Public Access
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a03e005a03 | ||
|
|
32b676db30 | ||
|
|
a287e092f5 | ||
|
|
4f1d458897 |
No files matched your search
@@ -4,12 +4,13 @@ Rivencraft is a clean, incremental port of the ideas and gameplay of
|
||||
[Mystcraft Legacy](https://github.com/Mystcraft/Mystcraft-Legacy) to Minecraft
|
||||
1.21.1 on NeoForge.
|
||||
|
||||
The bootstrap, books/linking, Ages, and writing-system milestones are complete.
|
||||
The bootstrap, books/linking, Ages, writing-system, and Age-grammar milestones are complete.
|
||||
The writing system uses a data-pack symbol catalog and persistent
|
||||
ordered-writing model. The project currently provides functional Linking Books
|
||||
and randomly seeded, persistent vanilla-like Ages created from page-free
|
||||
Descriptive Books. Instability and full symbol-to-world grammar interpretation
|
||||
have not been ported yet.
|
||||
ordered-writing model. Linking Books and Descriptive Books create persistent
|
||||
Ages from either authored supported symbols or seeded random completion.
|
||||
Instability and the remaining unsupported Legacy symbol effects have not been
|
||||
ported yet. The [Milestone 5 acceptance record](docs/MILESTONE_5_ACCEPTANCE.md)
|
||||
lists the supported grammar, optional integrations, and limits.
|
||||
|
||||
Milestone 4 now includes stackable blank Pages plus server-created symbol,
|
||||
unresolved-symbol, and baseline link-panel states. Page visuals follow the
|
||||
@@ -117,14 +118,14 @@ symbol meanings, page order, and runtime profile, so later data-pack changes do
|
||||
not reinterpret an existing Age. An authored terrain page selects its runtime
|
||||
profile. Built-in pages cover Standard, Amplified, Cave, Island, Flat, and Void;
|
||||
authored biome, environment, and supported feature pages also affect new Ages.
|
||||
Further symbol effects are scheduled for later Milestone 5 slices. The
|
||||
The
|
||||
writing is also stored on the book; the Descriptive Book screen's turned pages
|
||||
show ordered symbols and unresolved IDs. The Descriptive Book screen follows
|
||||
Legacy's book spread: the title and Age details are on the left, the destination
|
||||
preview is on the right, and clicks in the bottom corners turn pages. Ordered
|
||||
symbol pages appear before the final blank spread; their pictograms await
|
||||
Milestone 5. Link-panel-only books show their details in the enchantment-table
|
||||
font.
|
||||
symbol pages appear before the final blank spread with their runtime-rendered
|
||||
pictograms. Link-panel-only books use Rivencraft glyphs for their generated
|
||||
Age description.
|
||||
|
||||
## Linking Book
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ tasks.named('wrapper', Wrapper).configure {
|
||||
version = mod_version
|
||||
group = mod_group_id
|
||||
|
||||
List<String> archivedGameTestSuites = ['linking', 'environment', 'writing', 'grammar', 'desk', 'binder', 'mixer', 'recipe']
|
||||
List<String> archivedGameTestSuites = ['linking', 'environment', 'writing', 'grammar', 'generation', 'desk', 'binder', 'mixer', 'recipe']
|
||||
List<String> selectedArchivedGameTestSuites = providers.gradleProperty('withArchivedGameTests')
|
||||
.map { it.toBoolean() }.orElse(false).get() ? archivedGameTestSuites
|
||||
: providers.gradleProperty('archivedGameTestSuites').orElse('').get()
|
||||
|
||||
@@ -7,9 +7,8 @@ project's GNU LGPL v3 license. Rivencraft itself uses the same license.
|
||||
| Rivencraft asset | Upstream asset | Upstream revision | Changes |
|
||||
| --- | --- | --- | --- |
|
||||
| `assets/rivencraft/textures/item/page.png` | `assets/mystcraft/textures/items/page_background.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only |
|
||||
| `assets/rivencraft/textures/gui/notebook_pages.png` | `assets/mystcraft/gui/bookui_pagel.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; Notebook draws the native 30×40 page at atlas coordinates `(156, 0)` |
|
||||
| `assets/rivencraft/textures/gui/notebook_pages.png` | `assets/mystcraft/gui/bookui_pagel.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; shared by the Notebook, Desk, Binder, and turned left book page after removing a byte-identical duplicate |
|
||||
| `assets/rivencraft/textures/gui/bookui_cover.png` | `assets/mystcraft/gui/bookui_cover.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; shared book cover, with gold edges drawn only for Descriptive Books |
|
||||
| `assets/rivencraft/textures/gui/bookui_pagel.png` | `assets/mystcraft/gui/bookui_pagel.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; turned left page |
|
||||
| `assets/rivencraft/textures/gui/bookui_pager.png` | `assets/mystcraft/gui/bookui_pager.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; link-panel frame on the first right page |
|
||||
| `assets/rivencraft/textures/gui/bookui_rpage_full.png` | `assets/mystcraft/gui/bookui_rpage_full.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; full right written page |
|
||||
| `assets/rivencraft/textures/item/writing_desk.png` | `assets/mystcraft/textures/items/writingdesk.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only |
|
||||
@@ -25,7 +24,7 @@ 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/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 |
|
||||
| `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/crystal_block.png` | `assets/mystcraft/textures/blocks/crystal.png` | Legacy 0.13.7.06 local extraction | Exact 16×16 blue tile shared by Crystal Block and Budding Crystal models after removing a byte-identical duplicate |
|
||||
| `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 |
|
||||
| `assets/rivencraft/sounds/linking/link-fissure.ogg` | `assets/mystcraft/sounds/linking/link-fissure.ogg` | Legacy 0.13.7.06 local extraction | Namespace/path rename only; plays when a Star Fissure returns an entity home |
|
||||
|
||||
+28
-2
@@ -17,10 +17,15 @@ core tests when investigating an issue:
|
||||
```shell
|
||||
./gradlew runGameTestServer -ParchivedGameTestSuites=desk
|
||||
./gradlew runGameTestServer -ParchivedGameTestSuites=grammar,binder
|
||||
./gradlew runGameTestServer -ParchivedGameTestSuites=generation
|
||||
```
|
||||
|
||||
Available suite names are `linking`, `environment`, `writing`, `grammar`, `desk`,
|
||||
`binder`, `mixer`, and `recipe`. Run all Rivencraft tests before a
|
||||
Available suite names are `linking`, `environment`, `writing`, `grammar`,
|
||||
`generation`, `desk`, `binder`, `mixer`, and `recipe`. The `generation` archive
|
||||
keeps the detailed feature, structure, ore, crystal, and fissure regressions
|
||||
out of the default smoke run. Three checks formerly registered twice in the
|
||||
core and their archives now run only through the core wrapper. Run all
|
||||
Rivencraft tests before a
|
||||
release or after broad cross-system changes:
|
||||
|
||||
```shell
|
||||
@@ -47,6 +52,27 @@ automated check, and hand its exact scenario to the player for in-game
|
||||
verification. Do not keep retrying a stalled test or leave its process running.
|
||||
Keep the narrower non-stalling plan, persistence, and runtime checks automated.
|
||||
|
||||
For issue #41, the combined archive and the focused `linking` archive initially
|
||||
stalled during the multi-profile travel acceptance test. That test is no longer
|
||||
registered with GameTest; the rerun passed all 116 registered tests before the
|
||||
subsequent random-biome-count adjustment. The 51-test core suite passes after
|
||||
that adjustment, but the full archive stalled again late in its first batch;
|
||||
do not treat that interrupted run as a pass. Verify its
|
||||
scenario manually: in a fresh world, bind
|
||||
one Descriptive Book for each of Standard, Flat, Amplified, Island, Cave, and
|
||||
Void terrain (use the corresponding Terrain Page to select each one). Visit
|
||||
each Age, confirm a safe arrival platform and headroom, and
|
||||
travel back using a bound Linking Book. The narrower creation, persistence,
|
||||
terrain, and travel checks remain automated. See
|
||||
[random Age weights](RANDOM_AGE_WEIGHTS.md) for the Legacy rank mapping and
|
||||
the opt-in weighting regression.
|
||||
|
||||
Also bind several Link-Panel-only Descriptive Books with no authored biome
|
||||
pages. Check that each Age retains its biome set after leaving, unloading, and
|
||||
reopening it, and that the selected biome count varies between Ages without
|
||||
exceeding the eligible pool. This covers the bounded random-biome path touched
|
||||
after the last successful full-archive run.
|
||||
|
||||
The optional `-PwithSereneSeasons=true` runtime is for a real dev client, not
|
||||
the GameTest server: Serene Seasons sends a season payload to GameTest mock
|
||||
players, which cannot negotiate its channel. Follow the real-client Serene test in
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
# Milestone 5 acceptance: Age grammar
|
||||
|
||||
This is the completion record for [Gitea issue #42](https://gitea.tail180fb1.ts.net/dnorberg/rivencraft/issues/42) and release 0.5.0.0. Issues #28–#41, #45–#59, #61, and #62 are closed. #39 was closed with an explicit Ecliptic Seasons limitation, not with a working Ecliptic adapter. #42 is the final gate. Issues #43, #44, and #60 are separate open follow-ups, not hidden Milestone 5 completion claims.
|
||||
|
||||
## Authoring and generation contract
|
||||
|
||||
- Schema-v2 symbol JSON lives at `data/<namespace>/rivencraft/symbols/<path>.json`. Its file path is the stable page ID; `name`, `description`, and `category` are display metadata, while typed `semantics.role` and `semantics.value` control generation on the server. See [schema and role table](SYMBOL_SEMANTICS.md). Schema v1 remains display-only. Registry-derived biome, solid-block, and source-fluid pages are generated from valid registered entries rather than requiring one PNG or JSON definition per material.
|
||||
- Ordered writing is parsed as Link Panel, terrain, biomes/controller, weather, season, lighting, sky, celestial modifiers/celestial, then material/feature pairs. Missing branches are seeded completion warnings. Unresolved symbols, unsupported combinations, conflicting single-choice pages, incorrect order, and an invalid Link Panel produce Binder diagnostics before items are consumed. Repeated feature and material pages retain their occurrence order. See [grammar and diagnostics](WRITING_GRAMMAR.md).
|
||||
- Legacy's grammar ranks informed the random-choice weights; Rivencraft does not claim to run Legacy's complete 1.12.2 grammar or reproduce its terrain byte-for-byte. The [source audit](LEGACY_AGE_GRAMMAR_AUDIT.md), [weight table](RANDOM_AGE_WEIGHTS.md), and [runtime profiles](AGE_PROFILES.md) record exact mappings and adaptations. Authored supported symbols override seeded choices. A page-free or Link-Panel-only Descriptive Book creates a random Age. The resolved plan, seed, profile, biome IDs, traits, features, and writing order are saved with its Age identity before chunks generate. Reopening a book or restarting must not reroll it.
|
||||
- Feature pages cover decorations, terrain additions, dense ores, crystals, fissures, and supported structures including Trial Chambers and newer vanilla structures. Material pages may explicitly choose a compatible block/fluid or receive a seeded compatible feature. Terrain and biome eligibility still restrict combinations; incompatibility is reported rather than silently ignored. [Age documentation](AGES.md) and [feature rules](WRITING_GRAMMAR.md) describe the supported subset.
|
||||
|
||||
## Optional integrations and fallback
|
||||
|
||||
| Integration | Milestone 5 result |
|
||||
| --- | --- |
|
||||
| TerraBlender | Optional adapter reads registered Overworld and Nether region biome IDs. Any compatible biome-producing mod using those regions can supply eligible pages; no Biomes O' Plenty ID is hard-coded. Missing TerraBlender leaves vanilla Age generation intact. A removed biome warns and uses an eligible load-time fallback without rewriting the saved plan. See [TerraBlender checks](TERRABLENDER_COMPATIBILITY.md). |
|
||||
| Serene Seasons | Optional per-Age seasonal modes: No Seasons, Seasons, Eternal Winter/Summer/Fall/Spring. The adapter enrolls dynamic Age IDs in Serene's whitelist and synchronizes connected clients without a restart. Its internal config/saved-clock hooks are version-sensitive because a public dynamic-dimension registration/fixed-season API is unavailable. Without Serene, only No Seasons is valid for a *new* book; saved Ages retain their data with effects inactive. See [config and real-client checks](SERENE_SEASONS_COMPATIBILITY.md). |
|
||||
| Ecliptic Seasons | Deliberately not integrated. Its 1.21.1 `ValidDimensions` setting requires a world restart and caches validity on server/client level load; no supported live registration or per-dimension calendar-control API was found. Issue #39 records the blocker and the upstream API needed to revisit it. Rivencraft does not require Ecliptic and does not support both season mods together. |
|
||||
| JEI, Create/Ponder, Immersive Portals | Optional presentation/integration paths; none is required for core dedicated-server loading or Age grammar. Existing preview fallback and manual checks remain in [preview compatibility](PREVIEW_COMPATIBILITY.md). |
|
||||
|
||||
## Migration, limits, and milestone boundary
|
||||
|
||||
Existing saved writing keeps its stable IDs and order. Unresolved pages remain recoverable in books instead of being silently replaced. Existing bound books without a plan are not reinterpreted as newly authored grammar. A frozen plan can load without the old symbol definition or runtime-profile JSON, but missing referenced registry resources prevent or alter that load as documented in [runtime profiles](AGE_PROFILES.md); restore the data pack/mod and keep a backup. The migration regression suite covers legacy writing components, schema-v1 display pages, missing symbols, and old Binder/Desk data. It is **not** a promise of full compatibility with every pre-release world; that broader requirement is tracked separately by open issue #60.
|
||||
|
||||
Milestone 5 owns recognized symbol semantics, ordered grammar, deterministic completion, persistent Age configuration, and supported feature/integration effects. Milestone 6 owns instability from invalid or excessive writing and server-safe instability effects. Milestone 7 owns remaining structures/polish, portals, recipes, models, sounds, advancements, and migration depth. Several Legacy structures and crystals were pulled forward into Milestone 5 as their own closed port issues; that does not imply the rest of Milestone 7 is complete. Custom multi-body skies, gradients, unsupported direct Rain/Snow pages, and exact Legacy terrain/feature parity remain outside the accepted M5 subset. Open issue #44 tracks custom skybox work.
|
||||
|
||||
## Test and acceptance matrix
|
||||
|
||||
| Check | Result or handoff |
|
||||
| --- | --- |
|
||||
| Default dedicated-server GameTests, no optional mods | 26/26 passed after moving 25 detailed generation checks to the selectable `generation` archive. Core persistence, grammar, transaction, and migration checks remain. |
|
||||
| Focused generation archive | 51/51 passed on the reduced core plus `-ParchivedGameTestSuites=generation`. No generation test was deleted; 25 detailed checks moved out of the default run. |
|
||||
| Full archive | Previously passed 116/116 before the final random-biome-count adjustment in #41. Its later rerun stalled in the first batch and was stopped under the project GameTest rule; **not** claimed as a passing current run. Manual random-Age biome and six-terrain travel checks are in [GameTest handoffs](GAMETESTS.md). |
|
||||
| Optional TerraBlender | An earlier optional-mod GameTest run passed 51/51; Biomes O' Plenty/Nether-region behavior was checked in-game during #37. The published jar does not bundle TerraBlender. |
|
||||
| Optional Serene Seasons | In-game acceptance was recorded on #38 for six pages, saved whitelist, and no-restart sync. The GameTest mock player cannot negotiate Serene's season packet; the real-client path is documented. |
|
||||
| Gradle build and JAR | `./gradlew build --offline --no-daemon` passed and produced `build/libs/rivencraft-0.5.0.0.jar`. Its SHA-256 is attached to the Gitea release. |
|
||||
| Asset audit | Three byte-identical PNGs were replaced by references to their retained counterparts; no other unreferenced shipped textures or sounds were found. The user-provided `dev images` reference remains untouched. |
|
||||
|
||||
Completion checklist: implementation issues reviewed; #39 explicitly scoped as unsupported; schema/Legacy/grammar/generation/integration/migration boundaries documented; core and focused validation recorded; current archive stall disclosed; release JAR and SHA-256 published; issue #42 and Milestone 5 closed **only after** those release artifacts are verified.
|
||||
+10
-10
@@ -34,12 +34,13 @@ acceptance issue and all required implementation issues are complete.
|
||||
renderer compatibility. **Complete.** See
|
||||
[Milestone 3](https://gitea.tail180fb1.ts.net/dnorberg/rivencraft/milestone/8).
|
||||
4. **Writing system** — pages, notebooks, desks, book assembly, and the baseline
|
||||
Ink Mixer for Link Panels. Symbol effects are deferred until Milestone 5.
|
||||
Ink Mixer for Link Panels. Symbol effects were deferred to Milestone 5.
|
||||
**Complete.** See [Milestone 4](https://gitea.tail180fb1.ts.net/dnorberg/rivencraft/milestone/9)
|
||||
and [writing-system data and migration](WRITING_DATA.md).
|
||||
5. **Age grammar** — translate symbol combinations into modern biome, noise,
|
||||
dimension-type, and world-generation configuration. Optional integrations
|
||||
may add composable biome regions and seasonal behavior. See the
|
||||
5. **Age grammar** — translate supported symbol combinations into modern biome,
|
||||
noise, dimension-type, and world-generation configuration, with optional
|
||||
TerraBlender and Serene Seasons integration. **Complete for the supported
|
||||
subset.** See the [acceptance record](MILESTONE_5_ACCEPTANCE.md) and
|
||||
[Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md).
|
||||
6. **Instability** — deterministic validation and server-safe effects.
|
||||
7. **Structures and polish** — libraries, crystals, portals, recipes, models,
|
||||
@@ -61,17 +62,16 @@ live rendering when their dependencies are installed. The tested selection
|
||||
matrix and integration boundaries are documented in
|
||||
[PREVIEW_COMPATIBILITY.md](PREVIEW_COMPATIBILITY.md).
|
||||
|
||||
The writing system and Age grammar will build on the existing page-free Age
|
||||
path. Page-free books remain a useful deterministic fallback and test fixture
|
||||
after written symbol combinations become available.
|
||||
The writing system and Age grammar build on the existing page-free Age path.
|
||||
Page-free books remain a useful deterministic fallback and test fixture.
|
||||
|
||||
Milestone 4 delivered a versioned, data-pack-defined symbol catalog and an
|
||||
immutable ordered-writing model. See [WRITING_DATA.md](WRITING_DATA.md). These
|
||||
contracts preserve unknown symbol identifiers and store author intent; they do
|
||||
not interpret symbols into Age generation, which remains Milestone 5 work.
|
||||
contracts preserve unknown symbol identifiers and store author intent;
|
||||
Milestone 5 adds the server-owned interpretation and persistent Age plan.
|
||||
The Ink Mixer is included in Milestone 4 after book assembly; it
|
||||
uses paper and Ink Vials to make baseline Link Panels. Adding modifier
|
||||
ingredients and symbol-driven link properties belongs to Milestone 5.
|
||||
ingredients and symbol-driven link properties were delivered in Milestone 5.
|
||||
|
||||
## Provenance rules
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
# Random Age selection (issue #41)
|
||||
|
||||
Page-free and Link-Panel-only books still make one random Age definition from the Age seed. A written page overrides its branch; random completion never rewrites the book. The resulting terrain, traits, season mode, biome pool, and feature choices are saved with the Age identity, so loading an existing Age does not reroll it. This change affects **new** Ages only.
|
||||
|
||||
The rank-weight calculation follows Mystcraft Legacy's `GrammarGenerator.buildRankWeights` in the user-provided 0.13.7.06 classes: starting at the highest numbered (rarest) rank, a rank's weight is at least one greater than the preceding rank's total divided by the number of entries at the current rank. A missing intermediate rank still advances the weight. The corresponding `SymbolRules` entries supply the ranks. This is a selection policy, not a port of Legacy's full grammar tree or its Minecraft 1.12 world generator.
|
||||
|
||||
| Branch | Relative tickets for supported choices |
|
||||
| --- | --- |
|
||||
| Terrain | Standard 6, Flat 5, Amplified/Island/Cave/Void 1 each. Cave and Island occupy the rare slots corresponding to Legacy Nether and End terrain. Additional data-pack runtime profiles default to the rare rank and cause the group weights to be recomputed. |
|
||||
| Biome controller | Native/Single/Medium 3 each; Tiled/Grid/Tiny/Small/Large/Huge 1 each. The selected controller still applies terrain eligibility and minimum-biome rules. |
|
||||
| Additional random biomes | After Rivencraft's existing controller minimum, each extra biome has a 2-in-3 continuation chance and a 1-in-3 stop chance, capped by the eligible biome pool (including optional TerraBlender additions). This mirrors Legacy's ranked biome-list branch without changing the project's authored-page minimums. |
|
||||
| Lighting | Normal 3; Dark/Bright 1 each. |
|
||||
| Weather | Normal 9; Fast/Slow/Off/Always/Cloudy/Rain/Snow/Storm 1 each. WeatherOn is named Always here. |
|
||||
| Season (Serene Seasons only) | Seasons 6, No Seasons 5, each eternal season 1. These are Rivencraft ranks for features absent from Legacy; normal cycling is most common and eternal seasons are rare. No season policy is rolled without Serene Seasons. |
|
||||
|
||||
Random-feature selection remains bounded to two material features and two structures. Within those limits, surface/deep lakes have Legacy rank 1; lava lakes rank 2 as a separate new fluid choice; spheres/spikes/obelisks rank 3; and floating islands/tendrils rank 4. Rocks, which are a Rivencraft generalization, use rank 4. For structures, villages/strongholds/mineshafts use rank 1, dungeons/Nether fortresses rank 2, and newer Minecraft structures rank 3. Eligibility filtering still removes features incompatible with the selected terrain/biomes. Separate rare Skylands, Crystals, and Legacy-weighted Star Fissure rolls remain. This preserves Rivencraft's existing count limits rather than claiming exact parity with the full Legacy feature grammar. Existing saved random feature lists are retained. The current celestial stopped-time chance (1 in 7) follows the verified Legacy period ranks; other numeric celestial values still use Rivencraft's documented range.
|
||||
|
||||
Regression coverage: `RandomAgeWeightGameTests` (archived grammar suite) checks exact terrain rank tickets and stable selections across many seeds. Core Age persistence tests cover page-free and Link-Panel-only books, plan/trait round-trips, and migrated definitions. Binder and grammar archives cover page order, missing symbols, rejected assembly, and replayed output. The default GameTest runtime has none of TerraBlender, Serene Seasons, Ecliptic Seasons, JEI, Create, Ponder, or Immersive Portals installed. Optional-mod interactions and real unload/restart checks remain manual per `GAMETESTS.md`.
|
||||
@@ -40,10 +40,12 @@ For an eternal mode, Rivencraft sets Serene's per-Age saved clock to the midpoin
|
||||
|
||||
- The Serene adapter uses Serene's internal saved season state because there is no public per-dimension season-freeze API. The real-client behavior above, including each eternal mode and No Seasons, still needs player verification. Serene's [temperature and precipitation hooks](https://github.com/Glitchfiend/SereneSeasons/blob/1.21.1/common/src/main/java/sereneseasons/season/SeasonHooks.java) only cool eligible biomes.
|
||||
- Serene Seasons' [season tick](https://github.com/Glitchfiend/SereneSeasons/blob/1.21.1/common/src/main/java/sereneseasons/season/SeasonHandler.java) advances from a dimension's day-time changes. A Rivencraft Age with a stopped celestial cycle may also have a stopped season; this needs an in-game check.
|
||||
- Rivencraft's non-Normal weather modes currently control weather in each Age independently. Their timing can conflict with Serene Seasons' weather-frequency changes. Ecliptic Seasons integration remains issue #39; simultaneous installation is not a supported target.
|
||||
- Rivencraft's non-Normal weather modes currently control weather in each Age independently. Their timing can conflict with Serene Seasons' weather-frequency changes. Ecliptic Seasons integration was closed as unsupported for live dynamic Ages in issue #39; simultaneous installation is not a supported target.
|
||||
|
||||
## 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.
|
||||
|
||||
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.
|
||||
|
||||
The user subsequently reported an in-game pass for issue #38, recorded in its Gitea comment and release V0.4.9.2. The earlier candidate notes above describe the historical automated checks; the real-client matrix remains useful when upgrading Serene Seasons or GlitchCore.
|
||||
@@ -16,7 +16,7 @@ Milestone 5 issue #29 adds typed meaning to the existing data-pack symbol catalo
|
||||
}
|
||||
```
|
||||
|
||||
`name` and `description` are translation keys. `category` is for display and sorting; it does not determine grammar. `semantics.role` and its typed `value` are server-owned. The terrain value above names an Age runtime profile that a later compiler must resolve and validate. A syntactically valid resource ID alone does not guarantee the profile or feature exists.
|
||||
`name` and `description` are translation keys. `category` is for display and sorting; it does not determine grammar. `semantics.role` and its typed `value` are server-owned. The terrain value above names an Age runtime profile that the compiler resolves and validates. A syntactically valid resource ID alone does not guarantee the profile or feature exists.
|
||||
|
||||
`poem` is optional, client-safe artwork metadata: exactly four alphabetic words, ordered top, right, bottom, left. The client layers their glyphs from the shared Legacy component sheet at runtime. GUI thumbnails use the full transparent artwork over their page backgrounds; item icons use the same artwork reduced from 16 to 13 pixels across, over the page texture. Unregistered words use a stable generated component combination; when a symbol has no poem, the six original built-in IDs retain their Legacy poems and other IDs produce four stable fallback words. This affects appearance only, never Age generation. Generated images are cached up to 256 entries and discarded on resource reload.
|
||||
|
||||
@@ -28,17 +28,20 @@ The Writing Desk's 88 collection tabs use Legacy's number components, chiefly th
|
||||
| `biome_controller` | `native`, `single`, `tiled`, `grid`, `tiny`, `small`, `medium`, `large`, or `huge`. |
|
||||
| `biome` | Canonical namespaced biome ID. |
|
||||
| `lighting` | `normal`, `dark`, or `bright`. |
|
||||
| `sky` | `overworld`, `nether`, or `end`. |
|
||||
| `weather` | `normal`, `fast`, `slow`, `off`, `always`, `cloudy`, `rain`, `snow`, or `storm`. |
|
||||
| `season` | `no_seasons`, `seasons`, `eternal_winter`, `eternal_summer`, `eternal_fall`, or `eternal_spring`. Seasonal effects other than No Seasons require optional Serene Seasons. |
|
||||
| `celestial` | `normal_time` (the first representable single-cycle behavior). |
|
||||
| `period_modifier` | JSON number in `[0, 2]`; zero is stopped time. |
|
||||
| `angle_modifier` | JSON number in `[0, 360)` degrees. |
|
||||
| `phase_modifier` | JSON number in `[0, 360)` degrees; the compiler will convert to turns. |
|
||||
| `feature` | Canonical namespaced feature-effect ID; future generation mapping must recognize it. |
|
||||
| `block` | Canonical namespaced material ID for a compatible following feature; registered full-collision blocks and source fluids receive generated Pages. |
|
||||
| `feature` | Canonical namespaced feature-effect ID; the compiler must recognize and validate it. This includes supported decorations and structures. |
|
||||
|
||||
These are schema bounds, not claims that Legacy shipped numeric config ranges. See the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md) for the source values and biome-count rules. Roles outside this table—including multiple suns, gradients, special structures, and hazards—are intentionally unsupported by schema v2. Their meaning requires a later versioned extension, not an unvalidated free-form field.
|
||||
These are schema bounds, not claims that Legacy shipped numeric config ranges. See the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md) for the source values and biome-count rules. Roles outside this table—including multiple suns, gradients, and hazards—are intentionally unsupported by schema v2. Their meaning requires a later versioned extension, not an unvalidated free-form field. Recognized schema values can still be rejected by the current compiler when their runtime effect is unsupported, such as angle modifiers or direct Rain/Snow weather pages.
|
||||
|
||||
The server rejects a v2 definition with an unknown top-level or semantics field, missing/incorrectly typed field, unknown role or choice, malformed/non-canonical resource ID, or out-of-range/non-finite number. An invalid definition is logged with its file ID and excluded from the active catalog. Saved pages and books still retain that ID, allowing the player to recover them if the data pack is corrected. A reload atomically replaces the catalog rather than mutating saved writing.
|
||||
|
||||
Schema v1 definitions remain readable as **display-only** symbols; existing packs need not be rewritten merely to show or copy pages. A v1 definition cannot add a `semantics` field. To make one eligible for Age grammar parsing, publish a v2 definition with the **same file path and ID**, adding a valid role and value. Do not rename the page ID or reorder a book's `OrderedWriting`. The client receives only `SymbolDisplayMetadata` (ID, translation keys, category, resolved flag); semantic definitions are not serialized to it. The [ordered-writing parser](WRITING_GRAMMAR.md) validates new books, but does **not yet apply** written symbols to Age generation; issue #31 adds compilation.
|
||||
Schema v1 definitions remain readable as **display-only** symbols; existing packs need not be rewritten merely to show or copy pages. A v1 definition cannot add a `semantics` field. To make one eligible for Age grammar parsing, publish a v2 definition with the **same file path and ID**, adding a valid role and value. Do not rename the page ID or reorder a book's `OrderedWriting`. The client receives only display metadata; semantic definitions are not serialized to it. The [ordered-writing parser](WRITING_GRAMMAR.md) validates new books, and the server compiles supported writing into a frozen Age plan before Binder inputs are consumed.
|
||||
|
||||
The six built-in definitions demonstrate terrain, biome-controller, lighting, weather, celestial, and feature roles. A third-party pack may add its own definitions under its namespace. Use an explicit semantic role even when the display category has the same name; the two fields serve different purposes.
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
New Binder writing has at most one Link Panel plus 27 symbol pages. The Link Panel must be first. A Link-Panel-only book, or an older book with no writing component, keeps the existing random Age path. Any authored supported symbol makes the book a partial or complete grammar. From 0.4.3.0, the server compiles it into a persistent Age plan before consuming Binder inputs or generating chunks.
|
||||
|
||||
The supported order follows the representable subset of the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md): terrain; zero or more biome pages; biome controller; weather; lighting; sky effects; zero or more period or phase modifiers; one celestial page; then zero or more distinct features, each optionally preceded by a compatible block-material page. Biome pages precede the controller that consumes them, and celestial modifiers precede the celestial page. Terrain, controller, weather, lighting, sky, and celestial are single-choice categories; identical repeats are duplicates and differing values conflict. Repeated modifiers are intentional. Biome pages may repeat, preserving author order and any future weighting; feature IDs may not repeat. Angle modifiers remain recognized in the schema but are rejected at binding until a sky renderer can apply sun tilt.
|
||||
The supported order follows the representable subset of the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md): terrain; zero or more biome pages; biome controller; weather; season; lighting; sky effects; zero or more period or phase modifiers; one celestial page; then zero or more features, each optionally preceded by a compatible material page. Biome pages precede the controller that consumes them, and celestial modifiers precede the celestial page. Terrain, controller, weather, season, lighting, sky, and celestial are single-choice categories; identical repeats are duplicates and differing values conflict. Repeated modifiers, biome pages, feature pages, and material pages are intentional and retain their order. An unpaired material page receives a seeded compatible feature during compilation. Angle modifiers remain recognized in the schema but are rejected at binding until a sky renderer can apply sun tilt.
|
||||
|
||||
Missing terrain, controller, weather, lighting, celestial, or the controller's minimum biome count is an **incomplete** warning, not an error: the compiler retains seed-selected traits for missing branches. An omitted terrain page uses a seed-selected profile compatible with authored feature pages, so changing the Age name cannot accidentally select Flat, Void, or Cave terrain for Rocks or Lakes. If no profile can support the writing, binding still rejects it. The minimum biome count is zero for Native, one for Single, and two for Tiled/Grid and Tiny–Huge. Native cannot consume authored biome pages; Single accepts only one. Unknown IDs, schema-v1 display-only symbols, wrong ordering, misplaced modifiers, duplicates, conflicts, missing/extra Link Panels, and oversized writing are errors. The Binder disables output and exposes the first error on the result-slot tooltip. When that error belongs to a page, its thumbnail is tinted and outlined red, the strip scrolls to it, and hovering it shows the diagnostic. This maps the parser's compact entry position back through any empty page positions. Rejected inputs remain removable. Binding an unwritten Descriptive Book rechecks its server-owned writing and reports the first error without creating an Age. A terrain symbol whose profile is unavailable is also rejected before Binder inputs are consumed.
|
||||
Missing terrain, controller, weather, lighting, celestial, or the controller's minimum biome count is an **incomplete** warning, not an error: the compiler retains seed-selected traits for missing branches. An omitted terrain page uses a seed-selected profile compatible with authored feature pages, so changing the Age name cannot accidentally select Flat, Void, or Cave terrain for Rocks or Lakes. If no profile can support the writing, binding still rejects it. Native consumes no authored biome pages; Single accepts one; Tiled/Grid and Tiny–Huge require two, with seeded filler when pages are missing. Unknown IDs, schema-v1 display-only symbols, wrong ordering, misplaced modifiers, duplicates in single-choice categories, conflicts, missing/extra Link Panels, and oversized writing are errors. The Binder disables output and exposes the first error on the result-slot tooltip. When that error belongs to a page, its thumbnail is tinted and outlined red, the strip scrolls to it, and hovering it shows the diagnostic. This maps the parser's compact entry position back through any empty page positions. Rejected inputs remain removable. Binding an unwritten Descriptive Book rechecks its server-owned writing and reports the first error without creating an Age. A terrain symbol whose profile is unavailable is also rejected before Binder inputs are consumed.
|
||||
|
||||
The plan stores the original writing order, the authoritative semantic value of each resolved symbol, the Age seed, and a copy of the selected runtime profile. An explicit terrain page overrides random terrain selection; an omitted terrain uses a seed-selected compatible profile. The built-in Standard, Amplified, Cave, Island, Flat, and Void terrain pages select their matching generation resources. Age loading uses the frozen runtime profile and does not need the original symbol definition or runtime-profile JSON, though its referenced noise, biome-preset, and dimension-type registry entries must remain available. Existing bound books without plans are not reinterpreted. Page-free and Link-Panel-only books keep the pre-existing random path. Biome and environment pages affect new Ages, and the supported feature subset below is compiled into the same frozen plan; instability remains Milestone 6 work.
|
||||
|
||||
@@ -14,12 +14,12 @@ The plan stores the original writing order, the authoritative semantic value of
|
||||
|
||||
Feature pages come after the celestial section. Their order is retained in the plan and in decoration placement. The Caves page adds a second, Age-seeded vanilla cave-carving pass to Noise terrain, including Standard, Amplified, Island, and Cave terrain. It chooses the vanilla Overworld or Nether cave carver from the source biome. This is separate from the Milestone 7 issue about Cave **terrain** generation. Flat and Void terrain have no suitable solid noise body and reject Caves with a binder diagnostic.
|
||||
|
||||
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 Lava 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, each material-bearing feature selects a valid solid block or source fluid from the registered pool. The selection is deterministic for the Age seed and feature occurrence, so repeated feature pages can receive different materials while remaining stable 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 Lava 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. Portals and the Cave-terrain bug remain separate work.
|
||||
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 before a compatible solid feature (Rocks, Floating Islands, Tendrils, Spheres, Spikes, or Obelisks), or a Fluid Page before a lake feature. A material page with no explicit feature receives a seeded compatible one. A material directly attached to an incompatible feature is rejected. The effective feature and material IDs are frozen with the Age, so future chunks retain their choices after restart. Existing chunks are not retroactively decorated.
|
||||
|
||||
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.
|
||||
|
||||
Star Fissures are a material-free feature on every terrain profile, including Cave and Void. The fissure is generated once beside the first resolved spawn, using Legacy's spawn-chunk offset and 10–17 paired, irregular X-span rows running along +Z. Each portal tile is placed at y=0 and its column is opened to the sky, as in Legacy. For modern terrain with a surface below y=0, the portal uses the minimum build height plus one instead; empty Void columns keep y=0. Its non-solid portal links to the Overworld spawn with the Legacy fissure sound; the animated starfield is drawn with Minecraft's current End Portal renderer, which uses the same end-sky/end-portal art as Legacy's custom renderer. Random Ages sample Legacy's default small-feature grammar for fissure selection: the stop/one/repeat branches have rank-derived weights 1:1:3, and the fissure has weight 1 of 9 among its small-feature rules. The remainder of random feature selection still follows Rivencraft's current pipeline, rather than running Legacy's entire Age grammar.
|
||||
Star Fissures are a material-free feature on every terrain profile, including Cave and Void. The fissure is generated once beside the first resolved spawn, using Legacy's spawn-chunk offset and 10–17 paired, irregular X-span rows running along +Z. Legacy's y=0 portal floor maps to the modern dimension's minimum build height, replacing lower bedrock if present. The rift opens to the sky on ordinary terrain; in Cave terrain it opens into the cavern but stops below the upper bedrock roof. Water in the carved columns is cleared before the portal is placed. Its non-solid portal links to the Overworld spawn with the Legacy fissure sound; the animated starfield is drawn with Minecraft's current End Portal renderer, which uses the same end-sky/end-portal art as Legacy's custom renderer. Random Ages sample Legacy's default small-feature grammar for fissure selection: the stop/one/repeat branches have rank-derived weights 1:1:3, and the fissure has weight 1 of 9 among its small-feature rules. The remainder of random feature selection still follows Rivencraft's current pipeline, rather than running Legacy's entire Age grammar.
|
||||
|
||||
The Rivencraft symbol-page creative tabs read a generated index of bundled symbol definitions and group Pages by each definition's category, except biome-controller roles, which appear in a separate Biome Generation tab rather than the Biome tab. Adding another valid JSON symbol under `src/main/resources/data/rivencraft/rivencraft/symbols/` includes its page in the matching category tab on the next build; a new bundled category receives its own tab. Registry-derived Block and Fluid Pages have separate tabs and both appear in optional JEI. 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.
|
||||
+1
-1
@@ -36,7 +36,7 @@ mod_name=Rivencraft
|
||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||
mod_license=LGPL-3.0-or-later
|
||||
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
||||
mod_version=0.4.19.1
|
||||
mod_version=0.5.0.0
|
||||
immersive_portals_version=6.0.7
|
||||
terrablender_version=4.1.0.8
|
||||
serene_seasons_version_id=B6nTjh4b
|
||||
|
||||
@@ -80,13 +80,13 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
int minimum = minimum(distribution);
|
||||
int target = minimum;
|
||||
if (authored.isEmpty()) {
|
||||
// The terrain's available pool is the upper bound, including any
|
||||
// compatible TerraBlender region biomes present at creation time.
|
||||
// Legacy's BiomesAdv continuation/stop ranks are 2:3, which yield
|
||||
// two continuation tickets for every one stop ticket. Keep our
|
||||
// existing minimum and cap the list at the available biome pool.
|
||||
int availableBiomeCount = new LinkedHashSet<>(availableBiomes).size();
|
||||
int maximum = distribution == AgeTraits.BiomeDistribution.SINGLE ? 1 : availableBiomeCount;
|
||||
if (maximum >= minimum) {
|
||||
target += new Random(seed ^ 0x42494F4D45434F55L).nextInt(maximum - minimum + 1);
|
||||
}
|
||||
Random countRandom = new Random(seed ^ 0x42494F4D45434F55L);
|
||||
while (target < maximum && countRandom.nextInt(3) != 0) target++;
|
||||
}
|
||||
// An authored Void Age must not acquire The Void as an unrequested second biome.
|
||||
List<ResourceLocation> filler = profile.terrain() == AgeRuntimeProfile.Terrain.VOID && !authored.isEmpty()
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.Random;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.compat.ImmersivePortalsChunkLoaders;
|
||||
import net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.GlobalPos;
|
||||
@@ -103,7 +104,8 @@ public final class AgeDimensionService {
|
||||
.anyMatch(choice -> choice.id().equals(AgeFeatureSelection.STAR_FISSURES))
|
||||
|| definition.randomFeatures().stream()
|
||||
.anyMatch(choice -> choice.id().equals(AgeFeatureSelection.STAR_FISSURES))) {
|
||||
StarFissureFeature.generate(level, definition.seed(), spawn);
|
||||
StarFissureFeature.generate(level, definition.seed(), spawn,
|
||||
AgeBiomeSelection.isCave(runtimeProfile(definition)));
|
||||
}
|
||||
definition = AgeRegistrySavedData.get(level).setSpawn(definition.id(), spawn);
|
||||
}
|
||||
@@ -336,9 +338,11 @@ public final class AgeDimensionService {
|
||||
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
||||
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
||||
Holder<NoiseGeneratorSettings> settings = Holder.direct(withBiomeMaterialRules(baseSettings));
|
||||
boolean caveTerrain = AgeBiomeSelection.isCave(profile);
|
||||
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||
? new NoiseBasedChunkGenerator(biomeSource, settings)
|
||||
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed());
|
||||
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed(),
|
||||
caveTerrain, caveTerrain ? TerraBlenderBiomes.nether(server.registryAccess()) : List.of());
|
||||
}
|
||||
|
||||
private static NoiseGeneratorSettings withBiomeMaterialRules(NoiseGeneratorSettings base) {
|
||||
|
||||
@@ -159,13 +159,15 @@ public final class AgeFeatureSelection {
|
||||
public static List<Choice> randomChoices(long ageSeed, AgeRuntimeProfile profile, RegistryAccess registries) {
|
||||
Random random = new Random(ageSeed ^ 0x4D4154455249414CL);
|
||||
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<LegacyRankChoice.Option<ResourceLocation>> features = new ArrayList<>();
|
||||
for (ResourceLocation id : BLOCK_FEATURES) if (error(id, profile, registries) == null)
|
||||
features.add(new LegacyRankChoice.Option<>(id, randomMaterialRank(id)));
|
||||
for (ResourceLocation id : FLUID_FEATURES) if (error(id, profile, registries) == null)
|
||||
features.add(new LegacyRankChoice.Option<>(id, randomMaterialRank(id)));
|
||||
List<Choice> choices = new ArrayList<>();
|
||||
for (ResourceLocation feature : features) {
|
||||
if (choices.size() >= count) break;
|
||||
while (choices.size() < count && !features.isEmpty()) {
|
||||
ResourceLocation feature = LegacyRankChoice.choose(random, features);
|
||||
features.removeIf(option -> option.value().equals(feature));
|
||||
var category = solidFeature(feature)
|
||||
? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||
List<ResourceLocation> materials = BlockSymbolPages.availableBlocks(category).stream()
|
||||
@@ -186,6 +188,13 @@ public final class AgeFeatureSelection {
|
||||
return List.copyOf(choices);
|
||||
}
|
||||
|
||||
static int randomMaterialRank(ResourceLocation feature) {
|
||||
if (feature.equals(id("surface_lakes")) || feature.equals(id("deep_lakes"))) return 1;
|
||||
if (feature.equals(id("lava_lakes"))) return 2; // New separate fluid choice.
|
||||
if (spheres(feature) || spikes(feature) || obelisks(feature)) return 3;
|
||||
return 4; // Legacy Floating Islands/Tendrils and the new Rocks choice.
|
||||
}
|
||||
|
||||
/**
|
||||
* Legacy's default FeatureSmalls0 grammar: stop without a feature (rank 4),
|
||||
* emit one (rank 4), or emit one and repeat (rank 2). Its rank-derived
|
||||
@@ -302,45 +311,51 @@ public final class AgeFeatureSelection {
|
||||
}
|
||||
|
||||
public static boolean isRock(ResourceLocation choice) {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "rocks"));
|
||||
return is(choice, "rocks");
|
||||
}
|
||||
|
||||
public static boolean isLake(ResourceLocation choice) {
|
||||
return choice.getNamespace().equals("rivencraft") && List.of(
|
||||
"surface_lakes", "deep_lakes", "lava_lakes").contains(choice.getPath());
|
||||
if (!choice.getNamespace().equals("rivencraft")) return false;
|
||||
return switch (choice.getPath()) {
|
||||
case "surface_lakes", "deep_lakes", "lava_lakes" -> true;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
public static boolean surfaceVegetation(ResourceLocation choice) {
|
||||
return choice.getNamespace().equals("rivencraft")
|
||||
&& List.of("flowers", "trees", "huge_trees").contains(choice.getPath());
|
||||
if (!choice.getNamespace().equals("rivencraft")) return false;
|
||||
return switch (choice.getPath()) {
|
||||
case "flowers", "trees", "huge_trees" -> true;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
public static boolean caves(ResourceLocation choice) {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "caves"));
|
||||
return is(choice, "caves");
|
||||
}
|
||||
|
||||
public static boolean ravines(ResourceLocation choice) {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "ravines"));
|
||||
return is(choice, "ravines");
|
||||
}
|
||||
|
||||
public static boolean floatingIslands(ResourceLocation choice) {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "floating_islands"));
|
||||
return is(choice, "floating_islands");
|
||||
}
|
||||
|
||||
public static boolean tendrils(ResourceLocation choice) {
|
||||
return choice.equals(id("tendrils"));
|
||||
return is(choice, "tendrils");
|
||||
}
|
||||
|
||||
public static boolean spheres(ResourceLocation choice) {
|
||||
return choice.equals(id("spheres"));
|
||||
return is(choice, "spheres");
|
||||
}
|
||||
|
||||
public static boolean spikes(ResourceLocation choice) {
|
||||
return choice.equals(id("spikes"));
|
||||
return is(choice, "spikes");
|
||||
}
|
||||
|
||||
public static boolean obelisks(ResourceLocation choice) {
|
||||
return choice.equals(id("obelisks"));
|
||||
return is(choice, "obelisks");
|
||||
}
|
||||
|
||||
private static boolean solidFeature(ResourceLocation choice) {
|
||||
@@ -349,7 +364,11 @@ public final class AgeFeatureSelection {
|
||||
}
|
||||
|
||||
public static boolean skylands(ResourceLocation choice) {
|
||||
return choice.equals(id("skylands"));
|
||||
return is(choice, "skylands");
|
||||
}
|
||||
|
||||
private static boolean is(ResourceLocation choice, String path) {
|
||||
return choice.getNamespace().equals("rivencraft") && choice.getPath().equals(path);
|
||||
}
|
||||
|
||||
public static boolean supportsSurfaceVegetation(ResourceLocation id, RegistryAccess registries) {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Comparator;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
@@ -13,24 +15,37 @@ public final class AgeGenerationProfiles {
|
||||
public static final ResourceLocation FLAT = id("flat");
|
||||
public static final ResourceLocation VOID = id("void");
|
||||
|
||||
private static final List<ResourceLocation> RANDOM_PROFILES = List.of(
|
||||
STANDARD, AMPLIFIED, ISLAND, CAVE, FLAT, VOID
|
||||
private static final List<LegacyRankChoice.Option<ResourceLocation>> RANDOM_PROFILES = List.of(
|
||||
new LegacyRankChoice.Option<>(STANDARD, 1),
|
||||
new LegacyRankChoice.Option<>(FLAT, 2),
|
||||
new LegacyRankChoice.Option<>(AMPLIFIED, 3),
|
||||
new LegacyRankChoice.Option<>(ISLAND, 3),
|
||||
new LegacyRankChoice.Option<>(CAVE, 3),
|
||||
new LegacyRankChoice.Option<>(VOID, 3)
|
||||
);
|
||||
private static final List<LegacyRankChoice.Option<ResourceLocation>> SORTED_RANDOM_PROFILES =
|
||||
RANDOM_PROFILES.stream().sorted(Comparator.comparing(LegacyRankChoice.Option::value)).toList();
|
||||
|
||||
private AgeGenerationProfiles() {
|
||||
}
|
||||
|
||||
/** Selects one stable base terrain from the Age's already-persisted seed. */
|
||||
public static ResourceLocation select(long seed) {
|
||||
return RANDOM_PROFILES.get(Math.floorMod(Long.hashCode(seed), RANDOM_PROFILES.size()));
|
||||
return LegacyRankChoice.choose(new Random(seed ^ 0x5445525241494E4CL), SORTED_RANDOM_PROFILES);
|
||||
}
|
||||
|
||||
public static boolean isSupported(ResourceLocation profile) {
|
||||
return RANDOM_PROFILES.contains(profile);
|
||||
return RANDOM_PROFILES.stream().anyMatch(option -> option.value().equals(profile));
|
||||
}
|
||||
|
||||
public static List<ResourceLocation> all() {
|
||||
return RANDOM_PROFILES;
|
||||
return RANDOM_PROFILES.stream().map(LegacyRankChoice.Option::value).toList();
|
||||
}
|
||||
|
||||
static int randomRank(ResourceLocation profile) {
|
||||
if (profile.equals(STANDARD)) return 1;
|
||||
if (profile.equals(FLAT)) return 2;
|
||||
return 3;
|
||||
}
|
||||
|
||||
/** Maps removed legacy aliases to a stable built-in profile. */
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import java.util.Map;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||
@@ -59,8 +60,9 @@ public final class AgeRuntimeProfiles {
|
||||
if (PROFILES.isEmpty()) {
|
||||
return AgeGenerationProfiles.select(seed);
|
||||
}
|
||||
java.util.List<ResourceLocation> ids = PROFILES.keySet().stream().sorted().toList();
|
||||
return ids.get(Math.floorMod(Long.hashCode(seed), ids.size()));
|
||||
List<LegacyRankChoice.Option<ResourceLocation>> profiles = PROFILES.keySet().stream().sorted()
|
||||
.map(id -> new LegacyRankChoice.Option<>(id, AgeGenerationProfiles.randomRank(id))).toList();
|
||||
return LegacyRankChoice.choose(new Random(seed ^ 0x5445525241494E4CL), profiles);
|
||||
}
|
||||
|
||||
/** Keep seed-selected terrain random, but only among profiles able to host authored features. */
|
||||
|
||||
@@ -2,6 +2,7 @@ package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Random;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||
import net.neoforged.fml.ModList;
|
||||
|
||||
@@ -19,7 +20,13 @@ public enum AgeSeasonMode {
|
||||
/** 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;
|
||||
return sereneInstalled ? LegacyRankChoice.choose(new Random(ageSeed ^ RANDOM_SALT), List.of(
|
||||
new LegacyRankChoice.Option<>(SEASONS, 1),
|
||||
new LegacyRankChoice.Option<>(NO_SEASONS, 2),
|
||||
new LegacyRankChoice.Option<>(ETERNAL_WINTER, 3),
|
||||
new LegacyRankChoice.Option<>(ETERNAL_SUMMER, 3),
|
||||
new LegacyRankChoice.Option<>(ETERNAL_FALL, 3),
|
||||
new LegacyRankChoice.Option<>(ETERNAL_SPRING, 3))) : null;
|
||||
}
|
||||
|
||||
/** Existing Ages without a stored choice retain their old cycling behavior. */
|
||||
|
||||
@@ -18,7 +18,7 @@ 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)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class AgeStructureGameTests {
|
||||
private static final Map<String, ResourceLocation> SETS = Map.ofEntries(
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
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;
|
||||
@@ -116,13 +115,25 @@ public final class AgeStructureSelection {
|
||||
|
||||
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());
|
||||
List<LegacyRankChoice.Option<ResourceLocation>> eligible = new ArrayList<>(FEATURES.stream()
|
||||
.filter(id -> error(id, profile, biomes, registries) == null)
|
||||
.map(id -> new LegacyRankChoice.Option<>(id, randomRank(id))).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();
|
||||
List<AgeFeatureSelection.Choice> choices = new ArrayList<>();
|
||||
while (choices.size() < count && !eligible.isEmpty()) {
|
||||
ResourceLocation selected = LegacyRankChoice.choose(random, eligible);
|
||||
choices.add(new AgeFeatureSelection.Choice(selected, Optional.empty()));
|
||||
eligible.removeIf(option -> option.value().equals(selected));
|
||||
}
|
||||
return List.copyOf(choices);
|
||||
}
|
||||
|
||||
static int randomRank(ResourceLocation feature) {
|
||||
if (feature.equals(id("villages")) || feature.equals(id("strongholds"))
|
||||
|| feature.equals(id("mineshafts"))) return 1;
|
||||
if (feature.equals(id("dungeons")) || feature.equals(id("nether_fortresses"))) return 2;
|
||||
return 3; // Structures added after Legacy are uncommon, but still discoverable.
|
||||
}
|
||||
|
||||
private static Set<ResourceLocation> enabledSets(List<AgeFeatureSelection.Choice> choices) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.Random;
|
||||
import java.util.List;
|
||||
|
||||
/** Immutable random-Age traits selected once from the Age seed. */
|
||||
public record AgeTraits(
|
||||
@@ -42,9 +43,30 @@ public record AgeTraits(
|
||||
|
||||
public static AgeTraits select(long seed) {
|
||||
Random random = new Random(seed ^ 0x524956454E435241L);
|
||||
BiomeDistribution biomeDistribution = randomChoice(random, BiomeDistribution.values());
|
||||
Lighting lighting = randomChoice(random, Lighting.values());
|
||||
Weather weather = randomChoice(random, Weather.values());
|
||||
BiomeDistribution biomeDistribution = LegacyRankChoice.choose(random, List.of(
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.NATIVE, 1),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.SINGLE, 1),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.MEDIUM, 1),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.TILED, 2),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.GRID, 2),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.TINY, 2),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.SMALL, 2),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.LARGE, 2),
|
||||
new LegacyRankChoice.Option<>(BiomeDistribution.HUGE, 2)));
|
||||
Lighting lighting = LegacyRankChoice.choose(random, List.of(
|
||||
new LegacyRankChoice.Option<>(Lighting.NORMAL, 1),
|
||||
new LegacyRankChoice.Option<>(Lighting.DARK, 2),
|
||||
new LegacyRankChoice.Option<>(Lighting.BRIGHT, 2)));
|
||||
Weather weather = LegacyRankChoice.choose(random, List.of(
|
||||
new LegacyRankChoice.Option<>(Weather.NORMAL, 1),
|
||||
new LegacyRankChoice.Option<>(Weather.FAST, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.SLOW, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.OFF, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.ALWAYS, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.CLOUDY, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.RAIN, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.SNOW, 2),
|
||||
new LegacyRankChoice.Option<>(Weather.STORM, 2)));
|
||||
// Legacy's PERIOD_BASIC grammar gives ModZero rank 2 and its other
|
||||
// three length modifiers rank 1, producing an effective 1-in-7 weight.
|
||||
boolean stopped = random.nextInt(7) == 0;
|
||||
@@ -77,10 +99,6 @@ public record AgeTraits(
|
||||
}
|
||||
}
|
||||
|
||||
private static <E> E randomChoice(Random random, E[] values) {
|
||||
return values[random.nextInt(values.length)];
|
||||
}
|
||||
|
||||
public enum BiomeDistribution {
|
||||
NATIVE, SINGLE, TILED, GRID, TINY, SMALL, MEDIUM, LARGE, HUGE
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
@@ -22,7 +23,7 @@ import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||
|
||||
/** Issue #35: authored decorations must resolve to real placed features and survive plan reload. */
|
||||
@GameTestHolder(Rivencraft.MOD_ID)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class FeatureWritingGameTests {
|
||||
private FeatureWritingGameTests() {}
|
||||
@@ -460,6 +461,32 @@ public final class FeatureWritingGameTests {
|
||||
});
|
||||
}
|
||||
|
||||
@GameTest(template = "empty", timeoutTicks = 600)
|
||||
public static void netherCaveBiomeUsesNetherRock(GameTestHelper helper) {
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/cave"),
|
||||
page("biome/nether_wastes"), page("biome/single")));
|
||||
var target = AgeDimensionService.resolve(player,
|
||||
new AgeReference(UUID.randomUUID(), "Nether Cave Materials"), writing).orElseThrow();
|
||||
helper.runAfterDelay(1, () -> {
|
||||
var level = helper.getLevel().getServer().getLevel(target.location().dimension());
|
||||
helper.assertTrue(level != null, "The Nether cave Age must load");
|
||||
var chunk = level.getChunk(0, 0);
|
||||
int[] rock = new int[2];
|
||||
chunk.findBlocks(state -> state.is(Blocks.NETHERRACK) || state.is(Blocks.STONE)
|
||||
|| state.is(Blocks.DEEPSLATE) || state.is(Blocks.DIRT)
|
||||
|| state.is(Blocks.GRASS_BLOCK),
|
||||
(pos, state) -> {
|
||||
if (state.is(Blocks.NETHERRACK)) rock[0]++;
|
||||
else rock[1]++;
|
||||
});
|
||||
helper.assertTrue(rock[0] > 0, "Nether cave terrain must contain netherrack");
|
||||
helper.assertValueEqual(rock[1], 0,
|
||||
"Nether cave terrain must not retain stone, deepslate, dirt, or grass");
|
||||
helper.succeed();
|
||||
});
|
||||
}
|
||||
|
||||
private static void rejects(GameTestHelper helper, OrderedWriting writing, String expected) {
|
||||
try {
|
||||
AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
/** Legacy grammar ranks: each more-preferred rank group outweighs the next rarer group. */
|
||||
final class LegacyRankChoice {
|
||||
private LegacyRankChoice() {}
|
||||
|
||||
record Option<T>(T value, int rank) {
|
||||
Option {
|
||||
if (value == null || rank < 0) throw new IllegalArgumentException("Invalid ranked choice");
|
||||
}
|
||||
}
|
||||
|
||||
static <T> T choose(Random random, List<Option<T>> options) {
|
||||
if (options.isEmpty()) throw new IllegalArgumentException("No ranked choices");
|
||||
Map<Integer, Integer> counts = new HashMap<>();
|
||||
int highest = 0;
|
||||
for (Option<T> option : options) {
|
||||
counts.merge(option.rank(), 1, Integer::sum);
|
||||
highest = Math.max(highest, option.rank());
|
||||
}
|
||||
Map<Integer, Integer> weights = new HashMap<>();
|
||||
int weight = 1;
|
||||
int previousTotal = 0;
|
||||
for (int rank = highest; rank >= 0; rank--) {
|
||||
int count = counts.getOrDefault(rank, 0);
|
||||
if (weight != 1 && count > 0) weight = Math.max(weight, previousTotal / count + 1);
|
||||
weights.put(rank, weight);
|
||||
previousTotal = count * weight;
|
||||
weight++;
|
||||
}
|
||||
int total = options.stream().mapToInt(option -> weights.get(option.rank())).sum();
|
||||
int ticket = random.nextInt(total);
|
||||
for (Option<T> option : options) {
|
||||
ticket -= weights.get(option.rank());
|
||||
if (ticket < 0) return option.value();
|
||||
}
|
||||
throw new IllegalStateException("Ranked choice ticket was not consumed");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||
|
||||
/** Opt-in regression for Legacy rank weights and deterministic random-Age branches. */
|
||||
@GameTestHolder("rivencraft_archive_grammar")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class RandomAgeWeightGameTests {
|
||||
private RandomAgeWeightGameTests() {}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void randomAgeChoicesRespectLegacyRanks(GameTestHelper helper) {
|
||||
var terrain = List.of(new LegacyRankChoice.Option<>("normal", 1),
|
||||
new LegacyRankChoice.Option<>("flat", 2),
|
||||
new LegacyRankChoice.Option<>("amplified", 3),
|
||||
new LegacyRankChoice.Option<>("island", 3),
|
||||
new LegacyRankChoice.Option<>("cave", 3),
|
||||
new LegacyRankChoice.Option<>("void", 3));
|
||||
// Legacy's rank formula yields 6:5:1:1:1:1 for these six terrains.
|
||||
for (int ticket = 0; ticket < 15; ticket++) {
|
||||
final int selectedTicket = ticket;
|
||||
Random fixed = new Random() {
|
||||
@Override public int nextInt(int bound) {
|
||||
helper.assertValueEqual(bound, 15, "The terrain rank group must have 15 tickets");
|
||||
return selectedTicket;
|
||||
}
|
||||
};
|
||||
String expected = ticket < 6 ? "normal" : ticket < 11 ? "flat"
|
||||
: terrain.get(ticket - 9).value();
|
||||
helper.assertValueEqual(LegacyRankChoice.choose(fixed, terrain), expected,
|
||||
"A fixed ticket must map to its exact Legacy terrain weight");
|
||||
}
|
||||
|
||||
Map<ResourceLocation, Integer> profiles = new HashMap<>();
|
||||
Map<AgeTraits.Weather, Integer> weather = new HashMap<>();
|
||||
Map<AgeSeasonMode, Integer> seasons = new HashMap<>();
|
||||
for (long seed = 0; seed < 4_000; seed++) {
|
||||
ResourceLocation profile = AgeRuntimeProfiles.select(seed);
|
||||
helper.assertValueEqual(profile, AgeRuntimeProfiles.select(seed),
|
||||
"The same Age seed must choose the same terrain");
|
||||
if (AgeRuntimeProfiles.profiles().size() == AgeGenerationProfiles.all().size())
|
||||
helper.assertValueEqual(profile, AgeGenerationProfiles.select(seed),
|
||||
"The built-in-only fallback must agree with loaded profile selection");
|
||||
profiles.merge(profile, 1, Integer::sum);
|
||||
AgeTraits traits = AgeTraits.select(seed);
|
||||
helper.assertValueEqual(traits, AgeTraits.select(seed),
|
||||
"The same Age seed must choose the same traits");
|
||||
weather.merge(traits.weather(), 1, Integer::sum);
|
||||
AgeSeasonMode season = AgeSeasonMode.select(null, seed, true);
|
||||
helper.assertValueEqual(season, AgeSeasonMode.select(null, seed, true),
|
||||
"The same Age seed must choose the same season policy");
|
||||
seasons.merge(season, 1, Integer::sum);
|
||||
}
|
||||
helper.assertTrue(profiles.getOrDefault(AgeGenerationProfiles.STANDARD, 0)
|
||||
> profiles.getOrDefault(AgeGenerationProfiles.FLAT, 0)
|
||||
&& profiles.getOrDefault(AgeGenerationProfiles.FLAT, 0)
|
||||
> profiles.getOrDefault(AgeGenerationProfiles.VOID, 0),
|
||||
"Normal terrain must be common, Flat intermediate, and Void rare");
|
||||
helper.assertTrue(weather.getOrDefault(AgeTraits.Weather.NORMAL, 0)
|
||||
> weather.getOrDefault(AgeTraits.Weather.STORM, 0),
|
||||
"Legacy's normal weather must be more common than a special weather mode");
|
||||
helper.assertTrue(seasons.getOrDefault(AgeSeasonMode.SEASONS, 0)
|
||||
> seasons.getOrDefault(AgeSeasonMode.NO_SEASONS, 0)
|
||||
&& seasons.getOrDefault(AgeSeasonMode.NO_SEASONS, 0)
|
||||
> seasons.getOrDefault(AgeSeasonMode.ETERNAL_WINTER, 0),
|
||||
"Normal season cycling must be common, no seasons intermediate, and eternal seasons rare");
|
||||
helper.assertTrue(AgeSeasonMode.select(null, 42L, false) == null,
|
||||
"No season policy may be selected without Serene Seasons");
|
||||
helper.assertValueEqual(AgeFeatureSelection.randomMaterialRank(ResourceLocation.parse("rivencraft:surface_lakes")),
|
||||
1, "Surface Lakes must retain their Legacy common rank");
|
||||
helper.assertValueEqual(AgeFeatureSelection.randomMaterialRank(ResourceLocation.parse("rivencraft:floating_islands")),
|
||||
4, "Floating Islands must retain their Legacy rare rank");
|
||||
helper.assertValueEqual(AgeStructureSelection.randomRank(ResourceLocation.parse("rivencraft:villages")),
|
||||
1, "Villages must retain their Legacy common rank");
|
||||
helper.assertValueEqual(AgeStructureSelection.randomRank(ResourceLocation.parse("rivencraft:trial_chambers")),
|
||||
3, "Modern structures must use a rare rank");
|
||||
helper.succeed();
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,7 @@ public final class SymbolPageItemRenderer extends BlockEntityWithoutLevelRendere
|
||||
ResourceLocation texture = switch (PageItem.content(stack).kind()) {
|
||||
case BLANK -> texture("page");
|
||||
case LINK_PANEL -> texture("page_link_panel");
|
||||
case UNRESOLVED_SYMBOL -> texture("page_unresolved");
|
||||
case UNRESOLVED_SYMBOL -> texture("page_symbol");
|
||||
case SYMBOL -> SymbolPageTextures.forItem(stack);
|
||||
};
|
||||
VertexConsumer vertices = buffers.getBuffer(RenderType.entityCutoutNoCull(texture));
|
||||
|
||||
@@ -73,12 +73,12 @@ public final class SymbolPageTextures {
|
||||
public static ResourceLocation forDisplay(SymbolDisplayMetadata display) {
|
||||
return display.resolved()
|
||||
? forSymbol(display.id(), display.poem(), false)
|
||||
: texture("item/page_unresolved");
|
||||
: FALLBACK;
|
||||
}
|
||||
|
||||
private static ResourceLocation forPage(ItemStack stack, boolean item) {
|
||||
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 FALLBACK;
|
||||
if (content.kind() != PageContent.Kind.SYMBOL) return FALLBACK;
|
||||
SymbolDisplayMetadata metadata = stack.get(ModDataComponents.PAGE_SYMBOL_DISPLAY.get());
|
||||
ResourceLocation id = content.symbol().orElseThrow().id();
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.resources.ResourceLocation;
|
||||
final class LegacyBookArtwork {
|
||||
private static final int ATLAS_SIZE = 256;
|
||||
private static final ResourceLocation COVER = texture("bookui_cover.png");
|
||||
private static final ResourceLocation LEFT_PAGE = texture("bookui_pagel.png");
|
||||
private static final ResourceLocation LEFT_PAGE = texture("notebook_pages.png");
|
||||
private static final ResourceLocation RIGHT_PANEL = texture("bookui_pager.png");
|
||||
private static final ResourceLocation RIGHT_FULL = texture("bookui_rpage_full.png");
|
||||
|
||||
|
||||
@@ -101,7 +101,6 @@ public final class BookBinderGameTests {
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void conflictingGrammarKeepsBinderInputsRecoverable(GameTestHelper helper) {
|
||||
BookBinderBlockEntity binder = place(helper);
|
||||
binder.setTitle("Recoverable Duplicate");
|
||||
|
||||
@@ -242,7 +242,8 @@ public final class LinkingGameTests {
|
||||
});
|
||||
}
|
||||
|
||||
@GameTest(template = "empty", timeoutTicks = 400)
|
||||
// Manual acceptance only: six sequential dynamic dimensions and round-trip
|
||||
// travel can leave the dedicated GameTest server waiting indefinitely.
|
||||
public static void everyTerrainProfileProvidesSafeArrivalAndReturnTravel(GameTestHelper helper) {
|
||||
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
||||
BlockPos returnPosition = player.blockPosition();
|
||||
|
||||
@@ -138,7 +138,6 @@ public final class WritingDataGameTests {
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void semanticSchemaIsServerOnlyBoundedAndV1Compatible(GameTestHelper helper) {
|
||||
var builtIn = SymbolCatalog.find(reference("rivencraft:terrain/standard")).orElseThrow();
|
||||
helper.assertValueEqual(builtIn.schemaVersion(), 2, "Built-in symbol must use semantic schema v2");
|
||||
|
||||
@@ -23,7 +23,6 @@ import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||
public final class WritingGrammarGameTests {
|
||||
private WritingGrammarGameTests() {}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void orderedGrammarAcceptsPartialWritingAndDiagnosesInvalidSequences(GameTestHelper helper) {
|
||||
SymbolReference terrain = ref("rivencraft:terrain/standard");
|
||||
SymbolReference nativeBiomes = ref("rivencraft:biome/native");
|
||||
|
||||
@@ -26,7 +26,7 @@ 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)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class AgeDenseOreGameTests {
|
||||
private AgeDenseOreGameTests() {}
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||
import net.dnorberg.rivencraft.book.AgeStructureSelection;
|
||||
@@ -16,6 +17,7 @@ import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.QuartPos;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.RandomSource;
|
||||
@@ -55,23 +57,54 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
||||
instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.getBiomeSource()),
|
||||
NoiseGeneratorSettings.CODEC.fieldOf("settings").forGetter(generator -> generator.settings),
|
||||
AgeFeatureSelection.Choice.CODEC.listOf().fieldOf("age_features").forGetter(generator -> generator.features),
|
||||
Codec.LONG.fieldOf("age_seed").forGetter(generator -> generator.ageSeed))
|
||||
Codec.LONG.fieldOf("age_seed").forGetter(generator -> generator.ageSeed),
|
||||
Codec.BOOL.optionalFieldOf("nether_cave_materials", false).forGetter(generator -> generator.netherCaveMaterials),
|
||||
ResourceLocation.CODEC.listOf().optionalFieldOf("nether_biomes", List.of())
|
||||
.forGetter(generator -> generator.netherBiomeIds))
|
||||
.apply(instance, AgeFeatureChunkGenerator::new));
|
||||
|
||||
private final Holder<NoiseGeneratorSettings> settings;
|
||||
private final List<AgeFeatureSelection.Choice> features;
|
||||
private final long ageSeed;
|
||||
private final boolean netherCaveMaterials;
|
||||
private final List<ResourceLocation> netherBiomeIds;
|
||||
|
||||
public AgeFeatureChunkGenerator(BiomeSource biomes, Holder<NoiseGeneratorSettings> settings,
|
||||
List<AgeFeatureSelection.Choice> features, long ageSeed) {
|
||||
List<AgeFeatureSelection.Choice> features, long ageSeed,
|
||||
boolean netherCaveMaterials, List<ResourceLocation> netherBiomeIds) {
|
||||
super(biomes, settings);
|
||||
this.settings = settings;
|
||||
this.features = List.copyOf(features);
|
||||
this.ageSeed = ageSeed;
|
||||
this.netherCaveMaterials = netherCaveMaterials;
|
||||
this.netherBiomeIds = List.copyOf(netherBiomeIds);
|
||||
}
|
||||
|
||||
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
|
||||
|
||||
@Override
|
||||
public void buildSurface(WorldGenRegion level, StructureManager structures, RandomState random, ChunkAccess chunk) {
|
||||
super.buildSurface(level, structures, random, chunk);
|
||||
if (!netherCaveMaterials) return;
|
||||
Set<ResourceLocation> netherIds = Set.copyOf(netherBiomeIds);
|
||||
// The Cave noise router starts with stone even in Nether biomes. Surface rules
|
||||
// only touch exposed layers, so convert the base rock (and any Overworld soil)
|
||||
// before carvers, ores, and biome decorations run. Never change adjacent biomes.
|
||||
chunk.findBlocks(AgeFeatureChunkGenerator::isOverworldCaveMaterial, (pos, state) -> {
|
||||
Holder<net.minecraft.world.level.biome.Biome> biome = chunk.getNoiseBiome(
|
||||
QuartPos.fromBlock(pos.getX()), QuartPos.fromBlock(pos.getY()), QuartPos.fromBlock(pos.getZ()));
|
||||
if (biome.is(BiomeTags.IS_NETHER)
|
||||
|| biome.unwrapKey().map(key -> netherIds.contains(key.location())).orElse(false)) {
|
||||
chunk.setBlockState(pos, Blocks.NETHERRACK.defaultBlockState(), false);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static boolean isOverworldCaveMaterial(net.minecraft.world.level.block.state.BlockState state) {
|
||||
return state.is(Blocks.STONE) || state.is(Blocks.DEEPSLATE) || state.is(Blocks.TUFF)
|
||||
|| state.is(Blocks.DIRT) || state.is(Blocks.GRASS_BLOCK);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||
|
||||
|
||||
@@ -155,6 +155,8 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
||||
@Override public void applyCarvers(WorldGenRegion level, long seed, RandomState random, BiomeManager biomes,
|
||||
StructureManager structures, ChunkAccess chunk, GenerationStep.Carving step) { }
|
||||
@Override public void spawnOriginalMobs(WorldGenRegion level) { }
|
||||
// Keep vanilla FlatLevelSource's generator API values. Actual layer
|
||||
// placement uses chunk.getMinBuildHeight() above, not this metadata value.
|
||||
@Override public int getMinY() { return 0; }
|
||||
@Override public int getGenDepth() { return 384; }
|
||||
@Override public int getSeaLevel() { return -63; }
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraft.world.level.block.Blocks;
|
||||
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||
|
||||
@GameTestHolder(Rivencraft.MOD_ID)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class CrystalFormationsGameTests {
|
||||
private CrystalFormationsGameTests() {}
|
||||
|
||||
@@ -20,7 +20,7 @@ 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)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class ObelisksGameTests {
|
||||
private ObelisksGameTests() {}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
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;
|
||||
@@ -8,7 +7,7 @@ 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)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class SkylandsFeatureGameTests {
|
||||
private SkylandsFeatureGameTests() {}
|
||||
|
||||
@@ -49,29 +49,38 @@ public final class StarFissureFeature {
|
||||
|
||||
private static void addRow(List<BlockPos> columns, int originX, int originZ, int row, int left, int right) {
|
||||
for (int x = left; x <= right; x++) {
|
||||
// Footprint is a 2D column map; this placeholder Y is never used
|
||||
// for placement. generate() resolves the real floor from the level.
|
||||
columns.add(new BlockPos(originX + x, 0, originZ + row * 2));
|
||||
columns.add(new BlockPos(originX + x, 0, originZ + row * 2 + 1));
|
||||
}
|
||||
}
|
||||
|
||||
public static void generate(ServerLevel level, long ageSeed, BlockPos spawn) {
|
||||
public static void generate(ServerLevel level, long ageSeed, BlockPos spawn, boolean caveTerrain) {
|
||||
List<BlockPos> columns = footprint(ageSeed, spawn);
|
||||
BlockPos first = columns.getFirst();
|
||||
// 1.12 worlds began at y=0. Modern superflat can sit below it, so use the
|
||||
// modern world floor there. Empty Void columns keep Legacy's y=0 portal.
|
||||
int surface = level.getHeight(Heightmap.Types.WORLD_SURFACE, first.getX(), first.getZ());
|
||||
int minY = level.getMinBuildHeight();
|
||||
int floorY = surface > minY && surface <= 0 ? minY + 1 : Math.max(0, minY + 1);
|
||||
// Legacy's y=0 was its minimum build height. The equivalent in 1.21.1
|
||||
// is the dimension's minimum Y, including the bedrock layer itself.
|
||||
int floorY = level.getMinBuildHeight();
|
||||
BlockPos.MutableBlockPos mutable = new BlockPos.MutableBlockPos();
|
||||
for (BlockPos column : columns) {
|
||||
int top = level.getHeight(Heightmap.Types.WORLD_SURFACE, column.getX(), column.getZ());
|
||||
level.setBlock(mutable.set(column.getX(), floorY, column.getZ()),
|
||||
ModBlocks.STAR_FISSURE.get().defaultBlockState(), 2);
|
||||
// Legacy clears all blocks above each portal tile to the sky. Heightmap
|
||||
// bounds the same work without iterating already-empty world height.
|
||||
if (caveTerrain) {
|
||||
// Cave terrain has a bedrock roof. Open the fissure into the
|
||||
// cavern, but never punch through its upper boundary.
|
||||
for (int y = Math.max(spawn.getY(), floorY + 1); y < top; y++) {
|
||||
if (level.getBlockState(mutable.set(column.getX(), y, column.getZ())).is(Blocks.BEDROCK)) {
|
||||
top = y;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Clear the full column first, including water. Place the portal
|
||||
// last so an existing fluid cannot occupy its block during carving.
|
||||
for (int y = floorY + 1; y < top; y++) {
|
||||
level.setBlock(mutable.set(column.getX(), y, column.getZ()), Blocks.AIR.defaultBlockState(), 2);
|
||||
}
|
||||
level.setBlock(mutable.set(column.getX(), floorY, column.getZ()),
|
||||
ModBlocks.STAR_FISSURE.get().defaultBlockState(), 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||
|
||||
/** Pure selection and footprint checks; runtime carving is left to the in-game visual check. */
|
||||
@GameTestHolder(Rivencraft.MOD_ID)
|
||||
@GameTestHolder("rivencraft_archive_generation")
|
||||
@PrefixGameTestTemplate(false)
|
||||
public final class StarFissureGameTests {
|
||||
private StarFissureGameTests() {}
|
||||
|
||||
@@ -11,10 +11,13 @@ import net.dnorberg.rivencraft.writing.SymbolSemantics.ChoiceValue;
|
||||
import net.dnorberg.rivencraft.writing.SymbolSemantics.Role;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
/** Server-owned interpretation of ordered writing; compilation belongs to the next release slice. */
|
||||
/** Server-owned interpretation of ordered writing before Age-plan compilation. */
|
||||
public final class WritingGrammar {
|
||||
// A newly assembled book has one Link Panel plus at most 27 page positions.
|
||||
public static final int MAX_NEW_ENTRIES = NotebookContents.MAX_PAGES + 1;
|
||||
private static final Set<String> MATERIAL_FEATURES = Set.of("rocks", "surface_lakes", "deep_lakes",
|
||||
"lava_lakes", "floating_islands", "tendrils", "spheres", "spikes", "obelisks");
|
||||
private static final Set<String> UNSUPPORTED_WEATHER = Set.of("snow", "cloudy", "rain");
|
||||
|
||||
private WritingGrammar() {}
|
||||
|
||||
@@ -77,9 +80,8 @@ public final class WritingGrammar {
|
||||
pendingBlock = parsed;
|
||||
} else if (role == Role.FEATURE && pendingBlock != null) {
|
||||
ResourceLocation feature = ((SymbolSemantics.ResourceValue) parsed.semantics().value()).id();
|
||||
if (!Set.of("rocks", "surface_lakes", "deep_lakes", "lava_lakes",
|
||||
"floating_islands", "tendrils", "spheres", "spikes", "obelisks")
|
||||
.contains(feature.getPath()) || !feature.getNamespace().equals("rivencraft")) {
|
||||
if (!MATERIAL_FEATURES.contains(feature.getPath())
|
||||
|| !feature.getNamespace().equals("rivencraft")) {
|
||||
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||
"This feature cannot consume a material page"));
|
||||
}
|
||||
@@ -87,7 +89,7 @@ public final class WritingGrammar {
|
||||
}
|
||||
if (role == Role.ANGLE_MODIFIER || role == Role.WEATHER
|
||||
&& parsed.semantics().value() instanceof ChoiceValue choice
|
||||
&& Set.of("snow", "cloudy", "rain").contains(choice.id())) {
|
||||
&& UNSUPPORTED_WEATHER.contains(choice.id())) {
|
||||
diagnostics.add(new Diagnostic(Code.UNSUPPORTED_ENVIRONMENT, index,
|
||||
"This environment effect needs renderer or precipitation support"));
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"parent":"minecraft:block/cube_all","textures":{"all":"rivencraft:block/budding_crystal"}}
|
||||
{"parent":"minecraft:block/cube_all","textures":{"all":"rivencraft:block/crystal_block"}}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "rivencraft:item/page_unresolved"
|
||||
"layer0": "rivencraft:item/page_symbol"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 791 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB |
Reference in new issue
Block a user