Public Access
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bb88bad8a6 | ||
|
|
916755e810 | ||
|
|
6452d2c324 | ||
|
|
4541cbbba5 |
No files matched your search
@@ -21,11 +21,23 @@ The spent vial returns a glass bottle. Server owners can adjust the symbol-copy
|
||||
and link-panel costs in the `writing` section of `rivencraft-server.toml`.
|
||||
The Ink Mixer now offers a Legacy-style station for producing Link Panels:
|
||||
insert paper and Ink Vials, then take a Link Panel from the result slot. Each
|
||||
vial fills its 16-unit basin and returns a glass bottle; no server tick is
|
||||
needed. The earlier paper-in-one-hand method remains available. Ink Mixer
|
||||
vial fills its 16-unit basin and returns a glass bottle; taking one Link Panel
|
||||
uses the full vial. No server tick is needed. The earlier paper-in-one-hand
|
||||
method still uses the configurable link-panel ink cost. Ink Mixer
|
||||
additives can roll Disarm, Maintain Momentum, and Intra Linking onto a Link
|
||||
Panel. Descriptive Books retain Disarm and Momentum; Intra Linking is only
|
||||
meaningful for same-dimension travel with a Linking Book.
|
||||
TerraBlender 1.21.1 integration is optional: registered modded biomes receive
|
||||
Biome pages, with cave and Nether biomes in a separate Cave Biome creative tab.
|
||||
TerraBlender Overworld/Nether regions extend compatible Age
|
||||
biome pools. See [the compatibility matrix](docs/TERRABLENDER_COMPATIBILITY.md)
|
||||
for supported versions and in-game verification.
|
||||
Serene Seasons 1.21.1 can maintain separate season progress in an Age dimension.
|
||||
Rivencraft automatically whitelists loaded Ages without a restart when Serene is installed;
|
||||
season pages can instead opt an Age out or hold it in one season.
|
||||
See [the optional compatibility guide](docs/SERENE_SEASONS_COMPATIBILITY.md)
|
||||
for the supported manual configuration and current limits; Rivencraft does not
|
||||
require Serene Seasons or GlitchCore.
|
||||
The Writing Desk can copy a selected written page from its collection tabs.
|
||||
The Writing Desk is now craftable from planks, a glass bottle, and a feather.
|
||||
It occupies two adjacent blocks, with one shared inventory; loaded paper and
|
||||
|
||||
@@ -91,6 +91,11 @@ repositories {
|
||||
content { includeGroup 'curse.maven' }
|
||||
}
|
||||
maven { url = 'https://maven.bai.lol' }
|
||||
maven {
|
||||
name = 'TerraBlenderMaven'
|
||||
url = 'https://maven.minecraftforge.net/releases/'
|
||||
content { includeGroup 'com.github.glitchfiend' }
|
||||
}
|
||||
maven {
|
||||
url = 'https://api.modrinth.com/maven'
|
||||
content { includeGroup 'maven.modrinth' }
|
||||
@@ -238,6 +243,19 @@ dependencies {
|
||||
// Keep them on the compile classpath without forcing either mod at runtime.
|
||||
compileOnly "net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}"
|
||||
compileOnly "maven.modrinth:immersive-portals-neoforge:${immersive_portals_version}"
|
||||
// TerraBlender's region API is only used by the guarded compat adapter.
|
||||
compileOnly "com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}"
|
||||
if (providers.gradleProperty('withTerraBlender').map { it.toBoolean() }.orElse(false).get()) {
|
||||
localRuntime "com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}"
|
||||
}
|
||||
// The optional compatibility adapter uses Serene's dimension config API.
|
||||
// Neither mod is a required dependency of the published Rivencraft jar.
|
||||
compileOnly "maven.modrinth:e0bNACJD:${serene_seasons_version_id}"
|
||||
compileOnly "maven.modrinth:s3dmwKy5:${glitchcore_version_id}"
|
||||
if (providers.gradleProperty('withSereneSeasons').map { it.toBoolean() }.orElse(false).get()) {
|
||||
localRuntime "maven.modrinth:e0bNACJD:${serene_seasons_version_id}"
|
||||
localRuntime "maven.modrinth:s3dmwKy5:${glitchcore_version_id}"
|
||||
}
|
||||
implementation "curse.maven:dynamicdimension-ar-edition-1469680:${dynamic_dimensions_file_id}"
|
||||
implementation "lol.bai:badpackets:neo-${badpackets_version}"
|
||||
// JEI integration is isolated in its plugin and absent from the published runtime dependencies.
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 57 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 67 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB |
+42
-2
@@ -40,6 +40,39 @@ profiles, not claims that Legacy had identically named terrain symbols.
|
||||
Every family retains a safe cobblestone arrival platform. An omitted terrain
|
||||
page still uses the deterministic seed-selected profile.
|
||||
|
||||
The separate **Floating Islands** feature page adds rare high-altitude island
|
||||
clusters above Standard, Amplified, Sky Islands, Flat, or Void terrain; it does
|
||||
not replace the terrain page. The feature is seeded by the Age and saved with the written
|
||||
plan, so revisiting an Age recreates the same islands. Without a preceding
|
||||
Block page, the Age seed chooses one valid full-collision block from the Block
|
||||
Pages pool for the island body. A full-block material page immediately before
|
||||
Floating Islands overrides that choice. Ordinary surface biomes still get
|
||||
dirt/grass top layers; Nether and End biomes use the chosen block throughout.
|
||||
The feature is additive even on Sky Islands terrain,
|
||||
which already forms its own islands. Cave terrain rejects it. A page-free random
|
||||
Age may also roll Floating Islands as one of its material features.
|
||||
|
||||
An unpaired Block or Fluid page chooses a compatible feature from the Age seed:
|
||||
full blocks can become Rocks or Floating Islands; source fluids can become one
|
||||
of the lake features. Flat and Void terrain can only use Floating Islands from
|
||||
this pool, while Cave terrain has no compatible material feature. A page-free
|
||||
random Age rolls zero, one, or two distinct compatible features, choosing each
|
||||
material from the Block or Fluid Pages pool. The choices are saved on the Age
|
||||
definition, so opening the Age again does not reroll them.
|
||||
Repeated Block/Fluid and Feature pages remain separate entries in authored
|
||||
writing. Each unpaired material gets its own compatible feature, and repeated
|
||||
decorations use separate placement rolls. Repeated unmodified feature pages
|
||||
choose different compatible materials until their material pool is exhausted.
|
||||
|
||||
For an in-game visual check, bind Descriptive Books with a Link Panel,
|
||||
one of Standard, Amplified, Sky Islands, Flat, or Void terrain, and the Floating Islands
|
||||
feature page in that order. Fly through each Age at roughly Y=170–220 and
|
||||
verify the elevated clusters appear above its unchanged base terrain. Reopen
|
||||
the same Age to check that island positions stay fixed. Islands should be less
|
||||
common than in the first test build (one source chunk in 128 instead of 64).
|
||||
Sky Islands should retain its terrain islands and gain occasional additional
|
||||
feature islands. Try Cave terrain too; the Binder should reject that pairing.
|
||||
|
||||
## Written biome selection (generation version 16)
|
||||
|
||||
Biome pages follow the terrain page and precede the distribution-control page
|
||||
@@ -72,8 +105,15 @@ also accepted. Other cave/biome pairings are diagnosed and blocked for now.
|
||||
Milestone 6 instability should allow such illegal combinations as unstable
|
||||
Ages, without silently treating them as ordinary cave generation. Flat terrain
|
||||
uses Overworld choices when a distribution is authored; its Native default
|
||||
remains Plains. Void terrain defaults to The Void and needs additional authored
|
||||
biomes for a multi-biome distribution.
|
||||
remains Plains. Void terrain defaults to The Void when no biome page is written,
|
||||
but accepts authored biome pages. One authored biome uses Single distribution
|
||||
when no controller is written. An explicit multi-biome distribution needs enough
|
||||
authored biomes; The Void is not silently added to fill missing positions. These
|
||||
biome regions exist even without blocks or a Floating Islands page, so biome-
|
||||
dependent weather and optional season behavior can still vary there. To check
|
||||
this in-game, bind Void terrain with a Desert Biome page and no feature page:
|
||||
the Age should be empty while F3 reports Desert. A Void book without biome
|
||||
pages should instead report The Void.
|
||||
|
||||
The resolved list of biome IDs, their order/repetitions, and distribution are
|
||||
frozen into the Age plan. A removed biome ID emits a warning and uses an
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
# Descriptive Book presentation (Milestone 5, issue #40)
|
||||
|
||||
The Legacy-style front spread has the Age name and author on the left and the destination panel on the right. The reference screenshots are `dev images/Pasted image.png` (front spread) and `dev images/Pasted image (2).png` (single-symbol spread). An authored book shows one full-size composed symbol on each turned right page, in the order stored in `BOOK_WRITING`; the former plain-text name and symbol ID are not shown for resolved pages. The last authored symbol is the last normal page, not a blank trailing page.
|
||||
|
||||
The Binder records the taking player's name on the finished book; direct Age binding also records the binding player. Older books without this component display `Unknown author` rather than attributing them to whoever happens to open them. Link-Panel-only and older page-free books retain their random-Age glyph details and destination preview. On authored books, hovering the front-page name exposes the existing trait summary without filling the left page with text.
|
||||
|
||||
The server resolves symbol display metadata from its current catalog. A missing data-pack symbol draws the unresolved page artwork and its original ID. Descriptive Books do not show writing notes or grammar warning markers; grammar validation remains in the Binder and on the server when an Age is created. Opening a book never changes its persisted Age plan. Symbol pages use the same bounded, runtime glyph composition as Page items and do not require Create, Ponder, or Immersive Portals.
|
||||
|
||||
## Manual visual and behavior checks
|
||||
|
||||
1. Bind a Descriptive Book with two distinct symbol pages. Open it: the front spread shows its Age name, your player name, and the link panel. Turn twice and confirm exactly one large symbol on each right page, in authored order, with no plain-text symbol description or blank trailing page.
|
||||
2. Hover the front-page name to confirm the trait summary remains accessible. Click the link panel to confirm normal travel; repeat from a lectern to check the name, panel, and page-turn layout.
|
||||
3. Open a Link-Panel-only book and confirm its existing random-Age details and destination preview still appear.
|
||||
4. In a copy of a test world, remove a data pack that supplied one authored symbol. Reopen the book: its original symbol ID should remain readable beside the unresolved artwork, with no writing-notes pages. Restore the pack and verify the page artwork returns without changing the saved Age.
|
||||
|
||||
`./gradlew build --offline` verifies compilation and jar assembly. The visual and data-pack-removal checks require an in-game client.
|
||||
+6
-1
@@ -47,6 +47,11 @@ 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.
|
||||
|
||||
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
|
||||
`docs/SERENE_SEASONS_COMPATIBILITY.md` instead.
|
||||
|
||||
## Manual Ink Mixer modifier check (Milestone 5, issue #36)
|
||||
|
||||
With optional JEI installed, search for the Ink Mixer category. It should show
|
||||
@@ -62,7 +67,7 @@ right-click the ink basin once; one Gunpowder should be consumed, and hovering
|
||||
the basin should show a 20% Disarm chance. Black Dye, Clay Balls, and an
|
||||
unrelated item such as Stone should remain untouched.
|
||||
Closing and reopening the mixer should retain the chance. Taking a Link Panel
|
||||
should consume one paper and the configured ink cost, clear the current
|
||||
should consume one paper and one full Ink Vial, clear the current
|
||||
mixture, and possibly give a panel with Disarm on its tooltip. Repeat until
|
||||
a property-bearing panel appears, craft it with leather, and confirm the
|
||||
unwritten Linking Book preserves the property tooltip. After binding it,
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
# Serene Seasons 1.21.1: automatic Age whitelist (issue #38)
|
||||
|
||||
Serene Seasons has a [NeoForge 1.21.1 release, 10.1.0.8](https://modrinth.com/mod/serene-seasons/version/B6nTjh4b), with GlitchCore required ([2.1.0.2 for NeoForge 1.21.1](https://modrinth.com/mod/glitchcore/version/S2TfWrZR)). Its [1.21.1 source](https://github.com/Glitchfiend/SereneSeasons/tree/1.21.1) shows that each `ServerLevel` gets its own `SeasonSavedData` in that dimension's data storage. Season progress is keyed to the level's day time and saved separately, so an enabled Rivencraft Age can have a season independent of the Overworld and other Ages. The public [`SeasonHelper`](https://github.com/Glitchfiend/SereneSeasons/blob/1.21.1/common/src/main/java/sereneseasons/api/season/SeasonHelper.java) can read a level's current season; it does not provide a method to register a dimension or set its season.
|
||||
|
||||
The activation point is Serene Seasons' [`dimension_settings.whitelisted_dimensions`](https://github.com/Glitchfiend/SereneSeasons/blob/1.21.1/common/src/main/java/sereneseasons/config/SeasonsConfig.java). Its default contains only `minecraft:overworld`. On the server, GlitchCore [reloads and synchronizes](https://github.com/Glitchfiend/GlitchCore/blob/1.21.1/common/src/main/java/glitchcore/config/ConfigSync.java) this config when a player connects. Rivencraft adds successfully loaded Age IDs to Serene's in-memory list **and** its saved config so later logins retain them. Rivencraft also sends each newly added ID to players already connected. No restart is needed for a newly generated Age.
|
||||
|
||||
Serene Seasons 10.1.0.8 has no public dynamic-dimension registration hook, so the adapter uses its config object and GlitchCore's config writer directly. This is version-sensitive: verify this path when upgrading either mod. Rivencraft checks that Serene is installed before loading the adapter; neither dependency is required to run Rivencraft.
|
||||
|
||||
## Real-client test path
|
||||
|
||||
1. Install matching NeoForge 1.21.1 builds of Serene Seasons and GlitchCore on the server and client. Keep Rivencraft's `Weather: Normal` for this first test, so its own fixed/accelerated weather controller does not compete with seasonal weather timing.
|
||||
2. While the client stays connected, create an Age. Run `/rivencraft age list` as an operator and note its ID (for example `rivencraft:age/winter_garden`). Confirm this ID appeared in `config/sereneseasons/seasons.toml` under `dimension_settings.whitelisted_dimensions`, with existing entries intact.
|
||||
3. Without restarting or reconnecting, travel into the Age and check `/season get`; change its season with `/season set mid_winter` and check the Overworld and another Age separately.
|
||||
4. Reconnect another client and confirm it receives the same whitelist. Restart the server and confirm both the whitelist entry and the Age's season persisted.
|
||||
5. Build separate Ages with No Seasons, Seasons, and each Eternal page. Confirm No Seasons stays absent from Serene's whitelist, Seasons advances, and each Eternal Age remains in its named mid-season across several in-game days, a reconnect, and a server restart. Verify the Overworld still advances normally. The Eternal page should not stop the Age's sun or moon. With Serene removed, No Seasons should still bind, but the other five pages should refuse to bind with a clear message.
|
||||
6. With Serene installed and `auto_whitelist_ages=true`, create several new Link-Panel-only Ages and Ages with symbols but no season page. `/rivencraft age list` shows each saved random `season:` choice. Check that No Seasons is absent from Serene's whitelist, Seasons advances, and each Eternal choice holds its season. Reopen the world and confirm the listed choices do not change. Without Serene, create another unpaged Age and confirm the list has no saved season choice for it.
|
||||
|
||||
For a local development run, `./gradlew runClient -PwithSereneSeasons=true` adds these two mods only to that run. The published Rivencraft jar does not include or require them.
|
||||
|
||||
The server config `rivencraft-server.toml` has `serene_seasons.auto_whitelist_ages=true` by default. Set it to `false` to manage Serene's whitelist manually. Disabling it does not delete Age IDs previously added to Serene's config. On startup, Rivencraft also enrolls existing Ages that successfully load, so installing Serene after creating Ages does not require editing IDs one by one.
|
||||
|
||||
## Seasonal pages
|
||||
|
||||
An Age may specify one of six mutually exclusive seasonal modes:
|
||||
|
||||
| Page | Intended Age behavior |
|
||||
| --- | --- |
|
||||
| No Seasons | Opt this Age out of seasonal effects and progression. |
|
||||
| Seasons | Run the optional season mod's normal cycle, independently of the Overworld. |
|
||||
| Eternal Winter | Hold this Age in winter. |
|
||||
| Eternal Summer | Hold this Age in summer. |
|
||||
| Eternal Fall | Hold this Age in fall/autumn. |
|
||||
| Eternal Spring | Hold this Age in spring. |
|
||||
|
||||
The six pages are available in the Season creative tab and the same page feed used by JEI. The writing grammar accepts at most one seasonal page, and its choice is saved in the Age plan. No Seasons removes that Age's ID from Serene's whitelist, even if it was previously enrolled; the other explicit pages enroll it regardless of the automatic-enrollment setting. When a **new** Age has no season page and Serene Seasons is installed, Rivencraft chooses one of these six modes from the Age seed and saves that choice in the Age definition. A Link-Panel-only random Age is included. The choice does not change on reload or when the spawn moves. If Serene is absent at creation, no random seasonal modifier is assigned. Older Ages without a stored choice keep their previous normal-cycle behavior. The server's `auto_whitelist_ages=false` setting still prevents implicit (unpaged) modes other than No Seasons from enrolling the Age; explicit seasonal pages override it. If Serene Seasons is absent, No Seasons remains valid, but the other five pages reject **new** Age creation with a missing-dependency message rather than silently doing nothing. Existing Ages remain loadable with their saved pages, though their season effects are inactive until a supported season mod returns. Ecliptic Seasons integration was closed as unsupported for dynamic Ages in issue #39.
|
||||
|
||||
For an eternal mode, Rivencraft sets Serene's per-Age saved clock to the midpoint of the chosen season and resets it before it leaves that mid-season. Clients receive Serene's normal season sync. This does not freeze the Age's day/night cycle or change the Overworld's season. Eternal Winter does not guarantee snow in every biome.
|
||||
|
||||
## Current limits
|
||||
|
||||
- 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.
|
||||
|
||||
## 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.
|
||||
@@ -0,0 +1,63 @@
|
||||
# Optional TerraBlender biome compatibility (Milestone 5, issue #37)
|
||||
|
||||
Rivencraft targets TerraBlender NeoForge **1.21.1-4.1.0.8**. The official
|
||||
[1.21.1 release](https://modrinth.com/mod/terrablender/version/4.1.0.8) and
|
||||
[region API](https://github.com/Glitchfiend/TerraBlender/blob/1.21.1/Common/src/main/java/terrablender/api/Regions.java)
|
||||
are available for this Minecraft version. TerraBlender is `compileOnly` and
|
||||
is **not** required by the published Rivencraft jar. For a local development
|
||||
run with TerraBlender, use `-PwithTerraBlender=true`.
|
||||
|
||||
TerraBlender's API registers Overworld and Nether biome *regions*; it does not
|
||||
register arbitrary Rivencraft Age dimensions. Rivencraft therefore keeps its
|
||||
own deterministic Age biome sources and uses a guarded adapter to read the
|
||||
registered region biome IDs. Only biomes still present in Minecraft's biome
|
||||
registry are accepted. TerraBlender Overworld region biomes extend the pool
|
||||
for standard, flat, and sky-island Ages; Nether region biomes extend Cave Age
|
||||
pools and are valid authored Cave biome pages. Vanilla Nether-tagged biomes
|
||||
are also valid Cave biomes. This is generic: no Biomes O' Plenty IDs are
|
||||
hard-coded.
|
||||
|
||||
Every registered biome receives a generated page in Rivencraft's Biome or Cave
|
||||
Biome creative tab, and in JEI when JEI is installed. Cave-tagged, Nether-tagged,
|
||||
and TerraBlender Nether-region biomes go in the Cave Biome tab. Existing vanilla page IDs such as
|
||||
`rivencraft:biome/desert` are unchanged; modded biome IDs include their
|
||||
namespace, for example `rivencraft:biome/example/orchard` for a biome named
|
||||
`example:orchard`.
|
||||
Authoring still validates the exact biome registry key. New Age plans freeze
|
||||
the selected biome IDs, distribution, and seed, so a reload with the same mods
|
||||
retains the result. If a modded biome later disappears, the Age loader warns
|
||||
and uses an eligible fallback for that load without rewriting its frozen plan.
|
||||
Restore the mod to recover the authored biome. Do not remove biome mods from
|
||||
an existing play world without a backup.
|
||||
|
||||
## Compatibility matrix
|
||||
|
||||
| Setup | Expected result | Validation |
|
||||
| --- | --- | --- |
|
||||
| Rivencraft without TerraBlender | Vanilla biome pages and Age generation remain functional; no TerraBlender classes load on the core path. | Default GameTest server and build. |
|
||||
| Rivencraft with TerraBlender 4.1.0.8, no biome addon | Same baseline pool; default TerraBlender regions add no modded biome IDs. | GameTest server with `-PwithTerraBlender=true`. |
|
||||
| Rivencraft + TerraBlender + Biomes O' Plenty 1.21.1 | BOP registry biomes appear as distinct Biome pages, with Nether-region pages in the Cave Biome tab. Its Overworld regions can enter composed standard/sky-island Age pools; its Nether regions can enter Cave Age pools. | In-game check below; this combination is not bundled in automated tests. |
|
||||
| TerraBlender present but its region API cannot be read | Log one warning and use Rivencraft's normal biome pool. | Guarded adapter fallback; intentionally not forced by GameTest. |
|
||||
|
||||
## In-game check requested for Biomes O' Plenty
|
||||
|
||||
Use a **new test world** with compatible NeoForge 1.21.1 builds of
|
||||
TerraBlender and Biomes O' Plenty installed on both sides.
|
||||
|
||||
1. In the Rivencraft Biome and Cave Biome Pages creative tabs (and JEI, if installed), find
|
||||
at least one BOP Overworld biome and one BOP Nether biome, respectively. The page tooltip
|
||||
should identify the biome and not show an unresolved symbol.
|
||||
2. Bind a Descriptive Book with a Link Panel, Standard Terrain, a two-biome
|
||||
distribution page, and two different BOP Overworld biome pages. Travel to
|
||||
the Age and confirm both named biomes can occur. Reopen the same world and
|
||||
confirm the Age still uses the same authored biome pool.
|
||||
3. Bind a second book using Cave Terrain and a BOP Nether biome page. The
|
||||
Binder must accept the page, and the resulting Cave Age must use the
|
||||
selected Nether biome rather than rejecting it as non-cave.
|
||||
4. Separately, run Rivencraft without TerraBlender and confirm a Link-Panel-
|
||||
only random Age can still be created and entered. Do not reuse the BOP test
|
||||
world for this absence check.
|
||||
|
||||
The previous broad registry-enumeration GameTest stalled in the test server,
|
||||
so the BOP-specific and client-side checks are deliberately handed off for
|
||||
manual testing instead of retaining that stalled test.
|
||||
+4
-1
@@ -36,8 +36,11 @@ 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.7.4
|
||||
mod_version=0.4.11.7
|
||||
immersive_portals_version=6.0.7
|
||||
terrablender_version=4.1.0.8
|
||||
serene_seasons_version_id=B6nTjh4b
|
||||
glitchcore_version_id=S2TfWrZR
|
||||
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
||||
# This should match the base package used for the mod sources.
|
||||
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
|
||||
@@ -18,6 +18,7 @@ import net.dnorberg.rivencraft.command.RivencraftCommands;
|
||||
import net.dnorberg.rivencraft.network.ModNetworking;
|
||||
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
||||
import net.dnorberg.rivencraft.config.RivencraftClientConfig;
|
||||
import net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility;
|
||||
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
||||
import net.dnorberg.rivencraft.book.AgeWeatherService;
|
||||
import net.dnorberg.rivencraft.book.AgeRuntimeProfiles;
|
||||
@@ -51,6 +52,7 @@ public final class Rivencraft {
|
||||
ModCreativeTabs.register(modEventBus);
|
||||
NeoForge.EVENT_BUS.addListener(BookStandConversionHandler::onRightClickBlock);
|
||||
NeoForge.EVENT_BUS.addListener(AgeWeatherService::onLevelTickPost);
|
||||
NeoForge.EVENT_BUS.addListener(SereneSeasonsCompatibility::onLevelTickPost);
|
||||
NeoForge.EVENT_BUS.addListener(AgeCelestialAngleSync::onPlayerLoggedIn);
|
||||
NeoForge.EVENT_BUS.addListener(AgeCelestialAngleSync::onPlayerChangedDimension);
|
||||
NeoForge.EVENT_BUS.addListener(AgeLifecycleEvents::onPlayerLoggedOut);
|
||||
|
||||
@@ -25,7 +25,6 @@ import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
@@ -163,8 +162,8 @@ public final class BookBinderBlockEntity extends BlockEntity implements Containe
|
||||
if (holder.isEmpty()) {
|
||||
diagnostics.add(new WritingGrammar.Diagnostic(WritingGrammar.Code.UNKNOWN_BIOME,
|
||||
symbol.index(), "Restore biome " + id + " or remove this page"));
|
||||
} else if (cave && !holder.orElseThrow().is(AgeBiomeSelection.CAVE_BIOMES)
|
||||
&& !holder.orElseThrow().is(BiomeTags.IS_NETHER)) {
|
||||
} else if (cave && !AgeBiomeSelection.isCaveBiome(level.registryAccess(),
|
||||
holder.orElseThrow())) {
|
||||
diagnostics.add(new WritingGrammar.Diagnostic(WritingGrammar.Code.UNSUPPORTED_BIOME,
|
||||
symbol.index(), "Cave Ages require cave or Nether biomes; remove " + id));
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import net.dnorberg.rivencraft.writing.InkModifierIngredients;
|
||||
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.NonNullList;
|
||||
@@ -127,14 +126,13 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
||||
|
||||
public boolean canCreateLinkPanel() {
|
||||
if (!items.get(PAPER).is(Items.PAPER)) return false;
|
||||
int cost = WritingInkService.linkPanelCost();
|
||||
return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, cost);
|
||||
return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, InkVialItem.CAPACITY);
|
||||
}
|
||||
|
||||
/** Commit inputs only when a virtual output is actually taken. */
|
||||
public boolean consumeLinkPanelMaterials() {
|
||||
if (!canCreateLinkPanel()) return false;
|
||||
int cost = WritingInkService.linkPanelCost();
|
||||
int cost = InkVialItem.CAPACITY;
|
||||
if (inkRemaining < cost) {
|
||||
inkRemaining += InkVialExchange.exchange(items, INK, BOTTLES);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||
import net.minecraft.core.Holder;
|
||||
@@ -47,7 +48,8 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
distribution = AgeTraits.BiomeDistribution.SINGLE;
|
||||
}
|
||||
if (controller.isEmpty() && !authored.isEmpty()) {
|
||||
if (distribution == AgeTraits.BiomeDistribution.NATIVE
|
||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID
|
||||
|| distribution == AgeTraits.BiomeDistribution.NATIVE
|
||||
|| (distribution == AgeTraits.BiomeDistribution.SINGLE && authored.size() > 1)) {
|
||||
distribution = authored.size() == 1 ? AgeTraits.BiomeDistribution.SINGLE
|
||||
: authored.size() == 2 ? AgeTraits.BiomeDistribution.TILED
|
||||
@@ -59,9 +61,10 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
for (ResourceLocation id : authored) {
|
||||
Holder.Reference<Biome> holder = registry.get(ResourceKey.create(Registries.BIOME, id))
|
||||
.orElseThrow(() -> new IllegalArgumentException("Unknown biome " + id + "; restore its data pack or remove its page"));
|
||||
if (cave && !holder.is(CAVE_BIOMES) && !holder.is(BiomeTags.IS_NETHER)) {
|
||||
if (cave && !isCaveBiome(registries, holder)) {
|
||||
throw new IllegalArgumentException("Biome " + id
|
||||
+ " is not a cave or Nether biome; use #rivencraft:cave_biomes or #minecraft:is_nether");
|
||||
+ " is not a cave or Nether biome; use #rivencraft:cave_biomes, #minecraft:is_nether,"
|
||||
+ " or a TerraBlender Nether region");
|
||||
}
|
||||
}
|
||||
List<ResourceLocation> availableBiomes = eligible(registries, profile);
|
||||
@@ -69,22 +72,25 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
if (distribution == AgeTraits.BiomeDistribution.NATIVE) {
|
||||
if (!authored.isEmpty()) throw new IllegalArgumentException("Native biome distribution cannot use biome pages");
|
||||
return new AgeBiomeSelection(distribution, profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
|
||||
? List.of(ResourceLocation.withDefaultNamespace("plains")) : availableBiomes);
|
||||
? List.of(ResourceLocation.withDefaultNamespace("plains"))
|
||||
: isCave(profile) ? availableBiomes : presetBiomes(registries, profile));
|
||||
}
|
||||
List<ResourceLocation> selected = new ArrayList<>(authored);
|
||||
Set<ResourceLocation> distinct = new LinkedHashSet<>(selected);
|
||||
int minimum = minimum(distribution);
|
||||
int target = minimum;
|
||||
if (authored.isEmpty()) {
|
||||
// The terrain's available pool is the upper bound. For Cave terrain,
|
||||
// eligible() returns the cave tag; other terrains use their preset.
|
||||
// The terrain's available pool is the upper bound, including any
|
||||
// compatible TerraBlender region biomes present at creation time.
|
||||
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);
|
||||
}
|
||||
}
|
||||
List<ResourceLocation> filler = new ArrayList<>(availableBiomes);
|
||||
// An authored Void Age must not acquire The Void as an unrequested second biome.
|
||||
List<ResourceLocation> filler = profile.terrain() == AgeRuntimeProfile.Terrain.VOID && !authored.isEmpty()
|
||||
? new ArrayList<>() : new ArrayList<>(availableBiomes);
|
||||
java.util.Collections.shuffle(filler, new Random(seed ^ 0x42494F4D45504F4FL));
|
||||
for (ResourceLocation id : filler) {
|
||||
if (distinct.size() >= target) break;
|
||||
@@ -102,14 +108,26 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
if (isCave(profile)) {
|
||||
List<ResourceLocation> tagged = registry.listElements().filter(holder -> holder.is(CAVE_BIOMES))
|
||||
.map(holder -> holder.key().location()).sorted().toList();
|
||||
if (!tagged.isEmpty()) return tagged;
|
||||
return List.of("minecraft:deep_dark", "minecraft:dripstone_caves", "minecraft:lush_caves")
|
||||
List<ResourceLocation> vanilla = !tagged.isEmpty() ? tagged : List.of("minecraft:deep_dark", "minecraft:dripstone_caves", "minecraft:lush_caves")
|
||||
.stream().map(ResourceLocation::parse)
|
||||
.filter(id -> registry.get(ResourceKey.create(Registries.BIOME, id)).isPresent()).toList();
|
||||
List<ResourceLocation> nether = registry.listElements().filter(holder -> holder.is(BiomeTags.IS_NETHER))
|
||||
.map(holder -> holder.key().location()).toList();
|
||||
return merge(merge(vanilla, nether), TerraBlenderBiomes.nether(registries));
|
||||
}
|
||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
|
||||
return List.of(ResourceLocation.withDefaultNamespace("the_void"));
|
||||
}
|
||||
ResourceLocation preset = profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
|
||||
? ResourceLocation.withDefaultNamespace("overworld") : profile.biomePreset();
|
||||
List<ResourceLocation> nativeBiomes = presetBiomes(registries, profile);
|
||||
return merge(nativeBiomes, preset.equals(ResourceLocation.withDefaultNamespace("nether"))
|
||||
? TerraBlenderBiomes.nether(registries) : TerraBlenderBiomes.overworld(registries));
|
||||
}
|
||||
|
||||
private static List<ResourceLocation> presetBiomes(RegistryAccess registries, AgeRuntimeProfile profile) {
|
||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
|
||||
return List.of(ResourceLocation.withDefaultNamespace("the_void"));
|
||||
ResourceLocation preset = profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
|
||||
? ResourceLocation.withDefaultNamespace("overworld") : profile.biomePreset();
|
||||
var parameters = registries.lookupOrThrow(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST)
|
||||
@@ -119,6 +137,15 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
||||
.sorted(Comparator.naturalOrder()).toList();
|
||||
}
|
||||
|
||||
public static boolean isCaveBiome(RegistryAccess registries, Holder.Reference<Biome> holder) {
|
||||
return holder.is(CAVE_BIOMES) || holder.is(BiomeTags.IS_NETHER)
|
||||
|| TerraBlenderBiomes.nether(registries).contains(holder.key().location());
|
||||
}
|
||||
|
||||
private static List<ResourceLocation> merge(List<ResourceLocation> vanilla, List<ResourceLocation> additions) {
|
||||
return java.util.stream.Stream.concat(vanilla.stream(), additions.stream()).distinct().sorted().toList();
|
||||
}
|
||||
|
||||
public static boolean isCave(AgeRuntimeProfile profile) {
|
||||
return profile.terrain() == AgeRuntimeProfile.Terrain.NOISE
|
||||
&& profile.noiseSettings().equals(ResourceLocation.withDefaultNamespace("caves"));
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/** Immutable, server-owned generation definition for one Age. */
|
||||
public record AgeDefinition(
|
||||
@@ -17,7 +19,9 @@ public record AgeDefinition(
|
||||
ResourceLocation dimensionId,
|
||||
BlockPos spawn,
|
||||
AgeTraits traits,
|
||||
AgeGenerationPlan plan
|
||||
AgeGenerationPlan plan,
|
||||
@Nullable AgeSeasonMode seasonMode,
|
||||
List<AgeFeatureSelection.Choice> randomFeatures
|
||||
) {
|
||||
public static final ResourceLocation RANDOM_VANILLA_PROFILE = ResourceLocation.fromNamespaceAndPath(
|
||||
Rivencraft.MOD_ID, "random_vanilla"
|
||||
@@ -30,6 +34,10 @@ public record AgeDefinition(
|
||||
Objects.requireNonNull(generationProfile, "generationProfile");
|
||||
Objects.requireNonNull(dimensionId, "dimensionId");
|
||||
Objects.requireNonNull(traits, "traits");
|
||||
randomFeatures = List.copyOf(randomFeatures);
|
||||
if (plan != null && !randomFeatures.isEmpty()) {
|
||||
throw new IllegalArgumentException("Authored Ages cannot also have random features");
|
||||
}
|
||||
if (plan != null && plan.ageSeed() != seed) {
|
||||
throw new IllegalArgumentException("Age plan seed does not match its Age definition");
|
||||
}
|
||||
@@ -39,7 +47,22 @@ public record AgeDefinition(
|
||||
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||
BlockPos spawn, AgeTraits traits) {
|
||||
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||
dimensionId, spawn, traits, null);
|
||||
dimensionId, spawn, traits, null, null, List.of());
|
||||
}
|
||||
|
||||
public AgeDefinition(UUID id, String name, long seed, ResourceLocation generationProfile,
|
||||
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||
BlockPos spawn, AgeTraits traits, AgeGenerationPlan plan) {
|
||||
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||
dimensionId, spawn, traits, plan, null, List.of());
|
||||
}
|
||||
|
||||
public AgeDefinition(UUID id, String name, long seed, ResourceLocation generationProfile,
|
||||
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||
BlockPos spawn, AgeTraits traits, AgeGenerationPlan plan,
|
||||
@Nullable AgeSeasonMode seasonMode) {
|
||||
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||
dimensionId, spawn, traits, plan, seasonMode, List.of());
|
||||
}
|
||||
|
||||
public static ResourceLocation dimensionId(UUID ageId) {
|
||||
@@ -70,6 +93,6 @@ public record AgeDefinition(
|
||||
|
||||
public AgeDefinition withSpawn(BlockPos spawn) {
|
||||
return new AgeDefinition(id, name, seed, generationProfile, generationVersion,
|
||||
createdGameTime, dimensionId, spawn.immutable(), traits, plan);
|
||||
createdGameTime, dimensionId, spawn.immutable(), traits, plan, seasonMode, randomFeatures);
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import java.util.Comparator;
|
||||
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.writing.OrderedWriting;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.GlobalPos;
|
||||
@@ -74,6 +75,7 @@ public final class AgeDimensionService {
|
||||
);
|
||||
if (level != null) {
|
||||
applyCelestialClock(level, age);
|
||||
SereneSeasonsCompatibility.registerAge(server, age);
|
||||
}
|
||||
}
|
||||
synchronizeImmersivePortals(server);
|
||||
@@ -110,6 +112,7 @@ public final class AgeDimensionService {
|
||||
ServerLevel existing = server.getLevel(key);
|
||||
if (existing != null) {
|
||||
applyCelestialClock(existing, definition);
|
||||
SereneSeasonsCompatibility.registerAge(server, definition);
|
||||
return existing;
|
||||
}
|
||||
|
||||
@@ -125,6 +128,7 @@ public final class AgeDimensionService {
|
||||
Rivencraft.LOGGER.error("Failed to load Age {} as {}", definition.id(), definition.dimensionId());
|
||||
} else {
|
||||
applyCelestialClock(loaded, definition);
|
||||
SereneSeasonsCompatibility.registerAge(server, definition);
|
||||
synchronizeImmersivePortals(server);
|
||||
}
|
||||
return loaded;
|
||||
@@ -298,6 +302,8 @@ public final class AgeDimensionService {
|
||||
private static ChunkGenerator createGenerator(MinecraftServer server, AgeDefinition age) {
|
||||
AgeRuntimeProfile profile = runtimeProfile(age);
|
||||
BiomeSource biomeSource = createBiomeSource(server, age, profile);
|
||||
List<AgeFeatureSelection.Choice> features = age.plan() == null
|
||||
? age.randomFeatures() : AgeFeatureSelection.resolved(age.plan());
|
||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.FLAT) {
|
||||
var settings = FlatLevelGeneratorSettings.getDefault(
|
||||
server.registryAccess().lookupOrThrow(Registries.BIOME),
|
||||
@@ -305,7 +311,7 @@ public final class AgeDimensionService {
|
||||
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
|
||||
);
|
||||
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings);
|
||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed());
|
||||
}
|
||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
|
||||
FlatLevelGeneratorSettings settings = new FlatLevelGeneratorSettings(
|
||||
@@ -315,7 +321,7 @@ public final class AgeDimensionService {
|
||||
);
|
||||
settings.updateLayers();
|
||||
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings);
|
||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed());
|
||||
}
|
||||
|
||||
var noiseSettings = server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS);
|
||||
@@ -323,7 +329,6 @@ public final class AgeDimensionService {
|
||||
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
||||
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
||||
Holder<NoiseGeneratorSettings> settings = Holder.direct(withBiomeMaterialRules(baseSettings));
|
||||
List<AgeFeatureSelection.Choice> features = AgeFeatureSelection.resolved(age.plan());
|
||||
return features.isEmpty() ? new NoiseBasedChunkGenerator(biomeSource, settings)
|
||||
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed());
|
||||
}
|
||||
|
||||
@@ -3,8 +3,12 @@ package net.dnorberg.rivencraft.book;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Random;
|
||||
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||
@@ -20,6 +24,10 @@ import net.minecraft.world.level.block.Blocks;
|
||||
|
||||
/** Validates and freezes supported feature pages and their preceding material modifiers. */
|
||||
public final class AgeFeatureSelection {
|
||||
private static final List<ResourceLocation> BLOCK_FEATURES = List.of(id("rocks"), id("floating_islands"));
|
||||
private static final List<ResourceLocation> FLUID_FEATURES = List.of(
|
||||
id("surface_lakes"), id("deep_lakes"), id("lava_lakes"));
|
||||
|
||||
private AgeFeatureSelection() {}
|
||||
|
||||
public record Choice(ResourceLocation id, Optional<ResourceLocation> material) {
|
||||
@@ -34,9 +42,9 @@ public final class AgeFeatureSelection {
|
||||
}
|
||||
|
||||
public static List<Choice> compile(WritingGrammar.Result writing, AgeRuntimeProfile profile,
|
||||
AgeBiomeSelection biomes, RegistryAccess registries) {
|
||||
AgeBiomeSelection biomes, RegistryAccess registries, long ageSeed) {
|
||||
List<Choice> choices = choices(writing.symbols().stream()
|
||||
.map(symbol -> symbol.semantics()).toList());
|
||||
.map(symbol -> symbol.semantics()).toList(), profile, ageSeed);
|
||||
for (Choice choice : choices) {
|
||||
String error = error(choice.id(), profile, registries);
|
||||
if (error == null) error = materialError(choice);
|
||||
@@ -50,10 +58,15 @@ public final class AgeFeatureSelection {
|
||||
return choices;
|
||||
}
|
||||
|
||||
private static List<Choice> choices(List<SymbolSemantics> symbols) {
|
||||
private static List<Choice> choices(List<SymbolSemantics> symbols, AgeRuntimeProfile profile, long ageSeed) {
|
||||
List<Choice> choices = new ArrayList<>();
|
||||
ResourceLocation pendingMaterial = null;
|
||||
for (SymbolSemantics semantics : symbols) {
|
||||
for (int index = 0; index < symbols.size(); index++) {
|
||||
SymbolSemantics semantics = symbols.get(index);
|
||||
if (pendingMaterial != null && semantics.role() != SymbolSemantics.Role.FEATURE) {
|
||||
choices.add(implied(pendingMaterial, profile, ageSeed, index - 1));
|
||||
pendingMaterial = null;
|
||||
}
|
||||
if (semantics.role() == SymbolSemantics.Role.BLOCK) {
|
||||
pendingMaterial = ((SymbolSemantics.ResourceValue) semantics.value()).id();
|
||||
} else if (semantics.role() == SymbolSemantics.Role.FEATURE) {
|
||||
@@ -62,29 +75,114 @@ public final class AgeFeatureSelection {
|
||||
pendingMaterial = null;
|
||||
}
|
||||
}
|
||||
if (pendingMaterial != null) choices.add(implied(pendingMaterial, profile, ageSeed, symbols.size() - 1));
|
||||
return List.copyOf(choices);
|
||||
}
|
||||
|
||||
private static Choice implied(ResourceLocation material, AgeRuntimeProfile profile, long ageSeed, int index) {
|
||||
List<ResourceLocation> candidates = compatibleFeatures(material, profile);
|
||||
if (candidates.isEmpty()) throw new IllegalArgumentException("No compatible feature for material "
|
||||
+ material + " on " + profile.terrain() + " terrain");
|
||||
long mixed = mix(ageSeed ^ (long) material.hashCode() * 0x9E3779B97F4A7C15L ^ index);
|
||||
return new Choice(candidates.get(Math.floorMod(mixed, candidates.size())), Optional.of(material));
|
||||
}
|
||||
|
||||
public static boolean supportsUnpairedMaterials(WritingGrammar.Result writing, AgeRuntimeProfile profile) {
|
||||
List<SymbolSemantics> symbols = writing.symbols().stream().map(symbol -> symbol.semantics()).toList();
|
||||
ResourceLocation pending = null;
|
||||
for (SymbolSemantics symbol : symbols) {
|
||||
if (pending != null && symbol.role() != SymbolSemantics.Role.FEATURE) {
|
||||
if (compatibleFeatures(pending, profile).isEmpty()) return false;
|
||||
pending = null;
|
||||
}
|
||||
if (symbol.role() == SymbolSemantics.Role.BLOCK)
|
||||
pending = ((SymbolSemantics.ResourceValue) symbol.value()).id();
|
||||
else if (symbol.role() == SymbolSemantics.Role.FEATURE) pending = null;
|
||||
}
|
||||
return pending == null || !compatibleFeatures(pending, profile).isEmpty();
|
||||
}
|
||||
|
||||
private static List<ResourceLocation> compatibleFeatures(ResourceLocation material, AgeRuntimeProfile profile) {
|
||||
var block = BuiltInRegistries.BLOCK.getOptional(material);
|
||||
if (block.isEmpty()) return List.of();
|
||||
List<ResourceLocation> candidates = BlockSymbolPages.isFluidMaterial(block.orElseThrow())
|
||||
? FLUID_FEATURES : BlockSymbolPages.isRockMaterial(block.orElseThrow())
|
||||
? BLOCK_FEATURES : List.of();
|
||||
return candidates.stream().filter(id -> compatible(id, profile)).toList();
|
||||
}
|
||||
|
||||
private static boolean compatible(ResourceLocation feature, AgeRuntimeProfile profile) {
|
||||
if (AgeBiomeSelection.isCave(profile)) return false;
|
||||
return floatingIslands(feature) || profile.terrain() == AgeRuntimeProfile.Terrain.NOISE;
|
||||
}
|
||||
|
||||
public static List<Choice> resolved(AgeGenerationPlan plan) {
|
||||
if (plan == null) return List.of();
|
||||
return choices(plan.symbols().stream().map(symbol -> symbol.semantics()).toList()).stream()
|
||||
.map(choice -> choice.material().isPresent() || !isRock(choice.id()) && !isLake(choice.id())
|
||||
? choice : new Choice(choice.id(), Optional.of(randomMaterial(plan.ageSeed(), choice.id()))))
|
||||
.toList();
|
||||
Map<ResourceLocation, List<ResourceLocation>> materialOrders = new HashMap<>();
|
||||
Map<ResourceLocation, Integer> occurrences = new HashMap<>();
|
||||
List<Choice> resolved = new ArrayList<>();
|
||||
for (Choice choice : choices(plan.symbols().stream().map(symbol -> symbol.semantics()).toList(),
|
||||
plan.runtimeProfile(), plan.ageSeed())) {
|
||||
if (choice.material().isPresent()
|
||||
|| !isRock(choice.id()) && !isLake(choice.id()) && !floatingIslands(choice.id())) {
|
||||
resolved.add(choice);
|
||||
continue;
|
||||
}
|
||||
List<ResourceLocation> materials = materialOrders.computeIfAbsent(choice.id(),
|
||||
id -> shuffledMaterials(plan.ageSeed(), id));
|
||||
int occurrence = occurrences.merge(choice.id(), 1, Integer::sum) - 1;
|
||||
resolved.add(new Choice(choice.id(), Optional.of(materials.get(occurrence % materials.size()))));
|
||||
}
|
||||
return List.copyOf(resolved);
|
||||
}
|
||||
|
||||
private static ResourceLocation randomMaterial(long ageSeed, ResourceLocation feature) {
|
||||
var category = isRock(feature) ? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||
List<ResourceLocation> pool = BlockSymbolPages.availableBlocks(category).stream()
|
||||
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList();
|
||||
/** Page-free Ages roll up to two compatible material/feature pairs once at creation. */
|
||||
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<Choice> choices = new ArrayList<>();
|
||||
for (ResourceLocation feature : features) {
|
||||
if (choices.size() >= count) break;
|
||||
var category = isRock(feature) || floatingIslands(feature)
|
||||
? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||
List<ResourceLocation> materials = BlockSymbolPages.availableBlocks(category).stream()
|
||||
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList();
|
||||
if (!materials.isEmpty()) choices.add(new Choice(feature,
|
||||
Optional.of(materials.get(random.nextInt(materials.size())))));
|
||||
}
|
||||
return List.copyOf(choices);
|
||||
}
|
||||
|
||||
private static List<ResourceLocation> shuffledMaterials(long ageSeed, ResourceLocation feature) {
|
||||
var category = isRock(feature) || floatingIslands(feature)
|
||||
? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||
List<ResourceLocation> pool = new ArrayList<>(BlockSymbolPages.availableBlocks(category).stream()
|
||||
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList());
|
||||
if (pool.isEmpty()) throw new IllegalStateException("No valid material blocks for " + feature);
|
||||
long mixed = ageSeed ^ (long) feature.hashCode() * 0x9E3779B97F4A7C15L;
|
||||
mixed = (mixed ^ mixed >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||
mixed = (mixed ^ mixed >>> 27) * 0x94D049BB133111EBL;
|
||||
return pool.get(Math.floorMod(mixed ^ mixed >>> 31, pool.size()));
|
||||
Collections.shuffle(pool, new Random(mix(ageSeed ^ (long) feature.hashCode() * 0x9E3779B97F4A7C15L)));
|
||||
return pool;
|
||||
}
|
||||
|
||||
private static long mix(long value) {
|
||||
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||
return value ^ value >>> 31;
|
||||
}
|
||||
|
||||
private static ResourceLocation id(String path) {
|
||||
return ResourceLocation.fromNamespaceAndPath("rivencraft", path);
|
||||
}
|
||||
|
||||
public static String error(ResourceLocation choice, AgeRuntimeProfile profile, RegistryAccess registries) {
|
||||
if (floatingIslands(choice)) {
|
||||
if (AgeBiomeSelection.isCave(profile))
|
||||
return "Feature " + choice + " cannot form above Cave terrain";
|
||||
return null;
|
||||
}
|
||||
if (caves(choice) || ravines(choice)) {
|
||||
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE) {
|
||||
return "Feature " + choice + " requires noise terrain with stone to carve; not Flat or Void";
|
||||
@@ -118,7 +216,7 @@ public final class AgeFeatureSelection {
|
||||
if (block.isEmpty() || block.orElseThrow() == Blocks.AIR) {
|
||||
return "Feature " + choice.id() + " references missing block material " + material;
|
||||
}
|
||||
if (isRock(choice.id())) {
|
||||
if (isRock(choice.id()) || floatingIslands(choice.id())) {
|
||||
if (!BlockSymbolPages.isRockMaterial(block.orElseThrow())) {
|
||||
return "Feature " + choice.id() + " needs a full solid block without a block entity: " + material;
|
||||
}
|
||||
@@ -154,6 +252,10 @@ public final class AgeFeatureSelection {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "ravines"));
|
||||
}
|
||||
|
||||
public static boolean floatingIslands(ResourceLocation choice) {
|
||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "floating_islands"));
|
||||
}
|
||||
|
||||
public static boolean supportsSurfaceVegetation(ResourceLocation id, RegistryAccess registries) {
|
||||
var biome = registries.lookupOrThrow(Registries.BIOME)
|
||||
.get(ResourceKey.create(Registries.BIOME, id));
|
||||
|
||||
@@ -65,12 +65,13 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin
|
||||
AgeRuntimeProfile profile = AgeRuntimeProfiles.profiles().get(selected);
|
||||
if (profile == null) throw new IllegalArgumentException("Unsupported Age terrain profile " + selected);
|
||||
AgeBiomeSelection biomes = AgeBiomeSelection.compile(parsed, traits, profile, ageSeed, registries);
|
||||
AgeFeatureSelection.compile(parsed, profile, biomes, registries);
|
||||
AgeFeatureSelection.compile(parsed, profile, biomes, registries, ageSeed);
|
||||
AgeGenerationPlan plan = new AgeGenerationPlan(CURRENT_VERSION, ageSeed, writing,
|
||||
parsed.symbols().stream().map(symbol -> new ResolvedSymbol(
|
||||
symbol.index(), symbol.reference(), symbol.semantics())).toList(),
|
||||
profile, biomes);
|
||||
AgeEnvironmentCompiler.apply(plan, traits);
|
||||
AgeSeasonMode.validate(plan);
|
||||
return plan;
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,22 @@ public final class AgePersistenceGameTests {
|
||||
new AgeReference(UUID.randomUUID(), "Panel Only"),
|
||||
new OrderedWriting(List.of(WritingEntry.linkPanel())));
|
||||
helper.assertTrue(pageFree.plan() == null && panelOnly.plan() == null,
|
||||
"Old and Link-Panel-only books must retain the random Age path");
|
||||
"Page-free and Link-Panel-only books must retain the random Age path");
|
||||
for (AgeDefinition age : List.of(pageFree, panelOnly)) {
|
||||
helper.assertTrue(age.randomFeatures().size() <= 2,
|
||||
"A random Age may roll at most two material features");
|
||||
for (AgeFeatureSelection.Choice choice : age.randomFeatures()) {
|
||||
helper.assertTrue(choice.material().isPresent()
|
||||
&& AgeFeatureSelection.materialError(choice) == null,
|
||||
"Random features must each carry a valid block or fluid material");
|
||||
}
|
||||
}
|
||||
AgeRegistrySavedData registry = AgeRegistrySavedData.get(helper.getLevel());
|
||||
var restored = AgeRegistrySavedData.load(
|
||||
registry.save(new CompoundTag(), helper.getLevel().registryAccess()),
|
||||
helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(restored.find(pageFree.id()).orElseThrow().randomFeatures(),
|
||||
pageFree.randomFeatures(), "Random material features must survive a saved-data round trip");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.datafix.DataFixTypes;
|
||||
import net.minecraft.world.level.saveddata.SavedData;
|
||||
import net.neoforged.fml.ModList;
|
||||
|
||||
/** Server-wide persistent mapping from stable book UUIDs to immutable Age definitions. */
|
||||
public final class AgeRegistrySavedData extends SavedData {
|
||||
@@ -32,6 +33,8 @@ public final class AgeRegistrySavedData extends SavedData {
|
||||
private static final String SPAWN_Z_TAG = "SpawnZ";
|
||||
private static final String TRAITS_TAG = "Traits";
|
||||
private static final String PLAN_TAG = "GenerationPlan";
|
||||
private static final String RANDOM_FEATURES_TAG = "RandomFeatures";
|
||||
private static final String SEASON_MODE_TAG = "SeasonMode";
|
||||
private static final String BIOME_DISTRIBUTION_TAG = "BiomeDistribution";
|
||||
private static final String LIGHTING_TAG = "Lighting";
|
||||
private static final String WEATHER_TAG = "Weather";
|
||||
@@ -130,7 +133,10 @@ public final class AgeRegistrySavedData extends SavedData {
|
||||
dimensionId,
|
||||
null,
|
||||
AgeEnvironmentCompiler.apply(plan, traits),
|
||||
plan
|
||||
plan,
|
||||
AgeSeasonMode.select(plan, seed, ModList.get().isLoaded("sereneseasons")),
|
||||
plan == null ? AgeFeatureSelection.randomChoices(seed,
|
||||
AgeRuntimeProfiles.resolve(seedProfile), registries) : List.of()
|
||||
);
|
||||
ages.put(created.id(), created);
|
||||
setDirty();
|
||||
@@ -174,7 +180,10 @@ public final class AgeRegistrySavedData extends SavedData {
|
||||
spawn,
|
||||
readTraits(entry),
|
||||
entry.contains(PLAN_TAG, CompoundTag.TAG_COMPOUND)
|
||||
? AgeGenerationPlan.load(entry.getCompound(PLAN_TAG)) : null
|
||||
? AgeGenerationPlan.load(entry.getCompound(PLAN_TAG)) : null,
|
||||
entry.contains(SEASON_MODE_TAG, CompoundTag.TAG_STRING)
|
||||
? AgeSeasonMode.parseOrNull(entry.getString(SEASON_MODE_TAG)) : null,
|
||||
readRandomFeatures(entry)
|
||||
));
|
||||
}
|
||||
return data;
|
||||
@@ -208,12 +217,35 @@ public final class AgeRegistrySavedData extends SavedData {
|
||||
traits.putFloat(CELESTIAL_PHASE_TAG, age.traits().celestialPhase());
|
||||
entry.put(TRAITS_TAG, traits);
|
||||
if (age.plan() != null) entry.put(PLAN_TAG, age.plan().save());
|
||||
if (!age.randomFeatures().isEmpty()) {
|
||||
ListTag featureTags = new ListTag();
|
||||
for (AgeFeatureSelection.Choice choice : age.randomFeatures()) {
|
||||
CompoundTag feature = new CompoundTag();
|
||||
feature.putString("Id", choice.id().toString());
|
||||
choice.material().ifPresent(id -> feature.putString("Material", id.toString()));
|
||||
featureTags.add(feature);
|
||||
}
|
||||
entry.put(RANDOM_FEATURES_TAG, featureTags);
|
||||
}
|
||||
if (age.seasonMode() != null) entry.putString(SEASON_MODE_TAG, age.seasonMode().name());
|
||||
serializedAges.add(entry);
|
||||
});
|
||||
tag.put(AGES_TAG, serializedAges);
|
||||
return tag;
|
||||
}
|
||||
|
||||
private static List<AgeFeatureSelection.Choice> readRandomFeatures(CompoundTag age) {
|
||||
ListTag tags = age.getList(RANDOM_FEATURES_TAG, CompoundTag.TAG_COMPOUND);
|
||||
List<AgeFeatureSelection.Choice> features = new java.util.ArrayList<>();
|
||||
for (int index = 0; index < tags.size(); index++) {
|
||||
CompoundTag item = tags.getCompound(index);
|
||||
features.add(new AgeFeatureSelection.Choice(ResourceLocation.parse(item.getString("Id")),
|
||||
item.contains("Material", CompoundTag.TAG_STRING)
|
||||
? Optional.of(ResourceLocation.parse(item.getString("Material"))) : Optional.empty()));
|
||||
}
|
||||
return List.copyOf(features);
|
||||
}
|
||||
|
||||
private static AgeTraits readTraits(CompoundTag age) {
|
||||
if (!age.contains(TRAITS_TAG, CompoundTag.TAG_COMPOUND)) {
|
||||
return AgeTraits.LEGACY_DEFAULTS;
|
||||
|
||||
@@ -72,13 +72,17 @@ public final class AgeRuntimeProfiles {
|
||||
List<ResourceLocation> features = parsed.symbols().stream()
|
||||
.filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.FEATURE)
|
||||
.map(symbol -> ((SymbolSemantics.ResourceValue) symbol.semantics().value()).id()).toList();
|
||||
if (features.isEmpty() || PROFILES.isEmpty()) return selected;
|
||||
boolean hasMaterial = parsed.symbols().stream().anyMatch(symbol ->
|
||||
symbol.semantics().role() == SymbolSemantics.Role.BLOCK);
|
||||
if ((features.isEmpty() && !hasMaterial) || PROFILES.isEmpty()) return selected;
|
||||
AgeRuntimeProfile initial = PROFILES.get(selected);
|
||||
if (initial != null && features.stream().allMatch(id ->
|
||||
AgeFeatureSelection.error(id, initial, registries) == null)) return selected;
|
||||
AgeFeatureSelection.error(id, initial, registries) == null)
|
||||
&& AgeFeatureSelection.supportsUnpairedMaterials(parsed, initial)) return selected;
|
||||
List<ResourceLocation> compatible = PROFILES.entrySet().stream()
|
||||
.filter(entry -> features.stream().allMatch(id ->
|
||||
AgeFeatureSelection.error(id, entry.getValue(), registries) == null))
|
||||
AgeFeatureSelection.error(id, entry.getValue(), registries) == null)
|
||||
&& AgeFeatureSelection.supportsUnpairedMaterials(parsed, entry.getValue()))
|
||||
.map(Map.Entry::getKey).sorted().toList();
|
||||
return compatible.isEmpty() ? selected
|
||||
: compatible.get(Math.floorMod(Long.hashCode(seed), compatible.size()));
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.Random;
|
||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||
import net.neoforged.fml.ModList;
|
||||
|
||||
/** One authored or seed-selected season policy per Age. */
|
||||
public enum AgeSeasonMode {
|
||||
NO_SEASONS,
|
||||
SEASONS,
|
||||
ETERNAL_WINTER,
|
||||
ETERNAL_SUMMER,
|
||||
ETERNAL_FALL,
|
||||
ETERNAL_SPRING;
|
||||
|
||||
private static final long RANDOM_SALT = 0x5E45_0A5E_5EED_21L;
|
||||
|
||||
/** An omitted page is selected once when an Age is created with Serene installed. */
|
||||
public static AgeSeasonMode select(AgeGenerationPlan plan, long ageSeed, boolean sereneInstalled) {
|
||||
if (hasAuthoredPage(plan)) return from(plan);
|
||||
return sereneInstalled ? values()[new Random(ageSeed ^ RANDOM_SALT).nextInt(values().length)] : null;
|
||||
}
|
||||
|
||||
/** Existing Ages without a stored choice retain their old cycling behavior. */
|
||||
public static AgeSeasonMode from(AgeDefinition age) {
|
||||
return age.seasonMode() == null ? from(age.plan()) : age.seasonMode();
|
||||
}
|
||||
|
||||
public static boolean hasAuthoredPage(AgeGenerationPlan plan) {
|
||||
return plan != null && plan.symbols().stream()
|
||||
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SEASON);
|
||||
}
|
||||
|
||||
public static AgeSeasonMode parseOrNull(String value) {
|
||||
try {
|
||||
return valueOf(value);
|
||||
} catch (IllegalArgumentException exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static AgeSeasonMode from(AgeGenerationPlan plan) {
|
||||
if (plan == null) return SEASONS;
|
||||
return plan.symbols().stream()
|
||||
.filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SEASON)
|
||||
.map(symbol -> valueOf(((SymbolSemantics.ChoiceValue) symbol.semantics().value())
|
||||
.id().toUpperCase(Locale.ROOT)))
|
||||
.findFirst().orElse(SEASONS);
|
||||
}
|
||||
|
||||
public static void validate(AgeGenerationPlan plan) {
|
||||
if (plan == null) return;
|
||||
if (hasAuthoredPage(plan) && from(plan) != NO_SEASONS
|
||||
&& !ModList.get().isLoaded("sereneseasons")) {
|
||||
throw new IllegalArgumentException("This seasonal page requires Serene Seasons to create the Age");
|
||||
}
|
||||
}
|
||||
|
||||
public boolean eternal() {
|
||||
return this != NO_SEASONS && this != SEASONS;
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,21 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.registry.ModCreativeTabs;
|
||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||
import net.dnorberg.rivencraft.writing.PageContent;
|
||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.nbt.ListTag;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
||||
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
@@ -26,38 +28,23 @@ public final class EnvironmentWritingGameTests {
|
||||
private EnvironmentWritingGameTests() {}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void symbolCategoriesPartitionCreativePages(GameTestHelper helper) {
|
||||
public static void caveBiomesHaveSeparateCreativePages(GameTestHelper helper) {
|
||||
var registries = helper.getLevel().registryAccess();
|
||||
var allPages = PageItem.creativeSymbolPages(registries);
|
||||
Set<ResourceLocation> collected = new HashSet<>();
|
||||
helper.assertTrue(ModCreativeTabs.SYMBOL_PAGES.keySet().containsAll(PageItem.bundledCreativeCategories()),
|
||||
"Every bundled page category must receive a creative tab");
|
||||
for (ResourceLocation category : PageItem.bundledCreativeCategories()) {
|
||||
var categoryPages = PageItem.creativeSymbolPages(registries, category);
|
||||
helper.assertFalse(categoryPages.isEmpty(), "Every category tab must contain pages: " + category);
|
||||
for (var page : categoryPages) {
|
||||
helper.assertValueEqual(PageItem.creativeCategory(page), category,
|
||||
"Category tabs must not mix symbol pages");
|
||||
helper.assertTrue(collected.add(PageItem.content(page).symbol().orElseThrow().id()),
|
||||
"A symbol page must appear in exactly one category tab");
|
||||
}
|
||||
}
|
||||
helper.assertValueEqual(collected.size(), allPages.size(),
|
||||
"Category tabs must contain every bundled and generated biome page");
|
||||
var biomePages = PageItem.creativeSymbolPages(registries,
|
||||
ResourceLocation.fromNamespaceAndPath("rivencraft", "biome"));
|
||||
var generationPages = PageItem.creativeSymbolPages(registries,
|
||||
ResourceLocation.fromNamespaceAndPath("rivencraft", "biome_generation"));
|
||||
var cavePages = PageItem.creativeSymbolPages(registries,
|
||||
ResourceLocation.fromNamespaceAndPath("rivencraft", "cave_biome"));
|
||||
helper.assertTrue(PageItem.bundledCreativeCategories().contains(
|
||||
ResourceLocation.fromNamespaceAndPath("rivencraft", "cave_biome")),
|
||||
"The cave biome creative tab must be registered");
|
||||
helper.assertTrue(biomePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
|
||||
.id().getPath().equals("biome/desert")), "Biome pages must remain in the Biome tab");
|
||||
helper.assertTrue(cavePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
|
||||
.id().getPath().equals("biome/lush_caves")), "Cave biomes need their own tab");
|
||||
helper.assertTrue(cavePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
|
||||
.id().getPath().equals("biome/crimson_forest")), "Nether biomes belong in the Cave tab");
|
||||
helper.assertFalse(biomePages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
|
||||
.id().getPath().equals("biome/tiny")), "Biome generation types must leave the Biome tab");
|
||||
helper.assertTrue(generationPages.stream().anyMatch(page -> PageItem.content(page).symbol().orElseThrow()
|
||||
.id().getPath().equals("biome/tiny")), "Biome generation types need their own tab");
|
||||
helper.assertTrue(allPages.stream().noneMatch(page -> PageItem.content(page).kind() == PageContent.Kind.BLANK),
|
||||
"Blank pages must not enter the creative or JEI symbol-page feed");
|
||||
helper.assertValueEqual(PageItem.content(PageItem.createLinkPanelPage()).kind(), PageContent.Kind.LINK_PANEL,
|
||||
"Link pages must stay separate from symbol categories");
|
||||
.id().getPath().equals("biome/lush_caves")), "Cave biomes must leave the general Biome tab");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@@ -68,6 +55,8 @@ public final class EnvironmentWritingGameTests {
|
||||
"sky/overworld", "sky/nether", "sky/end",
|
||||
"weather/normal", "weather/fast", "weather/slow", "weather/off",
|
||||
"weather/always", "weather/storm", "celestial/normal_time",
|
||||
"season/no_seasons", "season/seasons", "season/eternal_winter",
|
||||
"season/eternal_summer", "season/eternal_fall", "season/eternal_spring",
|
||||
"period/zero", "period/half", "period/full", "period/double",
|
||||
"phase/nadir", "phase/rising", "phase/zenith", "phase/setting");
|
||||
Set<String> creative = PageItem.creativeSymbolPages(helper.getLevel().registryAccess()).stream()
|
||||
@@ -90,6 +79,60 @@ public final class EnvironmentWritingGameTests {
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void seasonalPagesAreExclusiveAndPersist(GameTestHelper helper) {
|
||||
OrderedWriting noSeasons = new OrderedWriting(List.of(
|
||||
WritingEntry.linkPanel(), page("season/no_seasons")));
|
||||
var plan = AgeGenerationPlan.compile(noSeasons, 42L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(42L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(AgeSeasonMode.from(plan), AgeSeasonMode.NO_SEASONS,
|
||||
"No Seasons must compile without an installed season mod");
|
||||
helper.assertValueEqual(AgeSeasonMode.from(AgeGenerationPlan.load(plan.save())),
|
||||
AgeSeasonMode.NO_SEASONS, "The Age's seasonal policy must survive reload");
|
||||
OrderedWriting conflict = new OrderedWriting(List.of(WritingEntry.linkPanel(),
|
||||
page("season/no_seasons"), page("season/eternal_winter")));
|
||||
helper.assertFalse(WritingGrammar.parse(conflict).canCreate(),
|
||||
"Only one seasonal page may be used in an Age");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void omittedSeasonPageSelectsOnlyWhenSereneIsPresent(GameTestHelper helper) {
|
||||
helper.assertTrue(AgeSeasonMode.select(null, 42L, false) == null,
|
||||
"An Age made without Serene must not receive a random seasonal modifier");
|
||||
AgeSeasonMode selected = AgeSeasonMode.select(null, 42L, true);
|
||||
helper.assertValueEqual(selected, AgeSeasonMode.select(null, 42L, true),
|
||||
"The same Age seed must select the same seasonal modifier");
|
||||
helper.assertTrue(selected != null, "Serene must select a mode when no season page is authored");
|
||||
AgeDefinition age = new AgeDefinition(UUID.randomUUID(), "Season Test", 42L,
|
||||
AgeGenerationProfiles.STANDARD, AgeDefinition.CURRENT_GENERATION_VERSION, 0L,
|
||||
AgeDefinition.dimensionId(UUID.randomUUID()), null, AgeTraits.select(42L), null, selected);
|
||||
helper.assertValueEqual(AgeSeasonMode.from(age.withSpawn(BlockPos.ZERO)), selected,
|
||||
"Updating an Age spawn must preserve the chosen seasonal modifier");
|
||||
OrderedWriting explicit = new OrderedWriting(List.of(WritingEntry.linkPanel(), page("season/no_seasons")));
|
||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(explicit, 42L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(42L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(AgeSeasonMode.select(plan, 42L, true), AgeSeasonMode.NO_SEASONS,
|
||||
"An authored season page must override random selection");
|
||||
AgeReference reference = new AgeReference(UUID.randomUUID(), "Season Persistence");
|
||||
AgeRegistrySavedData data = AgeRegistrySavedData.get(helper.getLevel());
|
||||
AgeRegistrySavedData.resolveOrCreate(helper.getLevel(), reference);
|
||||
CompoundTag saved = data.save(new CompoundTag(), helper.getLevel().registryAccess());
|
||||
ListTag entries = saved.getList("Ages", CompoundTag.TAG_COMPOUND);
|
||||
for (int index = 0; index < entries.size(); index++) {
|
||||
CompoundTag entry = entries.getCompound(index);
|
||||
if (entry.getUUID("Id").equals(reference.id())) {
|
||||
entry.putString("SeasonMode", selected.name());
|
||||
break;
|
||||
}
|
||||
}
|
||||
AgeDefinition restored = AgeRegistrySavedData.load(saved, helper.getLevel().registryAccess())
|
||||
.find(reference.id()).orElseThrow();
|
||||
helper.assertValueEqual(restored.seasonMode(), selected,
|
||||
"The selected seasonal modifier must survive Age data reload");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void writtenEnvironmentPersistsAndPageFreeAgesStaySeeded(GameTestHelper helper) {
|
||||
OrderedWriting writing = new OrderedWriting(List.of(
|
||||
|
||||
@@ -31,7 +31,8 @@ public final class FeatureWritingGameTests {
|
||||
var registries = helper.getLevel().registryAccess();
|
||||
Set<String> pages = Set.of("feature/caves", "feature/flowers", "feature/trees",
|
||||
"feature/huge_trees", "feature/rocks", "feature/lava_lakes",
|
||||
"feature/surface_lakes", "feature/deep_lakes", "feature/ravines");
|
||||
"feature/surface_lakes", "feature/deep_lakes", "feature/ravines",
|
||||
"feature/floating_islands");
|
||||
helper.assertTrue(PageItem.bundledCreativeSymbols().containsAll(pages),
|
||||
"Supported feature pages must appear in the creative and JEI symbol feed");
|
||||
for (String path : pages) {
|
||||
@@ -57,7 +58,8 @@ public final class FeatureWritingGameTests {
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||
AgeFeatureSelection.resolved(plan), "Features must survive the saved-plan round trip");
|
||||
for (AgeFeatureSelection.Choice choice : AgeFeatureSelection.resolved(plan)) {
|
||||
if (AgeFeatureSelection.caves(choice.id()) || AgeFeatureSelection.ravines(choice.id())) continue;
|
||||
if (AgeFeatureSelection.caves(choice.id()) || AgeFeatureSelection.ravines(choice.id())
|
||||
|| AgeFeatureSelection.floatingIslands(choice.id())) continue;
|
||||
var placement = AgeFeatureSelection.placedFeature(choice.id());
|
||||
helper.assertTrue(registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
||||
.get(ResourceKey.create(Registries.PLACED_FEATURE, placement)).isPresent(),
|
||||
@@ -92,11 +94,78 @@ public final class FeatureWritingGameTests {
|
||||
AgeBiomeSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(
|
||||
new OrderedWriting(List.of(panel(), page("terrain/standard"), page("feature/flowers")))),
|
||||
AgeTraits.select(87L), AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD),
|
||||
87L, registries), registries).contains(choice("flowers")),
|
||||
87L, registries), registries, 87L).contains(choice("flowers")),
|
||||
"A valid surface feature must still compile");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void floatingIslandsAreAdditiveAcrossSupportedTerrains(GameTestHelper helper) {
|
||||
for (String terrain : List.of("standard", "amplified", "flat", "void")) {
|
||||
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/" + terrain),
|
||||
page("feature/floating_islands")));
|
||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 450L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(plan.authoredTerrain(), id(terrain),
|
||||
"Floating Islands must not replace the terrain page");
|
||||
List<AgeFeatureSelection.Choice> resolved = AgeFeatureSelection.resolved(plan);
|
||||
helper.assertValueEqual(resolved.stream().map(AgeFeatureSelection.Choice::id).toList(),
|
||||
List.of(id("floating_islands")),
|
||||
"The island feature must be frozen independently of terrain");
|
||||
helper.assertTrue(resolved.getFirst().material().isPresent()
|
||||
&& AgeFeatureSelection.materialError(resolved.getFirst()) == null,
|
||||
"An unmodified island feature must choose a valid full-block material");
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||
resolved, "The seeded island material must survive an Age reload");
|
||||
}
|
||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/cave"),
|
||||
page("feature/floating_islands"))), "cannot form above Cave terrain");
|
||||
OrderedWriting materialWriting = new OrderedWriting(List.of(panel(), page("terrain/flat"),
|
||||
block("glowstone"), page("feature/floating_islands")));
|
||||
AgeGenerationPlan materialPlan = AgeGenerationPlan.compile(materialWriting, 450L,
|
||||
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(materialPlan), List.of(
|
||||
new AgeFeatureSelection.Choice(id("floating_islands"), Optional.of(
|
||||
ResourceLocation.withDefaultNamespace("glowstone")))),
|
||||
"A preceding full-block page must set the island interior");
|
||||
AgeGenerationPlan randomPlan = AgeGenerationPlan.compile(new OrderedWriting(List.of(panel())),
|
||||
450L, AgeGenerationProfiles.STANDARD, AgeTraits.select(450L),
|
||||
helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(randomPlan), List.of(),
|
||||
"A page-free plan must not implicitly author Floating Islands");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void voidBiomesAreIndependentOfFloatingIslands(GameTestHelper helper) {
|
||||
OrderedWriting voidDefault = new OrderedWriting(List.of(panel(), page("terrain/void")));
|
||||
AgeGenerationPlan voidDefaultPlan = AgeGenerationPlan.compile(voidDefault, 450L,
|
||||
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(voidDefaultPlan.biomeSelection().biomes(),
|
||||
List.of(net.minecraft.world.level.biome.Biomes.THE_VOID.location()),
|
||||
"Void terrain without biome pages must keep The Void biome");
|
||||
OrderedWriting voidDesert = new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||
page("biome/desert"), page("biome/single")));
|
||||
AgeGenerationPlan voidDesertPlan = AgeGenerationPlan.compile(voidDesert, 450L,
|
||||
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(voidDesertPlan.biomeSelection().biomes(),
|
||||
List.of(net.minecraft.world.level.biome.Biomes.DESERT.location()),
|
||||
"An authored biome must override The Void even with no generated blocks");
|
||||
helper.assertValueEqual(AgeGenerationPlan.load(voidDesertPlan.save()).biomeSelection(),
|
||||
voidDesertPlan.biomeSelection(), "The Void Age biome must survive reload");
|
||||
OrderedWriting voidDesertWithoutController = new OrderedWriting(List.of(panel(),
|
||||
page("terrain/void"), page("biome/desert")));
|
||||
AgeGenerationPlan implicitSinglePlan = AgeGenerationPlan.compile(voidDesertWithoutController, 450L,
|
||||
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(implicitSinglePlan.biomeSelection().biomes(),
|
||||
List.of(net.minecraft.world.level.biome.Biomes.DESERT.location()),
|
||||
"A Void Age with one authored biome must not add The Void as filler");
|
||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||
page("biome/desert"), page("biome/tiny"))),
|
||||
"requires 2 distinct biomes");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void blockPagesModifyFeaturesAndSurviveReload(GameTestHelper helper) {
|
||||
var stone = ResourceLocation.withDefaultNamespace("stone");
|
||||
@@ -146,7 +215,45 @@ public final class FeatureWritingGameTests {
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void incompatibleAndMisplacedBlockPagesAreRejected(GameTestHelper helper) {
|
||||
public static void repeatedMaterialAndFeaturePagesRemainInWrittenPlan(GameTestHelper helper) {
|
||||
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||
block("stone"), block("stone"), page("feature/rocks"), page("feature/rocks")));
|
||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(plan.writing(), writing,
|
||||
"Binding must keep every repeated material and feature page in order");
|
||||
helper.assertValueEqual(plan.symbols().size(), 5,
|
||||
"The frozen plan must retain both material pages and both feature pages");
|
||||
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||
helper.assertValueEqual(choices.size(), 3,
|
||||
"The first material gains an inferred feature; both authored features remain");
|
||||
helper.assertValueEqual(choices.get(1), new AgeFeatureSelection.Choice(id("rocks"),
|
||||
Optional.of(ResourceLocation.withDefaultNamespace("stone"))),
|
||||
"The second material must modify the first authored Rocks page");
|
||||
helper.assertValueEqual(choices.get(2).id(), id("rocks"),
|
||||
"The repeated Rocks page must remain a second feature choice");
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||
"Repeated pages and their feature choices must survive a plan reload");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void repeatedUnmodifiedRocksChooseDistinctMaterials(GameTestHelper helper) {
|
||||
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||
page("feature/rocks"), page("feature/rocks"), page("feature/rocks"), page("feature/rocks")));
|
||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||
helper.assertValueEqual(choices.size(), 4, "All four Rocks pages must survive binding");
|
||||
helper.assertValueEqual(choices.stream().map(AgeFeatureSelection.Choice::material).distinct().count(), 4L,
|
||||
"Each repeated unmodified Rocks page must receive a distinct material");
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||
"The four materials must remain stable after reloading the Age plan");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void incompatibleAndUnpairedMaterialPages(GameTestHelper helper) {
|
||||
helper.assertTrue(AgeFeatureSelection.materialError(new AgeFeatureSelection.Choice(
|
||||
id("rocks"), Optional.of(ResourceLocation.withDefaultNamespace("torch"))))
|
||||
.contains("full solid block"),
|
||||
@@ -155,8 +262,26 @@ public final class FeatureWritingGameTests {
|
||||
block("stone"), page("feature/surface_lakes"))), "source-fluid block");
|
||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||
block("stone"), page("feature/trees"))), "cannot consume a material page");
|
||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||
block("stone"))), "immediately before a compatible feature");
|
||||
for (String material : List.of("stone", "water")) {
|
||||
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||
block(material)));
|
||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||
helper.assertValueEqual(choices.size(), 1, "An unpaired material page must gain one feature");
|
||||
helper.assertValueEqual(choices.getFirst().material(),
|
||||
Optional.of(ResourceLocation.withDefaultNamespace(material)),
|
||||
"The inferred feature must consume the authored material");
|
||||
helper.assertTrue(material.equals("water")
|
||||
? AgeFeatureSelection.isLake(choices.getFirst().id())
|
||||
: AgeFeatureSelection.isRock(choices.getFirst().id())
|
||||
|| AgeFeatureSelection.floatingIslands(choices.getFirst().id()),
|
||||
"The inferred feature must accept the material type");
|
||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||
"The inferred feature must be deterministic across a plan reload");
|
||||
}
|
||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/void"), block("water"))),
|
||||
"No compatible feature for material");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
|
||||
@@ -92,8 +92,10 @@ public final class ClientBookInteractionHandler {
|
||||
return;
|
||||
}
|
||||
minecraft.setScreen(payload.fromStand()
|
||||
? new DescriptiveBookScreen(payload.source().pos(), payload.book(), payload.traits(), payload.writingSymbols())
|
||||
: new DescriptiveBookScreen(hand, payload.book(), payload.traits(), payload.writingSymbols()));
|
||||
? new DescriptiveBookScreen(payload.source().pos(), payload.book(), payload.traits(),
|
||||
payload.writingSymbols())
|
||||
: new DescriptiveBookScreen(hand, payload.book(), payload.traits(),
|
||||
payload.writingSymbols()));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package net.dnorberg.rivencraft.client;
|
||||
|
||||
import net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility;
|
||||
import net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
|
||||
/** Applies incremental Serene whitelist updates on the client main thread. */
|
||||
public final class ClientSereneAgeWhitelist {
|
||||
private ClientSereneAgeWhitelist() {
|
||||
}
|
||||
|
||||
public static void handle(SereneAgeWhitelistPayload payload, IPayloadContext context) {
|
||||
context.enqueueWork(() -> SereneSeasonsCompatibility.acceptClient(payload.dimensionId(), payload.enabled()));
|
||||
}
|
||||
}
|
||||
@@ -69,6 +69,13 @@ public final class SymbolPageTextures {
|
||||
return forPage(stack, true);
|
||||
}
|
||||
|
||||
/** Book pages use the same server-resolved poem and glyph composition as Page items. */
|
||||
public static ResourceLocation forDisplay(SymbolDisplayMetadata display) {
|
||||
return display.resolved()
|
||||
? forSymbol(display.id(), display.poem(), false)
|
||||
: texture("item/page_unresolved");
|
||||
}
|
||||
|
||||
private static ResourceLocation forPage(ItemStack stack, boolean item) {
|
||||
PageContent content = PageItem.content(stack);
|
||||
if (content.kind() == PageContent.Kind.UNRESOLVED_SYMBOL) return texture("item/page_unresolved");
|
||||
|
||||
@@ -52,6 +52,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
private final OrderedWriting writing;
|
||||
private final List<SymbolDisplayMetadata> writingSymbols;
|
||||
private final boolean pageFree;
|
||||
private final String author;
|
||||
private final InteractionHand hand;
|
||||
private final BlockPos bookStandPos;
|
||||
private DestinationPreviewRenderer preview;
|
||||
@@ -71,6 +72,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||
this.writingSymbols = List.copyOf(writingSymbols);
|
||||
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
||||
author = book.get(ModDataComponents.BOOK_AUTHOR.get());
|
||||
this.hand = hand;
|
||||
bookStandPos = null;
|
||||
}
|
||||
@@ -84,6 +86,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||
this.writingSymbols = List.copyOf(writingSymbols);
|
||||
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
||||
author = book.get(ModDataComponents.BOOK_AUTHOR.get());
|
||||
hand = InteractionHand.MAIN_HAND;
|
||||
this.bookStandPos = bookStandPos.immutable();
|
||||
}
|
||||
@@ -163,6 +166,26 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
else if (pageIndex < pageCount() && mouseX >= left + 293 && mouseX < left + 320)
|
||||
graphics.renderTooltip(font, Component.translatable("screen.rivencraft.book.next_page"), mouseX, mouseY);
|
||||
}
|
||||
if (pageIndex == 0 && age != null && !pageFree && traits != null
|
||||
&& mouseX >= left + 38 && mouseX < left + 154
|
||||
&& mouseY >= top + 38 && mouseY < top + 67) {
|
||||
graphics.renderComponentTooltip(font, List.of(
|
||||
Component.translatable("screen.rivencraft.age.trait.biomes",
|
||||
traitName("biome_distribution", traits.biomeDistribution())),
|
||||
Component.translatable("screen.rivencraft.age.trait.lighting",
|
||||
traitName("lighting", traits.lighting())),
|
||||
Component.translatable("screen.rivencraft.age.trait.weather",
|
||||
traitName("weather", traits.weather())),
|
||||
Component.translatable("screen.rivencraft.age.trait.day_length",
|
||||
traits.hasStoppedCelestialCycle()
|
||||
? Component.translatable("trait.rivencraft.day_length.stopped")
|
||||
: Component.literal(String.format(Locale.ROOT, "%.2fx", traits.celestialPeriod()))),
|
||||
Component.translatable("screen.rivencraft.age.trait.celestial_angle",
|
||||
Component.literal(String.format(Locale.ROOT, "%.0f°", traits.celestialAngle()))),
|
||||
Component.translatable("screen.rivencraft.age.trait.celestial_phase",
|
||||
Component.literal(String.format(Locale.ROOT, "%.0f%%", traits.celestialPhase() * 100.0F)))
|
||||
), mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
private void renderBook(GuiGraphics graphics, float partialTick) {
|
||||
@@ -182,7 +205,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
graphics.enableScissor(left + 38, top + 38, left + 154, top + 174);
|
||||
renderFirstPageText(graphics, left, top);
|
||||
graphics.disableScissor();
|
||||
} else if (pageIndex < pageCount()) {
|
||||
} else if (pageIndex < writing.entries().size()) {
|
||||
LegacyBookArtwork.drawFullPage(graphics, left, top);
|
||||
renderWrittenPage(graphics, left, top);
|
||||
}
|
||||
@@ -193,20 +216,25 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
|
||||
private int pageCount() {
|
||||
// Older page-free Descriptive Books do not have a BOOK_WRITING component.
|
||||
return Math.max(1, writing.entries().size());
|
||||
return Math.max(1, writing.entries().size() - 1);
|
||||
}
|
||||
|
||||
private void renderFirstPageText(GuiGraphics graphics, int left, int top) {
|
||||
int x = left + 40;
|
||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.title"),
|
||||
x, top + 40, 110);
|
||||
if (age == null) {
|
||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.title"),
|
||||
x, top + 40, 110);
|
||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.name_prompt"),
|
||||
x, top + 52, 110);
|
||||
return;
|
||||
}
|
||||
int detailsY = drawWrappedWithoutShadow(graphics, Component.literal(age.name()),
|
||||
x + 10, top + 52, 100) + 10;
|
||||
int nameEnd = drawWrappedWithoutShadow(graphics, Component.literal(age.name()),
|
||||
x, top + 40, 110);
|
||||
int detailsY = drawWrappedWithoutShadow(graphics,
|
||||
author == null || author.isBlank()
|
||||
? Component.translatable("screen.rivencraft.age.unknown_author")
|
||||
: Component.literal(author), x + 10, nameEnd + 2, 100) + 10;
|
||||
if (!pageFree) return;
|
||||
if (generationProfile != null) {
|
||||
Component profileName = generationProfile.getNamespace().equals("rivencraft")
|
||||
? Component.translatable("generator.rivencraft." + generationProfile.getPath())
|
||||
@@ -242,11 +270,15 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
||||
.filter(candidate -> candidate.kind() == WritingEntry.Kind.SYMBOL).count() - 1;
|
||||
SymbolDisplayMetadata display = symbolIndex < writingSymbols.size()
|
||||
? writingSymbols.get(symbolIndex) : SymbolDisplayMetadata.unresolved(entry.symbol().orElseThrow());
|
||||
int color = display.resolved() ? BOOK_TEXT_COLOR : UNRESOLVED_TEXT_COLOR;
|
||||
drawWrappedWithoutShadow(graphics, Component.translatable(display.nameTranslationKey()),
|
||||
x, top + 39, 126, color);
|
||||
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
||||
x, top + 64, 126, color);
|
||||
graphics.enableScissor(left + 174, top + 26, left + 306, top + 172);
|
||||
int textureSize = display.resolved() ? 128 : 16;
|
||||
graphics.blit(SymbolPageTextures.forDisplay(display), left + 177, top + 29,
|
||||
128, 128, 0, 0, textureSize, textureSize, textureSize, textureSize);
|
||||
if (!display.resolved()) {
|
||||
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
||||
x, top + 151, 126, UNRESOLVED_TEXT_COLOR);
|
||||
}
|
||||
graphics.disableScissor();
|
||||
}
|
||||
|
||||
private void turnPage(int direction) {
|
||||
|
||||
@@ -43,6 +43,8 @@ public final class RivencraftCommands {
|
||||
source.sendSuccess(() -> Component.literal(
|
||||
(loaded ? "[loaded] " : "[unloaded] ")
|
||||
+ age.name() + " — " + age.dimensionId()
|
||||
+ (age.seasonMode() == null ? "" : " (season: "
|
||||
+ age.seasonMode().name().toLowerCase(java.util.Locale.ROOT) + ")")
|
||||
), false);
|
||||
}
|
||||
return ages.size();
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.book.AgeSeasonMode;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import sereneseasons.api.season.Season;
|
||||
import sereneseasons.config.SeasonsConfig;
|
||||
import sereneseasons.init.ModConfig;
|
||||
import sereneseasons.season.SeasonHandler;
|
||||
import sereneseasons.season.SeasonSavedData;
|
||||
import sereneseasons.season.SeasonTime;
|
||||
|
||||
/** Isolates references to optional Serene Seasons and GlitchCore classes. */
|
||||
final class SereneSeasonsAdapter {
|
||||
private static final String WHITELIST_KEY = "dimension_settings.whitelisted_dimensions";
|
||||
|
||||
private SereneSeasonsAdapter() {
|
||||
}
|
||||
|
||||
static boolean setServerWhitelist(ResourceLocation dimensionId, boolean enabled) {
|
||||
SeasonsConfig config = ModConfig.seasons;
|
||||
if (config == null || config.whitelistedDimensions.contains(dimensionId.toString()) == enabled) return false;
|
||||
List<String> dimensions = new ArrayList<>(config.whitelistedDimensions);
|
||||
if (enabled) dimensions.add(dimensionId.toString());
|
||||
else dimensions.removeIf(dimensionId.toString()::equals);
|
||||
// GlitchCore rereads this config from disk before synchronizing new clients.
|
||||
config.set(WHITELIST_KEY, dimensions);
|
||||
config.write();
|
||||
config.whitelistedDimensions = dimensions;
|
||||
return true;
|
||||
}
|
||||
|
||||
static void setClientWhitelist(ResourceLocation dimensionId, boolean enabled) {
|
||||
SeasonsConfig config = ModConfig.seasons;
|
||||
if (config == null || config.whitelistedDimensions.contains(dimensionId.toString()) == enabled) return;
|
||||
List<String> dimensions = new ArrayList<>(config.whitelistedDimensions);
|
||||
if (enabled) dimensions.add(dimensionId.toString());
|
||||
else dimensions.removeIf(dimensionId.toString()::equals);
|
||||
config.whitelistedDimensions = dimensions;
|
||||
}
|
||||
|
||||
static void holdSeason(ServerLevel level, AgeSeasonMode mode) {
|
||||
SeasonSavedData data = SeasonHandler.getSeasonSavedData(level);
|
||||
Season.SubSeason target = switch (mode) {
|
||||
case ETERNAL_SPRING -> Season.SubSeason.MID_SPRING;
|
||||
case ETERNAL_SUMMER -> Season.SubSeason.MID_SUMMER;
|
||||
case ETERNAL_FALL -> Season.SubSeason.MID_AUTUMN;
|
||||
case ETERNAL_WINTER -> Season.SubSeason.MID_WINTER;
|
||||
default -> throw new IllegalArgumentException("Not an eternal season: " + mode);
|
||||
};
|
||||
int duration = SeasonTime.ZERO.getSubSeasonDuration();
|
||||
int midpoint = target.ordinal() * duration + duration / 2;
|
||||
// Reset well before the end of MID_* so the client never observes a
|
||||
// different sub-season; avoid marking saved data dirty every tick.
|
||||
int current = data.seasonCycleTicks;
|
||||
if (current >= midpoint && current < midpoint + duration / 4) return;
|
||||
data.seasonCycleTicks = midpoint;
|
||||
data.setDirty();
|
||||
SeasonHandler.sendSeasonUpdate(level);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.book.AgeDefinition;
|
||||
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
||||
import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
||||
import net.dnorberg.rivencraft.book.AgeSeasonMode;
|
||||
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
||||
import net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.neoforged.fml.ModList;
|
||||
import net.neoforged.neoforge.network.PacketDistributor;
|
||||
import net.neoforged.neoforge.network.registration.NetworkRegistry;
|
||||
import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||
|
||||
/** Optional, guarded bridge for Serene Seasons' per-dimension whitelist. */
|
||||
public final class SereneSeasonsCompatibility {
|
||||
private SereneSeasonsCompatibility() {
|
||||
}
|
||||
|
||||
public static void registerAge(MinecraftServer server, AgeDefinition age) {
|
||||
if (!available() || !isAge(age.dimensionId())) return;
|
||||
AgeSeasonMode mode = AgeSeasonMode.from(age);
|
||||
boolean explicit = AgeSeasonMode.hasAuthoredPage(age.plan());
|
||||
if (mode != AgeSeasonMode.NO_SEASONS && !explicit && !RivencraftConfig.autoWhitelistSereneAges()) {
|
||||
return;
|
||||
}
|
||||
boolean enabled = mode != AgeSeasonMode.NO_SEASONS;
|
||||
try {
|
||||
if (SereneSeasonsAdapter.setServerWhitelist(age.dimensionId(), enabled)) {
|
||||
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
|
||||
send(player, age.dimensionId(), enabled);
|
||||
}
|
||||
}
|
||||
if (enabled && mode.eternal()) {
|
||||
ServerLevel level = server.getLevel(AgeDimensionService.dimensionKey(age));
|
||||
if (level != null) SereneSeasonsAdapter.holdSeason(level, mode);
|
||||
}
|
||||
} catch (RuntimeException exception) {
|
||||
Rivencraft.LOGGER.warn("Could not apply Serene Seasons policy for Age {}", age.dimensionId(), exception);
|
||||
}
|
||||
}
|
||||
|
||||
public static void onLevelTickPost(LevelTickEvent.Post event) {
|
||||
if (!(event.getLevel() instanceof ServerLevel level) || !available()
|
||||
|| !isAge(level.dimension().location())) return;
|
||||
AgeDefinition age = AgeRegistrySavedData.get(level)
|
||||
.findByDimension(level.dimension().location()).orElse(null);
|
||||
if (age == null) return;
|
||||
AgeSeasonMode mode = AgeSeasonMode.from(age);
|
||||
if (!mode.eternal() || !AgeSeasonMode.hasAuthoredPage(age.plan())
|
||||
&& !RivencraftConfig.autoWhitelistSereneAges()) return;
|
||||
try {
|
||||
SereneSeasonsAdapter.holdSeason(level, mode);
|
||||
} catch (RuntimeException exception) {
|
||||
Rivencraft.LOGGER.warn("Could not hold Serene season in Age {}", age.dimensionId(), exception);
|
||||
}
|
||||
}
|
||||
|
||||
public static void acceptClient(ResourceLocation dimensionId, boolean enabled) {
|
||||
if (available() && isAge(dimensionId)) {
|
||||
SereneSeasonsAdapter.setClientWhitelist(dimensionId, enabled);
|
||||
}
|
||||
}
|
||||
|
||||
private static void send(ServerPlayer player, ResourceLocation dimensionId, boolean enabled) {
|
||||
if (NetworkRegistry.hasChannel(player.connection, SereneAgeWhitelistPayload.TYPE.id())) {
|
||||
PacketDistributor.sendToPlayer(player, new SereneAgeWhitelistPayload(dimensionId, enabled));
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean available() {
|
||||
return ModList.get().isLoaded("sereneseasons");
|
||||
}
|
||||
|
||||
private static boolean isAge(ResourceLocation dimensionId) {
|
||||
return dimensionId.getNamespace().equals(Rivencraft.MOD_ID)
|
||||
&& dimensionId.getPath().startsWith("age/");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.neoforged.fml.ModList;
|
||||
|
||||
/** Optional boundary: core Age code never loads TerraBlender API classes. */
|
||||
public final class TerraBlenderBiomes {
|
||||
private static final AtomicBoolean WARNED = new AtomicBoolean();
|
||||
private TerraBlenderBiomes() {}
|
||||
|
||||
public static List<ResourceLocation> overworld(RegistryAccess registries) {
|
||||
return collect(registries, false);
|
||||
}
|
||||
|
||||
public static List<ResourceLocation> nether(RegistryAccess registries) {
|
||||
return collect(registries, true);
|
||||
}
|
||||
|
||||
private static List<ResourceLocation> collect(RegistryAccess registries, boolean nether) {
|
||||
if (!ModList.get().isLoaded("terrablender")) return List.of();
|
||||
try {
|
||||
return TerraBlenderRegionAdapter.collect(registries, nether);
|
||||
} catch (RuntimeException | LinkageError exception) {
|
||||
if (WARNED.compareAndSet(false, true))
|
||||
Rivencraft.LOGGER.warn("TerraBlender biome regions could not be read; using Rivencraft's biome pool", exception);
|
||||
return List.of();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import terrablender.api.Region;
|
||||
import terrablender.api.RegionType;
|
||||
import terrablender.api.Regions;
|
||||
|
||||
/** Loaded only after the optional TerraBlender mod is confirmed present. */
|
||||
final class TerraBlenderRegionAdapter {
|
||||
private TerraBlenderRegionAdapter() {}
|
||||
|
||||
static List<ResourceLocation> collect(RegistryAccess registries, boolean nether) {
|
||||
var biomes = registries.registryOrThrow(Registries.BIOME);
|
||||
RegionType type = nether ? RegionType.NETHER : RegionType.OVERWORLD;
|
||||
Set<ResourceLocation> ids = new LinkedHashSet<>();
|
||||
for (Region region : Regions.get(type)) {
|
||||
region.addBiomes(biomes, mapping -> {
|
||||
ResourceKey<Biome> key = mapping.getSecond();
|
||||
ResourceLocation id = key.location();
|
||||
// Vanilla's default region is always present. Only additions from
|
||||
// other mods extend an Age's existing deterministic biome pool.
|
||||
if (!id.getNamespace().equals("minecraft") && biomes.containsKey(id)) ids.add(id);
|
||||
});
|
||||
}
|
||||
return ids.stream().sorted().toList();
|
||||
}
|
||||
}
|
||||
@@ -68,7 +68,7 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public void registerExtraIngredients(IExtraIngredientRegistration registration) {
|
||||
List<ItemStack> pages = new ArrayList<>();
|
||||
pages.add(PageItem.createLinkPanelPage());
|
||||
pages.addAll(PageItem.creativeLinkPanelPages());
|
||||
var connection = Minecraft.getInstance().getConnection();
|
||||
if (connection != null) {
|
||||
pages.addAll(PageItem.creativeSymbolPages(connection.registryAccess()));
|
||||
|
||||
@@ -17,6 +17,7 @@ public final class RivencraftConfig {
|
||||
private static final ModConfigSpec.EnumValue<ReturnLinkMode> RETURN_LINK_MODE;
|
||||
private static final ModConfigSpec.IntValue SYMBOL_INK_COST;
|
||||
private static final ModConfigSpec.IntValue LINK_PANEL_INK_COST;
|
||||
private static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES;
|
||||
|
||||
static {
|
||||
ModConfigSpec.Builder builder = new ModConfigSpec.Builder();
|
||||
@@ -33,6 +34,12 @@ public final class RivencraftConfig {
|
||||
LINK_PANEL_INK_COST = builder.comment("Ink units consumed when preparing one baseline link-panel page.")
|
||||
.defineInRange("link_panel_ink_cost", 2, 1, 16);
|
||||
builder.pop();
|
||||
builder.push("serene_seasons");
|
||||
AUTO_WHITELIST_SERENE_AGES = builder.comment(
|
||||
"Automatically add Rivencraft Ages to Serene Seasons' dimension whitelist when loaded.",
|
||||
"Existing entries are preserved; disabling this does not remove previously added Ages."
|
||||
).define("auto_whitelist_ages", true);
|
||||
builder.pop();
|
||||
SPEC = builder.build();
|
||||
}
|
||||
|
||||
@@ -50,4 +57,8 @@ public final class RivencraftConfig {
|
||||
public static int linkPanelInkCost() {
|
||||
return LINK_PANEL_INK_COST.get();
|
||||
}
|
||||
|
||||
public static boolean autoWhitelistSereneAges() {
|
||||
return AUTO_WHITELIST_SERENE_AGES.get();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package net.dnorberg.rivencraft.gametest;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.writing.BiomeSymbolPages;
|
||||
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;
|
||||
|
||||
@@ -92,6 +94,16 @@ public final class CoreGameTests {
|
||||
BookBinderGameTests.panelOnlyBookRetainsApplicableModifiers(helper);
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void biomePageNamespaces(GameTestHelper helper) {
|
||||
helper.assertValueEqual(BiomeSymbolPages.symbolId(ResourceLocation.parse("minecraft:desert")),
|
||||
ResourceLocation.parse("rivencraft:biome/desert"), "Vanilla biome page IDs must remain stable");
|
||||
helper.assertFalse(BiomeSymbolPages.symbolId(ResourceLocation.parse("example:orchard"))
|
||||
.equals(BiomeSymbolPages.symbolId(ResourceLocation.parse("another:orchard"))),
|
||||
"Equal biome paths from different mods must not share a page ID");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void binderRejectsConflictingGrammar(GameTestHelper helper) {
|
||||
BookBinderGameTests.conflictingGrammarKeepsBinderInputsRecoverable(helper);
|
||||
|
||||
@@ -4,7 +4,6 @@ import net.dnorberg.rivencraft.block.entity.InkMixerBlockEntity;
|
||||
import net.dnorberg.rivencraft.menu.InkMixerMenu;
|
||||
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
@@ -111,8 +110,9 @@ public final class InkMixerGameTests {
|
||||
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking result must give a Link Panel");
|
||||
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
|
||||
"Taking result must use exactly one paper");
|
||||
helper.assertValueEqual(mixer.inkRemaining(), 16 - WritingInkService.linkPanelCost(),
|
||||
"Taking result must spend the configured ink cost");
|
||||
helper.assertValueEqual(mixer.inkRemaining(), 0,
|
||||
"Taking one panel must spend the entire Ink Vial");
|
||||
helper.assertFalse(mixer.canCreateLinkPanel(), "A second panel needs another Ink Vial");
|
||||
var saved = mixer.saveWithoutMetadata(helper.getLevel().registryAccess());
|
||||
var restored = new InkMixerBlockEntity(mixer.getBlockPos(), ModBlocks.INK_MIXER.get().defaultBlockState());
|
||||
restored.loadWithComponents(saved, helper.getLevel().registryAccess());
|
||||
@@ -122,6 +122,24 @@ public final class InkMixerGameTests {
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void eachLinkPanelConsumesOneInkVial(GameTestHelper helper) {
|
||||
InkMixerBlockEntity mixer = place(helper);
|
||||
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 3));
|
||||
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get(), 2));
|
||||
helper.assertTrue(mixer.canCreateLinkPanel(), "First vial must enable the first panel");
|
||||
helper.assertTrue(mixer.consumeLinkPanelMaterials(), "First panel must be produced");
|
||||
helper.assertValueEqual(mixer.inkRemaining(), 16, "Second vial must refill after first panel");
|
||||
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.BOTTLES).getCount(), 2,
|
||||
"Both spent vials must return bottles");
|
||||
helper.assertTrue(mixer.consumeLinkPanelMaterials(), "Second panel must be produced");
|
||||
helper.assertValueEqual(mixer.inkRemaining(), 0, "Second panel must use the whole second vial");
|
||||
helper.assertFalse(mixer.canCreateLinkPanel(), "Two vials must not make a third panel");
|
||||
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
|
||||
"Each panel must also use one paper");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void bottleCapacityBlocksAndThenPermitsRefill(GameTestHelper helper) {
|
||||
InkMixerBlockEntity mixer = place(helper);
|
||||
|
||||
@@ -5,8 +5,10 @@ import com.mojang.serialization.JsonOps;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.book.AgeReference;
|
||||
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||
import net.dnorberg.rivencraft.writing.PageContent;
|
||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||
@@ -42,6 +44,20 @@ public final class WritingDataGameTests {
|
||||
private WritingDataGameTests() {
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void creativeLinkPanelsIncludeEveryActiveModifierCombination(GameTestHelper helper) {
|
||||
List<ItemStack> pages = PageItem.creativeLinkPanelPages();
|
||||
helper.assertValueEqual(pages.size(), 8, "The base panel and seven modifier combinations must be listed");
|
||||
helper.assertTrue(pages.stream().allMatch(page -> PageItem.content(page).kind()
|
||||
== PageContent.Kind.LINK_PANEL), "All variants must be usable Link Panels");
|
||||
Set<Integer> flags = pages.stream().map(page -> page.getOrDefault(
|
||||
ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE).flags())
|
||||
.collect(java.util.stream.Collectors.toSet());
|
||||
helper.assertValueEqual(flags, Set.of(0, 1, 4, 8, 5, 9, 12, 13),
|
||||
"Every active modifier combination must be represented exactly once");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void orderedWritingPreservesKnownUnknownAndLinkPanelEntries(GameTestHelper helper) {
|
||||
SymbolReference known = reference("rivencraft:terrain/standard");
|
||||
|
||||
@@ -99,8 +99,11 @@ public final class WritingGrammarGameTests {
|
||||
WritingEntry.symbol(nativeBiomes)), WritingGrammar.Code.CONFLICT);
|
||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(plains),
|
||||
WritingEntry.symbol(forest), WritingEntry.symbol(single)), WritingGrammar.Code.CONFLICT);
|
||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(caves),
|
||||
WritingEntry.symbol(caves)), WritingGrammar.Code.DUPLICATE);
|
||||
WritingGrammar.Result repeatedFeatures = parse(resolver, WritingEntry.linkPanel(),
|
||||
WritingEntry.symbol(caves), WritingEntry.symbol(caves));
|
||||
helper.assertTrue(repeatedFeatures.canCreate(), "Repeated feature pages must remain authorable");
|
||||
helper.assertValueEqual(repeatedFeatures.symbols().size(), 2,
|
||||
"Repeated feature pages must remain separate ordered symbols");
|
||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(ref("test:missing"))),
|
||||
WritingGrammar.Code.UNRESOLVED);
|
||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(displayOnly)),
|
||||
|
||||
@@ -11,7 +11,9 @@ import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.writing.PageContent;
|
||||
@@ -25,9 +27,11 @@ import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
@@ -36,6 +40,10 @@ import net.minecraft.world.item.TooltipFlag;
|
||||
public final class PageItem extends Item {
|
||||
private static final ResourceLocation BIOME_GENERATION_CATEGORY =
|
||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome_generation");
|
||||
private static final ResourceLocation CAVE_BIOME_CATEGORY =
|
||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "cave_biome");
|
||||
private static final ResourceLocation BIOME_CATEGORY =
|
||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome");
|
||||
private static final Map<String, CreativeSymbol> CREATIVE_SYMBOLS = loadCreativeSymbols();
|
||||
|
||||
private record CreativeSymbol(SymbolDisplayMetadata display, ResourceLocation creativeCategory) {}
|
||||
@@ -62,10 +70,14 @@ public final class PageItem extends Item {
|
||||
.collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
|
||||
categories.add(BlockSymbolPages.CATEGORY);
|
||||
categories.add(BlockSymbolPages.FLUID_CATEGORY);
|
||||
categories.add(CAVE_BIOME_CATEGORY);
|
||||
return List.copyOf(categories);
|
||||
}
|
||||
|
||||
public static ItemStack bundledCreativeCategoryIcon(ResourceLocation category) {
|
||||
if (category.equals(CAVE_BIOME_CATEGORY)) {
|
||||
return createCreativeBiomePage(ResourceLocation.withDefaultNamespace("lush_caves"));
|
||||
}
|
||||
if (category.equals(BlockSymbolPages.CATEGORY) || category.equals(BlockSymbolPages.FLUID_CATEGORY)) {
|
||||
return createCreativeBlockPage(ResourceLocation.withDefaultNamespace(
|
||||
category.equals(BlockSymbolPages.FLUID_CATEGORY) ? "water" : "stone"));
|
||||
@@ -90,8 +102,7 @@ public final class PageItem extends Item {
|
||||
Set<String> bundled = CREATIVE_SYMBOLS.keySet();
|
||||
registries.lookupOrThrow(Registries.BIOME).listElements()
|
||||
.map(holder -> holder.key().location())
|
||||
.filter(id -> id.getNamespace().equals("minecraft"))
|
||||
.filter(id -> !bundled.contains("biome/" + id.getPath()))
|
||||
.filter(id -> !bundled.contains(BiomeSymbolPages.symbolId(id).getPath()))
|
||||
.sorted()
|
||||
.forEach(id -> pages.add(createCreativeBiomePage(id)));
|
||||
return pages;
|
||||
@@ -103,11 +114,34 @@ public final class PageItem extends Item {
|
||||
return BlockSymbolPages.availableBlocks(category).stream()
|
||||
.map(PageItem::createCreativeBlockPage).toList();
|
||||
}
|
||||
Set<ResourceLocation> caveBiomes = category.equals(BIOME_CATEGORY) || category.equals(CAVE_BIOME_CATEGORY)
|
||||
? caveBiomeIds(registries) : Set.of();
|
||||
return creativeBundledAndBiomePages(registries).stream()
|
||||
.filter(page -> category.equals(creativeCategory(page)))
|
||||
.filter(page -> category.equals(creativeCategory(page, caveBiomes)))
|
||||
.toList();
|
||||
}
|
||||
|
||||
public static ResourceLocation creativeCategory(ItemStack page, HolderLookup.Provider registries) {
|
||||
return creativeCategory(page, caveBiomeIds(registries));
|
||||
}
|
||||
|
||||
private static ResourceLocation creativeCategory(ItemStack page, Set<ResourceLocation> caveBiomes) {
|
||||
ResourceLocation category = creativeCategory(page);
|
||||
if (!category.equals(BIOME_CATEGORY)) return category;
|
||||
ResourceLocation symbolId = content(page).symbol().orElseThrow().id();
|
||||
ResourceLocation biomeId = BiomeSymbolPages.biomeId(symbolId);
|
||||
return caveBiomes.contains(biomeId) ? CAVE_BIOME_CATEGORY : category;
|
||||
}
|
||||
|
||||
private static Set<ResourceLocation> caveBiomeIds(HolderLookup.Provider registries) {
|
||||
LinkedHashSet<ResourceLocation> ids = new LinkedHashSet<>();
|
||||
registries.lookupOrThrow(Registries.BIOME).listElements()
|
||||
.filter(holder -> holder.is(AgeBiomeSelection.CAVE_BIOMES) || holder.is(BiomeTags.IS_NETHER))
|
||||
.forEach(holder -> ids.add(holder.key().location()));
|
||||
if (registries instanceof RegistryAccess access) ids.addAll(TerraBlenderBiomes.nether(access));
|
||||
return ids;
|
||||
}
|
||||
|
||||
public static ResourceLocation creativeCategory(ItemStack page) {
|
||||
SymbolDisplayMetadata metadata = page.get(ModDataComponents.PAGE_SYMBOL_DISPLAY.get());
|
||||
if (metadata == null) throw new IllegalArgumentException("Page has no symbol display metadata");
|
||||
@@ -176,6 +210,27 @@ public final class PageItem extends Item {
|
||||
return create(PageContent.LINK_PANEL);
|
||||
}
|
||||
|
||||
/** Every Link Panel modifier combination the Ink Mixer can produce. */
|
||||
public static List<ItemStack> creativeLinkPanelPages() {
|
||||
int[] flags = {
|
||||
0,
|
||||
LinkProperties.DISARM,
|
||||
LinkProperties.MAINTAIN_MOMENTUM,
|
||||
LinkProperties.INTRA_LINKING,
|
||||
LinkProperties.DISARM | LinkProperties.MAINTAIN_MOMENTUM,
|
||||
LinkProperties.DISARM | LinkProperties.INTRA_LINKING,
|
||||
LinkProperties.MAINTAIN_MOMENTUM | LinkProperties.INTRA_LINKING,
|
||||
LinkProperties.DISARM | LinkProperties.MAINTAIN_MOMENTUM | LinkProperties.INTRA_LINKING
|
||||
};
|
||||
List<ItemStack> pages = new ArrayList<>(flags.length);
|
||||
for (int flag : flags) {
|
||||
ItemStack page = createLinkPanelPage();
|
||||
if (flag != 0) page.set(ModDataComponents.LINK_PROPERTIES.get(), new LinkProperties(flag));
|
||||
pages.add(page);
|
||||
}
|
||||
return pages;
|
||||
}
|
||||
|
||||
/** Restores saved unknown references without granting them validity for new writing operations. */
|
||||
public static ItemStack createRecoveredPage(SymbolReference reference) {
|
||||
return create(PageContent.unresolved(reference));
|
||||
|
||||
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.menu;
|
||||
import java.util.Optional;
|
||||
import net.dnorberg.rivencraft.block.entity.BookBinderBlockEntity;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.registry.ModMenus;
|
||||
import net.dnorberg.rivencraft.writing.PageContent;
|
||||
@@ -33,6 +34,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
||||
private final Container inputs;
|
||||
private final SimpleContainer result = new SimpleContainer(1);
|
||||
private final boolean clientSide;
|
||||
private final Player bookAuthor;
|
||||
private int selectedPage = -1;
|
||||
private int grammarErrorCode = -1;
|
||||
private int grammarErrorStripIndex = -1;
|
||||
@@ -47,6 +49,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
||||
this.binder = binder;
|
||||
inputs = binder == null ? new SimpleContainer(BookBinderBlockEntity.SIZE) : binder;
|
||||
clientSide = inventory.player.level().isClientSide;
|
||||
bookAuthor = inventory.player;
|
||||
addDataSlot(new DataSlot() {
|
||||
@Override public int get() { return selectedPage; }
|
||||
@Override public void set(int value) { selectedPage = value; }
|
||||
@@ -167,6 +170,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
||||
refreshResult();
|
||||
if (!binder.canAssemble()) return ItemStack.EMPTY;
|
||||
ItemStack book = binder.previewBook();
|
||||
book.set(ModDataComponents.BOOK_AUTHOR.get(), player.getGameProfile().getName());
|
||||
ItemStack remainder = book.copy();
|
||||
if (!moveItemStackTo(remainder, PLAYER_START, slots.size(), true) || !remainder.isEmpty()) {
|
||||
return ItemStack.EMPTY;
|
||||
@@ -221,6 +225,9 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
||||
private void refreshResult() {
|
||||
if (clientSide) return;
|
||||
ItemStack preview = binder == null ? ItemStack.EMPTY : binder.previewBook();
|
||||
if (!preview.isEmpty()) {
|
||||
preview.set(ModDataComponents.BOOK_AUTHOR.get(), bookAuthor.getGameProfile().getName());
|
||||
}
|
||||
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||
import net.dnorberg.rivencraft.client.ClientLinkPreviewHandler;
|
||||
import net.dnorberg.rivencraft.client.ClientBookInteractionHandler;
|
||||
import net.dnorberg.rivencraft.client.ClientAgeCelestialAngles;
|
||||
import net.dnorberg.rivencraft.client.ClientSereneAgeWhitelist;
|
||||
import net.dnorberg.rivencraft.client.ClientWritingDeskCatalog;
|
||||
import net.dnorberg.rivencraft.event.AgeCelestialAngleSync;
|
||||
import net.dnorberg.rivencraft.item.DescriptiveBookItem;
|
||||
@@ -58,7 +59,7 @@ public final class ModNetworking {
|
||||
}
|
||||
|
||||
public static void register(RegisterPayloadHandlersEvent event) {
|
||||
PayloadRegistrar registrar = event.registrar("13");
|
||||
PayloadRegistrar registrar = event.registrar("15");
|
||||
registrar.playToServer(RequestDescriptiveBookScreenPayload.TYPE, RequestDescriptiveBookScreenPayload.STREAM_CODEC,
|
||||
ModNetworking::requestDescriptiveBookScreen);
|
||||
registrar.playToClient(OpenDescriptiveBookScreenPayload.TYPE, OpenDescriptiveBookScreenPayload.STREAM_CODEC,
|
||||
@@ -78,6 +79,8 @@ public final class ModNetworking {
|
||||
ClientLinkPreviewHandler::handle);
|
||||
registrar.playToClient(AgeCelestialAnglePayload.TYPE, AgeCelestialAnglePayload.STREAM_CODEC,
|
||||
ClientAgeCelestialAngles::handle);
|
||||
registrar.playToClient(SereneAgeWhitelistPayload.TYPE, SereneAgeWhitelistPayload.STREAM_CODEC,
|
||||
ClientSereneAgeWhitelist::handle);
|
||||
registrar.playToClient(WritingDeskCatalogPayload.TYPE, WritingDeskCatalogPayload.STREAM_CODEC,
|
||||
ClientWritingDeskCatalog::handle);
|
||||
registrar.playToServer(SetBookBinderTitlePayload.TYPE, SetBookBinderTitlePayload.STREAM_CODEC,
|
||||
@@ -111,8 +114,9 @@ public final class ModNetworking {
|
||||
// Requests run on the same server thread as Age creation. A request queued
|
||||
// during generation can only open the finished book, never a stale client copy.
|
||||
player.inventoryMenu.broadcastChanges();
|
||||
List<SymbolDisplayMetadata> writingSymbols = access.stack()
|
||||
.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY).entries().stream()
|
||||
OrderedWriting writing = access.stack()
|
||||
.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||
List<SymbolDisplayMetadata> writingSymbols = writing.entries().stream()
|
||||
.filter(entry -> entry.kind() == WritingEntry.Kind.SYMBOL)
|
||||
.map(entry -> SymbolCatalog.display(entry.symbol().orElseThrow()))
|
||||
.toList();
|
||||
@@ -165,6 +169,7 @@ public final class ModNetworking {
|
||||
}
|
||||
|
||||
access.stack().set(ModDataComponents.AGE_REFERENCE.get(), reference);
|
||||
access.stack().set(ModDataComponents.BOOK_AUTHOR.get(), player.getGameProfile().getName());
|
||||
AgeRegistrySavedData.get(player.serverLevel()).find(reference.id()).ifPresent(definition ->
|
||||
access.stack().set(ModDataComponents.AGE_GENERATION_PROFILE.get(), definition.generationProfile()));
|
||||
access.stack().set(DataComponents.CUSTOM_NAME, Component.literal(title));
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package net.dnorberg.rivencraft.network;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
/** Updates an already connected client's Serene whitelist for one Age. */
|
||||
public record SereneAgeWhitelistPayload(ResourceLocation dimensionId, boolean enabled) implements CustomPacketPayload {
|
||||
public static final Type<SereneAgeWhitelistPayload> TYPE = new Type<>(
|
||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "serene_age_whitelist"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, SereneAgeWhitelistPayload> STREAM_CODEC =
|
||||
StreamCodec.of(
|
||||
(buffer, payload) -> {
|
||||
buffer.writeResourceLocation(payload.dimensionId());
|
||||
buffer.writeBoolean(payload.enabled());
|
||||
},
|
||||
buffer -> new SereneAgeWhitelistPayload(buffer.readResourceLocation(), buffer.readBoolean()));
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return TYPE;
|
||||
}
|
||||
}
|
||||
@@ -38,11 +38,12 @@ public final class ModCreativeTabs {
|
||||
CREATIVE_TABS.register("rivencraft_link_pages", () -> CreativeModeTab.builder()
|
||||
.title(Component.translatable("itemGroup.rivencraft.pages.link"))
|
||||
.icon(PageItem::createLinkPanelPage)
|
||||
.displayItems((parameters, output) -> output.accept(PageItem.createLinkPanelPage()))
|
||||
.displayItems((parameters, output) ->
|
||||
PageItem.creativeLinkPanelPages().forEach(output::accept))
|
||||
.build());
|
||||
|
||||
private static final List<String> CATEGORY_ORDER = List.of(
|
||||
"terrain", "biome", "biome_generation", "weather", "lighting", "sky", "celestial", "block", "fluid", "feature");
|
||||
"terrain", "biome", "cave_biome", "biome_generation", "weather", "season", "lighting", "sky", "celestial", "block", "fluid", "feature");
|
||||
|
||||
public static final Map<ResourceLocation, DeferredHolder<CreativeModeTab, CreativeModeTab>> SYMBOL_PAGES =
|
||||
registerSymbolPageTabs();
|
||||
|
||||
@@ -75,6 +75,12 @@ public final class ModDataComponents {
|
||||
.networkSynchronized(OrderedWriting.STREAM_CODEC)
|
||||
.cacheEncoding()
|
||||
.build());
|
||||
public static final DeferredHolder<DataComponentType<?>, DataComponentType<String>> BOOK_AUTHOR =
|
||||
DATA_COMPONENTS.register("book_author", () -> DataComponentType.<String>builder()
|
||||
.persistent(Codec.STRING)
|
||||
.networkSynchronized(ByteBufCodecs.STRING_UTF8)
|
||||
.cacheEncoding()
|
||||
.build());
|
||||
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> INK_REMAINING =
|
||||
DATA_COMPONENTS.register("ink_remaining", () -> DataComponentType.<Integer>builder()
|
||||
.persistent(Codec.intRange(0, 16))
|
||||
|
||||
@@ -3,7 +3,10 @@ package net.dnorberg.rivencraft.world;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||
import net.minecraft.world.level.levelgen.Heightmap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -29,6 +32,7 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||
import net.minecraft.world.level.levelgen.RandomState;
|
||||
import net.minecraft.world.level.levelgen.WorldgenRandom;
|
||||
import net.minecraft.world.level.levelgen.blending.Blender;
|
||||
import net.minecraft.world.level.levelgen.carver.CarvingContext;
|
||||
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
|
||||
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
||||
@@ -67,6 +71,22 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
||||
@Override
|
||||
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||
|
||||
@Override
|
||||
public CompletableFuture<ChunkAccess> fillFromNoise(Blender blender, RandomState random,
|
||||
StructureManager structures, ChunkAccess chunk) {
|
||||
CompletableFuture<ChunkAccess> filled = super.fillFromNoise(blender, random, structures, chunk);
|
||||
if (features.stream().noneMatch(choice -> AgeFeatureSelection.floatingIslands(choice.id()))) return filled;
|
||||
return filled.thenApply(result -> {
|
||||
int occurrence = 0;
|
||||
for (AgeFeatureSelection.Choice choice : features) {
|
||||
if (!AgeFeatureSelection.floatingIslands(choice.id())) continue;
|
||||
FloatingIslandFeature.generate(result, getBiomeSource(), random,
|
||||
ageSeed ^ (long) occurrence++ * 0x9E3779B97F4A7C15L, choice);
|
||||
}
|
||||
return result;
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applyCarvers(WorldGenRegion level, long seed, RandomState random, BiomeManager biomes,
|
||||
StructureManager structures, ChunkAccess chunk, GenerationStep.Carving step) {
|
||||
@@ -116,8 +136,10 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
||||
int x = chunk.getPos().getMinBlockX();
|
||||
int z = chunk.getPos().getMinBlockZ();
|
||||
BlockPos origin = new BlockPos(x, level.getMinBuildHeight(), z);
|
||||
Map<AgeFeatureSelection.Choice, Integer> occurrences = new HashMap<>();
|
||||
for (int index = 0; index < features.size(); index++) {
|
||||
AgeFeatureSelection.Choice choice = features.get(index);
|
||||
int occurrence = occurrences.merge(choice, 1, Integer::sum) - 1;
|
||||
if (AgeFeatureSelection.surfaceVegetation(choice.id())) {
|
||||
int surface = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, 8, 8);
|
||||
if (!AgeFeatureSelection.supportsSurfaceVegetation(
|
||||
@@ -148,7 +170,8 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
||||
? RarityFilter.onAverageOnceEvery(12) : modifier)
|
||||
.toList());
|
||||
long seed = ageSeed ^ (long) x * 341873128712L ^ (long) z * 132897987541L
|
||||
^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L;
|
||||
^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L
|
||||
^ (long) occurrence * 0xD1B54A32D192ED03L;
|
||||
authored.place(level, this, RandomSource.create(seed), origin);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package net.dnorberg.rivencraft.world;
|
||||
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.stream.Stream;
|
||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||
import net.minecraft.Util;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Holder;
|
||||
@@ -32,17 +34,30 @@ import net.minecraft.world.level.levelgen.structure.StructureSet;
|
||||
public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
||||
public static final MapCodec<AgeFlatChunkGenerator> CODEC = RecordCodecBuilder.mapCodec(instance ->
|
||||
instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.biomeSource),
|
||||
FlatLevelGeneratorSettings.CODEC.fieldOf("settings").forGetter(AgeFlatChunkGenerator::settings))
|
||||
FlatLevelGeneratorSettings.CODEC.fieldOf("settings").forGetter(AgeFlatChunkGenerator::settings),
|
||||
AgeFeatureSelection.Choice.CODEC.listOf().optionalFieldOf("age_features", List.of())
|
||||
.forGetter(generator -> generator.features),
|
||||
Codec.LONG.optionalFieldOf("age_seed", 0L).forGetter(generator -> generator.ageSeed))
|
||||
.apply(instance, AgeFlatChunkGenerator::new));
|
||||
|
||||
private final FlatLevelGeneratorSettings settings;
|
||||
private final List<AgeFeatureSelection.Choice> features;
|
||||
private final long ageSeed;
|
||||
|
||||
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings) {
|
||||
this(biomeSource, settings, List.of(), 0L);
|
||||
}
|
||||
|
||||
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings,
|
||||
List<AgeFeatureSelection.Choice> features, long ageSeed) {
|
||||
super(biomeSource, Util.memoize(settings::adjustGenerationSettings));
|
||||
this.settings = settings;
|
||||
this.features = List.copyOf(features);
|
||||
this.ageSeed = ageSeed;
|
||||
}
|
||||
|
||||
public FlatLevelGeneratorSettings settings() { return settings; }
|
||||
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
|
||||
|
||||
@Override
|
||||
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||
@@ -82,6 +97,12 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
||||
}
|
||||
}
|
||||
}
|
||||
int islandOccurrence = 0;
|
||||
for (AgeFeatureSelection.Choice choice : features) {
|
||||
if (!AgeFeatureSelection.floatingIslands(choice.id())) continue;
|
||||
FloatingIslandFeature.generate(chunk, biomeSource, random,
|
||||
ageSeed ^ (long) islandOccurrence++ * 0x9E3779B97F4A7C15L, choice);
|
||||
}
|
||||
return CompletableFuture.completedFuture(chunk);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
package net.dnorberg.rivencraft.world;
|
||||
|
||||
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.QuartPos;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.level.ChunkPos;
|
||||
import net.minecraft.world.level.biome.BiomeSource;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||
import net.minecraft.world.level.levelgen.Heightmap;
|
||||
import net.minecraft.world.level.levelgen.RandomState;
|
||||
|
||||
/** Adds rare, high island clusters to an existing noise terrain before its surface is built. */
|
||||
final class FloatingIslandFeature {
|
||||
private static final long SALT = 0x464C4F4154494E47L;
|
||||
private static final int SOURCE_RANGE = 3;
|
||||
private static final int CHANCE = 128;
|
||||
|
||||
private FloatingIslandFeature() {}
|
||||
|
||||
static void generate(ChunkAccess chunk, BiomeSource biomes, RandomState noise, long ageSeed,
|
||||
AgeFeatureSelection.Choice choice) {
|
||||
ChunkPos target = chunk.getPos();
|
||||
BlockState material = choice.material().map(id -> BuiltInRegistries.BLOCK.get(id).defaultBlockState())
|
||||
.orElse(null);
|
||||
for (int sourceX = target.x - SOURCE_RANGE; sourceX <= target.x + SOURCE_RANGE; sourceX++) {
|
||||
for (int sourceZ = target.z - SOURCE_RANGE; sourceZ <= target.z + SOURCE_RANGE; sourceZ++) {
|
||||
RandomSource random = random(ageSeed, sourceX, sourceZ);
|
||||
if (random.nextInt(CHANCE) != 0) continue;
|
||||
int centerX = sourceX * 16 + random.nextInt(16);
|
||||
int centerZ = sourceZ * 16 + random.nextInt(16);
|
||||
int centerY = Math.min(chunk.getMaxBuildHeight() - 30, 168 + random.nextInt(48));
|
||||
if (centerY < chunk.getMinBuildHeight() + 24) continue;
|
||||
int radiusX = 24 + random.nextInt(18);
|
||||
int radiusZ = 24 + random.nextInt(18);
|
||||
fill(chunk, biomes, noise, ageSeed, material, centerX, centerY, centerZ, radiusX, radiusZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void fill(ChunkAccess chunk, BiomeSource biomes, RandomState noise, long ageSeed,
|
||||
BlockState material,
|
||||
int centerX, int centerY, int centerZ, int radiusX, int radiusZ) {
|
||||
int originX = chunk.getPos().getMinBlockX();
|
||||
int originZ = chunk.getPos().getMinBlockZ();
|
||||
Heightmap surface = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
|
||||
Heightmap floor = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
|
||||
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||
for (int localX = 0; localX < 16; localX++) {
|
||||
int worldX = originX + localX;
|
||||
double dx = (worldX - centerX) / (double) radiusX;
|
||||
for (int localZ = 0; localZ < 16; localZ++) {
|
||||
int worldZ = originZ + localZ;
|
||||
double dz = (worldZ - centerZ) / (double) radiusZ;
|
||||
double distance = dx * dx + dz * dz;
|
||||
if (distance >= 1.0) continue;
|
||||
|
||||
// Coordinate noise keeps adjacent chunks seamless without sharing mutable RNG state.
|
||||
long detail = mix(ageSeed ^ (long) centerX * 341873128712L
|
||||
^ (long) centerZ * 132897987541L ^ (long) worldX * 42317861L
|
||||
^ (long) worldZ * 374761393L);
|
||||
int top = centerY + (int) Math.round(3 * (1 - distance)) + (int) Math.floorMod(detail, 3) - 1;
|
||||
int depth = Math.max(1, (int) Math.round(3 + 17 * Math.pow(1 - distance, 1.5)));
|
||||
var biome = biomes.getNoiseBiome(QuartPos.fromBlock(worldX), QuartPos.fromBlock(top),
|
||||
QuartPos.fromBlock(worldZ), noise.sampler());
|
||||
BlockState base = material != null ? material
|
||||
: biome.is(BiomeTags.IS_NETHER) ? Blocks.NETHERRACK.defaultBlockState()
|
||||
: biome.is(BiomeTags.IS_END) ? Blocks.END_STONE.defaultBlockState()
|
||||
: Blocks.STONE.defaultBlockState();
|
||||
BlockState soil = biome.is(BiomeTags.IS_NETHER) || biome.is(BiomeTags.IS_END)
|
||||
|| biome.is(AgeBiomeSelection.CAVE_BIOMES) ? base : Blocks.DIRT.defaultBlockState();
|
||||
BlockState cap = soil == base ? base : Blocks.GRASS_BLOCK.defaultBlockState();
|
||||
for (int y = Math.max(top - depth, chunk.getMinBuildHeight()); y <= top; y++) {
|
||||
pos.set(worldX, y, worldZ);
|
||||
if (!chunk.getBlockState(pos).isAir()) continue;
|
||||
BlockState state = y == top ? cap : y >= top - 3 ? soil : base;
|
||||
chunk.setBlockState(pos, state, false);
|
||||
surface.update(localX, y, localZ, state);
|
||||
floor.update(localX, y, localZ, state);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static RandomSource random(long ageSeed, int x, int z) {
|
||||
return RandomSource.create(mix(ageSeed ^ SALT ^ (long) x * 341873128712L
|
||||
^ (long) z * 132897987541L));
|
||||
}
|
||||
|
||||
private static long mix(long value) {
|
||||
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||
return value ^ value >>> 31;
|
||||
}
|
||||
}
|
||||
@@ -6,14 +6,27 @@ import java.util.Optional;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
/** Built-in fallback pages for registered vanilla biomes without hand-authored symbol JSON. */
|
||||
/** Registry-derived pages for biomes without hand-authored symbol JSON. */
|
||||
public final class BiomeSymbolPages {
|
||||
private static final ResourceLocation CATEGORY = ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome");
|
||||
|
||||
private BiomeSymbolPages() { }
|
||||
|
||||
public static ResourceLocation symbolId(ResourceLocation biomeId) {
|
||||
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome/" + biomeId.getPath());
|
||||
// Preserve old vanilla page IDs, while keeping modded namespaces distinct.
|
||||
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome/"
|
||||
+ (biomeId.getNamespace().equals("minecraft") ? "" : biomeId.getNamespace() + "/")
|
||||
+ biomeId.getPath());
|
||||
}
|
||||
|
||||
public static ResourceLocation biomeId(ResourceLocation symbolId) {
|
||||
String path = symbolId.getPath();
|
||||
if (!symbolId.getNamespace().equals(Rivencraft.MOD_ID) || !path.startsWith("biome/"))
|
||||
throw new IllegalArgumentException("Not a biome symbol: " + symbolId);
|
||||
path = path.substring("biome/".length());
|
||||
int separator = path.indexOf('/');
|
||||
return separator < 0 ? ResourceLocation.withDefaultNamespace(path)
|
||||
: ResourceLocation.fromNamespaceAndPath(path.substring(0, separator), path.substring(separator + 1));
|
||||
}
|
||||
|
||||
public static SymbolDefinition definition(ResourceLocation biomeId) {
|
||||
@@ -24,8 +37,11 @@ public final class BiomeSymbolPages {
|
||||
.map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
|
||||
.reduce("", String::concat);
|
||||
if (glyphWord.isEmpty()) glyphWord = "World";
|
||||
if (glyphWord.length() > 48) glyphWord = glyphWord.substring(0, 48);
|
||||
return new SymbolDefinition(SymbolDefinition.CURRENT_SCHEMA_VERSION,
|
||||
"symbol.rivencraft.biome." + path,
|
||||
biomeId.getNamespace().equals("minecraft")
|
||||
? "symbol.rivencraft.biome." + path
|
||||
: "biome." + biomeId.getNamespace() + "." + path.replace('/', '.'),
|
||||
"symbol.rivencraft.biome.generated.description",
|
||||
CATEGORY,
|
||||
Optional.of(new SymbolSemantics(SymbolSemantics.Role.BIOME,
|
||||
@@ -35,9 +51,14 @@ public final class BiomeSymbolPages {
|
||||
|
||||
public static String fallbackName(ResourceLocation symbolId) {
|
||||
String path = symbolId.getPath().substring("biome/".length());
|
||||
return Arrays.stream(path.split("_"))
|
||||
int separator = path.indexOf('/');
|
||||
String namespace = separator < 0 ? "" : path.substring(0, separator);
|
||||
if (separator >= 0) path = path.substring(separator + 1);
|
||||
String label = path.replace('/', '_');
|
||||
String name = Arrays.stream(label.split("_"))
|
||||
.filter(part -> !part.isEmpty())
|
||||
.map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
|
||||
.reduce((left, right) -> left + " " + right).orElse("Unknown") + " Biome";
|
||||
return namespace.isEmpty() ? name : name + " (" + namespace + ")";
|
||||
}
|
||||
}
|
||||
@@ -69,7 +69,6 @@ public final class SymbolCatalog {
|
||||
});
|
||||
registries.lookupOrThrow(Registries.BIOME).listElements()
|
||||
.map(holder -> holder.key().location())
|
||||
.filter(id -> id.getNamespace().equals("minecraft"))
|
||||
.forEach(id -> loaded.putIfAbsent(BiomeSymbolPages.symbolId(id),
|
||||
BiomeSymbolPages.definition(id)));
|
||||
BlockSymbolPages.availableBlocks().forEach(id -> loaded.putIfAbsent(
|
||||
|
||||
@@ -80,6 +80,8 @@ public record SymbolSemantics(Role role, Value value) {
|
||||
SKY("sky", Kind.CHOICE, "overworld", "nether", "end"),
|
||||
WEATHER("weather", Kind.CHOICE,
|
||||
"normal", "fast", "slow", "off", "always", "cloudy", "rain", "snow", "storm"),
|
||||
SEASON("season", Kind.CHOICE,
|
||||
"no_seasons", "seasons", "eternal_winter", "eternal_summer", "eternal_fall", "eternal_spring"),
|
||||
CELESTIAL("celestial", Kind.CHOICE, "normal_time"),
|
||||
PERIOD_MODIFIER("period_modifier", Kind.NUMBER),
|
||||
ANGLE_MODIFIER("angle_modifier", Kind.NUMBER),
|
||||
|
||||
@@ -2,7 +2,6 @@ package net.dnorberg.rivencraft.writing;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
@@ -37,7 +36,6 @@ public final class WritingGrammar {
|
||||
if (writing.entries().isEmpty()) return new Result(symbols, diagnostics);
|
||||
|
||||
EnumMap<Role, ParsedSymbol> singular = new EnumMap<>(Role.class);
|
||||
Set<ResourceLocation> features = new HashSet<>();
|
||||
int panels = 0;
|
||||
int lastStage = -1;
|
||||
int biomeCount = 0;
|
||||
@@ -71,15 +69,15 @@ public final class WritingGrammar {
|
||||
ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow());
|
||||
symbols.add(parsed);
|
||||
if (pendingBlock != null && role != Role.FEATURE) {
|
||||
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||
"Place this material page immediately before a compatible feature"));
|
||||
// A material page without a following feature receives a seeded compatible
|
||||
// feature when the Age plan is compiled.
|
||||
pendingBlock = null;
|
||||
}
|
||||
if (role == Role.BLOCK) {
|
||||
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")
|
||||
if (!Set.of("rocks", "surface_lakes", "deep_lakes", "lava_lakes", "floating_islands")
|
||||
.contains(feature.getPath()) || !feature.getNamespace().equals("rivencraft")) {
|
||||
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||
"This feature cannot consume a material page"));
|
||||
@@ -102,10 +100,6 @@ public final class WritingGrammar {
|
||||
+ " already supplies that category"));
|
||||
continue;
|
||||
}
|
||||
} else if (role == Role.FEATURE && !features.add(reference.id())) {
|
||||
diagnostics.add(new Diagnostic(Code.DUPLICATE, index,
|
||||
"Remove the repeated feature page " + reference.id()));
|
||||
continue;
|
||||
}
|
||||
if (role == Role.BIOME) biomeCount++;
|
||||
int stage = stage(role);
|
||||
@@ -116,8 +110,6 @@ public final class WritingGrammar {
|
||||
lastStage = stage;
|
||||
}
|
||||
}
|
||||
if (pendingBlock != null) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||
"Place this material page immediately before a compatible feature"));
|
||||
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
|
||||
"Add a Link Panel as the first page"));
|
||||
if (symbols.isEmpty()) return new Result(symbols, diagnostics);
|
||||
@@ -152,7 +144,7 @@ public final class WritingGrammar {
|
||||
|
||||
private static boolean singular(Role role) {
|
||||
return switch (role) {
|
||||
case TERRAIN, BIOME_CONTROLLER, WEATHER, LIGHTING, SKY, CELESTIAL -> true;
|
||||
case TERRAIN, BIOME_CONTROLLER, WEATHER, SEASON, LIGHTING, SKY, CELESTIAL -> true;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
@@ -167,11 +159,12 @@ public final class WritingGrammar {
|
||||
case BIOME -> 1;
|
||||
case BIOME_CONTROLLER -> 2;
|
||||
case WEATHER -> 3;
|
||||
case LIGHTING -> 4;
|
||||
case SKY -> 5;
|
||||
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER -> 6;
|
||||
case CELESTIAL -> 7;
|
||||
case BLOCK, FEATURE -> 8;
|
||||
case SEASON -> 4;
|
||||
case LIGHTING -> 5;
|
||||
case SKY -> 6;
|
||||
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER -> 7;
|
||||
case CELESTIAL -> 8;
|
||||
case BLOCK, FEATURE -> 9;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -88,6 +88,7 @@
|
||||
"screen.rivencraft.book.unwritten": "This Descriptive Book is unwritten",
|
||||
"screen.rivencraft.age.title": "Age name",
|
||||
"screen.rivencraft.age.title_hint": "Name this Age",
|
||||
"screen.rivencraft.age.unknown_author": "Unknown author",
|
||||
"screen.rivencraft.age.name_prompt": "Name this Age before writing the Descriptive Book",
|
||||
"screen.rivencraft.age.create": "Create",
|
||||
"screen.rivencraft.age.generator": "Terrain: %s",
|
||||
@@ -195,6 +196,18 @@
|
||||
"symbol.rivencraft.weather.always.description": "Keep the Age rainy.",
|
||||
"symbol.rivencraft.weather.storm": "Storm Weather",
|
||||
"symbol.rivencraft.weather.storm.description": "Keep the Age rainy and thundering.",
|
||||
"symbol.rivencraft.season.no_seasons": "No Seasons",
|
||||
"symbol.rivencraft.season.no_seasons.description": "Keep seasonal changes out of this Age.",
|
||||
"symbol.rivencraft.season.seasons": "Seasons",
|
||||
"symbol.rivencraft.season.seasons.description": "Let this Age follow its own season cycle.",
|
||||
"symbol.rivencraft.season.eternal_winter": "Eternal Winter",
|
||||
"symbol.rivencraft.season.eternal_winter.description": "Hold this Age in midwinter where the biome allows winter effects.",
|
||||
"symbol.rivencraft.season.eternal_summer": "Eternal Summer",
|
||||
"symbol.rivencraft.season.eternal_summer.description": "Hold this Age in midsummer.",
|
||||
"symbol.rivencraft.season.eternal_fall": "Eternal Fall",
|
||||
"symbol.rivencraft.season.eternal_fall.description": "Hold this Age in midautumn.",
|
||||
"symbol.rivencraft.season.eternal_spring": "Eternal Spring",
|
||||
"symbol.rivencraft.season.eternal_spring.description": "Hold this Age in midspring.",
|
||||
"symbol.rivencraft.celestial.normal_time": "Normal Time",
|
||||
"symbol.rivencraft.celestial.normal_time.description": "Use a normal-length celestial cycle.",
|
||||
"symbol.rivencraft.period.zero": "Zero Length",
|
||||
@@ -215,7 +228,7 @@
|
||||
"symbol.rivencraft.phase.setting.description": "Set the celestial phase to setting.",
|
||||
"symbol.rivencraft.feature.caves": "Caves",
|
||||
"symbol.rivencraft.feature.caves.description": "Add extra caves to the chosen noise terrain.",
|
||||
"symbol.rivencraft.block.generated.description": "Material modifier; place immediately before a compatible feature page.",
|
||||
"symbol.rivencraft.block.generated.description": "Place before a compatible feature page, or let the Age choose a compatible feature.",
|
||||
"symbol.rivencraft.feature.flowers": "Flowers",
|
||||
"symbol.rivencraft.feature.flowers.description": "Add vanilla flower patches to surface terrain.",
|
||||
"symbol.rivencraft.feature.trees": "Trees",
|
||||
@@ -230,6 +243,8 @@
|
||||
"symbol.rivencraft.feature.deep_lakes.description": "Add underground lakes using a random fluid, or specify one with a fluid page.",
|
||||
"symbol.rivencraft.feature.ravines": "Ravines",
|
||||
"symbol.rivencraft.feature.ravines.description": "Add vanilla canyon carving to noise terrain.",
|
||||
"symbol.rivencraft.feature.floating_islands": "Floating Islands",
|
||||
"symbol.rivencraft.feature.floating_islands.description": "Add high floating islands above the chosen surface terrain.",
|
||||
"symbol.rivencraft.feature.lava_lakes": "Small Lakes",
|
||||
"symbol.rivencraft.feature.lava_lakes.description": "Add small surface lakes using a random fluid, or specify one with a fluid page.",
|
||||
"generator.rivencraft.standard": "Standard",
|
||||
@@ -258,8 +273,10 @@
|
||||
"itemGroup.rivencraft.pages.link": "Rivencraft Link Pages",
|
||||
"itemGroup.rivencraft.pages.terrain": "Rivencraft Terrain Pages",
|
||||
"itemGroup.rivencraft.pages.biome": "Rivencraft Biome Pages",
|
||||
"itemGroup.rivencraft.pages.cave_biome": "Rivencraft Cave Biome Pages",
|
||||
"itemGroup.rivencraft.pages.biome_generation": "Rivencraft Biome Generation Pages",
|
||||
"itemGroup.rivencraft.pages.weather": "Rivencraft Weather Pages",
|
||||
"itemGroup.rivencraft.pages.season": "Rivencraft Season Pages",
|
||||
"itemGroup.rivencraft.pages.lighting": "Rivencraft Lighting Pages",
|
||||
"itemGroup.rivencraft.pages.sky": "Rivencraft Sky Pages",
|
||||
"itemGroup.rivencraft.pages.celestial": "Rivencraft Celestial Pages",
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.feature.floating_islands",
|
||||
"description": "symbol.rivencraft.feature.floating_islands.description",
|
||||
"category": "rivencraft:feature",
|
||||
"semantics": { "role": "feature", "value": "rivencraft:floating_islands" },
|
||||
"poem": "Terrain Elevation Island Sky"
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.eternal_fall",
|
||||
"description": "symbol.rivencraft.season.eternal_fall.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "eternal_fall" }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.eternal_spring",
|
||||
"description": "symbol.rivencraft.season.eternal_spring.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "eternal_spring" }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.eternal_summer",
|
||||
"description": "symbol.rivencraft.season.eternal_summer.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "eternal_summer" }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.eternal_winter",
|
||||
"description": "symbol.rivencraft.season.eternal_winter.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "eternal_winter" }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.no_seasons",
|
||||
"description": "symbol.rivencraft.season.no_seasons.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "no_seasons" }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"schema_version": 2,
|
||||
"name": "symbol.rivencraft.season.seasons",
|
||||
"description": "symbol.rivencraft.season.seasons.description",
|
||||
"category": "rivencraft:season",
|
||||
"semantics": { "role": "season", "value": "seasons" }
|
||||
}
|
||||
Reference in new issue
Block a user