Public Access
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b86e855907 | ||
|
|
6c3b4f1885 | ||
|
|
84a1f32732 | ||
|
|
a7b2c24915 |
No files matched your search
@@ -79,6 +79,9 @@ With JEI installed, Rivencraft displays the Ink Mixer operation in its own
|
|||||||
category and the hand-use, copying, binding, and Linking Book crafting flows in a Writing category.
|
category and the hand-use, copying, binding, and Linking Book crafting flows in a Writing category.
|
||||||
The Link Panel and individual symbol Pages, including registered vanilla biome
|
The Link Panel and individual symbol Pages, including registered vanilla biome
|
||||||
pages, appear as separately searchable JEI ingredients.
|
pages, appear as separately searchable JEI ingredients.
|
||||||
|
Creative inventory separates Link Pages and each symbol category into their own
|
||||||
|
tabs, including distinct Biome and Biome Generation tabs. Blank Pages are hidden
|
||||||
|
from creative inventory and JEI.
|
||||||
JEI is optional; vanilla crafting
|
JEI is optional; vanilla crafting
|
||||||
recipes and all writing interactions work without it. For a development client
|
recipes and all writing interactions work without it. For a development client
|
||||||
with JEI, run `./gradlew runClient -PwithJei=true`.
|
with JEI, run `./gradlew runClient -PwithJei=true`.
|
||||||
@@ -99,7 +102,8 @@ into a versioned, server-owned Age plan. The plan freezes the Age seed, resolved
|
|||||||
symbol meanings, page order, and runtime profile, so later data-pack changes do
|
symbol meanings, page order, and runtime profile, so later data-pack changes do
|
||||||
not reinterpret an existing Age. An authored terrain page selects its runtime
|
not reinterpret an existing Age. An authored terrain page selects its runtime
|
||||||
profile. Built-in pages cover Standard, Amplified, Cave, Island, Flat, and Void;
|
profile. Built-in pages cover Standard, Amplified, Cave, Island, Flat, and Void;
|
||||||
other symbol effects are scheduled for later Milestone 5 slices. The
|
authored biome, environment, and supported feature pages also affect new Ages.
|
||||||
|
Further symbol effects are scheduled for later Milestone 5 slices. The
|
||||||
writing is also stored on the book; the Descriptive Book screen's turned pages
|
writing is also stored on the book; the Descriptive Book screen's turned pages
|
||||||
show ordered symbols and unresolved IDs. The Descriptive Book screen follows
|
show ordered symbols and unresolved IDs. The Descriptive Book screen follows
|
||||||
Legacy's book spread: the title and Age details are on the left, the destination
|
Legacy's book spread: the title and Age details are on the left, the destination
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@ tasks.named('wrapper', Wrapper).configure {
|
|||||||
version = mod_version
|
version = mod_version
|
||||||
group = mod_group_id
|
group = mod_group_id
|
||||||
|
|
||||||
List<String> archivedGameTestSuites = ['linking', 'writing', 'grammar', 'desk', 'binder', 'mixer', 'recipe']
|
List<String> archivedGameTestSuites = ['linking', 'environment', 'writing', 'grammar', 'desk', 'binder', 'mixer', 'recipe']
|
||||||
List<String> selectedArchivedGameTestSuites = providers.gradleProperty('withArchivedGameTests')
|
List<String> selectedArchivedGameTestSuites = providers.gradleProperty('withArchivedGameTests')
|
||||||
.map { it.toBoolean() }.orElse(false).get() ? archivedGameTestSuites
|
.map { it.toBoolean() }.orElse(false).get() ? archivedGameTestSuites
|
||||||
: providers.gradleProperty('archivedGameTestSuites').orElse('').get()
|
: providers.gradleProperty('archivedGameTestSuites').orElse('').get()
|
||||||
|
|||||||
+28
-4
@@ -47,14 +47,16 @@ in the Binder. Bundled controls are Native, Single, Tiled, Grid, and Tiny throug
|
|||||||
Huge regions. Single needs one distinct biome; Tiled/Grid and Tiny–Huge need
|
Huge regions. Single needs one distinct biome; Tiled/Grid and Tiny–Huge need
|
||||||
two. An authored book receives seeded filler only when it falls below that
|
two. An authored book receives seeded filler only when it falls below that
|
||||||
minimum, while extra authored pages are retained as weighted entries. A book
|
minimum, while extra authored pages are retained as weighted entries. A book
|
||||||
with no biome pages selects a seeded count from 2–4 for Tiled/Grid or 2–6 for
|
with no biome pages selects a seeded count from two up to the number of
|
||||||
Tiny–Huge, capped by the number of eligible terrain biomes. Single uses one;
|
eligible biomes for Tiled/Grid and Tiny–Huge. The eligible pool comes from the
|
||||||
Native uses its preset biome pool. These random-age maximums do not truncate
|
terrain's biome preset, or `#rivencraft:cave_biomes` for Cave terrain, so future
|
||||||
|
biome integrations can expand it without changing the count rule. Single uses
|
||||||
|
one; Native uses its preset biome pool. This random-age maximum does not truncate
|
||||||
authored pages: the Binder's 27 symbol-page positions bound an authored book.
|
authored pages: the Binder's 27 symbol-page positions bound an authored book.
|
||||||
Native cannot be paired with explicit biome pages. Legacy filled Tiny–Huge to
|
Native cannot be paired with explicit biome pages. Legacy filled Tiny–Huge to
|
||||||
three; Rivencraft deliberately uses two so a pair of written biome pages stays
|
three; Rivencraft deliberately uses two so a pair of written biome pages stays
|
||||||
exactly as written.
|
exactly as written.
|
||||||
The Pages creative tab offers pages for every registered vanilla biome.
|
The Biome Pages creative tab offers pages for every registered vanilla biome.
|
||||||
Hand-authored symbol definitions take precedence; the remaining vanilla pages
|
Hand-authored symbol definitions take precedence; the remaining vanilla pages
|
||||||
are generated from the biome registry, so they do not each need a JSON file.
|
are generated from the biome registry, so they do not each need a JSON file.
|
||||||
Custom/modded biomes still require a data-pack symbol definition.
|
Custom/modded biomes still require a data-pack symbol definition.
|
||||||
@@ -79,6 +81,28 @@ eligible fallback for that load; restoring the biome recovers the original
|
|||||||
selection. Generation-version-15 Ages keep their prior registry-wide biome
|
selection. Generation-version-15 Ages keep their prior registry-wide biome
|
||||||
selection algorithm instead of being silently regenerated.
|
selection algorithm instead of being silently regenerated.
|
||||||
|
|
||||||
|
## Written environment
|
||||||
|
|
||||||
|
Lighting pages select Normal, Dark, or Bright lighting for the new Age. A Sky
|
||||||
|
page selects Minecraft's Overworld, Nether, or End sky effects; the chosen
|
||||||
|
effects also determine the destination preview backdrop. Overworld sky tint
|
||||||
|
continues to come from the destination biome. A written sky changes only that
|
||||||
|
Age's dimension type, not the source world or other Ages.
|
||||||
|
|
||||||
|
Normal, Fast, Slow, Off, Always, and Storm weather pages use the existing Age
|
||||||
|
weather controller. Zero, Half, Full, and Double Length pages set the day-cycle
|
||||||
|
period, and Nadir, Rising, Zenith, and Setting pages set its initial phase.
|
||||||
|
Repeated numeric modifiers combine in written order. A Zero Length Age keeps
|
||||||
|
the nonzero minimum clock rate that avoids client skybox bounce. Pages for
|
||||||
|
Cloudy, forced Rain, and Snow are not offered: vanilla precipitation rendering
|
||||||
|
cannot reproduce those Legacy distinctions yet, and Snow remains planned for
|
||||||
|
the optional season integrations. A data pack that supplies these unsupported
|
||||||
|
weather choices receives a binding error rather than a false success.
|
||||||
|
|
||||||
|
The category creative tabs and optional JEI page ingredients use the same generated
|
||||||
|
index of bundled environment symbols. Existing Age definitions and page-free
|
||||||
|
random Ages retain their saved or seeded environment unchanged.
|
||||||
|
|
||||||
## Persistence and reload behavior
|
## Persistence and reload behavior
|
||||||
|
|
||||||
An Age permanently stores its selected profile ID, generation version, seed,
|
An Age permanently stores its selected profile ID, generation version, seed,
|
||||||
|
|||||||
+101
-4
@@ -1,6 +1,6 @@
|
|||||||
# GameTest suites
|
# GameTest suites
|
||||||
|
|
||||||
The default dedicated-server run is a small smoke suite: 23 Rivencraft tests
|
The default dedicated-server run is a small smoke suite. Its Rivencraft tests
|
||||||
cover core linking, deterministic Age definition, writing persistence, legacy
|
cover core linking, deterministic Age definition, writing persistence, legacy
|
||||||
data migration, workstation transactions, and forged/replayed menu actions.
|
data migration, workstation transactions, and forged/replayed menu actions.
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ data migration, workstation transactions, and forged/replayed menu actions.
|
|||||||
./gradlew runGameTestServer
|
./gradlew runGameTestServer
|
||||||
```
|
```
|
||||||
|
|
||||||
The remaining 56 Rivencraft tests are archived, not deleted. They cover
|
The remaining Rivencraft tests are archived, not deleted. They cover
|
||||||
completed milestone details such as every Age terrain profile, Notebook and
|
completed milestone details such as every Age terrain profile, Notebook and
|
||||||
Desk surface interactions, refill edge cases, book assembly controls, and
|
Desk surface interactions, refill edge cases, book assembly controls, and
|
||||||
workstation break/drop behavior. Run only the relevant archive alongside the
|
workstation break/drop behavior. Run only the relevant archive alongside the
|
||||||
@@ -19,8 +19,8 @@ core tests when investigating an issue:
|
|||||||
./gradlew runGameTestServer -ParchivedGameTestSuites=grammar,binder
|
./gradlew runGameTestServer -ParchivedGameTestSuites=grammar,binder
|
||||||
```
|
```
|
||||||
|
|
||||||
Available suite names are `linking`, `writing`, `grammar`, `desk`, `binder`, `mixer`, and
|
Available suite names are `linking`, `environment`, `writing`, `grammar`, `desk`,
|
||||||
`recipe`. Run all 79 Rivencraft tests before a
|
`binder`, `mixer`, and `recipe`. Run all Rivencraft tests before a
|
||||||
release or after broad cross-system changes:
|
release or after broad cross-system changes:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
@@ -41,3 +41,100 @@ Logs and configuration remain available. Cleanup never targets a custom
|
|||||||
`-PgameTestRunDir` or a player world; callers using a custom directory manage
|
`-PgameTestRunDir` or a player world; callers using a custom directory manage
|
||||||
it themselves. The full suite should still be run
|
it themselves. The full suite should still be run
|
||||||
before shipping changes in the archived systems.
|
before shipping changes in the archived systems.
|
||||||
|
|
||||||
|
If a new GameTest stalls the server, stop that run, remove the offending
|
||||||
|
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.
|
||||||
|
|
||||||
|
## Manual Ink Mixer modifier check (Milestone 5, issue #36)
|
||||||
|
|
||||||
|
With optional JEI installed, search for the Ink Mixer category. It should show
|
||||||
|
the base paper/ink/vial operation and separate entries for Gunpowder, Mushroom
|
||||||
|
Stew, Experience Bottle, Ender Pearl, Feather, and Fire Charge,
|
||||||
|
with their property chances. Black Dye and Clay Ball should not appear: the
|
||||||
|
former had no working Legacy effect, while Generate Platform is redundant
|
||||||
|
with default Age arrival. Without JEI, Rivencraft should still
|
||||||
|
start and the mixer should work normally.
|
||||||
|
|
||||||
|
Put paper and an Ink Vial in the mixer. Hold Gunpowder on the cursor and
|
||||||
|
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
|
||||||
|
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,
|
||||||
|
link to another dimension; inventory items should drop at the departure point.
|
||||||
|
With twenty Ender Pearls added to a fresh mixture, both Disarm and Intra
|
||||||
|
Linking should show about 96.1%, and the basin should animate both property
|
||||||
|
colors. Taking a panel should reset all three percentages and clear the color
|
||||||
|
effect; a near-certain modifier should show the brighter outer animation.
|
||||||
|
Also bind a Descriptive Book with a Disarm panel and check the same drop behavior.
|
||||||
|
Bind a Descriptive Book with both Intra Linking and Maintain Momentum on its
|
||||||
|
panel: the assembled book should retain Maintain Momentum but omit Intra
|
||||||
|
Linking. For Linking Books, try an unmodified book whose destination is the
|
||||||
|
current dimension: it should refuse travel. A Linking Book with Intra Linking
|
||||||
|
should work in the same dimension. A Descriptive Book does not require or use
|
||||||
|
Intra Linking, even if an older book retained that flag.
|
||||||
|
Automatic Return Links should still appear according to the existing setting
|
||||||
|
and work from an Age back to the Overworld. A full player inventory or blocked glass-bottle slot
|
||||||
|
must not duplicate or consume materials for an output that cannot be taken.
|
||||||
|
|
||||||
|
Link Panels should not enter Notebooks (folders) or Writing Desk tabs, whether
|
||||||
|
clicked, shift-clicked, or dragged onto the page surface. An old Notebook or
|
||||||
|
Desk already holding a Link Panel should still let the player take it out,
|
||||||
|
but the Desk must not offer a copy of it. The Desk should continue to copy
|
||||||
|
ordinary symbol Pages; JEI should show that example instead of Link Panel copying.
|
||||||
|
|
||||||
|
## Manual Age unload/reload check
|
||||||
|
|
||||||
|
The automated suite does not unload a freshly generated Age. Minecraft can
|
||||||
|
queue point-of-interest block updates after generation; closing that Age's
|
||||||
|
region storage while a queued update is still pending can leave the dedicated
|
||||||
|
GameTest server waiting forever in `SectionStorage.readColumn`. Plan save/load,
|
||||||
|
terrain generation, and safe spawn remain automated; runtime unload/reload is
|
||||||
|
checked in a normal game session:
|
||||||
|
|
||||||
|
1. Back up the test world. Bind one Link-Panel-only Descriptive Book and one
|
||||||
|
Descriptive Book with a terrain page (for example, Island), using distinct
|
||||||
|
names. Bring a working way back to the Overworld.
|
||||||
|
2. Travel through each book, confirm the named Age and expected terrain, then
|
||||||
|
return to the Overworld. Close book screens and wait a few seconds.
|
||||||
|
3. With cheats enabled, run `/rivencraft age list` and record each Age's
|
||||||
|
`rivencraft:age/...` dimension ID. Run `/rivencraft age unload <dimension>`
|
||||||
|
for one Age at a time, then list again to confirm it is unloaded.
|
||||||
|
4. Reopen the same Descriptive Books and travel back. Confirm each book reaches
|
||||||
|
its original Age, the terrain and safe arrival remain intact, and no extra
|
||||||
|
Age entry was created. Save, restart the world, and repeat the book check.
|
||||||
|
|
||||||
|
## Manual feature-generation check (Milestone 5, issue #35)
|
||||||
|
|
||||||
|
The automated suite verifies feature pages, compiled and saved feature IDs,
|
||||||
|
vanilla registry mappings, unsupported combinations, and the runtime generator.
|
||||||
|
An automated scan across many newly generated chunks stalled the GameTest
|
||||||
|
server, so physical placement is handed to the player for in-game verification:
|
||||||
|
|
||||||
|
1. In a fresh world, bind a Descriptive Book with Link Panel, Standard Terrain,
|
||||||
|
Plains Biome, Single Biome, Caves, and Rocks pages in that order.
|
||||||
|
Missing weather/lighting/celestial branches may be seed-filled. Travel to
|
||||||
|
the Age and explore several fresh surface chunks: boulders made from one
|
||||||
|
seed-selected full-collision block should appear among the plains terrain.
|
||||||
|
Then explore underground in fresh
|
||||||
|
chunks; the Caves page should add a second cave-carving pass to Standard
|
||||||
|
terrain, not switch the Age to Cave terrain.
|
||||||
|
2. Make a second book with Flat Terrain and Caves. The Binder should mark the
|
||||||
|
Caves page unsupported and prevent assembly. Cave Terrain plus Caves should
|
||||||
|
be accepted; Cave Terrain plus Rocks should be rejected.
|
||||||
|
3. Return, save, and restart the world. Re-enter the first Age and explore
|
||||||
|
*new* chunks. The authored decorations should continue without rebinding.
|
||||||
|
Previously generated chunks are intentionally unchanged.
|
||||||
|
4. Title-derived terrain regression (with Create installed): with no Terrain Page, assemble Link Panel,
|
||||||
|
Glowstone, Rocks, Chocolate, Small Lakes in that order and name the Age
|
||||||
|
`glow`. The Binder should accept it and generate compatible surface terrain;
|
||||||
|
Glowstone should be the rock material and Chocolate should appear in authored
|
||||||
|
Small Lakes across fresh chunks. Ordinary vanilla lava lakes may still occur.
|
||||||
|
Repeat
|
||||||
|
with `gl` or `glo` to confirm names do not change page validity. An explicit
|
||||||
|
Flat or Cave Terrain Page with Rocks should still be rejected.
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# Ink Mixer and Link Panel modifiers (Milestone 5, issue #36)
|
||||||
|
|
||||||
|
Legacy source: [`InkEffects`](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/data/InkEffects.java), [`TileEntityInkMixer`](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/tileentity/TileEntityInkMixer.java), and [`LinkPropertyAPI`](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/api/java/com/xcompwiz/mystcraft/api/hook/LinkPropertyAPI.java).
|
||||||
|
|
||||||
|
Legacy does **not** use a conventional ingredient slot: the player clicks the ink basin with a carried item. Each accepted item is consumed immediately, changing the basin's property probabilities. A Link Panel is a virtual result; taking it consumes paper and ink, rolls each property independently using a saved next-seed, writes the selected flags to the Page, then resets that basin's mixture. The Link Panel passes those flags to a Linking Book made with leather. The preview must not roll or consume anything.
|
||||||
|
|
||||||
|
| Ingredient | Property | Chance per item |
|
||||||
|
| --- | --- | ---: |
|
||||||
|
| Gunpowder | Disarm | 20% |
|
||||||
|
| Mushroom Stew | Disarm | 5% |
|
||||||
|
| Clay Ball | Generate Platform | 25% |
|
||||||
|
| Experience Bottle | Intra Linking | 15% |
|
||||||
|
| Ender Pearl | Intra Linking + Disarm | 15% each |
|
||||||
|
| Feather | Maintain Momentum | 15% |
|
||||||
|
| Fire Charge | Disarm | 25% |
|
||||||
|
| Black dye | Empty effect key; ignored by Legacy's mixer | None in practice |
|
||||||
|
|
||||||
|
Legacy also has optional ore-dictionary dusts: brass, bronze, tin, iron, lead, silver, diamond, and gold. Their effect combinations are in `InkEffects.init()`. Forge's ore dictionary does not exist in NeoForge 1.21.1, so these should be mapped through item tags only when a suitable tag and item exist; none should become a hard dependency. The `Relative` and `Intra Linking Only` properties are registered but have no built-in ingredient. `Natural`, `External`, `Offensive`, `Op-TP`, and `Following` are internal link flags, not mixer ingredients.
|
||||||
|
|
||||||
|
For each additive, Legacy scales each existing probability by `1 - sum(additive chances)` and then adds the additive's probabilities. Properties are rolled independently on the final Page. The Legacy link effects are: Disarm drops carried inventory before travel; Generate Platform places a single arrival block if a drop exists; Maintain Momentum retains velocity; Intra Linking permits a same-dimension link.
|
||||||
|
|
||||||
|
Rivencraft deliberately diverges from Legacy's shared-probability dilution here: each supported modifier accumulates independently as `new = 1 - (1 - old) × (1 - item chance)^item count`. Twenty Ender Pearls therefore produce about 96.1% each for Disarm and Intra Linking, and a panel can receive both. Taking the panel resets every probability to zero. The GUI uses Legacy's empty-basin atlas sprite, fills the basin dark when ink is present, and projects its colored rotating D'ni effect over the ink (red Disarm, blue Momentum, green Intra); the effect intensifies as a modifier approaches certainty and disappears after output is taken.
|
||||||
|
|
||||||
|
Implementation requirements: keep the mixer server-authoritative; persist mixture probabilities and next-seed; show a deterministic virtual result; consume exact inputs once; prevent duplicate output on shift-click; preserve inputs when output cannot be taken; copy the Page's link properties into a Linking Book; apply supported properties only after destination validation; retain unmodified books' current safe-link behavior; and expose both base and modifier sequences to optional JEI. Tests should cover persistence, multiple additives, invalid items, full inventory/bottle output, and panel-to-book transfer.
|
||||||
|
|
||||||
|
## Rivencraft 0.4.7.x implementation scope
|
||||||
|
|
||||||
|
The built-in vanilla-item rows above are supported except black dye and clay balls. Legacy ignores black dye's empty effect key, so Rivencraft does not consume or advertise it in JEI. Clay Balls are omitted because Age arrival already builds a safe platform by default and a separate Generate Platform link modifier would be redundant. Right-clicking the Ink Mixer basin with a carried item adds one; left-clicking adds the carried stack. The mixture is persistent and its next panel is deterministic. The visual basin tooltip shows current probabilities. Only taking the virtual Link Panel consumes paper/ink and clears the mixture. The Link Panel's property component is copied to a Linking Book by the leather recipe or a Descriptive Book by the Binder. JEI's optional Ink Mixer category lists the base panel and each supported additive interaction with its per-property chance; Rivencraft does not require JEI to run.
|
||||||
|
|
||||||
|
Disarm and Maintain Momentum are applied by the server after confirming a safe destination. Disarm spawns each inventory stack as an item entity at the departure point, including for Descriptive Books. Intra Linking is required only for a Linking Book whose destination is in the player's current dimension; ordinary cross-dimensional Linking Books still work. The Binder treats an Intra Linking panel as an ordinary Link Panel and omits that flag from the resulting Descriptive Book, while retaining Disarm and Maintain Momentum. Automatic Return Links remain enabled under the existing configuration, as requested. The old Generate Platform bit remains readable on pre-0.4.7.1 test items but is neither rolled nor applied. Optional dust-tag mappings remain outside this built-in subset until their cross-mod tags and gameplay meaning are agreed.
|
||||||
@@ -34,10 +34,9 @@ Invalid definitions are logged and excluded by the server. Menus and future
|
|||||||
page synchronization must obtain resolved display metadata from the server;
|
page synchronization must obtain resolved display metadata from the server;
|
||||||
clients never make a symbol valid by naming it.
|
clients never make a symbol valid by naming it.
|
||||||
|
|
||||||
Rivencraft ships a small catalog covering terrain, biomes, lighting, weather,
|
Rivencraft ships a catalog covering terrain, biomes, lighting, weather,
|
||||||
celestial behavior, and features. Its v2 semantics prepare for the full
|
sky, celestial behavior, and features. The parser and compiler apply supported
|
||||||
Legacy-inspired grammar; writing still uses random Age fallback until the
|
schema-v2 pages to newly created Ages; omitted branches retain seeded defaults.
|
||||||
parser and compiler are implemented.
|
|
||||||
|
|
||||||
## Persistent writing
|
## Persistent writing
|
||||||
|
|
||||||
@@ -54,9 +53,7 @@ book copies its writing and Age reference; merely copying it never creates a
|
|||||||
new Age. The Book Binder creates the Age when its finished output is taken.
|
new Age. The Book Binder creates the Age when its finished output is taken.
|
||||||
The Descriptive Book screen can inspect the ordered pages by turning them from
|
The Descriptive Book screen can inspect the ordered pages by turning them from
|
||||||
the bottom corners and identifies unresolved IDs using server-provided symbol
|
the bottom corners and identifies unresolved IDs using server-provided symbol
|
||||||
metadata. Until Milestone 5, the
|
metadata. Page-free books continue to use random Age generation.
|
||||||
saved symbols are informational only: Age creation uses the existing random
|
|
||||||
fallback and does not apply them to generation.
|
|
||||||
|
|
||||||
Removing a data pack never removes its IDs from saved writing. A missing ID is
|
Removing a data pack never removes its IDs from saved writing. A missing ID is
|
||||||
resolved as client-safe **Unresolved Symbol** display metadata while retaining
|
resolved as client-safe **Unresolved Symbol** display metadata while retaining
|
||||||
@@ -108,7 +105,8 @@ imported at a chosen strip position; the empty Notebook remains recoverable.
|
|||||||
The preview result is virtual. Taking the completed Descriptive Book commits the
|
The preview result is virtual. Taking the completed Descriptive Book commits the
|
||||||
inputs once, creates its Age identity, and saves schema-versioned
|
inputs once, creates its Age identity, and saves schema-versioned
|
||||||
`OrderedWriting` plus the Age reference on the book. Link-Panel-only books
|
`OrderedWriting` plus the Age reference on the book. Link-Panel-only books
|
||||||
create random Ages. A written symbol does **not** yet change that generation.
|
create random Ages. Supported written pages change the corresponding Age
|
||||||
|
generation branch; missing branches use seeded defaults.
|
||||||
Inputs, title, and pending Age identity survive Binder save/load; breaking the
|
Inputs, title, and pending Age identity survive Binder save/load; breaking the
|
||||||
Binder returns stored inputs. The completed book retains both its writing and
|
Binder returns stored inputs. The completed book retains both its writing and
|
||||||
Age identity through item save/load and copying.
|
Age identity through item save/load and copying.
|
||||||
|
|||||||
+12
-4
@@ -4,10 +4,18 @@
|
|||||||
|
|
||||||
New Binder writing has at most one Link Panel plus 27 symbol pages. The Link Panel must be first. A Link-Panel-only book, or an older book with no writing component, keeps the existing random Age path. Any authored supported symbol makes the book a partial or complete grammar. From 0.4.3.0, the server compiles it into a persistent Age plan before consuming Binder inputs or generating chunks.
|
New Binder writing has at most one Link Panel plus 27 symbol pages. The Link Panel must be first. A Link-Panel-only book, or an older book with no writing component, keeps the existing random Age path. Any authored supported symbol makes the book a partial or complete grammar. From 0.4.3.0, the server compiles it into a persistent Age plan before consuming Binder inputs or generating chunks.
|
||||||
|
|
||||||
The supported order follows the representable subset of the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md): terrain; zero or more biome pages; biome controller; weather; lighting; zero or more period, angle, or phase modifiers; one celestial page; then zero or more distinct features. Biome pages precede the controller that consumes them, and celestial modifiers precede the celestial page. Terrain, controller, weather, lighting, and celestial are single-choice categories; identical repeats are duplicates and differing values conflict. Repeated modifiers are intentional. Biome pages may repeat, preserving author order and any future weighting; feature IDs may not repeat.
|
The supported order follows the representable subset of the [Legacy grammar audit](LEGACY_AGE_GRAMMAR_AUDIT.md): terrain; zero or more biome pages; biome controller; weather; lighting; sky effects; zero or more period or phase modifiers; one celestial page; then zero or more distinct features, each optionally preceded by a compatible block-material page. Biome pages precede the controller that consumes them, and celestial modifiers precede the celestial page. Terrain, controller, weather, lighting, sky, and celestial are single-choice categories; identical repeats are duplicates and differing values conflict. Repeated modifiers are intentional. Biome pages may repeat, preserving author order and any future weighting; feature IDs may not repeat. Angle modifiers remain recognized in the schema but are rejected at binding until a sky renderer can apply sun tilt.
|
||||||
|
|
||||||
Missing terrain, controller, weather, lighting, celestial, or the controller's minimum biome count is an **incomplete** warning, not an error: the compiler retains the seed-selected profile and traits for missing branches. The minimum is zero for Native, one for Single, and two for Tiled/Grid and Tiny–Huge. Native cannot consume authored biome pages; Single accepts only one. Unknown IDs, schema-v1 display-only symbols, wrong ordering, misplaced modifiers, duplicates, conflicts, missing/extra Link Panels, and oversized writing are errors. The Binder disables output and exposes the first error on the result-slot tooltip. When that error belongs to a page, its thumbnail is tinted and outlined red, the strip scrolls to it, and hovering it shows the diagnostic. This maps the parser's compact entry position back through any empty page positions. Rejected inputs remain removable. Binding an unwritten Descriptive Book rechecks its server-owned writing and reports the first error without creating an Age. A terrain symbol whose profile is unavailable is also rejected before Binder inputs are consumed.
|
Missing terrain, controller, weather, lighting, celestial, or the controller's minimum biome count is an **incomplete** warning, not an error: the compiler retains seed-selected traits for missing branches. An omitted terrain page uses a seed-selected profile compatible with authored feature pages, so changing the Age name cannot accidentally select Flat, Void, or Cave terrain for Rocks or Lakes. If no profile can support the writing, binding still rejects it. The minimum biome count is zero for Native, one for Single, and two for Tiled/Grid and Tiny–Huge. Native cannot consume authored biome pages; Single accepts only one. Unknown IDs, schema-v1 display-only symbols, wrong ordering, misplaced modifiers, duplicates, conflicts, missing/extra Link Panels, and oversized writing are errors. The Binder disables output and exposes the first error on the result-slot tooltip. When that error belongs to a page, its thumbnail is tinted and outlined red, the strip scrolls to it, and hovering it shows the diagnostic. This maps the parser's compact entry position back through any empty page positions. Rejected inputs remain removable. Binding an unwritten Descriptive Book rechecks its server-owned writing and reports the first error without creating an Age. A terrain symbol whose profile is unavailable is also rejected before Binder inputs are consumed.
|
||||||
|
|
||||||
The plan stores the original writing order, the authoritative semantic value of each resolved symbol, the Age seed, and a copy of the selected runtime profile. An explicit terrain page replaces the random terrain selection; an omitted terrain uses the seed-selected profile. The built-in Standard, Amplified, Cave, Island, Flat, and Void terrain pages now select their matching generation resources. Age loading uses the frozen runtime profile and does not need the original symbol definition or runtime-profile JSON, though its referenced noise, biome-preset, and dimension-type registry entries must remain available. Existing bound books without plans are not reinterpreted. Page-free and Link-Panel-only books keep the pre-existing random path. Biome, lighting, weather, celestial, and feature effects are retained in the plan but will be applied in issues #33–#35; instability remains Milestone 6 work.
|
The plan stores the original writing order, the authoritative semantic value of each resolved symbol, the Age seed, and a copy of the selected runtime profile. An explicit terrain page overrides random terrain selection; an omitted terrain uses a seed-selected compatible profile. The built-in Standard, Amplified, Cave, Island, Flat, and Void terrain pages select their matching generation resources. Age loading uses the frozen runtime profile and does not need the original symbol definition or runtime-profile JSON, though its referenced noise, biome-preset, and dimension-type registry entries must remain available. Existing bound books without plans are not reinterpreted. Page-free and Link-Panel-only books keep the pre-existing random path. Biome and environment pages affect new Ages, and the supported feature subset below is compiled into the same frozen plan; instability remains Milestone 6 work.
|
||||||
|
|
||||||
The Rivencraft Pages creative tab reads a generated index of bundled symbol definitions. Adding another valid JSON symbol under `src/main/resources/data/rivencraft/rivencraft/symbols/` includes its page automatically in the next build; no Java starter-page list needs updating. The server catalog still decides whether that page is valid for writing. External server data-pack symbols are not included in this bundled index.
|
## Supported feature pages (issue #35)
|
||||||
|
|
||||||
|
Feature pages come after the celestial section. Their order is retained in the plan and in decoration placement. The Caves page adds a second, Age-seeded vanilla cave-carving pass to Noise terrain, including Standard, Amplified, Island, and Cave terrain. It chooses the vanilla Overworld or Nether cave carver from the source biome. This is separate from the Milestone 7 issue about Cave **terrain** generation. Flat and Void terrain have no suitable solid noise body and reject Caves with a binder diagnostic.
|
||||||
|
|
||||||
|
Flowers, Trees, Huge Trees, Rocks, Surface Lakes, Deep Lakes, and Small Lakes add vanilla placed features after normal biome decoration. Huge Trees currently use vanilla old-growth spruce placement as a modern approximation of Legacy's huge-tree page; it is not the custom Legacy tree generator. Without a preceding material page, Rocks select a valid solid block and each lake page selects a valid source-fluid block from the registered pool. The selection is deterministic for an Age seed and feature ID, so all chunks in that Age use the same material across restarts with the same block registry. The page-specific feature preserves vanilla placement rules other than the biome-list filter, since an authored page deliberately adds it to the Age. Surface and Small Lakes use a more visible one-in-twelve-chunks attempt rate instead of vanilla lava lakes' one-in-two-hundred; Deep Lakes retain their underground placement. Vanilla biome lava lakes are separate and can still appear alongside authored fluid lakes. These decorations require surface Noise terrain; Cave, Flat, and Void reject them. Flowers and both tree pages require at least one surface Overworld biome and only run in compatible chunks; Nether, End, and tagged cave biomes do not receive surface vegetation. Ravines add a separate Age-seeded vanilla canyon-carving pass to Noise terrain. Unsupported feature IDs and missing vanilla registry entries produce diagnostics instead of becoming no-ops.
|
||||||
|
|
||||||
|
Material pages are generated for registered full-collision, non-fluid blocks and genuine source-fluid blocks, including eligible blocks supplied by other mods. Blocks with block entities are excluded. Waterlogged plants and coral are not fluid blocks and receive no pages. Valid source-fluid blocks appear only in the Fluid Pages creative tab; valid full-collision solids appear only in Block Pages. Both categories use the same saved material-page semantics. Put a Block Page immediately before Rocks to choose a rock material, or a Fluid Page immediately before Surface Lakes, Deep Lakes, or Small Lakes to choose a lake fluid. A material page left alone, placed before a different category, or attached to an incompatible feature is rejected. Both the feature and material ID are frozen in the saved plan, so future chunks retain their choice after restart. Existing chunks are not retroactively decorated. Custom structures, crystals, portals, and the Cave-terrain bug are outside this slice.
|
||||||
|
|
||||||
|
The Rivencraft symbol-page creative tabs read a generated index of bundled symbol definitions and group Pages by each definition's category, except biome-controller roles, which appear in a separate Biome Generation tab rather than the Biome tab. Adding another valid JSON symbol under `src/main/resources/data/rivencraft/rivencraft/symbols/` includes its page in the matching category tab on the next build; a new bundled category receives its own tab. Registry-derived Block and Fluid Pages have separate tabs and both appear in optional JEI. Link Pages have a separate tab. Blank Pages appear in neither the creative tabs nor JEI's ingredient list. The server catalog still decides whether a page is valid for writing. External server data-pack symbols are not included in this bundled index.
|
||||||
+1
-1
@@ -36,7 +36,7 @@ mod_name=Rivencraft
|
|||||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||||
mod_license=LGPL-3.0-or-later
|
mod_license=LGPL-3.0-or-later
|
||||||
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
||||||
mod_version=0.4.5.3
|
mod_version=0.4.7.3
|
||||||
immersive_portals_version=6.0.7
|
immersive_portals_version=6.0.7
|
||||||
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
# 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.
|
# This should match the base package used for the mod sources.
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import net.minecraft.core.NonNullList;
|
|||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.resources.ResourceKey;
|
import net.minecraft.resources.ResourceKey;
|
||||||
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
import net.minecraft.tags.BiomeTags;
|
import net.minecraft.tags.BiomeTags;
|
||||||
import net.minecraft.core.component.DataComponents;
|
import net.minecraft.core.component.DataComponents;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
@@ -151,7 +152,7 @@ public final class BookBinderBlockEntity extends BlockEntity implements Containe
|
|||||||
var selectedProfile = terrain.isPresent()
|
var selectedProfile = terrain.isPresent()
|
||||||
? ((SymbolSemantics.ResourceValue) terrain.orElseThrow().semantics().value()).id()
|
? ((SymbolSemantics.ResourceValue) terrain.orElseThrow().semantics().value()).id()
|
||||||
: level instanceof ServerLevel serverLevel
|
: level instanceof ServerLevel serverLevel
|
||||||
? AgeRegistrySavedData.previewGenerationProfile(serverLevel, title)
|
? AgeRegistrySavedData.previewGenerationProfile(serverLevel, title, currentWriting())
|
||||||
: AgeGenerationProfiles.STANDARD;
|
: AgeGenerationProfiles.STANDARD;
|
||||||
var runtimeProfile = AgeRuntimeProfiles.profiles().get(selectedProfile);
|
var runtimeProfile = AgeRuntimeProfiles.profiles().get(selectedProfile);
|
||||||
boolean cave = runtimeProfile != null && AgeBiomeSelection.isCave(runtimeProfile);
|
boolean cave = runtimeProfile != null && AgeBiomeSelection.isCave(runtimeProfile);
|
||||||
@@ -168,6 +169,33 @@ public final class BookBinderBlockEntity extends BlockEntity implements Containe
|
|||||||
symbol.index(), "Cave Ages require cave or Nether biomes; remove " + id));
|
symbol.index(), "Cave Ages require cave or Nether biomes; remove " + id));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if (runtimeProfile != null) {
|
||||||
|
parsed.symbols().stream().filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.FEATURE)
|
||||||
|
.forEach(symbol -> {
|
||||||
|
var id = ((SymbolSemantics.ResourceValue) symbol.semantics().value()).id();
|
||||||
|
String error = AgeFeatureSelection.error(id, runtimeProfile, level.registryAccess());
|
||||||
|
if (error != null) diagnostics.add(new WritingGrammar.Diagnostic(
|
||||||
|
WritingGrammar.Code.UNSUPPORTED_FEATURE, symbol.index(), error));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// Compile against the actual title-derived Age seed as a final compatibility
|
||||||
|
// check. This also pinpoints biome-pool conflicts that cannot be inferred from
|
||||||
|
// an individual feature page alone (for example Trees with only Nether biomes).
|
||||||
|
if (level instanceof ServerLevel serverLevel && diagnostics.stream().noneMatch(
|
||||||
|
diagnostic -> diagnostic.code() == WritingGrammar.Code.UNSUPPORTED_FEATURE)) {
|
||||||
|
try {
|
||||||
|
AgeRegistrySavedData.validateNewWriting(serverLevel, title, currentWriting());
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
if (exception.getMessage() != null && (exception.getMessage().startsWith("Feature ")
|
||||||
|
|| exception.getMessage().startsWith("Caves "))) {
|
||||||
|
parsed.symbols().stream().filter(symbol -> symbol.semantics().role()
|
||||||
|
== SymbolSemantics.Role.FEATURE).findFirst().ifPresent(symbol ->
|
||||||
|
diagnostics.add(new WritingGrammar.Diagnostic(
|
||||||
|
WritingGrammar.Code.UNSUPPORTED_FEATURE, symbol.index(),
|
||||||
|
exception.getMessage())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return new WritingGrammar.Result(parsed.symbols(), diagnostics);
|
return new WritingGrammar.Result(parsed.symbols(), diagnostics);
|
||||||
}
|
}
|
||||||
@@ -210,6 +238,11 @@ public final class BookBinderBlockEntity extends BlockEntity implements Containe
|
|||||||
ItemStack book = new ItemStack(ModItems.DESCRIPTIVE_BOOK.get());
|
ItemStack book = new ItemStack(ModItems.DESCRIPTIVE_BOOK.get());
|
||||||
book.set(ModDataComponents.AGE_REFERENCE.get(), new AgeReference(pendingAgeId, title));
|
book.set(ModDataComponents.AGE_REFERENCE.get(), new AgeReference(pendingAgeId, title));
|
||||||
book.set(ModDataComponents.BOOK_WRITING.get(), currentWriting());
|
book.set(ModDataComponents.BOOK_WRITING.get(), currentWriting());
|
||||||
|
if (items.get(LINK_PANEL).has(ModDataComponents.LINK_PROPERTIES.get())) {
|
||||||
|
var properties = items.get(LINK_PANEL).get(ModDataComponents.LINK_PROPERTIES.get())
|
||||||
|
.forDescriptiveBook();
|
||||||
|
if (properties.flags() != 0) book.set(ModDataComponents.LINK_PROPERTIES.get(), properties);
|
||||||
|
}
|
||||||
book.set(DataComponents.CUSTOM_NAME, Component.literal(title));
|
book.set(DataComponents.CUSTOM_NAME, Component.literal(title));
|
||||||
return book;
|
return book;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
package net.dnorberg.rivencraft.block.entity;
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.item.InkVialItem;
|
import net.dnorberg.rivencraft.item.InkVialItem;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.dnorberg.rivencraft.writing.InkVialExchange;
|
import net.dnorberg.rivencraft.writing.InkVialExchange;
|
||||||
|
import net.dnorberg.rivencraft.writing.InkModifierIngredients;
|
||||||
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.dnorberg.rivencraft.writing.WritingInkService;
|
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
@@ -18,7 +23,7 @@ import net.minecraft.world.level.Level;
|
|||||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
/** Baseline Link Panel mixer. Modifier ingredients belong to the symbol/ink-effects milestone. */
|
/** Server-owned Link Panel mixer with a persistent, Legacy-style additive mixture. */
|
||||||
public final class InkMixerBlockEntity extends BlockEntity implements Container {
|
public final class InkMixerBlockEntity extends BlockEntity implements Container {
|
||||||
public static final int INK = 0;
|
public static final int INK = 0;
|
||||||
public static final int PAPER = 1;
|
public static final int PAPER = 1;
|
||||||
@@ -27,6 +32,12 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
|||||||
|
|
||||||
private NonNullList<ItemStack> items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
private NonNullList<ItemStack> items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
private int inkRemaining;
|
private int inkRemaining;
|
||||||
|
private long nextModifierSeed = new Random().nextLong();
|
||||||
|
private final double[] modifierChances = new double[3];
|
||||||
|
private static final int[] FLAGS = {LinkProperties.DISARM,
|
||||||
|
LinkProperties.MAINTAIN_MOMENTUM, LinkProperties.INTRA_LINKING};
|
||||||
|
private static final String[] CHANCE_KEYS = {"DisarmChance", "MomentumChance", "IntraLinkingChance"};
|
||||||
|
private static final int[] OLD_CHANCE_INDEX = {0, 2, 3};
|
||||||
|
|
||||||
public InkMixerBlockEntity(BlockPos pos, BlockState state) {
|
public InkMixerBlockEntity(BlockPos pos, BlockState state) {
|
||||||
super(ModBlockEntities.INK_MIXER.get(), pos, state);
|
super(ModBlockEntities.INK_MIXER.get(), pos, state);
|
||||||
@@ -34,6 +45,44 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
|||||||
|
|
||||||
public int inkRemaining() { return inkRemaining; }
|
public int inkRemaining() { return inkRemaining; }
|
||||||
|
|
||||||
|
public int modifierChancePermille(int index) {
|
||||||
|
return Math.clamp((int) Math.round(modifierChances[index] * 1000), 0, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Infuses a carried ingredient into the current ink pool; only the server calls this. */
|
||||||
|
public boolean addModifier(ItemStack carried, int amount) {
|
||||||
|
InkModifierIngredients.Ingredient ingredient = InkModifierIngredients.find(carried);
|
||||||
|
if (ingredient == null || inkRemaining == 0 || amount <= 0 || carried.getCount() < amount)
|
||||||
|
return false;
|
||||||
|
for (InkModifierIngredients.Effect effect : ingredient.effects())
|
||||||
|
for (int index = 0; index < FLAGS.length; index++)
|
||||||
|
if (FLAGS[index] == effect.flag())
|
||||||
|
modifierChances[index] = 1.0 - (1.0 - modifierChances[index])
|
||||||
|
* Math.pow(1.0 - effect.chance(), amount);
|
||||||
|
carried.shrink(amount);
|
||||||
|
setChanged();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack previewLinkPanel() {
|
||||||
|
if (!canCreateLinkPanel()) return ItemStack.EMPTY;
|
||||||
|
ItemStack panel = PageItem.createLinkPanelPage();
|
||||||
|
LinkProperties properties = rollProperties(nextModifierSeed).properties();
|
||||||
|
if (properties.flags() != 0) panel.set(ModDataComponents.LINK_PROPERTIES.get(), properties);
|
||||||
|
return panel;
|
||||||
|
}
|
||||||
|
|
||||||
|
private record Roll(LinkProperties properties, long nextSeed) {}
|
||||||
|
|
||||||
|
private Roll rollProperties(long seed) {
|
||||||
|
Random random = new Random(seed);
|
||||||
|
int selected = 0;
|
||||||
|
for (int index = 0; index < FLAGS.length; index++)
|
||||||
|
if (modifierChances[index] > 0 && random.nextDouble() < modifierChances[index])
|
||||||
|
selected |= FLAGS[index];
|
||||||
|
return new Roll(new LinkProperties(selected), random.nextLong());
|
||||||
|
}
|
||||||
|
|
||||||
@Override public int getContainerSize() { return SIZE; }
|
@Override public int getContainerSize() { return SIZE; }
|
||||||
@Override public boolean isEmpty() { return items.stream().allMatch(ItemStack::isEmpty); }
|
@Override public boolean isEmpty() { return items.stream().allMatch(ItemStack::isEmpty); }
|
||||||
@Override public ItemStack getItem(int slot) { return items.get(slot); }
|
@Override public ItemStack getItem(int slot) { return items.get(slot); }
|
||||||
@@ -92,6 +141,8 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
|||||||
inkRemaining -= cost;
|
inkRemaining -= cost;
|
||||||
items.get(PAPER).shrink(1);
|
items.get(PAPER).shrink(1);
|
||||||
if (items.get(PAPER).isEmpty()) items.set(PAPER, ItemStack.EMPTY);
|
if (items.get(PAPER).isEmpty()) items.set(PAPER, ItemStack.EMPTY);
|
||||||
|
nextModifierSeed = rollProperties(nextModifierSeed).nextSeed();
|
||||||
|
java.util.Arrays.fill(modifierChances, 0);
|
||||||
setChanged();
|
setChanged();
|
||||||
if (inkRemaining == 0) refillEmptyBasin();
|
if (inkRemaining == 0) refillEmptyBasin();
|
||||||
return true;
|
return true;
|
||||||
@@ -104,6 +155,7 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
|||||||
@Override public void clearContent() {
|
@Override public void clearContent() {
|
||||||
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
inkRemaining = 0;
|
inkRemaining = 0;
|
||||||
|
java.util.Arrays.fill(modifierChances, 0);
|
||||||
setChanged();
|
setChanged();
|
||||||
}
|
}
|
||||||
@Override protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
@Override protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||||
@@ -111,11 +163,20 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
|
|||||||
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
ContainerHelper.loadAllItems(tag, items, registries);
|
ContainerHelper.loadAllItems(tag, items, registries);
|
||||||
inkRemaining = Math.clamp(tag.getInt("InkRemaining"), 0, InkVialItem.CAPACITY);
|
inkRemaining = Math.clamp(tag.getInt("InkRemaining"), 0, InkVialItem.CAPACITY);
|
||||||
|
if (tag.contains("NextModifierSeed")) nextModifierSeed = tag.getLong("NextModifierSeed");
|
||||||
|
for (int index = 0; index < modifierChances.length; index++) {
|
||||||
|
double chance = tag.contains(CHANCE_KEYS[index]) ? tag.getDouble(CHANCE_KEYS[index])
|
||||||
|
: tag.getDouble("ModifierChance" + OLD_CHANCE_INDEX[index]);
|
||||||
|
modifierChances[index] = Math.clamp(chance, 0.0, 1.0);
|
||||||
|
}
|
||||||
refillEmptyBasin();
|
refillEmptyBasin();
|
||||||
}
|
}
|
||||||
@Override protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
@Override protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||||
super.saveAdditional(tag, registries);
|
super.saveAdditional(tag, registries);
|
||||||
ContainerHelper.saveAllItems(tag, items, registries);
|
ContainerHelper.saveAllItems(tag, items, registries);
|
||||||
tag.putInt("InkRemaining", inkRemaining);
|
tag.putInt("InkRemaining", inkRemaining);
|
||||||
|
tag.putLong("NextModifierSeed", nextModifierSeed);
|
||||||
|
for (int index = 0; index < modifierChances.length; index++)
|
||||||
|
tag.putDouble(CHANCE_KEYS[index], modifierChances[index]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
package net.dnorberg.rivencraft.block.entity;
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
import net.dnorberg.rivencraft.item.InkVialItem;
|
import net.dnorberg.rivencraft.item.InkVialItem;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.dnorberg.rivencraft.writing.InkVialExchange;
|
import net.dnorberg.rivencraft.writing.InkVialExchange;
|
||||||
import net.dnorberg.rivencraft.writing.WritingInkService;
|
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
@@ -83,7 +87,11 @@ public final class WritingDeskBlockEntity extends BlockEntity implements Contain
|
|||||||
worldPosition.getZ() + 0.5) <= 64.0;
|
worldPosition.getZ() + 0.5) <= 64.0;
|
||||||
}
|
}
|
||||||
@Override public boolean canPlaceItem(int slot, ItemStack stack) {
|
@Override public boolean canPlaceItem(int slot, ItemStack stack) {
|
||||||
if (slot < COLLECTIONS) return stack.is(ModItems.NOTEBOOK.get()) || stack.is(ModItems.PAGE.get());
|
if (slot < COLLECTIONS) return stack.is(ModItems.NOTEBOOK.get())
|
||||||
|
&& stack.getOrDefault(ModDataComponents.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY)
|
||||||
|
.pages().stream().noneMatch(page -> PageItem.content(page).kind() == PageContent.Kind.LINK_PANEL)
|
||||||
|
|| stack.is(ModItems.PAGE.get())
|
||||||
|
&& PageItem.content(stack).kind() != PageContent.Kind.LINK_PANEL;
|
||||||
return switch (slot) {
|
return switch (slot) {
|
||||||
case INK -> stack.is(ModItems.INK_VIAL.get());
|
case INK -> stack.is(ModItems.INK_VIAL.get());
|
||||||
case RETURN -> false;
|
case RETURN -> false;
|
||||||
|
|||||||
@@ -64,24 +64,27 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
|||||||
+ " 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 or #minecraft:is_nether");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<ResourceLocation> eligible = eligible(registries, profile);
|
List<ResourceLocation> availableBiomes = eligible(registries, profile);
|
||||||
if (eligible.isEmpty()) throw new IllegalArgumentException("No eligible biomes for terrain " + profile.noiseSettings());
|
if (availableBiomes.isEmpty()) throw new IllegalArgumentException("No eligible biomes for terrain " + profile.noiseSettings());
|
||||||
if (distribution == AgeTraits.BiomeDistribution.NATIVE) {
|
if (distribution == AgeTraits.BiomeDistribution.NATIVE) {
|
||||||
if (!authored.isEmpty()) throw new IllegalArgumentException("Native biome distribution cannot use biome pages");
|
if (!authored.isEmpty()) throw new IllegalArgumentException("Native biome distribution cannot use biome pages");
|
||||||
return new AgeBiomeSelection(distribution, profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
|
return new AgeBiomeSelection(distribution, profile.terrain() == AgeRuntimeProfile.Terrain.FLAT
|
||||||
? List.of(ResourceLocation.withDefaultNamespace("plains")) : eligible);
|
? List.of(ResourceLocation.withDefaultNamespace("plains")) : availableBiomes);
|
||||||
}
|
}
|
||||||
List<ResourceLocation> selected = new ArrayList<>(authored);
|
List<ResourceLocation> selected = new ArrayList<>(authored);
|
||||||
Set<ResourceLocation> distinct = new LinkedHashSet<>(selected);
|
Set<ResourceLocation> distinct = new LinkedHashSet<>(selected);
|
||||||
int minimum = minimum(distribution);
|
int minimum = minimum(distribution);
|
||||||
int target = minimum;
|
int target = minimum;
|
||||||
if (authored.isEmpty()) {
|
if (authored.isEmpty()) {
|
||||||
int maximum = Math.min(maximum(distribution), new LinkedHashSet<>(eligible).size());
|
// The terrain's available pool is the upper bound. For Cave terrain,
|
||||||
|
// eligible() returns the cave tag; other terrains use their preset.
|
||||||
|
int availableBiomeCount = new LinkedHashSet<>(availableBiomes).size();
|
||||||
|
int maximum = distribution == AgeTraits.BiomeDistribution.SINGLE ? 1 : availableBiomeCount;
|
||||||
if (maximum >= minimum) {
|
if (maximum >= minimum) {
|
||||||
target += new Random(seed ^ 0x42494F4D45434F55L).nextInt(maximum - minimum + 1);
|
target += new Random(seed ^ 0x42494F4D45434F55L).nextInt(maximum - minimum + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<ResourceLocation> filler = new ArrayList<>(eligible);
|
List<ResourceLocation> filler = new ArrayList<>(availableBiomes);
|
||||||
java.util.Collections.shuffle(filler, new Random(seed ^ 0x42494F4D45504F4FL));
|
java.util.Collections.shuffle(filler, new Random(seed ^ 0x42494F4D45504F4FL));
|
||||||
for (ResourceLocation id : filler) {
|
for (ResourceLocation id : filler) {
|
||||||
if (distinct.size() >= target) break;
|
if (distinct.size() >= target) break;
|
||||||
@@ -128,12 +131,4 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Random-age limits; authored biome pages are never truncated to this maximum. */
|
|
||||||
public static int maximum(AgeTraits.BiomeDistribution distribution) {
|
|
||||||
return switch (distribution) {
|
|
||||||
case NATIVE, SINGLE -> 1;
|
|
||||||
case TILED, GRID -> 4;
|
|
||||||
case TINY, SMALL, MEDIUM, LARGE, HUGE -> 6;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -37,6 +37,7 @@ import net.minecraft.world.level.biome.FixedBiomeSource;
|
|||||||
import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
|
import net.minecraft.world.level.biome.MultiNoiseBiomeSource;
|
||||||
import net.dnorberg.rivencraft.world.ScaledBiomeSource;
|
import net.dnorberg.rivencraft.world.ScaledBiomeSource;
|
||||||
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
|
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
||||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
||||||
import net.minecraft.world.level.dimension.DimensionType;
|
import net.minecraft.world.level.dimension.DimensionType;
|
||||||
@@ -180,6 +181,10 @@ public final class AgeDimensionService {
|
|||||||
|
|
||||||
private static void applyInitialCelestialPhase(ServerLevel level, AgeDefinition age) {
|
private static void applyInitialCelestialPhase(ServerLevel level, AgeDefinition age) {
|
||||||
long phaseTime = (long)(age.traits().celestialPhase() * Level.TICKS_PER_DAY);
|
long phaseTime = (long)(age.traits().celestialPhase() * Level.TICKS_PER_DAY);
|
||||||
|
if (AgeEnvironmentCompiler.hasWrittenPhase(age.plan())) {
|
||||||
|
// Legacy's Nadir is midnight, while vanilla day time zero is sunrise.
|
||||||
|
phaseTime = (phaseTime + 18_000L) % Level.TICKS_PER_DAY;
|
||||||
|
}
|
||||||
level.setDayTime(phaseTime);
|
level.setDayTime(phaseTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,7 +322,10 @@ public final class AgeDimensionService {
|
|||||||
ResourceKey<NoiseGeneratorSettings> settingsKey = ResourceKey.create(
|
ResourceKey<NoiseGeneratorSettings> settingsKey = ResourceKey.create(
|
||||||
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
||||||
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
||||||
return new NoiseBasedChunkGenerator(biomeSource, Holder.direct(withBiomeMaterialRules(baseSettings)));
|
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());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static NoiseGeneratorSettings withBiomeMaterialRules(NoiseGeneratorSettings base) {
|
private static NoiseGeneratorSettings withBiomeMaterialRules(NoiseGeneratorSettings base) {
|
||||||
@@ -482,7 +490,7 @@ public final class AgeDimensionService {
|
|||||||
base.height(),
|
base.height(),
|
||||||
base.logicalHeight(),
|
base.logicalHeight(),
|
||||||
base.infiniburn(),
|
base.infiniburn(),
|
||||||
base.effectsLocation(),
|
AgeEnvironmentCompiler.skyEffects(age.plan(), base.effectsLocation()),
|
||||||
ambientLight,
|
ambientLight,
|
||||||
base.monsterSettings()
|
base.monsterSettings()
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -0,0 +1,90 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
||||||
|
|
||||||
|
/** Resolves written environment pages without changing the seeded page-free Age path. */
|
||||||
|
public final class AgeEnvironmentCompiler {
|
||||||
|
private AgeEnvironmentCompiler() {}
|
||||||
|
|
||||||
|
public static AgeTraits apply(AgeGenerationPlan plan, AgeTraits seeded) {
|
||||||
|
if (plan == null) return seeded;
|
||||||
|
|
||||||
|
AgeTraits.Lighting lighting = seeded.lighting();
|
||||||
|
AgeTraits.Weather weather = seeded.weather();
|
||||||
|
double period = seeded.celestialPeriod();
|
||||||
|
float phase = seeded.celestialPhase();
|
||||||
|
boolean normalTime = plan.symbols().stream()
|
||||||
|
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.CELESTIAL);
|
||||||
|
if (normalTime) period = 1.0D;
|
||||||
|
boolean writtenPeriod = false;
|
||||||
|
boolean writtenPhase = false;
|
||||||
|
float phaseDegrees = 0.0F;
|
||||||
|
|
||||||
|
for (AgeGenerationPlan.ResolvedSymbol symbol : plan.symbols()) {
|
||||||
|
SymbolSemantics semantics = symbol.semantics();
|
||||||
|
switch (semantics.role()) {
|
||||||
|
case LIGHTING -> lighting = AgeTraits.Lighting.valueOf(
|
||||||
|
((SymbolSemantics.ChoiceValue) semantics.value()).id().toUpperCase(java.util.Locale.ROOT));
|
||||||
|
case WEATHER -> {
|
||||||
|
String choice = ((SymbolSemantics.ChoiceValue) semantics.value()).id();
|
||||||
|
if (choice.equals("snow")) {
|
||||||
|
throw new IllegalArgumentException("Always Snow requires optional season integration");
|
||||||
|
}
|
||||||
|
if (choice.equals("cloudy") || choice.equals("rain")) {
|
||||||
|
throw new IllegalArgumentException(choice + " weather needs precipitation rendering support");
|
||||||
|
}
|
||||||
|
weather = AgeTraits.Weather.valueOf(choice.toUpperCase(java.util.Locale.ROOT));
|
||||||
|
}
|
||||||
|
case PERIOD_MODIFIER -> {
|
||||||
|
double next = ((SymbolSemantics.NumberValue) semantics.value()).amount();
|
||||||
|
period = writtenPeriod ? (period + next) / 2.0D : next;
|
||||||
|
writtenPeriod = true;
|
||||||
|
}
|
||||||
|
case PHASE_MODIFIER -> {
|
||||||
|
float next = (float) ((SymbolSemantics.NumberValue) semantics.value()).amount();
|
||||||
|
phaseDegrees = writtenPhase ? circularMidpoint(phaseDegrees, next) : next;
|
||||||
|
writtenPhase = true;
|
||||||
|
}
|
||||||
|
case ANGLE_MODIFIER -> throw new IllegalArgumentException(
|
||||||
|
"Sun angle pages require a custom sky renderer and are not supported yet");
|
||||||
|
default -> { }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (writtenPhase) phase = phaseDegrees / 360.0F;
|
||||||
|
return new AgeTraits(plan.biomeSelection() == null ? seeded.biomeDistribution()
|
||||||
|
: plan.biomeSelection().distribution(), lighting, weather, period,
|
||||||
|
seeded.celestialAngle(), phase);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Vanilla effects are the sky styles the current renderer can honor exactly. */
|
||||||
|
public static ResourceLocation skyEffects(AgeGenerationPlan plan, ResourceLocation fallback) {
|
||||||
|
if (plan == null) return fallback;
|
||||||
|
return plan.symbols().stream()
|
||||||
|
.filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SKY)
|
||||||
|
.map(symbol -> ((SymbolSemantics.ChoiceValue) symbol.semantics().value()).id())
|
||||||
|
.map(choice -> switch (choice) {
|
||||||
|
case "overworld" -> BuiltinDimensionTypes.OVERWORLD_EFFECTS;
|
||||||
|
case "nether" -> BuiltinDimensionTypes.NETHER_EFFECTS;
|
||||||
|
case "end" -> BuiltinDimensionTypes.END_EFFECTS;
|
||||||
|
default -> throw new IllegalArgumentException("Unsupported sky effect " + choice);
|
||||||
|
}).findFirst().orElse(fallback);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean hasWrittenPhase(AgeGenerationPlan plan) {
|
||||||
|
return plan != null && plan.symbols().stream()
|
||||||
|
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.PHASE_MODIFIER);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int previewSkyColor(ResourceLocation effects, int biomeSkyColor) {
|
||||||
|
if (effects.equals(BuiltinDimensionTypes.NETHER_EFFECTS)) return 0xFF6B2725;
|
||||||
|
if (effects.equals(BuiltinDimensionTypes.END_EFFECTS)) return 0xFF211835;
|
||||||
|
return biomeSkyColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float circularMidpoint(float current, float next) {
|
||||||
|
float difference = (next - current + 540.0F) % 360.0F - 180.0F;
|
||||||
|
return (current + difference / 2.0F + 360.0F) % 360.0F;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
|
||||||
|
/** Validates and freezes supported feature pages and their preceding material modifiers. */
|
||||||
|
public final class AgeFeatureSelection {
|
||||||
|
private AgeFeatureSelection() {}
|
||||||
|
|
||||||
|
public record Choice(ResourceLocation id, Optional<ResourceLocation> material) {
|
||||||
|
public static final Codec<Choice> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
ResourceLocation.CODEC.fieldOf("id").forGetter(Choice::id),
|
||||||
|
ResourceLocation.CODEC.optionalFieldOf("material").forGetter(Choice::material)
|
||||||
|
).apply(instance, Choice::new));
|
||||||
|
|
||||||
|
public Choice {
|
||||||
|
if (id == null || material == null) throw new IllegalArgumentException("Missing feature choice");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<Choice> compile(WritingGrammar.Result writing, AgeRuntimeProfile profile,
|
||||||
|
AgeBiomeSelection biomes, RegistryAccess registries) {
|
||||||
|
List<Choice> choices = choices(writing.symbols().stream()
|
||||||
|
.map(symbol -> symbol.semantics()).toList());
|
||||||
|
for (Choice choice : choices) {
|
||||||
|
String error = error(choice.id(), profile, registries);
|
||||||
|
if (error == null) error = materialError(choice);
|
||||||
|
if (error != null) throw new IllegalArgumentException(error);
|
||||||
|
if (surfaceVegetation(choice.id()) && biomes.biomes().stream()
|
||||||
|
.allMatch(id -> !supportsSurfaceVegetation(id, registries))) {
|
||||||
|
throw new IllegalArgumentException("Feature " + choice.id()
|
||||||
|
+ " needs at least one surface Overworld biome in the selected pool");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return choices;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<Choice> choices(List<SymbolSemantics> symbols) {
|
||||||
|
List<Choice> choices = new ArrayList<>();
|
||||||
|
ResourceLocation pendingMaterial = null;
|
||||||
|
for (SymbolSemantics semantics : symbols) {
|
||||||
|
if (semantics.role() == SymbolSemantics.Role.BLOCK) {
|
||||||
|
pendingMaterial = ((SymbolSemantics.ResourceValue) semantics.value()).id();
|
||||||
|
} else if (semantics.role() == SymbolSemantics.Role.FEATURE) {
|
||||||
|
choices.add(new Choice(((SymbolSemantics.ResourceValue) semantics.value()).id(),
|
||||||
|
Optional.ofNullable(pendingMaterial)));
|
||||||
|
pendingMaterial = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return List.copyOf(choices);
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
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()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String error(ResourceLocation choice, AgeRuntimeProfile profile, RegistryAccess registries) {
|
||||||
|
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";
|
||||||
|
}
|
||||||
|
var carvers = registries.lookupOrThrow(Registries.CONFIGURED_CARVER);
|
||||||
|
List<String> ids = caves(choice) ? List.of("cave", "nether_cave") : List.of("canyon");
|
||||||
|
for (String path : ids) {
|
||||||
|
var key = ResourceKey.create(Registries.CONFIGURED_CARVER, ResourceLocation.withDefaultNamespace(path));
|
||||||
|
if (carvers.get(key).isEmpty()) return "Feature " + choice
|
||||||
|
+ " requires missing configured carver " + key.location();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
ResourceLocation placed = placedFeature(choice);
|
||||||
|
if (placed == null) return "Unsupported feature " + choice
|
||||||
|
+ "; remove its page (custom structures remain future work)";
|
||||||
|
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE || AgeBiomeSelection.isCave(profile)) {
|
||||||
|
return "Feature " + choice + " requires surface noise terrain; not Flat, Void, or Cave";
|
||||||
|
}
|
||||||
|
if (registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
|
.get(ResourceKey.create(Registries.PLACED_FEATURE, placed)).isEmpty()) {
|
||||||
|
return "Feature " + choice + " requires missing placed feature " + placed;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String materialError(Choice choice) {
|
||||||
|
if (choice.material().isEmpty()) return null;
|
||||||
|
ResourceLocation material = choice.material().orElseThrow();
|
||||||
|
var block = BuiltInRegistries.BLOCK.getOptional(material);
|
||||||
|
if (block.isEmpty() || block.orElseThrow() == Blocks.AIR) {
|
||||||
|
return "Feature " + choice.id() + " references missing block material " + material;
|
||||||
|
}
|
||||||
|
if (isRock(choice.id())) {
|
||||||
|
if (!BlockSymbolPages.isRockMaterial(block.orElseThrow())) {
|
||||||
|
return "Feature " + choice.id() + " needs a full solid block without a block entity: " + material;
|
||||||
|
}
|
||||||
|
} else if (isLake(choice.id())) {
|
||||||
|
if (!BlockSymbolPages.isFluidMaterial(block.orElseThrow())) {
|
||||||
|
return "Feature " + choice.id() + " needs a source-fluid block: " + material;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return "Feature " + choice.id() + " cannot consume a block material page";
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isRock(ResourceLocation choice) {
|
||||||
|
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "rocks"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isLake(ResourceLocation choice) {
|
||||||
|
return choice.getNamespace().equals("rivencraft") && List.of(
|
||||||
|
"surface_lakes", "deep_lakes", "lava_lakes").contains(choice.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean surfaceVegetation(ResourceLocation choice) {
|
||||||
|
return choice.getNamespace().equals("rivencraft")
|
||||||
|
&& List.of("flowers", "trees", "huge_trees").contains(choice.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean caves(ResourceLocation choice) {
|
||||||
|
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "caves"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean ravines(ResourceLocation choice) {
|
||||||
|
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "ravines"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean supportsSurfaceVegetation(ResourceLocation id, RegistryAccess registries) {
|
||||||
|
var biome = registries.lookupOrThrow(Registries.BIOME)
|
||||||
|
.get(ResourceKey.create(Registries.BIOME, id));
|
||||||
|
return biome.isPresent() && supportsSurfaceVegetation(biome.orElseThrow());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean supportsSurfaceVegetation(Holder<Biome> biome) {
|
||||||
|
return !biome.is(BiomeTags.IS_NETHER) && !biome.is(BiomeTags.IS_END)
|
||||||
|
&& !biome.is(AgeBiomeSelection.CAVE_BIOMES);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Fixed 1.21.1 mappings; data-pack symbols must opt in through a future extension. */
|
||||||
|
public static ResourceLocation placedFeature(ResourceLocation choice) {
|
||||||
|
if (!choice.getNamespace().equals("rivencraft")) return null;
|
||||||
|
return switch (choice.getPath()) {
|
||||||
|
case "flowers" -> ResourceLocation.withDefaultNamespace("flower_default");
|
||||||
|
case "trees" -> ResourceLocation.withDefaultNamespace("trees_plains");
|
||||||
|
case "huge_trees" -> ResourceLocation.withDefaultNamespace("trees_old_growth_spruce_taiga");
|
||||||
|
case "rocks" -> ResourceLocation.withDefaultNamespace("forest_rock");
|
||||||
|
case "surface_lakes", "lava_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_surface");
|
||||||
|
case "deep_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_underground");
|
||||||
|
default -> null;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -65,10 +65,13 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin
|
|||||||
AgeRuntimeProfile profile = AgeRuntimeProfiles.profiles().get(selected);
|
AgeRuntimeProfile profile = AgeRuntimeProfiles.profiles().get(selected);
|
||||||
if (profile == null) throw new IllegalArgumentException("Unsupported Age terrain profile " + selected);
|
if (profile == null) throw new IllegalArgumentException("Unsupported Age terrain profile " + selected);
|
||||||
AgeBiomeSelection biomes = AgeBiomeSelection.compile(parsed, traits, profile, ageSeed, registries);
|
AgeBiomeSelection biomes = AgeBiomeSelection.compile(parsed, traits, profile, ageSeed, registries);
|
||||||
return new AgeGenerationPlan(CURRENT_VERSION, ageSeed, writing,
|
AgeFeatureSelection.compile(parsed, profile, biomes, registries);
|
||||||
|
AgeGenerationPlan plan = new AgeGenerationPlan(CURRENT_VERSION, ageSeed, writing,
|
||||||
parsed.symbols().stream().map(symbol -> new ResolvedSymbol(
|
parsed.symbols().stream().map(symbol -> new ResolvedSymbol(
|
||||||
symbol.index(), symbol.reference(), symbol.semantics())).toList(),
|
symbol.index(), symbol.reference(), symbol.semantics())).toList(),
|
||||||
profile, biomes);
|
profile, biomes);
|
||||||
|
AgeEnvironmentCompiler.apply(plan, traits);
|
||||||
|
return plan;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ResourceLocation authoredTerrain() {
|
public ResourceLocation authoredTerrain() {
|
||||||
@@ -137,7 +140,7 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin
|
|||||||
SymbolSemantics.Role role = SymbolSemantics.Role.valueOf(item.getString("Role"));
|
SymbolSemantics.Role role = SymbolSemantics.Role.valueOf(item.getString("Role"));
|
||||||
String raw = item.getString("Value");
|
String raw = item.getString("Value");
|
||||||
SymbolSemantics.Value value = switch (role) {
|
SymbolSemantics.Value value = switch (role) {
|
||||||
case TERRAIN, BIOME, FEATURE -> new SymbolSemantics.ResourceValue(ResourceLocation.parse(raw));
|
case TERRAIN, BIOME, BLOCK, FEATURE -> new SymbolSemantics.ResourceValue(ResourceLocation.parse(raw));
|
||||||
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER ->
|
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER ->
|
||||||
new SymbolSemantics.NumberValue(Double.parseDouble(raw));
|
new SymbolSemantics.NumberValue(Double.parseDouble(raw));
|
||||||
default -> new SymbolSemantics.ChoiceValue(raw);
|
default -> new SymbolSemantics.ChoiceValue(raw);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public final class AgePersistenceGameTests {
|
|||||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:weather/normal"))),
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:weather/normal"))),
|
||||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:lighting/normal"))),
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:lighting/normal"))),
|
||||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:celestial/normal_time"))),
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:celestial/normal_time"))),
|
||||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:feature/caves")))
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:feature/flowers")))
|
||||||
));
|
));
|
||||||
UUID id = UUID.randomUUID();
|
UUID id = UUID.randomUUID();
|
||||||
AgeReference reference = new AgeReference(id, "Authored Plan " + id);
|
AgeReference reference = new AgeReference(id, "Authored Plan " + id);
|
||||||
|
|||||||
@@ -66,15 +66,20 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
ServerLevel overworld = level.getServer().overworld();
|
ServerLevel overworld = level.getServer().overworld();
|
||||||
AgeRegistrySavedData data = get(overworld);
|
AgeRegistrySavedData data = get(overworld);
|
||||||
long seed = ageSeed(overworld.getSeed(), data.availableDimensionId(normalizedName(name)));
|
long seed = ageSeed(overworld.getSeed(), data.availableDimensionId(normalizedName(name)));
|
||||||
AgeGenerationPlan.compile(writing, seed, AgeRuntimeProfiles.select(seed), AgeTraits.select(seed),
|
AgeGenerationPlan.compile(writing, seed,
|
||||||
|
AgeRuntimeProfiles.selectForWriting(seed, writing, overworld.registryAccess()), AgeTraits.select(seed),
|
||||||
overworld.registryAccess());
|
overworld.registryAccess());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ResourceLocation previewGenerationProfile(ServerLevel level, String name) {
|
public static ResourceLocation previewGenerationProfile(ServerLevel level, String name) {
|
||||||
|
return previewGenerationProfile(level, name, OrderedWriting.EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ResourceLocation previewGenerationProfile(ServerLevel level, String name, OrderedWriting writing) {
|
||||||
ServerLevel overworld = level.getServer().overworld();
|
ServerLevel overworld = level.getServer().overworld();
|
||||||
AgeRegistrySavedData data = get(overworld);
|
AgeRegistrySavedData data = get(overworld);
|
||||||
long seed = ageSeed(overworld.getSeed(), data.availableDimensionId(normalizedName(name)));
|
long seed = ageSeed(overworld.getSeed(), data.availableDimensionId(normalizedName(name)));
|
||||||
return AgeRuntimeProfiles.select(seed);
|
return AgeRuntimeProfiles.selectForWriting(seed, writing, overworld.registryAccess());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<AgeDefinition> find(UUID ageId) {
|
public Optional<AgeDefinition> find(UUID ageId) {
|
||||||
@@ -112,7 +117,7 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
String name = normalizedName(reference.name());
|
String name = normalizedName(reference.name());
|
||||||
ResourceLocation dimensionId = availableDimensionId(name);
|
ResourceLocation dimensionId = availableDimensionId(name);
|
||||||
long seed = ageSeed(worldSeed, dimensionId);
|
long seed = ageSeed(worldSeed, dimensionId);
|
||||||
ResourceLocation seedProfile = AgeRuntimeProfiles.select(seed);
|
ResourceLocation seedProfile = AgeRuntimeProfiles.selectForWriting(seed, writing, registries);
|
||||||
AgeTraits traits = AgeTraits.select(seed);
|
AgeTraits traits = AgeTraits.select(seed);
|
||||||
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, seed, seedProfile, traits, registries);
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, seed, seedProfile, traits, registries);
|
||||||
AgeDefinition created = new AgeDefinition(
|
AgeDefinition created = new AgeDefinition(
|
||||||
@@ -124,7 +129,7 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
createdGameTime,
|
createdGameTime,
|
||||||
dimensionId,
|
dimensionId,
|
||||||
null,
|
null,
|
||||||
traits,
|
AgeEnvironmentCompiler.apply(plan, traits),
|
||||||
plan
|
plan
|
||||||
);
|
);
|
||||||
ages.put(created.id(), created);
|
ages.put(created.id(), created);
|
||||||
|
|||||||
@@ -5,8 +5,12 @@ import com.google.gson.GsonBuilder;
|
|||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.List;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||||
import net.minecraft.core.RegistryAccess;
|
import net.minecraft.core.RegistryAccess;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.resources.ResourceKey;
|
import net.minecraft.resources.ResourceKey;
|
||||||
@@ -59,6 +63,27 @@ public final class AgeRuntimeProfiles {
|
|||||||
return ids.get(Math.floorMod(Long.hashCode(seed), ids.size()));
|
return ids.get(Math.floorMod(Long.hashCode(seed), ids.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Keep seed-selected terrain random, but only among profiles able to host authored features. */
|
||||||
|
public static ResourceLocation selectForWriting(long seed, OrderedWriting writing, RegistryAccess registries) {
|
||||||
|
ResourceLocation selected = select(seed);
|
||||||
|
WritingGrammar.Result parsed = WritingGrammar.parse(writing);
|
||||||
|
if (parsed.symbols().stream().anyMatch(symbol ->
|
||||||
|
symbol.semantics().role() == SymbolSemantics.Role.TERRAIN)) return selected;
|
||||||
|
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;
|
||||||
|
AgeRuntimeProfile initial = PROFILES.get(selected);
|
||||||
|
if (initial != null && features.stream().allMatch(id ->
|
||||||
|
AgeFeatureSelection.error(id, initial, registries) == null)) return selected;
|
||||||
|
List<ResourceLocation> compatible = PROFILES.entrySet().stream()
|
||||||
|
.filter(entry -> features.stream().allMatch(id ->
|
||||||
|
AgeFeatureSelection.error(id, entry.getValue(), registries) == null))
|
||||||
|
.map(Map.Entry::getKey).sorted().toList();
|
||||||
|
return compatible.isEmpty() ? selected
|
||||||
|
: compatible.get(Math.floorMod(Long.hashCode(seed), compatible.size()));
|
||||||
|
}
|
||||||
|
|
||||||
static AgeRuntimeProfile parse(ResourceLocation id, JsonElement json, RegistryAccess registries) {
|
static AgeRuntimeProfile parse(ResourceLocation id, JsonElement json, RegistryAccess registries) {
|
||||||
JsonObject object = json.getAsJsonObject();
|
JsonObject object = json.getAsJsonObject();
|
||||||
int schemaVersion = object.has("schema_version") ? object.get("schema_version").getAsInt() : 1;
|
int schemaVersion = object.has("schema_version") ? object.get("schema_version").getAsInt() : 1;
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
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.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Issue #34: written environment effects and the shared creative/JEI page feed. */
|
||||||
|
@GameTestHolder("rivencraft_archive_environment")
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class EnvironmentWritingGameTests {
|
||||||
|
private EnvironmentWritingGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void symbolCategoriesPartitionCreativePages(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"));
|
||||||
|
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.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");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void environmentPagesEnterCreativeAndJeiFeed(GameTestHelper helper) {
|
||||||
|
Set<String> expected = Set.of(
|
||||||
|
"lighting/normal", "lighting/dark", "lighting/bright",
|
||||||
|
"sky/overworld", "sky/nether", "sky/end",
|
||||||
|
"weather/normal", "weather/fast", "weather/slow", "weather/off",
|
||||||
|
"weather/always", "weather/storm", "celestial/normal_time",
|
||||||
|
"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()
|
||||||
|
.map(PageItem::content)
|
||||||
|
.filter(content -> content.symbol().isPresent())
|
||||||
|
.map(content -> content.symbol().orElseThrow().id().getPath())
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
helper.assertTrue(PageItem.bundledCreativeSymbols().containsAll(expected)
|
||||||
|
&& creative.containsAll(expected),
|
||||||
|
"Every supported environment page must enter the creative index JEI also consumes");
|
||||||
|
for (String path : expected) {
|
||||||
|
var id = ResourceLocation.fromNamespaceAndPath("rivencraft", path);
|
||||||
|
helper.assertTrue(SymbolCatalog.isKnown(new SymbolReference(id))
|
||||||
|
&& PageItem.isUsableWriting(PageItem.createBundledCreativePage(path)),
|
||||||
|
"Environment page must resolve as valid writing: " + path);
|
||||||
|
}
|
||||||
|
helper.assertFalse(creative.contains("weather/snow") || creative.contains("weather/cloudy")
|
||||||
|
|| creative.contains("weather/rain"),
|
||||||
|
"Unsupported precipitation variants must not appear as working pages");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void writtenEnvironmentPersistsAndPageFreeAgesStaySeeded(GameTestHelper helper) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(
|
||||||
|
WritingEntry.linkPanel(),
|
||||||
|
page("terrain/standard"), page("weather/off"), page("lighting/dark"),
|
||||||
|
page("sky/end"), page("period/zero"), page("phase/rising"),
|
||||||
|
page("celestial/normal_time")));
|
||||||
|
AgeTraits seeded = AgeTraits.select(42L);
|
||||||
|
var plan = AgeGenerationPlan.compile(writing, 42L, AgeGenerationProfiles.STANDARD,
|
||||||
|
seeded, helper.getLevel().registryAccess());
|
||||||
|
var effective = AgeEnvironmentCompiler.apply(plan, seeded);
|
||||||
|
helper.assertValueEqual(effective.lighting(), AgeTraits.Lighting.DARK,
|
||||||
|
"Written Dark Lighting must override the seeded lighting");
|
||||||
|
helper.assertValueEqual(effective.weather(), AgeTraits.Weather.OFF,
|
||||||
|
"Written No Weather must override the seeded weather");
|
||||||
|
helper.assertTrue(effective.hasStoppedCelestialCycle(),
|
||||||
|
"A written Zero Length page must stop the celestial cycle");
|
||||||
|
helper.assertValueEqual(effective.celestialPhase(), 0.25F,
|
||||||
|
"Written Rising phase must be stored as a quarter turn");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.skyEffects(plan, BuiltinDimensionTypes.OVERWORLD_EFFECTS),
|
||||||
|
BuiltinDimensionTypes.END_EFFECTS, "Written End Sky must select the End sky effects");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.previewSkyColor(BuiltinDimensionTypes.END_EFFECTS, 0xFF77AAFF),
|
||||||
|
0xFF211835, "End sky preview must not retain an Overworld biome's blue tint");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.previewSkyColor(BuiltinDimensionTypes.NETHER_EFFECTS, 0xFF77AAFF),
|
||||||
|
0xFF6B2725, "Nether sky preview must use its red tint");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.previewSkyColor(BuiltinDimensionTypes.OVERWORLD_EFFECTS, 0xFF77AAFF),
|
||||||
|
0xFF77AAFF, "Overworld sky preview must retain the destination biome tint");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.apply(AgeGenerationPlan.load(plan.save()), seeded), effective,
|
||||||
|
"Written environment values must survive a plan save/load round trip");
|
||||||
|
helper.assertValueEqual(AgeEnvironmentCompiler.apply(null, seeded), seeded,
|
||||||
|
"Page-free Ages must retain their seeded environment without recompilation");
|
||||||
|
|
||||||
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
|
var reference = new AgeReference(UUID.randomUUID(), "Written Environment");
|
||||||
|
var target = AgeDimensionService.resolve(player, reference, writing).orElseThrow();
|
||||||
|
var definition = AgeRegistrySavedData.get(helper.getLevel()).find(reference.id()).orElseThrow();
|
||||||
|
helper.assertValueEqual(definition.traits(), AgeEnvironmentCompiler.apply(
|
||||||
|
definition.plan(), AgeTraits.select(definition.seed())),
|
||||||
|
"The effective authored environment must persist with the Age definition");
|
||||||
|
helper.runAfterDelay(1, () -> {
|
||||||
|
var level = helper.getLevel().getServer().getLevel(target.location().dimension());
|
||||||
|
helper.assertTrue(level != null, "Written environment Age must load");
|
||||||
|
helper.assertFalse(level.dimensionType().hasSkyLight(), "Dark Lighting must remove skylight");
|
||||||
|
helper.assertValueEqual(level.dimensionType().effectsLocation(), BuiltinDimensionTypes.END_EFFECTS,
|
||||||
|
"The runtime Age must render the written End sky");
|
||||||
|
helper.assertValueEqual(level.getDayTimePerTick(), Float.MIN_VALUE,
|
||||||
|
"Zero Length must use the non-bouncing stopped clock");
|
||||||
|
helper.assertTrue(Math.floorMod(level.getDayTime(), 24_000L) < 5L,
|
||||||
|
"Legacy Rising phase must begin at vanilla sunrise");
|
||||||
|
level.setWeatherParameters(0, 6_000, true, true);
|
||||||
|
helper.runAfterDelay(2, () -> {
|
||||||
|
helper.assertFalse(level.isRaining() || level.isThundering(),
|
||||||
|
"Written No Weather must clear rain and thunder in this Age");
|
||||||
|
helper.succeed();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry page(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath("rivencraft", path)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,216 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Issue #35: authored decorations must resolve to real placed features and survive plan reload. */
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class FeatureWritingGameTests {
|
||||||
|
private FeatureWritingGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void featurePagesCompileToFrozenVanillaPlacements(GameTestHelper helper) {
|
||||||
|
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");
|
||||||
|
helper.assertTrue(PageItem.bundledCreativeSymbols().containsAll(pages),
|
||||||
|
"Supported feature pages must appear in the creative and JEI symbol feed");
|
||||||
|
for (String path : pages) {
|
||||||
|
helper.assertTrue(PageItem.isUsableWriting(PageItem.createBundledCreativePage(path)),
|
||||||
|
path + " must be usable in authored writing");
|
||||||
|
}
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
page("biome/plains"), page("biome/single"), page("feature/caves"), page("feature/flowers"),
|
||||||
|
page("feature/trees"), page("feature/rocks"), page("feature/lava_lakes")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), registries);
|
||||||
|
List<AgeFeatureSelection.Choice> resolved = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(resolved.stream().map(AgeFeatureSelection.Choice::id).toList(), List.of(
|
||||||
|
id("caves"), id("flowers"), id("trees"), id("rocks"), id("lava_lakes")),
|
||||||
|
"The compiled Age plan must keep feature order and exact semantic IDs");
|
||||||
|
for (AgeFeatureSelection.Choice choice : resolved) {
|
||||||
|
if (AgeFeatureSelection.isRock(choice.id()) || AgeFeatureSelection.isLake(choice.id())) {
|
||||||
|
helper.assertTrue(choice.material().isPresent()
|
||||||
|
&& AgeFeatureSelection.materialError(choice) == null,
|
||||||
|
"Unmodified rocks and lakes must choose a valid material from the registry");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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;
|
||||||
|
var placement = AgeFeatureSelection.placedFeature(choice.id());
|
||||||
|
helper.assertTrue(registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
|
.get(ResourceKey.create(Registries.PLACED_FEATURE, placement)).isPresent(),
|
||||||
|
choice.id() + " must map to an existing vanilla placed feature");
|
||||||
|
}
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void unsupportedFeaturesAndTerrainsFailBeforeBinding(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
helper.assertTrue(AgeFeatureSelection.error(id("unknown"),
|
||||||
|
AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD), registries)
|
||||||
|
.contains("Unsupported feature"),
|
||||||
|
"Unimplemented feature meanings must report a diagnostic");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/flat"), page("feature/flowers"))),
|
||||||
|
"requires surface noise terrain");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/flat"), page("feature/caves"))),
|
||||||
|
"requires noise terrain");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/cave"), page("feature/lava_lakes"))),
|
||||||
|
"requires surface noise terrain");
|
||||||
|
helper.assertTrue(AgeGenerationPlan.compile(new OrderedWriting(List.of(panel(),
|
||||||
|
page("terrain/cave"), page("feature/caves"))), 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), registries) != null,
|
||||||
|
"Caves must add carving to Cave terrain as well as surface noise terrain");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
page("biome/nether_wastes"), page("biome/single"), page("feature/trees"))),
|
||||||
|
"surface Overworld biome");
|
||||||
|
helper.assertTrue(AgeFeatureSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(
|
||||||
|
new OrderedWriting(List.of(panel(), page("terrain/standard"), page("feature/flowers")))),
|
||||||
|
AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD),
|
||||||
|
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")),
|
||||||
|
"A valid surface feature must still compile");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void blockPagesModifyFeaturesAndSurviveReload(GameTestHelper helper) {
|
||||||
|
var stone = ResourceLocation.withDefaultNamespace("stone");
|
||||||
|
var water = ResourceLocation.withDefaultNamespace("water");
|
||||||
|
helper.assertTrue(BlockSymbolPages.availableBlocks().contains(stone),
|
||||||
|
"Registry-derived material pages must include vanilla stone");
|
||||||
|
helper.assertTrue(BlockSymbolPages.availableBlocks(BlockSymbolPages.CATEGORY).contains(stone),
|
||||||
|
"Stone must appear among standard Block Pages");
|
||||||
|
helper.assertTrue(!BlockSymbolPages.availableBlocks(BlockSymbolPages.CATEGORY).contains(water),
|
||||||
|
"Water must not appear among standard Block Pages");
|
||||||
|
helper.assertTrue(BlockSymbolPages.availableBlocks(BlockSymbolPages.FLUID_CATEGORY).contains(water),
|
||||||
|
"Water must appear among Fluid Pages");
|
||||||
|
for (String path : List.of("fern", "seagrass", "tube_coral")) {
|
||||||
|
helper.assertTrue(!BlockSymbolPages.availableBlocks().contains(ResourceLocation.withDefaultNamespace(path)),
|
||||||
|
path + " must not receive a rock or fluid material page");
|
||||||
|
}
|
||||||
|
var glowstone = ResourceLocation.withDefaultNamespace("glowstone");
|
||||||
|
helper.assertTrue(BlockSymbolPages.availableBlocks(BlockSymbolPages.CATEGORY).contains(glowstone),
|
||||||
|
"Glowstone should be a valid full-collision rock material");
|
||||||
|
helper.assertTrue(AgeFeatureSelection.materialError(new AgeFeatureSelection.Choice(
|
||||||
|
id("rocks"), Optional.of(glowstone))) == null,
|
||||||
|
"Glowstone must bind successfully before Rocks");
|
||||||
|
helper.assertTrue(!BlockSymbolPages.availableBlocks().contains(ResourceLocation.withDefaultNamespace("chest")),
|
||||||
|
"Blocks with block entities must not receive generated pages");
|
||||||
|
helper.assertTrue(!SymbolCatalog.isKnown(new SymbolReference(BlockSymbolPages.symbolId(
|
||||||
|
ResourceLocation.withDefaultNamespace("chest")))),
|
||||||
|
"Block-entity pages must not remain valid in the server catalog");
|
||||||
|
helper.assertTrue(SymbolCatalog.isKnown(new SymbolReference(BlockSymbolPages.symbolId(stone))),
|
||||||
|
"Generated material pages must be recognized by the server catalog");
|
||||||
|
helper.assertTrue(PageItem.isUsableWriting(PageItem.createCreativeBlockPage(stone)),
|
||||||
|
"A generated material page must be a usable authored page");
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
page("biome/plains"), page("biome/single"), block("stone"), page("feature/rocks"),
|
||||||
|
block("water"), page("feature/lava_lakes"), page("feature/huge_trees"),
|
||||||
|
page("feature/ravines")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||||
|
List<AgeFeatureSelection.Choice> expected = List.of(
|
||||||
|
new AgeFeatureSelection.Choice(id("rocks"), Optional.of(stone)),
|
||||||
|
new AgeFeatureSelection.Choice(id("lava_lakes"), Optional.of(water)),
|
||||||
|
choice("huge_trees"), choice("ravines"));
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(plan), expected,
|
||||||
|
"Each material must attach only to the immediately following feature");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), expected,
|
||||||
|
"Block modifiers must survive the frozen-plan round trip");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void incompatibleAndMisplacedBlockPagesAreRejected(GameTestHelper helper) {
|
||||||
|
helper.assertTrue(AgeFeatureSelection.materialError(new AgeFeatureSelection.Choice(
|
||||||
|
id("rocks"), Optional.of(ResourceLocation.withDefaultNamespace("torch"))))
|
||||||
|
.contains("full solid block"),
|
||||||
|
"A non-full block must still be rejected if supplied by old writing");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
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");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty", timeoutTicks = 600)
|
||||||
|
public static void runtimeAgeUsesSavedFeatureGenerator(GameTestHelper helper) {
|
||||||
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
page("biome/plains"), page("biome/single"), page("feature/caves"), page("feature/rocks")));
|
||||||
|
AgeReference reference = new AgeReference(UUID.randomUUID(), "Written Flowers");
|
||||||
|
var target = AgeDimensionService.resolve(player, reference, writing).orElseThrow();
|
||||||
|
AgeDefinition definition = AgeRegistrySavedData.get(helper.getLevel()).find(reference.id()).orElseThrow();
|
||||||
|
List<AgeFeatureSelection.Choice> expected = AgeFeatureSelection.resolved(definition.plan());
|
||||||
|
helper.assertValueEqual(expected.stream().map(AgeFeatureSelection.Choice::id).toList(),
|
||||||
|
List.of(id("caves"), id("rocks")), "Saved Age definition must retain the written decoration");
|
||||||
|
helper.assertTrue(expected.get(1).material().isPresent(),
|
||||||
|
"Unmodified rocks must receive a chosen material");
|
||||||
|
helper.runAfterDelay(1, () -> {
|
||||||
|
var level = helper.getLevel().getServer().getLevel(target.location().dimension());
|
||||||
|
helper.assertTrue(level != null, "The authored feature Age must load");
|
||||||
|
helper.assertTrue(level.getChunkSource().getGenerator() instanceof AgeFeatureChunkGenerator,
|
||||||
|
"Runtime world generation must use the feature-aware generator");
|
||||||
|
var generator = (AgeFeatureChunkGenerator) level.getChunkSource().getGenerator();
|
||||||
|
helper.assertValueEqual(generator.ageFeatures(), expected,
|
||||||
|
"Runtime generation must receive the frozen authored feature selection");
|
||||||
|
helper.succeed();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void rejects(GameTestHelper helper, OrderedWriting writing, String expected) {
|
||||||
|
try {
|
||||||
|
AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||||
|
helper.fail("Writing must reject " + expected);
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
helper.assertTrue(exception.getMessage().contains(expected), exception.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static AgeFeatureSelection.Choice choice(String path) {
|
||||||
|
return new AgeFeatureSelection.Choice(id(path), java.util.Optional.empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry page(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(id(path)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry block(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(BlockSymbolPages.symbolId(
|
||||||
|
ResourceLocation.withDefaultNamespace(path))));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry panel() { return WritingEntry.linkPanel(); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
import java.util.List;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
|
import net.minecraft.network.codec.ByteBufCodecs;
|
||||||
|
import net.minecraft.network.codec.StreamCodec;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
|
||||||
|
/** Flags written into a Link Panel and carried by books assembled from it. */
|
||||||
|
public record LinkProperties(int flags) {
|
||||||
|
public static final int DISARM = 1;
|
||||||
|
/** Retained only to read pre-0.4.7.1 test books; no longer generated or applied. */
|
||||||
|
public static final int GENERATE_PLATFORM = 2;
|
||||||
|
public static final int MAINTAIN_MOMENTUM = 4;
|
||||||
|
public static final int INTRA_LINKING = 8;
|
||||||
|
private static final int ALL_FLAGS = DISARM | GENERATE_PLATFORM | MAINTAIN_MOMENTUM | INTRA_LINKING;
|
||||||
|
public static final LinkProperties NONE = new LinkProperties(0);
|
||||||
|
public static final Codec<LinkProperties> CODEC = Codec.intRange(0, ALL_FLAGS).xmap(
|
||||||
|
LinkProperties::new, LinkProperties::flags);
|
||||||
|
public static final StreamCodec<ByteBuf, LinkProperties> STREAM_CODEC = StreamCodec.of(
|
||||||
|
(buffer, value) -> ByteBufCodecs.VAR_INT.encode(buffer, value.flags),
|
||||||
|
buffer -> new LinkProperties(ByteBufCodecs.VAR_INT.decode(buffer)));
|
||||||
|
|
||||||
|
public LinkProperties {
|
||||||
|
if ((flags & ~ALL_FLAGS) != 0 || flags < 0) {
|
||||||
|
throw new IllegalArgumentException("Unknown Link Panel flags: " + flags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean has(int flag) {
|
||||||
|
return (flags & flag) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Intra Linking only governs Linking Books; a Descriptive Book treats that panel as ordinary. */
|
||||||
|
public LinkProperties forDescriptiveBook() {
|
||||||
|
return new LinkProperties(flags & ~INTRA_LINKING);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void appendTooltip(List<Component> lines) {
|
||||||
|
if (has(DISARM)) lines.add(propertyName("disarm"));
|
||||||
|
if (has(MAINTAIN_MOMENTUM)) lines.add(propertyName("maintain_momentum"));
|
||||||
|
if (has(INTRA_LINKING)) lines.add(propertyName("intra_linking"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Component propertyName(String name) {
|
||||||
|
return Component.translatable("item.rivencraft.link_property." + name)
|
||||||
|
.withStyle(ChatFormatting.DARK_PURPLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Component name(int flag) {
|
||||||
|
return switch (flag) {
|
||||||
|
case DISARM -> propertyName("disarm");
|
||||||
|
case MAINTAIN_MOMENTUM -> propertyName("maintain_momentum");
|
||||||
|
case INTRA_LINKING -> propertyName("intra_linking");
|
||||||
|
default -> throw new IllegalArgumentException("Unknown link property flag: " + flag);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,7 +25,11 @@ public final class LinkingService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static LinkResult travel(ServerPlayer player, LinkTarget target) {
|
public static LinkResult travel(ServerPlayer player, LinkTarget target) {
|
||||||
return travel(player, target, false);
|
return travel(player, target, LinkProperties.NONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LinkResult travel(ServerPlayer player, LinkTarget target, LinkProperties properties) {
|
||||||
|
return travel(player, target, false, properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Optional<Vec3> resolveDestination(ServerLevel level, BlockPos origin, boolean ageArrival) {
|
public static Optional<Vec3> resolveDestination(ServerLevel level, BlockPos origin, boolean ageArrival) {
|
||||||
@@ -36,27 +40,36 @@ public final class LinkingService {
|
|||||||
|
|
||||||
/** Travels to an Age-style destination, which must have solid footing. */
|
/** Travels to an Age-style destination, which must have solid footing. */
|
||||||
public static LinkResult travelWithFooting(ServerPlayer player, LinkTarget target) {
|
public static LinkResult travelWithFooting(ServerPlayer player, LinkTarget target) {
|
||||||
|
return travelWithFooting(player, target, LinkProperties.NONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LinkResult travelWithFooting(ServerPlayer player, LinkTarget target, LinkProperties properties) {
|
||||||
ServerLevel destinationLevel = player.getServer().getLevel(target.location().dimension());
|
ServerLevel destinationLevel = player.getServer().getLevel(target.location().dimension());
|
||||||
if (destinationLevel == null) {
|
if (destinationLevel == null) {
|
||||||
return LinkResult.MISSING_DIMENSION;
|
return LinkResult.MISSING_DIMENSION;
|
||||||
}
|
}
|
||||||
|
|
||||||
Optional<Vec3> destination = resolveDestination(destinationLevel, target.location().pos(), true);
|
Optional<Vec3> destination = resolveDestination(destinationLevel, target.location().pos(), true);
|
||||||
if (destination.isEmpty()) {
|
if (destination.isEmpty()) {
|
||||||
return LinkResult.NO_SAFE_DESTINATION;
|
return LinkResult.NO_SAFE_DESTINATION;
|
||||||
}
|
}
|
||||||
|
|
||||||
Vec3 position = destination.get();
|
Vec3 position = destination.get();
|
||||||
|
Vec3 momentum = player.getDeltaMovement();
|
||||||
|
if (properties.has(LinkProperties.DISARM)) dropInventoryAtSource(player);
|
||||||
teleport(player, destinationLevel, position, target);
|
teleport(player, destinationLevel, position, target);
|
||||||
|
if (properties.has(LinkProperties.MAINTAIN_MOMENTUM)) player.setDeltaMovement(momentum);
|
||||||
player.resetFallDistance();
|
player.resetFallDistance();
|
||||||
return LinkResult.SUCCESS;
|
return LinkResult.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static LinkResult travel(ServerPlayer player, LinkTarget target, boolean requiresFooting) {
|
private static LinkResult travel(ServerPlayer player, LinkTarget target, boolean requiresFooting,
|
||||||
|
LinkProperties properties) {
|
||||||
ServerLevel destinationLevel = player.getServer().getLevel(target.location().dimension());
|
ServerLevel destinationLevel = player.getServer().getLevel(target.location().dimension());
|
||||||
if (destinationLevel == null) {
|
if (destinationLevel == null) {
|
||||||
return LinkResult.MISSING_DIMENSION;
|
return LinkResult.MISSING_DIMENSION;
|
||||||
}
|
}
|
||||||
|
if (destinationLevel == player.level() && !properties.has(LinkProperties.INTRA_LINKING))
|
||||||
|
return LinkResult.INTRA_LINKING_REQUIRED;
|
||||||
|
|
||||||
Optional<Vec3> destination = resolveDestination(destinationLevel, target.location().pos(), requiresFooting);
|
Optional<Vec3> destination = resolveDestination(destinationLevel, target.location().pos(), requiresFooting);
|
||||||
if (destination.isEmpty()) {
|
if (destination.isEmpty()) {
|
||||||
@@ -64,11 +77,26 @@ public final class LinkingService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Vec3 position = destination.get();
|
Vec3 position = destination.get();
|
||||||
|
Vec3 momentum = player.getDeltaMovement();
|
||||||
|
if (properties.has(LinkProperties.DISARM)) dropInventoryAtSource(player);
|
||||||
teleport(player, destinationLevel, position, target);
|
teleport(player, destinationLevel, position, target);
|
||||||
|
if (properties.has(LinkProperties.MAINTAIN_MOMENTUM)) player.setDeltaMovement(momentum);
|
||||||
player.resetFallDistance();
|
player.resetFallDistance();
|
||||||
return LinkResult.SUCCESS;
|
return LinkResult.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Drop each inventory stack as an item entity at the departure point. */
|
||||||
|
private static void dropInventoryAtSource(ServerPlayer player) {
|
||||||
|
var inventory = player.getInventory();
|
||||||
|
for (int slot = 0; slot < inventory.getContainerSize(); slot++) {
|
||||||
|
var stack = inventory.getItem(slot);
|
||||||
|
if (stack.isEmpty()) continue;
|
||||||
|
inventory.setItem(slot, net.minecraft.world.item.ItemStack.EMPTY);
|
||||||
|
player.drop(stack, false);
|
||||||
|
}
|
||||||
|
player.containerMenu.broadcastChanges();
|
||||||
|
}
|
||||||
|
|
||||||
private static void teleport(
|
private static void teleport(
|
||||||
ServerPlayer player,
|
ServerPlayer player,
|
||||||
ServerLevel destinationLevel,
|
ServerLevel destinationLevel,
|
||||||
@@ -166,6 +194,7 @@ public final class LinkingService {
|
|||||||
public enum LinkResult {
|
public enum LinkResult {
|
||||||
SUCCESS,
|
SUCCESS,
|
||||||
MISSING_DIMENSION,
|
MISSING_DIMENSION,
|
||||||
|
INTRA_LINKING_REQUIRED,
|
||||||
NO_SAFE_DESTINATION
|
NO_SAFE_DESTINATION
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,16 +147,42 @@ public final class TerrainWritingGameTests {
|
|||||||
var randomWriting = net.dnorberg.rivencraft.writing.WritingGrammar.parse(OrderedWriting.EMPTY);
|
var randomWriting = net.dnorberg.rivencraft.writing.WritingGrammar.parse(OrderedWriting.EMPTY);
|
||||||
var traits = new AgeTraits(AgeTraits.BiomeDistribution.TINY, AgeTraits.Lighting.NORMAL,
|
var traits = new AgeTraits(AgeTraits.BiomeDistribution.TINY, AgeTraits.Lighting.NORMAL,
|
||||||
AgeTraits.Weather.NORMAL, 1.0D, 0.0F, 0.0F);
|
AgeTraits.Weather.NORMAL, 1.0D, 0.0F, 0.0F);
|
||||||
|
int availableBiomeCount = new java.util.LinkedHashSet<>(AgeBiomeSelection.eligible(registries, profile)).size();
|
||||||
java.util.Set<Integer> counts = new java.util.HashSet<>();
|
java.util.Set<Integer> counts = new java.util.HashSet<>();
|
||||||
for (long seed = 0; seed < 64; seed++) {
|
for (long seed = 0; seed < 64; seed++) {
|
||||||
var random = AgeBiomeSelection.compile(randomWriting, traits, profile, seed, registries);
|
var random = AgeBiomeSelection.compile(randomWriting, traits, profile, seed, registries);
|
||||||
helper.assertTrue(random.biomes().size() >= 2 && random.biomes().size() <= 6,
|
helper.assertTrue(random.biomes().size() >= 2 && random.biomes().size() <= availableBiomeCount,
|
||||||
"Random Tiny ages must select between two and six distinct biomes");
|
"Random Tiny ages must not exceed their available biome pool");
|
||||||
helper.assertValueEqual(random, AgeBiomeSelection.compile(randomWriting, traits, profile, seed, registries),
|
helper.assertValueEqual(random, AgeBiomeSelection.compile(randomWriting, traits, profile, seed, registries),
|
||||||
"The random count and chosen biomes must be deterministic for an Age seed");
|
"The random count and chosen biomes must be deterministic for an Age seed");
|
||||||
counts.add(random.biomes().size());
|
counts.add(random.biomes().size());
|
||||||
}
|
}
|
||||||
helper.assertTrue(counts.size() > 1, "Random Ages must vary their biome count across seeds");
|
helper.assertTrue(counts.size() > 1, "Random Ages must vary their biome count across seeds");
|
||||||
|
if (availableBiomeCount > 6) {
|
||||||
|
helper.assertTrue(counts.stream().anyMatch(count -> count > 6),
|
||||||
|
"The available biome pool, not the old fixed cap, must bound random Ages");
|
||||||
|
}
|
||||||
|
|
||||||
|
var tiledTraits = new AgeTraits(AgeTraits.BiomeDistribution.TILED, AgeTraits.Lighting.NORMAL,
|
||||||
|
AgeTraits.Weather.NORMAL, 1.0D, 0.0F, 0.0F);
|
||||||
|
if (availableBiomeCount > 4) {
|
||||||
|
boolean exceededOldCap = false;
|
||||||
|
for (long seed = 0; seed < 64; seed++) {
|
||||||
|
var random = AgeBiomeSelection.compile(randomWriting, tiledTraits, profile, seed, registries);
|
||||||
|
helper.assertTrue(random.biomes().size() >= 2 && random.biomes().size() <= availableBiomeCount,
|
||||||
|
"Random Tiled ages must not exceed their available biome pool");
|
||||||
|
exceededOldCap |= random.biomes().size() > 4;
|
||||||
|
}
|
||||||
|
helper.assertTrue(exceededOldCap, "Tiled Ages must also be able to exceed the old fixed cap");
|
||||||
|
}
|
||||||
|
|
||||||
|
var caveProfile = AgeRuntimeProfiles.resolve(AgeGenerationProfiles.CAVE);
|
||||||
|
int caveBiomeCount = new java.util.LinkedHashSet<>(AgeBiomeSelection.eligible(registries, caveProfile)).size();
|
||||||
|
for (long seed = 0; seed < 64; seed++) {
|
||||||
|
var random = AgeBiomeSelection.compile(randomWriting, traits, caveProfile, seed, registries);
|
||||||
|
helper.assertTrue(random.biomes().size() >= 2 && random.biomes().size() <= caveBiomeCount,
|
||||||
|
"Random Cave ages must use the cave biome pool as their upper bound");
|
||||||
|
}
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,18 +206,14 @@ public final class TerrainWritingGameTests {
|
|||||||
helper.assertTrue(level.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().stream()
|
helper.assertTrue(level.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().stream()
|
||||||
.allMatch(biome -> biome.is(Biomes.THE_END)),
|
.allMatch(biome -> biome.is(Biomes.THE_END)),
|
||||||
"The runtime sky-island generator must use the End biome page");
|
"The runtime sky-island generator must use the End biome page");
|
||||||
helper.assertValueEqual(AgeDimensionService.unload(server, age), AgeDimensionService.UnloadResult.UNLOADED,
|
helper.assertValueEqual(AgeGenerationPlan.load(age.plan().save()).biomeSelection(),
|
||||||
"The island Age must unload");
|
age.plan().biomeSelection(), "The authored End biome must survive a plan save/load round trip");
|
||||||
var reloaded = AgeDimensionService.ensureLoaded(server, age);
|
|
||||||
helper.assertTrue(reloaded != null && reloaded.getChunkSource().getGenerator().getBiomeSource()
|
|
||||||
.possibleBiomes().stream().allMatch(biome -> biome.is(Biomes.THE_END)),
|
|
||||||
"The authored End biome must survive runtime dimension reload");
|
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty", timeoutTicks = 600)
|
@GameTest(template = "empty", timeoutTicks = 600)
|
||||||
public static void writtenTerrainFamiliesGenerateSafelyAndReload(GameTestHelper helper) {
|
public static void writtenTerrainFamiliesGenerateSafely(GameTestHelper helper) {
|
||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
checkWrittenTerrain(helper, player, AgeGenerationProfiles.all(), 0);
|
checkWrittenTerrain(helper, player, AgeGenerationProfiles.all(), 0);
|
||||||
}
|
}
|
||||||
@@ -233,14 +255,8 @@ public final class TerrainWritingGameTests {
|
|||||||
&& level.getBlockState(spawn.above()).isAir(),
|
&& level.getBlockState(spawn.above()).isAir(),
|
||||||
"Every written terrain family must retain a safe arrival platform");
|
"Every written terrain family must retain a safe arrival platform");
|
||||||
|
|
||||||
helper.assertValueEqual(AgeDimensionService.unload(server, age),
|
helper.assertValueEqual(AgeGenerationPlan.load(age.plan().save()).runtimeProfile(),
|
||||||
AgeDimensionService.UnloadResult.UNLOADED,
|
age.plan().runtimeProfile(), "The written terrain profile must survive plan persistence");
|
||||||
"A written Age must unload without losing its plan");
|
|
||||||
var reloaded = AgeDimensionService.ensureLoaded(server, age);
|
|
||||||
helper.assertTrue(reloaded != null, "The written Age must reload from its frozen plan");
|
|
||||||
assertGenerator(helper, reloaded, age.plan().runtimeProfile());
|
|
||||||
helper.assertValueEqual(reloaded.dimensionType().effectsLocation(),
|
|
||||||
level.dimensionType().effectsLocation(), "Reload must retain dimension effects");
|
|
||||||
helper.runAfterDelay(1, () -> checkWrittenTerrain(helper, player, profiles, index + 1));
|
helper.runAfterDelay(1, () -> checkWrittenTerrain(helper, player, profiles, index + 1));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -247,8 +247,6 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
x, top + 39, 126, color);
|
x, top + 39, 126, color);
|
||||||
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
||||||
x, top + 64, 126, color);
|
x, top + 64, 126, color);
|
||||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.pages_not_applied"),
|
|
||||||
x, top + 137, 126);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void turnPage(int direction) {
|
private void turnPage(int direction) {
|
||||||
|
|||||||
@@ -8,11 +8,20 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
|||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.entity.player.Inventory;
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.inventory.ClickType;
|
||||||
|
|
||||||
/** Legacy Ink Mixer atlas with a server-synced, sixteen-use basin. */
|
/** Legacy Ink Mixer atlas with a server-synced, sixteen-use basin. */
|
||||||
public final class InkMixerScreen extends AbstractContainerScreen<InkMixerMenu> {
|
public final class InkMixerScreen extends AbstractContainerScreen<InkMixerMenu> {
|
||||||
private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath(
|
private static final ResourceLocation BACKGROUND = ResourceLocation.fromNamespaceAndPath(
|
||||||
Rivencraft.MOD_ID, "textures/gui/ink_mixer_legacy.png");
|
Rivencraft.MOD_ID, "textures/gui/ink_mixer_legacy.png");
|
||||||
|
private static final int BASIN_X = 88;
|
||||||
|
private static final int BASIN_Y = 49;
|
||||||
|
private static final int BASIN_RADIUS = 30;
|
||||||
|
// Legacy's registered property colors: Disarm red, Momentum blue, Intra green.
|
||||||
|
private static final int[] PROPERTY_COLORS = {0xFFE84848, 0xFF5555FF, 0xFF55EF55};
|
||||||
|
private final int[] lastChances = new int[3];
|
||||||
|
private boolean basinClickPendingRelease;
|
||||||
|
private long lastAdditionTime;
|
||||||
|
|
||||||
public InkMixerScreen(InkMixerMenu menu, Inventory inventory, Component title) {
|
public InkMixerScreen(InkMixerMenu menu, Inventory inventory, Component title) {
|
||||||
super(menu, inventory, title);
|
super(menu, inventory, title);
|
||||||
@@ -26,16 +35,14 @@ public final class InkMixerScreen extends AbstractContainerScreen<InkMixerMenu>
|
|||||||
renderBg(graphics, partialTick, mouseX, mouseY);
|
renderBg(graphics, partialTick, mouseX, mouseY);
|
||||||
}
|
}
|
||||||
@Override protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int mouseY) {
|
@Override protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int mouseY) {
|
||||||
graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
|
// Legacy draws this inset behind the transparent center of the main atlas.
|
||||||
int centerX = leftPos + 88;
|
graphics.blit(BACKGROUND, leftPos + 54, topPos + 16, 179, 16, 66, 65, 256, 256);
|
||||||
int centerY = topPos + 49;
|
|
||||||
int fillTop = centerY + 26 - Math.round(menu.inkRemaining() / (float) InkVialItem.CAPACITY * 52);
|
|
||||||
if (menu.inkRemaining() > 0) {
|
if (menu.inkRemaining() > 0) {
|
||||||
for (int y = Math.max(centerY - 26, fillTop); y <= centerY + 26; y++) {
|
// Ink is a full dark basin in Legacy, rather than a vertical meter.
|
||||||
int halfWidth = (int) Math.sqrt(26 * 26 - (y - centerY) * (y - centerY));
|
graphics.fill(leftPos + 54, topPos + 16, leftPos + 120, topPos + 81, 0xFF101014);
|
||||||
graphics.fill(centerX - halfWidth, y, centerX + halfWidth + 1, y + 1, 0xFF241228);
|
renderPropertyGlyph(graphics);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
|
||||||
}
|
}
|
||||||
@Override protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
|
@Override protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
|
||||||
graphics.drawString(font, playerInventoryTitle, inventoryLabelX, inventoryLabelY, 0x404040, false);
|
graphics.drawString(font, playerInventoryTitle, inventoryLabelX, inventoryLabelY, 0x404040, false);
|
||||||
@@ -43,10 +50,112 @@ public final class InkMixerScreen extends AbstractContainerScreen<InkMixerMenu>
|
|||||||
@Override public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
|
@Override public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
super.render(graphics, mouseX, mouseY, partialTick);
|
super.render(graphics, mouseX, mouseY, partialTick);
|
||||||
renderTooltip(graphics, mouseX, mouseY);
|
renderTooltip(graphics, mouseX, mouseY);
|
||||||
int x = mouseX - (leftPos + 88);
|
if (overBasin(mouseX, mouseY)) {
|
||||||
int y = mouseY - (topPos + 49);
|
var lines = new java.util.ArrayList<Component>();
|
||||||
if (x * x + y * y <= 26 * 26)
|
lines.add(Component.translatable("screen.rivencraft.ink_mixer.ink",
|
||||||
graphics.renderTooltip(font, Component.translatable("screen.rivencraft.ink_mixer.ink",
|
menu.inkRemaining(), InkVialItem.CAPACITY));
|
||||||
menu.inkRemaining(), InkVialItem.CAPACITY), mouseX, mouseY);
|
lines.add(Component.translatable("screen.rivencraft.ink_mixer.additive_hint"));
|
||||||
|
for (int index = 0; index < 3; index++) {
|
||||||
|
int chance = menu.modifierChancePermille(index);
|
||||||
|
if (chance > 0) lines.add(Component.translatable("screen.rivencraft.ink_mixer.chance",
|
||||||
|
switch (index) {
|
||||||
|
case 0 -> Component.translatable("item.rivencraft.link_property.disarm");
|
||||||
|
case 1 -> Component.translatable("item.rivencraft.link_property.maintain_momentum");
|
||||||
|
default -> Component.translatable("item.rivencraft.link_property.intra_linking");
|
||||||
|
}, chance / 10.0));
|
||||||
|
}
|
||||||
|
graphics.renderTooltip(font, lines, java.util.Optional.empty(), mouseX, mouseY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseClicked(double mouseX, double mouseY, int button) {
|
||||||
|
if ((button == 0 || button == 1) && overBasin(mouseX, mouseY)
|
||||||
|
&& !menu.getCarried().isEmpty()) {
|
||||||
|
slotClicked(menu.getSlot(InkMixerMenu.MODIFIER), InkMixerMenu.MODIFIER, button, ClickType.PICKUP);
|
||||||
|
basinClickPendingRelease = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseClicked(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseReleased(double mouseX, double mouseY, int button) {
|
||||||
|
if (basinClickPendingRelease) {
|
||||||
|
basinClickPendingRelease = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseReleased(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean overBasin(double mouseX, double mouseY) {
|
||||||
|
double x = mouseX - leftPos - BASIN_X;
|
||||||
|
double y = mouseY - topPos - BASIN_Y;
|
||||||
|
return x * x + y * y < BASIN_RADIUS * BASIN_RADIUS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A GUI-scale projection of Legacy's colored, rotating D'ni ink effect. */
|
||||||
|
private void renderPropertyGlyph(GuiGraphics graphics) {
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
int[] active = new int[3];
|
||||||
|
int count = 0;
|
||||||
|
int strongest = 0;
|
||||||
|
for (int index = 0; index < lastChances.length; index++) {
|
||||||
|
int chance = menu.modifierChancePermille(index);
|
||||||
|
if (chance > lastChances[index]) lastAdditionTime = now;
|
||||||
|
lastChances[index] = chance;
|
||||||
|
if (chance > 0) {
|
||||||
|
active[count++] = index;
|
||||||
|
strongest = Math.max(strongest, chance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (count == 0) {
|
||||||
|
lastAdditionTime = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
double cycle = now / 1800.0;
|
||||||
|
int first = active[(int) cycle % count];
|
||||||
|
int second = active[((int) cycle + 1) % count];
|
||||||
|
double blend = (1.0 - Math.cos((cycle % 1.0) * Math.PI)) / 2.0;
|
||||||
|
int rgb = blendRgb(PROPERTY_COLORS[first], PROPERTY_COLORS[second], blend);
|
||||||
|
double pulse = Math.max(0.0, 1.0 - (now - lastAdditionTime) / 700.0);
|
||||||
|
int alpha = Math.clamp((int) (70 + strongest * 0.14 + pulse * 45), 0, 255);
|
||||||
|
int color = alpha << 24 | rgb;
|
||||||
|
int centerX = leftPos + BASIN_X;
|
||||||
|
int centerY = topPos + BASIN_Y;
|
||||||
|
double turn = now / 1200.0;
|
||||||
|
|
||||||
|
for (int spoke = 0; spoke < 4; spoke++) {
|
||||||
|
for (int step = 0; step <= 30; step++) {
|
||||||
|
double progress = step / 30.0;
|
||||||
|
double angle = turn + spoke * Math.PI / 2.0 + progress * 0.9;
|
||||||
|
double radius = 3.0 + progress * (15.0 + pulse * 3.0);
|
||||||
|
plot(graphics, centerX + Math.cos(angle) * radius,
|
||||||
|
centerY + Math.sin(angle) * radius, color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int step = 0; step < 96; step++) {
|
||||||
|
double angle = step * Math.PI / 48.0 + turn * 0.3;
|
||||||
|
plot(graphics, centerX + Math.cos(angle) * 19.0,
|
||||||
|
centerY + Math.sin(angle) * 19.0, color);
|
||||||
|
if (strongest >= 990 && step % 2 == 0) {
|
||||||
|
plot(graphics, centerX + Math.cos(angle) * 23.0,
|
||||||
|
centerY + Math.sin(angle) * 23.0, color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int blendRgb(int first, int second, double amount) {
|
||||||
|
int red = (int) (((first >> 16) & 0xFF) * (1.0 - amount)
|
||||||
|
+ ((second >> 16) & 0xFF) * amount);
|
||||||
|
int green = (int) (((first >> 8) & 0xFF) * (1.0 - amount)
|
||||||
|
+ ((second >> 8) & 0xFF) * amount);
|
||||||
|
int blue = (int) ((first & 0xFF) * (1.0 - amount) + (second & 0xFF) * amount);
|
||||||
|
return red << 16 | green << 8 | blue;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void plot(GuiGraphics graphics, double x, double y, int color) {
|
||||||
|
int pixelX = (int) Math.round(x);
|
||||||
|
int pixelY = (int) Math.round(y);
|
||||||
|
graphics.fill(pixelX, pixelY, pixelX + 1, pixelY + 1, color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@ import net.dnorberg.rivencraft.item.PageItem;
|
|||||||
import net.dnorberg.rivencraft.client.SymbolPageTextures;
|
import net.dnorberg.rivencraft.client.SymbolPageTextures;
|
||||||
import net.dnorberg.rivencraft.menu.NotebookMenu;
|
import net.dnorberg.rivencraft.menu.NotebookMenu;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
import net.minecraft.client.gui.GuiGraphics;
|
import net.minecraft.client.gui.GuiGraphics;
|
||||||
import net.minecraft.client.gui.components.Button;
|
import net.minecraft.client.gui.components.Button;
|
||||||
import net.minecraft.client.gui.components.EditBox;
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
@@ -115,7 +116,8 @@ public final class NotebookScreen extends AbstractContainerScreen<NotebookMenu>
|
|||||||
if (index >= 0 && (button == 0 || button == 1)) {
|
if (index >= 0 && (button == 0 || button == 1)) {
|
||||||
ItemStack page = menu.getSlot(index).getItem();
|
ItemStack page = menu.getSlot(index).getItem();
|
||||||
if ((!page.isEmpty() && !matchesSearch(page))
|
if ((!page.isEmpty() && !matchesSearch(page))
|
||||||
|| (page.isEmpty() && !menu.getCarried().is(ModItems.PAGE.get()))) {
|
|| (page.isEmpty() && (!menu.getCarried().is(ModItems.PAGE.get())
|
||||||
|
|| PageItem.content(menu.getCarried()).kind() == PageContent.Kind.LINK_PANEL))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
setFocused(null);
|
setFocused(null);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import java.util.Comparator;
|
|||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.client.SymbolPageTextures;
|
import net.dnorberg.rivencraft.client.SymbolPageTextures;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||||
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
@@ -329,7 +330,9 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
|||||||
int surfaceY = (int) Math.floor(mouseY - topPos - 20);
|
int surfaceY = (int) Math.floor(mouseY - topPos - 20);
|
||||||
if ((button == 0 || button == 1) && !menu.getCarried().isEmpty()
|
if ((button == 0 || button == 1) && !menu.getCarried().isEmpty()
|
||||||
&& surfaceX >= 0 && surfaceX < 155 && surfaceY >= 0 && surfaceY < 164) {
|
&& surfaceX >= 0 && surfaceX < 155 && surfaceY >= 0 && surfaceY < 164) {
|
||||||
if (menu.getCarried().is(ModItems.PAGE.get()) && surfaceX % 31 < 30 && surfaceY % 41 < 40) {
|
if (menu.getCarried().is(ModItems.PAGE.get())
|
||||||
|
&& PageItem.content(menu.getCarried()).kind() != PageContent.Kind.LINK_PANEL
|
||||||
|
&& surfaceX % 31 < 30 && surfaceY % 41 < 40) {
|
||||||
int index = (surfaceY / 41 + scrollRows) * 5 + surfaceX / 31;
|
int index = (surfaceY / 41 + scrollRows) * 5 + surfaceX / 31;
|
||||||
List<DisplayPage> entries = filteredPages();
|
List<DisplayPage> entries = filteredPages();
|
||||||
// Only displayed positions are addressable. Filtering never turns
|
// Only displayed positions are addressable. Filtering never turns
|
||||||
|
|||||||
@@ -19,14 +19,20 @@ import mezz.jei.api.registration.IRecipeRegistration;
|
|||||||
import mezz.jei.api.registration.ISubtypeRegistration;
|
import mezz.jei.api.registration.ISubtypeRegistration;
|
||||||
import mezz.jei.api.registration.IExtraIngredientRegistration;
|
import mezz.jei.api.registration.IExtraIngredientRegistration;
|
||||||
import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
|
import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter;
|
||||||
|
import mezz.jei.api.ingredients.subtypes.UidContext;
|
||||||
import mezz.jei.api.runtime.IJeiRuntime;
|
import mezz.jei.api.runtime.IJeiRuntime;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
|
import net.dnorberg.rivencraft.writing.InkModifierIngredients;
|
||||||
import net.dnorberg.rivencraft.writing.PageContent;
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiGraphics;
|
import net.minecraft.client.gui.GuiGraphics;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.Items;
|
import net.minecraft.world.item.Items;
|
||||||
@@ -51,7 +57,8 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
PageContent content = PageItem.content(stack);
|
PageContent content = PageItem.content(stack);
|
||||||
return switch (content.kind()) {
|
return switch (content.kind()) {
|
||||||
case BLANK -> "blank";
|
case BLANK -> "blank";
|
||||||
case LINK_PANEL -> "link_panel";
|
case LINK_PANEL -> "link_panel:" + stack.getOrDefault(
|
||||||
|
ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE).flags();
|
||||||
case SYMBOL -> "symbol:" + content.symbol().orElseThrow().id();
|
case SYMBOL -> "symbol:" + content.symbol().orElseThrow().id();
|
||||||
case UNRESOLVED_SYMBOL -> "unresolved:" + content.symbol().orElseThrow().id();
|
case UNRESOLVED_SYMBOL -> "unresolved:" + content.symbol().orElseThrow().id();
|
||||||
};
|
};
|
||||||
@@ -74,6 +81,9 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRuntimeAvailable(IJeiRuntime runtime) {
|
public void onRuntimeAvailable(IJeiRuntime runtime) {
|
||||||
|
// JEI discovers the base Page item as a blank stack; only authored pages belong in its list.
|
||||||
|
runtime.getIngredientVisibility().hideIngredients(VanillaTypes.ITEM_STACK,
|
||||||
|
List.of(new ItemStack(ModItems.PAGE.get())), List.of(UidContext.Ingredient));
|
||||||
var connection = Minecraft.getInstance().getConnection();
|
var connection = Minecraft.getInstance().getConnection();
|
||||||
if (connection == null) return;
|
if (connection == null) return;
|
||||||
Set<ResourceLocation> known = runtime.getIngredientManager().getAllItemStacks().stream()
|
Set<ResourceLocation> known = runtime.getIngredientManager().getAllItemStacks().stream()
|
||||||
@@ -99,17 +109,23 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
@Override
|
@Override
|
||||||
public void registerRecipes(IRecipeRegistration registration) {
|
public void registerRecipes(IRecipeRegistration registration) {
|
||||||
ItemStack panel = PageItem.createLinkPanelPage();
|
ItemStack panel = PageItem.createLinkPanelPage();
|
||||||
|
ItemStack symbolPage = PageItem.createSymbolPage(new SymbolReference(
|
||||||
|
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "terrain/standard")));
|
||||||
registration.addRecipes(WRITING, List.of(
|
registration.addRecipes(WRITING, List.of(
|
||||||
new WritingGuide(List.of(new ItemStack(Items.PAPER), new ItemStack(ModItems.INK_VIAL.get())),
|
new WritingGuide(List.of(new ItemStack(Items.PAPER), new ItemStack(ModItems.INK_VIAL.get())),
|
||||||
panel, "jei.rivencraft.writing.link_panel_hand"),
|
panel, "jei.rivencraft.writing.link_panel_hand"),
|
||||||
new WritingGuide(List.of(panel, new ItemStack(Items.PAPER), new ItemStack(ModItems.INK_VIAL.get())),
|
new WritingGuide(List.of(symbolPage, new ItemStack(Items.PAPER), new ItemStack(ModItems.INK_VIAL.get())),
|
||||||
panel, "jei.rivencraft.writing.copy"),
|
symbolPage, "jei.rivencraft.writing.copy"),
|
||||||
new WritingGuide(List.of(new ItemStack(Items.LEATHER), panel),
|
new WritingGuide(List.of(new ItemStack(Items.LEATHER), panel),
|
||||||
new ItemStack(ModItems.DESCRIPTIVE_BOOK.get()), "jei.rivencraft.writing.bind"),
|
new ItemStack(ModItems.DESCRIPTIVE_BOOK.get()), "jei.rivencraft.writing.bind"),
|
||||||
new WritingGuide(List.of(panel, new ItemStack(Items.LEATHER)),
|
new WritingGuide(List.of(panel, new ItemStack(Items.LEATHER)),
|
||||||
new ItemStack(ModItems.LINKING_BOOK.get()), "jei.rivencraft.writing.linking_book")
|
new ItemStack(ModItems.LINKING_BOOK.get()), "jei.rivencraft.writing.linking_book")
|
||||||
));
|
));
|
||||||
registration.addRecipes(INK_MIXER, List.of(new InkMixerGuide(panel)));
|
List<InkMixerGuide> mixerGuides = new ArrayList<>();
|
||||||
|
mixerGuides.add(new InkMixerGuide(panel, null));
|
||||||
|
InkModifierIngredients.builtIn().forEach(ingredient ->
|
||||||
|
mixerGuides.add(new InkMixerGuide(panel, ingredient)));
|
||||||
|
registration.addRecipes(INK_MIXER, mixerGuides);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -120,7 +136,7 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private record WritingGuide(List<ItemStack> inputs, ItemStack output, String instructionKey) {}
|
private record WritingGuide(List<ItemStack> inputs, ItemStack output, String instructionKey) {}
|
||||||
private record InkMixerGuide(ItemStack panel) {}
|
private record InkMixerGuide(ItemStack panel, InkModifierIngredients.Ingredient additive) {}
|
||||||
|
|
||||||
private static final class InkMixerCategory extends AbstractRecipeCategory<InkMixerGuide> {
|
private static final class InkMixerCategory extends AbstractRecipeCategory<InkMixerGuide> {
|
||||||
InkMixerCategory(IGuiHelper guiHelper) {
|
InkMixerCategory(IGuiHelper guiHelper) {
|
||||||
@@ -134,6 +150,9 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
builder.addInputSlot(2, 3).setStandardSlotBackground().addItemStack(new ItemStack(Items.PAPER));
|
builder.addInputSlot(2, 3).setStandardSlotBackground().addItemStack(new ItemStack(Items.PAPER));
|
||||||
builder.addInputSlot(23, 3).setStandardSlotBackground()
|
builder.addInputSlot(23, 3).setStandardSlotBackground()
|
||||||
.addItemStack(new ItemStack(ModItems.INK_VIAL.get()));
|
.addItemStack(new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
|
if (recipe.additive() != null)
|
||||||
|
builder.addInputSlot(44, 3).setStandardSlotBackground()
|
||||||
|
.addItemStack(recipe.additive().item());
|
||||||
builder.addOutputSlot(112, 3).setOutputSlotBackground().addItemStack(recipe.panel());
|
builder.addOutputSlot(112, 3).setOutputSlotBackground().addItemStack(recipe.panel());
|
||||||
builder.addOutputSlot(112, 46).setStandardSlotBackground()
|
builder.addOutputSlot(112, 46).setStandardSlotBackground()
|
||||||
.addItemStack(new ItemStack(Items.GLASS_BOTTLE));
|
.addItemStack(new ItemStack(Items.GLASS_BOTTLE));
|
||||||
@@ -142,8 +161,20 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
@Override
|
@Override
|
||||||
public void draw(InkMixerGuide recipe, IRecipeSlotsView slots, GuiGraphics graphics,
|
public void draw(InkMixerGuide recipe, IRecipeSlotsView slots, GuiGraphics graphics,
|
||||||
double mouseX, double mouseY) {
|
double mouseX, double mouseY) {
|
||||||
graphics.drawWordWrap(Minecraft.getInstance().font,
|
Component instructions = recipe.additive() == null
|
||||||
Component.translatable("jei.rivencraft.ink_mixer.usage"), 2, 27, 104, 0x404040);
|
? Component.translatable("jei.rivencraft.ink_mixer.usage")
|
||||||
|
: additiveInstructions(recipe.additive());
|
||||||
|
graphics.drawWordWrap(Minecraft.getInstance().font, instructions, 2, 27, 104, 0x404040);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Component additiveInstructions(InkModifierIngredients.Ingredient additive) {
|
||||||
|
MutableComponent effects = Component.empty();
|
||||||
|
for (InkModifierIngredients.Effect effect : additive.effects()) {
|
||||||
|
if (!effects.getSiblings().isEmpty()) effects.append(", ");
|
||||||
|
effects.append(Component.translatable("jei.rivencraft.ink_mixer.effect",
|
||||||
|
LinkProperties.name(effect.flag()), Math.round(effect.chance() * 100)));
|
||||||
|
}
|
||||||
|
return Component.translatable("jei.rivencraft.ink_mixer.additive", effects);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,14 @@ public final class BookBinderGameTests {
|
|||||||
helper.assertFalse(binder.consumeAssembly(), "Failure must consume nothing");
|
helper.assertFalse(binder.consumeAssembly(), "Failure must consume nothing");
|
||||||
helper.assertTrue(binder.getItem(BookBinderBlockEntity.COVER).is(Items.LEATHER),
|
helper.assertTrue(binder.getItem(BookBinderBlockEntity.COVER).is(Items.LEATHER),
|
||||||
"Rejected assembly must preserve cover");
|
"Rejected assembly must preserve cover");
|
||||||
binder.setItem(BookBinderBlockEntity.LINK_PANEL, PageItem.createLinkPanelPage());
|
ItemStack flavoredPanel = PageItem.createLinkPanelPage();
|
||||||
|
flavoredPanel.set(ModDataComponents.LINK_PROPERTIES.get(),
|
||||||
|
new net.dnorberg.rivencraft.book.LinkProperties(
|
||||||
|
net.dnorberg.rivencraft.book.LinkProperties.DISARM
|
||||||
|
| net.dnorberg.rivencraft.book.LinkProperties.MAINTAIN_MOMENTUM
|
||||||
|
| net.dnorberg.rivencraft.book.LinkProperties.INTRA_LINKING));
|
||||||
|
var expectedProperties = flavoredPanel.get(ModDataComponents.LINK_PROPERTIES.get()).forDescriptiveBook();
|
||||||
|
binder.setItem(BookBinderBlockEntity.LINK_PANEL, flavoredPanel);
|
||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
player.moveTo(binder.getBlockPos().getX() + 0.5, binder.getBlockPos().getY() + 0.5,
|
player.moveTo(binder.getBlockPos().getX() + 0.5, binder.getBlockPos().getY() + 0.5,
|
||||||
binder.getBlockPos().getZ() + 0.5);
|
binder.getBlockPos().getZ() + 0.5);
|
||||||
@@ -143,6 +150,9 @@ public final class BookBinderGameTests {
|
|||||||
menu.clicked(BookBinderMenu.RESULT, 0, ClickType.PICKUP, player);
|
menu.clicked(BookBinderMenu.RESULT, 0, ClickType.PICKUP, player);
|
||||||
ItemStack book = menu.getCarried();
|
ItemStack book = menu.getCarried();
|
||||||
helper.assertTrue(book.is(ModItems.DESCRIPTIVE_BOOK.get()), "Result must be a Descriptive Book");
|
helper.assertTrue(book.is(ModItems.DESCRIPTIVE_BOOK.get()), "Result must be a Descriptive Book");
|
||||||
|
helper.assertValueEqual(book.get(ModDataComponents.LINK_PROPERTIES.get()),
|
||||||
|
expectedProperties,
|
||||||
|
"Binder must retain Disarm and Momentum but omit Intra Linking");
|
||||||
AgeReference age = book.get(ModDataComponents.AGE_REFERENCE.get());
|
AgeReference age = book.get(ModDataComponents.AGE_REFERENCE.get());
|
||||||
helper.assertTrue(age != null, "Assembled book must already be a written Age book");
|
helper.assertTrue(age != null, "Assembled book must already be a written Age book");
|
||||||
OrderedWriting writing = book.get(ModDataComponents.BOOK_WRITING.get());
|
OrderedWriting writing = book.get(ModDataComponents.BOOK_WRITING.get());
|
||||||
|
|||||||
@@ -102,6 +102,11 @@ public final class CoreGameTests {
|
|||||||
InkMixerGameTests.linkPanelRequiresTakingOutputAndPersistsInk(helper);
|
InkMixerGameTests.linkPanelRequiresTakingOutputAndPersistsInk(helper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void mixerModifierTransaction(GameTestHelper helper) {
|
||||||
|
InkMixerGameTests.modifierClickPersistsPreviewAndConsumesOnce(helper);
|
||||||
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty")
|
@GameTest(template = "empty")
|
||||||
public static void linkingBookRecipe(GameTestHelper helper) {
|
public static void linkingBookRecipe(GameTestHelper helper) {
|
||||||
LinkingBookRecipeGameTests.legacyRecipeRequiresExactlyLeatherAndLinkPanel(helper);
|
LinkingBookRecipeGameTests.legacyRecipeRequiresExactlyLeatherAndLinkPanel(helper);
|
||||||
|
|||||||
@@ -28,6 +28,69 @@ public final class InkMixerGameTests {
|
|||||||
return (InkMixerBlockEntity) helper.getLevel().getBlockEntity(pos);
|
return (InkMixerBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void modifierClickPersistsPreviewAndConsumesOnce(GameTestHelper helper) {
|
||||||
|
InkMixerBlockEntity mixer = place(helper);
|
||||||
|
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
|
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
|
player.moveTo(mixer.getBlockPos().getX() + 0.5, mixer.getBlockPos().getY() + 0.5,
|
||||||
|
mixer.getBlockPos().getZ() + 0.5);
|
||||||
|
InkMixerMenu menu = new InkMixerMenu(1, player.getInventory(), mixer);
|
||||||
|
menu.setCarried(new ItemStack(Items.GUNPOWDER, 2));
|
||||||
|
menu.clicked(InkMixerMenu.MODIFIER, 1, ClickType.PICKUP, player);
|
||||||
|
helper.assertValueEqual(menu.getCarried().getCount(), 1, "Right click must consume one additive");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(0), 200,
|
||||||
|
"Gunpowder must add Legacy's 20% Disarm chance");
|
||||||
|
menu.setCarried(new ItemStack(Items.STONE));
|
||||||
|
menu.clicked(InkMixerMenu.MODIFIER, 0, ClickType.PICKUP, player);
|
||||||
|
helper.assertValueEqual(menu.getCarried().getCount(), 1, "Invalid additive must remain carried");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(0), 200,
|
||||||
|
"Invalid additive must not change the mixture");
|
||||||
|
ItemStack preview = mixer.previewLinkPanel();
|
||||||
|
var saved = mixer.saveWithoutMetadata(helper.getLevel().registryAccess());
|
||||||
|
var restored = new InkMixerBlockEntity(mixer.getBlockPos(), ModBlocks.INK_MIXER.get().defaultBlockState());
|
||||||
|
restored.loadWithComponents(saved, helper.getLevel().registryAccess());
|
||||||
|
helper.assertTrue(ItemStack.matches(preview, restored.previewLinkPanel()),
|
||||||
|
"Saving must retain the mixture and deterministic next-panel preview");
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
menu.clicked(InkMixerMenu.RESULT, 0, ClickType.PICKUP, player);
|
||||||
|
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking result must give a panel");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(0), 0,
|
||||||
|
"Mixture must be spent only when a panel is taken");
|
||||||
|
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
|
||||||
|
"Taking the panel must consume exactly one paper");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void enderPearlsRaiseBothPropertiesIndependentlyAndResetOnOutput(GameTestHelper helper) {
|
||||||
|
InkMixerBlockEntity mixer = place(helper);
|
||||||
|
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
|
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
|
ItemStack pearls = new ItemStack(Items.ENDER_PEARL, 20);
|
||||||
|
helper.assertTrue(mixer.addModifier(pearls, 20), "Ender Pearls must infuse the basin");
|
||||||
|
helper.assertTrue(pearls.isEmpty(), "Twenty pearls must be consumed exactly once");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(0), 961,
|
||||||
|
"Disarm must approach 100% independently");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(2), 961,
|
||||||
|
"Intra Linking must approach 100% independently");
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(1), 0,
|
||||||
|
"Ender Pearls must not add Momentum");
|
||||||
|
|
||||||
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
|
player.moveTo(mixer.getBlockPos().getX() + 0.5, mixer.getBlockPos().getY() + 0.5,
|
||||||
|
mixer.getBlockPos().getZ() + 0.5);
|
||||||
|
InkMixerMenu menu = new InkMixerMenu(1, player.getInventory(), mixer);
|
||||||
|
menu.clicked(InkMixerMenu.RESULT, 0, ClickType.PICKUP, player);
|
||||||
|
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking output must yield one panel");
|
||||||
|
for (int index = 0; index < 3; index++)
|
||||||
|
helper.assertValueEqual(mixer.modifierChancePermille(index), 0,
|
||||||
|
"Every modifier chance must reset when output is taken");
|
||||||
|
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
|
||||||
|
"Taking output must consume one paper");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
public static void linkPanelRequiresTakingOutputAndPersistsInk(GameTestHelper helper) {
|
public static void linkPanelRequiresTakingOutputAndPersistsInk(GameTestHelper helper) {
|
||||||
InkMixerBlockEntity mixer = place(helper);
|
InkMixerBlockEntity mixer = place(helper);
|
||||||
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package net.dnorberg.rivencraft.gametest;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
@@ -48,6 +49,8 @@ public final class LinkingBookRecipeGameTests {
|
|||||||
public static void outputIsUnwrittenAndRegisteredRecipeLoads(GameTestHelper helper) {
|
public static void outputIsUnwrittenAndRegisteredRecipeLoads(GameTestHelper helper) {
|
||||||
ItemStack panel = PageItem.createLinkPanelPage();
|
ItemStack panel = PageItem.createLinkPanelPage();
|
||||||
panel.set(DataComponents.CUSTOM_NAME, Component.literal("Home Panel"));
|
panel.set(DataComponents.CUSTOM_NAME, Component.literal("Home Panel"));
|
||||||
|
panel.set(ModDataComponents.LINK_PROPERTIES.get(),
|
||||||
|
new LinkProperties(LinkProperties.INTRA_LINKING | LinkProperties.MAINTAIN_MOMENTUM));
|
||||||
CraftingInput input = CraftingInput.of(2, 1, List.of(panel, new ItemStack(Items.LEATHER)));
|
CraftingInput input = CraftingInput.of(2, 1, List.of(panel, new ItemStack(Items.LEATHER)));
|
||||||
var holder = helper.getLevel().getRecipeManager()
|
var holder = helper.getLevel().getRecipeManager()
|
||||||
.getRecipeFor(RecipeType.CRAFTING, input, helper.getLevel()).orElseThrow();
|
.getRecipeFor(RecipeType.CRAFTING, input, helper.getLevel()).orElseThrow();
|
||||||
@@ -60,6 +63,14 @@ public final class LinkingBookRecipeGameTests {
|
|||||||
helper.assertFalse(result.has(ModDataComponents.PAGE_CONTENT.get()), "Page identity must not leak onto the book");
|
helper.assertFalse(result.has(ModDataComponents.PAGE_CONTENT.get()), "Page identity must not leak onto the book");
|
||||||
helper.assertValueEqual(result.get(DataComponents.CUSTOM_NAME), Component.literal("Home Panel"),
|
helper.assertValueEqual(result.get(DataComponents.CUSTOM_NAME), Component.literal("Home Panel"),
|
||||||
"The panel's custom name must survive crafting");
|
"The panel's custom name must survive crafting");
|
||||||
|
helper.assertValueEqual(result.get(ModDataComponents.LINK_PROPERTIES.get()),
|
||||||
|
panel.get(ModDataComponents.LINK_PROPERTIES.get()),
|
||||||
|
"The panel's link properties must survive crafting");
|
||||||
|
ItemStack restored = ItemStack.parseOptional(helper.getLevel().registryAccess(),
|
||||||
|
(net.minecraft.nbt.CompoundTag) result.saveOptional(helper.getLevel().registryAccess()));
|
||||||
|
helper.assertValueEqual(restored.get(ModDataComponents.LINK_PROPERTIES.get()),
|
||||||
|
panel.get(ModDataComponents.LINK_PROPERTIES.get()),
|
||||||
|
"The crafted book's link properties must persist through save/load");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
|||||||
import net.dnorberg.rivencraft.book.AgeRuntimeProfile;
|
import net.dnorberg.rivencraft.book.AgeRuntimeProfile;
|
||||||
import net.dnorberg.rivencraft.book.AgeRuntimeProfiles;
|
import net.dnorberg.rivencraft.book.AgeRuntimeProfiles;
|
||||||
import net.dnorberg.rivencraft.book.LinkTarget;
|
import net.dnorberg.rivencraft.book.LinkTarget;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.book.LinkingService;
|
import net.dnorberg.rivencraft.book.LinkingService;
|
||||||
import net.dnorberg.rivencraft.book.AgeVisitSavedData;
|
import net.dnorberg.rivencraft.book.AgeVisitSavedData;
|
||||||
import net.dnorberg.rivencraft.book.AgeTraits;
|
import net.dnorberg.rivencraft.book.AgeTraits;
|
||||||
@@ -313,42 +314,6 @@ public final class LinkingGameTests {
|
|||||||
throw new IllegalStateException("Could not select profile " + profile);
|
throw new IllegalStateException("Could not select profile " + profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty", timeoutTicks = 100)
|
|
||||||
public static void unloadedAgeReloadsWithTheSameDefinition(GameTestHelper helper) {
|
|
||||||
UUID id = UUID.randomUUID();
|
|
||||||
AgeDefinition definition = AgeRegistrySavedData.resolveOrCreate(
|
|
||||||
helper.getLevel(),
|
|
||||||
new AgeReference(id, "Lifecycle Test Age " + id)
|
|
||||||
);
|
|
||||||
|
|
||||||
var server = helper.getLevel().getServer();
|
|
||||||
var first = AgeDimensionService.ensureLoaded(server, definition);
|
|
||||||
helper.assertTrue(first != null, "The lifecycle test Age must load");
|
|
||||||
helper.runAfterDelay(1, () -> {
|
|
||||||
helper.assertValueEqual(
|
|
||||||
AgeDimensionService.unload(server, definition),
|
|
||||||
AgeDimensionService.UnloadResult.UNLOADED,
|
|
||||||
"A loaded Age must unload without deleting its definition"
|
|
||||||
);
|
|
||||||
helper.runAfterDelay(1, () -> {
|
|
||||||
helper.assertTrue(server.getLevel(AgeDimensionService.dimensionKey(definition)) == null,
|
|
||||||
"An unloaded Age must leave the active server level map");
|
|
||||||
|
|
||||||
var reloaded = AgeDimensionService.ensureLoaded(server, definition);
|
|
||||||
helper.assertTrue(reloaded != null, "A book must be able to reload an archived Age");
|
|
||||||
helper.runAfterDelay(1, () -> {
|
|
||||||
var registered = server.getLevel(AgeDimensionService.dimensionKey(definition));
|
|
||||||
helper.assertTrue(registered != null, "The reloaded Age must rejoin the active server level map");
|
|
||||||
helper.assertValueEqual(registered.getSeed(), definition.seed(),
|
|
||||||
"Reloading an Age must preserve its immutable seed");
|
|
||||||
helper.assertValueEqual(registered.dimension().location(), definition.dimensionId(),
|
|
||||||
"Reloading an Age must preserve its dimension identifier");
|
|
||||||
helper.succeed();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@GameTest(template = "empty", timeoutTicks = 200)
|
@GameTest(template = "empty", timeoutTicks = 200)
|
||||||
public static void legacyBaseTerrainProfilesLoadRuntimeDimensions(GameTestHelper helper) {
|
public static void legacyBaseTerrainProfilesLoadRuntimeDimensions(GameTestHelper helper) {
|
||||||
for (var profile : AgeGenerationProfiles.all()) {
|
for (var profile : AgeGenerationProfiles.all()) {
|
||||||
@@ -421,9 +386,11 @@ public final class LinkingGameTests {
|
|||||||
}
|
}
|
||||||
if (profile.equals(AgeGenerationProfiles.AMPLIFIED)) {
|
if (profile.equals(AgeGenerationProfiles.AMPLIFIED)) {
|
||||||
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
||||||
|
int availableBiomes = AgeBiomeSelection.eligible(helper.getLevel().registryAccess(),
|
||||||
|
AgeRuntimeProfiles.resolve(profile)).size();
|
||||||
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
||||||
&& biomeSource.possibleBiomes().size() <= 4,
|
&& biomeSource.possibleBiomes().size() <= availableBiomes,
|
||||||
"Random Tiled distribution must use two to four seeded biomes");
|
"Random Tiled distribution must stay within the available biome pool");
|
||||||
var origin = biomeSource.getNoiseBiome(0, 0, 0, null);
|
var origin = biomeSource.getNoiseBiome(0, 0, 0, null);
|
||||||
var eastTile = biomeSource.getNoiseBiome(64, 0, 0, null);
|
var eastTile = biomeSource.getNoiseBiome(64, 0, 0, null);
|
||||||
helper.assertFalse(origin.equals(eastTile),
|
helper.assertFalse(origin.equals(eastTile),
|
||||||
@@ -431,9 +398,11 @@ public final class LinkingGameTests {
|
|||||||
}
|
}
|
||||||
if (profile.equals(AgeGenerationProfiles.ISLAND)) {
|
if (profile.equals(AgeGenerationProfiles.ISLAND)) {
|
||||||
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
||||||
|
int availableBiomes = AgeBiomeSelection.eligible(helper.getLevel().registryAccess(),
|
||||||
|
AgeRuntimeProfiles.resolve(profile)).size();
|
||||||
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
||||||
&& biomeSource.possibleBiomes().size() <= 4,
|
&& biomeSource.possibleBiomes().size() <= availableBiomes,
|
||||||
"Random Grid distribution must use two to four seeded biomes");
|
"Random Grid distribution must stay within the available biome pool");
|
||||||
var origin = biomeSource.getNoiseBiome(0, 0, 0, null);
|
var origin = biomeSource.getNoiseBiome(0, 0, 0, null);
|
||||||
var insideOriginChunk = biomeSource.getNoiseBiome(3, 0, 3, null);
|
var insideOriginChunk = biomeSource.getNoiseBiome(3, 0, 3, null);
|
||||||
var eastChunk = biomeSource.getNoiseBiome(4, 0, 0, null);
|
var eastChunk = biomeSource.getNoiseBiome(4, 0, 0, null);
|
||||||
@@ -444,11 +413,13 @@ public final class LinkingGameTests {
|
|||||||
}
|
}
|
||||||
if (profile.equals(AgeGenerationProfiles.CAVE)) {
|
if (profile.equals(AgeGenerationProfiles.CAVE)) {
|
||||||
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
||||||
|
int caveBiomeCount = AgeBiomeSelection.eligible(helper.getLevel().registryAccess(),
|
||||||
|
AgeRuntimeProfiles.resolve(profile)).size();
|
||||||
helper.assertTrue(biomeSource instanceof net.dnorberg.rivencraft.world.ScaledBiomeSource,
|
helper.assertTrue(biomeSource instanceof net.dnorberg.rivencraft.world.ScaledBiomeSource,
|
||||||
"Tiny Biome Distribution must use the serializable scaled biome source");
|
"Tiny Biome Distribution must use the serializable scaled biome source");
|
||||||
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
||||||
&& biomeSource.possibleBiomes().size() <= 3,
|
&& biomeSource.possibleBiomes().size() <= caveBiomeCount,
|
||||||
"Random cave Tiny distribution must use two to three eligible biomes");
|
"Random cave Tiny distribution must use only eligible cave biomes");
|
||||||
java.util.Set<net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome>> sampled =
|
java.util.Set<net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome>> sampled =
|
||||||
new java.util.HashSet<>();
|
new java.util.HashSet<>();
|
||||||
for (int x = -32; x <= 32; x += 4) {
|
for (int x = -32; x <= 32; x += 4) {
|
||||||
@@ -520,11 +491,13 @@ public final class LinkingGameTests {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
var biomeSource = level.getChunkSource().getGenerator().getBiomeSource();
|
||||||
|
int availableBiomes = AgeBiomeSelection.eligible(helper.getLevel().registryAccess(),
|
||||||
|
AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD)).size();
|
||||||
helper.assertTrue(biomeSource instanceof net.dnorberg.rivencraft.world.ScaledBiomeSource,
|
helper.assertTrue(biomeSource instanceof net.dnorberg.rivencraft.world.ScaledBiomeSource,
|
||||||
distribution + " Biome Distribution must use the serializable scaled biome source");
|
distribution + " Biome Distribution must use the serializable scaled biome source");
|
||||||
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
helper.assertTrue(biomeSource.possibleBiomes().size() >= 2
|
||||||
&& biomeSource.possibleBiomes().size() <= 6,
|
&& biomeSource.possibleBiomes().size() <= availableBiomes,
|
||||||
distribution + " random distribution must use two to six seeded biomes");
|
distribution + " random distribution must stay within the available biome pool");
|
||||||
helper.assertValueEqual(
|
helper.assertValueEqual(
|
||||||
((net.dnorberg.rivencraft.world.ScaledBiomeSource)biomeSource).scale(),
|
((net.dnorberg.rivencraft.world.ScaledBiomeSource)biomeSource).scale(),
|
||||||
scale,
|
scale,
|
||||||
@@ -606,7 +579,8 @@ public final class LinkingGameTests {
|
|||||||
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
||||||
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), destination), 90.0F, 15.0F);
|
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), destination), 90.0F, 15.0F);
|
||||||
|
|
||||||
LinkingService.LinkResult result = LinkingService.travel(player, target);
|
LinkingService.LinkResult result = LinkingService.travel(player, target,
|
||||||
|
new LinkProperties(LinkProperties.INTRA_LINKING));
|
||||||
|
|
||||||
helper.assertValueEqual(result, LinkingService.LinkResult.SUCCESS,
|
helper.assertValueEqual(result, LinkingService.LinkResult.SUCCESS,
|
||||||
"A Linking Book must accept leaf blocks even without a floor");
|
"A Linking Book must accept leaf blocks even without a floor");
|
||||||
@@ -631,7 +605,8 @@ public final class LinkingGameTests {
|
|||||||
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
||||||
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), absoluteOrigin), 0.0F, 0.0F);
|
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), absoluteOrigin), 0.0F, 0.0F);
|
||||||
|
|
||||||
helper.assertValueEqual(LinkingService.travelWithFooting(player, target), LinkingService.LinkResult.SUCCESS,
|
helper.assertValueEqual(LinkingService.travelWithFooting(player, target,
|
||||||
|
new LinkProperties(LinkProperties.INTRA_LINKING)), LinkingService.LinkResult.SUCCESS,
|
||||||
"Descriptive Book travel must find an alternate grounded arrival");
|
"Descriptive Book travel must find an alternate grounded arrival");
|
||||||
BlockPos landing = player.blockPosition();
|
BlockPos landing = player.blockPosition();
|
||||||
helper.assertTrue(helper.getLevel().getBlockState(landing.below()).isFaceSturdy(
|
helper.assertTrue(helper.getLevel().getBlockState(landing.below()).isFaceSturdy(
|
||||||
@@ -652,8 +627,10 @@ public final class LinkingGameTests {
|
|||||||
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
ServerPlayer player = helper.makeMockServerPlayerInLevel();
|
||||||
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), absoluteOrigin), 0.0F, 0.0F);
|
LinkTarget target = new LinkTarget(GlobalPos.of(helper.getLevel().dimension(), absoluteOrigin), 0.0F, 0.0F);
|
||||||
|
|
||||||
helper.assertValueEqual(LinkingService.travel(player, target), LinkingService.LinkResult.NO_SAFE_DESTINATION,
|
helper.assertValueEqual(LinkingService.travel(player, target,
|
||||||
|
new LinkProperties(LinkProperties.INTRA_LINKING)), LinkingService.LinkResult.NO_SAFE_DESTINATION,
|
||||||
"Linking must fail rather than placing a player inside a blocked destination");
|
"Linking must fail rather than placing a player inside a blocked destination");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -111,7 +111,7 @@ public final class WritingDataGameTests {
|
|||||||
for (String terrain : List.of("standard", "amplified", "cave", "island", "flat", "void")) {
|
for (String terrain : List.of("standard", "amplified", "cave", "island", "flat", "void")) {
|
||||||
String path = "terrain/" + terrain;
|
String path = "terrain/" + terrain;
|
||||||
helper.assertTrue(PageItem.bundledCreativeSymbols().contains(path),
|
helper.assertTrue(PageItem.bundledCreativeSymbols().contains(path),
|
||||||
"The Pages creative tab must include " + path);
|
"The matching symbol-page creative tab must include " + path);
|
||||||
ItemStack page = PageItem.createBundledCreativePage(path);
|
ItemStack page = PageItem.createBundledCreativePage(path);
|
||||||
helper.assertValueEqual(PageItem.content(page).symbol().orElseThrow().id(),
|
helper.assertValueEqual(PageItem.content(page).symbol().orElseThrow().id(),
|
||||||
ResourceLocation.fromNamespaceAndPath("rivencraft", path),
|
ResourceLocation.fromNamespaceAndPath("rivencraft", path),
|
||||||
@@ -287,6 +287,8 @@ public final class WritingDataGameTests {
|
|||||||
|
|
||||||
helper.assertFalse(menu.getSlot(0).mayPlace(new ItemStack(Items.DIRT)),
|
helper.assertFalse(menu.getSlot(0).mayPlace(new ItemStack(Items.DIRT)),
|
||||||
"Notebook slots must reject non-Page items");
|
"Notebook slots must reject non-Page items");
|
||||||
|
helper.assertFalse(menu.getSlot(0).mayPlace(PageItem.createLinkPanelPage()),
|
||||||
|
"Notebook slots must reject Link Panels");
|
||||||
menu.getSlot(0).set(first);
|
menu.getSlot(0).set(first);
|
||||||
menu.getSlot(1).set(second);
|
menu.getSlot(1).set(second);
|
||||||
helper.assertTrue(menu.clickMenuButton(player, NotebookMenu.MOVE_NEXT_BASE),
|
helper.assertTrue(menu.clickMenuButton(player, NotebookMenu.MOVE_NEXT_BASE),
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
ItemStack source = PageItem.createLinkPanelPage();
|
ItemStack source = terrainPage();
|
||||||
desk.setItem(0, source.copy());
|
desk.setItem(0, source.copy());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
@@ -180,7 +180,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
desk.setItem(0, terrainPage());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
desk.setItem(WritingDeskBlockEntity.RETURN, new ItemStack(Items.GLASS_BOTTLE, 64));
|
desk.setItem(WritingDeskBlockEntity.RETURN, new ItemStack(Items.GLASS_BOTTLE, 64));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
@@ -210,7 +210,7 @@ public final class WritingDeskGameTests {
|
|||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
ItemStack notebook = new ItemStack(ModItems.NOTEBOOK.get());
|
ItemStack notebook = new ItemStack(ModItems.NOTEBOOK.get());
|
||||||
notebook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(),
|
notebook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(),
|
||||||
new NotebookContents(List.of(ItemStack.EMPTY, PageItem.createLinkPanelPage())));
|
new NotebookContents(List.of(ItemStack.EMPTY, terrainPage())));
|
||||||
desk.setItem(0, notebook);
|
desk.setItem(0, notebook);
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
@@ -232,7 +232,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
desk.setItem(0, terrainPage());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
var first = helper.makeMockServerPlayerInLevel();
|
var first = helper.makeMockServerPlayerInLevel();
|
||||||
@@ -258,7 +258,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
desk.setItem(0, terrainPage());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
@@ -319,7 +319,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
desk.setItem(0, terrainPage());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
@@ -446,7 +446,7 @@ public final class WritingDeskGameTests {
|
|||||||
helper.assertTrue(menu.clickMenuButton(player, 87), "Tab 88 must be selectable without page-ID collisions");
|
helper.assertTrue(menu.clickMenuButton(player, 87), "Tab 88 must be selectable without page-ID collisions");
|
||||||
helper.assertValueEqual(desk.activeCollection(), 87, "Tab 88 must become active");
|
helper.assertValueEqual(desk.activeCollection(), 87, "Tab 88 must become active");
|
||||||
helper.assertFalse(menu.clickMenuButton(player, 88), "Tab 89 must not exist");
|
helper.assertFalse(menu.clickMenuButton(player, 88), "Tab 89 must not exist");
|
||||||
desk.setItem(87, PageItem.createLinkPanelPage());
|
desk.setItem(87, terrainPage());
|
||||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.ALL_PAGE_BUTTON_BASE + 87 * NotebookContents.MAX_PAGES),
|
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.ALL_PAGE_BUTTON_BASE + 87 * NotebookContents.MAX_PAGES),
|
||||||
@@ -502,7 +502,7 @@ public final class WritingDeskGameTests {
|
|||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||||
ItemStack held = PageItem.createLinkPanelPage().copyWithCount(3);
|
ItemStack held = terrainPage().copyWithCount(3);
|
||||||
ItemStack expectedPage = held.copyWithCount(1);
|
ItemStack expectedPage = held.copyWithCount(1);
|
||||||
player.getInventory().setItem(9, held);
|
player.getInventory().setItem(9, held);
|
||||||
menu.clicked(WritingDeskMenu.COPY_RESULT + 1, 0, ClickType.PICKUP, player);
|
menu.clicked(WritingDeskMenu.COPY_RESULT + 1, 0, ClickType.PICKUP, player);
|
||||||
@@ -520,7 +520,7 @@ public final class WritingDeskGameTests {
|
|||||||
helper.assertValueEqual(menu.pageCapacity(87), NotebookContents.MAX_PAGES, "Notebook tab must expose normal notebook capacity");
|
helper.assertValueEqual(menu.pageCapacity(87), NotebookContents.MAX_PAGES, "Notebook tab must expose normal notebook capacity");
|
||||||
helper.assertValueEqual(menu.pageCapacity(0), 0, "Empty tab has no page storage");
|
helper.assertValueEqual(menu.pageCapacity(0), 0, "Empty tab has no page storage");
|
||||||
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE), "Empty tab must require a collection first");
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE), "Empty tab must require a collection first");
|
||||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
desk.setItem(0, terrainPage());
|
||||||
helper.assertValueEqual(menu.pageCapacity(0), 1, "Loose page tab must expose exactly one position");
|
helper.assertValueEqual(menu.pageCapacity(0), 1, "Loose page tab must expose exactly one position");
|
||||||
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE), "Loose page must not be replaced");
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE), "Loose page must not be replaced");
|
||||||
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE + 1), "Loose page tab must not grow extra positions");
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE + 1), "Loose page tab must not grow extra positions");
|
||||||
@@ -543,14 +543,13 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
var desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
var desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
ItemStack linkPanel = PageItem.createLinkPanelPage();
|
ItemStack movingPage = terrainPage();
|
||||||
ItemStack terrain = PageItem.createSymbolPage(new SymbolReference(
|
ItemStack terrain = terrainPage();
|
||||||
ResourceLocation.parse("rivencraft:terrain/standard")));
|
|
||||||
ItemStack firstBook = new ItemStack(ModItems.NOTEBOOK.get());
|
ItemStack firstBook = new ItemStack(ModItems.NOTEBOOK.get());
|
||||||
firstBook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(), new NotebookContents(List.of(linkPanel, terrain)));
|
firstBook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(), new NotebookContents(List.of(movingPage, terrain)));
|
||||||
desk.setItem(0, firstBook);
|
desk.setItem(0, firstBook);
|
||||||
desk.setItem(1, new ItemStack(ModItems.NOTEBOOK.get()));
|
desk.setItem(1, new ItemStack(ModItems.NOTEBOOK.get()));
|
||||||
desk.setItem(2, PageItem.createLinkPanelPage());
|
desk.setItem(2, terrainPage());
|
||||||
var player = helper.makeMockServerPlayerInLevel();
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||||
@@ -558,18 +557,18 @@ public final class WritingDeskGameTests {
|
|||||||
helper.assertTrue(menu.clickMenuButton(player, moveToEmpty), "Drag must move to a distant empty notebook position");
|
helper.assertTrue(menu.clickMenuButton(player, moveToEmpty), "Drag must move to a distant empty notebook position");
|
||||||
var pages = desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
var pages = desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
||||||
helper.assertTrue(pages.get(0).isEmpty(), "Moving must clear the source position");
|
helper.assertTrue(pages.get(0).isEmpty(), "Moving must clear the source position");
|
||||||
helper.assertTrue(ItemStack.matches(pages.get(26), linkPanel), "Moving must preserve page components");
|
helper.assertTrue(ItemStack.matches(pages.get(26), movingPage), "Moving must preserve page components");
|
||||||
helper.assertValueEqual(desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pageCount(), 2,
|
helper.assertValueEqual(desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pageCount(), 2,
|
||||||
"Moving must preserve total page count");
|
"Moving must preserve total page count");
|
||||||
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 26, 0, 1)),
|
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 26, 0, 1)),
|
||||||
"Drag onto an occupied position must swap pages");
|
"Drag onto an occupied position must swap pages");
|
||||||
pages = desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
pages = desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
||||||
helper.assertTrue(ItemStack.matches(pages.get(1), linkPanel) && ItemStack.matches(pages.get(26), terrain),
|
helper.assertTrue(ItemStack.matches(pages.get(1), movingPage) && ItemStack.matches(pages.get(26), terrain),
|
||||||
"Swap must preserve both pages");
|
"Swap must preserve both pages");
|
||||||
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 1, 1, 5)),
|
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 1, 1, 5)),
|
||||||
"Drag into another notebook must work");
|
"Drag into another notebook must work");
|
||||||
var otherPages = desk.getItem(1).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
var otherPages = desk.getItem(1).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages();
|
||||||
helper.assertTrue(ItemStack.matches(otherPages.get(5), linkPanel)
|
helper.assertTrue(ItemStack.matches(otherPages.get(5), movingPage)
|
||||||
&& desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages().get(1).isEmpty(),
|
&& desk.getItem(0).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages().get(1).isEmpty(),
|
||||||
"Cross notebook move must have one destination and no old source");
|
"Cross notebook move must have one destination and no old source");
|
||||||
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 1, 1, 6)),
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 1, 1, 6)),
|
||||||
@@ -584,7 +583,7 @@ public final class WritingDeskGameTests {
|
|||||||
menu.setCarried(new ItemStack(Items.DIAMOND));
|
menu.setCarried(new ItemStack(Items.DIAMOND));
|
||||||
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(1, 5, 1, 6)),
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(1, 5, 1, 6)),
|
||||||
"Held inventory items must not be moved by a panel drag");
|
"Held inventory items must not be moved by a panel drag");
|
||||||
helper.assertTrue(ItemStack.matches(desk.getItem(1).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages().get(5), linkPanel),
|
helper.assertTrue(ItemStack.matches(desk.getItem(1).get(ModDataComponents.NOTEBOOK_CONTENTS.get()).pages().get(5), movingPage),
|
||||||
"Rejected drags must leave notebook data intact");
|
"Rejected drags must leave notebook data intact");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
@@ -594,7 +593,7 @@ public final class WritingDeskGameTests {
|
|||||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
var desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
var desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
ItemStack page = PageItem.createLinkPanelPage();
|
ItemStack page = terrainPage();
|
||||||
ItemStack source = new ItemStack(ModItems.NOTEBOOK.get());
|
ItemStack source = new ItemStack(ModItems.NOTEBOOK.get());
|
||||||
source.set(ModDataComponents.NOTEBOOK_CONTENTS.get(),
|
source.set(ModDataComponents.NOTEBOOK_CONTENTS.get(),
|
||||||
new NotebookContents(List.of(page, page, page, page, page, page)));
|
new NotebookContents(List.of(page, page, page, page, page, page)));
|
||||||
@@ -643,4 +642,47 @@ public final class WritingDeskGameTests {
|
|||||||
"Extracting a loose page must empty its tab and return the same item");
|
"Extracting a loose page must empty its tab and return the same item");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void linkPanelsCannotBeStoredOrCopiedButOldPanelsCanBeRecovered(GameTestHelper helper) {
|
||||||
|
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||||
|
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||||
|
var desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||||
|
ItemStack panel = PageItem.createLinkPanelPage();
|
||||||
|
ItemStack oldNotebook = new ItemStack(ModItems.NOTEBOOK.get());
|
||||||
|
oldNotebook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(), new NotebookContents(List.of(panel)));
|
||||||
|
helper.assertFalse(desk.canPlaceItem(0, panel), "Desk tab must reject a Link Panel");
|
||||||
|
helper.assertFalse(desk.canPlaceItem(0, oldNotebook),
|
||||||
|
"Desk tab must reject a Notebook containing an old Link Panel");
|
||||||
|
|
||||||
|
// A preexisting desk is loaded without discarding its contents.
|
||||||
|
desk.setItem(0, panel.copy());
|
||||||
|
desk.setItem(1, new ItemStack(ModItems.NOTEBOOK.get()));
|
||||||
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||||
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||||
|
var player = helper.makeMockServerPlayerInLevel();
|
||||||
|
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
|
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||||
|
menu.broadcastChanges();
|
||||||
|
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().isEmpty(),
|
||||||
|
"Existing Link Panels must not produce a Desk copy");
|
||||||
|
helper.assertTrue(menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT).isEmpty(),
|
||||||
|
"Shift-click must not bypass the Link Panel copy rule");
|
||||||
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(0, 0, 1, 0)),
|
||||||
|
"An old Link Panel must not move into a Notebook");
|
||||||
|
menu.setCarried(panel.copy());
|
||||||
|
helper.assertFalse(menu.clickMenuButton(player, WritingDeskMenu.PLACE_PAGE_BUTTON_BASE
|
||||||
|
+ NotebookContents.MAX_PAGES), "A carried Link Panel must not enter a Notebook");
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
helper.assertTrue(menu.clickMenuButton(player, WritingDeskMenu.extractPageButtonId(0, 0, -1)),
|
||||||
|
"A stored legacy Link Panel must remain recoverable to the cursor");
|
||||||
|
helper.assertTrue(ItemStack.matches(menu.getCarried(), panel),
|
||||||
|
"Recovery must preserve the original Link Panel");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemStack terrainPage() {
|
||||||
|
return PageItem.createSymbolPage(new SymbolReference(
|
||||||
|
ResourceLocation.parse("rivencraft:terrain/standard")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,7 @@ import java.util.List;
|
|||||||
import net.dnorberg.rivencraft.book.AgeReference;
|
import net.dnorberg.rivencraft.book.AgeReference;
|
||||||
import net.dnorberg.rivencraft.book.AgeVisitSavedData;
|
import net.dnorberg.rivencraft.book.AgeVisitSavedData;
|
||||||
import net.dnorberg.rivencraft.book.LinkTarget;
|
import net.dnorberg.rivencraft.book.LinkTarget;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.book.LinkingService;
|
import net.dnorberg.rivencraft.book.LinkingService;
|
||||||
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
||||||
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
||||||
@@ -54,7 +55,9 @@ public final class DescriptiveBookItem extends Item {
|
|||||||
|
|
||||||
ServerLevel sourceLevel = player.serverLevel();
|
ServerLevel sourceLevel = player.serverLevel();
|
||||||
var sourcePosition = player.blockPosition();
|
var sourcePosition = player.blockPosition();
|
||||||
LinkingService.LinkResult result = LinkingService.travelWithFooting(player, ageTarget);
|
LinkProperties properties = stack.getOrDefault(ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE)
|
||||||
|
.forDescriptiveBook();
|
||||||
|
LinkingService.LinkResult result = LinkingService.travelWithFooting(player, ageTarget, properties);
|
||||||
if (result != LinkingService.LinkResult.SUCCESS) {
|
if (result != LinkingService.LinkResult.SUCCESS) {
|
||||||
player.displayClientMessage(Component.translatable("message.rivencraft.descriptive_book.unsafe"), true);
|
player.displayClientMessage(Component.translatable("message.rivencraft.descriptive_book.unsafe"), true);
|
||||||
return false;
|
return false;
|
||||||
@@ -109,5 +112,7 @@ public final class DescriptiveBookItem extends Item {
|
|||||||
? Component.translatable("item.rivencraft.descriptive_book.unwritten")
|
? Component.translatable("item.rivencraft.descriptive_book.unwritten")
|
||||||
: Component.translatable("item.rivencraft.descriptive_book.age", age.name());
|
: Component.translatable("item.rivencraft.descriptive_book.age", age.name());
|
||||||
tooltipComponents.add(status.withStyle(ChatFormatting.GRAY));
|
tooltipComponents.add(status.withStyle(ChatFormatting.GRAY));
|
||||||
|
stack.getOrDefault(ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE)
|
||||||
|
.forDescriptiveBook().appendTooltip(tooltipComponents);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,7 @@ import java.util.List;
|
|||||||
import net.dnorberg.rivencraft.book.LinkTarget;
|
import net.dnorberg.rivencraft.book.LinkTarget;
|
||||||
import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
||||||
import net.dnorberg.rivencraft.book.LinkingService;
|
import net.dnorberg.rivencraft.book.LinkingService;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModSounds;
|
import net.dnorberg.rivencraft.registry.ModSounds;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
@@ -49,7 +50,8 @@ public final class LinkingBookItem extends Item {
|
|||||||
|
|
||||||
Level sourceLevel = player.level();
|
Level sourceLevel = player.level();
|
||||||
BlockPos sourcePosition = player.blockPosition();
|
BlockPos sourcePosition = player.blockPosition();
|
||||||
LinkingService.LinkResult result = LinkingService.travel(player, target);
|
LinkProperties properties = stack.getOrDefault(ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE);
|
||||||
|
LinkingService.LinkResult result = LinkingService.travel(player, target, properties);
|
||||||
if (result == LinkingService.LinkResult.SUCCESS) {
|
if (result == LinkingService.LinkResult.SUCCESS) {
|
||||||
sourceLevel.playSound(null, sourcePosition, ModSounds.LINK.get(), SoundSource.PLAYERS,
|
sourceLevel.playSound(null, sourcePosition, ModSounds.LINK.get(), SoundSource.PLAYERS,
|
||||||
0.8F, sourceLevel.random.nextFloat() * 0.2F + 0.9F);
|
0.8F, sourceLevel.random.nextFloat() * 0.2F + 0.9F);
|
||||||
@@ -65,9 +67,11 @@ public final class LinkingBookItem extends Item {
|
|||||||
return InteractionResultHolder.success(stack);
|
return InteractionResultHolder.success(stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
String errorKey = result == LinkingService.LinkResult.MISSING_DIMENSION
|
String errorKey = switch (result) {
|
||||||
? "message.rivencraft.linking_book.missing_dimension"
|
case MISSING_DIMENSION -> "message.rivencraft.linking_book.missing_dimension";
|
||||||
: "message.rivencraft.linking_book.unsafe";
|
case INTRA_LINKING_REQUIRED -> "message.rivencraft.linking_book.intra_required";
|
||||||
|
default -> "message.rivencraft.linking_book.unsafe";
|
||||||
|
};
|
||||||
player.displayClientMessage(Component.translatable(errorKey), true);
|
player.displayClientMessage(Component.translatable(errorKey), true);
|
||||||
return InteractionResultHolder.fail(stack);
|
return InteractionResultHolder.fail(stack);
|
||||||
}
|
}
|
||||||
@@ -85,9 +89,11 @@ public final class LinkingBookItem extends Item {
|
|||||||
TooltipFlag tooltipFlag
|
TooltipFlag tooltipFlag
|
||||||
) {
|
) {
|
||||||
LinkTarget target = stack.get(ModDataComponents.LINK_TARGET.get());
|
LinkTarget target = stack.get(ModDataComponents.LINK_TARGET.get());
|
||||||
|
LinkProperties properties = stack.getOrDefault(ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE);
|
||||||
if (target == null) {
|
if (target == null) {
|
||||||
tooltipComponents.add(Component.translatable("item.rivencraft.linking_book.unbound")
|
tooltipComponents.add(Component.translatable("item.rivencraft.linking_book.unbound")
|
||||||
.withStyle(ChatFormatting.GRAY));
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
properties.appendTooltip(tooltipComponents);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,6 +107,7 @@ public final class LinkingBookItem extends Item {
|
|||||||
position.getZ()
|
position.getZ()
|
||||||
)
|
)
|
||||||
.withStyle(ChatFormatting.GRAY));
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
properties.appendTooltip(tooltipComponents);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String destinationName(ServerLevel level) {
|
public static String destinationName(ServerLevel level) {
|
||||||
|
|||||||
@@ -8,28 +8,37 @@ import java.util.LinkedHashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.dnorberg.rivencraft.writing.PageContent;
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolDefinition;
|
import net.dnorberg.rivencraft.writing.SymbolDefinition;
|
||||||
import net.dnorberg.rivencraft.writing.BiomeSymbolPages;
|
import net.dnorberg.rivencraft.writing.BiomeSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolReference;
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
import net.minecraft.ChatFormatting;
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.core.component.DataComponents;
|
import net.minecraft.core.component.DataComponents;
|
||||||
import net.minecraft.core.HolderLookup;
|
import net.minecraft.core.HolderLookup;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.TooltipFlag;
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
|
|
||||||
/** One stackable Page item whose server-owned component identifies its writing state. */
|
/** One stackable Page item whose server-owned component identifies its writing state. */
|
||||||
public final class PageItem extends Item {
|
public final class PageItem extends Item {
|
||||||
private static final Map<String, SymbolDisplayMetadata> CREATIVE_SYMBOLS = loadCreativeSymbols();
|
private static final ResourceLocation BIOME_GENERATION_CATEGORY =
|
||||||
|
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "biome_generation");
|
||||||
|
private static final Map<String, CreativeSymbol> CREATIVE_SYMBOLS = loadCreativeSymbols();
|
||||||
|
|
||||||
|
private record CreativeSymbol(SymbolDisplayMetadata display, ResourceLocation creativeCategory) {}
|
||||||
|
|
||||||
public PageItem(Properties properties) {
|
public PageItem(Properties properties) {
|
||||||
super(properties);
|
super(properties);
|
||||||
@@ -46,8 +55,36 @@ public final class PageItem extends Item {
|
|||||||
return List.copyOf(CREATIVE_SYMBOLS.keySet());
|
return List.copyOf(CREATIVE_SYMBOLS.keySet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Bundled categories become separate creative tabs without a Java page list. */
|
||||||
|
public static List<ResourceLocation> bundledCreativeCategories() {
|
||||||
|
LinkedHashSet<ResourceLocation> categories = CREATIVE_SYMBOLS.values().stream()
|
||||||
|
.map(CreativeSymbol::creativeCategory)
|
||||||
|
.collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new));
|
||||||
|
categories.add(BlockSymbolPages.CATEGORY);
|
||||||
|
categories.add(BlockSymbolPages.FLUID_CATEGORY);
|
||||||
|
return List.copyOf(categories);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack bundledCreativeCategoryIcon(ResourceLocation category) {
|
||||||
|
if (category.equals(BlockSymbolPages.CATEGORY) || category.equals(BlockSymbolPages.FLUID_CATEGORY)) {
|
||||||
|
return createCreativeBlockPage(ResourceLocation.withDefaultNamespace(
|
||||||
|
category.equals(BlockSymbolPages.FLUID_CATEGORY) ? "water" : "stone"));
|
||||||
|
}
|
||||||
|
return CREATIVE_SYMBOLS.entrySet().stream()
|
||||||
|
.filter(entry -> entry.getValue().creativeCategory().equals(category))
|
||||||
|
.findFirst()
|
||||||
|
.map(entry -> createBundledCreativePage(entry.getKey()))
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("No bundled pages for category " + category));
|
||||||
|
}
|
||||||
|
|
||||||
/** Exact symbol-page variants offered in the creative tab and to optional ingredient viewers. */
|
/** Exact symbol-page variants offered in the creative tab and to optional ingredient viewers. */
|
||||||
public static List<ItemStack> creativeSymbolPages(HolderLookup.Provider registries) {
|
public static List<ItemStack> creativeSymbolPages(HolderLookup.Provider registries) {
|
||||||
|
List<ItemStack> pages = creativeBundledAndBiomePages(registries);
|
||||||
|
BlockSymbolPages.availableBlocks().forEach(id -> pages.add(createCreativeBlockPage(id)));
|
||||||
|
return List.copyOf(pages);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ItemStack> creativeBundledAndBiomePages(HolderLookup.Provider registries) {
|
||||||
List<ItemStack> pages = new ArrayList<>();
|
List<ItemStack> pages = new ArrayList<>();
|
||||||
CREATIVE_SYMBOLS.keySet().forEach(id -> pages.add(createBundledCreativePage(id)));
|
CREATIVE_SYMBOLS.keySet().forEach(id -> pages.add(createBundledCreativePage(id)));
|
||||||
Set<String> bundled = CREATIVE_SYMBOLS.keySet();
|
Set<String> bundled = CREATIVE_SYMBOLS.keySet();
|
||||||
@@ -57,15 +94,37 @@ public final class PageItem extends Item {
|
|||||||
.filter(id -> !bundled.contains("biome/" + id.getPath()))
|
.filter(id -> !bundled.contains("biome/" + id.getPath()))
|
||||||
.sorted()
|
.sorted()
|
||||||
.forEach(id -> pages.add(createCreativeBiomePage(id)));
|
.forEach(id -> pages.add(createCreativeBiomePage(id)));
|
||||||
return List.copyOf(pages);
|
return pages;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<ItemStack> creativeSymbolPages(HolderLookup.Provider registries,
|
||||||
|
ResourceLocation category) {
|
||||||
|
if (category.equals(BlockSymbolPages.CATEGORY) || category.equals(BlockSymbolPages.FLUID_CATEGORY)) {
|
||||||
|
return BlockSymbolPages.availableBlocks(category).stream()
|
||||||
|
.map(PageItem::createCreativeBlockPage).toList();
|
||||||
|
}
|
||||||
|
return creativeBundledAndBiomePages(registries).stream()
|
||||||
|
.filter(page -> category.equals(creativeCategory(page)))
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
if (metadata.id().getNamespace().equals(Rivencraft.MOD_ID)) {
|
||||||
|
CreativeSymbol bundled = CREATIVE_SYMBOLS.get(metadata.id().getPath());
|
||||||
|
if (bundled != null) return bundled.creativeCategory();
|
||||||
|
}
|
||||||
|
return metadata.category();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Bundled symbols for the creative tab; the server still validates catalog membership on use. */
|
/** Bundled symbols for the creative tab; the server still validates catalog membership on use. */
|
||||||
public static ItemStack createBundledCreativePage(String path) {
|
public static ItemStack createBundledCreativePage(String path) {
|
||||||
SymbolDisplayMetadata metadata = CREATIVE_SYMBOLS.get(path);
|
CreativeSymbol symbol = CREATIVE_SYMBOLS.get(path);
|
||||||
if (metadata == null) {
|
if (symbol == null) {
|
||||||
throw new IllegalArgumentException("Not a bundled symbol: " + path);
|
throw new IllegalArgumentException("Not a bundled symbol: " + path);
|
||||||
}
|
}
|
||||||
|
SymbolDisplayMetadata metadata = symbol.display();
|
||||||
SymbolReference reference = new SymbolReference(metadata.id());
|
SymbolReference reference = new SymbolReference(metadata.id());
|
||||||
ItemStack page = create(PageContent.symbol(reference));
|
ItemStack page = create(PageContent.symbol(reference));
|
||||||
page.set(ModDataComponents.PAGE_SYMBOL_DISPLAY.get(), metadata);
|
page.set(ModDataComponents.PAGE_SYMBOL_DISPLAY.get(), metadata);
|
||||||
@@ -79,7 +138,14 @@ public final class PageItem extends Item {
|
|||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Map<String, SymbolDisplayMetadata> loadCreativeSymbols() {
|
public static ItemStack createCreativeBlockPage(ResourceLocation blockId) {
|
||||||
|
var symbolId = BlockSymbolPages.symbolId(blockId);
|
||||||
|
ItemStack page = create(PageContent.symbol(new SymbolReference(symbolId)));
|
||||||
|
page.set(ModDataComponents.PAGE_SYMBOL_DISPLAY.get(), BlockSymbolPages.definition(blockId).display(symbolId));
|
||||||
|
return page;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, CreativeSymbol> loadCreativeSymbols() {
|
||||||
String resource = "/assets/rivencraft/creative_symbol_pages.json";
|
String resource = "/assets/rivencraft/creative_symbol_pages.json";
|
||||||
try (var stream = PageItem.class.getResourceAsStream(resource)) {
|
try (var stream = PageItem.class.getResourceAsStream(resource)) {
|
||||||
if (stream == null) {
|
if (stream == null) {
|
||||||
@@ -87,13 +153,18 @@ public final class PageItem extends Item {
|
|||||||
}
|
}
|
||||||
var json = JsonParser.parseReader(new InputStreamReader(stream, StandardCharsets.UTF_8))
|
var json = JsonParser.parseReader(new InputStreamReader(stream, StandardCharsets.UTF_8))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
Map<String, SymbolDisplayMetadata> symbols = new LinkedHashMap<>();
|
Map<String, CreativeSymbol> symbols = new LinkedHashMap<>();
|
||||||
json.entrySet().forEach(entry -> {
|
json.entrySet().forEach(entry -> {
|
||||||
var id = net.minecraft.resources.ResourceLocation.parse(entry.getKey());
|
var id = net.minecraft.resources.ResourceLocation.parse(entry.getKey());
|
||||||
if (!id.getNamespace().equals(Rivencraft.MOD_ID)) {
|
if (!id.getNamespace().equals(Rivencraft.MOD_ID)) {
|
||||||
throw new IllegalStateException("Creative symbol is not a Rivencraft page: " + id);
|
throw new IllegalStateException("Creative symbol is not a Rivencraft page: " + id);
|
||||||
}
|
}
|
||||||
symbols.put(id.getPath(), SymbolDefinition.parse(entry.getValue()).display(id));
|
SymbolDefinition definition = SymbolDefinition.parse(entry.getValue());
|
||||||
|
ResourceLocation creativeCategory = definition.semantics()
|
||||||
|
.filter(semantics -> semantics.role() == SymbolSemantics.Role.BIOME_CONTROLLER)
|
||||||
|
.map(ignored -> BIOME_GENERATION_CATEGORY)
|
||||||
|
.orElse(definition.category());
|
||||||
|
symbols.put(id.getPath(), new CreativeSymbol(definition.display(id), creativeCategory));
|
||||||
});
|
});
|
||||||
return Collections.unmodifiableMap(symbols);
|
return Collections.unmodifiableMap(symbols);
|
||||||
} catch (java.io.IOException exception) {
|
} catch (java.io.IOException exception) {
|
||||||
@@ -153,6 +224,8 @@ public final class PageItem extends Item {
|
|||||||
if (content.kind() == PageContent.Kind.LINK_PANEL) {
|
if (content.kind() == PageContent.Kind.LINK_PANEL) {
|
||||||
tooltipComponents.add(Component.translatable("item.rivencraft.page.link_panel.description")
|
tooltipComponents.add(Component.translatable("item.rivencraft.page.link_panel.description")
|
||||||
.withStyle(ChatFormatting.GRAY));
|
.withStyle(ChatFormatting.GRAY));
|
||||||
|
stack.getOrDefault(ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE)
|
||||||
|
.appendTooltip(tooltipComponents);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SymbolReference reference = content.symbol().orElseThrow();
|
SymbolReference reference = content.symbol().orElseThrow();
|
||||||
@@ -188,6 +261,10 @@ public final class PageItem extends Item {
|
|||||||
&& reference.id().getPath().startsWith("biome/")
|
&& reference.id().getPath().startsWith("biome/")
|
||||||
? Component.translatableWithFallback(metadata.nameTranslationKey(),
|
? Component.translatableWithFallback(metadata.nameTranslationKey(),
|
||||||
BiomeSymbolPages.fallbackName(reference.id()))
|
BiomeSymbolPages.fallbackName(reference.id()))
|
||||||
|
: reference.id().getNamespace().equals(Rivencraft.MOD_ID)
|
||||||
|
&& reference.id().getPath().startsWith("block/")
|
||||||
|
? Component.translatableWithFallback(metadata.nameTranslationKey(),
|
||||||
|
BlockSymbolPages.fallbackName(BlockSymbolPages.blockId(reference.id())))
|
||||||
: Component.translatable(metadata.nameTranslationKey());
|
: Component.translatable(metadata.nameTranslationKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import net.minecraft.world.SimpleContainer;
|
|||||||
import net.minecraft.world.entity.player.Inventory;
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.inventory.AbstractContainerMenu;
|
import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||||
|
import net.minecraft.world.inventory.ClickType;
|
||||||
import net.minecraft.world.inventory.DataSlot;
|
import net.minecraft.world.inventory.DataSlot;
|
||||||
import net.minecraft.world.inventory.Slot;
|
import net.minecraft.world.inventory.Slot;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
@@ -17,13 +18,15 @@ import net.minecraft.world.item.Items;
|
|||||||
|
|
||||||
/** Server-owned virtual output; taking it spends paper and the configured ink cost once. */
|
/** Server-owned virtual output; taking it spends paper and the configured ink cost once. */
|
||||||
public final class InkMixerMenu extends AbstractContainerMenu {
|
public final class InkMixerMenu extends AbstractContainerMenu {
|
||||||
public static final int RESULT = InkMixerBlockEntity.SIZE;
|
public static final int MODIFIER = InkMixerBlockEntity.SIZE;
|
||||||
|
public static final int RESULT = MODIFIER + 1;
|
||||||
private static final int PLAYER_START = RESULT + 1;
|
private static final int PLAYER_START = RESULT + 1;
|
||||||
private final InkMixerBlockEntity mixer;
|
private final InkMixerBlockEntity mixer;
|
||||||
private final Container inputs;
|
private final Container inputs;
|
||||||
private final SimpleContainer result = new SimpleContainer(1);
|
private final SimpleContainer result = new SimpleContainer(1);
|
||||||
private final boolean clientSide;
|
private final boolean clientSide;
|
||||||
private int inkRemaining;
|
private int inkRemaining;
|
||||||
|
private final int[] modifierChances = new int[3];
|
||||||
|
|
||||||
public InkMixerMenu(int id, Inventory inventory, RegistryFriendlyByteBuf data) {
|
public InkMixerMenu(int id, Inventory inventory, RegistryFriendlyByteBuf data) {
|
||||||
this(id, inventory, inventory.player.level().getBlockEntity(data.readBlockPos())
|
this(id, inventory, inventory.player.level().getBlockEntity(data.readBlockPos())
|
||||||
@@ -39,9 +42,19 @@ public final class InkMixerMenu extends AbstractContainerMenu {
|
|||||||
@Override public int get() { return clientSide ? inkRemaining : mixer.inkRemaining(); }
|
@Override public int get() { return clientSide ? inkRemaining : mixer.inkRemaining(); }
|
||||||
@Override public void set(int value) { inkRemaining = value; }
|
@Override public void set(int value) { inkRemaining = value; }
|
||||||
});
|
});
|
||||||
|
for (int index = 0; index < modifierChances.length; index++) {
|
||||||
|
final int chanceIndex = index;
|
||||||
|
addDataSlot(new DataSlot() {
|
||||||
|
@Override public int get() {
|
||||||
|
return clientSide ? modifierChances[chanceIndex] : mixer.modifierChancePermille(chanceIndex);
|
||||||
|
}
|
||||||
|
@Override public void set(int value) { modifierChances[chanceIndex] = value; }
|
||||||
|
});
|
||||||
|
}
|
||||||
addSlot(new MixerSlot(InkMixerBlockEntity.INK, 8, 27));
|
addSlot(new MixerSlot(InkMixerBlockEntity.INK, 8, 27));
|
||||||
addSlot(new MixerSlot(InkMixerBlockEntity.PAPER, 8, 48));
|
addSlot(new MixerSlot(InkMixerBlockEntity.PAPER, 8, 48));
|
||||||
addSlot(new MixerSlot(InkMixerBlockEntity.BOTTLES, 152, 27));
|
addSlot(new MixerSlot(InkMixerBlockEntity.BOTTLES, 152, 27));
|
||||||
|
addSlot(new ModifierSlot(79, 40));
|
||||||
addSlot(new ResultSlot(152, 48));
|
addSlot(new ResultSlot(152, 48));
|
||||||
for (int row = 0; row < 3; row++)
|
for (int row = 0; row < 3; row++)
|
||||||
for (int column = 0; column < 9; column++)
|
for (int column = 0; column < 9; column++)
|
||||||
@@ -52,6 +65,24 @@ public final class InkMixerMenu extends AbstractContainerMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int inkRemaining() { return inkRemaining; }
|
public int inkRemaining() { return inkRemaining; }
|
||||||
|
public int modifierChancePermille(int index) { return modifierChances[index]; }
|
||||||
|
|
||||||
|
@Override public void clicked(int slotId, int button, ClickType clickType, Player player) {
|
||||||
|
if (slotId == MODIFIER) {
|
||||||
|
if (!clientSide && stillValid(player) && clickType == ClickType.PICKUP
|
||||||
|
&& (button == 0 || button == 1)) {
|
||||||
|
ItemStack carried = getCarried();
|
||||||
|
int amount = button == 1 ? 1 : carried.getCount();
|
||||||
|
if (mixer.addModifier(carried, amount)) {
|
||||||
|
setCarried(carried);
|
||||||
|
refreshResult();
|
||||||
|
broadcastChanges();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
super.clicked(slotId, button, clickType, player);
|
||||||
|
}
|
||||||
|
|
||||||
@Override public boolean stillValid(Player player) {
|
@Override public boolean stillValid(Player player) {
|
||||||
return mixer != null && mixer.stillValid(player);
|
return mixer != null && mixer.stillValid(player);
|
||||||
@@ -64,8 +95,7 @@ public final class InkMixerMenu extends AbstractContainerMenu {
|
|||||||
|
|
||||||
private void refreshResult() {
|
private void refreshResult() {
|
||||||
if (clientSide) return;
|
if (clientSide) return;
|
||||||
ItemStack preview = mixer != null && mixer.canCreateLinkPanel()
|
ItemStack preview = mixer == null ? ItemStack.EMPTY : mixer.previewLinkPanel();
|
||||||
? PageItem.createLinkPanelPage() : ItemStack.EMPTY;
|
|
||||||
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,7 +117,7 @@ public final class InkMixerMenu extends AbstractContainerMenu {
|
|||||||
ItemStack source = slot.getItem();
|
ItemStack source = slot.getItem();
|
||||||
ItemStack original = source.copy();
|
ItemStack original = source.copy();
|
||||||
boolean moved;
|
boolean moved;
|
||||||
if (index < RESULT) moved = moveItemStackTo(source, PLAYER_START, slots.size(), true);
|
if (index < MODIFIER) moved = moveItemStackTo(source, PLAYER_START, slots.size(), true);
|
||||||
else if (source.is(ModItems.INK_VIAL.get()))
|
else if (source.is(ModItems.INK_VIAL.get()))
|
||||||
moved = moveItemStackTo(source, InkMixerBlockEntity.INK, InkMixerBlockEntity.INK + 1, false);
|
moved = moveItemStackTo(source, InkMixerBlockEntity.INK, InkMixerBlockEntity.INK + 1, false);
|
||||||
else if (source.is(Items.PAPER))
|
else if (source.is(Items.PAPER))
|
||||||
@@ -105,6 +135,12 @@ public final class InkMixerMenu extends AbstractContainerMenu {
|
|||||||
@Override public boolean mayPlace(ItemStack stack) { return inputs.canPlaceItem(getContainerSlot(), stack); }
|
@Override public boolean mayPlace(ItemStack stack) { return inputs.canPlaceItem(getContainerSlot(), stack); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final class ModifierSlot extends Slot {
|
||||||
|
ModifierSlot(int x, int y) { super(new SimpleContainer(1), 0, x, y); }
|
||||||
|
@Override public boolean mayPlace(ItemStack stack) { return false; }
|
||||||
|
@Override public boolean mayPickup(Player player) { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
private final class ResultSlot extends Slot {
|
private final class ResultSlot extends Slot {
|
||||||
ResultSlot(int x, int y) { super(result, 0, x, y); }
|
ResultSlot(int x, int y) { super(result, 0, x, y); }
|
||||||
@Override public boolean mayPlace(ItemStack stack) { return false; }
|
@Override public boolean mayPlace(ItemStack stack) { return false; }
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import net.dnorberg.rivencraft.registry.ModDataComponents;
|
|||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.dnorberg.rivencraft.registry.ModMenus;
|
import net.dnorberg.rivencraft.registry.ModMenus;
|
||||||
import net.dnorberg.rivencraft.writing.NotebookContents;
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.minecraft.core.NonNullList;
|
import net.minecraft.core.NonNullList;
|
||||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
import net.minecraft.world.Container;
|
import net.minecraft.world.Container;
|
||||||
@@ -82,6 +84,7 @@ public final class NotebookMenu extends AbstractContainerMenu {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!source.is(ModItems.PAGE.get())
|
if (!source.is(ModItems.PAGE.get())
|
||||||
|
|| PageItem.content(source).kind() == PageContent.Kind.LINK_PANEL
|
||||||
|| !moveItemStackTo(source, 0, PLAYER_INVENTORY_START, false)) {
|
|| !moveItemStackTo(source, 0, PLAYER_INVENTORY_START, false)) {
|
||||||
return ItemStack.EMPTY;
|
return ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
@@ -135,7 +138,10 @@ public final class NotebookMenu extends AbstractContainerMenu {
|
|||||||
super(container, slot, x, y);
|
super(container, slot, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public boolean mayPlace(ItemStack stack) { return stack.is(ModItems.PAGE.get()); }
|
@Override public boolean mayPlace(ItemStack stack) {
|
||||||
|
return stack.is(ModItems.PAGE.get())
|
||||||
|
&& PageItem.content(stack).kind() != PageContent.Kind.LINK_PANEL;
|
||||||
|
}
|
||||||
@Override public int getMaxStackSize() { return 1; }
|
@Override public int getMaxStackSize() { return 1; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
|||||||
private boolean placeCarriedPage(int collectionIndex, int pageIndex) {
|
private boolean placeCarriedPage(int collectionIndex, int pageIndex) {
|
||||||
// Resolve the actual storage position on the server, never a filtered list index.
|
// Resolve the actual storage position on the server, never a filtered list index.
|
||||||
ItemStack carried = getCarried();
|
ItemStack carried = getCarried();
|
||||||
if (clientSide || !carried.is(ModItems.PAGE.get())) return false;
|
if (clientSide || !storablePage(carried)) return false;
|
||||||
ItemStack collection = desk.getItem(collectionIndex);
|
ItemStack collection = desk.getItem(collectionIndex);
|
||||||
if (collection.is(ModItems.NOTEBOOK.get())) {
|
if (collection.is(ModItems.NOTEBOOK.get())) {
|
||||||
var pages = new java.util.ArrayList<>(collection.getOrDefault(
|
var pages = new java.util.ArrayList<>(collection.getOrDefault(
|
||||||
@@ -215,12 +215,14 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
|||||||
if (sourceNotebook && (sourcePage >= sourcePages.size() || sourcePages.get(sourcePage).isEmpty())) return false;
|
if (sourceNotebook && (sourcePage >= sourcePages.size() || sourcePages.get(sourcePage).isEmpty())) return false;
|
||||||
ItemStack moving = sourceNotebook ? sourcePages.get(sourcePage) : sourceBook;
|
ItemStack moving = sourceNotebook ? sourcePages.get(sourcePage) : sourceBook;
|
||||||
if (moving.getCount() != 1) return false;
|
if (moving.getCount() != 1) return false;
|
||||||
|
if (!storablePage(moving)) return false;
|
||||||
if (!targetNotebook && targetBook.getCount() != 1) return false;
|
if (!targetNotebook && targetBook.getCount() != 1) return false;
|
||||||
var targetPages = targetNotebook ? sourceCollection == targetCollection ? sourcePages
|
var targetPages = targetNotebook ? sourceCollection == targetCollection ? sourcePages
|
||||||
: new java.util.ArrayList<>(targetBook.getOrDefault(
|
: new java.util.ArrayList<>(targetBook.getOrDefault(
|
||||||
ModDataComponents.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages()) : null;
|
ModDataComponents.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages()) : null;
|
||||||
if (targetNotebook) while (targetPages.size() <= targetPage) targetPages.add(ItemStack.EMPTY);
|
if (targetNotebook) while (targetPages.size() <= targetPage) targetPages.add(ItemStack.EMPTY);
|
||||||
ItemStack displaced = targetNotebook ? targetPages.get(targetPage) : targetBook;
|
ItemStack displaced = targetNotebook ? targetPages.get(targetPage) : targetBook;
|
||||||
|
if (!displaced.isEmpty() && !storablePage(displaced)) return false;
|
||||||
if (targetNotebook) targetPages.set(targetPage, moving);
|
if (targetNotebook) targetPages.set(targetPage, moving);
|
||||||
if (sourceNotebook) {
|
if (sourceNotebook) {
|
||||||
sourcePages.set(sourcePage, displaced);
|
sourcePages.set(sourcePage, displaced);
|
||||||
@@ -256,6 +258,7 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
|||||||
setCarried(moving);
|
setCarried(moving);
|
||||||
} else {
|
} else {
|
||||||
if (targetSlot >= WritingDeskBlockEntity.COLLECTIONS && targetSlot < PLAYER_START) return false;
|
if (targetSlot >= WritingDeskBlockEntity.COLLECTIONS && targetSlot < PLAYER_START) return false;
|
||||||
|
if (targetSlot < WritingDeskBlockEntity.COLLECTIONS && !storablePage(moving)) return false;
|
||||||
Slot target = slots.get(targetSlot);
|
Slot target = slots.get(targetSlot);
|
||||||
if (!target.isActive() || !target.mayPlace(moving)) return false;
|
if (!target.isActive() || !target.mayPlace(moving)) return false;
|
||||||
ItemStack current = target.getItem();
|
ItemStack current = target.getItem();
|
||||||
@@ -340,10 +343,15 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
|||||||
if (moving.is(Items.PAPER))
|
if (moving.is(Items.PAPER))
|
||||||
return moveItemStackTo(moving, WritingDeskBlockEntity.PAPER,
|
return moveItemStackTo(moving, WritingDeskBlockEntity.PAPER,
|
||||||
WritingDeskBlockEntity.PAPER + 1, false);
|
WritingDeskBlockEntity.PAPER + 1, false);
|
||||||
if (moving.is(ModItems.PAGE.get())) return moveItemStackTo(moving, firstVisibleTab, firstVisibleTab + VISIBLE_TABS, false);
|
if (storablePage(moving)) return moveItemStackTo(moving, firstVisibleTab, firstVisibleTab + VISIBLE_TABS, false);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean storablePage(ItemStack stack) {
|
||||||
|
return stack.is(ModItems.PAGE.get())
|
||||||
|
&& PageItem.content(stack).kind() != PageContent.Kind.LINK_PANEL;
|
||||||
|
}
|
||||||
|
|
||||||
private ItemStack selectedSource() {
|
private ItemStack selectedSource() {
|
||||||
if (selectedSymbol != null) {
|
if (selectedSymbol != null) {
|
||||||
SymbolReference reference = new SymbolReference(selectedSymbol);
|
SymbolReference reference = new SymbolReference(selectedSymbol);
|
||||||
@@ -375,6 +383,7 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
|||||||
ItemStack source = selectedSource();
|
ItemStack source = selectedSource();
|
||||||
return blockEntity != null && source.is(ModItems.PAGE.get())
|
return blockEntity != null && source.is(ModItems.PAGE.get())
|
||||||
&& PageItem.content(source).kind() != PageContent.Kind.BLANK
|
&& PageItem.content(source).kind() != PageContent.Kind.BLANK
|
||||||
|
&& PageItem.content(source).kind() != PageContent.Kind.LINK_PANEL
|
||||||
&& PageItem.isUsableWriting(source) && blockEntity.canConsumeCopyMaterials();
|
&& PageItem.isUsableWriting(source) && blockEntity.canConsumeCopyMaterials();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
|||||||
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
import net.dnorberg.rivencraft.book.AgeDimensionService;
|
||||||
import net.dnorberg.rivencraft.book.AgeGenerationPlan;
|
import net.dnorberg.rivencraft.book.AgeGenerationPlan;
|
||||||
import net.dnorberg.rivencraft.book.AgeGenerationProfiles;
|
import net.dnorberg.rivencraft.book.AgeGenerationProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeEnvironmentCompiler;
|
||||||
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
import net.dnorberg.rivencraft.client.ClientLinkPreviewHandler;
|
import net.dnorberg.rivencraft.client.ClientLinkPreviewHandler;
|
||||||
import net.dnorberg.rivencraft.client.ClientBookInteractionHandler;
|
import net.dnorberg.rivencraft.client.ClientBookInteractionHandler;
|
||||||
@@ -313,15 +314,10 @@ public final class ModNetworking {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Vanilla Nether and End renderers do not use their biomes' blue Overworld sky tint. */
|
/** Sky effects, not dimension IDs, decide the backdrop for custom Ages. */
|
||||||
private static int previewSkyColor(ServerLevel level, BlockPos origin) {
|
private static int previewSkyColor(ServerLevel level, BlockPos origin) {
|
||||||
if (level.dimension().equals(Level.NETHER)) {
|
return AgeEnvironmentCompiler.previewSkyColor(level.dimensionType().effectsLocation(),
|
||||||
return 0xFF6B2725;
|
level.getBiome(origin).value().getSkyColor());
|
||||||
}
|
|
||||||
if (level.dimension().equals(Level.END)) {
|
|
||||||
return 0xFF211835;
|
|
||||||
}
|
|
||||||
return level.getBiome(origin).value().getSkyColor();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static InteractionHand hand(boolean offhand) {
|
private static InteractionHand hand(boolean offhand) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.registry;
|
|||||||
import com.mojang.serialization.MapCodec;
|
import com.mojang.serialization.MapCodec;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
|
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
@@ -13,7 +14,10 @@ public final class ModChunkGenerators {
|
|||||||
private static final DeferredRegister<MapCodec<? extends ChunkGenerator>> GENERATORS =
|
private static final DeferredRegister<MapCodec<? extends ChunkGenerator>> GENERATORS =
|
||||||
DeferredRegister.create(Registries.CHUNK_GENERATOR, Rivencraft.MOD_ID);
|
DeferredRegister.create(Registries.CHUNK_GENERATOR, Rivencraft.MOD_ID);
|
||||||
|
|
||||||
static { GENERATORS.register("age_flat", () -> AgeFlatChunkGenerator.CODEC); }
|
static {
|
||||||
|
GENERATORS.register("age_flat", () -> AgeFlatChunkGenerator.CODEC);
|
||||||
|
GENERATORS.register("age_features", () -> AgeFeatureChunkGenerator.CODEC);
|
||||||
|
}
|
||||||
|
|
||||||
private ModChunkGenerators() { }
|
private ModChunkGenerators() { }
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
package net.dnorberg.rivencraft.registry;
|
package net.dnorberg.rivencraft.registry;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.minecraft.core.registries.Registries;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.item.CreativeModeTab;
|
import net.minecraft.world.item.CreativeModeTab;
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
import net.neoforged.neoforge.registries.DeferredHolder;
|
import net.neoforged.neoforge.registries.DeferredHolder;
|
||||||
@@ -28,17 +34,39 @@ public final class ModCreativeTabs {
|
|||||||
})
|
})
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> PAGES =
|
public static final DeferredHolder<CreativeModeTab, CreativeModeTab> LINK_PAGES =
|
||||||
CREATIVE_TABS.register("rivencraft_pages", () -> CreativeModeTab.builder()
|
CREATIVE_TABS.register("rivencraft_link_pages", () -> CreativeModeTab.builder()
|
||||||
.title(Component.translatable("itemGroup.rivencraft.pages"))
|
.title(Component.translatable("itemGroup.rivencraft.pages.link"))
|
||||||
.icon(PageItem::createLinkPanelPage)
|
.icon(PageItem::createLinkPanelPage)
|
||||||
.displayItems((parameters, output) -> {
|
.displayItems((parameters, output) -> output.accept(PageItem.createLinkPanelPage()))
|
||||||
output.accept(ModItems.PAGE.get());
|
|
||||||
output.accept(PageItem.createLinkPanelPage());
|
|
||||||
PageItem.creativeSymbolPages(parameters.holders()).forEach(output::accept);
|
|
||||||
})
|
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
|
private static final List<String> CATEGORY_ORDER = List.of(
|
||||||
|
"terrain", "biome", "biome_generation", "weather", "lighting", "sky", "celestial", "block", "fluid", "feature");
|
||||||
|
|
||||||
|
public static final Map<ResourceLocation, DeferredHolder<CreativeModeTab, CreativeModeTab>> SYMBOL_PAGES =
|
||||||
|
registerSymbolPageTabs();
|
||||||
|
|
||||||
|
private static Map<ResourceLocation, DeferredHolder<CreativeModeTab, CreativeModeTab>> registerSymbolPageTabs() {
|
||||||
|
List<ResourceLocation> categories = new ArrayList<>(PageItem.bundledCreativeCategories());
|
||||||
|
categories.sort(Comparator.comparingInt((ResourceLocation id) -> {
|
||||||
|
int index = CATEGORY_ORDER.indexOf(id.getPath());
|
||||||
|
return index < 0 ? CATEGORY_ORDER.size() : index;
|
||||||
|
}).thenComparing(ResourceLocation::toString));
|
||||||
|
Map<ResourceLocation, DeferredHolder<CreativeModeTab, CreativeModeTab>> tabs = new LinkedHashMap<>();
|
||||||
|
for (ResourceLocation category : categories) {
|
||||||
|
String key = "rivencraft_pages_" + category.getNamespace() + "_" + category.getPath().replace('/', '_');
|
||||||
|
tabs.put(category, CREATIVE_TABS.register(key, () -> CreativeModeTab.builder()
|
||||||
|
.title(Component.translatableWithFallback("itemGroup.rivencraft.pages." + category.getPath(),
|
||||||
|
"Rivencraft " + category.getPath() + " Pages"))
|
||||||
|
.icon(() -> PageItem.bundledCreativeCategoryIcon(category))
|
||||||
|
.displayItems((parameters, output) -> PageItem.creativeSymbolPages(parameters.holders(), category)
|
||||||
|
.forEach(output::accept))
|
||||||
|
.build()));
|
||||||
|
}
|
||||||
|
return Map.copyOf(tabs);
|
||||||
|
}
|
||||||
|
|
||||||
private ModCreativeTabs() {
|
private ModCreativeTabs() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package net.dnorberg.rivencraft.registry;
|
|||||||
|
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.book.LinkTarget;
|
import net.dnorberg.rivencraft.book.LinkTarget;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.book.AgeReference;
|
import net.dnorberg.rivencraft.book.AgeReference;
|
||||||
import net.dnorberg.rivencraft.writing.PageContent;
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
import net.dnorberg.rivencraft.writing.NotebookContents;
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
@@ -26,6 +27,12 @@ public final class ModDataComponents {
|
|||||||
.networkSynchronized(LinkTarget.STREAM_CODEC)
|
.networkSynchronized(LinkTarget.STREAM_CODEC)
|
||||||
.cacheEncoding()
|
.cacheEncoding()
|
||||||
.build());
|
.build());
|
||||||
|
public static final DeferredHolder<DataComponentType<?>, DataComponentType<LinkProperties>> LINK_PROPERTIES =
|
||||||
|
DATA_COMPONENTS.register("link_properties", () -> DataComponentType.<LinkProperties>builder()
|
||||||
|
.persistent(LinkProperties.CODEC)
|
||||||
|
.networkSynchronized(LinkProperties.STREAM_CODEC)
|
||||||
|
.cacheEncoding()
|
||||||
|
.build());
|
||||||
public static final DeferredHolder<DataComponentType<?>, DataComponentType<AgeReference>> AGE_REFERENCE =
|
public static final DeferredHolder<DataComponentType<?>, DataComponentType<AgeReference>> AGE_REFERENCE =
|
||||||
DATA_COMPONENTS.register("age_reference", () -> DataComponentType.<AgeReference>builder()
|
DATA_COMPONENTS.register("age_reference", () -> DataComponentType.<AgeReference>builder()
|
||||||
.persistent(AgeReference.CODEC)
|
.persistent(AgeReference.CODEC)
|
||||||
|
|||||||
@@ -0,0 +1,155 @@
|
|||||||
|
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 net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.core.QuartPos;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.StructureManager;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.server.level.WorldGenRegion;
|
||||||
|
import net.minecraft.world.level.biome.BiomeManager;
|
||||||
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.chunk.ProtoChunk;
|
||||||
|
import net.minecraft.world.level.levelgen.GenerationStep;
|
||||||
|
import net.minecraft.world.level.levelgen.LegacyRandomSource;
|
||||||
|
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.carver.CarvingContext;
|
||||||
|
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.RarityFilter;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.Feature;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.LakeFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.configurations.BlockStateConfiguration;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
|
||||||
|
/** Adds frozen authored decorations after vanilla's biome features, without changing shared biome registries. */
|
||||||
|
public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
||||||
|
public static final MapCodec<AgeFeatureChunkGenerator> CODEC = RecordCodecBuilder.mapCodec(instance ->
|
||||||
|
instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.getBiomeSource()),
|
||||||
|
NoiseGeneratorSettings.CODEC.fieldOf("settings").forGetter(generator -> generator.settings),
|
||||||
|
AgeFeatureSelection.Choice.CODEC.listOf().fieldOf("age_features").forGetter(generator -> generator.features),
|
||||||
|
Codec.LONG.fieldOf("age_seed").forGetter(generator -> generator.ageSeed))
|
||||||
|
.apply(instance, AgeFeatureChunkGenerator::new));
|
||||||
|
|
||||||
|
private final Holder<NoiseGeneratorSettings> settings;
|
||||||
|
private final List<AgeFeatureSelection.Choice> features;
|
||||||
|
private final long ageSeed;
|
||||||
|
|
||||||
|
public AgeFeatureChunkGenerator(BiomeSource biomes, Holder<NoiseGeneratorSettings> settings,
|
||||||
|
List<AgeFeatureSelection.Choice> features, long ageSeed) {
|
||||||
|
super(biomes, settings);
|
||||||
|
this.settings = settings;
|
||||||
|
this.features = List.copyOf(features);
|
||||||
|
this.ageSeed = ageSeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void applyCarvers(WorldGenRegion level, long seed, RandomState random, BiomeManager biomes,
|
||||||
|
StructureManager structures, ChunkAccess chunk, GenerationStep.Carving step) {
|
||||||
|
super.applyCarvers(level, seed, random, biomes, structures, chunk, step);
|
||||||
|
if (step != GenerationStep.Carving.AIR || features.stream().noneMatch(choice ->
|
||||||
|
AgeFeatureSelection.caves(choice.id()) || AgeFeatureSelection.ravines(choice.id()))) return;
|
||||||
|
var noiseChunk = chunk.getOrCreateNoiseChunk(ignored -> {
|
||||||
|
throw new IllegalStateException("Vanilla carver did not initialize the Age noise chunk");
|
||||||
|
});
|
||||||
|
var context = new CarvingContext(this, level.registryAccess(), chunk.getHeightAccessorForGeneration(),
|
||||||
|
noiseChunk, random, settings.value().surfaceRule());
|
||||||
|
var mask = ((ProtoChunk) chunk).getOrCreateCarvingMask(step);
|
||||||
|
var carvers = level.registryAccess().lookupOrThrow(Registries.CONFIGURED_CARVER);
|
||||||
|
var sourceRandom = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
ChunkPos target = chunk.getPos();
|
||||||
|
BiomeManager sourceBiomes = biomes.withDifferentSource((qx, qy, qz) ->
|
||||||
|
getBiomeSource().getNoiseBiome(qx, qy, qz, random.sampler()));
|
||||||
|
for (AgeFeatureSelection.Choice choice : features) {
|
||||||
|
if (!AgeFeatureSelection.caves(choice.id()) && !AgeFeatureSelection.ravines(choice.id())) continue;
|
||||||
|
for (int dx = -8; dx <= 8; dx++) {
|
||||||
|
for (int dz = -8; dz <= 8; dz++) {
|
||||||
|
ChunkPos source = new ChunkPos(target.x + dx, target.z + dz);
|
||||||
|
var biome = getBiomeSource().getNoiseBiome(QuartPos.fromBlock(source.getMinBlockX()), 0,
|
||||||
|
QuartPos.fromBlock(source.getMinBlockZ()), random.sampler());
|
||||||
|
if (AgeFeatureSelection.ravines(choice.id())
|
||||||
|
&& biome.is(net.minecraft.tags.BiomeTags.IS_NETHER)) continue;
|
||||||
|
ResourceLocation carverId = ResourceLocation.withDefaultNamespace(
|
||||||
|
AgeFeatureSelection.ravines(choice.id()) ? "canyon"
|
||||||
|
: biome.is(net.minecraft.tags.BiomeTags.IS_NETHER) ? "nether_cave" : "cave");
|
||||||
|
ConfiguredWorldCarver<?> carver = carvers.getOrThrow(
|
||||||
|
ResourceKey.create(Registries.CONFIGURED_CARVER, carverId)).value();
|
||||||
|
sourceRandom.setLargeFeatureSeed(ageSeed ^ (AgeFeatureSelection.ravines(choice.id())
|
||||||
|
? 0x524156494E45534CL : 0x4341564553464541L), source.x, source.z);
|
||||||
|
if (carver.isStartChunk(sourceRandom)) {
|
||||||
|
carver.carve(context, chunk, sourceBiomes::getBiome, sourceRandom,
|
||||||
|
noiseChunk.aquifer(), source, mask);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void applyBiomeDecoration(WorldGenLevel level, ChunkAccess chunk, StructureManager structures) {
|
||||||
|
super.applyBiomeDecoration(level, chunk, structures);
|
||||||
|
var registry = level.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE);
|
||||||
|
int x = chunk.getPos().getMinBlockX();
|
||||||
|
int z = chunk.getPos().getMinBlockZ();
|
||||||
|
BlockPos origin = new BlockPos(x, level.getMinBuildHeight(), z);
|
||||||
|
for (int index = 0; index < features.size(); index++) {
|
||||||
|
AgeFeatureSelection.Choice choice = features.get(index);
|
||||||
|
if (AgeFeatureSelection.surfaceVegetation(choice.id())) {
|
||||||
|
int surface = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, 8, 8);
|
||||||
|
if (!AgeFeatureSelection.supportsSurfaceVegetation(
|
||||||
|
level.getBiome(new BlockPos(x + 8, surface, z + 8)))) continue;
|
||||||
|
}
|
||||||
|
ResourceLocation key = AgeFeatureSelection.placedFeature(choice.id());
|
||||||
|
if (key == null) continue; // Carvers are applied before decoration.
|
||||||
|
PlacedFeature vanilla = registry.getOrThrow(ResourceKey.create(Registries.PLACED_FEATURE, key)).value();
|
||||||
|
// Vanilla's biome filter only admits a feature already in that biome's list. An
|
||||||
|
// authored page intentionally adds it, so preserve all other vanilla placement rules.
|
||||||
|
Holder<ConfiguredFeature<?, ?>> configured = vanilla.feature();
|
||||||
|
if (choice.material().isPresent()) {
|
||||||
|
var material = BuiltInRegistries.BLOCK.get(choice.material().orElseThrow()).defaultBlockState();
|
||||||
|
if (AgeFeatureSelection.isRock(choice.id())) {
|
||||||
|
configured = Holder.direct(new ConfiguredFeature<>(Feature.FOREST_ROCK,
|
||||||
|
new BlockStateConfiguration(material)));
|
||||||
|
} else if (AgeFeatureSelection.isLake(choice.id())) {
|
||||||
|
configured = Holder.direct(new ConfiguredFeature<>(Feature.LAKE,
|
||||||
|
new LakeFeature.Configuration(BlockStateProvider.simple(material),
|
||||||
|
BlockStateProvider.simple(Blocks.STONE))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PlacedFeature authored = new PlacedFeature(configured, vanilla.placement().stream()
|
||||||
|
.filter(modifier -> !(modifier instanceof BiomeFilter))
|
||||||
|
.map(modifier -> AgeFeatureSelection.isLake(choice.id())
|
||||||
|
&& !choice.id().getPath().equals("deep_lakes")
|
||||||
|
&& modifier instanceof RarityFilter
|
||||||
|
? RarityFilter.onAverageOnceEvery(12) : modifier)
|
||||||
|
.toList());
|
||||||
|
long seed = ageSeed ^ (long) x * 341873128712L ^ (long) z * 132897987541L
|
||||||
|
^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L;
|
||||||
|
authored.place(level, this, RandomSource.create(seed), origin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package net.dnorberg.rivencraft.writing;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Optional;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.EmptyBlockGetter;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.EntityBlock;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
|
/** Registry-derived material pages; binding validates the material for its consumer. */
|
||||||
|
public final class BlockSymbolPages {
|
||||||
|
public static final ResourceLocation CATEGORY = ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "block");
|
||||||
|
public static final ResourceLocation FLUID_CATEGORY = ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "fluid");
|
||||||
|
|
||||||
|
private BlockSymbolPages() {}
|
||||||
|
|
||||||
|
public static ResourceLocation symbolId(ResourceLocation blockId) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID,
|
||||||
|
"block/" + blockId.getNamespace() + "/" + blockId.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ResourceLocation blockId(ResourceLocation symbolId) {
|
||||||
|
String path = symbolId.getPath();
|
||||||
|
if (!path.startsWith("block/")) return null;
|
||||||
|
String rest = path.substring("block/".length());
|
||||||
|
int separator = rest.indexOf('/');
|
||||||
|
return separator < 1 ? null : ResourceLocation.tryParse(
|
||||||
|
rest.substring(0, separator) + ":" + rest.substring(separator + 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.List<ResourceLocation> availableBlocks() {
|
||||||
|
return BuiltInRegistries.BLOCK.keySet().stream()
|
||||||
|
.filter(id -> isRockMaterial(BuiltInRegistries.BLOCK.get(id))
|
||||||
|
|| isFluidMaterial(BuiltInRegistries.BLOCK.get(id)))
|
||||||
|
.sorted().toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static java.util.List<ResourceLocation> availableBlocks(ResourceLocation category) {
|
||||||
|
if (!category.equals(CATEGORY) && !category.equals(FLUID_CATEGORY)) return java.util.List.of();
|
||||||
|
return availableBlocks().stream().filter(id -> category(id).equals(category)).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ResourceLocation category(ResourceLocation blockId) {
|
||||||
|
return isFluidMaterial(BuiltInRegistries.BLOCK.get(blockId)) ? FLUID_CATEGORY : CATEGORY;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isRockMaterial(Block block) {
|
||||||
|
if (excluded(block)) return false;
|
||||||
|
BlockState state = block.defaultBlockState();
|
||||||
|
return state.getFluidState().isEmpty()
|
||||||
|
&& state.isCollisionShapeFullBlock(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isFluidMaterial(Block block) {
|
||||||
|
if (excluded(block)) return false;
|
||||||
|
var fluid = block.defaultBlockState().getFluidState();
|
||||||
|
// A waterlogged coral or seagrass block contains water, but is not a fluid block.
|
||||||
|
return fluid.isSource() && fluid.createLegacyBlock().getBlock() == block;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean excluded(Block block) {
|
||||||
|
return block == Blocks.AIR || block == Blocks.CAVE_AIR || block == Blocks.VOID_AIR
|
||||||
|
|| block instanceof EntityBlock || block.defaultBlockState().hasBlockEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SymbolDefinition definition(ResourceLocation blockId) {
|
||||||
|
String path = blockId.getPath().replace('/', '_');
|
||||||
|
String word = Arrays.stream(path.split("_"))
|
||||||
|
.map(part -> part.replaceAll("[^A-Za-z]", ""))
|
||||||
|
.filter(part -> !part.isEmpty())
|
||||||
|
.map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
|
||||||
|
.reduce("", String::concat);
|
||||||
|
if (word.isEmpty()) word = "Stone";
|
||||||
|
// A modded registry path can be arbitrarily long; poems have a bounded codec.
|
||||||
|
if (word.length() > 48) word = word.substring(0, 48);
|
||||||
|
return new SymbolDefinition(SymbolDefinition.CURRENT_SCHEMA_VERSION,
|
||||||
|
"block." + blockId.getNamespace() + "." + path,
|
||||||
|
"symbol.rivencraft.block.generated.description", category(blockId),
|
||||||
|
Optional.of(new SymbolSemantics(SymbolSemantics.Role.BLOCK,
|
||||||
|
new SymbolSemantics.ResourceValue(blockId))),
|
||||||
|
"Modifier Constraint " + word + " Form");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String fallbackName(ResourceLocation blockId) {
|
||||||
|
return Arrays.stream(blockId.getPath().replace('/', '_').split("_"))
|
||||||
|
.filter(part -> !part.isEmpty())
|
||||||
|
.map(part -> part.substring(0, 1).toUpperCase(Locale.ROOT) + part.substring(1))
|
||||||
|
.reduce((left, right) -> left + " " + right).orElse("Unknown")
|
||||||
|
+ (category(blockId).equals(FLUID_CATEGORY) ? " Fluid" : " Material");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package net.dnorberg.rivencraft.writing;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
|
||||||
|
/** Built-in Legacy ink additives. Optional mod dusts will be mapped through tags separately. */
|
||||||
|
public final class InkModifierIngredients {
|
||||||
|
public record Effect(int flag, double chance) {}
|
||||||
|
public record Ingredient(ItemStack item, List<Effect> effects) {}
|
||||||
|
|
||||||
|
private static final List<Ingredient> BUILT_IN = List.of(
|
||||||
|
new Ingredient(new ItemStack(Items.GUNPOWDER), List.of(new Effect(LinkProperties.DISARM, 0.20))),
|
||||||
|
new Ingredient(new ItemStack(Items.MUSHROOM_STEW), List.of(new Effect(LinkProperties.DISARM, 0.05))),
|
||||||
|
new Ingredient(new ItemStack(Items.EXPERIENCE_BOTTLE), List.of(new Effect(LinkProperties.INTRA_LINKING, 0.15))),
|
||||||
|
new Ingredient(new ItemStack(Items.ENDER_PEARL), List.of(
|
||||||
|
new Effect(LinkProperties.INTRA_LINKING, 0.15),
|
||||||
|
new Effect(LinkProperties.DISARM, 0.15))),
|
||||||
|
new Ingredient(new ItemStack(Items.FEATHER), List.of(new Effect(LinkProperties.MAINTAIN_MOMENTUM, 0.15))),
|
||||||
|
new Ingredient(new ItemStack(Items.FIRE_CHARGE), List.of(new Effect(LinkProperties.DISARM, 0.25)))
|
||||||
|
);
|
||||||
|
|
||||||
|
private InkModifierIngredients() {}
|
||||||
|
|
||||||
|
public static List<Ingredient> builtIn() {
|
||||||
|
return BUILT_IN;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Ingredient find(ItemStack stack) {
|
||||||
|
return BUILT_IN.stream().filter(ingredient -> stack.is(ingredient.item().getItem())).findFirst().orElse(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package net.dnorberg.rivencraft.writing;
|
package net.dnorberg.rivencraft.writing;
|
||||||
|
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.dnorberg.rivencraft.registry.ModRecipeSerializers;
|
import net.dnorberg.rivencraft.registry.ModRecipeSerializers;
|
||||||
import net.minecraft.core.HolderLookup;
|
import net.minecraft.core.HolderLookup;
|
||||||
@@ -50,11 +51,13 @@ public final class LinkingBookRecipe extends CustomRecipe {
|
|||||||
ItemStack panel = findPanel(input);
|
ItemStack panel = findPanel(input);
|
||||||
if (panel.isEmpty()) return ItemStack.EMPTY;
|
if (panel.isEmpty()) return ItemStack.EMPTY;
|
||||||
ItemStack book = new ItemStack(ModItems.LINKING_BOOK.get());
|
ItemStack book = new ItemStack(ModItems.LINKING_BOOK.get());
|
||||||
// Legacy copied the panel's data. Only its custom name is meaningful to a
|
// Copy book-relevant panel data, never the Page identity component.
|
||||||
// 1.21.1 Linking Book today; page-only components must not reach the book.
|
|
||||||
if (panel.has(DataComponents.CUSTOM_NAME)) {
|
if (panel.has(DataComponents.CUSTOM_NAME)) {
|
||||||
book.set(DataComponents.CUSTOM_NAME, panel.get(DataComponents.CUSTOM_NAME));
|
book.set(DataComponents.CUSTOM_NAME, panel.get(DataComponents.CUSTOM_NAME));
|
||||||
}
|
}
|
||||||
|
if (panel.has(ModDataComponents.LINK_PROPERTIES.get())) {
|
||||||
|
book.set(ModDataComponents.LINK_PROPERTIES.get(), panel.get(ModDataComponents.LINK_PROPERTIES.get()));
|
||||||
|
}
|
||||||
return book;
|
return book;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,6 +72,8 @@ public final class SymbolCatalog {
|
|||||||
.filter(id -> id.getNamespace().equals("minecraft"))
|
.filter(id -> id.getNamespace().equals("minecraft"))
|
||||||
.forEach(id -> loaded.putIfAbsent(BiomeSymbolPages.symbolId(id),
|
.forEach(id -> loaded.putIfAbsent(BiomeSymbolPages.symbolId(id),
|
||||||
BiomeSymbolPages.definition(id)));
|
BiomeSymbolPages.definition(id)));
|
||||||
|
BlockSymbolPages.availableBlocks().forEach(id -> loaded.putIfAbsent(
|
||||||
|
BlockSymbolPages.symbolId(id), BlockSymbolPages.definition(id)));
|
||||||
symbols = Map.copyOf(loaded);
|
symbols = Map.copyOf(loaded);
|
||||||
Rivencraft.LOGGER.info("Loaded {} writing symbols", loaded.size());
|
Rivencraft.LOGGER.info("Loaded {} writing symbols", loaded.size());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,12 +77,14 @@ public record SymbolSemantics(Role role, Value value) {
|
|||||||
"native", "single", "tiled", "grid", "tiny", "small", "medium", "large", "huge"),
|
"native", "single", "tiled", "grid", "tiny", "small", "medium", "large", "huge"),
|
||||||
BIOME("biome", Kind.RESOURCE),
|
BIOME("biome", Kind.RESOURCE),
|
||||||
LIGHTING("lighting", Kind.CHOICE, "normal", "dark", "bright"),
|
LIGHTING("lighting", Kind.CHOICE, "normal", "dark", "bright"),
|
||||||
|
SKY("sky", Kind.CHOICE, "overworld", "nether", "end"),
|
||||||
WEATHER("weather", Kind.CHOICE,
|
WEATHER("weather", Kind.CHOICE,
|
||||||
"normal", "fast", "slow", "off", "always", "cloudy", "rain", "snow", "storm"),
|
"normal", "fast", "slow", "off", "always", "cloudy", "rain", "snow", "storm"),
|
||||||
CELESTIAL("celestial", Kind.CHOICE, "normal_time"),
|
CELESTIAL("celestial", Kind.CHOICE, "normal_time"),
|
||||||
PERIOD_MODIFIER("period_modifier", Kind.NUMBER),
|
PERIOD_MODIFIER("period_modifier", Kind.NUMBER),
|
||||||
ANGLE_MODIFIER("angle_modifier", Kind.NUMBER),
|
ANGLE_MODIFIER("angle_modifier", Kind.NUMBER),
|
||||||
PHASE_MODIFIER("phase_modifier", Kind.NUMBER),
|
PHASE_MODIFIER("phase_modifier", Kind.NUMBER),
|
||||||
|
BLOCK("block", Kind.RESOURCE),
|
||||||
FEATURE("feature", Kind.RESOURCE);
|
FEATURE("feature", Kind.RESOURCE);
|
||||||
|
|
||||||
private final String id;
|
private final String id;
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ public final class WritingGrammar {
|
|||||||
int panels = 0;
|
int panels = 0;
|
||||||
int lastStage = -1;
|
int lastStage = -1;
|
||||||
int biomeCount = 0;
|
int biomeCount = 0;
|
||||||
|
ParsedSymbol pendingBlock = null;
|
||||||
for (int index = 0; index < writing.entries().size(); index++) {
|
for (int index = 0; index < writing.entries().size(); index++) {
|
||||||
WritingEntry entry = writing.entries().get(index);
|
WritingEntry entry = writing.entries().get(index);
|
||||||
if (entry.kind() == WritingEntry.Kind.LINK_PANEL) {
|
if (entry.kind() == WritingEntry.Kind.LINK_PANEL) {
|
||||||
@@ -69,6 +70,28 @@ public final class WritingGrammar {
|
|||||||
Role role = semantics.orElseThrow().role();
|
Role role = semantics.orElseThrow().role();
|
||||||
ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow());
|
ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow());
|
||||||
symbols.add(parsed);
|
symbols.add(parsed);
|
||||||
|
if (pendingBlock != null && role != Role.FEATURE) {
|
||||||
|
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||||
|
"Place this material page immediately before a compatible feature"));
|
||||||
|
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")
|
||||||
|
.contains(feature.getPath()) || !feature.getNamespace().equals("rivencraft")) {
|
||||||
|
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||||
|
"This feature cannot consume a material page"));
|
||||||
|
}
|
||||||
|
pendingBlock = null;
|
||||||
|
}
|
||||||
|
if (role == Role.ANGLE_MODIFIER || role == Role.WEATHER
|
||||||
|
&& parsed.semantics().value() instanceof ChoiceValue choice
|
||||||
|
&& Set.of("snow", "cloudy", "rain").contains(choice.id())) {
|
||||||
|
diagnostics.add(new Diagnostic(Code.UNSUPPORTED_ENVIRONMENT, index,
|
||||||
|
"This environment effect needs renderer or precipitation support"));
|
||||||
|
}
|
||||||
if (singular(role)) {
|
if (singular(role)) {
|
||||||
ParsedSymbol previous = singular.putIfAbsent(role, parsed);
|
ParsedSymbol previous = singular.putIfAbsent(role, parsed);
|
||||||
if (previous != null) {
|
if (previous != null) {
|
||||||
@@ -93,6 +116,8 @@ public final class WritingGrammar {
|
|||||||
lastStage = stage;
|
lastStage = stage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (pendingBlock != null) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||||
|
"Place this material page immediately before a compatible feature"));
|
||||||
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
|
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
|
||||||
"Add a Link Panel as the first page"));
|
"Add a Link Panel as the first page"));
|
||||||
if (symbols.isEmpty()) return new Result(symbols, diagnostics);
|
if (symbols.isEmpty()) return new Result(symbols, diagnostics);
|
||||||
@@ -127,7 +152,7 @@ public final class WritingGrammar {
|
|||||||
|
|
||||||
private static boolean singular(Role role) {
|
private static boolean singular(Role role) {
|
||||||
return switch (role) {
|
return switch (role) {
|
||||||
case TERRAIN, BIOME_CONTROLLER, WEATHER, LIGHTING, CELESTIAL -> true;
|
case TERRAIN, BIOME_CONTROLLER, WEATHER, LIGHTING, SKY, CELESTIAL -> true;
|
||||||
default -> false;
|
default -> false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -143,16 +168,17 @@ public final class WritingGrammar {
|
|||||||
case BIOME_CONTROLLER -> 2;
|
case BIOME_CONTROLLER -> 2;
|
||||||
case WEATHER -> 3;
|
case WEATHER -> 3;
|
||||||
case LIGHTING -> 4;
|
case LIGHTING -> 4;
|
||||||
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER -> 5;
|
case SKY -> 5;
|
||||||
case CELESTIAL -> 6;
|
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER -> 6;
|
||||||
case FEATURE -> 7;
|
case CELESTIAL -> 7;
|
||||||
|
case BLOCK, FEATURE -> 8;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum Code {
|
public enum Code {
|
||||||
TOO_MANY, MISSING_PANEL, PANEL_ORDER, DUPLICATE_PANEL, UNRESOLVED, UNSUPPORTED,
|
TOO_MANY, MISSING_PANEL, PANEL_ORDER, DUPLICATE_PANEL, UNRESOLVED, UNSUPPORTED,
|
||||||
DUPLICATE, CONFLICT, OUT_OF_ORDER, MISPLACED_MODIFIER, INCOMPLETE, UNSUPPORTED_PROFILE,
|
DUPLICATE, CONFLICT, OUT_OF_ORDER, MISPLACED_MODIFIER, INCOMPLETE, UNSUPPORTED_PROFILE,
|
||||||
UNKNOWN_BIOME, UNSUPPORTED_BIOME
|
UNKNOWN_BIOME, UNSUPPORTED_BIOME, UNSUPPORTED_ENVIRONMENT, UNSUPPORTED_FEATURE
|
||||||
}
|
}
|
||||||
|
|
||||||
public record Diagnostic(Code code, int index, String message) {
|
public record Diagnostic(Code code, int index, String message) {
|
||||||
|
|||||||
@@ -10,7 +10,10 @@
|
|||||||
"item.rivencraft.page.blank": "Blank Page",
|
"item.rivencraft.page.blank": "Blank Page",
|
||||||
"item.rivencraft.page.blank.description": "Ready for writing at a Writing Desk.",
|
"item.rivencraft.page.blank.description": "Ready for writing at a Writing Desk.",
|
||||||
"item.rivencraft.page.link_panel": "Link Panel Page",
|
"item.rivencraft.page.link_panel": "Link Panel Page",
|
||||||
"item.rivencraft.page.link_panel.description": "The baseline panel required to assemble a Descriptive Book.",
|
"item.rivencraft.page.link_panel.description": "A Link Panel for assembling books.",
|
||||||
|
"item.rivencraft.link_property.disarm": "Disarm",
|
||||||
|
"item.rivencraft.link_property.maintain_momentum": "Maintain Momentum",
|
||||||
|
"item.rivencraft.link_property.intra_linking": "Intra Linking",
|
||||||
"item.rivencraft.page.unresolved": "Unresolved Symbol Page",
|
"item.rivencraft.page.unresolved": "Unresolved Symbol Page",
|
||||||
"item.rivencraft.notebook": "Notebook",
|
"item.rivencraft.notebook": "Notebook",
|
||||||
"item.rivencraft.notebook.pages": "Pages: %s/%s",
|
"item.rivencraft.notebook.pages": "Pages: %s/%s",
|
||||||
@@ -23,6 +26,8 @@
|
|||||||
"block.rivencraft.ink_mixer": "Ink Mixer",
|
"block.rivencraft.ink_mixer": "Ink Mixer",
|
||||||
"container.rivencraft.ink_mixer": "Ink Mixer",
|
"container.rivencraft.ink_mixer": "Ink Mixer",
|
||||||
"screen.rivencraft.ink_mixer.ink": "Ink: %s/%s",
|
"screen.rivencraft.ink_mixer.ink": "Ink: %s/%s",
|
||||||
|
"screen.rivencraft.ink_mixer.additive_hint": "Click the basin with an additive; right-click adds one.",
|
||||||
|
"screen.rivencraft.ink_mixer.chance": "%s: %s%%",
|
||||||
"screen.rivencraft.book_binder.title": "Book title",
|
"screen.rivencraft.book_binder.title": "Book title",
|
||||||
"screen.rivencraft.book_binder.title_hint": "Name the book",
|
"screen.rivencraft.book_binder.title_hint": "Name the book",
|
||||||
"screen.rivencraft.book_binder.missing_panel": "Link Panel required as the first page",
|
"screen.rivencraft.book_binder.missing_panel": "Link Panel required as the first page",
|
||||||
@@ -41,6 +46,7 @@
|
|||||||
"screen.rivencraft.book_binder.grammar.unresolved": "Page %s: missing symbol definition; restore its data pack or remove it",
|
"screen.rivencraft.book_binder.grammar.unresolved": "Page %s: missing symbol definition; restore its data pack or remove it",
|
||||||
"screen.rivencraft.book_binder.grammar.unsupported": "Page %s: this symbol needs semantic schema v2; update its data pack or remove it",
|
"screen.rivencraft.book_binder.grammar.unsupported": "Page %s: this symbol needs semantic schema v2; update its data pack or remove it",
|
||||||
"screen.rivencraft.book_binder.grammar.unsupported_profile": "Page %s: its Age profile is unavailable; restore the data pack or remove this page",
|
"screen.rivencraft.book_binder.grammar.unsupported_profile": "Page %s: its Age profile is unavailable; restore the data pack or remove this page",
|
||||||
|
"screen.rivencraft.book_binder.grammar.unsupported_environment": "Page %s: this weather or sky effect is not supported yet",
|
||||||
"screen.rivencraft.book_binder.grammar.duplicate": "Page %s: remove the duplicate symbol",
|
"screen.rivencraft.book_binder.grammar.duplicate": "Page %s: remove the duplicate symbol",
|
||||||
"screen.rivencraft.book_binder.grammar.conflict": "Page %s: replace the conflicting symbol",
|
"screen.rivencraft.book_binder.grammar.conflict": "Page %s: replace the conflicting symbol",
|
||||||
"screen.rivencraft.book_binder.grammar.out_of_order": "Page %s: move this symbol before later categories",
|
"screen.rivencraft.book_binder.grammar.out_of_order": "Page %s: move this symbol before later categories",
|
||||||
@@ -66,6 +72,7 @@
|
|||||||
"message.rivencraft.linking_book.linked": "Linked",
|
"message.rivencraft.linking_book.linked": "Linked",
|
||||||
"message.rivencraft.linking_book.missing_dimension": "That dimension is unavailable",
|
"message.rivencraft.linking_book.missing_dimension": "That dimension is unavailable",
|
||||||
"message.rivencraft.linking_book.unsafe": "No safe destination was found near the link",
|
"message.rivencraft.linking_book.unsafe": "No safe destination was found near the link",
|
||||||
|
"message.rivencraft.linking_book.intra_required": "This book needs an Intra Linking panel for same-dimension travel",
|
||||||
"message.rivencraft.descriptive_book.unwritten": "This Descriptive Book is unwritten",
|
"message.rivencraft.descriptive_book.unwritten": "This Descriptive Book is unwritten",
|
||||||
"message.rivencraft.descriptive_book.created": "Created Age: %s",
|
"message.rivencraft.descriptive_book.created": "Created Age: %s",
|
||||||
"message.rivencraft.descriptive_book.unavailable": "That Age is unavailable",
|
"message.rivencraft.descriptive_book.unavailable": "That Age is unavailable",
|
||||||
@@ -87,7 +94,6 @@
|
|||||||
"screen.rivencraft.age.pages": "Pages",
|
"screen.rivencraft.age.pages": "Pages",
|
||||||
"screen.rivencraft.age.details": "Details",
|
"screen.rivencraft.age.details": "Details",
|
||||||
"screen.rivencraft.age.pages_count": "Writing %s/%s",
|
"screen.rivencraft.age.pages_count": "Writing %s/%s",
|
||||||
"screen.rivencraft.age.pages_not_applied": "Symbols not applied yet",
|
|
||||||
"screen.rivencraft.age.trait.biomes": "Biomes: %s",
|
"screen.rivencraft.age.trait.biomes": "Biomes: %s",
|
||||||
"screen.rivencraft.age.trait.lighting": "Lighting: %s",
|
"screen.rivencraft.age.trait.lighting": "Lighting: %s",
|
||||||
"screen.rivencraft.age.trait.weather": "Weather: %s",
|
"screen.rivencraft.age.trait.weather": "Weather: %s",
|
||||||
@@ -167,12 +173,65 @@
|
|||||||
"symbol.rivencraft.biome.huge.description": "Distribute selected biomes in huge regions.",
|
"symbol.rivencraft.biome.huge.description": "Distribute selected biomes in huge regions.",
|
||||||
"symbol.rivencraft.lighting.normal": "Normal Lighting",
|
"symbol.rivencraft.lighting.normal": "Normal Lighting",
|
||||||
"symbol.rivencraft.lighting.normal.description": "Use normal skylight and ambient brightness.",
|
"symbol.rivencraft.lighting.normal.description": "Use normal skylight and ambient brightness.",
|
||||||
|
"symbol.rivencraft.lighting.dark": "Dark Lighting",
|
||||||
|
"symbol.rivencraft.lighting.dark.description": "Remove skylight from this Age.",
|
||||||
|
"symbol.rivencraft.lighting.bright": "Bright Lighting",
|
||||||
|
"symbol.rivencraft.lighting.bright.description": "Increase this Age's ambient brightness.",
|
||||||
|
"symbol.rivencraft.sky.overworld": "Overworld Sky",
|
||||||
|
"symbol.rivencraft.sky.overworld.description": "Use the Overworld sky and biome sky tint.",
|
||||||
|
"symbol.rivencraft.sky.nether": "Nether Sky",
|
||||||
|
"symbol.rivencraft.sky.nether.description": "Use the Nether sky and red preview background.",
|
||||||
|
"symbol.rivencraft.sky.end": "End Sky",
|
||||||
|
"symbol.rivencraft.sky.end.description": "Use the End sky and dark preview background.",
|
||||||
"symbol.rivencraft.weather.normal": "Normal Weather",
|
"symbol.rivencraft.weather.normal": "Normal Weather",
|
||||||
"symbol.rivencraft.weather.normal.description": "Use the normal weather cycle.",
|
"symbol.rivencraft.weather.normal.description": "Use the normal weather cycle.",
|
||||||
|
"symbol.rivencraft.weather.fast": "Fast Weather",
|
||||||
|
"symbol.rivencraft.weather.fast.description": "Change weather more quickly.",
|
||||||
|
"symbol.rivencraft.weather.slow": "Slow Weather",
|
||||||
|
"symbol.rivencraft.weather.slow.description": "Change weather more slowly.",
|
||||||
|
"symbol.rivencraft.weather.off": "No Weather",
|
||||||
|
"symbol.rivencraft.weather.off.description": "Keep the Age clear.",
|
||||||
|
"symbol.rivencraft.weather.always": "Always Weather",
|
||||||
|
"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.celestial.normal_time": "Normal Time",
|
"symbol.rivencraft.celestial.normal_time": "Normal Time",
|
||||||
"symbol.rivencraft.celestial.normal_time.description": "Use a normal-length celestial cycle.",
|
"symbol.rivencraft.celestial.normal_time.description": "Use a normal-length celestial cycle.",
|
||||||
|
"symbol.rivencraft.period.zero": "Zero Length",
|
||||||
|
"symbol.rivencraft.period.zero.description": "Stop the celestial cycle at its written phase.",
|
||||||
|
"symbol.rivencraft.period.half": "Half Length",
|
||||||
|
"symbol.rivencraft.period.half.description": "Use a half-length celestial cycle.",
|
||||||
|
"symbol.rivencraft.period.full": "Full Length",
|
||||||
|
"symbol.rivencraft.period.full.description": "Use a normal-length celestial cycle.",
|
||||||
|
"symbol.rivencraft.period.double": "Double Length",
|
||||||
|
"symbol.rivencraft.period.double.description": "Use a double-length celestial cycle.",
|
||||||
|
"symbol.rivencraft.phase.nadir": "Nadir Phase",
|
||||||
|
"symbol.rivencraft.phase.nadir.description": "Set the celestial phase to nadir.",
|
||||||
|
"symbol.rivencraft.phase.rising": "Rising Phase",
|
||||||
|
"symbol.rivencraft.phase.rising.description": "Set the celestial phase to rising.",
|
||||||
|
"symbol.rivencraft.phase.zenith": "Zenith Phase",
|
||||||
|
"symbol.rivencraft.phase.zenith.description": "Set the celestial phase to zenith.",
|
||||||
|
"symbol.rivencraft.phase.setting": "Setting Phase",
|
||||||
|
"symbol.rivencraft.phase.setting.description": "Set the celestial phase to setting.",
|
||||||
"symbol.rivencraft.feature.caves": "Caves",
|
"symbol.rivencraft.feature.caves": "Caves",
|
||||||
"symbol.rivencraft.feature.caves.description": "Describe underground cave features.",
|
"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.feature.flowers": "Flowers",
|
||||||
|
"symbol.rivencraft.feature.flowers.description": "Add vanilla flower patches to surface terrain.",
|
||||||
|
"symbol.rivencraft.feature.trees": "Trees",
|
||||||
|
"symbol.rivencraft.feature.trees.description": "Add vanilla plains trees to surface terrain.",
|
||||||
|
"symbol.rivencraft.feature.rocks": "Rocks",
|
||||||
|
"symbol.rivencraft.feature.rocks.description": "Add boulders using a random solid material, or specify one with a block page.",
|
||||||
|
"symbol.rivencraft.feature.huge_trees": "Huge Trees",
|
||||||
|
"symbol.rivencraft.feature.huge_trees.description": "Add vanilla old-growth spruce trees to surface terrain.",
|
||||||
|
"symbol.rivencraft.feature.surface_lakes": "Surface Lakes",
|
||||||
|
"symbol.rivencraft.feature.surface_lakes.description": "Add surface lakes using a random fluid, or specify one with a fluid page.",
|
||||||
|
"symbol.rivencraft.feature.deep_lakes": "Deep Lakes",
|
||||||
|
"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.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",
|
"generator.rivencraft.standard": "Standard",
|
||||||
"generator.rivencraft.amplified": "Amplified",
|
"generator.rivencraft.amplified": "Amplified",
|
||||||
"generator.rivencraft.island": "Island",
|
"generator.rivencraft.island": "Island",
|
||||||
@@ -190,9 +249,21 @@
|
|||||||
"jei.rivencraft.writing.link_panel_hand": "Hold paper and an Ink Vial in opposite hands; use the vial to make a Link Panel.",
|
"jei.rivencraft.writing.link_panel_hand": "Hold paper and an Ink Vial in opposite hands; use the vial to make a Link Panel.",
|
||||||
"jei.rivencraft.ink_mixer": "Ink Mixer",
|
"jei.rivencraft.ink_mixer": "Ink Mixer",
|
||||||
"jei.rivencraft.ink_mixer.usage": "Paper + ink makes a Link Panel. One vial fills 16 ink; each panel uses the configured ink cost. The empty vial returns as a glass bottle.",
|
"jei.rivencraft.ink_mixer.usage": "Paper + ink makes a Link Panel. One vial fills 16 ink; each panel uses the configured ink cost. The empty vial returns as a glass bottle.",
|
||||||
|
"jei.rivencraft.ink_mixer.additive": "Click this additive into the ink basin: %s. Effects roll when the panel is taken.",
|
||||||
|
"jei.rivencraft.ink_mixer.effect": "%s %s%%",
|
||||||
"jei.rivencraft.writing.copy": "At a Writing Desk, select a stored Page, add paper and ink, then take the copy. The source Page stays.",
|
"jei.rivencraft.writing.copy": "At a Writing Desk, select a stored Page, add paper and ink, then take the copy. The source Page stays.",
|
||||||
"jei.rivencraft.writing.bind": "At a Book Binder, name the Age and add a cover plus Link Panel. Optional symbol Pages follow the panel.",
|
"jei.rivencraft.writing.bind": "At a Book Binder, name the Age and add a cover plus Link Panel. Optional symbol Pages follow the panel.",
|
||||||
"jei.rivencraft.writing.linking_book": "Craft one Link Panel Page with leather to make an unwritten Linking Book. Open it to name and bind it.",
|
"jei.rivencraft.writing.linking_book": "Craft one Link Panel Page with leather to make an unwritten Linking Book. Open it to name and bind it.",
|
||||||
"itemGroup.rivencraft": "Rivencraft",
|
"itemGroup.rivencraft": "Rivencraft",
|
||||||
"itemGroup.rivencraft.pages": "Rivencraft Pages"
|
"itemGroup.rivencraft.pages.link": "Rivencraft Link Pages",
|
||||||
|
"itemGroup.rivencraft.pages.terrain": "Rivencraft Terrain Pages",
|
||||||
|
"itemGroup.rivencraft.pages.biome": "Rivencraft Biome Pages",
|
||||||
|
"itemGroup.rivencraft.pages.biome_generation": "Rivencraft Biome Generation Pages",
|
||||||
|
"itemGroup.rivencraft.pages.weather": "Rivencraft Weather Pages",
|
||||||
|
"itemGroup.rivencraft.pages.lighting": "Rivencraft Lighting Pages",
|
||||||
|
"itemGroup.rivencraft.pages.sky": "Rivencraft Sky Pages",
|
||||||
|
"itemGroup.rivencraft.pages.celestial": "Rivencraft Celestial Pages",
|
||||||
|
"itemGroup.rivencraft.pages.block": "Rivencraft Block Pages",
|
||||||
|
"itemGroup.rivencraft.pages.fluid": "Rivencraft Fluid Pages",
|
||||||
|
"itemGroup.rivencraft.pages.feature": "Rivencraft Feature Pages"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.deep_lakes",
|
||||||
|
"description": "symbol.rivencraft.feature.deep_lakes.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:deep_lakes" },
|
||||||
|
"poem": "Nature Flow Static Explore"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.flowers",
|
||||||
|
"description": "symbol.rivencraft.feature.flowers.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:flowers" },
|
||||||
|
"poem": "Nature Grow Color Bloom"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.huge_trees",
|
||||||
|
"description": "symbol.rivencraft.feature.huge_trees.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:huge_trees" },
|
||||||
|
"poem": "Nature Stimulate Spur Elevate"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.lava_lakes",
|
||||||
|
"description": "symbol.rivencraft.feature.lava_lakes.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:lava_lakes" },
|
||||||
|
"poem": "Fire Fluid Basin Transform"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.ravines",
|
||||||
|
"description": "symbol.rivencraft.feature.ravines.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:ravines" },
|
||||||
|
"poem": "Terrain Transform Void Weave"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.rocks",
|
||||||
|
"description": "symbol.rivencraft.feature.rocks.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:rocks" },
|
||||||
|
"poem": "Earth Form Moss Stone"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.surface_lakes",
|
||||||
|
"description": "symbol.rivencraft.feature.surface_lakes.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:surface_lakes" },
|
||||||
|
"poem": "Nature Flow Static Elevate"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.trees",
|
||||||
|
"description": "symbol.rivencraft.feature.trees.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:trees" },
|
||||||
|
"poem": "Nature Grow Life Forest"
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.lighting.bright","description":"symbol.rivencraft.lighting.bright.description","category":"rivencraft:lighting","semantics":{"role":"lighting","value":"bright"},"poem":"Ethereal Sustain Cycle Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.lighting.dark","description":"symbol.rivencraft.lighting.dark.description","category":"rivencraft:lighting","semantics":{"role":"lighting","value":"dark"},"poem":"Ethereal Void Cycle Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.period.double","description":"symbol.rivencraft.period.double.description","category":"rivencraft:celestial","semantics":{"role":"period_modifier","value":2.0},"poem":"Transform Time Cycle Dynamic"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.period.full","description":"symbol.rivencraft.period.full.description","category":"rivencraft:celestial","semantics":{"role":"period_modifier","value":1.0},"poem":"Transform Time Cycle Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.period.half","description":"symbol.rivencraft.period.half.description","category":"rivencraft:celestial","semantics":{"role":"period_modifier","value":0.5},"poem":"Transform Time Cycle Constraint"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.period.zero","description":"symbol.rivencraft.period.zero.description","category":"rivencraft:celestial","semantics":{"role":"period_modifier","value":0.0},"poem":"Transform Time Void Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.phase.nadir","description":"symbol.rivencraft.phase.nadir.description","category":"rivencraft:celestial","semantics":{"role":"phase_modifier","value":0.0},"poem":"Transform Time Void Tradition"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.phase.rising","description":"symbol.rivencraft.phase.rising.description","category":"rivencraft:celestial","semantics":{"role":"phase_modifier","value":90.0},"poem":"Transform Time Flow Tradition"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.phase.setting","description":"symbol.rivencraft.phase.setting.description","category":"rivencraft:celestial","semantics":{"role":"phase_modifier","value":270.0},"poem":"Transform Time Nature Tradition"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.phase.zenith","description":"symbol.rivencraft.phase.zenith.description","category":"rivencraft:celestial","semantics":{"role":"phase_modifier","value":180.0},"poem":"Transform Time Ethereal Tradition"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.sky.end","description":"symbol.rivencraft.sky.end.description","category":"rivencraft:sky","semantics":{"role":"sky","value":"end"},"poem":"Ethereal Void Sky Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.sky.nether","description":"symbol.rivencraft.sky.nether.description","category":"rivencraft:sky","semantics":{"role":"sky","value":"nether"},"poem":"Ethereal Void Sky Transform"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.sky.overworld","description":"symbol.rivencraft.sky.overworld.description","category":"rivencraft:sky","semantics":{"role":"sky","value":"overworld"},"poem":"Ethereal Nature Sky Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.weather.always","description":"symbol.rivencraft.weather.always.description","category":"rivencraft:weather","semantics":{"role":"weather","value":"always"},"poem":"Sustain Flow Cycle Tradition"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.weather.fast","description":"symbol.rivencraft.weather.fast.description","category":"rivencraft:weather","semantics":{"role":"weather","value":"fast"},"poem":"Sustain Dynamic Flow Transform"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.weather.off","description":"symbol.rivencraft.weather.off.description","category":"rivencraft:weather","semantics":{"role":"weather","value":"off"},"poem":"Sustain Void Flow Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.weather.slow","description":"symbol.rivencraft.weather.slow.description","category":"rivencraft:weather","semantics":{"role":"weather","value":"slow"},"poem":"Sustain Dynamic Flow Balance"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"schema_version":2,"name":"symbol.rivencraft.weather.storm","description":"symbol.rivencraft.weather.storm.description","category":"rivencraft:weather","semantics":{"role":"weather","value":"storm"},"poem":"Sustain Nature Flow Dynamic"}
|
||||||
Reference in new issue
Block a user