Public Access
Compare commits
3
Commits
V26.3.0.5
...
V26.3.0.15
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6630ed7ab1 | ||
|
|
d199ac253e | ||
|
|
90e4a98a7a |
No files matched your search
@@ -10,33 +10,26 @@ also lets you author modern terrain, biomes, structures, seasons, and celestial
|
||||
bodies. It is an independently developed project, not a byte-for-byte copy of
|
||||
the 1.12.2 mod.
|
||||
|
||||
Current releases: **1.21.1.0.12** and **26.3.0.15**, with separate Minecraft-specific JARs and saves.
|
||||
|
||||
The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate
|
||||
**Minecraft 26.3 release, 26.3.0.1**, uses Java 25, NeoForge 26.3.0.99 and a
|
||||
first-party Age backend; it does not need Dynamic Dimensions or Bad Packets.
|
||||
It includes authored/seeded Ages, writing stations and collections, libraries,
|
||||
crystal portals, celestials/eclipses, instability and Link Modifier controls.
|
||||
JEI, TerraBlender/Biomes O' Plenty, Serene Seasons and Ruins remain optional.
|
||||
Immersive Portals Reborn 7.0.12 adds live book previews and crystal portal views;
|
||||
animated fallbacks work without it. Random-page eligibility and random-Age glyph
|
||||
descriptions are included. Full 1.21.1 parity and the final expanded-catalog
|
||||
two-client regression remain ongoing. Reborn's Static Sky rendering bug is tracked
|
||||
in [#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116).
|
||||
See the [26.3 guide](ports/mc263/README.md) and
|
||||
[release notes](ports/mc263/RELEASE_NOTES_26.3.0.1.md).
|
||||
Keep the builds and their saves separate, and back up worlds before updating.
|
||||
**Minecraft 26.3 release** uses Java 25, NeoForge 26.3.0.99 and a first-party Age
|
||||
backend; it does not require Dynamic Dimensions or Bad Packets. Both tracks include
|
||||
authored/seeded Ages, writing stations, libraries, crystal portals, celestials,
|
||||
instability and Link Modifier controls. JEI, TerraBlender/Biomes O' Plenty,
|
||||
Serene Seasons and Ruins remain optional. See the [26.3 guide](ports/mc263/README.md)
|
||||
and [parity review](docs/MC263_PARITY_REVIEW.md).
|
||||
|
||||
Minecraft **26.3** is also supported through a separate **Java 25 / NeoForge
|
||||
26.3.0.99** release with a first-party Age backend. See the
|
||||
[26.3 guide](ports/mc263/README.md) and
|
||||
[parity review](docs/MC263_PARITY_REVIEW.md). Keep the game-version JARs and saves
|
||||
separate; 1.21.1 remains supported with its existing dependencies. The guide below
|
||||
describes 1.21.1 unless stated otherwise.
|
||||
|
||||
Current releases: **1.21.1.0.3** and **26.3.0.5**. Both add
|
||||
[Flooded Pages](docs/FLOODED_PAGES.md). The 1.21.1 update also corrects Ink Mixer
|
||||
cost and Flat ground height. Reborn's known 26.3 crashes are tracked in
|
||||
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); full optional
|
||||
Seamless support is planned in [#117](https://git.paddedcell.org/dnorberg/rivencraft/issues/117).
|
||||
These releases add [Accelerated machine ticking](docs/ACCELERATED_MACHINES.md),
|
||||
correct [Writing Desk displays](docs/WRITING_DESK_MODEL.md), restore
|
||||
[Legacy-style dropped-book interaction](docs/DROPPED_BOOKS.md), and use
|
||||
[default block baselines](docs/BLOCK_BASELINE.md) for void/skyblock Overworlds.
|
||||
On 26.3, optional Immersive Portals Reborn or Seamless Portals provides live book
|
||||
and crystal portal views, including look-only exploration in the book panel.
|
||||
Install only one fork; built-in animations work without either.
|
||||
Known Reborn/Seamless crashes and travel disconnects remain tracked in
|
||||
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||
Use matching client/server builds, keep Minecraft tracks separate and back up worlds before updating.
|
||||
|
||||
## Getting started
|
||||
|
||||
@@ -65,7 +58,9 @@ Stand. Crystal formations yield shards for Crystal Blocks. A connected crystal
|
||||
frame with a Book Receptacle and a bound book forms a portal; frames can stand
|
||||
upright or lie flat. Libraries, Book Stands, and portals use Legacy-inspired
|
||||
assets and sounds. Handheld travel drops the used book at the departure point,
|
||||
so plan how you will retrieve it.
|
||||
so plan how you will retrieve it. Dropped books do not pick up on contact:
|
||||
right-click to open one, or shift-right-click to collect it. Ground books use
|
||||
lectern-style previews with interactive exploration disabled.
|
||||
|
||||
## Requirements and optional integrations
|
||||
|
||||
@@ -140,8 +135,7 @@ The JAR is written to `build/libs/`. Development runs need the required mods;
|
||||
see [GameTest guidance](docs/GAMETESTS.md) for focused archived suites.
|
||||
New versions prefix the Minecraft version, followed by the milestone/release
|
||||
slice and fixes/additional-work iteration. For example, `26.3.0.1` produces
|
||||
`rivencraft-26.3.0.1.jar`. Existing 1.21.1 artifacts keep their published legacy
|
||||
numbers until that line's next code release. See the [release workflow](docs/DUAL_VERSION_RELEASE.md).
|
||||
`rivencraft-26.3.0.1.jar`. Both supported tracks now use this scheme. See the [release workflow](docs/DUAL_VERSION_RELEASE.md).
|
||||
|
||||
Rivencraft is licensed under LGPL-3.0-or-later. Legacy-derived material is
|
||||
credited in [NOTICE](NOTICE) and [asset provenance](docs/ASSET_PROVENANCE.md).
|
||||
@@ -0,0 +1,11 @@
|
||||
# Rivencraft 1.21.1.0.10
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Dropped Linking/Descriptive Books no longer auto-pick up on contact.
|
||||
- Right-click opens the existing book GUI; its panel links while leaving the book on the ground.
|
||||
- Shift-right-click picks up using normal ownership, pickup-delay and inventory checks.
|
||||
- Ground-book previews follow lectern behavior: rotating views remain available, interactive exploration is disabled.
|
||||
- Server validates the actual nearby entity, UUID and expected book for actions and previews.
|
||||
- Clients and servers must use matching updated builds.
|
||||
- Includes the prior local Writing Desk and machine-acceleration changes; 1.21.1 also includes universal open-book drop conversion.
|
||||
@@ -0,0 +1,17 @@
|
||||
# Rivencraft 1.21.1.0.12
|
||||
|
||||
Release for Minecraft 1.21.1 / NeoForge 21.1.264 / Java 21.
|
||||
Requires Dynamic Dimensions AR Edition and Bad Packets. Update clients and servers together.
|
||||
|
||||
- Accelerated Pages now also speed up registered server-side machine tickers. Repeated Pages stack within independent configurable machine/candidate budgets. Normal fuel, energy and input costs apply; machines gated by global time may remain limited.
|
||||
- Corrects Writing Desk selected-page placement on the red mat and adds white paper-stack geometry on the right shelf, with up to four layers matching the stored paper count.
|
||||
- Dropped Linking and Descriptive Books do not auto-pick up. Right-click opens the book; shift-right-click collects it with normal ownership, delay and inventory checks. Destination-panel travel leaves the ground book in place.
|
||||
- Ground-book previews follow lectern behavior: rotating previews remain available, interactive exploration is disabled. Server validation rejects stale or remote book actions.
|
||||
- Zero-count Overworld materials use version-specific bundled averages, balancing valuable-block instability with void/skyblock Overworlds. Positive measured counts retain precedence.
|
||||
- Missing modded ores use combined iron/deepslate iron measurements, falling back to bundled iron averages when measured iron is also absent. No extra profiling dimension is generated.
|
||||
- Existing 401 Age / 500 Overworld sampling thresholds, 5% excess allowance, material weights and difficulty controls remain unchanged.
|
||||
- Ordinary dropped books now consistently convert to open-book entities across player, container, station, Disarm and saved-item drop paths, preserving their book data, transform, ownership and metadata.
|
||||
|
||||
Player in-game checks passed for both supported versions. Focused machine probes passed 25 checks (1.21.1) / 26 (26.3), dropped-book interaction probes passed 21 / 23, and baseline policy checks passed 14 per version with source-average audits. The 1.21.1 universal-drop probe passed 62 checks. Writing Desk geometry audit passed 126 face checks. These do not claim a separate automated full client/restart matrix.
|
||||
|
||||
The abandoned reference-world generation probes stalled and were stopped without retry. They are superseded by bundled defaults; no generation pass is claimed for them.
|
||||
@@ -0,0 +1,14 @@
|
||||
# Rivencraft 1.21.1.0.4
|
||||
|
||||
Local test build for issue #108; pending player validation and explicit publication.
|
||||
|
||||
- Trees add ordinary cacti in vanilla and tagged modded deserts.
|
||||
- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes.
|
||||
- Repeated pages add seeded attempts; normal biome decoration remains.
|
||||
- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP
|
||||
Dryland/Lush Desert are included; Cold Desert is unchanged.
|
||||
- Candidate biome, air, ground and bounds checks protect existing blocks.
|
||||
- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior.
|
||||
- Flat Ages now apply these authored vegetation pages as well.
|
||||
|
||||
Shared placement checks passed. See [desert vegetation rules](docs/DESERT_VEGETATION.md).
|
||||
@@ -0,0 +1,13 @@
|
||||
# Rivencraft 1.21.1.0.5
|
||||
|
||||
Local test build for Minecraft 1.21.1; pending player validation and explicit publication.
|
||||
|
||||
- Number Pages immediately before Static Sky set its cells per face in base 25.
|
||||
Default 48; supported range 1–128, with zero and oversized inputs clamped.
|
||||
- Resolution persists across travel/save/reload and synchronizes with clients.
|
||||
Matching updated server/client builds are required.
|
||||
- Static animation timing and tint remain independent; other skies are unchanged.
|
||||
- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated.
|
||||
- Includes the previously validated desert vegetation changes from issue #108.
|
||||
|
||||
Focused checks passed; GPU appearance awaits player validation. See [rules and tests](docs/STATIC_SKY_RESOLUTION.md).
|
||||
@@ -0,0 +1,15 @@
|
||||
# Rivencraft 1.21.1.0.6
|
||||
|
||||
Release for Minecraft 1.21.1 / NeoForge 21.1.264 / Java 21.
|
||||
Requires Dynamic Dimensions AR Edition and Bad Packets. Use matching client/server builds.
|
||||
|
||||
- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes.
|
||||
- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether biome authoring on Cave terrain remains supported.
|
||||
- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Works on Flat terrain, including BOP Dryland and Lush Desert.
|
||||
- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution saves and synchronizes with clients.
|
||||
- New Pages appear in the biome generation Creative tab and optional JEI. Updated tooltips explain the new behavior.
|
||||
- Saves freeze the selected biome family and IDs. Existing frozen pools and generated chunks are not rewritten.
|
||||
|
||||
Player in-game checks passed for both supported Minecraft versions. Focused Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Desert and Static Sky checks also passed.
|
||||
|
||||
Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller.
|
||||
@@ -0,0 +1,11 @@
|
||||
# Rivencraft 1.21.1.0.7
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Accelerated Pages now give ticking server machines extra registered ticker calls.
|
||||
- Repeated Pages stack within separate configurable machine and candidate budgets.
|
||||
- Fair allocation, loaded/ticking chunk checks, world-border/removal checks and tick freeze remain in effect.
|
||||
- No force-loading or entity acceleration; normal Ages and the Overworld are unchanged.
|
||||
- Existing Accelerated Ages gain the behavior without rebinding; saved Page counts are unchanged.
|
||||
- Random-block acceleration retains its own independent budget.
|
||||
- Machine fuel, energy and input costs remain normal; global-time-gated machines may not scale linearly.
|
||||
@@ -0,0 +1,8 @@
|
||||
# Rivencraft 1.21.1.0.8
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Corrects Writing Desk selected-page height and centers it on the red writing mat.
|
||||
- Adds shared white paper-stack geometry on the right shelf, slightly forward, using Legacy's existing desk texture.
|
||||
- Paper count controls up to four staggered layers; attachments follow all desk facings.
|
||||
- Includes the player-validated Accelerated machine support from issue #112.
|
||||
@@ -0,0 +1,11 @@
|
||||
# Rivencraft 1.21.1.0.9
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- All ordinary dropped Linking/Descriptive Books now convert to open-book entities, including unwritten books and saved item drops loaded from disk.
|
||||
- Central queued conversion covers player, container, stand, station and Disarm paths.
|
||||
- Preserves stack components/count, toss position/motion/rotation, pickup delay, ownership and serializable metadata; retains existing open-book lifetime/weather behavior.
|
||||
- Canceled replacement spawning keeps the original; custom books and non-book items are skipped.
|
||||
- Keeps the existing custom pickup-particle copy fix.
|
||||
- Includes the previously player-validated Accelerated machines and Writing Desk model changes.
|
||||
- Minecraft 26.3 already has this drop behavior and is unchanged by this slice.
|
||||
@@ -0,0 +1,81 @@
|
||||
# Accelerated server machines — issue #112
|
||||
|
||||
Introduced in development candidates **1.21.1.0.7** and **26.3.0.11**.
|
||||
Player in-game checks passed; included in releases **1.21.1.0.12** and **26.3.0.15**.
|
||||
|
||||
## Behavior
|
||||
|
||||
Each authored Accelerated Page requests one extra tick per server-side ticking
|
||||
block entity in that Age, in addition to its normal tick. One Page targets 2x
|
||||
normal ticker calls; four target 5x, before budgets. Identical Pages stack.
|
||||
The normal registered bound ticker is reused, including optional modded machines.
|
||||
Its own state validity, chunk-ticking and NeoForge error-handling rules remain active.
|
||||
Entities, scheduled block ticks and the global clock are not accelerated.
|
||||
|
||||
Extra work respects removed/rebound tickers, loaded chunks, normal block-ticking
|
||||
range, world border and server tick freeze. No new chunk tickets are created.
|
||||
Machines in normally ticking force-loaded Age chunks may run without a nearby
|
||||
player. Random-block acceleration remains restricted to its existing player-nearby
|
||||
chunks. The Overworld and Ages without Accelerated Pages receive no extra work.
|
||||
|
||||
The existing authored-plan/page-count save data is unchanged. Existing Accelerated
|
||||
Ages gain machine ticking after installing this build; no new Age is required.
|
||||
Page counts persist through the existing save/reload/reseed paths. Work cursors
|
||||
are transient and reset on reload; they do not alter the saved Page count.
|
||||
|
||||
## Independent budgets
|
||||
|
||||
Both targets expose these settings under accelerated_age:
|
||||
|
||||
| Setting | Default | Meaning |
|
||||
| --- | --- | --- |
|
||||
| max_machine_candidates_per_tick | 1024 | Maximum registered ticker entries inspected in one Age tick, rotating across the list. |
|
||||
| max_machine_ticks_per_tick | 4096 | Maximum extra machine ticker calls per Age tick. Zero disables only machines. |
|
||||
| max_random_tick_attempts_per_tick | 16384 | Existing random block samples; zero disables only random-block acceleration. |
|
||||
| max_loaded_chunks | 8 | Existing random-block chunk cap; not a machine chunk-loading setting. |
|
||||
|
||||
The selected machine window is snapshotted before executing tickers. Work is
|
||||
distributed round-robin across eligible machines rather than letting the first
|
||||
machine use every repeated Page. Removal/replacement/freeze is checked again
|
||||
before each call. Large installations can hit the cap and run slower than the
|
||||
requested multiplier. Both machine settings have an upper bound of 65536.
|
||||
|
||||
## Compatibility limits
|
||||
|
||||
Additional ticker calls also consume normal fuel, energy, inputs and durability.
|
||||
The effect does not synthesize power or bypass recipe requirements. Machines that
|
||||
compare global game time, use once-per-tick guards, async jobs or scheduled work
|
||||
may remain limited to their ordinary rate. Transport may bottleneck independently.
|
||||
No optional machine mod is required or hard-coded.
|
||||
|
||||
## Validation and manual checks
|
||||
|
||||
Run sequentially:
|
||||
python3 scripts/regression_machine112.py mc1211
|
||||
python3 scripts/regression_machine112.py mc263
|
||||
|
||||
These use new disposable worlds and remove them on pass or fail. A 60-second
|
||||
stall stops the run and hands remaining checks to the player, without a retry.
|
||||
Fixtures remain outside shipping artifacts.
|
||||
|
||||
In-game checks, on each target:
|
||||
1. In Survival, compare fuelled furnaces in Ages with zero, one and four Pages.
|
||||
Smelting should be about 10, 5 and 2 seconds per ordinary 200-tick recipe,
|
||||
before machine budgets; use the same input/fuel and avoid other speed effects.
|
||||
2. Repeat with a ticking modded machine (Create on 1.21.1 if available). Record
|
||||
the machine type if it does not accelerate; game-time guards may be a limit.
|
||||
3. Remove and replace a working machine, leave its chunks, return, then restart.
|
||||
No ghost ticking or force-loading should occur. Existing Page counts remain.
|
||||
4. Confirm an ordinary Overworld furnace stays at its normal rate and random-tick
|
||||
crops still accelerate in an Accelerated Age.
|
||||
5. With two players in the same Age, confirm the effect is not doubled by player
|
||||
count. Test tick freeze; machines must stop along with the normal world.
|
||||
|
||||
Automated probes test registered vanilla furnace recipes, zero/one/repeated Pages,
|
||||
freeze, removal/replacement, nonloaded/border guards, a custom registered ticker,
|
||||
Overworld event exclusion, bounded fair work, and saved Page-count decoding.
|
||||
They do not constitute a real modded-machine or two-client/restart pass.
|
||||
|
||||
### Automated result
|
||||
|
||||
Sequential probes passed: **25 checks on 1.21.1**, **26 checks on 26.3**. The freeze check initially exposed a cached runsNormally value immediately after setFrozen; the adapter now checks both the current freeze flag and the tick manager's run state. No test stalled. Both temporary worlds were removed. Player in-game checks subsequently passed; no independent real-mod-machine or two-client/restart result is claimed.
|
||||
@@ -0,0 +1,74 @@
|
||||
# Block-instability baselines
|
||||
|
||||
Issue #115 uses version-specific bundled averages when an individual Overworld
|
||||
material has a measured count of zero. It does not create a reference dimension.
|
||||
|
||||
## Defaults
|
||||
|
||||
The defaults are averaged from the developer's existing Overworld profiles:
|
||||
987 chunks for Minecraft 1.21.1 and 1,024 chunks for Minecraft 26.3.
|
||||
Every sampled chunk contributes to the denominator, including chunks without
|
||||
that block. Ore and deepslate variants retain separate averages.
|
||||
|
||||
The bundled JSON files are:
|
||||
|
||||
- 1.21.1: src/main/resources/assets/rivencraft/instability/default_block_baseline.json
|
||||
- 26.3: ports/mc263/src/main/resources/assets/rivencraft/instability/default_block_baseline.json
|
||||
|
||||
Each records the source sample count and source-export SHA-256. They contain no
|
||||
save path, chunk coordinates, or dependency on the developer's save. Rebuild an
|
||||
average with scripts/generate_block_baseline.py SOURCE_JSON VERSION OUTPUT_JSON.
|
||||
|
||||
## Scoring
|
||||
|
||||
For each watched block:
|
||||
|
||||
1. A positive measured Overworld count uses its actual count divided by sampled chunks.
|
||||
2. A modded ore with zero measured occurrences uses the combined measured
|
||||
iron_ore and deepslate_iron_ore average. If that combined count is zero,
|
||||
it uses the combined bundled iron average. This takes precedence over any
|
||||
modded ore entry in the bundled JSON.
|
||||
3. Other zero-count materials use their own bundled average, or zero if absent.
|
||||
|
||||
The combined bundled iron average is 89.96656534954407 blocks/chunk for 1.21.1
|
||||
and 76.5361328125 blocks/chunk for 26.3. Installed mods remain optional:
|
||||
unused resource IDs do not register blocks or make a mod required.
|
||||
|
||||
The existing readiness requirements remain: at least 401 sampled Age chunks
|
||||
and 500 sampled Overworld chunks. The 5% excess allowance, material weights,
|
||||
difficulty multipliers and score cap are unchanged. The baseline is selected
|
||||
per material, so one absent ore cannot replace all measured Overworld results.
|
||||
Storage blocks and fluids do not receive the modded-ore iron substitution.
|
||||
They use their own measured/default counts.
|
||||
|
||||
Existing saved profiles remain usable. The abandoned reference-source flag is
|
||||
no longer written or read. Existing Ages use this calculation without rebinding.
|
||||
|
||||
## Validation
|
||||
|
||||
The former reference-world generation probes stalled on both versions and were
|
||||
stopped without retry. That implementation and its temporary fixture were
|
||||
removed. Their logs remain under build/verification/baseline115/.
|
||||
|
||||
The replacement is checked without starting a server: regenerate/compare the
|
||||
bundled averages and exercise the production shared Java policy with each
|
||||
version's actual resource. Production builds check both Minecraft integrations.
|
||||
|
||||
Player checks:
|
||||
|
||||
- In a void/skyblock or flat Overworld, enter an Age with valuable generated
|
||||
blocks. Allow the Age and Overworld profiles to reach the existing thresholds.
|
||||
Confirm excess materials produce block instability rather than every missing
|
||||
Overworld ore being compared against zero.
|
||||
- A modded ore absent from the Overworld should use iron, even if the modded
|
||||
ore has an entry in the bundled defaults.
|
||||
- In a normal Overworld, measured positive counts should still take priority.
|
||||
- Reopen the save and verify profiles and scores persist normally.
|
||||
|
||||
Inside the Age, use /rivencraft age instability on 1.21.1 or
|
||||
/rivencraft_port instability status on 26.3 to inspect readiness and scoring;
|
||||
instability scores remain absent from the book GUI. The player reported in-game acceptance on both versions before publication.
|
||||
This is manual acceptance, not a passing result from the abandoned reference-world probes.
|
||||
|
||||
Offline verification: both source-average audits passed; the production shared
|
||||
Java policy passed 14 checks per version. Both production builds passed.
|
||||
@@ -0,0 +1,104 @@
|
||||
# Desert vegetation Pages — issue #108
|
||||
|
||||
Applies to Minecraft 1.21.1 and 26.3. Local test builds: **1.21.1.0.4** and
|
||||
**26.3.0.7**. Minecraft 1.21.1 (including BOP Dryland) passed player validation. The 26.3
|
||||
Flat soil correction awaits player retest; not committed or published.
|
||||
|
||||
## Classification
|
||||
|
||||
The biome tag `rivencraft:desert_vegetation` includes vanilla Desert and the
|
||||
optional common tag `c:is_desert`. No TerraBlender dependency or biome-ID
|
||||
substring guessing is used. In the installed BOP 21.1.0.14 and 26.3.0.0.16
|
||||
assets, Dryland and Lush Desert have that common tag; Cold Desert does not.
|
||||
Cold Desert therefore retains the ordinary non-desert behavior. Hot/dry
|
||||
climate alone does not classify a biome as desert.
|
||||
|
||||
Data packs can extend `data/rivencraft/tags/worldgen/biome/desert_vegetation.json`
|
||||
with additional biome IDs using `replace: false`. The existing exclusion of
|
||||
Nether/End/cave biomes for generic surface vegetation still applies.
|
||||
|
||||
## Authored effects
|
||||
|
||||
| Page | Desert effect per occurrence per chunk |
|
||||
| --- | --- |
|
||||
| Flowers | 16 attempts to place individual dead bushes |
|
||||
| Trees | 8 attempts to place 1–3-block cactus columns |
|
||||
| Huge Trees | 4 attempts to place 5–9-block cactus columns |
|
||||
|
||||
Repeated Pages add independent, deterministic attempts within the existing
|
||||
feature-page limit. Space and ground checks still apply: attempts are not a
|
||||
guarantee of a fixed number of plants. Vanilla biome decoration runs normally
|
||||
before authored vegetation. Non-desert candidates keep the existing vanilla
|
||||
flower, plains-tree and old-growth-spruce features.
|
||||
|
||||
Placement checks the actual candidate biome. Desert writes and neighbor reads
|
||||
stay within the decorating chunk, leave existing structures/plants intact, and
|
||||
require clear air. Cacti require horizontal clearance for their full height.
|
||||
Sand/red sand are preserved. Supported dirt/grass can have just the cactus's
|
||||
base converted to sand, permitting grass-layer Flat Ages without repainting
|
||||
the terrain. Soil over an unsupported block is skipped to avoid falling bases.
|
||||
Dead bushes can grow on supported sand/soil. Other materials are left alone.
|
||||
|
||||
The 1.21.1 Flat generator now applies these three authored plant Pages too;
|
||||
previously that path did not run them. Both versions use the same cactus/bush
|
||||
placement algorithm; version-specific adapters retain their vanilla placement
|
||||
APIs. No new item, recipe, generated texture or hard dependency is introduced.
|
||||
Existing Creative/JEI Pages receive updated tooltip descriptions.
|
||||
|
||||
## Saves
|
||||
|
||||
Only newly decorated chunks change. Existing plants/chunks are not rewritten.
|
||||
Saved written Page order/count and Age seed remain the inputs, with no new
|
||||
saved plan field. Reopening/restarting retains the same placement inputs;
|
||||
it does not rerun decoration on existing chunks.
|
||||
|
||||
## Verification
|
||||
|
||||
Run `python3 scripts/test_desert_vegetation.py` for storage-free checks of all
|
||||
three effects, repeatability, repeated attempts, biome boundaries, chunk
|
||||
bounds, invalid ground, obstruction, Flat base conversion and ceiling limits.
|
||||
Temporary Java outputs are deleted. Test fixtures stay outside production JARs.
|
||||
|
||||
### Player checks, both versions
|
||||
|
||||
1. Create fresh Standard + Desert + Single Biome Ages with a Link Panel and
|
||||
separately Flowers, Trees or Huge Trees. Use a no-feature control and a
|
||||
four-copy version of each page; matching Age seeds improve comparisons.
|
||||
2. Expect additional dead bushes, ordinary cacti, or visibly taller cactus
|
||||
columns respectively. Repeated pages increase attempts; no generic
|
||||
flowers/oak/spruce should be added by these pages in Desert.
|
||||
3. Repeat on Flat + Desert + Single Biome, including the grass-layer surface.
|
||||
Cactus bases may be single sand blocks; other Flat layers remain intact.
|
||||
4. Repeat in BOP Dryland/Lush Desert when installed. Check nearby Plains and
|
||||
Cold Desert keep their previous non-desert behavior.
|
||||
5. Revisit after restart, then explore new chunks. Existing vegetation must
|
||||
remain intact; new chunks should continue the selected behavior.
|
||||
6. Check mixed-biome Ages and occupied/rocky surfaces: vegetation respects the
|
||||
candidate biome, solid obstructions and ground rules.
|
||||
|
||||
No test server or saved test world is required by the offline checks. If a
|
||||
future runtime test stalls, stop it and hand it to the player without retry.
|
||||
|
||||
## 26.3 Flat Dryland regression
|
||||
|
||||
The saved `drybones` Age uses Flat terrain, Single BOP Dryland, and all three
|
||||
plant pages. Its writing and runtime desert tags were correct. In Minecraft
|
||||
26.3, `minecraft:dirt` no longer contains grass blocks; the old soil check
|
||||
therefore rejected the grass surface. The 26.3 adapter now checks both
|
||||
`minecraft:dirt` and `minecraft:grass_blocks`. No 1.21.1 code change was needed.
|
||||
|
||||
An isolated 26.3 server with BOP, TerraBlender and GlitchCore reproduced zero
|
||||
cactus blocks before the fix. With the same seed and pages, the corrected
|
||||
first chunk contained 22 cactus blocks / 15 dead bushes in vanilla Desert and
|
||||
12 cactus blocks / 17 dead bushes in BOP Dryland. These are one-seed observations,
|
||||
not guaranteed densities. The test world and isolated build output were removed;
|
||||
the retained log is `build/verification/desert108/mc263.log`.
|
||||
|
||||
Run `python3 scripts/regression_desert263.py` for this optional-mod runtime
|
||||
check using the local Dev 26.3 mod files. It uses the single-server lock and
|
||||
a 60-second timeout, hands off a stalled test without retry, and removes its
|
||||
temporary world regardless of result.
|
||||
|
||||
## Release validation (2026-11-17)
|
||||
|
||||
Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them.
|
||||
@@ -0,0 +1,126 @@
|
||||
# Open-book drops — issue #114
|
||||
|
||||
Initial conversion slice: local **1.21.1.0.9**, followed by the interaction candidates below.
|
||||
The existing 26.3 conversion was already player-validated and remains unchanged
|
||||
in **26.3.0.12**. That initial conversion slice changed only 1.21.1; the interaction follow-up below changes both versions.
|
||||
|
||||
## Central conversion
|
||||
|
||||
Both targets listen for ordinary ItemEntity joins on the server at LOWEST
|
||||
priority. Linking and Descriptive Books convert regardless of binding state.
|
||||
Pages, Notebooks, folders, portfolios and sealed collections retain ordinary
|
||||
item behavior. Existing DroppedBookEntity instances are skipped.
|
||||
|
||||
A queued server task waits until the original join callback completes. It
|
||||
rechecks the level identity, entity registration/removal and item type, then
|
||||
creates a custom book. The source is discarded only if addFreshEntity accepts
|
||||
the replacement. A canceled source cannot create a ghost replacement; canceled
|
||||
replacement spawning leaves the source intact. Another join/reload may retry.
|
||||
There is no per-tick scan, force-loading, or conversion recursion.
|
||||
|
||||
This covers Q/Ctrl-Q and inventory tosses, container/loot/dispenser-style item
|
||||
spawns, stand/receptacle contents, full-inventory deliveries, death inventory
|
||||
drops, and Disarm. Existing ordinary book entities loaded from disk take the
|
||||
same join path. Books created directly by handheld travel already use the
|
||||
custom type and retain their existing departure placement.
|
||||
|
||||
## State and lifetime
|
||||
|
||||
fromDrop uses Minecraft's native restoreFrom NBT path, copies the full stack and
|
||||
gives the replacement a fresh UUID while the source is still registered. On 1.21.1 the live transform/motion is copied explicitly after NBT loading, which otherwise clamps very high velocities.
|
||||
Position, facing, velocity, pickup delay, owner/thrower, persistent data and
|
||||
serializable entity metadata are retained. Arbitrary tosses do not get the
|
||||
handheld departure constructor's extra height or zero velocity.
|
||||
|
||||
The replacement adopts open-book lifetime (unlimited ordinary ItemEntity age)
|
||||
and the existing slow book decay and rain/water damage. The original ordinary
|
||||
despawn age is intentionally not retained. Normal book entity save/load retains
|
||||
its own decay clock thereafter.
|
||||
|
||||
The 1.21.1 custom copy() override remains intact so client pickup particles keep
|
||||
the custom renderer type.
|
||||
|
||||
## Validation
|
||||
|
||||
Run only the changed target:
|
||||
python3 scripts/regression_drop114.py mc1211
|
||||
|
||||
A disposable server probe exercises native metadata/component copying, bound and
|
||||
unwritten variants, direct joins and NBT-loaded item joins, actual player toss,
|
||||
container drop, stand break/full inventory retrieval, station break, Disarm,
|
||||
inventory death-path drops, already-custom skip, non-book items, cancellation and
|
||||
retry, custom NBT round trip and pickup-copy entity type. Temporary worlds and
|
||||
fixture outputs are removed on pass or fail. Stop and hand off a stalled probe.
|
||||
|
||||
Player checks on 1.21.1:
|
||||
- Q/Ctrl-Q and inventory/cursor tosses for Linking/Descriptive Books, bound and
|
||||
unwritten. Verify open-book orientation, throw motion, pickup delay, name,
|
||||
destination and modifiers.
|
||||
- Break a loaded stand; expect one lectern and exactly one open book. Shift-remove
|
||||
with a full inventory. Repeat with a receptacle and Link Modifier station.
|
||||
- Test death and Disarm drops and handheld travel. Full-inventory Return Link
|
||||
delivery can be checked if automatic Return Links are explicitly enabled.
|
||||
- Leave/reload the chunk and restart with books on the ground. Pick them up and
|
||||
verify no client pickup-particle crash. Pages/collections stay ordinary items.
|
||||
|
||||
An NBT round trip is not a full server restart, and FakePlayer drop paths do not
|
||||
replace real GUI, death, portal or client rendering acceptance.
|
||||
|
||||
## Automated result
|
||||
|
||||
The isolated 1.21.1 server probe passed **62 checks**. High-velocity native NBT loading was accounted for by explicitly retaining live transform/motion. No test stalled; the disposable world and fixture build outputs were deleted. The production build passes. No new 26.3 code or tests were run for this root-only change. Player acceptance was subsequently reported; included in 1.21.1.0.12.
|
||||
|
||||
|
||||
## Legacy-style interaction follow-up
|
||||
|
||||
Candidates **1.21.1.0.10** and **26.3.0.13** add:
|
||||
- Walking over a custom dropped book never picks it up.
|
||||
- Right-click opens the existing Linking/Descriptive Book GUI. Clicking its
|
||||
destination panel uses normal linking rules and leaves the same book in place.
|
||||
- Shift-right-click explicitly attempts normal item pickup, respecting ownership,
|
||||
pickup delay, inventory capacity and NeoForge pickup hooks. A full inventory
|
||||
leaves the book in the world. This uses inventory pickup rather than Legacy's
|
||||
special empty-hand assignment.
|
||||
- Ground books use the lectern-style view: rotating destination previews are
|
||||
supported, **interactive exploration is disabled**. GUI input closes if the
|
||||
entity disappears or moves out of reach.
|
||||
- Unwritten dropped books retain their naming/binding screens. The server
|
||||
resolves and updates the actual nearby entity, never a held item.
|
||||
- ID + UUID + expected full stack + alive/range checks reject stale, replaced,
|
||||
picked-up or remote source actions. Normal travel rules and 26.3 catalog
|
||||
acknowledgement remain in effect. Preview leases on 26.3 also validate the
|
||||
dropped entity and distinguish it from hands/stands.
|
||||
|
||||
Reviewed local Legacy EntityLinkbook interaction bytecode. Legacy uses sneaking
|
||||
and an empty hand for direct hand pickup, otherwise opens BOOK_ENTITY. Rivencraft
|
||||
keeps the requested gesture but uses existing pickup permissions/hooks.
|
||||
|
||||
New dropped-action/open-screen payloads reuse existing screens and binding/travel
|
||||
helpers. 1.21.1 networking protocol is 20; 26.3 book-network registration is 2.
|
||||
The 26.3 preview request adds an optional dropped-entity UUID with a default
|
||||
constructor for existing hand/stand callers. Update clients and servers together.
|
||||
|
||||
Sequential isolated interaction probes exercise no-contact pickup, normal open,
|
||||
explicit pickup with owner/delay/full-inventory checks, stale/forged/remote source
|
||||
rejection, actual binding helper dispatch, teleport request dispatch without
|
||||
duplicating/removing the ground book, and packet codec round trips. The fixture
|
||||
captures teleport requests because FakePlayer's connection intentionally ignores
|
||||
teleports. It does not establish real client rendering or dimension transition.
|
||||
The 26.3 fixture acknowledges its catalog explicitly; there is no production bypass.
|
||||
|
||||
Player checks on both versions:
|
||||
1. Drop bound Linking and Descriptive Books. Walk over each: no pickup.
|
||||
2. Right-click: normal book GUI, rotating preview when its optional renderer is
|
||||
available, and no usable interactive-view control. Click the destination panel
|
||||
to travel. Return and verify the same book remains.
|
||||
3. Shift-right-click to collect, including a full inventory and a fresh toss's
|
||||
pickup delay. Confirm contents/title/modifiers remain intact.
|
||||
4. Try unwritten books, input names/bind and reopen. Check changing/removing the
|
||||
ground book while its GUI is open closes it safely.
|
||||
5. Check reload/restart, ordinary held/stand book GUIs and optional live previews.
|
||||
|
||||
### Follow-up automated result
|
||||
|
||||
Interaction probes passed sequentially: **21 checks on 1.21.1, 23 on 26.3**. No stall occurred; temporary worlds were deleted. Dedicated-server startup caught and corrected eager client-screen class loading on 1.21.1; client handling now uses a deferred lambda. The fixtures capture teleport dispatch and simulate the 26.3 catalog acknowledgement; the player subsequently reported in-game acceptance on both versions. No independent automated full client/restart matrix is claimed. Logs remain in build/verification/drop_interactions.
|
||||
|
||||
The complete interaction update is included in releases **1.21.1.0.12** and **26.3.0.15**.
|
||||
@@ -111,3 +111,7 @@ the Reborn acknowledgement guard. Both player checks passed; publication was
|
||||
explicitly authorized. Reborn is not crash-free: #118 remains open. #117 owns
|
||||
full Seamless support. #116 was user-closed as resolved. Prior dated evidence
|
||||
above remains historical; unchanged earlier artifacts are not relabeled.
|
||||
|
||||
## 2026-11-17 release update
|
||||
|
||||
Player-approved 1.21.1.0.6 and 26.3.0.10 collect #108 desert vegetation, #109 Static Sky resolution and #111 Native biome families. The 26.3 release also includes #117 optional Seamless live rendering. #118 remains open for Reborn/Seamless failures, including the recovered caves_on_top acknowledgement disconnect. Both JARs retain their player-tested hashes.
|
||||
@@ -0,0 +1,139 @@
|
||||
# Native biome families — issue #111
|
||||
|
||||
Release builds: **1.21.1.0.6** and **26.3.0.10**. Player in-game validation passed on both versions (2026-11-17).
|
||||
|
||||
## Pages and terrain
|
||||
|
||||
| Controller Page | Biome selection |
|
||||
| --- | --- |
|
||||
| Native | Existing terrain default. On new Cave Ages, non-Nether cave biomes only. |
|
||||
| Native Caves | All recognized non-Nether caves, using seeded regional placement. |
|
||||
| Native Nether | All recognized Nether biomes, using seeded regional placement. |
|
||||
| Native End | All recognized End biomes, using seeded regional placement. |
|
||||
|
||||
The three explicit family controllers work with Standard, Amplified, Island,
|
||||
Cave, Flat and Void terrain. The **Terrain Page still controls geometry**.
|
||||
Void stays empty; its biomes can affect weather and seasons. These controllers
|
||||
do not select a sky style, dimension type or season.
|
||||
|
||||
The player chose **seeded regional layout including modded biomes** for Native
|
||||
Nether/End, rather than vanilla climate or End-island placement. The family
|
||||
controllers use the established Native Cave/Tiny regional scale (16-block
|
||||
base cells), across the whole frozen family pool. A single available biome
|
||||
uses a FixedBiomeSource.
|
||||
|
||||
Native controllers select their own pool. Individual biome Pages before one
|
||||
retain the existing conflict/recovery rule: the manual biome entries are
|
||||
discarded and instability applies. To choose/weight individual Nether biomes
|
||||
on Cave terrain, use Single/Tiled/region controllers as before.
|
||||
|
||||
## Classification
|
||||
|
||||
- Caves: `rivencraft:cave_biomes`, including optional `c:is_cave`, plus
|
||||
recognized vanilla cave keys. 26.3 retains its new **Sulfur Caves** biome.
|
||||
- Nether: `minecraft:is_nether` **or** membership in a TerraBlender Nether
|
||||
region. No mod-specific name list or namespace heuristic is used.
|
||||
- End: `minecraft:is_end` and known vanilla End members. TerraBlender exposes
|
||||
Overworld and Nether regions, not an End region in either supported API.
|
||||
- Nether classification wins over Cave tagging for Native Caves, including
|
||||
a biome that belongs to a Nether region but lacks `is_nether`.
|
||||
- TerraBlender's internal deferred placeholder is never a native-family biome.
|
||||
|
||||
Family pools are sorted and deduplicated. Vanilla family members provide safe
|
||||
fallbacks when broad tags are empty; Cave fallbacks are still checked against
|
||||
Nether classification. A one-biome pool remains valid. If no cave family member
|
||||
can be used at all, a registered non-Nether biome is the last-resort safety
|
||||
fallback; an entirely unusable registry reports a binding error.
|
||||
|
||||
The broader Cave-compatible authoring pool is preserved. Explicit Nether
|
||||
biome Pages on Cave terrain remain legal and retain existing materials.
|
||||
Other terrain eligibility and non-Native distributions are not filtered by
|
||||
this new default-pool rule.
|
||||
|
||||
## Random Ages and persistence
|
||||
|
||||
Ordinary random-Age controller ranks remain unchanged. When random or
|
||||
seed-completed writing resolves to Cave terrain + Native, its new pool excludes
|
||||
Nether biomes. The new family Pages are explicit authoring choices; they are
|
||||
not added as extra rank tickets to the random controller deck.
|
||||
|
||||
The selected family is saved separately from the existing NATIVE distribution
|
||||
enum, so seeded distribution ordinals/ranks do not change.
|
||||
|
||||
- Authored 1.21.1 plans save optional `NativeKind` with their frozen biome IDs.
|
||||
- New random Native Cave Ages in 1.21.1 generation version **18** also save
|
||||
`RandomBiomes` in the Age definition. Spawn updates and reseeding retain it.
|
||||
- 26.3's existing frozen biome plan saves optional `native_kind`. Random Native
|
||||
Cave Ages now explicitly freeze the CAVES family.
|
||||
- Missing family fields on old saves mean TERRAIN and **do not re-filter the
|
||||
old list**. Existing frozen Cave pools containing Nether biomes are preserved.
|
||||
- Unplanned generation-16/17 Native Cave Ages retain their prior broad pool
|
||||
algorithm; older Ages retain their existing legacy generator. They are not
|
||||
silently migrated to the new family default.
|
||||
- Regions use the Age seed; reseeding can change spatial placement in future
|
||||
chunks while retaining the selected IDs. Existing chunks are not rewritten.
|
||||
|
||||
On 26.3, authored noise-terrain generation can now construct a vanilla noise
|
||||
baseline when the primary Overworld is Flat/custom rather than a Noise generator.
|
||||
This allows the independent Native-family/terrain pairing in that setup instead
|
||||
of failing with “Overworld generator cannot accept authored noise settings.”
|
||||
The existing path for an ordinary noise Overworld is unchanged. Issue #115's
|
||||
separate material-abundance baseline work is not completed by this fix.
|
||||
|
||||
## Creative, JEI and loot policy
|
||||
|
||||
All three new JSON-backed controllers enter the existing **biome generation**
|
||||
Creative category and optional JEI page feed. Glyphs use the existing component
|
||||
renderer and poems; no new generated texture or recipe is needed.
|
||||
Native/Cave tooltips explain the default-pool rule.
|
||||
|
||||
Page allow/block lists categorize the new IDs as biome controllers, separately
|
||||
from individual biome IDs. Manual authoring is still unaffected by those lists.
|
||||
Normal library eligibility can expose the new Pages; Age-only loot uses the
|
||||
Age's own written/result Pages.
|
||||
|
||||
## Verification
|
||||
|
||||
Run one target at a time:
|
||||
|
||||
```sh
|
||||
python3 scripts/regression_native111.py mc1211
|
||||
python3 scripts/regression_native111.py mc263
|
||||
python3 scripts/regression_native111.py mc1211 --biome-mods
|
||||
python3 scripts/regression_native111.py mc263 --biome-mods
|
||||
```
|
||||
|
||||
The optional-mod checks use the installed Dev instance's BOP/TerraBlender/
|
||||
GlitchCore JARs. Every run uses the host-wide server lock, a new temporary
|
||||
world, isolated fixture output and a 60-second stall handoff. Worlds and fixture
|
||||
outputs are deleted on pass or fail; logs remain in
|
||||
`build/verification/native111/`. The fixture code is not shipped in the mod
|
||||
or added to the default GameTest deck.
|
||||
|
||||
Results: **91 checks per version without biome mods; 94 per version with
|
||||
BOP/TerraBlender**. Coverage includes:
|
||||
|
||||
- All three explicit family controllers on all six terrains.
|
||||
- Explicit Native, seed-completed Native and random Native Cave selection.
|
||||
- Overlapping Cave/Nether tags, region-only Nether membership, empty-tag
|
||||
fallback, a valid single-cave saved pool and optional-mod absence.
|
||||
- Explicit Crimson Forest + Cave + Single authoring.
|
||||
- Frozen plan/codec and root random-Age registry save/load behavior.
|
||||
- Preservation of an older mixed Cave/Nether snapshot without a family field.
|
||||
- Controller-policy categories, last-controller recovery, and new Creative/JEI index entries.
|
||||
- 26.3 runtime source overrides on Standard, Void and Cave, including a Flat
|
||||
primary world. Actual world appearance remains player validation.
|
||||
|
||||
### Player checks — both versions
|
||||
|
||||
1. Create **Cave + Native** Ages and explore: no Nether biomes should be selected.
|
||||
Revisit after restart; the chosen cave pool should remain stable.
|
||||
2. Try Native Caves, Native Nether and Native End with Standard or Flat terrain.
|
||||
Confirm their biome IDs and normal travel, including optional BOP biome IDs.
|
||||
3. Try those family Pages on Void terrain: no terrain should be added solely
|
||||
by the controller. Biome-based weather/season behavior can still apply.
|
||||
4. Create **Cave + Crimson Forest + Single** to confirm explicit Nether authoring
|
||||
still works. Native End on Cave should also bind through the explicit family.
|
||||
5. Verify all three Pages appear under biome generation in Creative and JEI.
|
||||
6. Reopen an older Native Cave Age if available. Its saved mixed pool is kept;
|
||||
create a new Age to test the new default rather than expecting migration.
|
||||
@@ -1,10 +1,7 @@
|
||||
# Publishing Rivencraft with the Gitea, Modrinth, and CurseForge APIs
|
||||
|
||||
The local helper is [`scripts/publish_mod_sites.py`](../scripts/publish_mod_sites.py).
|
||||
It previews a release unless `--publish` is explicitly supplied. The current
|
||||
configuration is for the Minecraft **26.3** artifact only. The 1.21.1 line needs
|
||||
its required external dependencies mapped on both sites before API publishing
|
||||
is enabled for it.
|
||||
It previews a release unless `--publish` is explicitly supplied. Both Minecraft **1.21.1** and **26.3** are supported. The publisher maps required Dynamic Dimensions AR Edition and Bad Packets dependencies for 1.21.1; 26.3 uses its first-party backend.
|
||||
|
||||
## One-time token setup
|
||||
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
# Rivencraft
|
||||
|
||||
*Write a book. Name an Age. Step into a world that did not exist before.*
|
||||
|
||||
Rivencraft brings the book-writing and dimension-travelling spirit of Mystcraft to **Minecraft 1.21.1 and Minecraft 26.3 on NeoForge**. Collect and arrange Symbol Pages to author an Age, or bind a Link Panel alone to discover a random world. Explore libraries, build crystal portals, and contend with instability when your writing asks too much of an Age.
|
||||
|
||||
Rivencraft is an independent community project inspired by Mystcraft Legacy—not an official Mystcraft release or a byte-for-byte copy.
|
||||
|
||||
## Minecraft versions
|
||||
|
||||
Rivencraft is available for **Minecraft 1.21.1 and 26.3**. Both versions include authored and random Ages, Symbol Pages, writing stations, libraries, crystal portals, and instability. Download the file matching your Minecraft version and install matching builds on clients and servers.
|
||||
|
||||
| Minecraft | NeoForge | Java | Required companion mods |
|
||||
| --- | --- | --- | --- |
|
||||
| **1.21.1** | 21.1.264 or newer in the 21.1 line | **21** | Dynamic Dimensions AR Edition and Bad Packets |
|
||||
| **26.3** | 26.3.0.99 | **25** | None; Rivencraft includes its own Age-loading backend |
|
||||
|
||||
The Minecraft tracks use separate builds and saves. Cross-version world migration is not supported.
|
||||
|
||||
See the [installation guide](https://git.paddedcell.org/dnorberg/rivencraft/wiki/Installation), [26.3 guide](https://git.paddedcell.org/dnorberg/rivencraft/src/branch/main/ports/mc263/README.md), and [latest releases](https://git.paddedcell.org/dnorberg/rivencraft/releases).
|
||||
|
||||
## What you can do
|
||||
|
||||
- Write Descriptive Books with pages for terrain, biomes, weather, seasons, sky colors, celestials, structures, decorations, and more.
|
||||
- Explore randomly generated Ages and discover pages in Age libraries.
|
||||
- Store and arrange pages in Notebooks; copy pages at the Writing Desk with paper and ink.
|
||||
- Travel with Linking Books, Book Stands, and crystal-frame portals.
|
||||
- Experience Legacy-inspired instability, including decay and environmental hazards.
|
||||
- Preview destinations with the built-in Legacy-style animation or an optional rendering integration for your Minecraft version.
|
||||
- Set an Age’s water level with Flooded and Number Pages.
|
||||
- Select Native Caves, Nether or End biome pools independently of terrain, grow desert vegetation with Trees/Huge Trees/Flowers, and control Static Sky resolution with Number Pages.
|
||||
|
||||
## Getting started
|
||||
|
||||
1. Craft an Ink Vial, Ink Mixer, Writing Desk, and Book Binder.
|
||||
2. Put paper and ink in the Ink Mixer to make a Link Panel Page. Modifier ingredients can change how the link behaves.
|
||||
3. Put leather or an empty Notebook and the Link Panel in the Book Binder. Name the Age and take its Descriptive Book. Add Symbol Pages to author the Age; a Link Panel alone creates a seeded random Age.
|
||||
4. Open the book, then click its destination preview to travel. Bring a bound Linking Book for the return trip—automatic Return Links are disabled by default.
|
||||
|
||||
## Installation and optional integrations
|
||||
|
||||
For **Minecraft 1.21.1**, install **[Dynamic Dimensions AR Edition 0.9.1](https://www.curseforge.com/minecraft/mc-mods/dynamicdimension-ar-edition)** and **[Bad Packets 0.8.2](https://www.curseforge.com/minecraft/mc-mods/badpackets)** alongside Rivencraft on clients and servers. **Minecraft 26.3 does not require either companion mod.**
|
||||
|
||||
Optional integrations include **JEI**, **TerraBlender** and compatible biome mods such as Biomes O’ Plenty, **Serene Seasons** with GlitchCore, and **Ruins**. Use each integration’s Minecraft-specific files. Rivencraft’s core gameplay works without these optional mods. Ecliptic Seasons is not currently supported.
|
||||
|
||||
Destination previews depend on the Minecraft version:
|
||||
|
||||
- **1.21.1:** optional Create/Ponder snapshots or Immersive Portals live views.
|
||||
- **26.3:** optional **Immersive Portals Reborn or Seamless Portals** live book and crystal-portal views, including look-only exploration inside the book panel. Install only one fork per instance. **Known Reborn/Seamless crashes and travel disconnects remain under investigation:** [issue #118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||
|
||||
Built-in animated previews remain available without a portal renderer. Create/Ponder scenes are not currently included in the 26.3 build.
|
||||
|
||||
Back up the **entire world folder** before changing versions, data packs, or biome mods. Age definitions and dimension data must be restored together.
|
||||
|
||||
## Community, issues, and wiki
|
||||
|
||||
Rivencraft is developed at [BlackSheep Git](https://git.paddedcell.org/dnorberg/rivencraft). Please [report bugs or suggest features](https://git.paddedcell.org/dnorberg/rivencraft/issues) there. Want to help document Ages, pages, and crafting? Visit the [Rivencraft wiki](https://git.paddedcell.org/dnorberg/rivencraft/wiki) to contribute, or open an issue with guide ideas and corrections.
|
||||
|
||||
## Thanks and attribution
|
||||
|
||||
Heartfelt thanks to **XCompWiz**, the original creator of Mystcraft, for making such a wonderful mod and inspiring years of exploration and creative world-writing. Please visit the original [Mystcraft](https://www.curseforge.com/minecraft/mc-mods/mystcraft) and his early, unfinished [Mystcraft 2](https://www.curseforge.com/minecraft/mc-mods/mystcraft-2). Rivencraft is independent and is not endorsed by the original Mystcraft team. Selected Legacy-derived assets are credited in the project's NOTICE and asset-provenance document. Rivencraft is licensed under LGPL-3.0-or-later.
|
||||
@@ -19,3 +19,10 @@ former behavior or loader version.
|
||||
audits are intentionally retained for source attribution and migration
|
||||
history; these three entry points replace the former practice of treating
|
||||
every dated task note as a current installation guide.
|
||||
|
||||
## Current cross-version updates
|
||||
|
||||
- [Accelerated machines](ACCELERATED_MACHINES.md)
|
||||
- [Writing Desk display model](WRITING_DESK_MODEL.md)
|
||||
- [Dropped books](DROPPED_BOOKS.md)
|
||||
- [Void/skyblock block baselines](BLOCK_BASELINE.md)
|
||||
@@ -0,0 +1,136 @@
|
||||
# Optional Seamless Portals integration — issue #117
|
||||
|
||||
Local candidate **26.3.0.9**, Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||
Pending real-client validation; not committed or published. Minecraft 1.21.1
|
||||
is unchanged by this issue.
|
||||
|
||||
## Supported engines and API boundary
|
||||
|
||||
Install **one** portal fork per instance:
|
||||
|
||||
- Seamless Portals **1.0.0**, installed file `seamlessportals-neoforge-1.0.0.jar`.
|
||||
- Immersive Portals Reborn **7.0.12**, retaining its previously implemented path.
|
||||
- Neither: Rivencraft's animated panels/surfaces and ordinary travel remain.
|
||||
|
||||
The actual installed Seamless JAR was inspected and compiled against, not
|
||||
assumed compatible from its name. Used public GUI rendering, WorldRenderInfo
|
||||
builder, chunk-loader and PortalAPI signatures match Reborn. ClientWorldLoader
|
||||
and Portal have additional fork-specific members; Rivencraft does not use those
|
||||
differences for live views. The native dimension adapter still uses each fork's
|
||||
own `DimIdSyncPacket.createFromServer` factory and wire format.
|
||||
|
||||
The existing Reborn implementation has been renamed into shared
|
||||
`ImmersiveBookPreviews`, `ImmersivePreviewChunks`, `ImmersiveLiveBookPanel`,
|
||||
`ImmersiveCrystalPortals` and `ImmersiveCrystalView` classes. No second copy
|
||||
of the rendering, destination, chunk-stream or mesh algorithms was introduced.
|
||||
Optional API references remain behind availability guards; neither fork is
|
||||
bundled or required.
|
||||
|
||||
The Reborn acknowledgement workaround is still **Reborn-only**. This change
|
||||
does not resolve or establish a root cause for the Reborn crashes in
|
||||
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||
|
||||
## Configuration
|
||||
|
||||
In `config/rivencraft-local.toml`:
|
||||
|
||||
```toml
|
||||
[book_previews]
|
||||
seamless_live_views = true
|
||||
seamless_crystal_live_views = true
|
||||
reborn_live_views = true
|
||||
reborn_crystal_live_views = true
|
||||
```
|
||||
|
||||
The active fork uses its own switches. The existing Reborn preferences keep
|
||||
their meanings; Seamless defaults to enabled. Book views are a local client
|
||||
choice. Crystal views are server-controlled. Disable the relevant switch for
|
||||
animated fallback; portal/book travel remains Rivencraft's responsibility.
|
||||
|
||||
## Books
|
||||
|
||||
Both Linking and Descriptive Books request a rotating live destination panel.
|
||||
Stand books get the panel without exploration. The handheld eye enters
|
||||
look-only exploration inside the book window; movement is disabled, and
|
||||
right-click returns to ordinary book controls. The camera starts at the linked
|
||||
arrival eye position. Missing/unready destination chunks retain the animation.
|
||||
|
||||
Each player has one validated preview stream, tied to source world, held or
|
||||
stand book and session UUID. Requests are rate limited. A 30-second lease is
|
||||
renewed by the open book and released on close, logout, dimension changes,
|
||||
invalid source book, expiry and shutdown. Late responses cannot overwrite a
|
||||
newer book session.
|
||||
|
||||
Only one GUI render target task is queued at once. The target stays alive
|
||||
across deferred GUI frames rather than being destroyed while still referenced.
|
||||
The shared engine hook clears the remote target before rendering and restores
|
||||
the player's local camera afterward. Remote book-world sounds are filtered;
|
||||
source rain/audio and camera restoration remain explicit player checks.
|
||||
|
||||
## Crystal portals
|
||||
|
||||
Native portals are render-only: Rivencraft portal cells retain travel,
|
||||
cooldowns, link properties and destination safety rules. Connected cells are
|
||||
grouped into one coplanar masked mesh per side of an opening, not repeated
|
||||
per-block views. The linked standing eye position maps through the native
|
||||
transform onto the actual destination eye position; the frame sits in front
|
||||
of the live view.
|
||||
|
||||
A complete native surface disables the fallback texture. Missing/disabled
|
||||
native views retain it. Receptacle maintenance restores views after reload;
|
||||
book removal/frame shutdown removes native entities. Existing ownership tags
|
||||
are preserved so maintenance can find saved views rather than duplicate them.
|
||||
|
||||
## Automated and player validation
|
||||
|
||||
The isolated `scripts/regression_portal117.py` probe accepts `none`,
|
||||
`seamless --jar /path/to/seamless.jar`, or `reborn`. Run each separately;
|
||||
the host-wide server lock prevents overlap. Every run uses a new temporary
|
||||
world, removes it and fixture outputs regardless of result, and retains a log
|
||||
under `build/verification/portal117/`. A 60-second stall is stopped and handed
|
||||
to the player without retry.
|
||||
|
||||
The fixture explicitly warms a forced test chunk before querying native
|
||||
entities. An unticked startup chunk does not expose its entities through the
|
||||
normal spatial query. Portal widths/heights use the engine's W/H axes, which
|
||||
can swap relative to world X/Y; assertions check world-space spans and the
|
||||
actual eye transform.
|
||||
|
||||
Final sequential server results: **24 checks passed with Seamless, 24 with
|
||||
Reborn, and 8 with neither**. Earlier fixture assertions were corrected for
|
||||
entity-section visibility and native axis ordering; no stalled run was retried.
|
||||
|
||||
Server checks cover dynamic Age registration/catalog synchronization, six-cell
|
||||
frame formation, one mesh per side, correct physical spans, exact eye mapping,
|
||||
non-teleporting/non-interactive native surfaces, refresh reuse, config fallback,
|
||||
reactivation and cleanup. They do **not** verify GPU output, connected preview
|
||||
leases, multiplayer packet delivery, or real-client restart behavior.
|
||||
|
||||
### Required player matrix
|
||||
|
||||
Use Seamless alone with Rivencraft 26.3.0.9 on both ends:
|
||||
|
||||
1. Bind a new Descriptive Book, open/close it repeatedly and link through it.
|
||||
Compare the live view with the real destination.
|
||||
2. Test a Linking Book and a stand book. Confirm the panel stays inside the
|
||||
book and stands have no eye exploration.
|
||||
3. Enter handheld exploration, look around, right-click out, re-enter, close
|
||||
and reopen. Confirm no movement or full-screen view, and local rain/audio
|
||||
remain correct.
|
||||
4. Form a multi-block crystal opening. Check one continuous view, frame
|
||||
occlusion, no fallback overlay, matching arrival position/facing, and travel.
|
||||
5. Remove/reinsert the book and break/rebuild the frame; no orphan views.
|
||||
6. Reconnect and fully restart. Check saved books, previews and portal
|
||||
reactivation, including initially unloaded destination chunks.
|
||||
7. Explore across chunk boundaries for a sustained period. Do not assume
|
||||
Seamless is free of the Reborn renderer problem without testing.
|
||||
8. On a dedicated server, check two players using different books/portals,
|
||||
closing/logging out independently, and creating a new Age after joining.
|
||||
9. Disable each Seamless switch and verify its animated fallback and normal
|
||||
travel. No portal mod and Reborn are separate regression configurations.
|
||||
|
||||
Inspected Seamless artifact SHA-256: `5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0`.
|
||||
|
||||
## Release validation (2026-11-17)
|
||||
|
||||
Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them.
|
||||
@@ -0,0 +1,102 @@
|
||||
# Static Sky resolution — issue #109
|
||||
|
||||
Local test builds: **Minecraft 1.21.1 / 1.21.1.0.5** and **Minecraft 26.3 /
|
||||
26.3.0.8**. Pending player validation; not committed or published.
|
||||
|
||||
## Authoring
|
||||
|
||||
Place one or more Number Pages **immediately before Static Sky**. Digits are
|
||||
0–24 in base 25, as with Flooded. No Number Pages means the existing **48 × 48
|
||||
cells on each of six faces**.
|
||||
|
||||
| Written sequence | Resolution on each face |
|
||||
| --- | --- |
|
||||
| Static Sky | 48 × 48 |
|
||||
| Number 0 → Static Sky | 1 × 1 (minimum) |
|
||||
| Number 8 → Static Sky | 8 × 8 |
|
||||
| Number 24 → Static Sky | 24 × 24 |
|
||||
| Number 1 → Number 23 → Static Sky | 48 × 48 |
|
||||
| Number 5 → Number 3 → Static Sky | 128 × 128 (maximum) |
|
||||
| Number 24 → Number 24 → Static Sky | 128 × 128 (624 clamps) |
|
||||
|
||||
Any intervening non-number Page breaks the digit run. A Number followed by a
|
||||
color still modifies that color, not the later sky. Other Sky styles do not
|
||||
consume resolution numbers. Duplicate Sky controllers retain the existing
|
||||
last-choice recovery and instability rules; the final unnumbered Static Sky
|
||||
returns to 48. Dangling/misplaced numbers retain their usual diagnostics.
|
||||
|
||||
Higher values make smaller cells. Resolution does not change the animation
|
||||
cadence, colors, celestial geometry, terrain or lighting. Random/unmodified
|
||||
Static Ages retain 48; no new Page or recipe is added. Creative and JEI use
|
||||
the existing Static Sky and Number items, with updated tooltips.
|
||||
|
||||
## Persistence and synchronization
|
||||
|
||||
- **1.21.1:** derive resolution from the persisted ordered semantic writing,
|
||||
include it in AgeSkyProfile and its server-to-client sky payload.
|
||||
- **26.3:** freeze resolution in the existing presentation settings record
|
||||
(PortAgeColors), save optional `static_resolution` in the Age index and
|
||||
synchronize it with the full Age catalog. Old records without the field
|
||||
default to 48.
|
||||
- Require matching updated client/server builds: sky payload protocol is 19
|
||||
on 1.21.1 and Age catalog protocol is 12 on 26.3.
|
||||
- No existing chunks or writing are rewritten. Existing unnumbered Static
|
||||
Ages retain their old appearance. Save/revisit/reconnect/restart preserve
|
||||
newly authored settings.
|
||||
|
||||
## Render bounds and lifecycle
|
||||
|
||||
Shared bounds are **1–128** cells per face, including the constructors and
|
||||
client render entry points. Long digit runs saturate safely before clamping.
|
||||
|
||||
The 1.21.1 procedural renderer draws at most 98,304 quads (393,216 vertices),
|
||||
roughly 6 MiB of position/color vertex data per draw. The bound limits its
|
||||
existing per-cell work; the normal 48 setting is unchanged.
|
||||
|
||||
The 26.3 renderer keeps one 24-vertex cube. Its current noise atlas is at most
|
||||
768 × 128 RGBA pixels (384 KiB of image data). It creates a replacement only
|
||||
when the extracted resolution changes, closes the previous texture, invalidates
|
||||
the frame/tint cache, and reuses the cube. World metadata is read during
|
||||
extraction, never during drawing. Extracted state resets to 48; renderer close
|
||||
releases both GPU resources. No growing per-Age texture cache is introduced.
|
||||
|
||||
## Automated checks
|
||||
|
||||
Run separately, sequentially:
|
||||
|
||||
```sh
|
||||
python3 scripts/regression_static109.py mc1211
|
||||
python3 scripts/regression_static109.py mc263
|
||||
```
|
||||
|
||||
These use the server lock, isolated startup fixtures and new temporary worlds,
|
||||
with a 60-second stall handoff. They delete worlds and fixture outputs on
|
||||
success or failure and retain logs in `build/verification/static109/`.
|
||||
The probes do not enter the production JAR or default GameTest suite.
|
||||
|
||||
Results: 34 checks passed on 1.21.1 and 42 on 26.3 for unmodified/default,
|
||||
zero, single and multi-digit writing, bounds, ordering, saved plan/codec and
|
||||
full packet/catalog round trips, independent color, old-save defaults,
|
||||
non-Static behavior and unchanged Flooded digit grammar. Actual GPU appearance
|
||||
and preview interactions remain player checks.
|
||||
|
||||
## Player checks — both versions
|
||||
|
||||
1. Bind fresh Ages with Static Sky alone, Number 8 + Static Sky, Number 24 +
|
||||
Static Sky, and Number 5 + Number 3 + Static Sky. Prefer the same remaining
|
||||
Pages and an explicit celestial choice to make comparison straightforward.
|
||||
2. Look up, down and around: all six faces should show the selected cell size
|
||||
and keep animating. The plain book retains the previous fine static.
|
||||
3. Check Number 0 gives the coarse minimum. Compare Number 1 + Number 23 to the
|
||||
unnumbered default. Oversized values clamp instead of crashing.
|
||||
4. Add numbered color Pages before the resolution digits; verify the tint and
|
||||
resolution work independently.
|
||||
5. Travel between different-resolution Ages, the Overworld and a non-Static
|
||||
Age. Check book/portal destination views with the installed optional renderer
|
||||
for leaked settings.
|
||||
6. Revisit, reconnect and restart; the selected resolution must persist.
|
||||
Update both ends if using a dedicated server.
|
||||
|
||||
## Release validation (2026-11-17)
|
||||
|
||||
Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them.
|
||||
@@ -0,0 +1,54 @@
|
||||
# Writing Desk display model — issue #113
|
||||
|
||||
Introduced in candidates **1.21.1.0.8** and **26.3.0.12**.
|
||||
Player in-game checks passed (2026-11-18); included in **1.21.1.0.12** and **26.3.0.15**.
|
||||
|
||||
## References and placement
|
||||
|
||||
Reviewed dev images/current 26.3.png and the local Legacy ModelWritingDesk /
|
||||
RenderWritingDesk bytecode. Legacy uses dedicated paper geometry with small yaw
|
||||
offsets and separate selected-item rendering. Reuse the imported Legacy desk
|
||||
atlas, including its white paper patch; no new artwork or texture edits.
|
||||
|
||||
The existing two block JSON models put the tabletop at Y=12/16. Their red mat
|
||||
crosses the controller/extension seam. Earlier attachments used unrelated heights:
|
||||
paper at 0.27 (below the middle shelf at 0.375), selected page at 0.572 (below the tabletop at 0.75).
|
||||
|
||||
WritingDeskDisplayModel is shared by both clients:
|
||||
- Selected page: desk-local (0.5, 0.752, 0), scale 0.7, centered on the seam/mat.
|
||||
The renderer origin is the controller center (0.5, 0, 0.5).
|
||||
- Paper stack: local center X=1.15, Z=-0.1, sitting on the right middle shelf at 0.376.
|
||||
Its sheets are 0.5 x 0.625 blocks, 1/32 high with alternating +/-2-degree yaw.
|
||||
This is the extension/right half, shifted toward the desk's front.
|
||||
- One visible layer for 1–16 paper, two for 17–32, three for 33–48 and four for
|
||||
49–64. Zero paper emits no mesh. Each layer has closed, shaded white geometry.
|
||||
- Both attachments share the desk's existing facing transform. Geometry stays
|
||||
within their respective supporting surfaces and does not overlap the selected page.
|
||||
- The 26.3 renderer captures count/page during extraction and submits immutable
|
||||
precomputed paper geometry; it does not read the block entity during submission.
|
||||
|
||||
The desk's base geometry, non-occluding registration, GUI, storage/copy costs and
|
||||
item textures are unchanged. Dynamic paper is model geometry rather than repeated
|
||||
vanilla Paper item sprites. Symbol Pages retain their item renderer so changing
|
||||
the selected symbol displays its actual artwork.
|
||||
|
||||
## Validation
|
||||
|
||||
Both Gradle builds pass. A disposable Java geometry audit checked 126 faces over
|
||||
counts 0, 1, 15, 16, 17, 32, 33, 48, 49 and 64, including outward winding, support-surface
|
||||
clearance/bounds, separation from the selected page and four facing transforms.
|
||||
No game server was started for this client-model change.
|
||||
This does not replace GPU screenshots.
|
||||
|
||||
Player checks on both targets:
|
||||
1. Place four desks, one per horizontal facing. Compare with neighboring solid
|
||||
blocks and inspect from above, below and each side.
|
||||
2. Check neither attachment, page only, paper only and both.
|
||||
3. Try 1, 16, 17, 32, 33, 48, 49 and 64 paper; verify visible height transitions
|
||||
and no clipping/floating geometry. Paper should be white and on the right shelf,
|
||||
slightly forward; the selected page should sit over the red mat.
|
||||
4. Change/remove selected pages and paper, leave/reload the chunk and restart.
|
||||
Displays must update; neighboring block faces must remain visible correctly.
|
||||
5. Provide comparison screenshots of all facings for final visual acceptance.
|
||||
|
||||
Player acceptance was reported after testing these candidates. The checklist above records the suggested visual matrix; no automated GPU screenshot or independent full restart matrix is claimed.
|
||||
@@ -23,3 +23,16 @@ Crystal Formations are an authored, material-free feature on exposed solid terra
|
||||
Star Fissures are a material-free feature on every terrain profile, including Cave and Void. The fissure is generated once beside the first resolved spawn, using Legacy's spawn-chunk offset and 10–17 paired, irregular X-span rows running along +Z. Legacy's y=0 portal floor maps to the modern dimension's minimum build height, replacing lower bedrock if present. The rift opens to the sky on ordinary terrain; in Cave terrain it opens into the cavern but stops below the upper bedrock roof. Water in the carved columns is cleared before the portal is placed. Its non-solid portal links to the Overworld spawn with the Legacy fissure sound; the animated starfield is drawn with Minecraft's current End Portal renderer, which uses the same end-sky/end-portal art as Legacy's custom renderer. Random Ages sample Legacy's default small-feature grammar for fissure selection: the stop/one/repeat branches have rank-derived weights 1:1:3, and the fissure has weight 1 of 9 among its small-feature rules. The remainder of random feature selection still follows Rivencraft's current pipeline, rather than running Legacy's entire Age grammar.
|
||||
|
||||
The Rivencraft symbol-page creative tabs read a generated index of bundled symbol definitions and group Pages by each definition's category, except biome-controller roles, which appear in a separate Biome Generation tab rather than the Biome tab. Adding another valid JSON symbol under `src/main/resources/data/rivencraft/rivencraft/symbols/` includes its page in the matching category tab on the next build; a new bundled category receives its own tab. Registry-derived Block and Fluid Pages have separate tabs and both appear in optional JEI. Registry-derived biome pages share a creative/JEI feed; `terrablender:deferred_placeholder` is excluded because it is TerraBlender's internal staging biome, not a player-facing biome choice. Other modded biomes remain listed. Link Pages have a separate tab. Blank Pages appear in neither the creative tabs nor JEI's ingredient list. The server catalog still decides whether a page is valid for writing. External server data-pack symbols are not included in this bundled index.
|
||||
|
||||
## Static Sky resolution (issue #109)
|
||||
|
||||
Adjacent Number Pages before Static Sky form a base-25 cell count per face.
|
||||
Default 48, bounded 1–128; zero clamps to 1. Other sky styles do not consume
|
||||
resolution numbers. See [Static Sky resolution](STATIC_SKY_RESOLUTION.md).
|
||||
|
||||
## Native biome families (issue #111)
|
||||
|
||||
Native Caves, Native Nether and Native End are singular biome controllers,
|
||||
usable on any Terrain Page. They choose a frozen family pool in seeded regions;
|
||||
individual biome Pages retain Native conflict recovery. New ordinary Native Cave
|
||||
pools exclude Nether tags/regions. See [family rules](NATIVE_BIOME_FAMILIES.md).
|
||||
+1
-1
@@ -36,7 +36,7 @@ mod_name=Rivencraft
|
||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||
mod_license=LGPL-3.0-or-later
|
||||
# Minecraft.release-slice.iteration; independent of the 26.3 release track.
|
||||
mod_version=1.21.1.0.3
|
||||
mod_version=1.21.1.0.12
|
||||
immersive_portals_version=6.0.7
|
||||
terrablender_version=4.1.0.8
|
||||
serene_seasons_version_id=pHEgQQUE
|
||||
|
||||
+22
-14
@@ -1,24 +1,27 @@
|
||||
# Minecraft 26.3
|
||||
|
||||
The current **Minecraft 26.3 release is 26.3.0.5**, for NeoForge 26.3.0.99 and
|
||||
The current **Minecraft 26.3 release is 26.3.0.15**, for NeoForge 26.3.0.99 and
|
||||
Java 25. It uses Rivencraft's first-party Age backend, with no Dynamic Dimensions
|
||||
or Bad Packets dependency. The writing loop, authored/seeded Ages, generation
|
||||
features, weather/skies/celestials, libraries, crystal portals, live instability,
|
||||
and Link Modifier controls are ported. JEI, TerraBlender/Biomes O' Plenty, Serene
|
||||
Seasons/GlitchCore and Ruins are optional.
|
||||
|
||||
Immersive Portals Reborn 7.0.12 optionally supplies rotating live book previews
|
||||
and continuous crystal portal views. Built-in animations and normal travel remain
|
||||
available without it. Random-page eligibility and glyph descriptions are included.
|
||||
Use one portal fork per instance. The server controls crystal live views through
|
||||
`book_previews.reborn_crystal_live_views`; clients can disable live book views
|
||||
with `book_previews.reborn_live_views` in `rivencraft-local.toml`.
|
||||
**Known Reborn crashes:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118)
|
||||
tracks the world-reset acknowledgement problem and an unresolved null-section
|
||||
rebuild crash during exploration. 26.3.0.5 mitigates the acknowledgement gap;
|
||||
it does not fix the section rebuild crash. The earlier Static Sky issue #116
|
||||
was closed after the user reported it resolved. Full Seamless live-view support
|
||||
is tracked in [#117](https://git.paddedcell.org/dnorberg/rivencraft/issues/117).
|
||||
Immersive Portals Reborn 7.0.12 or Seamless Portals 1.0.0 optionally supplies
|
||||
rotating live book previews, look-only exploration and continuous crystal portal
|
||||
views. Install only one fork per instance. Built-in animations and normal travel
|
||||
remain available without either. Independent settings under book_previews control
|
||||
each fork's live book and crystal views.
|
||||
|
||||
**Known portal-mod failures:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118)
|
||||
tracks Reborn section-rebuild crashes and Reborn/Seamless acknowledgement disconnects
|
||||
during travel. Rejoining recovered the observed Seamless Age-loading disconnect.
|
||||
This release does not fix those failures. See [integration details](../../docs/SEAMLESS_PORTALS.md).
|
||||
|
||||
Native Caves/Nether/End Pages, desert vegetation and Number-controlled Static Sky
|
||||
resolution passed player checks on both supported versions. Native controls select
|
||||
their own seeded biome pool independently of terrain. Write Link Panel → Terrain
|
||||
→ one Native choice. See [family rules](../../docs/NATIVE_BIOME_FAMILIES.md).
|
||||
|
||||
The port feature and acceptance review is recorded in
|
||||
[the parity review](../../docs/MC263_PARITY_REVIEW.md). Book exploration matches
|
||||
@@ -26,7 +29,12 @@ The port feature and acceptance review is recorded in
|
||||
movement is disabled. The final dedicated-server restart/return check passed.
|
||||
Create/Ponder scenes are not ported to this target. Use matching client/server
|
||||
builds, keep saves separate from 1.21.1 and back up before updating.
|
||||
See [release notes](RELEASE_NOTES_26.3.0.5.md).
|
||||
See [release notes](RELEASE_NOTES_26.3.0.15.md).
|
||||
|
||||
This release adds [Accelerated machine ticking](../../docs/ACCELERATED_MACHINES.md),
|
||||
corrects [Writing Desk displays](../../docs/WRITING_DESK_MODEL.md), restores
|
||||
[dropped-book interaction](../../docs/DROPPED_BOOKS.md), and adds
|
||||
[void/skyblock block baselines](../../docs/BLOCK_BASELINE.md). Player in-game checks passed.
|
||||
|
||||
Flooded Environment Pages now fill Cave and other terrain to Y=63 by default,
|
||||
or the absolute base-25 Number Pages immediately before Flooded. Both-version
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# Rivencraft 26.3.0.10
|
||||
|
||||
Release for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||
Uses Rivencraft's first-party Age backend. Use matching client/server builds.
|
||||
|
||||
- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes and 26.3 Sulfur Caves.
|
||||
- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether authoring remains supported.
|
||||
- Authored noise terrain can use a vanilla noise baseline when the primary Overworld uses Flat/custom generation.
|
||||
- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Fixes Flat grass-surface placement in BOP Dryland.
|
||||
- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution persists and synchronizes; the renderer releases replaced textures.
|
||||
- Enables optional Seamless Portals 1.0.0 live book previews, look-only book exploration and continuous crystal-portal views. Install only one portal fork.
|
||||
- Adds independent seamless_live_views and seamless_crystal_live_views configuration options. Animated previews and ordinary travel remain available without an optional renderer.
|
||||
- New Pages enter the biome generation Creative/JEI feeds. Existing frozen pools and generated chunks are not rewritten.
|
||||
|
||||
Player in-game checks passed. Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Optional-portal server probes passed sequentially: Seamless 24, Reborn 24, neither 8.
|
||||
|
||||
Known issue: [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) tracks Reborn renderer crashes and Reborn/Seamless acknowledgement disconnects during travel. A Seamless disconnect occurred loading “caves on top”; rejoining loaded the Age successfully. This release does not fix that failure. Disable optional live views or remove the optional renderer if needed.
|
||||
|
||||
Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller.
|
||||
@@ -0,0 +1,11 @@
|
||||
# Rivencraft 26.3.0.11
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Accelerated Pages now give ticking server machines extra registered ticker calls.
|
||||
- Repeated Pages stack within separate configurable machine and candidate budgets.
|
||||
- Fair allocation, loaded/ticking chunk checks, world-border/removal checks and tick freeze remain in effect.
|
||||
- No force-loading or entity acceleration; normal Ages and the Overworld are unchanged.
|
||||
- Existing Accelerated Ages gain the behavior without rebinding; saved Page counts are unchanged.
|
||||
- Random-block acceleration retains its own independent budget.
|
||||
- Machine fuel, energy and input costs remain normal; global-time-gated machines may not scale linearly.
|
||||
@@ -0,0 +1,8 @@
|
||||
# Rivencraft 26.3.0.12
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Corrects Writing Desk selected-page height and centers it on the red writing mat.
|
||||
- Adds shared white paper-stack geometry on the right shelf, slightly forward, using Legacy's existing desk texture.
|
||||
- Paper count controls up to four staggered layers; attachments follow all desk facings.
|
||||
- Includes the player-validated Accelerated machine support from issue #112.
|
||||
@@ -0,0 +1,11 @@
|
||||
# Rivencraft 26.3.0.13
|
||||
|
||||
Intermediate development candidate; accepted changes are included in the subsequent 1.21.1.0.12 / 26.3.0.15 releases.
|
||||
|
||||
- Dropped Linking/Descriptive Books no longer auto-pick up on contact.
|
||||
- Right-click opens the existing book GUI; its panel links while leaving the book on the ground.
|
||||
- Shift-right-click picks up using normal ownership, pickup-delay and inventory checks.
|
||||
- Ground-book previews follow lectern behavior: rotating views remain available, interactive exploration is disabled.
|
||||
- Server validates the actual nearby entity, UUID and expected book for actions and previews.
|
||||
- Clients and servers must use matching updated builds.
|
||||
- Includes the prior local Writing Desk and machine-acceleration changes; 1.21.1 also includes universal open-book drop conversion.
|
||||
@@ -0,0 +1,18 @@
|
||||
# Rivencraft 26.3.0.15
|
||||
|
||||
Release for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||
Uses Rivencraft's first-party Age backend; no Dynamic Dimensions or Bad Packets required. Update clients and servers together.
|
||||
|
||||
- Accelerated Pages now also speed up registered server-side machine tickers. Repeated Pages stack within independent configurable machine/candidate budgets. Normal fuel, energy and input costs apply; machines gated by global time may remain limited.
|
||||
- Corrects Writing Desk selected-page placement on the red mat and adds white paper-stack geometry on the right shelf, with up to four layers matching the stored paper count.
|
||||
- Dropped Linking and Descriptive Books do not auto-pick up. Right-click opens the book; shift-right-click collects it with normal ownership, delay and inventory checks. Destination-panel travel leaves the ground book in place.
|
||||
- Ground-book previews follow lectern behavior: rotating previews remain available, interactive exploration is disabled. Server validation rejects stale or remote book actions.
|
||||
- Zero-count Overworld materials use version-specific bundled averages, balancing valuable-block instability with void/skyblock Overworlds. Positive measured counts retain precedence.
|
||||
- Missing modded ores use combined iron/deepslate iron measurements, falling back to bundled iron averages when measured iron is also absent. No extra profiling dimension is generated.
|
||||
- Existing 401 Age / 500 Overworld sampling thresholds, 5% excess allowance, material weights and difficulty controls remain unchanged.
|
||||
|
||||
Player in-game checks passed for both supported versions. Focused machine probes passed 25 checks (1.21.1) / 26 (26.3), dropped-book interaction probes passed 21 / 23, and baseline policy checks passed 14 per version with source-average audits. The 1.21.1 universal-drop probe passed 62 checks. Writing Desk geometry audit passed 126 face checks. These do not claim a separate automated full client/restart matrix.
|
||||
|
||||
The abandoned reference-world generation probes stalled and were stopped without retry. They are superseded by bundled defaults; no generation pass is claimed for them.
|
||||
|
||||
Known issue: [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) continues to track optional Reborn/Seamless crashes and travel disconnects. This release does not fix those failures.
|
||||
@@ -0,0 +1,13 @@
|
||||
# Rivencraft 26.3.0.6
|
||||
|
||||
Local test build for issue #108; pending player validation and explicit publication.
|
||||
|
||||
- Trees add ordinary cacti in vanilla and tagged modded deserts.
|
||||
- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes.
|
||||
- Repeated pages add seeded attempts; normal biome decoration remains.
|
||||
- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP
|
||||
Dryland/Lush Desert are included; Cold Desert is unchanged.
|
||||
- Candidate biome, air, ground and bounds checks protect existing blocks.
|
||||
- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior.
|
||||
|
||||
Shared placement checks passed. See [desert vegetation rules](../../docs/DESERT_VEGETATION.md).
|
||||
@@ -0,0 +1,14 @@
|
||||
# Rivencraft 26.3.0.7
|
||||
|
||||
Local test build for issue #108; pending player retest and explicit publication.
|
||||
|
||||
- Includes the desert Trees, Huge Trees and Flowers page behavior from 26.3.0.6.
|
||||
- Fixes cactus placement on Flat grass surfaces in BOP Dryland and other tagged
|
||||
deserts: Minecraft 26.3 splits dirt and grass-like soils into separate tags.
|
||||
- Keeps existing plants/blocks and normal biome decoration; old generated
|
||||
chunks are not rewritten.
|
||||
- The isolated BOP/TerraBlender server probe reproduced the failure, then
|
||||
confirmed cactus and dead-bush placement with the corrected ground rule.
|
||||
- Minecraft 1.21.1.0.4 passed player validation and is unchanged by this fix.
|
||||
|
||||
See [desert vegetation rules](../../docs/DESERT_VEGETATION.md).
|
||||
@@ -0,0 +1,16 @@
|
||||
# Rivencraft 26.3.0.8
|
||||
|
||||
Local test build for Minecraft 26.3; pending player validation and explicit publication.
|
||||
|
||||
- Number Pages immediately before Static Sky set its cells per face in base 25.
|
||||
Default 48; supported range 1–128, with zero and oversized inputs clamped.
|
||||
- Resolution persists across travel/save/reload and synchronizes with clients.
|
||||
Matching updated server/client builds are required.
|
||||
- Static animation timing and tint remain independent; other skies are unchanged.
|
||||
- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated.
|
||||
- Includes the previously validated desert vegetation changes from issue #108.
|
||||
|
||||
The 26.3 renderer reuses its cube, resizes only the current noise texture,
|
||||
and releases the previous texture on resolution changes.
|
||||
|
||||
Focused checks passed; GPU appearance awaits player validation. See [rules and tests](../../docs/STATIC_SKY_RESOLUTION.md).
|
||||
@@ -0,0 +1,23 @@
|
||||
# Rivencraft 26.3.0.9
|
||||
|
||||
Local candidate for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||
Pending player validation and explicit publication.
|
||||
|
||||
- Enables optional Seamless Portals 1.0.0 live rotating Linking/Descriptive Book
|
||||
panels and handheld look-only exploration, reusing the established renderer.
|
||||
- Enables continuous masked crystal portal views through the same adapter,
|
||||
with Rivencraft retaining teleportation and link-property handling.
|
||||
- Adds independent `seamless_live_views` and `seamless_crystal_live_views`
|
||||
options under `book_previews`. Existing Reborn options remain unchanged.
|
||||
- Shares preview leases, camera/audio restoration and portal maintenance across
|
||||
the two optional forks. Install only one fork per instance.
|
||||
- Retains animations/ordinary travel without a renderer or when disabled.
|
||||
- Keeps the Reborn acknowledgement workaround Reborn-only. Known Reborn
|
||||
renderer crashes in issue #118 are not fixed by this release.
|
||||
- Includes the validated desert vegetation and Static Sky resolution changes
|
||||
from issues #108 and #109.
|
||||
|
||||
Sequential focused server checks pass: Seamless 24, Reborn 24, no portal mod 8.
|
||||
Actual client rendering and multiplayer/restart behavior await player validation.
|
||||
|
||||
See [Seamless integration and manual checks](../../docs/SEAMLESS_PORTALS.md).
|
||||
@@ -249,6 +249,7 @@ tasks.named('processResources', ProcessResources).configure {
|
||||
include 'assets/rivencraft/models/block/decay_*.json'
|
||||
include 'assets/rivencraft/textures/block/decay_*.png'
|
||||
include 'data/rivencraft/tags/block/decay_protected.json'
|
||||
include 'data/rivencraft/tags/worldgen/biome/desert_vegetation.json'
|
||||
include 'assets/rivencraft/sounds.json'
|
||||
include 'assets/rivencraft/sounds/**/*.ogg'
|
||||
include 'assets/rivencraft/textures/item/crystal_shard.png'
|
||||
|
||||
@@ -7,7 +7,7 @@ neo_version=26.3.0.99
|
||||
mod_id=rivencraft
|
||||
mod_name=Rivencraft
|
||||
mod_license=LGPL-3.0-or-later
|
||||
mod_version=26.3.0.5
|
||||
mod_version=26.3.0.15
|
||||
|
||||
jei_version=31.17.0.109
|
||||
|
||||
|
||||
@@ -11,10 +11,8 @@
|
||||
"symbol.rivencraft.sky.overworld.description": "Use the native Overworld sky. Terrain and lighting remain independently authored.",
|
||||
"symbol.rivencraft.sky.nether.description": "Use a Nether-style reddish fog backdrop. Authored celestials render over it; terrain and gameplay rules remain independent.",
|
||||
"symbol.rivencraft.sky.end.description": "Use the native End sky backdrop with authored celestials over it, without End terrain or a dragon fight.",
|
||||
"symbol.rivencraft.sky.static.description": "Animated static surrounds the Age, behind authored celestials. Preceding colors tint it; otherwise it is gray.",
|
||||
"symbol.rivencraft.lighting.ambient_color": "Ambient Light Color",
|
||||
"symbol.rivencraft.lighting.ambient_color.description": "Apply preceding shared colors to ambient light. Use Bright separately for full effective ambient lighting.",
|
||||
"symbol.rivencraft.number.description": "Before Color: value × 10 per channel. Before Length: value × 0.08 days. Before Phase/Angle: value × 15 degrees. Before Size: 0.25× to 3× (0-24).",
|
||||
"symbol.rivencraft.size.small.description": "Before Sun/Moon: 0.5× body size. Before Normal Time: size the sun only. A preceding Number overrides the size.",
|
||||
"symbol.rivencraft.size.normal.description": "Before Sun/Moon: 1× body size. Before Normal Time: size the sun only. A preceding Number selects 0.25× through 3× (0-24).",
|
||||
"symbol.rivencraft.size.large.description": "Before Sun/Moon: 2× body size. Before Normal Time: size the sun only. A preceding Number selects 0.25× through 3× (0-24).",
|
||||
@@ -85,11 +83,10 @@
|
||||
"symbol.rivencraft.feature.abandoned_camps": "Abandoned Camps",
|
||||
"symbol.rivencraft.feature.abandoned_camps.description": "Allow abandoned camps on surface noise terrain, including outside their usual biomes.",
|
||||
"symbol.rivencraft.block.generated.description": "Modify the next compatible feature. Without a following feature, choose a compatible feature from the Age seed.",
|
||||
"symbol.rivencraft.biome.native.description": "Use the terrain's default biome source. Cave uses Tiny regions from recognized Cave/Nether biomes. Do not include Biome pages.",
|
||||
"symbol.rivencraft.feature.dungeons.description": "Add monster-room dungeon attempts throughout surface noise or Cave terrain, including Nether cave biomes. Not Flat or Void.",
|
||||
"symbol.rivencraft.biome.single.description": "Use one biome across the Age. If omitted, choose an eligible biome from the Age seed.",
|
||||
"symbol.rivencraft.terrain.flat.description": "A level, biome-decorated landscape with its foundation at Y=0.",
|
||||
"symbol.rivencraft.environment.accelerated.description": "Adds extra random block ticks near players in this Age. Repeated pages stack within server tick budgets; does not speed up entities or machines.",
|
||||
"symbol.rivencraft.environment.accelerated.description": "Adds extra random block ticks and server machine ticks in this Age. Repeated pages stack within separate budgets; entities are not accelerated.",
|
||||
"symbol.rivencraft.feature.floating_islands.description": "Add high floating islands alongside noise, Flat, or Void terrain; not Cave terrain.",
|
||||
"symbol.rivencraft.feature.caves.description": "Add extra cave carving to noise terrain, including Cave; not Flat or Void.",
|
||||
"symbol.rivencraft.feature.ravines.description": "Add canyon carving to noise terrain; not Flat or Void. Skips Nether biomes.",
|
||||
|
||||
@@ -11,6 +11,8 @@ public final class PortConfig {
|
||||
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_BLOCKLIST;
|
||||
public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS;
|
||||
public static final ModConfigSpec.BooleanValue CRYSTAL_LIVE_VIEWS;
|
||||
public static final ModConfigSpec.BooleanValue SEAMLESS_BOOK_PREVIEWS;
|
||||
public static final ModConfigSpec.BooleanValue SEAMLESS_CRYSTAL_VIEWS;
|
||||
public static final ModConfigSpec SPEC;
|
||||
public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES;
|
||||
public static final ModConfigSpec.IntValue SYMBOL_INK_COST;
|
||||
@@ -18,6 +20,8 @@ public final class PortConfig {
|
||||
public static final ModConfigSpec.EnumValue<ReturnLinkMode> RETURN_LINK_MODE;
|
||||
public static final ModConfigSpec.IntValue ACCELERATED_MAX_CHUNKS;
|
||||
public static final ModConfigSpec.IntValue ACCELERATED_MAX_ATTEMPTS;
|
||||
public static final ModConfigSpec.IntValue ACCELERATED_MACHINE_CANDIDATES;
|
||||
public static final ModConfigSpec.IntValue ACCELERATED_MACHINE_TICKS;
|
||||
|
||||
static {
|
||||
var builder = new ModConfigSpec.Builder();
|
||||
@@ -28,6 +32,14 @@ public final class PortConfig {
|
||||
CRYSTAL_LIVE_VIEWS = builder.comment("Server option: create native live crystal portal surfaces when Reborn is installed.",
|
||||
"Disabling keeps crystal portal travel with the animated surface.")
|
||||
.define("reborn_crystal_live_views", true);
|
||||
SEAMLESS_BOOK_PREVIEWS = builder.comment(
|
||||
"Show rotating live book views and handheld look-only exploration with Seamless on client and server.",
|
||||
"Disable locally to retain animated Legacy link panels; existing Reborn switches remain independent.")
|
||||
.define("seamless_live_views", true);
|
||||
SEAMLESS_CRYSTAL_VIEWS = builder.comment(
|
||||
"Server option: create native live crystal portal surfaces when Seamless is installed.",
|
||||
"Disabling retains normal portal travel and the animated surface.")
|
||||
.define("seamless_crystal_live_views", true);
|
||||
builder.pop();
|
||||
builder.push("random_pages");
|
||||
RANDOM_PAGE_ALLOWLIST = builder.comment(
|
||||
@@ -64,8 +76,12 @@ public final class PortConfig {
|
||||
builder.push("accelerated_age");
|
||||
ACCELERATED_MAX_CHUNKS = builder.comment("Maximum already-loaded player-nearby chunks given extra random ticks per Age tick.")
|
||||
.defineInRange("max_loaded_chunks", 8, 1, 64);
|
||||
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables Accelerated.")
|
||||
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables extra random ticks.")
|
||||
.defineInRange("max_random_tick_attempts_per_tick", 16384, 0, 65536);
|
||||
ACCELERATED_MACHINE_CANDIDATES = builder.comment("Maximum registered server machine tickers inspected per Age tick; rotates fairly without loading chunks.")
|
||||
.defineInRange("max_machine_candidates_per_tick", 1024, 1, 65536);
|
||||
ACCELERATED_MACHINE_TICKS = builder.comment("Maximum extra machine ticker calls per Age tick, shared round-robin. Each Accelerated page requests one extra tick per machine; zero disables machine acceleration independently of random ticks.")
|
||||
.defineInRange("max_machine_ticks_per_tick", 4096, 0, 65536);
|
||||
builder.pop();
|
||||
net.dnorberg.rivencraft.age.PortInstabilityConfig.define(builder);
|
||||
SPEC = builder.build();
|
||||
|
||||
@@ -249,7 +249,7 @@ public final class Rivencraft {
|
||||
COMPONENTS.register(modEventBus);
|
||||
RECIPE_SERIALIZERS.register(modEventBus);
|
||||
net.dnorberg.rivencraft.compat.RuinsCompatibility.register();
|
||||
net.dnorberg.rivencraft.compat.RebornBookPreviews.register();
|
||||
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.register();
|
||||
ModCreativeTabs.register(modEventBus);
|
||||
PortBiomeSources.register(modEventBus);
|
||||
PortChunkGenerators.register(modEventBus);
|
||||
|
||||
@@ -21,7 +21,7 @@ public final class AgeCatalogSync {
|
||||
}
|
||||
|
||||
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
||||
var registrar = event.registrar("11");
|
||||
var registrar = event.registrar("12");
|
||||
registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC);
|
||||
registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC,
|
||||
(payload, context) -> {
|
||||
|
||||
@@ -16,7 +16,7 @@ import net.minecraft.world.level.chunk.LevelChunk;
|
||||
import net.minecraft.world.level.chunk.LevelChunkSection;
|
||||
import net.minecraft.util.RandomSource;
|
||||
|
||||
/** Extra random block ticks from authored Accelerated pages, bounded to loaded player chunks. */
|
||||
/** Independent bounded random-block and server-machine acceleration in authored Ages. */
|
||||
public final class PortAcceleratedTicks {
|
||||
public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "environment/accelerated");
|
||||
|
||||
@@ -42,9 +42,10 @@ public final class PortAcceleratedTicks {
|
||||
|
||||
static void tick(ServerLevel level) {
|
||||
int maximumAttempts = PortConfig.ACCELERATED_MAX_ATTEMPTS.get();
|
||||
if (maximumAttempts == 0) return;
|
||||
int pages = pages(level);
|
||||
if (pages == 0) return;
|
||||
if (pages == 0 || !level.tickRateManager().runsNormally() || level.tickRateManager().isFrozen()) return;
|
||||
PortMachineTicks.tick(level, pages);
|
||||
if (maximumAttempts == 0) return;
|
||||
|
||||
List<ChunkPos> chunks = loadedPlayerChunks(level);
|
||||
if (chunks.isEmpty()) return;
|
||||
|
||||
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.age;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
@@ -14,26 +15,33 @@ import org.joml.Vector3f;
|
||||
import org.joml.Vector3fc;
|
||||
|
||||
/** Frozen shared-color writing, adapted from 1.21.1 AgeSkyProfile. -1 means native. */
|
||||
public record PortAgeColors(int sky, int ambient, int celestial) {
|
||||
public record PortAgeColors(int sky, int ambient, int celestial, int staticResolution) {
|
||||
public static final PortAgeColors NATIVE = new PortAgeColors(-1, -1);
|
||||
public static final Codec<PortAgeColors> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||
Codec.intRange(-1, 0xffffff).fieldOf("sky").forGetter(PortAgeColors::sky),
|
||||
Codec.intRange(-1, 0xffffff).fieldOf("ambient").forGetter(PortAgeColors::ambient),
|
||||
Codec.intRange(-1, 0xffffff).optionalFieldOf("celestial", -1).forGetter(PortAgeColors::celestial)
|
||||
Codec.intRange(-1, 0xffffff).optionalFieldOf("celestial", -1).forGetter(PortAgeColors::celestial),
|
||||
Codec.intRange(StaticSkyResolution.MIN, StaticSkyResolution.MAX)
|
||||
.optionalFieldOf("static_resolution", StaticSkyResolution.DEFAULT).forGetter(PortAgeColors::staticResolution)
|
||||
).apply(instance, PortAgeColors::new));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeColors> STREAM_CODEC = StreamCodec.composite(
|
||||
ByteBufCodecs.INT, PortAgeColors::sky, ByteBufCodecs.INT, PortAgeColors::ambient,
|
||||
ByteBufCodecs.INT, PortAgeColors::celestial, PortAgeColors::new);
|
||||
ByteBufCodecs.INT, PortAgeColors::celestial,
|
||||
ByteBufCodecs.VAR_INT, PortAgeColors::staticResolution, PortAgeColors::new);
|
||||
public static final Identifier AMBIENT = Identifier.fromNamespaceAndPath("rivencraft", "lighting/ambient_color");
|
||||
private static volatile Map<Identifier, PortAgeColors> clientColors = Map.of();
|
||||
|
||||
public PortAgeColors {
|
||||
staticResolution = StaticSkyResolution.clamp(staticResolution);
|
||||
if (sky < -1 || sky > 0xffffff || ambient < -1 || ambient > 0xffffff
|
||||
|| celestial < -1 || celestial > 0xffffff)
|
||||
throw new IllegalArgumentException("Invalid Age color");
|
||||
}
|
||||
|
||||
public PortAgeColors(int sky, int ambient) { this(sky, ambient, -1); }
|
||||
public PortAgeColors(int sky, int ambient, int celestial) {
|
||||
this(sky, ambient, celestial, StaticSkyResolution.DEFAULT);
|
||||
}
|
||||
|
||||
public static void updateClient(Map<Identifier, PortAgeColors> colors) { clientColors = Map.copyOf(colors); }
|
||||
|
||||
@@ -60,11 +68,17 @@ public record PortAgeColors(int sky, int ambient, int celestial) {
|
||||
public static boolean isModifier(Identifier page) { return isColor(page) || number(page) >= 0 || page.equals(AMBIENT); }
|
||||
|
||||
public static boolean validNumbers(List<Identifier> pages) {
|
||||
for (int i = 0; i < pages.size(); i++)
|
||||
if (number(pages.get(i)) >= 0 && (i + 1 == pages.size()
|
||||
|| !isColor(pages.get(i + 1)) && !PortDayCycle.isPeriod(pages.get(i + 1))
|
||||
&& !PortDayCycle.isPhase(pages.get(i + 1)) && !PortDayCycle.isAngle(pages.get(i + 1))
|
||||
&& !PortDayCycle.isSize(pages.get(i + 1)))) return false;
|
||||
for (int i = 0; i < pages.size(); i++) {
|
||||
if (number(pages.get(i)) < 0) continue;
|
||||
int next = i + 1;
|
||||
while (next < pages.size() && number(pages.get(next)) >= 0) next++;
|
||||
if (next < pages.size() && (pages.get(next).equals(PortStaticSkyResolution.PAGE)
|
||||
|| pages.get(next).equals(PortFlooding.PAGE))) continue;
|
||||
if (i + 1 >= pages.size()) return false;
|
||||
Identifier target = pages.get(i + 1);
|
||||
if (!isColor(target) && !PortDayCycle.isPeriod(target) && !PortDayCycle.isPhase(target)
|
||||
&& !PortDayCycle.isAngle(target) && !PortDayCycle.isSize(target)) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -101,7 +115,7 @@ public record PortAgeColors(int sky, int ambient, int celestial) {
|
||||
}
|
||||
}
|
||||
if (written) sky = clamp(red) << 16 | clamp(green) << 8 | clamp(blue);
|
||||
return new PortAgeColors(sky, ambient, celestial);
|
||||
return new PortAgeColors(sky, ambient, celestial, PortStaticSkyResolution.compile(pages));
|
||||
}
|
||||
|
||||
/** Only pageless random Ages receive a random sky tint, as in 1.21.1. */
|
||||
|
||||
@@ -3,19 +3,29 @@ package net.dnorberg.rivencraft.age;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.minecraft.resources.Identifier;
|
||||
|
||||
/** Frozen biome choice; Native may carry an explicit Cave pool. Repeats retain weight. */
|
||||
public record PortBiomePlan(Distribution distribution, List<Identifier> biomes) {
|
||||
public record PortBiomePlan(Distribution distribution, List<Identifier> biomes, NativeBiomeKind nativeKind) {
|
||||
public enum Distribution { NATIVE, SINGLE, TILED, GRID, TINY, SMALL, MEDIUM, LARGE, HUGE }
|
||||
|
||||
public static final Codec<PortBiomePlan> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||
Codec.STRING.xmap(Distribution::valueOf, Distribution::name).fieldOf("distribution")
|
||||
.forGetter(PortBiomePlan::distribution),
|
||||
Identifier.CODEC.listOf().fieldOf("biomes").forGetter(PortBiomePlan::biomes)
|
||||
Identifier.CODEC.listOf().fieldOf("biomes").forGetter(PortBiomePlan::biomes),
|
||||
Codec.STRING.xmap(NativeBiomeKind::valueOf, NativeBiomeKind::name)
|
||||
.optionalFieldOf("native_kind", NativeBiomeKind.TERRAIN).forGetter(PortBiomePlan::nativeKind)
|
||||
).apply(instance, PortBiomePlan::new));
|
||||
|
||||
public PortBiomePlan(Distribution distribution, List<Identifier> biomes) {
|
||||
this(distribution, biomes, NativeBiomeKind.TERRAIN);
|
||||
}
|
||||
|
||||
public PortBiomePlan {
|
||||
java.util.Objects.requireNonNull(nativeKind, "nativeKind");
|
||||
if (nativeKind != NativeBiomeKind.TERRAIN && (distribution != Distribution.NATIVE || biomes.isEmpty()))
|
||||
throw new IllegalArgumentException("A native family requires a nonempty Native pool");
|
||||
biomes = List.copyOf(biomes);
|
||||
if (distribution == null || distribution == Distribution.SINGLE && biomes.size() != 1
|
||||
|| distribution != Distribution.NATIVE && distribution != Distribution.SINGLE && biomes.size() < 2)
|
||||
|
||||
@@ -54,6 +54,32 @@ public final class PortBlockInstability {
|
||||
|
||||
private PortBlockInstability() {}
|
||||
|
||||
private static final net.dnorberg.rivencraft.shared.MaterialBaselinePolicy DEFAULT_BASELINE =
|
||||
net.dnorberg.rivencraft.shared.MaterialBaselinePolicy.load(
|
||||
"/assets/rivencraft/instability/default_block_baseline.json");
|
||||
|
||||
public static int baselineSamples(MinecraftServer server) {
|
||||
return PortBlockProfileSavedData.get(server.overworld()).count();
|
||||
}
|
||||
|
||||
public static String baselineStatus(MinecraftServer server) {
|
||||
return "minecraft:overworld; zero counts use bundled defaults, modded ores use iron";
|
||||
}
|
||||
|
||||
private static boolean moddedOre(Identifier id) {
|
||||
if (id.getNamespace().equals("minecraft") || id.getNamespace().equals("rivencraft")
|
||||
|| !BuiltInRegistries.BLOCK.containsKey(id)) return false;
|
||||
var state = BuiltInRegistries.BLOCK.getValue(id).defaultBlockState();
|
||||
return state.is(Tags.BlockItems.ORES.block()) || id.getPath().endsWith("_ore") || id.getPath().contains("_ore_");
|
||||
}
|
||||
|
||||
static double baselineAverage(Identifier id, Map<Identifier, Long> baseline, int chunks) {
|
||||
long iron = baseline.getOrDefault(Identifier.withDefaultNamespace("iron_ore"), 0L)
|
||||
+ baseline.getOrDefault(Identifier.withDefaultNamespace("deepslate_iron_ore"), 0L);
|
||||
return DEFAULT_BASELINE.average(id.toString(), baseline.getOrDefault(id, 0L),
|
||||
chunks, moddedOre(id), iron);
|
||||
}
|
||||
|
||||
/** Track recognized materials from installed mods without requiring any mod-specific API. */
|
||||
static boolean tracked(Identifier id) {
|
||||
if (VANILLA_WEIGHTS.containsKey(id)) return true;
|
||||
@@ -164,7 +190,7 @@ public final class PortBlockInstability {
|
||||
GENERATION_IN_FLIGHT.remove(event.getServer());
|
||||
}
|
||||
|
||||
/** Generate at most one chunk per second across the active Age and its Overworld baseline. */
|
||||
/** Generate at most one chunk per second across active Ages and the Overworld baseline. */
|
||||
private static void generateNextSpawnSample(MinecraftServer server) {
|
||||
if (GENERATION_IN_FLIGHT.containsKey(server)) return;
|
||||
List<SampleTarget> targets = new ArrayList<>();
|
||||
@@ -178,8 +204,8 @@ public final class PortBlockInstability {
|
||||
PortBlockProfileSavedData.MIN_AGE_SAMPLES));
|
||||
}
|
||||
if (targets.isEmpty()) return;
|
||||
ServerLevel overworld = server.overworld();
|
||||
targets.add(0, new SampleTarget(overworld, overworld.getRespawnData().pos(),
|
||||
ServerLevel baseline = server.overworld();
|
||||
targets.add(0, new SampleTarget(baseline, baseline.getRespawnData().pos(),
|
||||
PortBlockProfileSavedData.MIN_BASELINE_SAMPLES));
|
||||
int first = Math.floorMod(NEXT_TARGET.getOrDefault(server, 0), targets.size());
|
||||
for (int offset = 0; offset < targets.size(); offset++) {
|
||||
@@ -261,7 +287,7 @@ public final class PortBlockInstability {
|
||||
double weight = weight(id);
|
||||
if (weight <= 0) continue;
|
||||
double excess = age.getOrDefault(id, 0L) / (double) ageChunks
|
||||
- 1.05 * baseline.getOrDefault(id, 0L) / (double) baselineChunks;
|
||||
- 1.05 * baselineAverage(id, baseline, baselineChunks);
|
||||
if (excess > 0) result += excess * weight;
|
||||
}
|
||||
return (int) Math.min(100_000, Math.round(result));
|
||||
|
||||
@@ -292,6 +292,14 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
|
||||
PortShelfMushrooms.decorate(level, chunk, mushroomHosts, random);
|
||||
continue;
|
||||
}
|
||||
if (page.equals(PortVegetationPlan.FLOWERS) || page.equals(PortVegetationPlan.TREES)
|
||||
|| page.equals(PortVegetationPlan.HUGE_TREES)) {
|
||||
PortSurfaceVegetation.place(level, this, chunk,
|
||||
page.getPath().substring("feature/".length()),
|
||||
PortVegetationPlan.placedFeature(page), random);
|
||||
if (PortVegetationPlan.addsLogs(page)) mushroomHosts = null;
|
||||
continue;
|
||||
}
|
||||
if (!surfaceBiome) continue;
|
||||
Identifier placedId = PortVegetationPlan.placedFeature(page);
|
||||
PlacedFeature vanilla = registry.getOrThrow(
|
||||
|
||||
@@ -32,7 +32,8 @@ public final class PortInstabilityCommands {
|
||||
+ "; effective score=" + PortInstabilityRuntime.effectiveScore(level)
|
||||
+ "; difficulty=" + PortInstabilityConfig.instabilityDifficulty()
|
||||
+ "; samples Age=" + PortBlockInstability.sampledChunks(level) + "/" + PortBlockProfileSavedData.MIN_AGE_SAMPLES
|
||||
+ ", Overworld=" + PortBlockInstability.sampledChunks(source.getServer().overworld()) + "/" + PortBlockProfileSavedData.MIN_BASELINE_SAMPLES
|
||||
+ ", baseline=" + PortBlockInstability.baselineSamples(source.getServer()) + "/" + PortBlockProfileSavedData.MIN_BASELINE_SAMPLES
|
||||
+ " [" + PortBlockInstability.baselineStatus(source.getServer()) + "]"
|
||||
+ "; profiling=" + PortInstabilityData.get(source.getServer()).supportsProfiling(level)), false);
|
||||
for (var cost : age.contributions()) source.sendSuccess(() -> Component.literal(
|
||||
" " + cost.reason() + " page=" + cost.page() + " +" + cost.points()), false);
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.WeakHashMap;
|
||||
import net.dnorberg.rivencraft.PortConfig;
|
||||
import net.dnorberg.rivencraft.mixin.LevelBlockEntityTickersAccessor;
|
||||
import net.dnorberg.rivencraft.shared.AcceleratedMachineWork;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
|
||||
/** Reuses vanilla/NeoForge bound tickers, including modded server machines. */
|
||||
public final class PortMachineTicks {
|
||||
private static final Map<ServerLevel, AcceleratedMachineWork> WORK = new WeakHashMap<>();
|
||||
private PortMachineTicks() {}
|
||||
|
||||
public static void tick(ServerLevel level, int pages) {
|
||||
if (pages <= 0 || !level.tickRateManager().runsNormally() || level.tickRateManager().isFrozen()) return;
|
||||
WORK.computeIfAbsent(level, ignored -> new AcceleratedMachineWork()).run(
|
||||
((LevelBlockEntityTickersAccessor) level).rivencraft$blockEntityTickers(),
|
||||
pages, PortConfig.ACCELERATED_MACHINE_CANDIDATES.get(), PortConfig.ACCELERATED_MACHINE_TICKS.get(),
|
||||
ticker -> eligible(level, ticker), TickingBlockEntity::tick);
|
||||
}
|
||||
|
||||
private static boolean eligible(ServerLevel level, TickingBlockEntity ticker) {
|
||||
var pos = ticker.getPos();
|
||||
return level.tickRateManager().runsNormally() && !level.tickRateManager().isFrozen() && !ticker.isRemoved()
|
||||
&& level.getWorldBorder().isWithinBounds(pos)
|
||||
&& level.hasChunkAt(pos) && level.shouldTickBlocksAt(pos);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
|
||||
/** Family pools are resolved only when binding new writing, never re-filtered on load. */
|
||||
public final class PortNativeBiomePools {
|
||||
private PortNativeBiomePools() {}
|
||||
public static final TagKey<Biome> CAVES = TagKey.create(Registries.BIOME,
|
||||
Identifier.fromNamespaceAndPath("rivencraft", "cave_biomes"));
|
||||
|
||||
public static List<Identifier> pool(HolderLookup.Provider registries, NativeBiomeKind kind) {
|
||||
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
||||
var nether = java.util.Set.copyOf(TerraBlenderBiomes.nether(registries));
|
||||
java.util.function.Predicate<Holder.Reference<Biome>> isNether =
|
||||
biome -> biome.is(BiomeTags.IS_NETHER) || nether.contains(biome.key().identifier());
|
||||
var selected = biomes.listElements()
|
||||
.filter(biome -> !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||
.filter(biome -> switch (kind) {
|
||||
case CAVES -> biome.is(CAVES) && !isNether.test(biome);
|
||||
case NETHER -> isNether.test(biome);
|
||||
case END -> biome.is(BiomeTags.IS_END);
|
||||
case TERRAIN -> throw new IllegalArgumentException("Terrain Native uses its own preset");
|
||||
}).map(biome -> biome.key().identifier()).toList();
|
||||
// Built-in family members remain recognizable if a data pack replaces the broad tags.
|
||||
List<String> vanilla = switch (kind) {
|
||||
case CAVES -> List.of("lush_caves", "dripstone_caves", "deep_dark", "sulfur_caves");
|
||||
case NETHER -> List.of("nether_wastes", "soul_sand_valley", "crimson_forest", "warped_forest", "basalt_deltas");
|
||||
case END -> List.of("the_end", "end_highlands", "end_midlands", "small_end_islands", "end_barrens");
|
||||
default -> List.of();
|
||||
};
|
||||
var fallback = vanilla.stream().map(Identifier::withDefaultNamespace)
|
||||
.filter(id -> biomes.get(ResourceKey.create(Registries.BIOME, id))
|
||||
.filter(biome -> kind != NativeBiomeKind.CAVES || !isNether.test(biome)).isPresent());
|
||||
var result = Stream.concat(selected.stream(), fallback).distinct().sorted().toList();
|
||||
if (!result.isEmpty()) return result; // A one-biome family becomes a safe FixedBiomeSource.
|
||||
var safe = kind == NativeBiomeKind.CAVES ? biomes.listElements().filter(biome -> !isNether.test(biome)
|
||||
&& !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||
.map(biome -> biome.key().identifier()).sorted().findFirst()
|
||||
: java.util.Optional.<Identifier>empty();
|
||||
return safe.map(List::of).orElseThrow(() -> new IllegalArgumentException("No usable " + kind + " biomes"));
|
||||
}
|
||||
}
|
||||
@@ -45,7 +45,11 @@ public final class PortRandomAgeSelection {
|
||||
}
|
||||
if (distribution == PortBiomePlan.Distribution.NATIVE)
|
||||
return new Selection(terrain, new PortBiomePlan(distribution,
|
||||
terrain == PortAgeTerrain.CAVE ? eligible : List.of()));
|
||||
terrain == PortAgeTerrain.CAVE
|
||||
? PortNativeBiomePools.pool(server.registryAccess(), net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES)
|
||||
: List.of(), terrain == PortAgeTerrain.CAVE
|
||||
? net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES
|
||||
: net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN));
|
||||
|
||||
int count = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
|
||||
if (count > 1) {
|
||||
|
||||
@@ -53,7 +53,7 @@ public record PortRandomPagePolicy(Set<Identifier> allowlist, Set<Identifier> bl
|
||||
|
||||
private static String category(Identifier id) {
|
||||
String path = id.getPath();
|
||||
if (path.startsWith("biome/") && java.util.Set.of("native", "single", "tiled", "grid",
|
||||
if (path.startsWith("biome/") && java.util.Set.of("native", "native_caves", "native_nether", "native_end", "single", "tiled", "grid",
|
||||
"tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length())))
|
||||
return "biome_distribution";
|
||||
return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/'));
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
|
||||
import net.minecraft.resources.Identifier;
|
||||
|
||||
public final class PortStaticSkyResolution {
|
||||
public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "sky/static");
|
||||
private PortStaticSkyResolution() {}
|
||||
|
||||
public static int compile(List<Identifier> pages) {
|
||||
return StaticSkyResolution.requested(pages.stream().map(page -> {
|
||||
int number = PortAgeColors.number(page);
|
||||
if (number >= 0) return number;
|
||||
if (page.equals(PAGE)) return StaticSkyResolution.STATIC;
|
||||
return PortSkyStyle.forPage(page) != null
|
||||
? StaticSkyResolution.OTHER_SKY : StaticSkyResolution.OTHER;
|
||||
}).toList());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.Optional;
|
||||
import net.dnorberg.rivencraft.writing.PortRegistryPages;
|
||||
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||
import net.dnorberg.rivencraft.shared.DesertVegetation;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.level.WorldGenLevel;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.Heightmap;
|
||||
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
||||
import net.minecraft.world.level.levelgen.placement.PlacementContext;
|
||||
|
||||
/** Routes only the three generic plant pages by the actual candidate biome. */
|
||||
public final class PortSurfaceVegetation {
|
||||
public static final TagKey<Biome> DESERTS = TagKey.create(Registries.BIOME,
|
||||
Identifier.fromNamespaceAndPath("rivencraft", "desert_vegetation"));
|
||||
|
||||
private PortSurfaceVegetation() {}
|
||||
|
||||
public static boolean isDesert(Holder<Biome> biome) {
|
||||
return biome.is(DESERTS) && (!biome.is(net.minecraft.tags.BiomeTags.IS_END) && !PortRegistryPages.isCaveBiome(biome));
|
||||
}
|
||||
|
||||
public static void place(WorldGenLevel level, ChunkGenerator generator, ChunkAccess chunk,
|
||||
String page, Identifier placedId, RandomSource random) {
|
||||
DesertVegetation.Kind kind = switch (page) {
|
||||
case "flowers" -> DesertVegetation.Kind.FLOWERS;
|
||||
case "trees" -> DesertVegetation.Kind.TREES;
|
||||
case "huge_trees" -> DesertVegetation.Kind.HUGE_TREES;
|
||||
default -> throw new IllegalArgumentException("Not a generic vegetation page: " + page);
|
||||
};
|
||||
int x = chunk.getPos().getMinBlockX();
|
||||
int z = chunk.getPos().getMinBlockZ();
|
||||
// Separate streams keep ordinary non-desert placement independent of desert attempts.
|
||||
RandomSource desertRandom = RandomSource.create(random.nextLong());
|
||||
DesertVegetation.place(new DesertVegetation.World() {
|
||||
public int surfaceY(int px, int pz) {
|
||||
return level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, px, pz);
|
||||
}
|
||||
public int maxY() { return level.getMaxY(); }
|
||||
public boolean desert(int px, int py, int pz) {
|
||||
return isDesert(level.getBiome(new BlockPos(px, py, pz)));
|
||||
}
|
||||
public DesertVegetation.Ground ground(int px, int py, int pz) {
|
||||
var state = level.getBlockState(new BlockPos(px, py, pz));
|
||||
if (state.is(Blocks.SAND) || state.is(Blocks.RED_SAND)) return DesertVegetation.Ground.SAND;
|
||||
// Modern dirt and grass-like soils are separate tags.
|
||||
return (state.is(BlockTags.DIRT) || state.is(BlockTags.GRASS_BLOCKS))
|
||||
&& level.getBlockState(new BlockPos(px, py - 1, pz)).isFaceSturdy(
|
||||
level, new BlockPos(px, py - 1, pz), net.minecraft.core.Direction.UP)
|
||||
? DesertVegetation.Ground.SOIL : DesertVegetation.Ground.OTHER;
|
||||
}
|
||||
public boolean air(int px, int py, int pz) {
|
||||
return level.getBlockState(new BlockPos(px, py, pz)).isAir();
|
||||
}
|
||||
public void set(int px, int py, int pz, DesertVegetation.Plant plant) {
|
||||
var block = switch (plant) {
|
||||
case SAND -> Blocks.SAND;
|
||||
case CACTUS -> Blocks.CACTUS;
|
||||
case DEAD_BUSH -> Blocks.DEAD_BUSH;
|
||||
};
|
||||
level.setBlock(new BlockPos(px, py, pz), block.defaultBlockState(), 2);
|
||||
}
|
||||
}, kind, x, z, desertRandom::nextInt);
|
||||
|
||||
var vanilla = level.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
|
||||
.getOrThrow(ResourceKey.create(Registries.PLACED_FEATURE, placedId)).value();
|
||||
var context = new PlacementContext(level, generator, Optional.empty());
|
||||
placeOrdinary(vanilla, context, random, 0, new BlockPos(x, level.getMinY(), z));
|
||||
}
|
||||
|
||||
private static void placeOrdinary(PlacedFeature feature, PlacementContext context,
|
||||
RandomSource random, int index, BlockPos position) {
|
||||
if (index == feature.placement().size()) {
|
||||
Holder<Biome> biome = context.getLevel().getBiome(position);
|
||||
if (!biome.is(net.minecraft.tags.BiomeTags.IS_END)
|
||||
&& !PortRegistryPages.isCaveBiome(biome) && !isDesert(biome))
|
||||
feature.feature().value().place(context.getLevel(), context.generator(), random, position);
|
||||
return;
|
||||
}
|
||||
var modifier = feature.placement().get(index);
|
||||
if (modifier instanceof BiomeFilter) {
|
||||
placeOrdinary(feature, context, random, index + 1, position);
|
||||
} else {
|
||||
modifier.modify(context, random, position,
|
||||
candidate -> placeOrdinary(feature, context, random, index + 1, candidate));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -538,7 +538,8 @@ public final class RuntimeAgeBackend {
|
||||
ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, id);
|
||||
if (server.getLevel(key) != null) throw new IllegalArgumentException("Level already loaded: " + id);
|
||||
if (biomePlan != null && biomePlan.distribution() == PortBiomePlan.Distribution.NATIVE
|
||||
&& !biomePlan.biomes().isEmpty() && terrain != PortAgeTerrain.CAVE)
|
||||
&& !biomePlan.biomes().isEmpty() && terrain != PortAgeTerrain.CAVE
|
||||
&& biomePlan.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN)
|
||||
throw new IllegalArgumentException("Only Native Cave terrain may carry an explicit native biome pool");
|
||||
|
||||
// Noise terrains reuse the Overworld biome source unless a
|
||||
@@ -577,15 +578,24 @@ public final class RuntimeAgeBackend {
|
||||
generator = biomePlan != null && biomePlan.biomes().size() > 1
|
||||
? new PortFlatChunkGenerator(authoredBiomeSource(server, biomePlan, seed), settings)
|
||||
: new FlatLevelSource(settings);
|
||||
} else if ((biomePlan != null && biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE)
|
||||
} else if ((biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE
|
||||
|| biomePlan.nativeKind() != net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN))
|
||||
|| terrain != PortAgeTerrain.STANDARD) {
|
||||
if (!(generator instanceof NoiseBasedChunkGenerator noise))
|
||||
throw new IllegalStateException("Overworld generator cannot accept authored noise settings");
|
||||
// A Flat/skyblock Overworld has no noise generator to adapt. Native
|
||||
// family pages must still work with an independently authored noise terrain.
|
||||
NoiseBasedChunkGenerator noise = generator instanceof NoiseBasedChunkGenerator existingNoise ? existingNoise
|
||||
: new NoiseBasedChunkGenerator(
|
||||
net.minecraft.world.level.biome.MultiNoiseBiomeSource.createFromPreset(
|
||||
server.registryAccess().lookupOrThrow(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST)
|
||||
.getOrThrow(ResourceKey.create(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST,
|
||||
Identifier.withDefaultNamespace("overworld")))),
|
||||
server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS).getOrThrow(NoiseGeneratorSettings.OVERWORLD));
|
||||
var source = terrain == PortAgeTerrain.CAVE
|
||||
? new FixedBiomeSource(server.registryAccess().lookupOrThrow(Registries.BIOME)
|
||||
.getOrThrow(Biomes.LUSH_CAVES))
|
||||
: generator.getBiomeSource();
|
||||
if (terrain == PortAgeTerrain.CAVE && biomePlan != null) {
|
||||
: noise.getBiomeSource();
|
||||
if (terrain == PortAgeTerrain.CAVE && biomePlan != null
|
||||
&& biomePlan.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN) {
|
||||
var biomes = server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
for (Identifier biomeId : biomePlan.biomes()) {
|
||||
var holder = biomes.get(ResourceKey.create(Registries.BIOME, biomeId))
|
||||
@@ -595,6 +605,7 @@ public final class RuntimeAgeBackend {
|
||||
}
|
||||
}
|
||||
if (biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE
|
||||
|| biomePlan.nativeKind() != net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN
|
||||
|| terrain == PortAgeTerrain.CAVE && !biomePlan.biomes().isEmpty())) {
|
||||
source = authoredBiomeSource(server, biomePlan, seed);
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public final class CrystalPortalBlock extends BaseEntityBlock {
|
||||
@Override protected RenderShape getRenderShape(BlockState state) {
|
||||
// Keep the animated fallback until the optional destination view has
|
||||
// actually been established, including after a world restart.
|
||||
return net.dnorberg.rivencraft.compat.RebornBookPreviews.available() && state.getValue(LIVE_VIEW)
|
||||
return net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.available() && state.getValue(LIVE_VIEW)
|
||||
? RenderShape.INVISIBLE : RenderShape.MODEL;
|
||||
}
|
||||
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
|
||||
public int skyColor() { return skyColor; }
|
||||
public void setBook(ItemStack value) {
|
||||
if (level instanceof ServerLevel server)
|
||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
|
||||
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||
book = value.copyWithCount(1);
|
||||
restore = true;
|
||||
skyColor = 0xffffff;
|
||||
@@ -58,7 +58,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
|
||||
}
|
||||
public ItemStack takeBook() {
|
||||
if (level instanceof ServerLevel server)
|
||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
|
||||
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
|
||||
}
|
||||
private void sync() {
|
||||
|
||||
@@ -28,6 +28,7 @@ public final class AgeCatalogClient {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(RegisterClientPayloadHandlersEvent event) {
|
||||
event.register(net.dnorberg.rivencraft.network.OpenDroppedBookScreenPayload.TYPE, ClientDroppedBooks::open);
|
||||
event.register(net.dnorberg.rivencraft.network.BookPreviewPayload.TYPE, (payload, context) -> PortBookPreview.accept(payload));
|
||||
event.register(net.dnorberg.rivencraft.network.WritingDeskCatalogPayload.TYPE, ClientWritingDeskCatalog::handle);
|
||||
event.register(net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload.TYPE, (payload, context) ->
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
package net.dnorberg.rivencraft.client;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.network.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
|
||||
public final class ClientDroppedBooks {
|
||||
private ClientDroppedBooks() {}
|
||||
public static boolean present(DroppedBookActionPayload source) {
|
||||
var mc = Minecraft.getInstance();
|
||||
var entity = mc.level == null ? null : mc.level.getEntity(source.entityId());
|
||||
return mc.player != null && entity instanceof net.dnorberg.rivencraft.entity.DroppedBookEntity
|
||||
&& !entity.isRemoved() && entity.getUUID().equals(source.entityUuid())
|
||||
&& mc.player.distanceToSqr(entity) <= 64;
|
||||
}
|
||||
public static void send(DroppedBookActionPayload source, DroppedBookActionPayload.Action action, String title) {
|
||||
ClientPacketDistributor.sendToServer(source.action(action, title, false));
|
||||
}
|
||||
public static void open(OpenDroppedBookScreenPayload payload, IPayloadContext context) {
|
||||
context.enqueueWork(() -> {
|
||||
var source = payload.source();
|
||||
if (!present(source)) return;
|
||||
if (source.book().is(Rivencraft.LINKING_BOOK.get()))
|
||||
Minecraft.getInstance().gui.setScreen(new PortLinkingBookScreen(source));
|
||||
else if (source.book().is(Rivencraft.DESCRIPTIVE_BOOK.get()))
|
||||
Minecraft.getInstance().gui.setScreen(new PortDescriptiveBookScreen(source));
|
||||
});
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -18,12 +18,12 @@ import qouteall.imm_ptl.core.ClientWorldLoader;
|
||||
import qouteall.imm_ptl.core.render.GuiPortalRendering;
|
||||
import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo;
|
||||
|
||||
/** Reborn renders before GUI drawing; the deferred GUI samples its target normally. */
|
||||
public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
|
||||
/** The portal engine renders before GUI drawing; the deferred GUI samples its target normally. */
|
||||
public final class ImmersiveLiveBookPanel implements PortBookPreview.LivePanel {
|
||||
// The engine retains queued tasks. Keep one reusable target alive across screen
|
||||
// removal instead of deleting textures still referenced by a queued GUI frame.
|
||||
private static RenderTarget target;
|
||||
private static RebornLiveBookPanel queued;
|
||||
private static ImmersiveLiveBookPanel queued;
|
||||
private LinkBookTarget destination;
|
||||
private boolean closed;
|
||||
private boolean exploring;
|
||||
@@ -71,11 +71,11 @@ public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
|
||||
.setCameraTransformation(transform).setOverwriteCameraTransformation(true)
|
||||
.setRenderDistance(Math.min(8, minecraft.options.getEffectiveRenderDistance()))
|
||||
.setDoRenderHand(false).setEnableViewBobbing(false).setDoRenderSky(true).setHasFog(true).build();
|
||||
// Overlay-to-screen transitions can extract this panel twice before Reborn
|
||||
// Overlay-to-screen transitions can extract this panel twice before the portal engine
|
||||
// drains its queue. Its API accepts only one task per target until then.
|
||||
// Reuse that pending view for subsequent draws instead of submitting twice.
|
||||
if (queued == null) {
|
||||
// Submit first: Reborn may resize the target and invalidate its texture view.
|
||||
// Submit first: The portal engine may resize the target and invalidate its texture view.
|
||||
// GPU clearing happens in beginRender(), before remote rendering.
|
||||
GuiPortalRendering.submitNextFrameRendering(info, target);
|
||||
queued = this;
|
||||
@@ -1,8 +1,7 @@
|
||||
package net.dnorberg.rivencraft.client;
|
||||
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.PortConfig;
|
||||
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
|
||||
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
|
||||
import net.dnorberg.rivencraft.network.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
@@ -31,12 +30,17 @@ public final class PortBookPreview {
|
||||
private net.minecraft.resources.Identifier destination;
|
||||
|
||||
PortBookPreview(InteractionHand hand, ItemStack book, UseBookStandPayload stand) {
|
||||
this(hand, book, stand, null);
|
||||
}
|
||||
|
||||
PortBookPreview(InteractionHand hand, ItemStack book, UseBookStandPayload stand, DroppedBookActionPayload dropped) {
|
||||
var minecraft = Minecraft.getInstance();
|
||||
request = minecraft.level == null ? null : new RequestBookPreviewPayload(session,
|
||||
hand == InteractionHand.OFF_HAND, stand != null, minecraft.level.dimension().identifier(),
|
||||
stand == null ? BlockPos.ZERO : stand.pos(), book.copy());
|
||||
boolean enabled = RebornBookPreviews.available() && PortConfig.LIVE_BOOK_PREVIEWS.get();
|
||||
live = enabled ? new RebornLiveBookPanel() : null;
|
||||
stand == null ? BlockPos.ZERO : stand.pos(), book.copy(),
|
||||
dropped == null ? null : dropped.entityUuid());
|
||||
boolean enabled = ImmersiveBookPreviews.bookViewsEnabled();
|
||||
live = enabled ? new ImmersiveLiveBookPanel() : null;
|
||||
if (active != null) active.close();
|
||||
active = this;
|
||||
sendRequest();
|
||||
|
||||
+17
-4
@@ -31,6 +31,7 @@ public final class PortDescriptiveBookScreen extends Screen {
|
||||
private final net.dnorberg.rivencraft.writing.DescriptiveBookPages pages;
|
||||
private int pageIndex;
|
||||
private net.dnorberg.rivencraft.network.UseBookStandPayload standSource;
|
||||
private net.dnorberg.rivencraft.network.DroppedBookActionPayload droppedSource;
|
||||
private EditBox titleInput;
|
||||
|
||||
public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) {
|
||||
@@ -47,11 +48,16 @@ public final class PortDescriptiveBookScreen extends Screen {
|
||||
standSource = source;
|
||||
}
|
||||
|
||||
public PortDescriptiveBookScreen(net.dnorberg.rivencraft.network.DroppedBookActionPayload source) {
|
||||
this(InteractionHand.MAIN_HAND, source.book());
|
||||
droppedSource = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void init() {
|
||||
if (bound) {
|
||||
linkPanel.open(hand, book, standSource);
|
||||
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null);
|
||||
linkPanel.open(hand, book, standSource, droppedSource);
|
||||
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null || droppedSource != null);
|
||||
return;
|
||||
}
|
||||
if (standSource != null) return;
|
||||
@@ -151,7 +157,9 @@ public final class PortDescriptiveBookScreen extends Screen {
|
||||
int direction = PortLegacyBookArtwork.turnDirection(event.x() - left, event.y() - top, pageIndex, pages.lastPage());
|
||||
if (direction != 0) { turnPage(direction); return true; }
|
||||
if (bound && pageIndex == 0 && PortLegacyLinkPanel.contains(event.x() - left, event.y() - top)) {
|
||||
if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||
if (droppedSource != null) ClientDroppedBooks.send(droppedSource,
|
||||
net.dnorberg.rivencraft.network.DroppedBookActionPayload.Action.USE, "");
|
||||
else if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||
else ClientPacketDistributor.sendToServer(new UseDescriptiveBookPayload(hand == InteractionHand.OFF_HAND));
|
||||
onClose();
|
||||
return true;
|
||||
@@ -187,6 +195,9 @@ public final class PortDescriptiveBookScreen extends Screen {
|
||||
}
|
||||
|
||||
@Override public void tick() {
|
||||
if (droppedSource != null && !ClientDroppedBooks.present(droppedSource)) {
|
||||
onClose(); return;
|
||||
}
|
||||
if (bound) linkPanel.tick();
|
||||
exploration.tick(pageIndex == 0);
|
||||
}
|
||||
@@ -202,7 +213,9 @@ public final class PortDescriptiveBookScreen extends Screen {
|
||||
if (titleInput == null) return;
|
||||
String name = titleInput.getValue().strip();
|
||||
if (name.isEmpty()) return;
|
||||
ClientPacketDistributor.sendToServer(new BindDescriptiveBookPayload(hand == InteractionHand.OFF_HAND, name));
|
||||
if (droppedSource != null) ClientDroppedBooks.send(droppedSource,
|
||||
net.dnorberg.rivencraft.network.DroppedBookActionPayload.Action.BIND, name);
|
||||
else ClientPacketDistributor.sendToServer(new BindDescriptiveBookPayload(hand == InteractionHand.OFF_HAND, name));
|
||||
onClose();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,12 @@ final class PortLegacyLinkPanel {
|
||||
private PortBookPreview preview;
|
||||
void open(net.minecraft.world.InteractionHand hand, net.minecraft.world.item.ItemStack book,
|
||||
net.dnorberg.rivencraft.network.UseBookStandPayload stand) {
|
||||
if (preview == null) preview = new PortBookPreview(hand, book, stand);
|
||||
open(hand, book, stand, null);
|
||||
}
|
||||
void open(net.minecraft.world.InteractionHand hand, net.minecraft.world.item.ItemStack book,
|
||||
net.dnorberg.rivencraft.network.UseBookStandPayload stand,
|
||||
net.dnorberg.rivencraft.network.DroppedBookActionPayload dropped) {
|
||||
if (preview == null) preview = new PortBookPreview(hand, book, stand, dropped);
|
||||
}
|
||||
void close() { if (preview != null) { preview.close(); preview = null; } }
|
||||
boolean canExplore() { return preview != null && preview.canExplore(); }
|
||||
|
||||
+17
-4
@@ -32,6 +32,7 @@ public final class PortLinkingBookScreen extends Screen {
|
||||
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel();
|
||||
private final PortBookExploration exploration = new PortBookExploration(linkPanel);
|
||||
private net.dnorberg.rivencraft.network.UseBookStandPayload standSource;
|
||||
private net.dnorberg.rivencraft.network.DroppedBookActionPayload droppedSource;
|
||||
private EditBox titleInput;
|
||||
|
||||
public PortLinkingBookScreen(InteractionHand hand, ItemStack book) {
|
||||
@@ -52,11 +53,16 @@ public final class PortLinkingBookScreen extends Screen {
|
||||
standSource = source;
|
||||
}
|
||||
|
||||
public PortLinkingBookScreen(net.dnorberg.rivencraft.network.DroppedBookActionPayload source) {
|
||||
this(InteractionHand.MAIN_HAND, source.book());
|
||||
droppedSource = source;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void init() {
|
||||
if (bound) {
|
||||
linkPanel.open(hand, book, standSource);
|
||||
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null);
|
||||
linkPanel.open(hand, book, standSource, droppedSource);
|
||||
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null || droppedSource != null);
|
||||
return;
|
||||
}
|
||||
if (standSource != null) return;
|
||||
@@ -119,7 +125,9 @@ public final class PortLinkingBookScreen extends Screen {
|
||||
int direction = PortLegacyBookArtwork.turnDirection(event.x() - left, event.y() - top, pageIndex, 1);
|
||||
if (direction != 0) { turnPage(direction); return true; }
|
||||
if (bound && pageIndex == 0 && PortLegacyLinkPanel.contains(event.x() - left, event.y() - top)) {
|
||||
if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||
if (droppedSource != null) ClientDroppedBooks.send(droppedSource,
|
||||
net.dnorberg.rivencraft.network.DroppedBookActionPayload.Action.USE, "");
|
||||
else if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||
else ClientPacketDistributor.sendToServer(new UseLinkingBookPayload(hand == InteractionHand.OFF_HAND));
|
||||
onClose();
|
||||
return true;
|
||||
@@ -152,6 +160,9 @@ public final class PortLinkingBookScreen extends Screen {
|
||||
}
|
||||
|
||||
@Override public void tick() {
|
||||
if (droppedSource != null && !ClientDroppedBooks.present(droppedSource)) {
|
||||
onClose(); return;
|
||||
}
|
||||
if (bound) linkPanel.tick();
|
||||
exploration.tick(pageIndex == 0);
|
||||
}
|
||||
@@ -167,7 +178,9 @@ public final class PortLinkingBookScreen extends Screen {
|
||||
if (titleInput == null) return;
|
||||
String name = titleInput.getValue().strip();
|
||||
if (name.isEmpty()) return;
|
||||
ClientPacketDistributor.sendToServer(new BindLinkingBookPayload(hand == InteractionHand.OFF_HAND, name));
|
||||
if (droppedSource != null) ClientDroppedBooks.send(droppedSource,
|
||||
net.dnorberg.rivencraft.network.DroppedBookActionPayload.Action.BIND, name);
|
||||
else ClientPacketDistributor.sendToServer(new BindLinkingBookPayload(hand == InteractionHand.OFF_HAND, name));
|
||||
onClose();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,33 +10,43 @@ import com.mojang.renderpearl.api.buffers.GpuBuffer;
|
||||
import com.mojang.renderpearl.api.buffers.GpuBufferSlice;
|
||||
import com.mojang.renderpearl.api.pipeline.PrimitiveTopology;
|
||||
import java.util.Optional;
|
||||
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
|
||||
import java.util.OptionalDouble;
|
||||
import net.minecraft.client.renderer.RenderPipelines;
|
||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import org.joml.Matrix4f;
|
||||
|
||||
/** Legacy's six 48x48 noise faces, uploaded once per animation frame rather than per cell. */
|
||||
/** Six bounded authored-resolution noise faces, uploaded once per animation frame rather than per cell. */
|
||||
public final class PortStaticSky implements AutoCloseable {
|
||||
private static final int GRID = 48;
|
||||
private final DynamicTexture texture = new DynamicTexture("Rivencraft static sky", GRID * 6, GRID, false);
|
||||
private int grid;
|
||||
private DynamicTexture texture;
|
||||
private final GpuBuffer cube = buildCube();
|
||||
private long uploadedFrame = Long.MIN_VALUE;
|
||||
private int uploadedTint = -1;
|
||||
|
||||
public void render(RenderTarget target, GpuBufferSlice fog, long frame, int tint) {
|
||||
public void render(RenderTarget target, GpuBufferSlice fog, long frame, int tint, int resolution) {
|
||||
int requested = StaticSkyResolution.clamp(resolution);
|
||||
if (texture == null || grid != requested) {
|
||||
var replacement = new DynamicTexture("Rivencraft static sky", requested * 6, requested, false);
|
||||
if (texture != null) texture.close();
|
||||
texture = replacement;
|
||||
grid = requested;
|
||||
uploadedFrame = Long.MIN_VALUE;
|
||||
uploadedTint = -1;
|
||||
}
|
||||
if (tint < 0) tint = 0x929292;
|
||||
if (uploadedFrame != frame || uploadedTint != tint) {
|
||||
RandomSource random = RandomSource.create(frame);
|
||||
var image = texture.getPixels();
|
||||
for (int face = 0; face < 6; face++) {
|
||||
for (int y = 0; y < GRID; y++) {
|
||||
for (int x = 0; x < GRID; x++) {
|
||||
for (int y = 0; y < grid; y++) {
|
||||
for (int x = 0; x < grid; x++) {
|
||||
int noise = 65 + random.nextInt(160);
|
||||
int red = (tint >> 16 & 255) * noise / 255;
|
||||
int green = (tint >> 8 & 255) * noise / 255;
|
||||
int blue = (tint & 255) * noise / 255;
|
||||
image.setPixel(face * GRID + x, y, 0xff000000 | red << 16 | green << 8 | blue);
|
||||
image.setPixel(face * grid + x, y, 0xff000000 | red << 16 | green << 8 | blue);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -88,6 +98,6 @@ public final class PortStaticSky implements AutoCloseable {
|
||||
|
||||
@Override public void close() {
|
||||
cube.close();
|
||||
texture.close();
|
||||
if (texture != null) texture.close();
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,8 @@ public interface StaticSkyState {
|
||||
void rivencraft$bodies(java.util.List<Body> bodies);
|
||||
long rivencraft$staticFrame();
|
||||
void rivencraft$staticFrame(long frame);
|
||||
int rivencraft$staticResolution();
|
||||
void rivencraft$staticResolution(int resolution);
|
||||
int rivencraft$skyTint();
|
||||
void rivencraft$skyTint(int color);
|
||||
int rivencraft$orbitBearing();
|
||||
|
||||
@@ -14,18 +14,20 @@ import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.world.item.ItemDisplayContext;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.dnorberg.rivencraft.shared.WritingDeskDisplayModel;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.client.renderer.rendertype.RenderTypes;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** The existing selected-page and white-paper display, extracted for 26.3. */
|
||||
public final class WritingDeskRenderer implements BlockEntityRenderer<WritingDeskBlockEntity, WritingDeskRenderer.State> {
|
||||
private static final Identifier TEXTURE = Identifier.fromNamespaceAndPath(
|
||||
"rivencraft", "textures/block/writing_desk.png");
|
||||
private final ItemModelResolver resolver;
|
||||
public WritingDeskRenderer(BlockEntityRendererProvider.Context context) { resolver = context.itemModelResolver(); }
|
||||
public static final class State extends BlockEntityRenderState {
|
||||
final ItemStackRenderState paper = new ItemStackRenderState();
|
||||
final ItemStackRenderState page = new ItemStackRenderState();
|
||||
int layers;
|
||||
int paperCount;
|
||||
float rotation;
|
||||
}
|
||||
@Override public State createRenderState() { return new State(); }
|
||||
@@ -33,18 +35,31 @@ public final class WritingDeskRenderer implements BlockEntityRenderer<WritingDes
|
||||
Vec3 camera, ModelFeatureRenderer.CrumblingOverlay overlay) {
|
||||
BlockEntityRenderer.super.extractRenderState(desk, state, partialTick, camera, overlay);
|
||||
int count = desk.getItem(WritingDeskBlockEntity.PAPER).getCount();
|
||||
state.layers = count == 0 ? 0 : Math.min(4, 1 + count / 16);
|
||||
state.paperCount = count;
|
||||
state.rotation = 180 - desk.getBlockState().getValue(WritingDeskBlock.FACING).toYRot();
|
||||
resolver.updateForTopItem(state.paper, new ItemStack(Items.PAPER), ItemDisplayContext.FIXED, desk.getLevel(), null, 0);
|
||||
resolver.updateForTopItem(state.page, desk.displayPage(), ItemDisplayContext.FIXED, desk.getLevel(), null, 0);
|
||||
}
|
||||
@Override public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
|
||||
pose.pushPose();
|
||||
pose.translate(0.5, 0, 0.5);
|
||||
pose.rotateDegrees(Axis.YP, state.rotation);
|
||||
for (int i = 0; i < state.layers; i++) draw(state.paper, pose, collector, state.lightCoords,
|
||||
1.22, 0.27 + i * 0.008, -0.14, 0.55F);
|
||||
if (!state.page.isEmpty()) draw(state.page, pose, collector, state.lightCoords, 1.0, 0.572, 0, 0.8F);
|
||||
var faces = WritingDeskDisplayModel.paper(state.paperCount);
|
||||
if (!faces.isEmpty()) {
|
||||
int light = state.lightCoords;
|
||||
collector.submitCustomGeometry(pose, RenderTypes.entitySolid(TEXTURE), (matrix, vertices) -> {
|
||||
for (var face : faces) {
|
||||
for (var vertex : face.vertices()) {
|
||||
vertices.addVertex(matrix, vertex.x(), vertex.y(), vertex.z())
|
||||
.setColor(face.color()).setUv(vertex.u(), vertex.v())
|
||||
.setOverlay(OverlayTexture.NO_OVERLAY).setLight(light)
|
||||
.setNormal(matrix, face.nx(), face.ny(), face.nz());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
if (!state.page.isEmpty()) draw(state.page, pose, collector, state.lightCoords,
|
||||
WritingDeskDisplayModel.PAGE_X, WritingDeskDisplayModel.PAGE_Y,
|
||||
WritingDeskDisplayModel.PAGE_Z, WritingDeskDisplayModel.PAGE_SCALE);
|
||||
pose.popPose();
|
||||
}
|
||||
private static void draw(ItemStackRenderState item, PoseStack pose, SubmitNodeCollector collector,
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.PortConfig;
|
||||
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.neoforged.fml.ModList;
|
||||
import net.neoforged.neoforge.common.NeoForge;
|
||||
|
||||
/** No optional API appears in common class signatures. */
|
||||
public final class ImmersiveBookPreviews {
|
||||
public static boolean reborn() { return ModList.get().isLoaded("immersive_portals_reborn"); }
|
||||
public static boolean seamless() { return ModList.get().isLoaded("seamlessportals"); }
|
||||
public static boolean available() { return reborn() || seamless(); }
|
||||
public static String engineName() { return seamless() ? "Seamless" : "Reborn"; }
|
||||
public static boolean bookViewsEnabled() {
|
||||
return seamless() ? PortConfig.SEAMLESS_BOOK_PREVIEWS.get()
|
||||
: reborn() && PortConfig.LIVE_BOOK_PREVIEWS.get();
|
||||
}
|
||||
public static boolean crystalViewsEnabled() {
|
||||
return seamless() ? PortConfig.SEAMLESS_CRYSTAL_VIEWS.get()
|
||||
: reborn() && PortConfig.CRYSTAL_LIVE_VIEWS.get();
|
||||
}
|
||||
public static void open(ServerPlayer player, RequestBookPreviewPayload payload) {
|
||||
if (!available()) return;
|
||||
try { ImmersivePreviewChunks.open(player, payload); }
|
||||
catch (RuntimeException | LinkageError error) {
|
||||
Rivencraft.LOGGER.warn("{} book preview unavailable; retaining animated panel", engineName(), error);
|
||||
ImmersivePreviewChunks.close(player);
|
||||
}
|
||||
}
|
||||
public static void release(ServerPlayer player, java.util.UUID session) {
|
||||
if (available()) ImmersivePreviewChunks.release(player, session);
|
||||
}
|
||||
public static void register() {
|
||||
if (!available()) return;
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> ImmersivePreviewChunks.tick(event.getServer()));
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> {
|
||||
if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.logout(player);
|
||||
});
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> {
|
||||
if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.close(player);
|
||||
});
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> ImmersivePreviewChunks.stop());
|
||||
}
|
||||
private ImmersiveBookPreviews() {}
|
||||
}
|
||||
+9
-10
@@ -1,6 +1,5 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import net.dnorberg.rivencraft.PortConfig;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -8,23 +7,23 @@ import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** Render-only optional integration. Crystal portal blocks retain all travel rules. */
|
||||
public final class RebornCrystalPortals {
|
||||
public final class ImmersiveCrystalPortals {
|
||||
public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
|
||||
boolean live = false;
|
||||
if (RebornBookPreviews.available()) {
|
||||
if (ImmersiveBookPreviews.available()) {
|
||||
try {
|
||||
if (!book.isEmpty() && PortConfig.CRYSTAL_LIVE_VIEWS.get())
|
||||
live = RebornCrystalView.refresh(source, owner, plan, book);
|
||||
else RebornCrystalView.remove(source, owner);
|
||||
if (!book.isEmpty() && ImmersiveBookPreviews.crystalViewsEnabled())
|
||||
live = ImmersiveCrystalView.refresh(source, owner, plan, book);
|
||||
else ImmersiveCrystalView.remove(source, owner);
|
||||
} catch (RuntimeException | LinkageError failure) {
|
||||
Rivencraft.LOGGER.warn("Could not establish Reborn crystal view at {}; retaining portal travel and fallback", owner, failure);
|
||||
RebornCrystalView.remove(source, owner);
|
||||
Rivencraft.LOGGER.warn("Could not establish immersive crystal view at {}; retaining portal travel and fallback", owner, failure);
|
||||
ImmersiveCrystalView.remove(source, owner);
|
||||
}
|
||||
}
|
||||
CrystalPortalNetwork.setLiveView(source, plan, live);
|
||||
}
|
||||
public static void remove(ServerLevel source, BlockPos owner) {
|
||||
if (RebornBookPreviews.available()) RebornCrystalView.remove(source, owner);
|
||||
if (ImmersiveBookPreviews.available()) ImmersiveCrystalView.remove(source, owner);
|
||||
}
|
||||
private RebornCrystalPortals() {}
|
||||
private ImmersiveCrystalPortals() {}
|
||||
}
|
||||
+2
-2
@@ -23,7 +23,7 @@ import qouteall.q_misc_util.my_util.DQuaternion;
|
||||
import qouteall.q_misc_util.my_util.Mesh2D;
|
||||
|
||||
/** One native mesh per coplanar opening/side, not one repeated image per block. */
|
||||
final class RebornCrystalView {
|
||||
final class ImmersiveCrystalView {
|
||||
private static final String PREFIX = "rivencraft:crystal:mc263:v1:";
|
||||
private record View(CrystalPortalSurfaces.Surface surface, Direction normal,
|
||||
LinkBookTarget target, boolean preserveFacing, boolean relative, String tag) {}
|
||||
@@ -127,5 +127,5 @@ final class RebornCrystalView {
|
||||
return to.hamiltonProduct(from.getConjugated()).getNormalized();
|
||||
}
|
||||
private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; }
|
||||
private RebornCrystalView() {}
|
||||
private ImmersiveCrystalView() {}
|
||||
}
|
||||
+11
-3
@@ -23,7 +23,7 @@ import qouteall.imm_ptl.core.chunk_loading.ChunkLoader;
|
||||
import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking;
|
||||
|
||||
/** Optional API class: one expiring stream per player, validated before any chunk load. */
|
||||
final class RebornPreviewChunks {
|
||||
final class ImmersivePreviewChunks {
|
||||
private static final Map<ServerPlayer, Lease> LEASES = new IdentityHashMap<>();
|
||||
private static final Map<ServerPlayer, Long> REQUESTS = new IdentityHashMap<>();
|
||||
private static final int LIFETIME = 600;
|
||||
@@ -40,6 +40,7 @@ final class RebornPreviewChunks {
|
||||
if (previous != null && previous.session().equals(request.session())
|
||||
&& previous.source().offhand() == request.offhand()
|
||||
&& previous.source().fromStand() == request.fromStand()
|
||||
&& java.util.Objects.equals(previous.source().droppedBook(), request.droppedBook())
|
||||
&& previous.source().sourceDimension().equals(request.sourceDimension())
|
||||
&& previous.source().standPos().equals(request.standPos())
|
||||
&& ItemStack.matches(previous.source().book(), request.book())) {
|
||||
@@ -69,7 +70,7 @@ final class RebornPreviewChunks {
|
||||
var center = BlockPos.containing(target.x(), target.y(), target.z());
|
||||
if (level == null || !level.isInWorldBounds(center) || !level.getWorldBorder().isWithinBounds(center)) return;
|
||||
close(player);
|
||||
// Match the root live renderer's eight-chunk orbit view. Reborn schedules
|
||||
// Match the root live renderer's eight-chunk orbit view. The portal engine schedules
|
||||
// generation/streaming; no synchronous square of getChunk() calls here.
|
||||
var loader = new ChunkLoader(level.dimension(), center.getX() >> 4, center.getZ() >> 4, 8);
|
||||
PortalAPI.addChunkLoaderForPlayer(player, loader);
|
||||
@@ -80,6 +81,13 @@ final class RebornPreviewChunks {
|
||||
|
||||
private static ItemStack validated(ServerPlayer player, RequestBookPreviewPayload request) {
|
||||
if (!player.level().dimension().identifier().equals(request.sourceDimension()) || !player.isAlive()) return ItemStack.EMPTY;
|
||||
if (request.droppedBook() != null) {
|
||||
var entity = player.level().getEntity(request.droppedBook());
|
||||
if (!(entity instanceof net.dnorberg.rivencraft.entity.DroppedBookEntity dropped)) return ItemStack.EMPTY;
|
||||
var validated = net.dnorberg.rivencraft.entity.DroppedBookEntity.validated(
|
||||
player, dropped.getId(), request.droppedBook(), request.book());
|
||||
return validated == null ? ItemStack.EMPTY : validated.getItem();
|
||||
}
|
||||
if (request.fromStand()) return PortBookNetworking.validatedStandBook(player,
|
||||
new net.dnorberg.rivencraft.network.UseBookStandPayload(request.sourceDimension(), request.standPos(), request.book()));
|
||||
ItemStack held = player.getItemInHand(request.offhand() ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND);
|
||||
@@ -108,5 +116,5 @@ final class RebornPreviewChunks {
|
||||
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player);
|
||||
REQUESTS.clear();
|
||||
}
|
||||
private RebornPreviewChunks() {}
|
||||
private ImmersivePreviewChunks() {}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package net.dnorberg.rivencraft.compat;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.neoforged.fml.ModList;
|
||||
import net.neoforged.neoforge.common.NeoForge;
|
||||
|
||||
/** No optional API appears in common class signatures. */
|
||||
public final class RebornBookPreviews {
|
||||
public static boolean available() { return ModList.get().isLoaded("immersive_portals_reborn"); }
|
||||
public static void open(ServerPlayer player, RequestBookPreviewPayload payload) {
|
||||
if (!available()) return;
|
||||
try { RebornPreviewChunks.open(player, payload); }
|
||||
catch (RuntimeException | LinkageError error) {
|
||||
Rivencraft.LOGGER.warn("Reborn book preview unavailable; retaining animated panel", error);
|
||||
RebornPreviewChunks.close(player);
|
||||
}
|
||||
}
|
||||
public static void release(ServerPlayer player, java.util.UUID session) {
|
||||
if (available()) RebornPreviewChunks.release(player, session);
|
||||
}
|
||||
public static void register() {
|
||||
if (!available()) return;
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> RebornPreviewChunks.tick(event.getServer()));
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> {
|
||||
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.logout(player);
|
||||
});
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> {
|
||||
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.close(player);
|
||||
});
|
||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> RebornPreviewChunks.stop());
|
||||
}
|
||||
private RebornBookPreviews() {}
|
||||
}
|
||||
@@ -37,6 +37,37 @@ public final class DroppedBookEntity extends ItemEntity {
|
||||
return book;
|
||||
}
|
||||
|
||||
/** Contact must never take a book away from its world GUI. */
|
||||
@Override public void playerTouch(net.minecraft.world.entity.player.Player player) {}
|
||||
|
||||
@Override public boolean isPickable() { return !isRemoved() && !getItem().isEmpty(); }
|
||||
|
||||
@Override
|
||||
public net.minecraft.world.InteractionResult interact(net.minecraft.world.entity.player.Player player,
|
||||
net.minecraft.world.InteractionHand hand, Vec3 hit) {
|
||||
if (level().isClientSide()) return net.minecraft.world.InteractionResult.SUCCESS;
|
||||
if (!(player instanceof net.minecraft.server.level.ServerPlayer serverPlayer)
|
||||
|| !player.isAlive() || player.isSpectator() || player.distanceToSqr(this) > 64
|
||||
|| isRemoved() || getItem().isEmpty()) return net.minecraft.world.InteractionResult.PASS;
|
||||
if (player.isShiftKeyDown()) {
|
||||
// Explicit interaction uses normal ownership, delay, inventory and NeoForge pickup hooks.
|
||||
super.playerTouch(player);
|
||||
} else {
|
||||
net.dnorberg.rivencraft.network.PortBookNetworking.openDroppedBook(serverPlayer, this);
|
||||
}
|
||||
return net.minecraft.world.InteractionResult.SUCCESS;
|
||||
}
|
||||
|
||||
/** Only the nearby, still-present world book can authorize an action or preview. */
|
||||
public static DroppedBookEntity validated(net.minecraft.server.level.ServerPlayer player,
|
||||
int id, java.util.UUID uuid, ItemStack expected) {
|
||||
var entity = player.level().getEntity(id);
|
||||
return player.isAlive() && !player.isSpectator()
|
||||
&& entity instanceof DroppedBookEntity book && !book.isRemoved() && !book.getItem().isEmpty() && book.isAddedToLevel()
|
||||
&& book.getUUID().equals(uuid) && player.distanceToSqr(book) <= 64
|
||||
&& ItemStack.matches(book.getItem(), expected) ? book : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
super.tick();
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
package net.dnorberg.rivencraft.mixin;
|
||||
|
||||
import net.dnorberg.rivencraft.client.RebornLiveBookPanel;
|
||||
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
|
||||
import net.dnorberg.rivencraft.client.ImmersiveLiveBookPanel;
|
||||
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Pseudo;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -10,13 +10,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Pseudo
|
||||
@Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false)
|
||||
public abstract class RebornGuiRenderingMixin {
|
||||
public abstract class ImmersiveGuiRenderingMixin {
|
||||
@Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false)
|
||||
private static void rivencraft$clearLiveTarget(CallbackInfo ci) {
|
||||
if (RebornBookPreviews.available()) RebornLiveBookPanel.beginRender();
|
||||
if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.beginRender();
|
||||
}
|
||||
@Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false)
|
||||
private static void rivencraft$restoreCamera(CallbackInfo ci) {
|
||||
if (RebornBookPreviews.available()) RebornLiveBookPanel.endRender();
|
||||
if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.endRender();
|
||||
}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package net.dnorberg.rivencraft.mixin;
|
||||
|
||||
import java.util.List;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(Level.class)
|
||||
public interface LevelBlockEntityTickersAccessor {
|
||||
@Accessor("blockEntityTickers")
|
||||
List<TickingBlockEntity> rivencraft$blockEntityTickers();
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package net.dnorberg.rivencraft.mixin;
|
||||
|
||||
import net.dnorberg.rivencraft.client.RebornPredictionAcks;
|
||||
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
|
||||
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.client.multiplayer.ClientPacketListener;
|
||||
@@ -20,7 +20,7 @@ public abstract class RebornBlockAckMixin {
|
||||
@Inject(method = "handleBlockChangedAck", at = @At("HEAD"), cancellable = true)
|
||||
private void rivencraft$ackDuringWorldReset(ClientboundBlockChangedAckPacket packet, CallbackInfo callback) {
|
||||
// Off-thread packets must reach vanilla's normal scheduling path first.
|
||||
if (Minecraft.getInstance().isSameThread() && RebornBookPreviews.available()
|
||||
if (Minecraft.getInstance().isSameThread() && ImmersiveBookPreviews.reborn()
|
||||
&& RebornPredictionAcks.handleDuringWorldReset(level, packet.sequence())) callback.cancel();
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,9 @@ public class StaticSkyRendererMixin {
|
||||
key.identifier().getNamespace().equals("rivencraft")
|
||||
&& key.identifier().getPath().endsWith("_sky_static")).orElse(false);
|
||||
((StaticSkyState) state).rivencraft$staticFrame(enabled ? level.getGameTime() / 2 : Long.MIN_VALUE);
|
||||
((StaticSkyState) state).rivencraft$skyTint(net.dnorberg.rivencraft.age.PortAgeColors.forLevel(level).sky());
|
||||
var colors = net.dnorberg.rivencraft.age.PortAgeColors.forLevel(level);
|
||||
((StaticSkyState) state).rivencraft$skyTint(colors.sky());
|
||||
((StaticSkyState) state).rivencraft$staticResolution(colors.staticResolution());
|
||||
var cycle = net.dnorberg.rivencraft.age.PortDayCycle.forLevel(level);
|
||||
// 0=native Overworld/no authored overlay, 1=fog-only backdrop,
|
||||
// 2=native End backdrop, 3=custom Static backdrop.
|
||||
@@ -132,7 +134,8 @@ public class StaticSkyRendererMixin {
|
||||
}
|
||||
if (frame == Long.MIN_VALUE) return;
|
||||
if (rivencraft$staticSky == null) rivencraft$staticSky = new PortStaticSky();
|
||||
rivencraft$staticSky.render(renderTarget, fog, frame, rivencraft$endTint);
|
||||
rivencraft$staticSky.render(renderTarget, fog, frame, rivencraft$endTint,
|
||||
((StaticSkyState) state).rivencraft$staticResolution());
|
||||
if (((StaticSkyState) state).rivencraft$bodyOverlay() == 3) rivencraft$overlay(fog, state);
|
||||
ci.cancel();
|
||||
}
|
||||
|
||||
@@ -12,6 +12,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
public class StaticSkyStateMixin implements StaticSkyState {
|
||||
@Unique private long rivencraft$frame = Long.MIN_VALUE;
|
||||
@Unique private int rivencraft$tint = -1;
|
||||
@Unique private int rivencraft$resolution = net.dnorberg.rivencraft.shared.StaticSkyResolution.DEFAULT;
|
||||
public int rivencraft$staticResolution() { return rivencraft$resolution; }
|
||||
public void rivencraft$staticResolution(int resolution) { rivencraft$resolution = resolution; }
|
||||
@Unique private int rivencraft$bearing = -1;
|
||||
@Unique private float rivencraft$sunSize = 1F;
|
||||
@Unique private int rivencraft$celestialTint = -1;
|
||||
@@ -39,6 +42,7 @@ public class StaticSkyStateMixin implements StaticSkyState {
|
||||
private void rivencraft$reset(CallbackInfo ci) {
|
||||
rivencraft$frame = Long.MIN_VALUE;
|
||||
rivencraft$tint = -1;
|
||||
rivencraft$resolution = net.dnorberg.rivencraft.shared.StaticSkyResolution.DEFAULT;
|
||||
rivencraft$bearing = -1;
|
||||
rivencraft$sunSize = 1F;
|
||||
rivencraft$celestialTint = -1;
|
||||
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package net.dnorberg.rivencraft.network;
|
||||
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** The stack is an expected identity, never an authoritative destination. */
|
||||
public record DroppedBookActionPayload(int entityId, UUID entityUuid, ItemStack book,
|
||||
Action action, String title, boolean immersive) implements CustomPacketPayload {
|
||||
public enum Action { USE, BIND, PREVIEW }
|
||||
public static final Type<DroppedBookActionPayload> TYPE = new Type<>(
|
||||
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "dropped_book_action"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, DroppedBookActionPayload> STREAM_CODEC =
|
||||
StreamCodec.of((buf, value) -> {
|
||||
buf.writeVarInt(value.entityId()); buf.writeUUID(value.entityUuid());
|
||||
ItemStack.STREAM_CODEC.encode(buf, value.book()); buf.writeEnum(value.action());
|
||||
buf.writeUtf(value.title(), 32); buf.writeBoolean(value.immersive());
|
||||
}, buf -> new DroppedBookActionPayload(buf.readVarInt(), buf.readUUID(),
|
||||
ItemStack.STREAM_CODEC.decode(buf), buf.readEnum(Action.class),
|
||||
buf.readUtf(32), buf.readBoolean()));
|
||||
public DroppedBookActionPayload action(Action action, String title, boolean immersive) {
|
||||
return new DroppedBookActionPayload(entityId, entityUuid, book.copy(), action, title, immersive);
|
||||
}
|
||||
@Override public Type<? extends CustomPacketPayload> type() { return TYPE; }
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package net.dnorberg.rivencraft.network;
|
||||
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.Identifier;
|
||||
|
||||
public record OpenDroppedBookScreenPayload(DroppedBookActionPayload source) implements CustomPacketPayload {
|
||||
public static final Type<OpenDroppedBookScreenPayload> TYPE = new Type<>(
|
||||
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID,"open_dropped_book"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, OpenDroppedBookScreenPayload> STREAM_CODEC =
|
||||
StreamCodec.of((buf,value)->{ DroppedBookActionPayload.STREAM_CODEC.encode(buf,value.source()); },
|
||||
buf->new OpenDroppedBookScreenPayload(DroppedBookActionPayload.STREAM_CODEC.decode(buf)));
|
||||
@Override public Type<? extends CustomPacketPayload> type() { return TYPE; }
|
||||
}
|
||||
@@ -32,17 +32,22 @@ public final class PortBookNetworking {
|
||||
}
|
||||
|
||||
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
||||
var registrar = event.registrar("1");
|
||||
var registrar = event.registrar("2");
|
||||
registrar.playToClient(OpenDroppedBookScreenPayload.TYPE, OpenDroppedBookScreenPayload.STREAM_CODEC);
|
||||
registrar.playToServer(DroppedBookActionPayload.TYPE, DroppedBookActionPayload.STREAM_CODEC,
|
||||
(payload, context) -> {
|
||||
if (context.player() instanceof ServerPlayer player) droppedBookAction(player, payload);
|
||||
});
|
||||
registrar.playToClient(BookPreviewPayload.TYPE, BookPreviewPayload.STREAM_CODEC);
|
||||
registrar.playToServer(RequestBookPreviewPayload.TYPE, RequestBookPreviewPayload.STREAM_CODEC,
|
||||
(payload, context) -> {
|
||||
if (context.player() instanceof ServerPlayer player)
|
||||
net.dnorberg.rivencraft.compat.RebornBookPreviews.open(player, payload);
|
||||
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.open(player, payload);
|
||||
});
|
||||
registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC,
|
||||
(payload, context) -> {
|
||||
if (context.player() instanceof ServerPlayer player)
|
||||
net.dnorberg.rivencraft.compat.RebornBookPreviews.release(player, payload.session());
|
||||
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.release(player, payload.session());
|
||||
});
|
||||
registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC,
|
||||
(payload, context) -> {
|
||||
@@ -96,9 +101,12 @@ public final class PortBookNetworking {
|
||||
}
|
||||
|
||||
private static void bind(ServerPlayer player, BindLinkingBookPayload payload) {
|
||||
ItemStack stack = player.getItemInHand(hand(payload.offhand()));
|
||||
bindLinking(player, player.getItemInHand(hand(payload.offhand())), payload.title());
|
||||
}
|
||||
|
||||
private static void bindLinking(ServerPlayer player, ItemStack stack, String requestedTitle) {
|
||||
if (!stack.is(Rivencraft.LINKING_BOOK.get()) || stack.has(Rivencraft.LINK_BOOK_TARGET.get())) return;
|
||||
String title = payload.title().strip();
|
||||
String title = requestedTitle.strip();
|
||||
if (title.isEmpty() || title.length() > MAX_BOOK_TITLE_LENGTH) return;
|
||||
stack.set(Rivencraft.LINK_BOOK_TARGET.get(), LinkBookTarget.at(player));
|
||||
stack.set(Rivencraft.LINK_DESTINATION_NAME.get(), LinkingBookItem.destinationName(player.level()));
|
||||
@@ -118,9 +126,12 @@ public final class PortBookNetworking {
|
||||
}
|
||||
|
||||
private static void bindAge(ServerPlayer player, BindDescriptiveBookPayload payload) {
|
||||
ItemStack stack = player.getItemInHand(hand(payload.offhand()));
|
||||
bindDescriptive(player, player.getItemInHand(hand(payload.offhand())), payload.title());
|
||||
}
|
||||
|
||||
private static void bindDescriptive(ServerPlayer player, ItemStack stack, String requestedTitle) {
|
||||
if (!stack.is(Rivencraft.DESCRIPTIVE_BOOK.get()) || stack.has(Rivencraft.AGE_BOOK_ID.get())) return;
|
||||
String title = payload.title().strip();
|
||||
String title = requestedTitle.strip();
|
||||
if (title.isEmpty() || title.length() > MAX_BOOK_TITLE_LENGTH) return;
|
||||
Identifier id = createAge(player, title);
|
||||
if (id == null) return;
|
||||
@@ -253,6 +264,34 @@ public final class PortBookNetworking {
|
||||
}
|
||||
}
|
||||
|
||||
public static void openDroppedBook(ServerPlayer player, net.dnorberg.rivencraft.entity.DroppedBookEntity entity) {
|
||||
var source = new DroppedBookActionPayload(entity.getId(), entity.getUUID(), entity.getItem().copy(),
|
||||
DroppedBookActionPayload.Action.USE, "", false);
|
||||
net.neoforged.neoforge.network.PacketDistributor.sendToPlayer(player, new OpenDroppedBookScreenPayload(source));
|
||||
}
|
||||
|
||||
public static void droppedBookAction(ServerPlayer player, DroppedBookActionPayload payload) {
|
||||
var entity = net.dnorberg.rivencraft.entity.DroppedBookEntity.validated(
|
||||
player, payload.entityId(), payload.entityUuid(), payload.book());
|
||||
if (entity == null) return;
|
||||
var stack = entity.getItem();
|
||||
switch (payload.action()) {
|
||||
case USE -> {
|
||||
if (stack.is(Rivencraft.LINKING_BOOK.get())) {
|
||||
String failure = LinkingBookItem.travel(player, stack);
|
||||
if (failure != null) player.sendOverlayMessage(Component.literal(failure));
|
||||
else net.dnorberg.rivencraft.advancement.ProgressionAdvancements.awardAgeTravel(player);
|
||||
} else if (stack.is(Rivencraft.DESCRIPTIVE_BOOK.get())) travelDescriptive(player, stack, null);
|
||||
}
|
||||
case BIND -> {
|
||||
if (stack.is(Rivencraft.LINKING_BOOK.get())) bindLinking(player, stack, payload.title());
|
||||
else if (stack.is(Rivencraft.DESCRIPTIVE_BOOK.get())) bindDescriptive(player, stack, payload.title());
|
||||
entity.setItem(stack.copy());
|
||||
}
|
||||
case PREVIEW -> { /* Live views use the existing session-bound preview request. */ }
|
||||
}
|
||||
}
|
||||
|
||||
private static InteractionHand hand(boolean offhand) {
|
||||
return offhand ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
|
||||
}
|
||||
|
||||
+10
-3
@@ -9,16 +9,23 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** The server verifies the actual held/stand book, never a client-supplied destination. */
|
||||
/** The server verifies the actual held, stand or dropped book, never a client-supplied destination. */
|
||||
public record RequestBookPreviewPayload(UUID session, boolean offhand, boolean fromStand,
|
||||
Identifier sourceDimension, BlockPos standPos, ItemStack book) implements CustomPacketPayload {
|
||||
Identifier sourceDimension, BlockPos standPos, ItemStack book, UUID droppedBook) implements CustomPacketPayload {
|
||||
public RequestBookPreviewPayload(UUID session, boolean offhand, boolean fromStand,
|
||||
Identifier dimension, BlockPos pos, ItemStack book) {
|
||||
this(session, offhand, fromStand, dimension, pos, book, null);
|
||||
}
|
||||
public static final Type<RequestBookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "request_book_preview"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, RequestBookPreviewPayload> STREAM_CODEC = StreamCodec.of(
|
||||
(buf, value) -> {
|
||||
buf.writeUUID(value.session()); buf.writeBoolean(value.offhand()); buf.writeBoolean(value.fromStand());
|
||||
Identifier.STREAM_CODEC.encode(buf, value.sourceDimension());
|
||||
BlockPos.STREAM_CODEC.encode(buf, value.standPos()); ItemStack.STREAM_CODEC.encode(buf, value.book());
|
||||
buf.writeBoolean(value.droppedBook() != null);
|
||||
if (value.droppedBook() != null) buf.writeUUID(value.droppedBook());
|
||||
}, buf -> new RequestBookPreviewPayload(buf.readUUID(), buf.readBoolean(), buf.readBoolean(),
|
||||
Identifier.STREAM_CODEC.decode(buf), BlockPos.STREAM_CODEC.decode(buf), ItemStack.STREAM_CODEC.decode(buf)));
|
||||
Identifier.STREAM_CODEC.decode(buf), BlockPos.STREAM_CODEC.decode(buf), ItemStack.STREAM_CODEC.decode(buf),
|
||||
buf.readBoolean() ? buf.readUUID() : null));
|
||||
@Override public Type<RequestBookPreviewPayload> type() { return TYPE; }
|
||||
}
|
||||
@@ -176,12 +176,12 @@ public final class CrystalPortalNetwork {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void shutdown(ServerLevel level, BlockPos receptacle) {
|
||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(level, receptacle);
|
||||
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(level, receptacle);
|
||||
// A broken support can disconnect the graph. Scan a bounded volume rather
|
||||
// than trusting a path through blocks that no longer exist.
|
||||
for (BlockPos pos : BlockPos.betweenClosed(receptacle.offset(-CLEANUP_RADIUS, -CLEANUP_RADIUS, -CLEANUP_RADIUS),
|
||||
@@ -224,7 +224,7 @@ public final class CrystalPortalNetwork {
|
||||
}
|
||||
orientSurfaces(level, plan);
|
||||
var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle);
|
||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -241,7 +241,7 @@ public final class PortAuthoredWriting {
|
||||
private static PortBiomePlan.Distribution controller(Identifier page) {
|
||||
if (!page.getNamespace().equals(Rivencraft.MOD_ID)) return null;
|
||||
return switch (page.getPath()) {
|
||||
case "biome/native" -> PortBiomePlan.Distribution.NATIVE;
|
||||
case "biome/native", "biome/native_caves", "biome/native_nether", "biome/native_end" -> PortBiomePlan.Distribution.NATIVE;
|
||||
case "biome/single" -> PortBiomePlan.Distribution.SINGLE;
|
||||
case "biome/tiled" -> PortBiomePlan.Distribution.TILED;
|
||||
case "biome/grid" -> PortBiomePlan.Distribution.GRID;
|
||||
@@ -423,10 +423,15 @@ public final class PortAuthoredWriting {
|
||||
? PortBiomePlan.Distribution.TILED : PortBiomePlan.Distribution.MEDIUM;
|
||||
}
|
||||
if (distribution == PortBiomePlan.Distribution.NATIVE) {
|
||||
var nativePool = caveTerrain
|
||||
? (available != null ? available : net.dnorberg.rivencraft.age.PortRandomAgeSelection.caveBiomes(registries))
|
||||
: List.<Identifier>of();
|
||||
return new PortBiomePlan(distribution, nativePool);
|
||||
var kind = pages.stream().filter(page -> controller(page) == PortBiomePlan.Distribution.NATIVE)
|
||||
.map(page -> net.dnorberg.rivencraft.shared.NativeBiomeKind.controller(
|
||||
page.getPath().substring("biome/".length())))
|
||||
.reduce((prior, current) -> current).orElse(net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN);
|
||||
if (kind == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN && caveTerrain)
|
||||
kind = net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES;
|
||||
return new PortBiomePlan(distribution,
|
||||
kind == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN ? List.of()
|
||||
: net.dnorberg.rivencraft.age.PortNativeBiomePools.pool(registries, kind), kind);
|
||||
}
|
||||
if (distribution != null && available != null) {
|
||||
int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
|
||||
|
||||
@@ -29,13 +29,13 @@ public final class PortWritingRecovery {
|
||||
var entry = PortSymbolPages.find(page);
|
||||
if (entry == null || !PortAuthoredWriting.isPageImplemented(page)) { implemented = false; continue; }
|
||||
String role = entry.role();
|
||||
if (pendingNumber != null && !numberTarget(role)
|
||||
&& !(role.equals("color_number") && numberRunTargetsFlooded(pages, index))) {
|
||||
if (pendingNumber != null && !numberTarget(role, page)
|
||||
&& !(role.equals("color_number") && numberRunTargetsInteger(pages, index))) {
|
||||
diagnostics.add(new Diagnostic("misplaced_modifier", pendingNumber, 100));
|
||||
pendingNumber = null;
|
||||
}
|
||||
if (role.equals("color_number")) pendingNumber = index;
|
||||
else if (numberTarget(role)) pendingNumber = null;
|
||||
else if (numberTarget(role, page)) pendingNumber = null;
|
||||
if (MODIFIERS.contains(role)) pendingModifiers.put(role, index);
|
||||
else if (role.equals("celestial")) pendingModifiers.clear();
|
||||
if (SINGULAR.contains(role)) {
|
||||
@@ -56,7 +56,7 @@ public final class PortWritingRecovery {
|
||||
for (int index : pendingModifiers.values())
|
||||
diagnostics.add(new Diagnostic("dangling_modifier", index, 100));
|
||||
Integer controller = last.get("biome_controller");
|
||||
boolean nativeBiomes = controller != null && pages.get(controller).getPath().equals("biome/native");
|
||||
boolean nativeBiomes = controller != null && net.dnorberg.rivencraft.shared.NativeBiomeKind.isController(pages.get(controller).getPath().substring("biome/".length()));
|
||||
boolean single = controller != null && pages.get(controller).getPath().equals("biome/single");
|
||||
if (nativeBiomes && biomes > 0 || single && biomes > 1)
|
||||
diagnostics.add(new Diagnostic("conflict", controller, 500));
|
||||
@@ -79,18 +79,20 @@ public final class PortWritingRecovery {
|
||||
// The port's category compilers select by role, so no physical resort is necessary.
|
||||
return new Result(active, diagnostics, implemented);
|
||||
}
|
||||
private static boolean numberRunTargetsFlooded(List<Identifier> pages, int index) {
|
||||
private static boolean numberRunTargetsInteger(List<Identifier> pages, int index) {
|
||||
for (int next = index + 1; next < pages.size(); next++) {
|
||||
var entry = PortSymbolPages.find(pages.get(next));
|
||||
if (entry == null) return false;
|
||||
if (!entry.role().equals("color_number")) return entry.role().equals("flooding");
|
||||
if (!entry.role().equals("color_number")) return entry.role().equals("flooding")
|
||||
|| pages.get(next).equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static boolean numberTarget(String role) {
|
||||
private static boolean numberTarget(String role, Identifier page) {
|
||||
return role.equals("color") || role.equals("period_modifier") || role.equals("angle_modifier")
|
||||
|| role.equals("phase_modifier") || role.equals("size_modifier") || role.equals("flooding");
|
||||
|| role.equals("phase_modifier") || role.equals("size_modifier") || role.equals("flooding")
|
||||
|| page.equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE);
|
||||
}
|
||||
private static int stage(String role) {
|
||||
return switch (role) {
|
||||
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"minecraft_version": "26.3",
|
||||
"source_sample_count": 1024,
|
||||
"source_sha256": "07a9989118b5079f75e9c03d04126b82509555082829a8f610481add9740a162",
|
||||
"blocks_per_chunk": {
|
||||
"minecraft:coal_ore": 95.7587890625,
|
||||
"minecraft:deepslate_coal_ore": 0.642578125,
|
||||
"minecraft:deepslate_diamond_ore": 24.1845703125,
|
||||
"minecraft:deepslate_emerald_ore": 0.03125,
|
||||
"minecraft:deepslate_gold_ore": 21.470703125,
|
||||
"minecraft:deepslate_iron_ore": 24.6806640625,
|
||||
"minecraft:deepslate_lapis_ore": 13.30078125,
|
||||
"minecraft:deepslate_redstone_ore": 32.9697265625,
|
||||
"minecraft:diamond_ore": 0.4580078125,
|
||||
"minecraft:emerald_ore": 0.6337890625,
|
||||
"minecraft:gold_ore": 4.158203125,
|
||||
"minecraft:iron_ore": 51.85546875,
|
||||
"minecraft:lapis_ore": 11.046875,
|
||||
"minecraft:raw_iron_block": 0.0390625,
|
||||
"minecraft:redstone_ore": 3.0068359375,
|
||||
"rivencraft:crystal_block": 0.015625
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,11 @@
|
||||
"values": [
|
||||
"minecraft:lush_caves",
|
||||
"minecraft:dripstone_caves",
|
||||
"minecraft:deep_dark"
|
||||
"minecraft:deep_dark",
|
||||
"minecraft:sulfur_caves",
|
||||
{
|
||||
"id": "#c:is_cave",
|
||||
"required": false
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -12,12 +12,13 @@
|
||||
"AgeDayTimelineMixin",
|
||||
"RuinsDimensionMixin",
|
||||
"RuinsTemplateDimensionMixin",
|
||||
"RuinsAttemptMixin"
|
||||
"RuinsAttemptMixin",
|
||||
"LevelBlockEntityTickersAccessor"
|
||||
],
|
||||
"client": [
|
||||
"StaticSkyStateMixin",
|
||||
"StaticSkyRendererMixin",
|
||||
"RebornGuiRenderingMixin",
|
||||
"ImmersiveGuiRenderingMixin",
|
||||
"ClientLevelSoundMixin",
|
||||
"RebornBlockAckMixin"
|
||||
],
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import net.dnorberg.rivencraft.shared.DesertVegetation;
|
||||
import net.dnorberg.rivencraft.shared.DesertVegetation.*;
|
||||
|
||||
/** Storage-free shared placement checks; no fixture is packaged into either mod JAR. */
|
||||
public class DesertVegetationChecks {
|
||||
record Pos(int x, int y, int z) {}
|
||||
static class World implements DesertVegetation.World {
|
||||
final Map<Pos, Plant> plants = new HashMap<>();
|
||||
Ground ground = Ground.SAND;
|
||||
boolean desert = true;
|
||||
boolean mixed;
|
||||
boolean blocked;
|
||||
int ceiling = 320;
|
||||
int readsOutside;
|
||||
public int surfaceY(int x, int z) { return 4; }
|
||||
public int maxY() { return ceiling; }
|
||||
public boolean desert(int x, int y, int z) { return desert && (!mixed || x < 8); }
|
||||
public Ground ground(int x, int y, int z) { return ground; }
|
||||
public boolean air(int x, int y, int z) {
|
||||
if (x < 0 || x > 15 || z < 0 || z > 15) readsOutside++;
|
||||
return y >= 4 && !blocked && !plants.containsKey(new Pos(x,y,z));
|
||||
}
|
||||
public void set(int x, int y, int z, Plant plant) {
|
||||
if (x < 0 || x > 15 || z < 0 || z > 15 || y >= ceiling)
|
||||
throw new AssertionError("Write outside chunk/world bounds");
|
||||
if (plants.putIfAbsent(new Pos(x,y,z),plant) != null)
|
||||
throw new AssertionError("Overwrote existing vegetation");
|
||||
}
|
||||
}
|
||||
static int place(World w, Kind k, long seed) {
|
||||
return DesertVegetation.place(w,k,0,0,new Random(seed)::nextInt);
|
||||
}
|
||||
static void check(boolean condition, String label) {
|
||||
if (!condition) throw new AssertionError(label);
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
for (Kind kind : Kind.values()) {
|
||||
var a = new World();
|
||||
int count = place(a,kind,108);
|
||||
check(count > 0,"Page produces plants: "+kind);
|
||||
var b = new World();
|
||||
place(b,kind,108);
|
||||
check(a.plants.equals(b.plants),"Seeded repeatability: "+kind);
|
||||
check(a.readsOutside == 0,"Chunk-local checks: "+kind);
|
||||
if (kind == Kind.FLOWERS)
|
||||
check(a.plants.values().stream().allMatch(p -> p == Plant.DEAD_BUSH),"Desert plants only");
|
||||
else {
|
||||
int max = a.plants.keySet().stream().mapToInt(Pos::y).max().orElseThrow() - 3;
|
||||
check(kind == Kind.HUGE_TREES ? max >= 5 && max <= 9 : max <= 3,"Cactus heights");
|
||||
}
|
||||
int original = a.plants.size();
|
||||
for (int n=1;n<4;n++) place(a,kind,108+n);
|
||||
check(a.plants.size() > original,"Repeated pages add plants: "+kind);
|
||||
|
||||
var outside = new World(); outside.desert = false;
|
||||
check(place(outside,kind,108)==0 && outside.plants.isEmpty(),"No non-desert writes");
|
||||
var unsupported = new World(); unsupported.ground=Ground.OTHER;
|
||||
check(place(unsupported,kind,108)==0 && unsupported.plants.isEmpty(),"Preserve rock/invalid ground");
|
||||
var blocked = new World(); blocked.blocked=true; blocked.ground=Ground.SOIL;
|
||||
check(place(blocked,kind,108)==0 && blocked.plants.isEmpty(),"No partial writes when obstructed");
|
||||
var mixed = new World(); mixed.mixed=true;
|
||||
place(mixed,kind,108);
|
||||
check(mixed.plants.keySet().stream().allMatch(p -> p.x()<8),"Candidate biome selection");
|
||||
}
|
||||
var flat = new World(); flat.ground=Ground.SOIL;
|
||||
int cacti=place(flat,Kind.TREES,108);
|
||||
check(cacti>0 && flat.plants.values().stream().filter(p -> p==Plant.SAND).count()==cacti,
|
||||
"Flat soil converts exactly one base per cactus");
|
||||
var low = new World(); low.ceiling=8;
|
||||
check(place(low,Kind.HUGE_TREES,108)==0 && low.plants.isEmpty(),"No truncated tall cactus/headroom writes");
|
||||
System.out.println("DESERT108_PASS: placement, heights, repeated pages, seed repeatability, biome boundaries, "
|
||||
+"chunk bounds, obstruction, ground protection, Flat bases and ceiling");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.age.*;
|
||||
import net.dnorberg.rivencraft.writing.PortRegistryPages;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class DesertProbe {
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try {
|
||||
var server=event.getServer();
|
||||
for (String name : List.of("minecraft:desert","biomesoplenty:dryland")) {
|
||||
var biome=server.registryAccess().lookupOrThrow(Registries.BIOME)
|
||||
.getOrThrow(ResourceKey.create(Registries.BIOME,Identifier.parse(name)));
|
||||
System.out.println("DESERT263_CLASSIFY "+name+" own="+biome.is(PortSurfaceVegetation.DESERTS)
|
||||
+" common="+biome.is(TagKey.<Biome>create(Registries.BIOME,Identifier.parse("c:is_desert")))
|
||||
+" cave="+PortRegistryPages.isCaveBiome(biome));
|
||||
var level=RuntimeAgeBackend.create(server,Identifier.parse("rivencraft:age/probe_"+name.split(":")[1]),
|
||||
1115555888188619066L,
|
||||
new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,List.of(Identifier.parse(name))),
|
||||
PortAgeTerrain.FLAT,null,
|
||||
new PortVegetationPlan(List.of(PortVegetationPlan.TREES,PortVegetationPlan.HUGE_TREES,
|
||||
PortVegetationPlan.FLOWERS)),0,null,null);
|
||||
level.getChunk(0,0);
|
||||
var probePos=new BlockPos(8,3,8);
|
||||
System.out.println("DESERT263_HEIGHT "+name
|
||||
+" motion="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,8,8)
|
||||
+" wg="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE_WG,8,8)
|
||||
+" ground="+level.getBlockState(probePos)
|
||||
+" dirt="+level.getBlockState(probePos).is(net.minecraft.tags.BlockTags.DIRT)
|
||||
+" belowSturdy="+level.getBlockState(probePos.below()).isFaceSturdy(level,probePos.below(),net.minecraft.core.Direction.UP));
|
||||
java.util.Map<String,Integer> ground=new java.util.TreeMap<>();
|
||||
int cacti=0,bushes=0;
|
||||
for(int x=0;x<16;x++)for(int z=0;z<16;z++) {
|
||||
ground.merge(level.getBlockState(new BlockPos(x,4,z)).toString(),1,Integer::sum);
|
||||
for(int y=4;y<20;y++) {
|
||||
var state=level.getBlockState(new BlockPos(x,y,z));
|
||||
if(state.is(Blocks.CACTUS))cacti++;
|
||||
if(state.is(Blocks.DEAD_BUSH))bushes++;
|
||||
}
|
||||
}
|
||||
System.out.println("DESERT263_RESULT "+name+" cacti="+cacti+" bushes="+bushes+" ground="+ground);
|
||||
if(cacti==0)
|
||||
throw new AssertionError("No authored cactus in "+name);
|
||||
}
|
||||
System.out.println("DESERT263_PASS");
|
||||
}catch(Throwable error){
|
||||
System.out.println("DESERT263_FAIL "+error);
|
||||
error.printStackTrace();
|
||||
}finally{event.getServer().halt(false);}
|
||||
});
|
||||
}
|
||||
}
|
||||
+162
@@ -0,0 +1,162 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||
import net.dnorberg.rivencraft.registry.*;
|
||||
import net.dnorberg.rivencraft.book.*;
|
||||
import net.dnorberg.rivencraft.writing.*;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.GlobalPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.*;
|
||||
import net.neoforged.bus.api.*;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class BookDropProbe {
|
||||
static int checks, wait, stage;
|
||||
static boolean cancelReplacement;
|
||||
static ServerLevel level;
|
||||
static final UUID OWNER=UUID.fromString("cc5909e5-aafa-43d6-b841-a917ec9c0115");
|
||||
static final AABB AREA=new AABB(-16,0,-16,32,100,32);
|
||||
static void check(boolean value,String label) { if(!value)throw new AssertionError(label);checks++; }
|
||||
static ItemStack book(boolean descriptive,String name) {
|
||||
var stack=new ItemStack(descriptive?ModItems.DESCRIPTIVE_BOOK.get():ModItems.LINKING_BOOK.get());
|
||||
stack.set(DataComponents.CUSTOM_NAME,Component.literal(name));return stack;
|
||||
}
|
||||
@SubscribeEvent(priority=EventPriority.HIGHEST)
|
||||
public static void cancel(EntityJoinLevelEvent event) {
|
||||
if(event.getLevel()!=level || !(event.getEntity() instanceof ItemEntity item))return;
|
||||
String name=item.getItem().getHoverName().getString();
|
||||
if(name.equals("cancel_original") || cancelReplacement && item instanceof DroppedBookEntity
|
||||
&& name.equals("cancel_preserve"))event.setCanceled(true);
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
level=event.getServer().overworld();level.setChunkForced(0,0,true);wait=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(wait<=0 || --wait!=0)return;
|
||||
try {
|
||||
if(stage==0) { create();stage=1;wait=3; }
|
||||
else if(stage==1) { verify();stage=2;wait=3; }
|
||||
else { check(find("retry_after_reload") instanceof DroppedBookEntity,"Canceled replacement converts after reload");
|
||||
System.out.println("DROP114_PASS checks="+checks);event.getServer().halt(false); }
|
||||
} catch(Throwable error) { System.out.println("DROP114_FAIL "+error);error.printStackTrace();event.getServer().halt(false); }
|
||||
}
|
||||
static void create() {
|
||||
for(int x=0;x<16;x++)for(int z=0;z<16;z++)level.setBlock(new BlockPos(x,63,z),Blocks.STONE.defaultBlockState(),2);
|
||||
var player=net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenDropProbe"));
|
||||
player.setPos(8.5,64,8.5);
|
||||
var stack=book(false,"state_copy");stack.setCount(3);
|
||||
stack.set(ModDataComponents.LINK_TARGET.get(),new LinkTarget(GlobalPos.of(level.dimension(),new BlockPos(-1,64,-2)),135,-20));
|
||||
stack.set(ModDataComponents.LINK_DESTINATION_NAME.get(),"Named destination");
|
||||
stack.set(ModDataComponents.LINK_PROPERTIES.get(),new LinkProperties(LinkProperties.DISARM|LinkProperties.MAINTAIN_MOMENTUM));
|
||||
stack.set(ModDataComponents.AGE_REFERENCE.get(),new AgeReference(UUID.randomUUID(),"Authored Age"));
|
||||
stack.set(ModDataComponents.BOOK_AUTHOR.get(),"Test author");
|
||||
stack.set(ModDataComponents.BOOK_WRITING.get(),new OrderedWriting(List.of(WritingEntry.linkPanel(),
|
||||
WritingEntry.symbol(new SymbolReference(ResourceLocation.parse("rivencraft:terrain/flat"))))));
|
||||
var source=new ItemEntity(level,8.5,66,8.5,stack);
|
||||
source.setTarget(OWNER);source.setThrower(player);source.setPickUpDelay(80);
|
||||
source.setDeltaMovement(12.5,.1,-13.25);source.setYRot(37);source.setXRot(12);
|
||||
source.setNoGravity(true);source.setInvulnerable(true);source.addTag("drop_probe");
|
||||
source.getPersistentData().putString("test_attachment","kept");
|
||||
var copy=DroppedBookEntity.fromDrop(source);
|
||||
check(copy.position().equals(source.position()) && copy.getDeltaMovement().equals(source.getDeltaMovement()),"No departure offset or motion reset");
|
||||
check(copy.getYRot()==37 && copy.getXRot()==12 && copy.isNoGravity() && copy.isInvulnerable(),"Rotation and entity flags");
|
||||
check(ItemStack.matches(source.getItem(),copy.getItem()) && copy.getItem().getCount()==3,"All components and count");
|
||||
check(!copy.getUUID().equals(source.getUUID()) && copy.getAge()==-32768,"Fresh identity and open-book lifetime");
|
||||
check(copy.copy() instanceof DroppedBookEntity && copy.copy().getType()==ModEntities.DROPPED_BOOK.get(),"Pickup-particle copy retains custom renderer type");
|
||||
CompoundTag original=source.saveWithoutId(new CompoundTag()),saved=copy.saveWithoutId(new CompoundTag());
|
||||
for(String key:original.getAllKeys()) {
|
||||
if(key.equals("UUID") || key.equals("Age"))continue;
|
||||
check(java.util.Objects.equals(original.get(key),saved.get(key)),"Native metadata retained: "+key);
|
||||
}
|
||||
var restored=new DroppedBookEntity(ModEntities.DROPPED_BOOK.get(),level);
|
||||
restored.load(saved);
|
||||
check(ItemStack.matches(restored.getItem(),copy.getItem()) && OWNER.equals(restored.getTarget()),"Custom entity NBT reload");
|
||||
for(String name:List.of("bound_link","bound_description","unwritten_link","unwritten_description")) {
|
||||
var item=book(name.endsWith("description"),name);
|
||||
if(name.equals("bound_link")) {
|
||||
item.set(ModDataComponents.LINK_TARGET.get(),stack.get(ModDataComponents.LINK_TARGET.get()));
|
||||
item.set(ModDataComponents.LINK_DESTINATION_NAME.get(),"Named destination");
|
||||
}
|
||||
if(name.equals("bound_description"))item.set(ModDataComponents.AGE_REFERENCE.get(),stack.get(ModDataComponents.AGE_REFERENCE.get()));
|
||||
spawn(item);
|
||||
}
|
||||
player.drop(book(false,"player_toss"),false);
|
||||
net.minecraft.world.Containers.dropItemStack(level,8.5,65,8.5,book(true,"container"));
|
||||
var stand=new BlockPos(10,64,8);
|
||||
level.setBlock(stand,ModBlocks.BOOK_STAND.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.BookStandBlockEntity)level.getBlockEntity(stand)).setBook(book(false,"stand_break"));
|
||||
level.destroyBlock(stand,true);
|
||||
for(int slot=0;slot<36;slot++)player.getInventory().setItem(slot,new ItemStack(Items.STONE,64));
|
||||
stand=new BlockPos(11,64,8);
|
||||
level.setBlock(stand,ModBlocks.BOOK_STAND.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.BookStandBlockEntity)level.getBlockEntity(stand)).setBook(book(false,"full_inventory"));
|
||||
player.setShiftKeyDown(true);
|
||||
level.getBlockState(stand).useWithoutItem(level,player,new BlockHitResult(Vec3.atCenterOf(stand),net.minecraft.core.Direction.UP,stand,false));
|
||||
player.setShiftKeyDown(false);player.getInventory().clearContent();
|
||||
player.getInventory().setItem(0,book(false,"disarm"));
|
||||
LinkDisarmService.disarm(player);
|
||||
check(player.getInventory().getItem(0).isEmpty(),"Disarm emptied book slot");
|
||||
player.getInventory().setItem(0,book(true,"inventory_death_path"));
|
||||
player.getInventory().dropAll();
|
||||
var modifier=new BlockPos(12,64,8);
|
||||
level.setBlock(modifier,ModBlocks.LINK_MODIFIER.get().defaultBlockState(),3);
|
||||
((net.dnorberg.rivencraft.block.entity.LinkModifierBlockEntity)level.getBlockEntity(modifier)).setItem(0,book(false,"station"));
|
||||
level.destroyBlock(modifier,true);
|
||||
var custom=new DroppedBookEntity(level,new Vec3(8.5,66,8.5),book(false,"already_custom"));
|
||||
custom.setNoGravity(true);level.addFreshEntity(custom);
|
||||
for(var item:List.of(ModItems.PAGE.get(),ModItems.NOTEBOOK.get(),ModItems.COLLATION_FOLDER.get(),ModItems.SYMBOL_PORTFOLIO.get())) {
|
||||
var ordinary=new ItemStack(item);ordinary.set(DataComponents.CUSTOM_NAME,Component.literal("ordinary_"+item.toString()));spawn(ordinary);
|
||||
}
|
||||
cancelReplacement=true;spawn(book(false,"cancel_preserve"));
|
||||
var canceled=new ItemEntity(level,8.5,66,8.5,book(false,"cancel_original"));
|
||||
check(!level.addFreshEntity(canceled),"Original spawn cancellation honored");
|
||||
var loaded=new ItemEntity(level,8.5,66,8.5,book(false,"loaded_ordinary"));
|
||||
var tag=loaded.saveWithoutId(new CompoundTag());
|
||||
var fromDisk=new ItemEntity(EntityType.ITEM,level);fromDisk.load(tag);fromDisk.setUUID(UUID.randomUUID());
|
||||
level.addFreshEntity(fromDisk);
|
||||
}
|
||||
static void spawn(ItemStack stack) {
|
||||
var item=new ItemEntity(level,8.5,66,8.5,stack);item.setNoGravity(true);
|
||||
item.setDeltaMovement(Vec3.ZERO);item.setTarget(OWNER);level.addFreshEntity(item);
|
||||
}
|
||||
static ItemEntity find(String name) {
|
||||
var found=level.getEntitiesOfClass(ItemEntity.class,AREA).stream()
|
||||
.filter(e->e.getItem().getHoverName().getString().equals(name)).toList();
|
||||
check(found.size()==1,"Exactly one entity: "+name);
|
||||
return found.getFirst();
|
||||
}
|
||||
static void verify() {
|
||||
for(String name:List.of("bound_link","bound_description","unwritten_link","unwritten_description",
|
||||
"player_toss","container","stand_break","full_inventory","disarm","inventory_death_path","station","already_custom","loaded_ordinary"))
|
||||
check(find(name) instanceof DroppedBookEntity,"Open model: "+name);
|
||||
check("Named destination".equals(find("bound_link").getItem().get(ModDataComponents.LINK_DESTINATION_NAME.get())),"Bound destination retained");
|
||||
var drops=level.getEntitiesOfClass(ItemEntity.class,AREA);
|
||||
check(drops.stream().filter(e->e.getItem().is(Items.LECTERN)).mapToInt(e->e.getItem().getCount()).sum()==1,"One lectern on break");
|
||||
check(drops.stream().filter(e->e.getItem().getHoverName().getString().startsWith("ordinary_")).count()==4,"All non-book drops present");
|
||||
check(drops.stream().noneMatch(e->e instanceof DroppedBookEntity && e.getItem().getHoverName().getString().startsWith("ordinary_")),"Pages and collections stay ordinary");
|
||||
check(drops.stream().noneMatch(e->e.getItem().getHoverName().getString().equals("cancel_original")),"Canceled source produced no ghost");
|
||||
var canceled=find("cancel_preserve");
|
||||
check(!(canceled instanceof DroppedBookEntity),"Canceled replacement keeps source");
|
||||
cancelReplacement=false;
|
||||
var tag=canceled.saveWithoutId(new CompoundTag());canceled.discard();
|
||||
var reloaded=new ItemEntity(EntityType.ITEM,level);reloaded.load(tag);reloaded.setUUID(UUID.randomUUID());
|
||||
reloaded.getItem().set(DataComponents.CUSTOM_NAME,Component.literal("retry_after_reload"));
|
||||
level.addFreshEntity(reloaded);
|
||||
}
|
||||
}
|
||||
+120
@@ -0,0 +1,120 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||
import net.dnorberg.rivencraft.network.*;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
import net.dnorberg.rivencraft.registry.*;
|
||||
import net.dnorberg.rivencraft.book.*;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class DroppedInteractionProbe {
|
||||
static int checks,wait;
|
||||
static ServerLevel level;
|
||||
static void check(boolean value,String name) { if(!value)throw new AssertionError(name);checks++; }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
level=event.getServer().overworld();level.setChunkForced(0,0,true);wait=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(wait<=0 || --wait!=0)return;
|
||||
try { run();System.out.println("DROPINTERACT_PASS checks="+checks); }
|
||||
catch(Throwable e) { System.out.println("DROPINTERACT_FAIL "+e);e.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
}
|
||||
static class ProbePlayer extends net.neoforged.neoforge.common.util.FakePlayer {
|
||||
Vec3 requested;
|
||||
ProbePlayer(ServerLevel level,com.mojang.authlib.GameProfile profile) { super(level,profile); }
|
||||
|
||||
@Override public void teleportTo(ServerLevel destination,double x,double y,double z,float yaw,float pitch) {
|
||||
requested=new Vec3(x,y,z);setPos(x,y,z);
|
||||
}
|
||||
}
|
||||
static void click(DroppedBookEntity book,net.minecraft.server.level.ServerPlayer player) {
|
||||
book.interact(player,InteractionHand.MAIN_HAND);
|
||||
}
|
||||
static DroppedBookEntity spawn() {
|
||||
var stack=new ItemStack(ModItems.LINKING_BOOK.get());
|
||||
stack.set(DataComponents.CUSTOM_NAME,Component.literal("World book"));
|
||||
var book=new DroppedBookEntity(level,new Vec3(8.5,64,8.5),stack);
|
||||
book.setNoGravity(true);book.setDeltaMovement(Vec3.ZERO);book.setNoPickUpDelay();
|
||||
check(level.addFreshEntity(book),"Spawn clickable book");
|
||||
return book;
|
||||
}
|
||||
static DroppedBookActionPayload source(DroppedBookEntity book) {
|
||||
return new DroppedBookActionPayload(book.getId(),book.getUUID(),book.getItem().copy(),
|
||||
DroppedBookActionPayload.Action.USE,"",false);
|
||||
}
|
||||
static void run() throws Exception {
|
||||
for(int x=0;x<16;x++)for(int z=0;z<16;z++)level.setBlock(new BlockPos(x,63,z),Blocks.STONE.defaultBlockState(),2);
|
||||
var player=new ProbePlayer(level,
|
||||
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenInteraction"));
|
||||
player.setPos(8.5,64,8.5);player.getInventory().clearContent();
|
||||
var book=spawn();var expected=source(book);
|
||||
check(book.isPickable(),"Raycast can hit book");
|
||||
book.playerTouch(player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Walking does not pick up");
|
||||
player.setShiftKeyDown(false);click(book,player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Right click opens without pickup");
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem().copy())==book,"Valid source");
|
||||
check(DroppedBookEntity.validated(player,book.getId(),UUID.randomUUID(),book.getItem())==null,"Wrong UUID rejected");
|
||||
var forged=book.getItem().copy();forged.set(DataComponents.CUSTOM_NAME,Component.literal("Forged"));
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),forged)==null,"Changed stack rejected");
|
||||
player.setPos(100,64,100);
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem())==null,"Remote action rejected");
|
||||
ModNetworking.droppedBookAction(player,expected.action(DroppedBookActionPayload.Action.BIND,"Remote",false));
|
||||
check(!book.getItem().has(ModDataComponents.LINK_TARGET.get()),"Remote bind cannot mutate book");
|
||||
player.setPos(8.5,64,8.5);
|
||||
ModNetworking.droppedBookAction(player,source(book).action(DroppedBookActionPayload.Action.BIND,"Ground binding",false));
|
||||
check(book.getItem().has(ModDataComponents.LINK_TARGET.get()) && book.getItem().getHoverName().getString().equals("Ground binding"),"Ground book binding shares normal handler");
|
||||
check(DroppedBookEntity.validated(player,expected.entityId(),expected.entityUuid(),expected.book())==null,"Stale pre-bind request rejected");
|
||||
book.getItem().set(ModDataComponents.LINK_TARGET.get(),new LinkTarget(net.minecraft.core.GlobalPos.of(level.dimension(),new BlockPos(14,64,14)),0,0));
|
||||
book.getItem().set(ModDataComponents.LINK_PROPERTIES.get(),new LinkProperties(LinkProperties.INTRA_LINKING));
|
||||
var use=source(book);
|
||||
ModNetworking.droppedBookAction(player,use);
|
||||
check(player.requested!=null && player.requested.x>13 && player.requested.z>13,"Ground handler requests normal link teleport");
|
||||
check(!book.isRemoved() && book.getItem().getCount()==1,"Travel leaves the same world book");
|
||||
player.setPos(8.5,64,8.5);
|
||||
// Ownership and the original pickup delay are still enforced for explicit pickup.
|
||||
player.setShiftKeyDown(true);book.setTarget(UUID.randomUUID());click(book,player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Owner restriction retained");
|
||||
book.setTarget(player.getUUID());book.setPickUpDelay(80);click(book,player);
|
||||
check(!book.isRemoved(),"Pickup delay retained");
|
||||
book.setNoPickUpDelay();
|
||||
for(int i=0;i<36;i++)player.getInventory().setItem(i,new ItemStack(Items.STONE,64));
|
||||
click(book,player);
|
||||
check(!book.isRemoved() && book.getItem().getCount()==1,"Full inventory keeps world book");
|
||||
player.getInventory().clearContent();click(book,player);
|
||||
check(book.isRemoved(),"Shift right click picks up");
|
||||
check(player.getInventory().countItem(ModItems.LINKING_BOOK.get())==1,"Exactly one book recovered");
|
||||
check(DroppedBookEntity.validated(player,use.entityId(),use.entityUuid(),use.book())==null,"Picked-up source invalidated");
|
||||
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
|
||||
try {
|
||||
DroppedBookActionPayload.STREAM_CODEC.encode(buffer,use);
|
||||
var decoded=DroppedBookActionPayload.STREAM_CODEC.decode(buffer);
|
||||
check(decoded.entityUuid().equals(use.entityUuid()) && decoded.entityId()==use.entityId()
|
||||
&& decoded.action()==use.action() && ItemStack.matches(decoded.book(),use.book()) && buffer.readableBytes()==0,"Action wire round trip");
|
||||
} finally { buffer.release(); }
|
||||
var b=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
|
||||
try {
|
||||
var contents=new OpenDescriptiveBookScreenPayload(false,false,net.minecraft.core.GlobalPos.of(level.dimension(),BlockPos.ZERO),
|
||||
use.book(),null,java.util.List.of());
|
||||
OpenDroppedBookScreenPayload.STREAM_CODEC.encode(b,new OpenDroppedBookScreenPayload(use,contents));
|
||||
var reply=OpenDroppedBookScreenPayload.STREAM_CODEC.decode(b);
|
||||
check(reply.source().entityUuid().equals(use.entityUuid()) && ItemStack.matches(reply.contents().book(),use.book())
|
||||
&& b.readableBytes()==0,"Open screen metadata round trip");
|
||||
} finally { b.release(); }
|
||||
}
|
||||
}
|
||||
+127
@@ -0,0 +1,127 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.UUID;
|
||||
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||
import net.dnorberg.rivencraft.network.*;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class DroppedInteractionProbe {
|
||||
static int checks,wait;
|
||||
static ServerLevel level;
|
||||
static void check(boolean value,String name) { if(!value)throw new AssertionError(name);checks++; }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
level=event.getServer().overworld();level.setChunkForced(0,0,true);wait=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(wait<=0 || --wait!=0)return;
|
||||
try { run();System.out.println("DROPINTERACT_PASS checks="+checks); }
|
||||
catch(Throwable e) { System.out.println("DROPINTERACT_FAIL "+e);e.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
}
|
||||
static class ProbePlayer extends net.neoforged.neoforge.common.util.FakePlayer {
|
||||
Vec3 requested;
|
||||
ProbePlayer(ServerLevel level,com.mojang.authlib.GameProfile profile) { super(level,profile); }
|
||||
|
||||
@Override public boolean teleportTo(ServerLevel destination,double x,double y,double z,
|
||||
java.util.Set<net.minecraft.world.entity.Relative> relative,float yaw,float pitch,boolean resetCamera) {
|
||||
requested=new Vec3(x,y,z);setPos(x,y,z);return true;
|
||||
}
|
||||
}
|
||||
static void click(DroppedBookEntity book,net.minecraft.server.level.ServerPlayer player) {
|
||||
book.interact(player,InteractionHand.MAIN_HAND,Vec3.ZERO);
|
||||
}
|
||||
static DroppedBookEntity spawn() {
|
||||
var stack=new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||
stack.set(DataComponents.CUSTOM_NAME,Component.literal("World book"));
|
||||
var book=new DroppedBookEntity(level,new Vec3(8.5,64,8.5),stack);
|
||||
book.setNoGravity(true);book.setDeltaMovement(Vec3.ZERO);book.setNoPickUpDelay();
|
||||
check(level.addFreshEntity(book),"Spawn clickable book");
|
||||
return book;
|
||||
}
|
||||
static DroppedBookActionPayload source(DroppedBookEntity book) {
|
||||
return new DroppedBookActionPayload(book.getId(),book.getUUID(),book.getItem().copy(),
|
||||
DroppedBookActionPayload.Action.USE,"",false);
|
||||
}
|
||||
static void run() throws Exception {
|
||||
for(int x=0;x<16;x++)for(int z=0;z<16;z++)level.setBlock(new BlockPos(x,63,z),Blocks.STONE.defaultBlockState(),2);
|
||||
var player=new ProbePlayer(level,
|
||||
new com.mojang.authlib.GameProfile(UUID.randomUUID(),"RivenInteraction"));
|
||||
player.setPos(8.5,64,8.5);player.getInventory().clearContent();
|
||||
var book=spawn();var expected=source(book);
|
||||
check(book.isPickable(),"Raycast can hit book");
|
||||
book.playerTouch(player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Walking does not pick up");
|
||||
player.setShiftKeyDown(false);click(book,player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Right click opens without pickup");
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem().copy())==book,"Valid source");
|
||||
check(DroppedBookEntity.validated(player,book.getId(),UUID.randomUUID(),book.getItem())==null,"Wrong UUID rejected");
|
||||
var forged=book.getItem().copy();forged.set(DataComponents.CUSTOM_NAME,Component.literal("Forged"));
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),forged)==null,"Changed stack rejected");
|
||||
player.setPos(100,64,100);
|
||||
check(DroppedBookEntity.validated(player,book.getId(),book.getUUID(),book.getItem())==null,"Remote action rejected");
|
||||
PortBookNetworking.droppedBookAction(player,expected.action(DroppedBookActionPayload.Action.BIND,"Remote",false));
|
||||
check(!book.getItem().has(Rivencraft.LINK_BOOK_TARGET.get()),"Remote bind cannot mutate book");
|
||||
player.setPos(8.5,64,8.5);
|
||||
PortBookNetworking.droppedBookAction(player,source(book).action(DroppedBookActionPayload.Action.BIND,"Ground binding",false));
|
||||
check(book.getItem().has(Rivencraft.LINK_BOOK_TARGET.get()) && book.getItem().getHoverName().getString().equals("Ground binding"),"Ground book binding shares normal handler");
|
||||
check(DroppedBookEntity.validated(player,expected.entityId(),expected.entityUuid(),expected.book())==null,"Stale pre-bind request rejected");
|
||||
book.getItem().set(Rivencraft.LINK_BOOK_TARGET.get(),new net.dnorberg.rivencraft.item.LinkBookTarget(level.dimension().identifier(),14.5,64,14.5,0,0));
|
||||
book.getItem().set(Rivencraft.LINK_PROPERTIES.get(),new net.dnorberg.rivencraft.item.LinkProperties(net.dnorberg.rivencraft.item.LinkProperties.INTRA_LINKING));
|
||||
var use=source(book);
|
||||
PortBookNetworking.droppedBookAction(player,use);
|
||||
check(player.requested==null,"Ground travel still requires catalog acknowledgement");
|
||||
var stateMethod=net.dnorberg.rivencraft.age.AgeCatalogSync.class.getDeclaredMethod("state",net.minecraft.server.MinecraftServer.class);
|
||||
stateMethod.setAccessible(true);var state=stateMethod.invoke(null,level.getServer());
|
||||
var version=state.getClass().getDeclaredField("version");version.setAccessible(true);
|
||||
var ack=net.dnorberg.rivencraft.age.AgeCatalogSync.class.getDeclaredMethod("acknowledge",net.minecraft.server.level.ServerPlayer.class,int.class);
|
||||
ack.setAccessible(true);ack.invoke(null,player,version.getInt(state));
|
||||
PortBookNetworking.droppedBookAction(player,use);
|
||||
check(player.requested!=null && player.requested.x>13 && player.requested.z>13,"Ground handler requests normal link teleport");
|
||||
check(!book.isRemoved() && book.getItem().getCount()==1,"Travel leaves the same world book");
|
||||
player.setPos(8.5,64,8.5);
|
||||
// Ownership and the original pickup delay are still enforced for explicit pickup.
|
||||
player.setShiftKeyDown(true);book.setTarget(UUID.randomUUID());click(book,player);
|
||||
check(!book.isRemoved() && player.getInventory().isEmpty(),"Owner restriction retained");
|
||||
book.setTarget(player.getUUID());book.setPickUpDelay(80);click(book,player);
|
||||
check(!book.isRemoved(),"Pickup delay retained");
|
||||
book.setNoPickUpDelay();
|
||||
for(int i=0;i<36;i++)player.getInventory().setItem(i,new ItemStack(Items.STONE,64));
|
||||
click(book,player);
|
||||
check(!book.isRemoved() && book.getItem().getCount()==1,"Full inventory keeps world book");
|
||||
player.getInventory().clearContent();click(book,player);
|
||||
check(book.isRemoved(),"Shift right click picks up");
|
||||
check(player.getInventory().countItem(Rivencraft.LINKING_BOOK.get())==1,"Exactly one book recovered");
|
||||
check(DroppedBookEntity.validated(player,use.entityId(),use.entityUuid(),use.book())==null,"Picked-up source invalidated");
|
||||
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
|
||||
try {
|
||||
DroppedBookActionPayload.STREAM_CODEC.encode(buffer,use);
|
||||
var decoded=DroppedBookActionPayload.STREAM_CODEC.decode(buffer);
|
||||
check(decoded.entityUuid().equals(use.entityUuid()) && decoded.entityId()==use.entityId()
|
||||
&& decoded.action()==use.action() && ItemStack.matches(decoded.book(),use.book()) && buffer.readableBytes()==0,"Action wire round trip");
|
||||
} finally { buffer.release(); }
|
||||
var b=new RegistryFriendlyByteBuf(Unpooled.buffer(),level.registryAccess());
|
||||
try {
|
||||
for(UUID id:java.util.Arrays.asList(null,UUID.randomUUID())) {
|
||||
var preview=new RequestBookPreviewPayload(UUID.randomUUID(),false,false,level.dimension().identifier(),BlockPos.ZERO,use.book(),id);
|
||||
RequestBookPreviewPayload.STREAM_CODEC.encode(b,preview);
|
||||
var decoded=RequestBookPreviewPayload.STREAM_CODEC.decode(b);
|
||||
check(java.util.Objects.equals(decoded.droppedBook(),id) && b.readableBytes()==0,"Preview source wire round trip");
|
||||
}
|
||||
} finally { b.release(); }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.mixin.LevelBlockEntityTickersAccessor;
|
||||
import net.dnorberg.rivencraft.shared.AcceleratedMachineWork;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
import net.minecraft.world.inventory.ContainerData;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class MachineProbe {
|
||||
static int checks, warmup;
|
||||
static void check(boolean value,String label) {
|
||||
if(!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().overworld().setChunkForced(0,0,true);
|
||||
warmup=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(warmup<=0 || --warmup!=0) return;
|
||||
event.getServer().execute(()->{
|
||||
try { run(event.getServer());System.out.println("MACHINE112_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("MACHINE112_FAIL "+error);error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static class Counter implements TickingBlockEntity {
|
||||
final BlockPos pos; int calls; boolean removed;
|
||||
Counter(BlockPos pos) { this.pos=pos; }
|
||||
public void tick() { calls++; }
|
||||
public boolean isRemoved() { return removed; }
|
||||
public BlockPos getPos() { return pos; }
|
||||
public String getType() { return "rivencraft:test_machine"; }
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
scheduler();
|
||||
ServerLevel level=server.overworld();
|
||||
var registered=((LevelBlockEntityTickersAccessor)level).rivencraft$blockEntityTickers();
|
||||
var near=new BlockPos(1,4,1);
|
||||
check(level.hasChunkAt(near) && level.shouldTickBlocksAt(near),"Forced chunk normally ticks");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var furnace=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
furnace.setItem(0,new ItemStack(Items.IRON_ORE,4));
|
||||
furnace.setItem(1,new ItemStack(Items.COAL,4));
|
||||
var dataField=AbstractFurnaceBlockEntity.class.getDeclaredField("dataAccess");
|
||||
dataField.setAccessible(true);
|
||||
var data=(ContainerData)dataField.get(furnace);
|
||||
// Its ordinary registered ticker is also the one used for acceleration.
|
||||
var ticker=registered.stream().filter(t->t.getPos().equals(near)).findFirst().orElseThrow();
|
||||
ticker.tick();
|
||||
int progress=data.get(2);
|
||||
check(progress>0,"Ordinary registered furnace ticker smelts");
|
||||
AgeMachineTicks.tick(level,0);
|
||||
check(data.get(2)==progress,"Zero pages add no work");
|
||||
AgeMachineTicks.tick(level,1);
|
||||
check(data.get(2)==progress+1,"One page one extra registered furnace tick");
|
||||
AgeMachineTicks.tick(level,4);
|
||||
check(data.get(2)==progress+5,"Repeated pages stack");
|
||||
server.tickRateManager().setFrozen(true);
|
||||
AgeMachineTicks.tick(level,8);
|
||||
check(data.get(2)==progress+5,"Tick freeze respected");
|
||||
server.tickRateManager().setFrozen(false);
|
||||
for(int i=0;i<50;i++) AgeMachineTicks.tick(level,4);
|
||||
check(furnace.getItem(2).is(Items.IRON_INGOT),"Extra ticks complete real smelting recipe");
|
||||
// Overworld's normal event must not enable the Age-only effect.
|
||||
progress=data.get(2);
|
||||
AgeInstabilityRuntime.onLevelTickPost(new net.neoforged.neoforge.event.tick.LevelTickEvent.Post(()->true,level));
|
||||
check(data.get(2)==progress,"Normal Overworld not accelerated by runtime event");
|
||||
level.removeBlock(near,false);
|
||||
AgeMachineTicks.tick(level,8);
|
||||
check(furnace.isRemoved(),"Removed furnace no longer valid");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var replacement=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
replacement.setItem(0,new ItemStack(Items.IRON_ORE));
|
||||
replacement.setItem(1,new ItemStack(Items.COAL));
|
||||
AgeMachineTicks.tick(level,3);
|
||||
var replacementData=(ContainerData)dataField.get(replacement);
|
||||
check(replacement!=furnace && replacementData.get(2)==3,"Replacement uses new bound ticker");
|
||||
|
||||
var valid=new Counter(near);
|
||||
var removed=new Counter(near);removed.removed=true;
|
||||
var unloaded=new Counter(new BlockPos(50000,4,50000));
|
||||
var outsideBorder=new Counter(new BlockPos(30000000,4,0));
|
||||
var original=new ArrayList<>(registered);
|
||||
try {
|
||||
registered.clear();registered.addAll(List.of(valid,removed,unloaded,outsideBorder));
|
||||
AgeMachineTicks.tick(level,3);
|
||||
check(valid.calls==3,"Custom registered ticker supported");
|
||||
check(removed.calls==0 && unloaded.calls==0 && outsideBorder.calls==0,"Removal unloaded and border guards");
|
||||
check(!level.hasChunkAt(unloaded.getPos()),"Does not force-load machinery");
|
||||
} finally { registered.clear();registered.addAll(original); }
|
||||
var ids=java.util.List.of("terrain/flat","biome/plains","biome/single",
|
||||
"environment/accelerated","environment/accelerated","environment/accelerated");
|
||||
var entries=new ArrayList<net.dnorberg.rivencraft.writing.WritingEntry>();
|
||||
entries.add(net.dnorberg.rivencraft.writing.WritingEntry.linkPanel());
|
||||
for(String id:ids) entries.add(net.dnorberg.rivencraft.writing.WritingEntry.symbol(new net.dnorberg.rivencraft.writing.SymbolReference(net.minecraft.resources.ResourceLocation.parse("rivencraft:"+id))));
|
||||
var plan=AgeGenerationPlan.compile(new net.dnorberg.rivencraft.writing.OrderedWriting(entries),112L,
|
||||
AgeGenerationProfiles.STANDARD,AgeTraits.select(112L),server.registryAccess());
|
||||
check(AgeAcceleratedTicks.acceleratedPages(plan)==3,"Repeated authored Accelerated page count");
|
||||
check(AgeAcceleratedTicks.acceleratedPages(AgeGenerationPlan.load(plan.save()))==3,"Saved plan retains page count");
|
||||
}
|
||||
static void scheduler() {
|
||||
var work=new AcceleratedMachineWork();
|
||||
var list=new ArrayList<Counter>();
|
||||
for(int i=0;i<5;i++)list.add(new Counter(BlockPos.ZERO));
|
||||
for(int i=0;i<5;i++)check(work.run(list,20,5,2,c->!c.removed,Counter::tick)==2,"Budget cap");
|
||||
check(list.stream().allMatch(c->c.calls==2),"Fair budget across repeated ticks");
|
||||
work=new AcceleratedMachineWork();
|
||||
list.forEach(c->c.calls=0);
|
||||
for(int i=0;i<5;i++)work.run(list,1,2,20,c->true,Counter::tick);
|
||||
check(list.stream().allMatch(c->c.calls==2),"Candidate window rotates fairly");
|
||||
var mutating=new ArrayList<Counter>();var first=new Counter(BlockPos.ZERO);
|
||||
mutating.add(first);
|
||||
work.run(mutating,4,10,20,c->!c.removed,c->{c.tick();c.removed=true;mutating.clear();});
|
||||
check(first.calls==1,"Removal and live list mutation safe");
|
||||
check(work.run(list,10,5,0,c->true,Counter::tick)==0,"Zero machine budget");
|
||||
check(work.run(list,Integer.MAX_VALUE,5,7,c->true,Counter::tick)==7,"Overflow-safe page budget");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,133 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.mixin.LevelBlockEntityTickersAccessor;
|
||||
import net.dnorberg.rivencraft.shared.AcceleratedMachineWork;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
|
||||
import net.minecraft.world.level.block.entity.TickingBlockEntity;
|
||||
import net.minecraft.world.inventory.ContainerData;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class MachineProbe {
|
||||
static int checks, warmup;
|
||||
static void check(boolean value,String label) {
|
||||
if(!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().overworld().setChunkForced(0,0,true);
|
||||
warmup=5;
|
||||
}
|
||||
@SubscribeEvent public static void tick(ServerTickEvent.Post event) {
|
||||
if(warmup<=0 || --warmup!=0) return;
|
||||
event.getServer().execute(()->{
|
||||
try { run(event.getServer());System.out.println("MACHINE112_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("MACHINE112_FAIL "+error);error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static class Counter implements TickingBlockEntity {
|
||||
final BlockPos pos; int calls; boolean removed;
|
||||
Counter(BlockPos pos) { this.pos=pos; }
|
||||
public void tick() { calls++; }
|
||||
public boolean isRemoved() { return removed; }
|
||||
public BlockPos getPos() { return pos; }
|
||||
public String getType() { return "rivencraft:test_machine"; }
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
scheduler();
|
||||
ServerLevel level=server.overworld();
|
||||
var registered=((LevelBlockEntityTickersAccessor)level).rivencraft$blockEntityTickers();
|
||||
var near=new BlockPos(1,4,1);
|
||||
check(level.hasChunkAt(near) && level.shouldTickBlocksAt(near),"Forced chunk normally ticks");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var furnace=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
furnace.setItem(0,new ItemStack(Items.IRON_ORE,4));
|
||||
furnace.setItem(1,new ItemStack(Items.COAL,4));
|
||||
var dataField=AbstractFurnaceBlockEntity.class.getDeclaredField("dataAccess");
|
||||
dataField.setAccessible(true);
|
||||
var data=(ContainerData)dataField.get(furnace);
|
||||
// Its ordinary registered ticker is also the one used for acceleration.
|
||||
var ticker=registered.stream().filter(t->t.getPos().equals(near)).findFirst().orElseThrow();
|
||||
ticker.tick();
|
||||
int progress=data.get(2);
|
||||
check(progress>0,"Ordinary registered furnace ticker smelts");
|
||||
PortMachineTicks.tick(level,0);
|
||||
check(data.get(2)==progress,"Zero pages add no work");
|
||||
PortMachineTicks.tick(level,1);
|
||||
check(data.get(2)==progress+1,"One page one extra registered furnace tick");
|
||||
PortMachineTicks.tick(level,4);
|
||||
check(data.get(2)==progress+5,"Repeated pages stack");
|
||||
server.tickRateManager().setFrozen(true);
|
||||
PortMachineTicks.tick(level,8);
|
||||
check(data.get(2)==progress+5,"Tick freeze respected");
|
||||
server.tickRateManager().setFrozen(false);
|
||||
for(int i=0;i<50;i++) PortMachineTicks.tick(level,4);
|
||||
check(furnace.getItem(2).is(Items.IRON_INGOT),"Extra ticks complete real smelting recipe");
|
||||
// Overworld's normal event must not enable the Age-only effect.
|
||||
progress=data.get(2);
|
||||
PortAcceleratedTicks.onLevelTickPost(new net.neoforged.neoforge.event.tick.LevelTickEvent.Post(()->true,level));
|
||||
check(data.get(2)==progress,"Normal Overworld not accelerated by runtime event");
|
||||
level.removeBlock(near,false);
|
||||
PortMachineTicks.tick(level,8);
|
||||
check(furnace.isRemoved(),"Removed furnace no longer valid");
|
||||
level.setBlockAndUpdate(near,Blocks.FURNACE.defaultBlockState());
|
||||
var replacement=(AbstractFurnaceBlockEntity)level.getBlockEntity(near);
|
||||
replacement.setItem(0,new ItemStack(Items.IRON_ORE));
|
||||
replacement.setItem(1,new ItemStack(Items.COAL));
|
||||
PortMachineTicks.tick(level,3);
|
||||
var replacementData=(ContainerData)dataField.get(replacement);
|
||||
check(replacement!=furnace && replacementData.get(2)==3,"Replacement uses new bound ticker");
|
||||
|
||||
var valid=new Counter(near);
|
||||
var removed=new Counter(near);removed.removed=true;
|
||||
var unloaded=new Counter(new BlockPos(50000,4,50000));
|
||||
var outsideBorder=new Counter(new BlockPos(30000000,4,0));
|
||||
var original=new ArrayList<>(registered);
|
||||
try {
|
||||
registered.clear();registered.addAll(List.of(valid,removed,unloaded,outsideBorder));
|
||||
PortMachineTicks.tick(level,3);
|
||||
check(valid.calls==3,"Custom registered ticker supported");
|
||||
check(removed.calls==0 && unloaded.calls==0 && outsideBorder.calls==0,"Removal unloaded and border guards");
|
||||
check(!level.hasChunkAt(unloaded.getPos()),"Does not force-load machinery");
|
||||
} finally { registered.clear();registered.addAll(original); }
|
||||
var age=RuntimeAgeBackend.create(server,net.minecraft.resources.Identifier.parse("rivencraft:age/machines112"),112L,null,PortAgeTerrain.FLAT);
|
||||
PortAcceleratedTicks.configure(age,4);
|
||||
check(PortAcceleratedTicks.pages(age)==4,"Age-local configured page count");
|
||||
age.getDataStorage().saveAndJoin();
|
||||
var typeField=PortAccelerationSettings.class.getDeclaredField("CODEC");typeField.setAccessible(true);
|
||||
@SuppressWarnings("unchecked") var codec=(com.mojang.serialization.Codec<PortAccelerationSettings>)typeField.get(null);
|
||||
var saved=codec.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,
|
||||
age.getDataStorage().computeIfAbsent(PortAccelerationSettings.TYPE)).getOrThrow();
|
||||
check(codec.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().pages()==4,"Saved page count reload");
|
||||
check(PortAcceleratedTicks.pages(level)==0,"Other dimension page count unchanged");
|
||||
}
|
||||
static void scheduler() {
|
||||
var work=new AcceleratedMachineWork();
|
||||
var list=new ArrayList<Counter>();
|
||||
for(int i=0;i<5;i++)list.add(new Counter(BlockPos.ZERO));
|
||||
for(int i=0;i<5;i++)check(work.run(list,20,5,2,c->!c.removed,Counter::tick)==2,"Budget cap");
|
||||
check(list.stream().allMatch(c->c.calls==2),"Fair budget across repeated ticks");
|
||||
work=new AcceleratedMachineWork();
|
||||
list.forEach(c->c.calls=0);
|
||||
for(int i=0;i<5;i++)work.run(list,1,2,20,c->true,Counter::tick);
|
||||
check(list.stream().allMatch(c->c.calls==2),"Candidate window rotates fairly");
|
||||
var mutating=new ArrayList<Counter>();var first=new Counter(BlockPos.ZERO);
|
||||
mutating.add(first);
|
||||
work.run(mutating,4,10,20,c->!c.removed,c->{c.tick();c.removed=true;mutating.clear();});
|
||||
check(first.calls==1,"Removal and live list mutation safe");
|
||||
check(work.run(list,10,5,0,c->true,Counter::tick)==0,"Zero machine budget");
|
||||
check(work.run(list,Integer.MAX_VALUE,5,7,c->true,Counter::tick)==7,"Overflow-safe page budget");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
import java.util.*;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.level.biome.*;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeBiomeProbe {
|
||||
static net.dnorberg.rivencraft.writing.WritingEntry page(String path) {
|
||||
return net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||
new net.dnorberg.rivencraft.writing.SymbolReference(id(path)));
|
||||
}
|
||||
static int checks;
|
||||
static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; }
|
||||
static ResourceLocation id(String path) { return ResourceLocation.fromNamespaceAndPath("rivencraft",path); }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||
nether.remove(ResourceLocation.parse("terrablender:deferred_placeholder"));
|
||||
var caves=NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||
check(caves.size()>=3,"Multiple baseline caves");
|
||||
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);
|
||||
var old=lush.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||
"Nether wins over overlapping Cave tag");
|
||||
} finally { bind.invoke(lush,old); }
|
||||
if(!nether.isEmpty()) {
|
||||
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||
var original=biome.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(NativeBiomePools.CAVES);
|
||||
bind.invoke(biome,tags);
|
||||
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||
} finally { bind.invoke(biome,original); }
|
||||
}
|
||||
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||
try {
|
||||
registry.listElements().forEach(biome->{
|
||||
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||
var stripped=new ArrayList<>(tags);stripped.remove(NativeBiomePools.CAVES);
|
||||
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||
});
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||
"Empty cave tag has non-Nether vanilla fallback");
|
||||
} finally {
|
||||
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||
}
|
||||
var traits=AgeTraits.select(111L).withBiomeDistribution(AgeTraits.BiomeDistribution.NATIVE);
|
||||
var sourceMethod=AgeDimensionService.class.getDeclaredMethod("createBiomeSource",
|
||||
MinecraftServer.class,AgeDefinition.class,AgeRuntimeProfile.class);
|
||||
sourceMethod.setAccessible(true);
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||
var writing=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/"+terrain),
|
||||
page("biome/native_"+family.name().toLowerCase(Locale.ROOT))));
|
||||
var plan=AgeGenerationPlan.compile(writing,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||
check(plan.biomeSelection().nativeKind()==family,"Family on "+terrain);
|
||||
check(plan.biomeSelection().biomes().equals(NativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||
var loaded=AgeGenerationPlan.load(plan.save());
|
||||
check(loaded.biomeSelection().equals(plan.biomeSelection()),"Plan reload");
|
||||
var age=new AgeDefinition(UUID.randomUUID(),"probe",111L,AgeGenerationProfiles.STANDARD,
|
||||
AgeDefinition.CURRENT_GENERATION_VERSION,0L,id("age/probe"),null,traits,loaded);
|
||||
var source=(BiomeSource)sourceMethod.invoke(null,server,age,loaded.runtimeProfile());
|
||||
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().location()).collect(java.util.stream.Collectors.toSet())
|
||||
.equals(new HashSet<>(plan.biomeSelection().biomes())),"Generator consumes family on "+terrain);
|
||||
}
|
||||
var repeated=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/flat"),
|
||||
page("biome/native_nether"),page("biome/native_end")));
|
||||
check(AgeGenerationPlan.compile(repeated,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().nativeKind()==NativeBiomeKind.END,"Last family controller wins");
|
||||
var caveProfile=AgeRuntimeProfiles.resolve(AgeGenerationProfiles.CAVE);
|
||||
var empty=net.dnorberg.rivencraft.writing.WritingGrammar.parse(net.dnorberg.rivencraft.writing.OrderedWriting.EMPTY);
|
||||
var omitted=AgeBiomeSelection.compile(empty,traits,caveProfile,111L,server.registryAccess());
|
||||
check(omitted.nativeKind()==NativeBiomeKind.CAVES && omitted.biomes().equals(caves),"Seed-completed Cave Native");
|
||||
var nativeWriting=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),page("biome/native")));
|
||||
check(AgeGenerationPlan.compile(nativeWriting,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().biomes().equals(caves),"Explicit Cave Native");
|
||||
var authored=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),
|
||||
page("biome/crimson_forest"),page("biome/single")));
|
||||
check(AgeGenerationPlan.compile(authored,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().biomes().equals(List.of(ResourceLocation.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||
var oldPool=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(
|
||||
ResourceLocation.withDefaultNamespace("lush_caves"),ResourceLocation.withDefaultNamespace("crimson_forest")));
|
||||
var tag=oldPool.save();tag.remove("NativeKind");
|
||||
check(AgeBiomeSelection.load(tag).equals(oldPool),"Old frozen mixed pool retained");
|
||||
var one=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(ResourceLocation.withDefaultNamespace("lush_caves")),NativeBiomeKind.CAVES);
|
||||
check(AgeBiomeSelection.load(one.save()).equals(one),"Single-cave pool is valid");
|
||||
var policy=new RandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Controller lists do not restrict individual biomes");
|
||||
String name=null;
|
||||
for(int i=0;i<10000;i++) {
|
||||
String candidate="native111_"+i;
|
||||
long seed=server.overworld().getSeed()+AgeDefinition.namedDimensionId(candidate).hashCode();
|
||||
if(AgeRuntimeProfiles.select(seed).equals(AgeGenerationProfiles.CAVE)
|
||||
&& AgeTraits.select(seed).biomeDistribution()==AgeTraits.BiomeDistribution.NATIVE) {name=candidate;break;}
|
||||
}
|
||||
check(name!=null,"Find random Native Cave seed");
|
||||
var age=AgeRegistrySavedData.resolveOrCreate(server.overworld(),new AgeReference(UUID.randomUUID(),name));
|
||||
check(age.randomBiomes()!=null && age.randomBiomes().nativeKind()==NativeBiomeKind.CAVES,"Random Native Cave frozen at creation");
|
||||
check(age.withSpawn(new net.minecraft.core.BlockPos(0,64,0)).randomBiomes().equals(age.randomBiomes()),"Spawn update preserves pool");
|
||||
var saved=AgeRegistrySavedData.get(server.overworld()).save(new net.minecraft.nbt.CompoundTag(),server.registryAccess());
|
||||
var restored=AgeRegistrySavedData.load(saved,server.registryAccess()).find(age.id()).orElseThrow();
|
||||
check(restored.randomBiomes().equals(age.randomBiomes()),"Random pool registry round trip");
|
||||
|
||||
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
import java.util.*;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.level.biome.*;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeBiomeProbe {
|
||||
static int checks;
|
||||
static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; }
|
||||
static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft",path); }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||
nether.remove(Identifier.parse("terrablender:deferred_placeholder"));
|
||||
var caves=PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||
check(caves.size()>=3,"Multiple baseline caves");
|
||||
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);
|
||||
var old=lush.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||
"Nether wins over overlapping Cave tag");
|
||||
} finally { bind.invoke(lush,old); }
|
||||
if(!nether.isEmpty()) {
|
||||
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||
var original=biome.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(PortNativeBiomePools.CAVES);
|
||||
bind.invoke(biome,tags);
|
||||
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||
} finally { bind.invoke(biome,original); }
|
||||
}
|
||||
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||
try {
|
||||
registry.listElements().forEach(biome->{
|
||||
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||
var stripped=new ArrayList<>(tags);stripped.remove(PortNativeBiomePools.CAVES);
|
||||
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||
});
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||
"Empty cave tag has non-Nether vanilla fallback");
|
||||
} finally {
|
||||
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||
}
|
||||
var sourceMethod=RuntimeAgeBackend.class.getDeclaredMethod("authoredBiomeSource",
|
||||
MinecraftServer.class,PortBiomePlan.class,long.class);sourceMethod.setAccessible(true);
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||
var selected=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||
id("terrain/"+terrain),id("biome/native_"+family.name().toLowerCase(Locale.ROOT))),111L);
|
||||
var plan=selected.biomes();
|
||||
check(plan.nativeKind()==family,"Family on "+terrain);
|
||||
check(plan.biomes().equals(PortNativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||
var saved=PortBiomePlan.CODEC.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,plan).getOrThrow();
|
||||
check(PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().equals(plan),"Plan codec reload");
|
||||
var source=(BiomeSource)sourceMethod.invoke(null,server,plan,111L);
|
||||
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().identifier()).collect(java.util.stream.Collectors.toSet())
|
||||
.equals(new HashSet<>(plan.biomes())),"Source consumes family");
|
||||
}
|
||||
check(net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(List.of(id("terrain/flat"),
|
||||
id("biome/native_nether"),id("biome/native_end")),server,111L).nativeKind()==NativeBiomeKind.END,
|
||||
"Last family controller wins even for direct compiler calls");
|
||||
var explicit=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||
List.of(id("terrain/cave"),id("biome/native")),111L).biomes();
|
||||
check(explicit.nativeKind()==NativeBiomeKind.CAVES && explicit.biomes().equals(caves),"Explicit Cave Native");
|
||||
long nativeSeed=0;
|
||||
while(PortRandomAgeSelection.distribution(nativeSeed)!=PortBiomePlan.Distribution.NATIVE)nativeSeed++;
|
||||
var omitted=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||
List.of(id("terrain/cave")),nativeSeed).biomes();
|
||||
check(omitted.nativeKind()==NativeBiomeKind.CAVES,"Seed-completed Native Cave");
|
||||
long randomSeed=0;
|
||||
while(PortRandomAgeSelection.terrain(randomSeed)!=PortAgeTerrain.CAVE
|
||||
|| PortRandomAgeSelection.distribution(randomSeed)!=PortBiomePlan.Distribution.NATIVE)randomSeed++;
|
||||
var random=PortRandomAgeSelection.select(server,randomSeed);
|
||||
check(random.biomes().nativeKind()==NativeBiomeKind.CAVES && random.biomes().biomes().equals(caves),"Random Native Cave");
|
||||
var authored=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||
id("terrain/cave"),id("biome/crimson_forest"),id("biome/single")),111L).biomes();
|
||||
check(authored.biomes().equals(List.of(Identifier.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||
var oldJson=com.google.gson.JsonParser.parseString(
|
||||
"{\"distribution\":\"NATIVE\",\"biomes\":[\"minecraft:lush_caves\",\"minecraft:crimson_forest\"]}");
|
||||
var oldPool=PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,oldJson).getOrThrow();
|
||||
check(oldPool.nativeKind()==NativeBiomeKind.TERRAIN && oldPool.biomes().size()==2,"Old frozen mixed pool retained");
|
||||
var policy=new PortRandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Policy category");
|
||||
int n=0;
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) {
|
||||
var terrain=family==NativeBiomeKind.CAVES?PortAgeTerrain.VOID:family==NativeBiomeKind.NETHER?PortAgeTerrain.STANDARD:PortAgeTerrain.CAVE;
|
||||
var plan=new PortBiomePlan(PortBiomePlan.Distribution.NATIVE,PortNativeBiomePools.pool(server.registryAccess(),family),family);
|
||||
var age=RuntimeAgeBackend.create(server,id("age/native111_"+n++),111L,plan,terrain);
|
||||
check(age.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().size()==plan.biomes().size(),"Runtime terrain override "+terrain);
|
||||
}
|
||||
check(registry.get(ResourceKey.create(Registries.BIOME,Identifier.withDefaultNamespace("sulfur_caves"))).isEmpty()
|
||||
|| caves.contains(Identifier.withDefaultNamespace("sulfur_caves")),"New vanilla Sulfur Caves included");
|
||||
|
||||
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.PortConfig;
|
||||
import net.dnorberg.rivencraft.age.*;
|
||||
import net.dnorberg.rivencraft.compat.*;
|
||||
import net.dnorberg.rivencraft.portal.*;
|
||||
import net.dnorberg.rivencraft.block.*;
|
||||
import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity;
|
||||
import net.dnorberg.rivencraft.item.LinkBookTarget;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class PortalEngineProbe {
|
||||
private static int checks;
|
||||
@SubscribeEvent public static void join(net.neoforged.neoforge.event.entity.EntityJoinLevelEvent event) {
|
||||
if(event.getEntity().getClass().getName().startsWith("qouteall.imm_ptl"))
|
||||
System.out.println("PORTAL117_SPAWN "+event.getEntity()+" at "+event.getEntity().getBoundingBox());
|
||||
}
|
||||
private static void check(boolean pass,String label) {
|
||||
if(!pass) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
private static int warmup;
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().overworld().setChunkForced(0,0,true);
|
||||
warmup=3;
|
||||
}
|
||||
@SubscribeEvent public static void tick(net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) {
|
||||
if(warmup<=0 || --warmup!=0) return;
|
||||
event.getServer().execute(() -> {
|
||||
try {
|
||||
run(event.getServer());
|
||||
System.out.println("PORTAL117_PASS checks="+checks);
|
||||
}catch(Throwable error) {
|
||||
System.out.println("PORTAL117_FAIL "+error);
|
||||
error.printStackTrace();
|
||||
}finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
private static void run(net.minecraft.server.MinecraftServer server) {
|
||||
boolean nativeViews=ImmersiveBookPreviews.available();
|
||||
check(ImmersiveBookPreviews.bookViewsEnabled()==nativeViews,"Default book view selection");
|
||||
check(ImmersiveBookPreviews.crystalViewsEnabled()==nativeViews,"Default crystal view selection");
|
||||
var id=Identifier.parse("rivencraft:age/portal117");
|
||||
var destination=RuntimeAgeBackend.create(server,id,117L,null,PortAgeTerrain.FLAT);
|
||||
check(ImmersivePortalsCompatibility.synchronize(server),"Dynamic catalog sync");
|
||||
check(server.getLevel(destination.dimension())==destination,"First-party Age remains authoritative");
|
||||
destination.getChunkAt(new BlockPos(24,4,24));
|
||||
var level=server.overworld();
|
||||
level.getChunk(0,0);
|
||||
var owner=new BlockPos(7,65,7);
|
||||
for(int x=7;x<=10;x++) for(int y=64;y<=68;y++)
|
||||
if(x==7 || x==10 || y==64 || y==68)
|
||||
level.setBlock(new BlockPos(x,y,8),Rivencraft.CRYSTAL_BLOCK.get().defaultBlockState(),2);
|
||||
level.setBlock(owner,Rivencraft.BOOK_RECEPTACLE.get().defaultBlockState()
|
||||
.setValue(BookReceptacleBlock.FACING,Direction.NORTH),2);
|
||||
var holder=(BookReceptacleBlockEntity)level.getBlockEntity(owner);
|
||||
var book=new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||
book.set(Rivencraft.LINK_BOOK_TARGET.get(),new LinkBookTarget(id,24.5,4,24.5,90,0));
|
||||
holder.setBook(book);
|
||||
var plan=CrystalPortalNetwork.plan(level,owner);
|
||||
check(plan.valid() && plan.portalCells().size()==6,"One six-cell opening");
|
||||
check(CrystalPortalNetwork.activate(level,owner,plan,null),"Frame activation");
|
||||
System.out.println("PORTAL117_SURFACES "+CrystalPortalSurfaces.group(level,plan));
|
||||
System.out.println("PORTAL117_DEST "+PortalBookTravel.destination(level,book,owner,0,0));
|
||||
if(nativeViews) System.out.println("PORTAL117_NATIVE "+Native.count(level,owner));
|
||||
check(plan.portalCells().stream().allMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)==nativeViews),
|
||||
"Native or fallback state");
|
||||
if(nativeViews) Native.checkViews(level,owner,plan,id);
|
||||
CrystalPortalNetwork.shutdown(level,owner);
|
||||
if(nativeViews) check(Native.count(level,owner)==0,"Shutdown removes native surfaces");
|
||||
check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).is(Rivencraft.CRYSTAL_PORTAL.get())),
|
||||
"Shutdown removes cells");
|
||||
}
|
||||
private static final class Native {
|
||||
static java.util.List<qouteall.imm_ptl.core.portal.Portal> portals(
|
||||
net.minecraft.server.level.ServerLevel level,BlockPos owner) {
|
||||
return level.getEntitiesOfClass(qouteall.imm_ptl.core.portal.Portal.class,new AABB(owner).inflate(20),
|
||||
e->e.portalTag!=null && e.portalTag.startsWith("rivencraft:crystal:mc263:v1:"));
|
||||
}
|
||||
static int count(net.minecraft.server.level.ServerLevel level,BlockPos owner) { return portals(level,owner).size(); }
|
||||
static void checkViews(net.minecraft.server.level.ServerLevel level,BlockPos owner,
|
||||
CrystalPortalNetwork.Plan plan,Identifier id) {
|
||||
var views=portals(level,owner);
|
||||
check(views.size()==2,"One continuous mesh per side, not six repeated views");
|
||||
for(var view:views) {
|
||||
check(!view.getTeleportable() && !view.isInteractable(),"Rivencraft retains travel/interactions");
|
||||
double spanX=Math.abs(view.getAxisW().x*view.getWidth())+Math.abs(view.getAxisH().x*view.getHeight());
|
||||
double spanY=Math.abs(view.getAxisW().y*view.getWidth())+Math.abs(view.getAxisH().y*view.getHeight());
|
||||
check(Math.abs(spanX-2)<0.00001 && Math.abs(spanY-3)<0.00001,"Whole opening dimensions");
|
||||
var eye=new net.minecraft.world.phys.Vec3(9,65+1.62,8.5);
|
||||
check(view.transformPoint(eye).distanceTo(new net.minecraft.world.phys.Vec3(24.5,4+1.62,24.5))<0.00001,
|
||||
"Standing eye maps to exact linked arrival");
|
||||
check(view.getDestDim().identifier().equals(id),"Dynamic destination");
|
||||
check(view.getPortalShape() instanceof qouteall.imm_ptl.core.portal.shape.SpecialFlatPortalShape,
|
||||
"Masked opening mesh");
|
||||
}
|
||||
var ids=views.stream().map(net.minecraft.world.entity.Entity::getUUID).collect(java.util.stream.Collectors.toSet());
|
||||
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||
check(portals(level,owner).stream().allMatch(p->ids.contains(p.getUUID())),"Refresh reuses existing views");
|
||||
var setting=ImmersiveBookPreviews.seamless()?PortConfig.SEAMLESS_CRYSTAL_VIEWS:PortConfig.CRYSTAL_LIVE_VIEWS;
|
||||
setting.set(false);
|
||||
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||
check(count(level,owner)==0,"Config disable removes views");
|
||||
check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)),
|
||||
"Disabled config restores animated fallback");
|
||||
setting.set(true);
|
||||
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||
check(count(level,owner)==2,"Config enable rebuilds views");
|
||||
}
|
||||
}
|
||||
}
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
import java.util.List;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.dnorberg.rivencraft.book.*;
|
||||
import net.dnorberg.rivencraft.writing.*;
|
||||
import net.dnorberg.rivencraft.network.AgeCelestialAnglePayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class StaticSkyProbe {
|
||||
static int checks;
|
||||
static void check(boolean condition,String label) {
|
||||
if(!condition) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try {
|
||||
run(event.getServer());
|
||||
System.out.println("STATIC109_PASS checks="+checks);
|
||||
}catch(Throwable error) {
|
||||
System.out.println("STATIC109_FAIL "+error);
|
||||
error.printStackTrace();
|
||||
}finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static WritingEntry page(String id) {
|
||||
return WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath("rivencraft",id)));
|
||||
}
|
||||
static AgeGenerationPlan plan(net.minecraft.server.MinecraftServer server,String... ids) {
|
||||
var entries=new java.util.ArrayList<WritingEntry>();
|
||||
entries.add(WritingEntry.linkPanel());
|
||||
for(var id:ids) entries.add(page(id));
|
||||
return AgeGenerationPlan.compile(new OrderedWriting(entries),109L,
|
||||
AgeGenerationProfiles.STANDARD,AgeTraits.select(109L),server.registryAccess());
|
||||
}
|
||||
static void run(net.minecraft.server.MinecraftServer server) {
|
||||
String[][] pages={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"},
|
||||
{"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"},
|
||||
{"number/24","number/24","sky/static"}};
|
||||
int[] expected={48,1,8,48,128,128};
|
||||
for(int i=0;i<pages.length;i++) {
|
||||
var plan=plan(server,pages[i]);
|
||||
check(plan.writingInstability()==0,"No number/order penalty");
|
||||
var sky=AgeSkyProfile.compile(plan,AgeTraits.select(109L));
|
||||
check(sky.staticResolution()==expected[i],"Resolution");
|
||||
var loaded=AgeGenerationPlan.load(plan.save());
|
||||
check(AgeSkyProfile.compile(loaded,AgeTraits.select(109L)).equals(sky),"Frozen plan persistence");
|
||||
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),server.registryAccess());
|
||||
try {
|
||||
var packet=new AgeCelestialAnglePayload(net.minecraft.world.level.Level.OVERWORLD,0F,sky);
|
||||
AgeCelestialAnglePayload.STREAM_CODEC.encode(buffer,packet);
|
||||
check(AgeCelestialAnglePayload.STREAM_CODEC.decode(buffer).equals(packet),"Network round trip");
|
||||
check(buffer.readableBytes()==0,"No unread bytes");
|
||||
}finally { buffer.release(); }
|
||||
}
|
||||
var color=plan(server,"number/10","color/red","number/8","sky/static");
|
||||
var sky=AgeSkyProfile.compile(color,AgeTraits.select(109L));
|
||||
check(sky.color()==0x640000 && sky.staticResolution()==8,"Independent color and resolution");
|
||||
check(AgeSkyProfile.compile(plan(server,"sky/overworld"),AgeTraits.select(109L)).staticResolution()==48,
|
||||
"Non-static default");
|
||||
var misplaced=plan(server,"number/8","color/red","sky/static");
|
||||
check(AgeSkyProfile.compile(misplaced,AgeTraits.select(109L)).staticResolution()==48,"Adjacent only");
|
||||
var flood=plan(server,"number/2","number/24","environment/flooded");
|
||||
check(AgeFlooding.requested(flood)==74 && flood.writingInstability()==0,"Flooded digit grammar unchanged");
|
||||
}
|
||||
}
|
||||
+71
@@ -0,0 +1,71 @@
|
||||
package net.dnorberg.rivencraft.regression;
|
||||
import java.util.List;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
import net.dnorberg.rivencraft.age.*;
|
||||
import net.dnorberg.rivencraft.writing.PortWritingRecovery;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import com.mojang.serialization.JsonOps;
|
||||
import com.google.gson.JsonParser;
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public class StaticSkyProbe {
|
||||
static int checks;
|
||||
static void check(boolean condition,String label) {
|
||||
if(!condition) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try {
|
||||
run(event.getServer());
|
||||
System.out.println("STATIC109_PASS checks="+checks);
|
||||
}catch(Throwable error) {
|
||||
System.out.println("STATIC109_FAIL "+error);
|
||||
error.printStackTrace();
|
||||
}finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static List<Identifier> pages(String... paths) {
|
||||
return java.util.Arrays.stream(paths).map(s->Identifier.fromNamespaceAndPath("rivencraft",s)).toList();
|
||||
}
|
||||
static void run(net.minecraft.server.MinecraftServer server) {
|
||||
String[][] cases={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"},
|
||||
{"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"},
|
||||
{"number/24","number/24","sky/static"}};
|
||||
int[] expected={48,1,8,48,128,128};
|
||||
for(int i=0;i<cases.length;i++) {
|
||||
var writing=pages(cases[i]);
|
||||
check(PortWritingRecovery.recover(writing).diagnostics().isEmpty(),"No number/order penalty");
|
||||
check(PortAgeColors.validNumbers(writing),"Numeric writing valid");
|
||||
var colors=PortAgeColors.compile(writing,109L);
|
||||
check(colors.staticResolution()==expected[i],"Resolution");
|
||||
var saved=PortAgeColors.CODEC.encodeStart(JsonOps.INSTANCE,colors).getOrThrow();
|
||||
check(PortAgeColors.CODEC.parse(JsonOps.INSTANCE,saved).getOrThrow().equals(colors),"Saved codec");
|
||||
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),server.registryAccess());
|
||||
try {
|
||||
var id=Identifier.parse("rivencraft:age/static_probe");
|
||||
var packet=new AgeCatalogPayload(109,List.of(id),java.util.Map.of(id,colors),
|
||||
java.util.Map.of(),java.util.Map.of());
|
||||
AgeCatalogPayload.STREAM_CODEC.encode(buffer,packet);
|
||||
check(AgeCatalogPayload.STREAM_CODEC.decode(buffer).equals(packet),"Full catalog round trip");
|
||||
check(buffer.readableBytes()==0,"No unread bytes");
|
||||
}finally { buffer.release(); }
|
||||
}
|
||||
var old=PortAgeColors.CODEC.parse(JsonOps.INSTANCE,JsonParser.parseString(
|
||||
"{\"sky\":-1,\"ambient\":-1}")).getOrThrow();
|
||||
check(old.staticResolution()==48 && old.equals(PortAgeColors.NATIVE),"Old save default");
|
||||
var color=PortAgeColors.compile(pages("number/10","color/red","number/8","sky/static"),109L);
|
||||
check(color.sky()==0x640000 && color.staticResolution()==8,"Independent color");
|
||||
check(PortAgeColors.compile(pages("number/8","color/red","sky/static"),109L).staticResolution()==48,
|
||||
"Adjacent only");
|
||||
check(PortAgeColors.compile(pages("sky/overworld"),109L).staticResolution()==48,"Non-static default");
|
||||
var flood=pages("number/2","number/24","environment/flooded");
|
||||
check(PortFlooding.requested(flood)==74 && PortWritingRecovery.recover(flood).diagnostics().isEmpty(),
|
||||
"Flooded grammar unchanged");
|
||||
check(!PortWritingRecovery.recover(pages("number/8","sky/overworld")).diagnostics().isEmpty(),
|
||||
"Other sky does not consume number");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Average a JSON-exported SavedData block profile, including zero-count chunks."""
|
||||
import argparse
|
||||
import collections
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
def generate(source, version):
|
||||
raw = source.read_bytes()
|
||||
data = json.loads(raw)["nbt"]["data"]
|
||||
samples = data.get("Samples", data.get("samples"))
|
||||
if not samples:
|
||||
raise ValueError("The source profile has no sampled chunks")
|
||||
totals = collections.Counter()
|
||||
for sample in samples:
|
||||
counts = sample.get("Blocks", sample.get("blocks"))
|
||||
if not isinstance(counts, dict) or any(not isinstance(n, int) or n < 0 for n in counts.values()):
|
||||
raise ValueError("Invalid sampled block counts")
|
||||
totals.update(counts)
|
||||
return {
|
||||
"minecraft_version": version,
|
||||
"source_sample_count": len(samples),
|
||||
"source_sha256": hashlib.sha256(raw).hexdigest(),
|
||||
"blocks_per_chunk": {key: total / len(samples) for key, total in sorted(totals.items())},
|
||||
}
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("source", type=Path)
|
||||
parser.add_argument("version", choices=("1.21.1", "26.3"))
|
||||
parser.add_argument("output", type=Path)
|
||||
args = parser.parse_args()
|
||||
args.output.parent.mkdir(parents=True, exist_ok=True)
|
||||
args.output.write_text(json.dumps(generate(args.source, args.version), indent=2) + "\n")
|
||||
@@ -160,7 +160,7 @@ def release_metadata(args: argparse.Namespace) -> tuple[dict, dict]:
|
||||
]
|
||||
curseforge["relations"] = {"projects": [
|
||||
{"slug": "badpackets", "type": "requiredDependency"},
|
||||
{"slug": "dynamicdimension-ar-edition", "projectID": "1469680", "type": "requiredDependency"},
|
||||
{"slug": "dynamicdimension-ar-edition", "projectID": 1469680, "type": "requiredDependency"},
|
||||
]}
|
||||
return modrinth, curseforge
|
||||
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Exercise the bundled-baseline Java policy without a server or test world."""
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
from generate_block_baseline import generate
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
JAVA = r"""
|
||||
import java.util.Map;
|
||||
import net.dnorberg.rivencraft.shared.MaterialBaselinePolicy;
|
||||
|
||||
public class BaselineDefaultsChecks {
|
||||
private static int checks;
|
||||
private static void equal(double actual, double expected, String label) {
|
||||
checks++;
|
||||
if (Math.abs(actual - expected) > 1e-9) throw new AssertionError(label + ": " + actual + " != " + expected);
|
||||
}
|
||||
public static void main(String[] args) {
|
||||
var policy = MaterialBaselinePolicy.load("/assets/rivencraft/instability/default_block_baseline.json");
|
||||
double iron = Double.parseDouble(args[0]), coal = Double.parseDouble(args[1]);
|
||||
equal(policy.average("minecraft:coal_ore", 0, 500, false, 0), coal, "Void coal default");
|
||||
equal(policy.average("minecraft:coal_ore", 25, 500, false, 0), .05, "Measured vanilla wins");
|
||||
equal(policy.average("test:tin_ore", 0, 500, true, 1000), 2, "Measured iron for missing modded ore");
|
||||
equal(policy.average("test:tin_ore", 0, 500, true, 0), iron, "Void uses bundled iron");
|
||||
equal(policy.average("create:zinc_ore", 0, 500, true, 0), iron, "Bundled modded entry cannot replace iron rule");
|
||||
equal(policy.average("test:tin_ore", 5, 500, true, 0), .01, "Measured modded ore wins");
|
||||
equal(policy.average("test:tin_ore", 0, 1000, true, 2000), 2, "Chunk-count normalization");
|
||||
equal(policy.average("test:tin_block", 0, 500, false, 1000), 0, "No iron fallback for storage");
|
||||
equal(policy.average("test:fluid", 0, 500, false, 1000), 0, "No iron fallback for fluid");
|
||||
equal(policy.average("minecraft:diamond_block", 0, 500, false, 0), 0, "Absent default remains zero");
|
||||
equal(policy.average("minecraft:coal_ore", 1, 3, false, 0), 1.0 / 3, "No integer rounding");
|
||||
try {
|
||||
policy.average("minecraft:coal_ore", 0, 0, false, 0);
|
||||
throw new AssertionError("Empty profile accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
try {
|
||||
new MaterialBaselinePolicy(Map.of("minecraft:iron_ore", Double.NaN));
|
||||
throw new AssertionError("NaN accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
try {
|
||||
new MaterialBaselinePolicy(Map.of("minecraft:coal_ore", 1.0));
|
||||
throw new AssertionError("Missing iron accepted");
|
||||
} catch (IllegalArgumentException expected) { checks++; }
|
||||
System.out.println("BASELINE_DEFAULTS_PASS version=" + args[2] + " checks=" + checks);
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
def main(source_dir):
|
||||
gson = next((Path.home() / ".gradle/caches/modules-2/files-2.1/com.google.code.gson/gson").rglob("gson-*.jar"))
|
||||
output = ROOT / "build/verification/baseline115/defaults.txt"
|
||||
output.parent.mkdir(parents=True, exist_ok=True)
|
||||
lines = []
|
||||
with tempfile.TemporaryDirectory(prefix="rivencraft-baseline-policy-") as temp:
|
||||
work = Path(temp)
|
||||
fixture = work / "BaselineDefaultsChecks.java"
|
||||
fixture.write_text(JAVA)
|
||||
subprocess.run(["javac", "-cp", str(gson), "-d", temp,
|
||||
str(ROOT / "shared/src/main/java/net/dnorberg/rivencraft/shared/MaterialBaselinePolicy.java"),
|
||||
str(fixture)], check=True)
|
||||
for version, resources, iron, coal in [
|
||||
("1.21.1", ROOT / "src/main/resources", 89.96656534954407, 170.09625126646404),
|
||||
("26.3", ROOT / "ports/mc263/src/main/resources", 76.5361328125, 95.7587890625),
|
||||
]:
|
||||
bundled = json.loads((resources / "assets/rivencraft/instability/default_block_baseline.json").read_text())
|
||||
if source_dir:
|
||||
expected = generate(source_dir / ("baseline-" + version + ".json"), version)
|
||||
assert bundled == expected, "Bundled averages differ from source chunk means: " + version
|
||||
lines.append("SOURCE_AVERAGES_PASS version=" + version + " chunks=" + str(bundled["source_sample_count"]))
|
||||
result = subprocess.run(["java", "-cp", ":".join(map(str, [work, gson, resources])),
|
||||
"BaselineDefaultsChecks", str(iron), str(coal), version], check=True, capture_output=True, text=True)
|
||||
lines.append(result.stdout.strip())
|
||||
output.write_text("\n".join(lines) + "\n")
|
||||
print("\n".join(lines))
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--source-dir", type=Path, help="Optionally verify each bundled mean against the original JSON exports")
|
||||
main(parser.parse_args().source_dir)
|
||||
Loaded 100 of 154 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user