Compare commits

..
Author SHA1 Message Date
dnorberg d199ac253e Add native biome families, desert vegetation, static sky controls and Seamless views
Build and smoke / changes (push) Waiting to run
2026-11-17 18:12:07 -05:00
dnorberg 90e4a98a7a Use integer CurseForge dependency project IDs for release uploads
Build and smoke / changes (push) Canceled after 0s
Build and smoke / build (push) Canceled after 0s
2026-11-15 22:11:17 -05:00
dnorberg 441f2896d7 Add Flooded pages across Minecraft versions and fix 1.21.1 workstations
Build and smoke / changes (push) Canceled after 0s
Build and smoke / build (push) Canceled after 0s
2026-11-15 22:08:56 -05:00
dnorberg 4a59fb5d02 Complete 26.3 parity acceptance and dual-version release workflow
Build and smoke / changes (push) Canceled after 0s
Build and smoke / build (push) Canceled after 0s
2026-11-14 12:17:49 -05:00
dnorberg 41daff1e61 Release 26.3.0.1 with live Reborn views and random page policies
Build / build (push) Canceled after 0s
2026-11-11 17:15:46 -05:00
160 changed files with 6615 additions and 643 deletions

No files matched your search

+64
View File
@@ -0,0 +1,64 @@
name: Build and smoke
on: [push, pull_request]
permissions:
contents: read
jobs:
changes:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.targets.outputs.matrix }}
any: ${{ steps.targets.outputs.any }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Check release workflow safeguards
run: python3 scripts/test_release_workflow.py -v
- id: targets
env:
BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
run: |
base="$BASE"
if [ -z "$base" ] || ! git cat-file -e "$base^{commit}" 2>/dev/null; then
base=$(git rev-parse HEAD^)
fi
matrix=$(python3 scripts/changed_targets.py --base "$base")
echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
if [ "$matrix" = '{"include":[]}' ]; then
echo "any=false" >> "$GITHUB_OUTPUT"
else
echo "any=true" >> "$GITHUB_OUTPUT"
fi
build:
needs: changes
if: needs.changes.outputs.any == 'true'
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
fail-fast: false
max-parallel: 1
matrix: ${{ fromJSON(needs.changes.outputs.matrix) }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- uses: gradle/actions/setup-gradle@v4
- name: Build Minecraft target
run: ./gradlew ${{ matrix.gradle_args }} --console=plain
- name: Disposable dedicated-server smoke
run: python3 scripts/smoke_server.py --target ${{ matrix.target }}
- name: Keep smoke logs
if: always()
uses: actions/upload-artifact@v3
with:
name: smoke-${{ matrix.target }}
path: build/verification/${{ matrix.target }}/*.log
if-no-files-found: ignore
+54 -15
View File
@@ -1,25 +1,64 @@
name: Build name: Build and smoke
on: [push, pull_request] on: [push, pull_request]
permissions:
contents: read
jobs: jobs:
build: changes:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.targets.outputs.matrix }}
any: ${{ steps.targets.outputs.any }}
steps: steps:
- name: Checkout repository - uses: actions/checkout@v4
uses: actions/checkout@v4 with:
fetch-depth: 0
- name: Check release workflow safeguards
run: python3 scripts/test_release_workflow.py -v
- id: targets
env:
BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
run: |
base="$BASE"
if [ -z "$base" ] || ! git cat-file -e "$base^{commit}" 2>/dev/null; then
base=$(git rev-parse HEAD^)
fi
matrix=$(python3 scripts/changed_targets.py --base "$base")
echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
if [ "$matrix" = '{"include":[]}' ]; then
echo "any=false" >> "$GITHUB_OUTPUT"
else
echo "any=true" >> "$GITHUB_OUTPUT"
fi
build:
needs: changes
if: needs.changes.outputs.any == 'true'
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
fail-fast: false
max-parallel: 1
matrix: ${{ fromJSON(needs.changes.outputs.matrix) }}
steps:
- uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
fetch-tags: true fetch-tags: true
- uses: actions/setup-java@v4
- name: Setup JDK 21
uses: actions/setup-java@v4
with: with:
java-version: '21' java-version: ${{ matrix.java }}
distribution: 'temurin' distribution: temurin
- uses: gradle/actions/setup-gradle@v4
- name: Setup Gradle - name: Build Minecraft target
uses: gradle/actions/setup-gradle@v4 run: ./gradlew ${{ matrix.gradle_args }} --console=plain
- name: Disposable dedicated-server smoke
- name: Build with Gradle run: python3 scripts/smoke_server.py --target ${{ matrix.target }}
run: ./gradlew build - name: Keep smoke logs
if: always()
uses: actions/upload-artifact@v4
with:
name: smoke-${{ matrix.target }}
path: build/verification/${{ matrix.target }}/*.log
if-no-files-found: ignore
+23 -21
View File
@@ -10,25 +10,25 @@ 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 bodies. It is an independently developed project, not a byte-for-byte copy of
the 1.12.2 mod. the 1.12.2 mod.
The gameplay guide below describes the **Minecraft 1.21.1 release**. A separate, Current releases: **1.21.1.0.6** and **26.3.0.10**, with separate Minecraft-specific JARs and saves.
incomplete **Minecraft 26.3 beta** is available: Java 25, NeoForge 26.3.0.99,
and a first-party Age backend (no Dynamic Dimensions or Bad Packets). It now The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate
supports authored terrain/biomes, structure and vegetation pages, independent **Minecraft 26.3 release** uses Java 25, NeoForge 26.3.0.99 and a first-party Age
Age weather/lighting, seeded and colorable Overworld/Nether/End/Static skies, backend; it does not require Dynamic Dimensions or Bad Packets. Both tracks include
independent Sun/Moon controls, multiple bodies and eclipses, seeded biome and authored/seeded Ages, writing stations, libraries, crystal portals, celestials,
feature completion, and random structure selection. Nether/End noise-biome instability and Link Modifier controls. JEI, TerraBlender/Biomes O' Plenty,
materials now follow their native rules. Books now have Legacy-style spreads, Serene Seasons and Ruins remain optional. See the [26.3 guide](ports/mc263/README.md)
animated fallback panels and saved destination labels; lectern stands, open-book and [parity review](docs/MC263_PARITY_REVIEW.md).
drops, page collections, stations and basic progression are also ported. The latest
beta includes libraries, fallback crystal portals, live instability profiling and These releases add [Native biome-family Pages](docs/NATIVE_BIOME_FAMILIES.md),
hazards, ordered writing recovery, and the Link Modifier with property, seed and [desert vegetation](docs/DESERT_VEGETATION.md) and Number-controlled
operator retirement controls. JEI, TerraBlender/Biomes O' Plenty, Serene Seasons [Static Sky resolution](docs/STATIC_SKY_RESOLUTION.md).
and Ruins integrations are now available as optional additions. Live destination On 26.3, optional Immersive Portals Reborn or Seamless Portals provides live book
renderers, remaining discovery/configuration parity and the final multiplayer and crystal portal views, including look-only exploration in the book panel.
regression remain unfinished. Install only one fork; built-in animations work without either.
See the [26.3 beta guide](ports/mc263/README.md) and Known Reborn/Seamless crashes and travel disconnects remain tracked in
[latest beta release notes](ports/mc263/RELEASE_NOTES_1.0.1.136-beta.1.md). [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
Keep the builds and their saves separate, and back up worlds before updating. Use matching client/server builds, keep Minecraft tracks separate and back up worlds before updating.
## Getting started ## Getting started
@@ -130,8 +130,10 @@ checks from manual evidence and known limitations.
The JAR is written to `build/libs/`. Development runs need the required mods; The JAR is written to `build/libs/`. Development runs need the required mods;
see [GameTest guidance](docs/GAMETESTS.md) for focused archived suites. see [GameTest guidance](docs/GAMETESTS.md) for focused archived suites.
Versions use `x.y.z.b`: major release, completed milestone, release slice, New versions prefix the Minecraft version, followed by the milestone/release
then fixes/additional work within that slice. 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 is licensed under LGPL-3.0-or-later. Legacy-derived material is Rivencraft is licensed under LGPL-3.0-or-later. Legacy-derived material is
credited in [NOTICE](NOTICE) and [asset provenance](docs/ASSET_PROVENANCE.md). credited in [NOTICE](NOTICE) and [asset provenance](docs/ASSET_PROVENANCE.md).
+14
View File
@@ -0,0 +1,14 @@
# Rivencraft 1.21.1.0.1
For Minecraft 1.21.1, NeoForge 21.1.264 and Java 21.
Requires Dynamic Dimensions AR Edition and Bad Packets as before.
- Fixed Ink Mixers draining a full vial for one Link Panel. Each panel now costs
one paper and one ink; one full vial produces 16 panels.
- Modifier chances remain in the basin while previewing and reset only when a
panel is taken. Output refreshes immediately; vial exchange still returns a
vanilla glass bottle and respects bottle-slot space.
- Hand-making a panel retains its separate two-ink cost.
- Updated the JEI guide text to state the Mixer cost.
- This is the first 1.21.1 release using Minecraft-prefixed version identity.
The independently maintained 26.3 line already uses the correct mixer cost.
+16
View File
@@ -0,0 +1,16 @@
# Rivencraft 1.21.1.0.2
For Minecraft 1.21.1, NeoForge 21.1.264 and Java 21.
Includes the unpublished 1.21.1.0.1 Ink Mixer fix; requires Dynamic Dimensions AR
Edition and Bad Packets as before.
- Flat Age generation now starts bedrock at Y=0, dirt at Y=1–2 and grass at Y=3,
matching 26.3. The existing footing search uses this surface for arrival.
- Void and non-Flat generation are unchanged. Dimension profiles whose minimum
is already zero do not receive extra padding.
- Existing generated chunks are not rewritten. Newly generated chunks in existing
Flat Ages use the new layout and can meet old chunks at a height discontinuity.
Existing saved arrival positions are retained; create a fresh Age to test.
- Ink Mixers use one paper and one ink per panel (16 panels per full vial).
Modifier chances reset only when a panel is taken; hand-making defaults to two ink.
- JEI mixer text reflects the one-ink cost. Uses Minecraft-prefixed version names.
+40
View File
@@ -0,0 +1,40 @@
# Rivencraft 1.21.1.0.3
For **Minecraft 1.21.1**, **NeoForge 21.1.264** and **Java 21**.
Requires **Dynamic Dimensions AR Edition** and **Bad Packets**.
## Flooded Pages
- Added the Flooded Environment Page for Cave, Standard, Amplified, Island,
Flat and Void terrain. The default highest water block is Y=63.
- Number Pages immediately before Flooded form base-25 digits: Number 24 +
Flooded sets Y=24; Number 2 + Number 24 + Flooded sets Y=74. The visible water
surface is one block above that coordinate. Last Flooded wins.
- Levels are nonnegative and clamp below the dimension ceiling to leave room
for a safe arrival platform and player headroom.
- Flooding fills open space after terrain/carvers/decorations, preserving solid
features and waterloggable blocks. Lower levels drain higher ordinary water.
- Cave default water aquifers are disabled without Flooded. Water policy persists
in saved writing and generator codecs; fallback platforms sit above flood water.
- Included in Creative and optional JEI using existing glyph composition.
## Ink Mixer and Flat Ages
- Each Link Panel from the Ink Mixer consumes one paper and one ink. A full vial
makes 16 panels. Modifier chances reset only when a panel is taken; vial
exchange still returns a vanilla glass bottle. Hand-making defaults to two ink.
- Flat solid layers now start at Y=0: bedrock at 0, dirt at 1–2, grass at 3.
New Flat Ages arrive on their surface rather than far above the ground.
- JEI wording states the mixer cost. This release adopts Minecraft-prefixed
version identity and collects the unpublished 1.21.1.0.1–0.2 fixes.
## Validation and save behavior
The player passed the Mixer, fresh Flat arrival/revisit and Flooded checks.
Focused tests passed: four Mixer checks, three Flat checks and three Flooded
checks, including codecs, two water levels and preserved features. Temporary
test worlds were removed.
Existing generated chunks and saved arrival positions are not rewritten. New
chunks in old Flat Ages may meet previous chunks at a height seam. Use new Ages
for new writing. See [Flooded rules](https://git.paddedcell.org/dnorberg/rivencraft/src/branch/main/docs/FLOODED_PAGES.md).
+14
View File
@@ -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).
+13
View File
@@ -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).
+15
View File
@@ -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.
+3 -1
View File
@@ -17,7 +17,7 @@ tasks.named('wrapper', Wrapper).configure {
version = mod_version version = mod_version
group = mod_group_id group = mod_group_id
List<String> archivedGameTestSuites = ['linking', 'environment', 'writing', 'grammar', 'generation', 'desk', 'binder', 'mixer', 'recipe', 'instability'] List<String> archivedGameTestSuites = ['linking', 'environment', 'writing', 'grammar', 'generation', 'desk', 'binder', 'mixer', 'recipe', 'instability', 'flat', 'flood']
List<String> selectedArchivedGameTestSuites = providers.gradleProperty('withArchivedGameTests') List<String> selectedArchivedGameTestSuites = providers.gradleProperty('withArchivedGameTests')
.map { it.toBoolean() }.orElse(false).get() ? archivedGameTestSuites .map { it.toBoolean() }.orElse(false).get() ? archivedGameTestSuites
: providers.gradleProperty('archivedGameTestSuites').orElse('').get() : providers.gradleProperty('archivedGameTestSuites').orElse('').get()
@@ -29,6 +29,8 @@ String enabledGameTestNamespaces = ([mod_id] + selectedArchivedGameTestSuites.co
"rivencraft_archive_${it}" "rivencraft_archive_${it}"
}).join(',') }).join(',')
sourceSets.main.java.srcDir('shared/src/main/java')
sourceSets.main.resources { sourceSets.main.resources {
// Include resources generated by data generators. // Include resources generated by data generators.
srcDir('src/generated/resources') srcDir('src/generated/resources')
+104
View File
@@ -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.
+117
View File
@@ -0,0 +1,117 @@
# Dual-version release workflow
Maintain Minecraft 1.21.1 and 26.3 independently. The 1.21.1 line retains Dynamic
Dimensions AR Edition and Bad Packets. The 26.3 line uses its first-party backend.
Do not widen either artifact's Minecraft dependency range or import saves between
the tracks.
## Version identity
From 26.3.0.1 onward, prefix the Minecraft version and append the milestone/release
slice and iteration: Minecraft.release-slice.iteration. Example:
`26.3.0.1` -> `rivencraft-26.3.0.1.jar`, Gitea tag `V26.3.0.1`.
An explicitly selected prerelease uses a suffix such as `-beta.1`.
The existing 1.21.1 release keeps its published version until its next code update;
then use the corresponding `1.21.1.<slice>.<iteration>` convention.
The user authorized regular release status for 26.3.0.1. Release-channel status
does not close unfinished parity or multiplayer issues automatically.
## Build and publish
For 26.3, update `ports/mc263/gradle.properties`, then run
`./gradlew -p ports/mc263 build --console=plain` with Java 25 available.
Use the exact built/player-validated artifact; naming/metadata-only changes do
not change generation or save behavior.
Write release notes, audit the guide/wiki/project description, commit and push
the changes, then create and push the matching annotated tag. Preview the
`scripts/publish_mod_sites.py release` command with the JAR, changelog, version,
display name, Minecraft version, Java version and channel; add `--publish` to
upload to Gitea, Modrinth and CurseForge. Tokens stay in the system keyring.
Verify published metadata and downloaded artifact hashes. CurseForge approval
may remain pending after a successful upload.
The publisher accepts legacy Minecraft-prefixed archive filenames and beta tags
for already numbered historical uploads; new releases use the identity above.
## Validation gates and issue audit
Run appropriate builds and targeted server checks for changed behavior. The user
performs visual/gameplay validation. Keep temporary test fixtures out of shipped
JARs; use new worlds and remove them regardless of pass/fail. Stop test processes.
If generation stalls, hand the test to the user.
Before closing a port umbrella issue, compare its acceptance criteria and comments
to actual evidence. The expanded-catalog matrix and manual restart/return handoff completed in #100.
See [the final parity review](MC263_PARITY_REVIEW.md) for evidence and limits.
Shared issues need both versions resolved before closure.
For each release, document tested optional versions and no-optional fallbacks,
match client/server JARs, preserve the independent 1.21.1 support line, update wiki
and platform descriptions, and keep known bugs linked in the release notes.
## Changed-target validation policy
Only test a Minecraft target when its code/resources changed. Select targets with
`python3 scripts/changed_targets.py --base <commit>`. Shared assets can select
both; temporary servers must run sequentially. Earlier gameplay sign-off remains
valid for unchanged 1.21.1 code.
Repeatable local checks:
- Java 21 / 1.21.1: `./gradlew build --console=plain`.
- Java 25 / 26.3: `./gradlew -p ports/mc263 build --console=plain`.
- Smoke one changed target: `python3 scripts/smoke_server.py --target mc1211`
or `--target mc263`.
- Two-client 26.3 acceptance: `python3 scripts/regression_multiplayer_263.py`.
Fixture sources remain outside the shipping JAR. If a test stalls, stop it,
preserve logs, delete temporary worlds and hand the remaining check to the user.
Do not automatically retry.
GitHub and Gitea workflow definitions select changed targets and use
`max-parallel: 1`. Hosted execution is not yet verified. Repository runner
inventory alone does not establish availability of instance-wide runners.
The publisher checks embedded version/Minecraft metadata, Java selection,
filename identity, absence of test fixtures and required 1.21.1 dependencies.
Apply relevant fixes to both supported lines, with separate implementation and
validation per target. Keep version-specific fixes on the affected line. Advancing
the newer Minecraft/NeoForge target requires a compatibility audit and must not
silently replace 1.21.1 support or widen an existing JAR dependency range.
## Current acceptance evidence (2026-11-14)
26.3.0.3 builds and the user passed book-window mouse-look, right-click return
and re-entry. Beta branding is removed. The release collects these changes,
the workflow tools and the final parity review.
The expanded-catalog dedicated matrix ran with two real clients. Both received
runtime-created Ages and authored environment data, traveled using normal books,
and passed stale-ack rejection/recovery, occupied-unload refusal, empty-Age
reload/reseed and retirement checks. After full server restart both reconnected in
the surviving Age with its saved seed and presentation, without the retired Age.
The run stalled at the final post-restart return Linking Book step (phase 22).
It was stopped, temporary worlds deleted, and the last check handed off rather
than retried. Singleplayer preview sign-off does not replace that dedicated check.
The player completed the manual dedicated-server restart/return check on
2026-11-14 and explicitly accepted #100. This was one player-operated client,
complementing the automated two-client evidence; it is not described as a new
automated two-client pass. The test server was stopped, logs retained under
build/verification/issue100-manual, and its temporary world removed.
See [the final parity review](MC263_PARITY_REVIEW.md). Renderer bug #116 remains
separately tracked. #103/#104 and parent #96 close after release verification.
## 2026-11-15 release update
The first Minecraft-prefixed 1.21.1 release is 1.21.1.0.3, collecting Mixer #105,
Flat #106 and Flooded #107. The matching 26.3 release is 26.3.0.5 with Flooded and
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.
+98
View File
@@ -0,0 +1,98 @@
# Flooded Pages (issue #107)
Available in releases 1.21.1.0.3 and 26.3.0.5. The player passed both game
versions, with Reborn crashes separately tracked in
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
## Writing
Flooded is an Environment Page in Creative and the page feed used by optional
JEI. It reuses glyph composition, without a new bitmap.
Number Pages immediately before Flooded encode the absolute topmost water block
Y as base-25 digits, most significant first.
| Number Pages before Flooded | Water block Y |
| --- | --- |
| None | 63 |
| 0 | 0 |
| 24 | 24 |
| 2, 13 | 63 |
| 2, 24 | 74 |
| 4, 0 | 100 |
The visible surface is at Y+1. Only an adjacent number run applies; other pages
break it. The last Flooded wins. An unnumbered final Flooded returns to Y=63.
Duplicates follow ordinary singular-controller recovery and instability.
Number chains are special to Flooded; color/celestial number behavior is unchanged.
Existing Number Pages are unsigned. Requested levels clamp between
max(0, dimension minimum Y) and dimension maximum Y minus 5, leaving emergency
platform/headroom space. Overflow saturates safely. There is no signed Number
Page for a negative surface; open spaces below zero still flood.
## Generation and travel
Works with Cave, Standard, Amplified, Flat, Island and Void terrain.
Without Flooded, Cave default fluid is air and water aquifers are disabled;
separate authored fluid/lake features retain their own behavior.
Flooding runs after terrain, carvers and decorations. It fills air, preserves
solid terrain/material features and roofs, and wets waterloggable blocks. A lower
requested line drains ordinary water/aquatic plants above it and dries waterlogged
solids without deleting them. It is generation, not a per-tick refill system.
Neighbor features and normal fluid physics can still change blocks afterward.
The policy is frozen into generator state/ordered writing and survives codec
reload. Worldgen does not consult mutable SavedData. Arrival searches reject
submerged space. Fallback platforms rise above the water; no-platform travel may
fail safely when natural footing is unavailable.
Existing generated chunks are not rewritten or retroactively drained. Existing
saved arrival positions remain. Use new Ages for validation; mixed old/new chunks
can retain different earlier layouts.
## Validation
1.21.1: three focused tests passed for ordered numbers, plan/generator codecs,
two water levels in Cave-like in-memory chunks, dry Cave settings, solid/waterlogged
block preservation and the public page feed.
26.3: 21 isolated dedicated checks passed for equivalent grammar/support/feed,
two levels, block preservation/draining, codec and authored non-Cave biome, dry
Cave defaults and safe-height bounds. The first probe exposed an adjacent-number
grammar penalty; it was corrected before the passing run. No test stalled.
The port probe stays outside shipping sources and uses a disposable world/build:
python3 scripts/regression_flood263.py
Player checks on both versions:
1. A fresh Cave Age without Flooded stays free of default water flooding.
2. Cave Ages using 24 + Flooded and 2 + 24 + Flooded stop at water block Y=24
and Y=74 respectively.
3. A Flat/Plains Age with Flooded uses the selected/default level and safe arrival.
4. Return, save/reload, revisit, and check new chunks retain the same water level.
Books/portals must not spawn the player underwater.
5. Flooded appears in Environment Creative pages and JEI when installed.
Optionally verify a large number chain clamps safely near the ceiling.
Both game versions are tested sequentially. Test logs remain under
build/verification/flood107; temporary worlds and fixture outputs are removed.
## Reborn travel disconnect during player validation
The 26.3.0.4 client disconnected on a block-change acknowledgement after Age
travel. Reborn 7.0.12 called getClientWorlds while its world map was uninitialized
after dimension replacement. The integrated server stopped after the client left;
the report was not a Flooded generator server exception.
26.3.0.5 adds a client-only compatibility guard: on the game thread, while Reborn's
map is uninitialized, use vanilla acknowledgement handling for the packet
listener's world. Initialized Reborn retains its normal multiworld handling.
No networking payload format, 1.21.1 code or saved player data changed for this fix.
Build and target-method signatures verified. The player accepted 26.3 Flooded,
but subsequently encountered a different null-section rebuild crash while exploring.
That renderer failure remains unresolved in #118; 26.3.0.5 is not advertised as
crash-free with Reborn. Full Seamless support is tracked in #117.
+11 -1
View File
@@ -26,7 +26,7 @@ core tests when investigating an issue:
``` ```
Available suite names are `linking`, `environment`, `writing`, `grammar`, Available suite names are `linking`, `environment`, `writing`, `grammar`,
`generation`, `desk`, `binder`, `mixer`, `recipe`, and `instability`. The `generation` archive `generation`, `desk`, `binder`, `mixer`, `recipe`, `instability`, `flat`, and `flood`. The `generation` archive
keeps the detailed feature, structure, ore, crystal, and fissure regressions keeps the detailed feature, structure, ore, crystal, and fissure regressions
out of the default smoke run. The `instability` archive adds multi-player loaded-chunk selection, policy gates, and protected-block checks without rerunning the default scoring and migration tests. Three checks formerly registered twice in the out of the default smoke run. The `instability` archive adds multi-player loaded-chunk selection, policy gates, and protected-block checks without rerunning the default scoring and migration tests. Three checks formerly registered twice in the
core and their archives now run only through the core wrapper. Run all core and their archives now run only through the core wrapper. Run all
@@ -175,3 +175,13 @@ server, so physical placement is handed to the player for in-game verification:
Repeat Repeat
with `gl` or `glo` to confirm names do not change page validity. An explicit with `gl` or `glo` to confirm names do not change page validity. An explicit
Flat or Cave Terrain Page with Rocks should still be rejected. Flat or Cave Terrain Page with Rocks should still be rejected.
The `flat` archive covers issue #106 without loading dynamic Ages: Y=0 layer/height
queries, authored-biome generator codec reload, zero-minimum dimension profiles,
and unchanged empty Void columns. Travel/revisit/full-world restart remains a
player check in a fresh Flat Age.
The flood archive covers #107 grammar/codecs and in-memory water filling.
The 26.3 equivalent is scripts/regression_flood263.py. Run servers sequentially.
See [Flooded Pages](FLOODED_PAGES.md) for the travel/reload player checklist.
+84
View File
@@ -0,0 +1,84 @@
# 26.3 port parity and acceptance review
Update 2026-11-15: Flooded passed on both versions (#107). #116 was later closed
by the user as resolved; current Reborn crashes are separately tracked in #118.
Full Seamless live views remain future work in #117. The dated port review below
does not imply all subsequent third-party renderer bugs are fixed.
Reviewed 2026-11-14 for 26.3.0.3 against the independently maintained 1.21.1
implementation. This closes the port feature checklist, not every open bug or
future enhancement. The dated development entries in MINECRAFT_26_3_PORT.md
retain their original evidence and are superseded by later slices where stated.
## Feature comparison
| Area | 1.21.1 implementation | 26.3 counterpart / acceptance |
| --- | --- | --- |
| Page language | Ordered writing, registry-backed pages, modifiers, recovery and corrupted pages | PortAuthoredWriting, PortWritingRecovery, PortMaterialCompletion, PortRegistryPages and the shared symbol resources retain source writing, material pairing and diagnostics. Port slices received player sign-off. |
| Ink Mixer | Paper/ink, additive modifiers, vial/bottle exchange and output reset | InkMixerMenu/Screen, InkModifierIngredients and InkVialExchange port the interaction and assets. One ink and paper per panel; additives reset on removal. The separate 1.21.1 correction remains a shared follow-up. |
| Page storage | Notebook, folders, portfolios, sealed notebooks | NotebookMenu/Screen and the corresponding item components port sparse storage, selection/moving, held-slot protection and bulk import. Legacy glyph/page assets reused. |
| Desk / Binder | Tab catalog, ink/paper copy transactions, collection input, named books and OP diagnostics | WritingDeskMenu/Screen, WritingDeskCatalog and PortBookBinderMenu/Screen with authoritative networking and existing textures/models. Input, output pickup and naming fixes passed in game. |
| Link Modifier | Name, properties, seed and retirement | LinkModifierMenu/Screen and explicit edit payloads provide six property controls, title/seed edits and guarded retirement. Player-approved before this audit. |
| Terrain and biomes | Standard/amplified/flat/cave/void/sky-island profiles and biome distributions | PortAgeTerrain, PortBiomePlan, native registry biome pools and first-party generators. Authored and random plans persist their own seeds. Version-specific terrain/biome follow-ups remain separate. |
| Decorations and structures | Material features, vegetation, lakes, carvers, vanilla structures, libraries, crystals and fissures | Port terrain/vegetation/lake/carver/structure plans and generation passes implement these families, with modern structures and registry-backed materials. Family-specific terrain restrictions are retained; this audit does not claim every possible combination can generate. |
| Time, sky and celestials | Authored/random bodies, number/color modifiers, time modes, eclipses and ambient lighting | PortDayCycle, PortAgeColors, PortCelestialDiscs and sky/light mixins; colors, multiple bodies, sizes, positions, frozen time and eclipse rendering received player checks. Static Sky with Reborn has known bug #116. |
| Weather and seasons | Per-Age weather and optional Serene policies | PortWeatherMode, PortSeasonPolicies and Serene adapters preserve independent Age policy. Serene is optional; Ecliptic integration remains deferred on both lines. |
| Instability | Writing and live material scores, provider plans, effects and operator controls | PortInstabilityData/Plan/Runtime, block profiling, status/decay/hazard/meteor/environment providers and operator commands. Scores remain OP-only. Accelerated ticks use bounded loaded-world budgets; machine parity work remains tracked separately. |
| Travel | Handheld books, stands, receptacles, portals, footing/platform, modifiers and return links | Shared port destination/travel services, PortalTravelQueue and CrystalPortalNetwork keep book properties authoritative. Return links default disabled. Unsafe or unsynchronized travel leaves the player at source. |
| Presentation | Legacy books/pages/models/sounds, dropped open books and preview renderers | Existing assets reused through 26.3 extracted render states and modern input. Live Reborn book/portal views and look-only exploration are implemented; right-click return/re-entry passed on 26.3.0.3. |
| Discovery / guides | Libraries, loot, crafting, advancements, creative pages and JEI | Libraries/stands, sealed notebook discovery, progression and JEI guides ported. Random eligibility controls apply to new random choices/loot while existing authored pages remain usable. |
| Backend lifecycle | Dynamic Dimensions AR plus catalog/travel behavior | Rivencraft-owned backend with atomic creation, seed persistence, catalog acknowledgement, unload/reseed/retire. #99/#101 and now #100 accepted. |
## Deliberate platform differences
- Java 21 / NeoForge 21.1.264 and Dynamic Dimensions AR + Bad Packets stay on
1.21.1. The tested 26.3 target uses Java 25 / NeoForge 26.3.0.99 and a first-party
Age backend. No optional integration is bundled or made mandatory.
- 26.3 starts fresh saves. Importing 1.21.1 dimension/save internals is unsupported.
New chunk algorithms and random streams need not produce identical terrain.
- Create/Ponder has no ported 26.3 integration. Built-in animation is always
available; Reborn 7.0.12 provides optional live book/crystal views and look-only
exploration. Seamless has the dimension bridge, not this Reborn rendering path.
- Optional libraries, registry contents and vanilla generation APIs differ across
game versions. Changes to shared symbols/assets must be considered for both;
version-specific implementations and dependency requirements stay separate.
- Shared requested enhancements in #105–#115 and renderer bug #116 are separate
work. Port closure does not close those issues or describe their work as done.
## Regression evidence and limits
Earlier recorded 1.21.1 client/dedicated/optional-mod sign-offs remain valid:
its game code did not change during this work, so it was not retested merely
because the 26.3 target changed. Both build targets were built during the workflow
audit; only changed-target gameplay checks are required going forward.
The expanded-catalog 26.3 test used two actual clients on one dedicated server.
Runtime Age creation, catalog/environment delivery, normal-book travel,
stale-ack rejection/recovery, occupied unload refusal, empty reload/reseed and
retirement passed. On full restart both reconnected in the surviving Age with
the saved seed/presentation; retired data stayed absent. The final return-book
step stalled and was handed off without retry, per the user's instruction.
The player then created and entered an Age on the current local dedicated server
with the Dev optional stack, requested a full restart, reconnected, and returned
to the Overworld by Linking Book. Server logs confirm restored Age
rivencraft:age/random, seed -1985136355166262436, and the Overworld return.
The player explicitly accepted #100. This final handoff used one player-operated
client, not a new two-client automated pass. Logs are retained locally under
build/verification; temporary worlds and server processes were removed.
Production 26.3.0.3 builds and its book-window look/exit/re-entry received an
in-game pass. Earlier slices record no-optional startup, generation, portal
geometry/lifecycle and optional integration checks. This is cumulative evidence,
not a claim that every historical test was rerun on the final JAR.
## Release gate
[DUAL_VERSION_RELEASE.md](DUAL_VERSION_RELEASE.md) defines changed-target builds,
sequential temporary servers, stalled-test handoff, maintenance policy and upload
identity checks. Offline tooling checks cover track selection, release naming,
required dependencies, wrong-artifact/fixture rejection and server exclusion.
Hosted workflow execution remains unverified; repeatable local commands provide
the supported fallback. Release acceptance is recorded in Gitea after publication
and artifact verification. The existing published 1.21.1 release is retained;
unchanged code is not republished merely to adopt the new filename scheme.
+257 -15
View File
@@ -8,20 +8,32 @@ The user wants both Minecraft lines maintained after the port, not a one-time
26.3 release. Gitea milestone "Dual-version support: 1.21.1 and 26.3" 26.3 release. Gitea milestone "Dual-version support: 1.21.1 and 26.3"
tracks issues #97–#103 under parent #96. tracks issues #97–#103 under parent #96.
## Final port acceptance — 2026-11-14
The 26.3 port is playable on the regular release channel. The complete writing,
generation, instability, travel, discovery and presentation review is in
[MC263_PARITY_REVIEW.md](MC263_PARITY_REVIEW.md). #100 is complete: the
expanded-catalog two-client checks and the player-operated full-restart return
handoff passed. The look-only book-window overlay and its right-click exit fix
also passed on 26.3.0.3. #103/#104 closure follows the workflow/release audit.
The original introductory audit and slice entries below are historical, not a
list of currently missing features. 1.21.1 remains maintained independently.
Known issues and shared enhancements remain tracked separately.
## Published status — 2026-11-11 ## Published status — 2026-11-11
[1.0.1.136-beta.1](../ports/mc263/RELEASE_NOTES_1.0.1.136-beta.1.md) collects [26.3.0.1](../ports/mc263/RELEASE_NOTES_26.3.0.1.md) collects the player-validated
player-validated .130–.136: Link Modifier seed editing and operator retirement, .137–.142 slices: random-page eligibility, random-Age glyph descriptions, optional
creation rollback, and optional JEI, TerraBlender/BOP, Serene Seasons/GlitchCore portal-engine dimension synchronization, and Reborn live book/crystal portal views.
and Ruins. Both Minecraft builds pass. The latest production client log records It is published on the regular release channel at the user's request, using the
all these optional integrations loaded together. Issue #99's remaining creation new Minecraft-prefixed version scheme. Minecraft 1.21.1 remains unchanged.
rollback requirement is complete. #100 still requires the current dedicated
two-client/normal-book matrix; #102 retains the live-renderer/alternative review; #102's optional-integration audit/port is complete; the Static Sky/Reborn rendering
#103/#104 and parent #96 remain open. Shared dual-version follow-ups remain open bug is tracked separately in #116. #100 still requires the current expanded-catalog
where one or both implementations are pending. The versioning change requested dedicated two-client matrix. #103/#104 and parent #96 retain the remaining workflow
in #103's comment remains part of that next release-workflow task; this release and parity gates. Full parity is not implied by the release channel. Shared
retains the version already built and player-tested. Entries below are historical follow-ups stay open where one or both implementations are pending. Earlier
engineering records and may describe limitations addressed in later slices. entries are historical records and may describe limitations resolved later.
## Version boundary ## Version boundary
@@ -102,8 +114,8 @@ range of the 1.21.1 JAR. The official [26.3 release notes](https://www.minecraft
[NeoForge 26.3 Maven metadata](https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml), [NeoForge 26.3 Maven metadata](https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml),
[NeoForge Java 25 setting](https://github.com/neoforged/NeoForge/blob/26.3.x/gradle.properties), [NeoForge Java 25 setting](https://github.com/neoforged/NeoForge/blob/26.3.x/gradle.properties),
and [NeoForge migration primers](https://docs.neoforged.net/primer/docs/) and [NeoForge migration primers](https://docs.neoforged.net/primer/docs/)
are the version sources. NeoForge 26.3.0.99 is the newest listed stable build are the version sources. NeoForge 26.3.0.99 is the validated target for this release; the availability
at the time of this check. of newer NeoForge builds does not imply they have been validated.
## Dependency availability ## Dependency availability
@@ -121,7 +133,8 @@ Rivencraft. Recheck immediately before choosing versions for a port build.
| [Biomes O' Plenty](https://modrinth.com/mod/biomes-o-plenty) | Optional TerraBlender test addon | Yes | Test modded biome registration and decoration. | | [Biomes O' Plenty](https://modrinth.com/mod/biomes-o-plenty) | Optional TerraBlender test addon | Yes | Test modded biome registration and decoration. |
| [Ruins (Structure Spawning System)](https://www.curseforge.com/minecraft/mc-mods/ruins-structure-spawning-system) | Optional authored ruins integration | Yes | Port and verify its generation hooks. | | [Ruins (Structure Spawning System)](https://www.curseforge.com/minecraft/mc-mods/ruins-structure-spawning-system) | Optional authored ruins integration | Yes | Port and verify its generation hooks. |
| [Create](https://modrinth.com/mod/create) / bundled Ponder | Optional scene renderer | No advertised 26.3 version | Use Rivencraft's existing legacy-animation preview fallback for this target until a compatible release exists. | | [Create](https://modrinth.com/mod/create) / bundled Ponder | Optional scene renderer | No advertised 26.3 version | Use Rivencraft's existing legacy-animation preview fallback for this target until a compatible release exists. |
| [Immersive Portals for (Neo)Forge](https://modrinth.com/mod/immersive-portals-neoforge) | Optional live views and portal teleport integration | No advertised 26.3 version | Use the fallback portal surface and normal Rivencraft linking. Do not claim live destination views on 26.3. | | [Immersive Portal / Seamless Portals](https://www.curseforge.com/minecraft/mc-mods/immersive-portal/files/9218525) | Optional live views and portal integration | Latest file 9218525: displayed 10.0.0, internal 1.0.0 | Runtime-Age/native packet checks passed; live rendering still pending. Old file 8937394 has an upstream startup failure. |
| [Immersive Portals Reborn](https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354) | Alternative optional portal engine | NeoForge 7.0.12 for 26.3; later 7.0.18 is Fabric | .141–.142 port live book/crystal views; player, dedicated/client and restart checks passed. Static Sky bug: #116. Use one fork per instance. |
Ecliptic Seasons publishes 26.3, but Rivencraft's Ecliptic integration was Ecliptic Seasons publishes 26.3, but Rivencraft's Ecliptic integration was
deferred and is not a replacement for the current Serene integration. deferred and is not a replacement for the current Serene integration.
@@ -2871,3 +2884,232 @@ filtering, both dimension gates, spawn-event veto, and a real Tiki Head placemen
retained the counts. Temporary fixtures and test worlds were removed; test servers retained the counts. Temporary fixtures and test worlds were removed; test servers
were stopped. Client glyph/GUI checks and natural spawning while exploring an Age were stopped. Client glyph/GUI checks and natural spawning while exploring an Age
remain player validation. No commit, push, or publication; #102 remains open. remain player validation. No commit, push, or publication; #102 remains open.
### Random Page eligibility and library discovery — 1.0.1.137-beta.1
The player passed .136 and authorized its publication. This slice adapts 1.21.1's
RandomPagePolicy and random_pages allowlist/blocklist. Short paths (sky/static)
and fully namespaced Page IDs are accepted; blocklist wins, and allowlist entries
restrict only their own categories. Biome controllers are a separate category
from individual biomes. Creative/JEI availability and manual book authoring are
not filtered.
Normal Link-Panel-only book creation takes one immutable policy snapshot and
passes it through terrain, biome distribution/Page completion, environment,
celestial kinds, material features/materials, optional formations and structures.
Seasons use the same snapshot before their saved policy is committed. Resolved
choices are already frozen in Age index/season data, so reload/reseed never reads
the current lists to reselect an old Age. Authored and partly authored books use
the existing unrestricted completion behavior, matching the 1.21.1 boundary.
Required empty categories use Standard terrain, Native distribution, Normal
lighting/weather, inherited Overworld sky, or No Seasons. Optional features or
materials with no candidates are omitted, not filled with a forbidden random
Page. Non-Native biome distributions preserve their required minimum using the
terrain's preferred/native fallback pool; necessary fallback biomes can therefore
bypass a filter. Native noise biomes come from the preset, not biome Page selection,
and remain unfiltered just as in 1.21.1. Void still has its required Void biome.
Cave weather/season safety overrides remain unchanged. Original unrestricted
terrain/distribution seed choices are unchanged; filtered ranks are recalculated
using the shared Legacy rank chooser instead of a duplicate weighted routine.
Newly placed direct library Pages apply the current policy in both LEGACY and
AGE_ONLY modes. Existing inventory contents are not rewritten. The Legacy library
pool now includes exact Ruins templates and semantic bundled pages rather than
reusing the Sealed Notebook's narrower pool. Sealed Notebook opening retains its
1.21.1 pool behavior; this setting does not retroactively edit unopened/old loot.
No policy filtering is applied to JEI or creative portfolios.
Build passed. A disposable no-optional dedicated server passed 766 creation/policy
checks over 48 seeds and six restart checks: normal book binding, manual blocked
Page authoring, immutable saved settings under a changed policy, unload/reload,
required category/biome fallbacks, optional empty pools, material eligibility,
Native distinction, season policies without requiring Serene classes, library
filtering and unchanged Creative entries. The later rank revision added default
seed-compatibility and minimum-biome checks. These are temporary fixtures, not
new permanent game tests. Worlds and fixtures removed, servers stopped, production
JAR rebuilt. Player config/GUI/world validation remains pending. No commit, push
or publication.
### Random-Age book glyph prose — 1.0.1.138-beta.1
The player passed the .137 eligibility slice. Ported 1.21.1's first-page random-Age
glyph description: the Age name and author remain ordinary text on the left,
followed by layered Legacy word glyphs and real base-25 numerals for terrain,
distribution, lighting, weather and the first celestial cycle's period/angle/phase.
Authored books keep their existing name/author front page and single-symbol middle
pages; no writing notes or instability scores are introduced. The right-side
animated link panel and its click-to-travel behavior are unchanged.
The existing symbolcomponents.png atlas and deterministic word mappings are reused
directly with tinted GUI_TEXTURED blits; no generated art or per-frame dynamic
textures are added. A common prose layout helper handles Unicode word boundaries,
numeric width and wrapping. Writing Desk tab numerals now use the same rendering
routine, retaining their existing size/position/color.
Public terrain/distribution/lighting/weather metadata is sent in the Age catalog,
with celestial data reused from its existing saved-cycle map. These are actual
loaded Age settings rather than a reroll from the book ID or current config.
Metadata excludes seeds, instability scores and providers. It does not load an
unavailable destination merely to display a book. Full catalog replacement removes
unloaded/retired entries; logout clears description/cycle caches. Older books with
no authored symbol component use the random-description path. Existing Age/save
formats remain readable. Catalog network protocol is now 11 (previously 10):
client and server must use matching builds.
Build passed; disposable no-optional dedicated-server checks passed catalog
serialization, immutable snapshots, actual saved setting capture, cache
replacement/clear, real restart, unload/reload and retirement. Pure layout checks
covered Legacy word splitting, Unicode, wrapping, base-25 width and oversized
numeric fallback. Test worlds and fixtures removed, server stopped and production
JAR rebuilt. Visual glyph layering, book/lectern appearance and actual client
catalog receipt remain player validation. No commit, push or publication.
### Renamed Immersive Portals dimension bridge — 1.0.1.139-beta.1
The player passed .138. Confirmed the user's correction: the 26.3 Immersive Portal
implementation uses the Seamless Portals name/mod ID, retaining qouteall rendering,
chunk-loading and dimension APIs. Added an optional shared dimension-ID adapter
before Rivencraft catalog publication/acknowledgement. It synchronizes integer
IDs and native type/sea-level metadata without delegating Age ownership. Failed
synchronization blocks acknowledgement/travel rather than making a successfully
committed Age appear to have failed binding. Startup, unload/reload, reseed and
retirement are covered. Live book/crystal rendering remains later work.
The installed working build passed 35 server creation/catalog checks plus 13 after
restart. Normal book binding, native metadata, API ID roundtrips, two Ages,
lifecycle changes and failed-creation nonpublication were checked. No-optional
startup passed. Real client travel remains pending; Prism files were not changed.
Correction to the initial artifact audit: old CurseForge file 8937394 fails during
its own constructor on .99 with missing DataPackRegistryEvent$NewRegistry; this is
NOT the latest release. The latest file is 9218525, displayed as 10.0.0 while its
filename/internal metadata still say 1.0.0. Its SHA-256 exactly matches the user's
installed working file:
5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0.
The compile dependency is corrected to 9218525 in .140. The earlier broad claim
that the current published build cannot start was wrong and is superseded here.
NeoForge audit on 2026-11-11: official Maven metadata lists .102 as latest in the
26.3 line. Its universal JAR still lacks the old NewRegistry class, so upgrading
cannot fix that OLD portal artifact. Current target remains validated .99; a
separate .102 build/client/server check is recommended. No release authorized.
### Immersive Portals Reborn comparison and shared bridge — 1.0.1.140-beta.1
The user suggested Reborn. Verified the NeoForge 26.3 release is 7.0.12, file
9435354 in CurseForge project 1721833. The newer 7.0.18 is Fabric. The Reborn JAR
registers immersive_portals_reborn plus its legacy core aliases and retains the
qouteall GUI rendering/portal/chunk/dimension APIs. It starts on NeoForge .99
without Cloth Config or other optional mods in the test environment.
Generalized the optional bridge to recognize either Reborn or Seamless. Both
share DimensionIntId.onServerDimensionChanged and the createFromServer packet
factory. Seamless's createPacket returns a vanilla Packet; Reborn's returns a
CustomPacketPayload. The adapter now wraps createFromServer in the vanilla
clientbound payload packet, preserving each fork's native two-/three-tag wire
format. No cross-fork packet schema is invented and neither dependency is bundled.
The compat probe recognizes both. A development run may select
-PwithImmersivePortalsReborn or -PwithSeamlessPortals; requesting both is rejected
because the forks share classes/mixins. The normal build remains optional-free.
Reborn passed 32 creation/catalog checks and 15 after restart: real book-binding
entry point, two runtime Ages, ID/type metadata, native wire roundtrip, per-player
packet preparation, unload/reload, reseed, retirement isolation and persistence.
Seamless latest file 9218525 passed the same 32 lifecycle/packet and 15 restart checks against the shared adapter.
These are server/packet checks, not evidence of renderer quality or real client
packet receipt. Reborn is a viable next client-test target; no performance
superiority is claimed. Live snapshots, chunk leases/audio isolation, and live
crystal surfaces still need porting. Player files were not modified. Temporary
worlds/fixtures removed; no commit, push or publication.
### Reborn live book previews — 1.0.1.141-beta.1
Linking and Descriptive Book front panels now use Immersive Portals Reborn's
live GUI-world renderer when Reborn is installed on both sides. This carries
forward the 1.21.1 camera orbit (11-block radius, five blocks above the focus),
destination sky/fog, chunk streaming and remote-audio isolation. Server destination
resolution uses the actual held book or a nearby loaded stand's matching book;
the client cannot request arbitrary destination coordinates.
A unique session ID prevents stale replies or close packets from replacing or
releasing another book's preview. One per-player eight-chunk-radius loader streams
the view asynchronously, renews while the book stays open, and expires if its
heartbeat is lost. Closing, logout, death/source invalidation, dimension changes,
and shutdown release the lease. Destination resolution for Descriptive Books
uses the same footing/platform rules as book travel.
The rendering integration uses 26.3 GPU texture views with the deferred GUI.
Reborn may resize its target before extraction records the texture view; clearing
is deferred to its render hook, and the normal GUI draws the image beneath the
Legacy panel cutout. The target uses the main framebuffer's depth/stencil format.
The player camera is restored after remote rendering, and remote preview-world
sounds are suppressed without muting the player's world.
Set `[book_previews] reborn_live_views = false` in the local configuration to use
animated panels. Missing Reborn or unavailable terrain also retains the animated
fallback. Seamless's dimension-ID bridge remains available, but this live GUI
implementation is activated only for Reborn. Live crystal portal surfaces and
preview exploration controls remain separate port work.
Validation: production build passed. An isolated real NeoForge 26.3.0.99
dedicated-server/client run with Reborn 7.0.12 displayed the remote live Linking
Book view; screenshot inspected for the panel cutout, upright image and actual
terrain. The client completed without a renderer exception and logout left no
preview chunk leases. The user also reported that the books displayed live views
perfectly. All temporary worlds/client directories and fixture sources were
removed, and the distributable was rebuilt without test classes.
Startup warnings in this isolated run included Reborn's four deprecated
`logoFile` metadata entries; these are upstream branding metadata warnings.
The Linux narrator also lacks `libflite`, unrelated to the book renderer.
### Reborn live crystal portals — 1.0.1.142-beta.1
Crystal portals now create optional native Reborn render-only surfaces. Each
coplanar opening is one masked mesh on each side, including irregular outlines;
the destination image does not repeat once per portal block. Mesh planes sit
inside the portal block thickness so the crystal frame remains in front. Once
native surfaces are established, LIVE_VIEW hides only the animated portal model.
The blocks and their receptacle owner pointers stay intact.
Live views share destination resolution with portal book travel. Linking Books
use their written facing, while Descriptive Books preserve the approaching
entity's facing as their travel path does. The reference camera is anchored to
standing eye height above the opening's floor, rather than to its vertical center.
This prevents taller frames from shifting the preview's arrival height. Relative
links resolve using the opening's center as the view reference; the actual
entity's departure position is still used for travel.
Native surfaces cannot teleport entities, accept remote interaction or perform
cross-portal collision. Existing Rivencraft collision/queue and book rules remain
authoritative, including catalog readiness, Disarm, momentum and arrival safety.
Reborn handles visible-destination streaming through its normal portal system.
Geometry/destination tags allow maintenance to reuse matching entities and replace
stale ones. Activation establishes views immediately; normal receptacle maintenance
restores them after restart. Book removal, frame shutdown, missing destinations
and disabling the integration remove the native surfaces. Without Reborn the
animated surface and ordinary travel continue to work. The server setting is
[book_previews] reborn_crystal_live_views, default true.
Validation on NeoForge 26.3.0.99 / Reborn 7.0.12: 68 server checks passed, covering
all three plane axes, both sides, one mesh per opening, eye-position and facing
transforms, entity reuse, fallback toggling and book removal. Five additional
restart checks passed. An isolated real client/dedicated server rendered the live
opening, then crossed into the correct Age through normal Rivencraft travel.
Screenshots before/after were inspected; the user also reported success.
An initial render test mistakenly bound its synthetic Linking Book at Y=1 inside
the flat world's solid layers. The view correctly displayed underground terrain
and the collision check refused travel. The corrected fixture bound to the actual
surface (Y=4) and passed. No production spawn-height workaround was added for an
invalid synthetic book. All temporary fixtures and test worlds were removed, and
the distributable was rebuilt without test classes.
+139
View File
@@ -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 -4
View File
@@ -1,10 +1,7 @@
# Publishing Rivencraft with the Gitea, Modrinth, and CurseForge APIs # Publishing Rivencraft with the Gitea, Modrinth, and CurseForge APIs
The local helper is [`scripts/publish_mod_sites.py`](../scripts/publish_mod_sites.py). 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 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.
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.
## One-time token setup ## One-time token setup
+61
View File
@@ -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.
+136
View File
@@ -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.
+102
View File
@@ -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.
+13
View File
@@ -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. 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. 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).
+2 -2
View File
@@ -35,8 +35,8 @@ mod_id=rivencraft
mod_name=Rivencraft mod_name=Rivencraft
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=LGPL-3.0-or-later mod_license=LGPL-3.0-or-later
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md. # Minecraft.release-slice.iteration; independent of the 26.3 release track.
mod_version=1.0.1.1 mod_version=1.21.1.0.6
immersive_portals_version=6.0.7 immersive_portals_version=6.0.7
terrablender_version=4.1.0.8 terrablender_version=4.1.0.8
serene_seasons_version_id=pHEgQQUE serene_seasons_version_id=pHEgQQUE
+264 -19
View File
@@ -1,23 +1,39 @@
# Minecraft 26.3 beta port workspace # Minecraft 26.3
This is an **experimental beta port** for issues #97–#104, not gameplay parity The current **Minecraft 26.3 release is 26.3.0.10**, for NeoForge 26.3.0.99 and
with the Minecraft 1.21.1 release. The 26.3 backend persists separate Ages and Java 25. It uses Rivencraft's first-party Age backend, with no Dynamic Dimensions
their seeds. Books, lectern book stands, the Book Binder, Ink Mixer, Writing Desk and page collections or Bad Packets dependency. The writing loop, authored/seeded Ages, generation
are ported, and the Binder can features, weather/skies/celestials, libraries, crystal portals, live instability,
author Standard, Amplified, Island, Flat, Void, or Cave terrain with supported and Link Modifier controls are ported. JEI, TerraBlender/Biomes O' Plenty, Serene
biome-distribution pages, selected material/vegetation/structure features, and Seasons/GlitchCore and Ruins are optional.
independent Age weather and lighting, multiple authored or seeded celestial
bodies and eclipses, biome/material completion, and random features/structures. Immersive Portals Reborn 7.0.12 or Seamless Portals 1.0.0 optionally supplies
Crystal portals and libraries are ported. Instability scoring/provider selection, rotating live book previews, look-only exploration and continuous crystal portal
status effects, colored decay, lightning, explosions, meteors, burning and erosion, views. Install only one fork per instance. Built-in animations and normal travel
ordered writing recovery, live material profiling and all six Link Modifier controls are now ported. remain available without either. Independent settings under book_previews control
Seed editing, operator-confirmed Age retirement and creation rollback are included. each fork's live book and crystal views.
JEI, TerraBlender/Biomes O' Plenty, Serene Seasons/GlitchCore and Ruins are optional
integrations. Live previews, remaining discovery/configuration parity and the final **Known portal-mod failures:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118)
multiplayer regression remain unfinished. The latest published beta is tracks Reborn section-rebuild crashes and Reborn/Seamless acknowledgement disconnects
[1.0.1.136-beta.1](RELEASE_NOTES_1.0.1.136-beta.1.md). during travel. Rejoining recovered the observed Seamless Age-loading disconnect.
Use a test world and keep a backup; do not This release does not fix those failures. See [integration details](../../docs/SEAMLESS_PORTALS.md).
substitute this JAR for the 1.21.1 mod or import 1.21.1 saves.
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
1.21.1: use the eye for mouse look inside the book panel and right-click to return;
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.10.md).
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
player checks passed. See [Flooded rules](../../docs/FLOODED_PAGES.md).
The entries below record how the port was built, including earlier alpha-only The entries below record how the port was built, including earlier alpha-only
limitations that were addressed by later slices. limitations that were addressed by later slices.
@@ -2801,3 +2817,232 @@ filtering, both dimension gates, spawn-event veto, and a real Tiki Head placemen
retained the counts. Temporary fixtures and test worlds were removed; test servers retained the counts. Temporary fixtures and test worlds were removed; test servers
were stopped. Client glyph/GUI checks and natural spawning while exploring an Age were stopped. Client glyph/GUI checks and natural spawning while exploring an Age
remain player validation. No commit, push, or publication; #102 remains open. remain player validation. No commit, push, or publication; #102 remains open.
### Random Page eligibility and library discovery — 1.0.1.137-beta.1
The player passed .136 and authorized its publication. This slice adapts 1.21.1's
RandomPagePolicy and random_pages allowlist/blocklist. Short paths (sky/static)
and fully namespaced Page IDs are accepted; blocklist wins, and allowlist entries
restrict only their own categories. Biome controllers are a separate category
from individual biomes. Creative/JEI availability and manual book authoring are
not filtered.
Normal Link-Panel-only book creation takes one immutable policy snapshot and
passes it through terrain, biome distribution/Page completion, environment,
celestial kinds, material features/materials, optional formations and structures.
Seasons use the same snapshot before their saved policy is committed. Resolved
choices are already frozen in Age index/season data, so reload/reseed never reads
the current lists to reselect an old Age. Authored and partly authored books use
the existing unrestricted completion behavior, matching the 1.21.1 boundary.
Required empty categories use Standard terrain, Native distribution, Normal
lighting/weather, inherited Overworld sky, or No Seasons. Optional features or
materials with no candidates are omitted, not filled with a forbidden random
Page. Non-Native biome distributions preserve their required minimum using the
terrain's preferred/native fallback pool; necessary fallback biomes can therefore
bypass a filter. Native noise biomes come from the preset, not biome Page selection,
and remain unfiltered just as in 1.21.1. Void still has its required Void biome.
Cave weather/season safety overrides remain unchanged. Original unrestricted
terrain/distribution seed choices are unchanged; filtered ranks are recalculated
using the shared Legacy rank chooser instead of a duplicate weighted routine.
Newly placed direct library Pages apply the current policy in both LEGACY and
AGE_ONLY modes. Existing inventory contents are not rewritten. The Legacy library
pool now includes exact Ruins templates and semantic bundled pages rather than
reusing the Sealed Notebook's narrower pool. Sealed Notebook opening retains its
1.21.1 pool behavior; this setting does not retroactively edit unopened/old loot.
No policy filtering is applied to JEI or creative portfolios.
Build passed. A disposable no-optional dedicated server passed 766 creation/policy
checks over 48 seeds and six restart checks: normal book binding, manual blocked
Page authoring, immutable saved settings under a changed policy, unload/reload,
required category/biome fallbacks, optional empty pools, material eligibility,
Native distinction, season policies without requiring Serene classes, library
filtering and unchanged Creative entries. The later rank revision added default
seed-compatibility and minimum-biome checks. These are temporary fixtures, not
new permanent game tests. Worlds and fixtures removed, servers stopped, production
JAR rebuilt. Player config/GUI/world validation remains pending. No commit, push
or publication.
### Random-Age book glyph prose — 1.0.1.138-beta.1
The player passed the .137 eligibility slice. Ported 1.21.1's first-page random-Age
glyph description: the Age name and author remain ordinary text on the left,
followed by layered Legacy word glyphs and real base-25 numerals for terrain,
distribution, lighting, weather and the first celestial cycle's period/angle/phase.
Authored books keep their existing name/author front page and single-symbol middle
pages; no writing notes or instability scores are introduced. The right-side
animated link panel and its click-to-travel behavior are unchanged.
The existing symbolcomponents.png atlas and deterministic word mappings are reused
directly with tinted GUI_TEXTURED blits; no generated art or per-frame dynamic
textures are added. A common prose layout helper handles Unicode word boundaries,
numeric width and wrapping. Writing Desk tab numerals now use the same rendering
routine, retaining their existing size/position/color.
Public terrain/distribution/lighting/weather metadata is sent in the Age catalog,
with celestial data reused from its existing saved-cycle map. These are actual
loaded Age settings rather than a reroll from the book ID or current config.
Metadata excludes seeds, instability scores and providers. It does not load an
unavailable destination merely to display a book. Full catalog replacement removes
unloaded/retired entries; logout clears description/cycle caches. Older books with
no authored symbol component use the random-description path. Existing Age/save
formats remain readable. Catalog network protocol is now 11 (previously 10):
client and server must use matching builds.
Build passed; disposable no-optional dedicated-server checks passed catalog
serialization, immutable snapshots, actual saved setting capture, cache
replacement/clear, real restart, unload/reload and retirement. Pure layout checks
covered Legacy word splitting, Unicode, wrapping, base-25 width and oversized
numeric fallback. Test worlds and fixtures removed, server stopped and production
JAR rebuilt. Visual glyph layering, book/lectern appearance and actual client
catalog receipt remain player validation. No commit, push or publication.
### Renamed Immersive Portals dimension bridge — 1.0.1.139-beta.1
The player passed .138. Confirmed the user's correction: the 26.3 Immersive Portal
implementation uses the Seamless Portals name/mod ID, retaining qouteall rendering,
chunk-loading and dimension APIs. Added an optional shared dimension-ID adapter
before Rivencraft catalog publication/acknowledgement. It synchronizes integer
IDs and native type/sea-level metadata without delegating Age ownership. Failed
synchronization blocks acknowledgement/travel rather than making a successfully
committed Age appear to have failed binding. Startup, unload/reload, reseed and
retirement are covered. Live book/crystal rendering remains later work.
The installed working build passed 35 server creation/catalog checks plus 13 after
restart. Normal book binding, native metadata, API ID roundtrips, two Ages,
lifecycle changes and failed-creation nonpublication were checked. No-optional
startup passed. Real client travel remains pending; Prism files were not changed.
Correction to the initial artifact audit: old CurseForge file 8937394 fails during
its own constructor on .99 with missing DataPackRegistryEvent$NewRegistry; this is
NOT the latest release. The latest file is 9218525, displayed as 10.0.0 while its
filename/internal metadata still say 1.0.0. Its SHA-256 exactly matches the user's
installed working file:
5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0.
The compile dependency is corrected to 9218525 in .140. The earlier broad claim
that the current published build cannot start was wrong and is superseded here.
NeoForge audit on 2026-11-11: official Maven metadata lists .102 as latest in the
26.3 line. Its universal JAR still lacks the old NewRegistry class, so upgrading
cannot fix that OLD portal artifact. Current target remains validated .99; a
separate .102 build/client/server check is recommended. No release authorized.
### Immersive Portals Reborn comparison and shared bridge — 1.0.1.140-beta.1
The user suggested Reborn. Verified the NeoForge 26.3 release is 7.0.12, file
9435354 in CurseForge project 1721833. The newer 7.0.18 is Fabric. The Reborn JAR
registers immersive_portals_reborn plus its legacy core aliases and retains the
qouteall GUI rendering/portal/chunk/dimension APIs. It starts on NeoForge .99
without Cloth Config or other optional mods in the test environment.
Generalized the optional bridge to recognize either Reborn or Seamless. Both
share DimensionIntId.onServerDimensionChanged and the createFromServer packet
factory. Seamless's createPacket returns a vanilla Packet; Reborn's returns a
CustomPacketPayload. The adapter now wraps createFromServer in the vanilla
clientbound payload packet, preserving each fork's native two-/three-tag wire
format. No cross-fork packet schema is invented and neither dependency is bundled.
The compat probe recognizes both. A development run may select
-PwithImmersivePortalsReborn or -PwithSeamlessPortals; requesting both is rejected
because the forks share classes/mixins. The normal build remains optional-free.
Reborn passed 32 creation/catalog checks and 15 after restart: real book-binding
entry point, two runtime Ages, ID/type metadata, native wire roundtrip, per-player
packet preparation, unload/reload, reseed, retirement isolation and persistence.
Seamless latest file 9218525 passed the same 32 lifecycle/packet and 15 restart checks against the shared adapter.
These are server/packet checks, not evidence of renderer quality or real client
packet receipt. Reborn is a viable next client-test target; no performance
superiority is claimed. Live snapshots, chunk leases/audio isolation, and live
crystal surfaces still need porting. Player files were not modified. Temporary
worlds/fixtures removed; no commit, push or publication.
### Reborn live book previews — 1.0.1.141-beta.1
Linking and Descriptive Book front panels now use Immersive Portals Reborn's
live GUI-world renderer when Reborn is installed on both sides. This carries
forward the 1.21.1 camera orbit (11-block radius, five blocks above the focus),
destination sky/fog, chunk streaming and remote-audio isolation. Server destination
resolution uses the actual held book or a nearby loaded stand's matching book;
the client cannot request arbitrary destination coordinates.
A unique session ID prevents stale replies or close packets from replacing or
releasing another book's preview. One per-player eight-chunk-radius loader streams
the view asynchronously, renews while the book stays open, and expires if its
heartbeat is lost. Closing, logout, death/source invalidation, dimension changes,
and shutdown release the lease. Destination resolution for Descriptive Books
uses the same footing/platform rules as book travel.
The rendering integration uses 26.3 GPU texture views with the deferred GUI.
Reborn may resize its target before extraction records the texture view; clearing
is deferred to its render hook, and the normal GUI draws the image beneath the
Legacy panel cutout. The target uses the main framebuffer's depth/stencil format.
The player camera is restored after remote rendering, and remote preview-world
sounds are suppressed without muting the player's world.
Set `[book_previews] reborn_live_views = false` in the local configuration to use
animated panels. Missing Reborn or unavailable terrain also retains the animated
fallback. Seamless's dimension-ID bridge remains available, but this live GUI
implementation is activated only for Reborn. Live crystal portal surfaces and
preview exploration controls remain separate port work.
Validation: production build passed. An isolated real NeoForge 26.3.0.99
dedicated-server/client run with Reborn 7.0.12 displayed the remote live Linking
Book view; screenshot inspected for the panel cutout, upright image and actual
terrain. The client completed without a renderer exception and logout left no
preview chunk leases. The user also reported that the books displayed live views
perfectly. All temporary worlds/client directories and fixture sources were
removed, and the distributable was rebuilt without test classes.
Startup warnings in this isolated run included Reborn's four deprecated
`logoFile` metadata entries; these are upstream branding metadata warnings.
The Linux narrator also lacks `libflite`, unrelated to the book renderer.
### Reborn live crystal portals — 1.0.1.142-beta.1
Crystal portals now create optional native Reborn render-only surfaces. Each
coplanar opening is one masked mesh on each side, including irregular outlines;
the destination image does not repeat once per portal block. Mesh planes sit
inside the portal block thickness so the crystal frame remains in front. Once
native surfaces are established, LIVE_VIEW hides only the animated portal model.
The blocks and their receptacle owner pointers stay intact.
Live views share destination resolution with portal book travel. Linking Books
use their written facing, while Descriptive Books preserve the approaching
entity's facing as their travel path does. The reference camera is anchored to
standing eye height above the opening's floor, rather than to its vertical center.
This prevents taller frames from shifting the preview's arrival height. Relative
links resolve using the opening's center as the view reference; the actual
entity's departure position is still used for travel.
Native surfaces cannot teleport entities, accept remote interaction or perform
cross-portal collision. Existing Rivencraft collision/queue and book rules remain
authoritative, including catalog readiness, Disarm, momentum and arrival safety.
Reborn handles visible-destination streaming through its normal portal system.
Geometry/destination tags allow maintenance to reuse matching entities and replace
stale ones. Activation establishes views immediately; normal receptacle maintenance
restores them after restart. Book removal, frame shutdown, missing destinations
and disabling the integration remove the native surfaces. Without Reborn the
animated surface and ordinary travel continue to work. The server setting is
[book_previews] reborn_crystal_live_views, default true.
Validation on NeoForge 26.3.0.99 / Reborn 7.0.12: 68 server checks passed, covering
all three plane axes, both sides, one mesh per opening, eye-position and facing
transforms, entity reuse, fallback toggling and book removal. Five additional
restart checks passed. An isolated real client/dedicated server rendered the live
opening, then crossed into the correct Age through normal Rivencraft travel.
Screenshots before/after were inspected; the user also reported success.
An initial render test mistakenly bound its synthetic Linking Book at Y=1 inside
the flat world's solid layers. The view correctly displayed underground terrain
and the collision check refused travel. The corrected fixture bound to the actual
surface (Y=4) and passed. No production spawn-height workaround was added for an
invalid synthetic book. All temporary fixtures and test worlds were removed, and
the distributable was rebuilt without test classes.
+81
View File
@@ -0,0 +1,81 @@
# Rivencraft 26.3.0.1
For **Minecraft 26.3**, **NeoForge 26.3.0.99** and **Java 25**.
This regular release collects the player-validated .137–.142 development slices
since 1.0.1.136-beta.1. Versions now use the Minecraft version followed by the
release slice and its iteration: `26.3.0.1`. The JAR is
`rivencraft-26.3.0.1.jar`. The existing Minecraft 1.21.1 release is unchanged.
## Live destination views with Immersive Portals Reborn
- Optional live rotating destination views in Linking and Descriptive Books,
including books on stands. Reborn streams the actual destination chunks.
- Crystal portals show a continuous live view across each coplanar opening,
masked to its shape, with the crystal frame remaining in front.
- Linking Book views use the written destination/facing; Descriptive Book
portals preserve the traveler's facing. Views anchor standing eye height to
the opening's floor, so taller frames do not shift arrival height.
- Rivencraft retains control of portal travel, Disarm, momentum and arrival
safety. The native view cannot independently teleport or interact remotely.
- Preview sessions release their chunk streams on close, logout, invalidation
or expiry. Remote book-preview audio is suppressed and the player camera
restored after rendering.
- Portal maintenance restores views after restart and removes them when the
book is removed or the frame is shut down.
- Tested with **[Immersive Portals Reborn 7.0.12 for NeoForge 26.3](https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354)**.
Use one portal fork per instance. No optional mod is bundled or required.
- The renamed Seamless fork also receives runtime Age dimension/metadata
synchronization; this release's live rendering is enabled for Reborn.
## Random Ages, pages and book descriptions
- New random-Age and library-page allowlists/blocklists accept short paths such
as `sky/static`, as well as full namespaced IDs.
- Blocklists take precedence. An allowlist restricts only the categories it
mentions. Existing Ages and manually authored books remain usable.
- Required empty categories use safe defaults; optional empty categories can be
omitted. Native preset biome pools and necessary biome minimum fallbacks can
bypass individual biome-page exclusions.
- Random-Age Descriptive Books show Legacy glyph descriptions of their public
traits, beneath the readable Age name/author. Seed and instability scores
remain absent from these descriptions.
- Optional portal-engine dimension IDs and native metadata synchronize before
the Rivencraft catalog acknowledgement permits travel.
## Configuration
In `config/rivencraft-local.toml`:
- `random_pages.allowlist` and `random_pages.blocklist`: default empty.
- `book_previews.reborn_live_views`: default `true`; disable locally for
animated book panels.
- `book_previews.reborn_crystal_live_views`: default `true`; the server
controls live crystal surfaces. Disabling retains animated surfaces and travel.
The built-in Legacy animation remains available without optional renderers.
Dynamic Dimensions and Bad Packets are not required by the 26.3 line.
## Validation and known limits
The user passed the included slices in game. Disposable checks covered random
policy resolution, description/catalog serialization and persistence, native
dimension IDs and packet formats for both portal forks, preview rendering and
chunk-lease cleanup, all three crystal portal plane axes, both sides, destination
eye/facing transforms, fallback toggling and full restart restoration. A real
dedicated server/client displayed the live crystal view and crossed into its Age.
The no-optional-mod server also started successfully. Temporary fixtures/worlds
were removed and the production JAR contains no test or optional-engine classes.
**Known issue [#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116):**
with Reborn active, a Static Sky Age can render its sky outside the book GUI.
Use the animated book panel option if affected.
26.3 is now published on the regular release channel at the user's request.
This is not a claim that every 1.21.1 behavior or the final expanded-catalog
two-client regression is complete. The remaining multiplayer, parity and shared
follow-up issues stay open. Preview exploration controls and Create/Ponder scenes
are not included in this release.
Use matching client/server JARs. Back up worlds, keep the Minecraft tracks and
saves separate, and do not downgrade worlds containing newer data.
+19
View File
@@ -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.
+38
View File
@@ -0,0 +1,38 @@
# Rivencraft 26.3.0.3
For **Minecraft 26.3**, **NeoForge 26.3.0.99** and **Java 25**.
## Book preview exploration
- The eye button now matches 1.21.1: it grabs the mouse for look-only exploration
while the destination view remains inside the book panel. Movement is disabled.
- Right-click returns to the ordinary book controls without releasing the preview.
Books on stands retain their disabled exploration button.
- Fixed the exit crash caused by a forced render and duplicate Reborn render-target
submission. Pending target submissions are reused until the renderer drains them.
- Removed remaining Beta branding from the in-game mod name/description.
## Port acceptance and maintenance
- Completed dedicated-server restart/return-link acceptance for #100, following
the two-client matrix and its manual handoff. The player confirmed return travel.
- Added changed-target build/smoke workflows, sequential test-server exclusion and
repeatable dual-version validation commands.
- Hardened release uploads against mismatched filename, embedded version,
Minecraft/Java target and accidental test-fixture packaging. The 1.21.1 metadata
declares its required Dynamic Dimensions AR and Bad Packets dependencies.
- Documented the feature parity review and ongoing independent support of 1.21.1.
Existing 1.21.1 code and published artifacts are unchanged.
## Validation and known issues
The player passed the live-view exploration/right-click/re-entry check and the
dedicated-server Age restart/Linking Book return check. The expanded-catalog
two-client matrix passed creation/catalog/travel/stale-ack/lifecycle checks;
its final return step stalled and was completed by the player, not retried.
Release-tooling checks pass. No optional mod or test fixture is bundled.
**Known issue #116:** Static Sky can leak outside book previews with Reborn.
It remains separately tracked. Other shared follow-ups remain open where needed.
Create/Ponder is not ported to 26.3. Without Reborn, built-in animated previews
and normal book/portal travel remain available. 1.21.1 saves are not imported.
+17
View File
@@ -0,0 +1,17 @@
# Rivencraft 26.3.0.4
Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25. Local test build.
- Added Flooded Environment Pages with the same 1.21.1 rules: default water block
Y=63, or adjacent base-25 Number Pages (2,24 means Y=74). Last Flooded wins.
- Works with Cave and other terrain, preserving solid features. Cave defaults
remain dry without Flooded.
- Lower lines drain higher ordinary water; waterlogged solids are wet/dried.
Policy persists in generator writing/codecs.
- Safe fallback platforms rise above water within build-height limits.
Creative and optional JEI reuse the existing glyph/page pipeline.
- Existing generated chunks are not rewritten. See docs/FLOODED_PAGES.md.
Known Static Sky/Reborn bug #116 remains separate.
Awaiting player acceptance and explicit publication instruction; not committed,
pushed or published.
+46
View File
@@ -0,0 +1,46 @@
# Rivencraft 26.3.0.5
For **Minecraft 26.3**, **NeoForge 26.3.0.99** and **Java 25**.
Dynamic Dimensions and Bad Packets are not required. All integrations remain optional.
## Flooded Pages
- Added Flooded Environment Pages for Cave and other terrain. Default highest
water block Y=63; adjacent Number Pages encode a base-25 absolute height.
Number 24 + Flooded means Y=24; Number 2 + Number 24 + Flooded means Y=74.
- Last Flooded wins. Unsigned heights clamp below the ceiling with safe
platform/headroom space. Cave defaults remain dry without Flooded.
- Flooding preserves solid terrain/features, wets waterloggable blocks and drains
ordinary water above a lower requested line. Policy persists in generator writing.
- Safe fallback platforms sit above water; no-platform travel can fail safely.
- Creative and optional JEI use the existing glyph/page pipeline.
- Existing generated chunks are not rewritten.
## Reborn compatibility and known crashes
- Added a targeted Reborn 7.0.12 acknowledgement guard for the reported protocol
disconnect during Age travel. While Reborn's world map is uninitialized, keep
vanilla acknowledgement handling for the packet listener's world; normal
multiworld handling resumes once ready. Packet scheduling stays on the game thread.
- **Known issue [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118):**
Reborn can still crash during exploration when a queued section rebuild resolves
to null. This release does not fix that renderer crash or establish which mod
made the queue stale. The player accepted Flooded with these Reborn issues noted.
- [#117](https://git.paddedcell.org/dnorberg/rivencraft/issues/117) tracks full
Seamless live-view support. Seamless currently has native dimension synchronization
and normal travel, with animated fallback views; live views remain Reborn-only.
- The earlier Static Sky leak #116 was closed after the user reported it had gone
away with recent changes, possibly after interactive view was implemented.
That timing is not a verified root-cause fix. It is not the new section rebuild failure.
- Built-in animated book/portal views and ordinary travel remain available without
a portal renderer. Disabling only Rivencraft live views has not been proven to
prevent all Reborn crashes. No required or bundled portal-mod dependency is added.
## Validation
Both-version Flooded in-game checks passed. Three focused 1.21.1 tests and 21
isolated 26.3 checks covered grammar, two water levels, codecs, preserved solids,
dry Cave defaults and page availability. The 26.3.0.5 build and acknowledgement
target signatures were verified. No claim that Reborn is crash-free is made.
Temporary worlds/fixtures were removed; production JAR contains no test fixtures.
See [Flooded rules](https://git.paddedcell.org/dnorberg/rivencraft/src/branch/main/docs/FLOODED_PAGES.md).
+13
View File
@@ -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).
+14
View File
@@ -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).
+16
View File
@@ -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).
+23
View File
@@ -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).
+35
View File
@@ -0,0 +1,35 @@
# Random Page policy test — 1.0.1.137-beta.1
Install the new JAR and launch once so the new entries appear in
Minecraft's config/rivencraft-local.toml. Close the instance before editing.
On a dedicated server edit its own config, not the client's.
For a visible check, replace only the existing random_pages section with:
```toml
[random_pages]
allowlist = ["terrain/flat", "biome/single", "biome/plains", "sky/static", "lighting/normal", "weather/off", "feature/not_present"]
blocklist = ["sky/nether", "celestial/sun", "celestial/moon"]
```
The deliberately nonexistent feature entry restricts only optional features,
leaving an empty feature pool for this test.
1. Bind a Descriptive Book with only a Link Panel. Enter it: expect Flat terrain,
Plains, Static Sky, normal lighting, no rain and no suns/moons. Optional Page
features/structures should be absent; native biome decoration is independent.
2. Bind an authored Flat/Plains/Single/Nether Sky book. Nether Sky remains usable
despite the blocklist; the setting controls random generation and direct
library loot, not manual authorship. The Page remains visible in Creative/JEI.
3. Change sky/static to sky/end, restart and revisit the first Age. It must retain
Static Sky. A newly bound Link-Panel-only book should get End Sky.
4. Optional library check: allowlist = ["sky/static"], blocklist = ["sky/nether"].
New library direct Pages may include Static Sky or other unrestricted
categories, but never another Sky Page. Test both library loot modes where
desired. Existing chests/stands remain untouched; AGE_ONLY may have no Pages
when the book's written Page set has no eligible entries.
Restore both lists to [] afterward unless you want the restrictions to persist.
No existing Age should change. Keep the full world backup customary for beta
updates. Native biome presets and required minimum-biome fallbacks intentionally
bypass biome-Page filters; Sealed Notebooks keep their separate 1.21.1 draw pool.
+21
View File
@@ -0,0 +1,21 @@
# Random-Age glyph description test — 1.0.1.138-beta.1
Use the new build on both client and server (Age catalog protocol 11).
1. Open an existing or new Link-Panel-only Descriptive Book. Its front spread
should retain the plain-text Age name and author on the left, with the generated
description below rendered as Legacy glyphs. The destination animation remains
on the right and clicking it still travels.
2. Put the same book on a lectern and open it. The description and panel should
match handheld use.
3. Open an authored book containing Symbol Pages. Its front spread should retain
just the name/author, and page turning should show one authored symbol at a time.
4. Reconnect or restart, then reopen the random book. Glyph traits should remain
consistent with its saved Age. Test a longer name and GUI scale for clipping.
5. Check Writing Desk tab numbers around 24/25 and 49/50. Their existing glyph
size/position and base-25 behavior should be unchanged.
Descriptions are available only for loaded Ages; viewing a book does not force-load
an unloaded/retired Age. No instability score or seed appears in the description.
The desktop glyph display still needs your visual check; server/codec/layout
validation does not substitute for a real client render check.
+8
View File
@@ -0,0 +1,8 @@
# Superseded by the 1.0.1.140-beta.1 portal-fork test
Use TESTING_1.0.1.140-beta.1.md. It covers both supported fork candidates.
Correction: the user's installed Seamless file exactly matches current published
CurseForge file 9218525 (displayed 10.0.0, internal version/filename 1.0.0).
The startup failure applies only to older file 8937394. The earlier recommendation
to avoid the current download was incorrect.
+29
View File
@@ -0,0 +1,29 @@
# Portal fork runtime compatibility — 1.0.1.140-beta.1
Candidate downloads for Minecraft 26.3 / NeoForge:
- Immersive Portals Reborn 7.0.12:
https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354
Version 7.0.18 is Fabric, so use the NeoForge 7.0.12 file for this test.
- Seamless latest file 9218525:
https://www.curseforge.com/minecraft/mc-mods/immersive-portal/files/9218525
Display name is 10.0.0, but its downloaded filename/internal version remain 1.0.0.
This exactly matches the user's installed working JAR.
Use ONE portal fork per instance: they share engine classes and mixins.
Prism files were left unchanged. Install matching Rivencraft builds on both sides
for dedicated testing. Current tested loader is NeoForge 26.3.0.99.
1. Enable/install the chosen fork and Rivencraft .140.
2. Create an authored Descriptive Book after joining, using a distinctive sky and
lighting. Travel into its newly created Age without reconnecting.
3. Return using a bound Linking Book and test a second freshly created Age.
4. Restart and revisit both Ages. Check for unknown/unloaded-dimension rejection,
disconnects or incorrect sky/lighting.
5. Test existing crystal portals through the usual Rivencraft fallback path.
This slice synchronizes runtime Ages and native metadata. Live book panels and
live crystal portal surfaces are NOT ported yet; animated fallbacks are expected.
Actual client travel/packet handling needs your check. Server lifecycle, packet
serialization and restart checks passed with both Reborn and latest Seamless
(32 lifecycle/packet plus 15 restart checks each). NeoForge .102 is a candidate for a later isolated upgrade
check; the project target has not been changed yet.
+26
View File
@@ -0,0 +1,26 @@
# 1.0.1.141-beta.1 — Reborn live book previews
Use NeoForge 26.3.0.99 and Immersive Portals Reborn 7.0.12, CurseForge file 9435354.
Install one portal fork per instance and matching Rivencraft builds on a dedicated
server/client. Reborn remains optional; nothing is bundled.
The user reports live views working in both book types. Follow-up coverage:
1. View a Linking Book and Descriptive Book pointing to different Ages. Check
orbiting terrain, upright orientation, destination lighting/sky and the panel
cutout. Click the live panel to travel using the existing book controls.
2. Repeat from a book stand, including a destination whose chunks are not loaded.
3. Close/reopen, switch books quickly and restart/revisit the Age. A stale view
must not replace the newly selected destination.
4. During rain, confirm the source world's weather audio remains audible and the
remote world's sounds do not leak into the GUI.
5. Set [book_previews] reborn_live_views = false in rivencraft-local.toml to
verify the animated fallback; restore true for live views.
The live image streams actual destination chunks. It is not restricted to the
old fixed block snapshot volume. Exploration controls and live crystal portal
surfaces are not included in this slice.
Build and isolated dedicated/client rendering check passed, with a live Linking
Book screenshot inspected and zero remaining preview leases on logout. Temporary
test worlds were removed regardless of result. Reborn's four deprecated logoFile
startup warnings concern its metadata, not Rivencraft rendering.
+30
View File
@@ -0,0 +1,30 @@
# 1.0.1.142-beta.1 — Reborn live crystal portal surfaces
Use Reborn 7.0.12 for NeoForge 26.3, CurseForge file 9435354, with NeoForge
26.3.0.99. Use one portal fork and matching Rivencraft builds on a server/client.
Implemented and validated:
- One continuous view per opening on each side, masked to the portal cells.
- Correct destination eye-height reference; Linking Book facing and Descriptive
Book inherited facing.
- Native surfaces render only; Rivencraft's blocks retain transport and effects.
- Fallback model hidden only for established live surfaces.
- Maintenance restores views after restart and removes them on shutdown/removal.
- Optional server setting [book_previews] reborn_crystal_live_views = false retains
animated surfaces and ordinary portal travel.
68 server checks and five restart checks passed, plus a real dedicated/client
live-view and walking-through check. Screenshots were inspected and the user
reported success. Temporary worlds were deleted and fixture sources removed.
Useful follow-up manual coverage:
1. Try both book types, compare portal arrival to using the same book, and inspect
both sides of the frame.
2. Try taller, horizontal and irregular frames; check that frame edges occlude the
scene and the view does not repeat per cell.
3. Restart, revisit, remove/reinsert the book and break a frame block.
4. Check a destination with different sky/lighting and an initially unloaded
destination area.
The initial synthetic render fixture used a blocked Y=1 target; that was corrected
to the resolved Y=4 surface. No global landing-height behavior was changed.
+21 -1
View File
@@ -17,7 +17,24 @@ repositories {
content { includeGroup 'mezz.jei'; includeGroup 'net.mezzdev.config' } content { includeGroup 'mezz.jei'; includeGroup 'net.mezzdev.config' }
} }
} }
// Optional APIs stay out of published dependency metadata.
configurations {
localRuntime
runtimeClasspath.extendsFrom localRuntime
}
dependencies { dependencies {
// Both optional forks retain qouteall APIs, but must never be loaded together.
if (project.hasProperty('withSeamlessPortals') && project.hasProperty('withImmersivePortalsReborn'))
throw new GradleException('Choose one Immersive Portals fork for the development run')
def portalDependency = project.hasProperty('withImmersivePortalsReborn')
? 'curse.maven:immersive-portals-reborn-unofficial-fork-1721833:9435354'
: project.hasProperty('seamlessPortalsJar') ? files(project.property('seamlessPortalsJar'))
: project.hasProperty('withSeamlessPortals') ? 'curse.maven:immersive-portal-1511174:9218525'
: 'curse.maven:immersive-portals-reborn-unofficial-fork-1721833:9435354'
compileOnly portalDependency
if (project.hasProperty('withSeamlessPortals') || project.hasProperty('withImmersivePortalsReborn'))
localRuntime portalDependency
// Compile against the 26.3 baseline API; a local current Ruins JAR can override it. // Compile against the 26.3 baseline API; a local current Ruins JAR can override it.
def ruinsDependency = project.hasProperty('ruinsJar') ? files(project.property('ruinsJar')) def ruinsDependency = project.hasProperty('ruinsJar') ? files(project.property('ruinsJar'))
: 'curse.maven:ruins-227873:8962119' : 'curse.maven:ruins-227873:8962119'
@@ -36,11 +53,13 @@ dependencies {
if (project.hasProperty('withJei')) localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" if (project.hasProperty('withJei')) localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
} }
sourceSets.main.java.srcDir('../../shared/src/main/java')
group = 'net.dnorberg.rivencraft' group = 'net.dnorberg.rivencraft'
version = mod_version version = mod_version
base { base {
archivesName = "rivencraft-${minecraft_version}" archivesName = "rivencraft"
} }
java.toolchain.languageVersion = JavaLanguageVersion.of(25) java.toolchain.languageVersion = JavaLanguageVersion.of(25)
@@ -230,6 +249,7 @@ tasks.named('processResources', ProcessResources).configure {
include 'assets/rivencraft/models/block/decay_*.json' include 'assets/rivencraft/models/block/decay_*.json'
include 'assets/rivencraft/textures/block/decay_*.png' include 'assets/rivencraft/textures/block/decay_*.png'
include 'data/rivencraft/tags/block/decay_protected.json' 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.json'
include 'assets/rivencraft/sounds/**/*.ogg' include 'assets/rivencraft/sounds/**/*.ogg'
include 'assets/rivencraft/textures/item/crystal_shard.png' include 'assets/rivencraft/textures/item/crystal_shard.png'
+1 -1
View File
@@ -7,7 +7,7 @@ neo_version=26.3.0.99
mod_id=rivencraft mod_id=rivencraft
mod_name=Rivencraft mod_name=Rivencraft
mod_license=LGPL-3.0-or-later mod_license=LGPL-3.0-or-later
mod_version=1.0.1.136-beta.1 mod_version=26.3.0.10
jei_version=31.17.0.109 jei_version=31.17.0.109
-3
View File
@@ -11,10 +11,8 @@
"symbol.rivencraft.sky.overworld.description": "Use the native Overworld sky. Terrain and lighting remain independently authored.", "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.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.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": "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.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.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.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).", "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,7 +83,6 @@
"symbol.rivencraft.feature.abandoned_camps": "Abandoned Camps", "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.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.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.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.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.terrain.flat.description": "A level, biome-decorated landscape with its foundation at Y=0.",
@@ -7,6 +7,12 @@ public final class PortConfig {
public enum LibraryLootMode { LEGACY, AGE_ONLY } public enum LibraryLootMode { LEGACY, AGE_ONLY }
public static final ModConfigSpec.EnumValue<LibraryLootMode> LIBRARY_LOOT_MODE; public static final ModConfigSpec.EnumValue<LibraryLootMode> LIBRARY_LOOT_MODE;
public enum ReturnLinkMode { ON_CREATION, ALWAYS, DISABLED } public enum ReturnLinkMode { ON_CREATION, ALWAYS, DISABLED }
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_ALLOWLIST;
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 SPEC;
public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES; public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES;
public static final ModConfigSpec.IntValue SYMBOL_INK_COST; public static final ModConfigSpec.IntValue SYMBOL_INK_COST;
@@ -17,6 +23,34 @@ public final class PortConfig {
static { static {
var builder = new ModConfigSpec.Builder(); var builder = new ModConfigSpec.Builder();
builder.push("book_previews");
LIVE_BOOK_PREVIEWS = builder.comment("Show live rotating destination views when Immersive Portals Reborn is installed on client and server.",
"Disable locally to retain the animated Legacy link panels.")
.define("reborn_live_views", true);
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(
"Page paths allowed in new random Ages and newly generated library pages.",
"Restricts only categories it mentions; other categories remain unrestricted.",
"Example: [\"sky/static\"]; full namespaced IDs are accepted too.")
.defineList("allowlist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
RANDOM_PAGE_BLOCKLIST = builder.comment(
"Page paths excluded from new random Ages and newly generated library pages.",
"Blocklist wins. Existing Ages, Creative/JEI pages and manually authored books remain usable.",
"Required empty categories use safe defaults; Native biomes come from the preset, not biome pages.")
.defineList("blocklist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
builder.pop();
builder.push("serene_seasons"); builder.push("serene_seasons");
AUTO_WHITELIST_SERENE_AGES = builder.comment("Automatically whitelist Ages with seed-selected/legacy cycling seasons. Explicit pages still apply; existing entries are preserved when disabled.") AUTO_WHITELIST_SERENE_AGES = builder.comment("Automatically whitelist Ages with seed-selected/legacy cycling seasons. Explicit pages still apply; existing entries are preserved when disabled.")
.define("auto_whitelist_ages", true); .define("auto_whitelist_ages", true);
@@ -47,5 +81,10 @@ public final class PortConfig {
SPEC = builder.build(); SPEC = builder.build();
} }
private static boolean validPageId(Object value) {
if (!(value instanceof String id)) return false;
try { net.dnorberg.rivencraft.age.PortRandomPagePolicy.parsePageId(id); return true; }
catch (IllegalArgumentException exception) { return false; }
}
private PortConfig() {} private PortConfig() {}
} }
@@ -249,10 +249,13 @@ public final class Rivencraft {
COMPONENTS.register(modEventBus); COMPONENTS.register(modEventBus);
RECIPE_SERIALIZERS.register(modEventBus); RECIPE_SERIALIZERS.register(modEventBus);
net.dnorberg.rivencraft.compat.RuinsCompatibility.register(); net.dnorberg.rivencraft.compat.RuinsCompatibility.register();
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.register();
ModCreativeTabs.register(modEventBus); ModCreativeTabs.register(modEventBus);
PortBiomeSources.register(modEventBus); PortBiomeSources.register(modEventBus);
PortChunkGenerators.register(modEventBus); PortChunkGenerators.register(modEventBus);
NeoForge.EVENT_BUS.addListener(RuntimeAgeBackend::onLevelLoad); NeoForge.EVENT_BUS.addListener(RuntimeAgeBackend::onLevelLoad);
NeoForge.EVENT_BUS.addListener(net.neoforged.bus.api.EventPriority.LOWEST,
net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility::onServerStarted);
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAgeWeather::onLevelTickPre); NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAgeWeather::onLevelTickPre);
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAcceleratedTicks::onLevelTickPost); NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAcceleratedTicks::onLevelTickPost);
NeoForge.EVENT_BUS.addListener(PortAgeCommands::register); NeoForge.EVENT_BUS.addListener(PortAgeCommands::register);
@@ -13,7 +13,8 @@ import net.minecraft.resources.Identifier;
/** Full server level catalog, sent on login and after a runtime Age is added. */ /** Full server level catalog, sent on login and after a runtime Age is added. */
public record AgeCatalogPayload(int version, List<Identifier> dimensions, public record AgeCatalogPayload(int version, List<Identifier> dimensions,
Map<Identifier, PortAgeColors> colors, Map<Identifier, PortAgeColors> colors,
Map<Identifier, PortDayCycle> dayCycles) implements CustomPacketPayload { Map<Identifier, PortDayCycle> dayCycles,
Map<Identifier, PortAgeDescription> descriptions) implements CustomPacketPayload {
public static final Type<AgeCatalogPayload> TYPE = new Type<>( public static final Type<AgeCatalogPayload> TYPE = new Type<>(
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age_catalog")); Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age_catalog"));
public static final StreamCodec<RegistryFriendlyByteBuf, AgeCatalogPayload> STREAM_CODEC = StreamCodec.composite( public static final StreamCodec<RegistryFriendlyByteBuf, AgeCatalogPayload> STREAM_CODEC = StreamCodec.composite(
@@ -21,6 +22,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
Identifier.STREAM_CODEC.apply(ByteBufCodecs.list()), AgeCatalogPayload::dimensions, Identifier.STREAM_CODEC.apply(ByteBufCodecs.list()), AgeCatalogPayload::dimensions,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeColors.STREAM_CODEC), AgeCatalogPayload::colors, ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeColors.STREAM_CODEC), AgeCatalogPayload::colors,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortDayCycle.STREAM_CODEC), AgeCatalogPayload::dayCycles, ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortDayCycle.STREAM_CODEC), AgeCatalogPayload::dayCycles,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeDescription.STREAM_CODEC), AgeCatalogPayload::descriptions,
AgeCatalogPayload::new AgeCatalogPayload::new
); );
@@ -28,6 +30,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
dimensions = List.copyOf(dimensions); dimensions = List.copyOf(dimensions);
colors = Map.copyOf(colors); colors = Map.copyOf(colors);
dayCycles = Map.copyOf(dayCycles); dayCycles = Map.copyOf(dayCycles);
descriptions = Map.copyOf(descriptions);
} }
@Override @Override
@@ -21,7 +21,7 @@ public final class AgeCatalogSync {
} }
public static void registerPayloads(RegisterPayloadHandlersEvent event) { public static void registerPayloads(RegisterPayloadHandlersEvent event) {
var registrar = event.registrar("10"); var registrar = event.registrar("12");
registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC); registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC);
registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC, registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC,
(payload, context) -> { (payload, context) -> {
@@ -55,6 +55,9 @@ public final class AgeCatalogSync {
State state = state(server); State state = state(server);
state.version++; state.version++;
state.acknowledged.clear(); state.acknowledged.clear();
// Optional synchronization failures must not turn a committed Age into a
// reported binding failure. Withhold acknowledgements, so travel stays safe.
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.synchronize(server)) return;
for (ServerPlayer player : server.getPlayerList().getPlayers()) { for (ServerPlayer player : server.getPlayerList().getPlayers()) {
try { try {
send(player); send(player);
@@ -76,9 +79,11 @@ public final class AgeCatalogSync {
MinecraftServer server = player.level().getServer(); MinecraftServer server = player.level().getServer();
State state = state(server); State state = state(server);
state.acknowledged.remove(player.getUUID()); state.acknowledged.remove(player.getUUID());
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.beforeCatalog(player))
throw new IllegalStateException("Optional portal dimension catalog is unavailable");
var dimensions = server.levelKeys().stream().map(key -> key.identifier()).sorted().toList(); var dimensions = server.levelKeys().stream().map(key -> key.identifier()).sorted().toList();
PacketDistributor.sendToPlayer(player, new AgeCatalogPayload(state.version, dimensions, PacketDistributor.sendToPlayer(player, new AgeCatalogPayload(state.version, dimensions,
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server))); RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server)));
} }
private static void acknowledge(ServerPlayer player, int version) { private static void acknowledge(ServerPlayer player, int version) {
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.age;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.List; import java.util.List;
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf;
@@ -14,26 +15,33 @@ import org.joml.Vector3f;
import org.joml.Vector3fc; import org.joml.Vector3fc;
/** Frozen shared-color writing, adapted from 1.21.1 AgeSkyProfile. -1 means native. */ /** 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 PortAgeColors NATIVE = new PortAgeColors(-1, -1);
public static final Codec<PortAgeColors> CODEC = RecordCodecBuilder.create(instance -> instance.group( 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("sky").forGetter(PortAgeColors::sky),
Codec.intRange(-1, 0xffffff).fieldOf("ambient").forGetter(PortAgeColors::ambient), 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)); ).apply(instance, PortAgeColors::new));
public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeColors> STREAM_CODEC = StreamCodec.composite( public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeColors> STREAM_CODEC = StreamCodec.composite(
ByteBufCodecs.INT, PortAgeColors::sky, ByteBufCodecs.INT, PortAgeColors::ambient, 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"); public static final Identifier AMBIENT = Identifier.fromNamespaceAndPath("rivencraft", "lighting/ambient_color");
private static volatile Map<Identifier, PortAgeColors> clientColors = Map.of(); private static volatile Map<Identifier, PortAgeColors> clientColors = Map.of();
public PortAgeColors { public PortAgeColors {
staticResolution = StaticSkyResolution.clamp(staticResolution);
if (sky < -1 || sky > 0xffffff || ambient < -1 || ambient > 0xffffff if (sky < -1 || sky > 0xffffff || ambient < -1 || ambient > 0xffffff
|| celestial < -1 || celestial > 0xffffff) || celestial < -1 || celestial > 0xffffff)
throw new IllegalArgumentException("Invalid Age color"); throw new IllegalArgumentException("Invalid Age color");
} }
public PortAgeColors(int sky, int ambient) { this(sky, ambient, -1); } 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); } 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 isModifier(Identifier page) { return isColor(page) || number(page) >= 0 || page.equals(AMBIENT); }
public static boolean validNumbers(List<Identifier> pages) { public static boolean validNumbers(List<Identifier> pages) {
for (int i = 0; i < pages.size(); i++) for (int i = 0; i < pages.size(); i++) {
if (number(pages.get(i)) >= 0 && (i + 1 == pages.size() if (number(pages.get(i)) < 0) continue;
|| !isColor(pages.get(i + 1)) && !PortDayCycle.isPeriod(pages.get(i + 1)) int next = i + 1;
&& !PortDayCycle.isPhase(pages.get(i + 1)) && !PortDayCycle.isAngle(pages.get(i + 1)) while (next < pages.size() && number(pages.get(next)) >= 0) next++;
&& !PortDayCycle.isSize(pages.get(i + 1)))) return false; 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; 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); 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. */ /** Only pageless random Ages receive a random sky tint, as in 1.21.1. */
@@ -46,7 +46,7 @@ public final class PortAgeCommands {
StringBuilder mods = new StringBuilder("Optional mods: "); StringBuilder mods = new StringBuilder("Optional mods: ");
for (String id : new String[]{"jei", "terrablender", "biomesoplenty", for (String id : new String[]{"jei", "terrablender", "biomesoplenty",
"sereneseasons", "glitchcore", "ruins", "create", "sereneseasons", "glitchcore", "ruins", "create",
"ponder", "immersive_portals_core"}) { "ponder", "immersive_portals_core", "seamlessportals", "immersive_portals_reborn"}) {
if (mods.length() > "Optional mods: ".length()) mods.append(", "); if (mods.length() > "Optional mods: ".length()) mods.append(", ");
mods.append(id).append('=').append(ModList.get().isLoaded(id)); mods.append(id).append('=').append(ModList.get().isLoaded(id));
} }
@@ -1777,7 +1777,7 @@ public final class PortAgeCommands {
private static void verifyCatalogRoundTrip(net.minecraft.server.MinecraftServer server) { private static void verifyCatalogRoundTrip(net.minecraft.server.MinecraftServer server) {
var payload = new AgeCatalogPayload(1, server.levelKeys().stream().map(key -> key.identifier()).toList(), var payload = new AgeCatalogPayload(1, server.levelKeys().stream().map(key -> key.identifier()).toList(),
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server)); RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server));
var buffer = new net.minecraft.network.RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(), var buffer = new net.minecraft.network.RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(),
server.registryAccess(), net.neoforged.neoforge.network.connection.ConnectionType.NEOFORGE); server.registryAccess(), net.neoforged.neoforge.network.connection.ConnectionType.NEOFORGE);
try { try {
@@ -0,0 +1,24 @@
package net.dnorberg.rivencraft.age;
import java.util.Map;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.resources.Identifier;
/** Public presentation only: no seed, instability score or provider information. */
public record PortAgeDescription(PortAgeTerrain terrain, PortBiomePlan.Distribution distribution,
PortLighting lighting, PortWeatherMode weather) {
public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeDescription> STREAM_CODEC = StreamCodec.composite(
ByteBufCodecs.STRING_UTF8.map(PortAgeTerrain::valueOf, PortAgeTerrain::name), PortAgeDescription::terrain,
ByteBufCodecs.STRING_UTF8.map(PortBiomePlan.Distribution::valueOf, PortBiomePlan.Distribution::name), PortAgeDescription::distribution,
ByteBufCodecs.STRING_UTF8.map(PortLighting::valueOf, PortLighting::name), PortAgeDescription::lighting,
ByteBufCodecs.STRING_UTF8.map(PortWeatherMode::valueOf, PortWeatherMode::name), PortAgeDescription::weather,
PortAgeDescription::new);
private static volatile Map<Identifier, PortAgeDescription> clientDescriptions = Map.of();
public static void updateClient(Map<Identifier, PortAgeDescription> descriptions) {
clientDescriptions = Map.copyOf(descriptions);
}
public static PortAgeDescription forClient(Identifier id) { return clientDescriptions.get(id); }
}
@@ -1,5 +1,7 @@
package net.dnorberg.rivencraft.age; package net.dnorberg.rivencraft.age;
import net.dnorberg.rivencraft.shared.FloodingRules;
import java.util.Set; import java.util.Set;
import net.dnorberg.rivencraft.Rivencraft; import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
@@ -36,10 +38,14 @@ public final class PortAgeTravel {
public static BlockPos resolveLanding(ServerLevel target) { return resolveLanding(target, true); } public static BlockPos resolveLanding(ServerLevel target) { return resolveLanding(target, true); }
public static BlockPos resolveLanding(ServerLevel target, net.minecraft.world.entity.Entity entity, public static BlockPos resolveLanding(ServerLevel target, net.minecraft.world.entity.Entity entity,
net.dnorberg.rivencraft.item.LinkProperties properties) { net.dnorberg.rivencraft.item.LinkProperties properties) {
return resolveLanding(target, (ServerLevel) entity.level(), entity.blockPosition(), properties);
}
public static BlockPos resolveLanding(ServerLevel target, ServerLevel source, BlockPos departure,
net.dnorberg.rivencraft.item.LinkProperties properties) {
BlockPos landing = resolveLanding(target, !properties.has(net.dnorberg.rivencraft.item.LinkProperties.DISABLE_PLATFORM)); BlockPos landing = resolveLanding(target, !properties.has(net.dnorberg.rivencraft.item.LinkProperties.DISABLE_PLATFORM));
if (landing == null || !properties.has(net.dnorberg.rivencraft.item.LinkProperties.RELATIVE_LINK)) return landing; if (landing == null || !properties.has(net.dnorberg.rivencraft.item.LinkProperties.RELATIVE_LINK)) return landing;
return findFootedDestination(target, net.dnorberg.rivencraft.item.PortLinkDestinations.relativeOrigin( return findFootedDestination(target, net.dnorberg.rivencraft.item.PortLinkDestinations.relativeOrigin(
(ServerLevel) entity.level(), target, entity.blockPosition())).orElse(null); source, target, departure)).orElse(null);
} }
public static BlockPos resolveLanding(ServerLevel target, boolean generatePlatform) { public static BlockPos resolveLanding(ServerLevel target, boolean generatePlatform) {
boolean fissure = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features boolean fissure = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
@@ -72,14 +78,18 @@ public final class PortAgeTravel {
} }
} }
} }
return generatePlatform ? makePlatform(target, new BlockPos(0, 64, 0)) : null; return generatePlatform ? makePlatform(target, new BlockPos(0, fallbackFeet(target), 0)) : null;
} }
BlockPos surface = findSurfaceLanding(target, 0, 0); BlockPos surface = findSurfaceLanding(target, 0, 0);
if (surface != null) return surface; if (surface != null) return surface;
// Only build above the actual highest obstruction, never in a pocket // Only build above the actual highest obstruction, never in a pocket
// beneath it. Void Ages retain the usual platform floor at Y=63. // beneath it. Void Ages retain the usual platform floor at Y=63.
BlockPos obstruction = highestObstruction(target, 0, 0); BlockPos obstruction = highestObstruction(target, 0, 0);
int y = obstruction == null ? 64 : Math.max(64, obstruction.getY() + 3); boolean flooded = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
&& features.floodSurface() != FloodingRules.NONE;
int clearance = flooded && obstruction != null && !target.getFluidState(obstruction).isEmpty() ? 2 : 3;
int y = obstruction == null ? fallbackFeet(target)
: Math.max(fallbackFeet(target), obstruction.getY() + clearance);
return generatePlatform ? makePlatform(target, new BlockPos(0, y, 0)) : null; return generatePlatform ? makePlatform(target, new BlockPos(0, y, 0)) : null;
} }
@@ -120,6 +130,12 @@ public final class PortAgeTravel {
.value().noiseSettings()); .value().noiseSettings());
} }
private static int fallbackFeet(ServerLevel target) {
int requested = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
? features.floodSurface() : FloodingRules.NONE;
return FloodingRules.platformFloor(requested, target.getMinY(), target.getMaxY()) + 1;
}
private static BlockPos makePlatform(ServerLevel target, BlockPos foot) { private static BlockPos makePlatform(ServerLevel target, BlockPos foot) {
if (foot.getY() <= target.getMinY() || foot.getY() + 2 >= target.getMaxY()) return null; if (foot.getY() <= target.getMinY() || foot.getY() + 2 >= target.getMaxY()) return null;
// A carved pocket inside a flooded cave immediately refills. Refuse // A carved pocket inside a flooded cave immediately refills. Refuse
@@ -3,19 +3,29 @@ package net.dnorberg.rivencraft.age;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.List; import java.util.List;
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
import net.minecraft.resources.Identifier; import net.minecraft.resources.Identifier;
/** Frozen biome choice; Native may carry an explicit Cave pool. Repeats retain weight. */ /** 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 enum Distribution { NATIVE, SINGLE, TILED, GRID, TINY, SMALL, MEDIUM, LARGE, HUGE }
public static final Codec<PortBiomePlan> CODEC = RecordCodecBuilder.create(instance -> instance.group( public static final Codec<PortBiomePlan> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.STRING.xmap(Distribution::valueOf, Distribution::name).fieldOf("distribution") Codec.STRING.xmap(Distribution::valueOf, Distribution::name).fieldOf("distribution")
.forGetter(PortBiomePlan::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)); ).apply(instance, PortBiomePlan::new));
public PortBiomePlan(Distribution distribution, List<Identifier> biomes) {
this(distribution, biomes, NativeBiomeKind.TERRAIN);
}
public PortBiomePlan { 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); biomes = List.copyOf(biomes);
if (distribution == null || distribution == Distribution.SINGLE && biomes.size() != 1 if (distribution == null || distribution == Distribution.SINGLE && biomes.size() != 1
|| distribution != Distribution.NATIVE && distribution != Distribution.SINGLE && biomes.size() < 2) || distribution != Distribution.NATIVE && distribution != Distribution.SINGLE && biomes.size() < 2)
@@ -144,6 +144,10 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
/** Creation-only completion. Exact diagnostic fixtures can still use compile. */ /** Creation-only completion. Exact diagnostic fixtures can still use compile. */
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks) { public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks) {
return resolve(pages, seed, nativeTicks, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks, PortRandomPagePolicy policy) {
if (!validWriting(pages)) if (!validWriting(pages))
throw new IllegalArgumentException("An Age may have at most ten suns and ten moons"); throw new IllegalArgumentException("An Age may have at most ten suns and ten moons");
if (pages.stream().anyMatch(PortDayCycle::isController)) return compile(pages, seed, nativeTicks); if (pages.stream().anyMatch(PortDayCycle::isController)) return compile(pages, seed, nativeTicks);
@@ -152,7 +156,8 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
var random = new Random(seed ^ 0x534B5950524F464CL); var random = new Random(seed ^ 0x534B5950524F464CL);
random.nextInt(5); random.nextInt(5);
randomColor(random); randomColor(random);
int suns = random.nextInt(4), moons = random.nextInt(4); int suns = policy.allows(Identifier.parse("rivencraft:celestial/sun")) ? random.nextInt(4) : 0;
int moons = policy.allows(Identifier.parse("rivencraft:celestial/moon")) ? random.nextInt(4) : 0;
var bodies = new java.util.ArrayList<PortCelestialBody>(); var bodies = new java.util.ArrayList<PortCelestialBody>();
for (int i = 0; i < suns + moons; i++) for (int i = 0; i < suns + moons; i++)
bodies.addAll(randomUnmodified(seed, i, nativeTicks, i < suns ? SUN : MOON).bodies); bodies.addAll(randomUnmodified(seed, i, nativeTicks, i < suns ? SUN : MOON).bodies);
@@ -309,6 +314,8 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
net.minecraft.core.registries.Registries.WORLD_CLOCK).getOrThrow(WorldClocks.OVERWORLD)).totalTicks(); net.minecraft.core.registries.Registries.WORLD_CLOCK).getOrThrow(WorldClocks.OVERWORLD)).totalTicks();
} }
public static PortDayCycle forClient(Identifier id) { return clientCycles.getOrDefault(id, NATIVE); }
public static void updateClient(Map<Identifier, PortDayCycle> cycles) { clientCycles = Map.copyOf(cycles); } public static void updateClient(Map<Identifier, PortDayCycle> cycles) { clientCycles = Map.copyOf(cycles); }
public static PortDayCycle forLevel(Level level) { public static PortDayCycle forLevel(Level level) {
if (level instanceof PortAgeLevel age) return age.dayCycle(); if (level instanceof PortAgeLevel age) return age.dayCycle();
@@ -1,6 +1,5 @@
package net.dnorberg.rivencraft.age; package net.dnorberg.rivencraft.age;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.resources.Identifier; import net.minecraft.resources.Identifier;
@@ -8,21 +7,28 @@ import net.minecraft.resources.Identifier;
/** Seed-completes missing environment controllers once, before an Age is saved. */ /** Seed-completes missing environment controllers once, before an Age is saved. */
public record PortEnvironmentSelection(PortWeatherMode weather, PortLighting lighting, PortSkyStyle sky) { public record PortEnvironmentSelection(PortWeatherMode weather, PortLighting lighting, PortSkyStyle sky) {
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain) { public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain) {
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull) return resolve(pages, seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values()));
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values()));
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed));
} }
private static <T> T rankedDefault(Random random, T[] choices) { public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain,
PortRandomPagePolicy policy) {
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values(), "lighting", policy));
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values(), "weather", policy));
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed, policy));
}
private static <T extends Enum<T>> T rankedDefault(Random random, T[] choices, String category, PortRandomPagePolicy policy) {
// LegacyRankChoice: the first (Normal) option is rank 1, the rest rank 2. // LegacyRankChoice: the first (Normal) option is rank 1, the rest rank 2.
// Its rank-1 weight is the complete rare group plus one. Derive this // Its rank-1 weight is the complete rare group plus one. Derive this
// from the supported pool, rather than selecting unported weather. // from the supported pool, rather than selecting unported weather.
int[] weights = new int[choices.length]; var options = new java.util.ArrayList<PortRankedChoice.Option<T>>();
Arrays.fill(weights, 1); for (int i = 0; i < choices.length; i++)
weights[0] = choices.length; options.add(new PortRankedChoice.Option<>(choices[i], i == 0 ? 1 : 2));
return PortRandomAgeSelection.weighted(random, List.of(choices), weights); return PortRankedChoice.choose(random, policy.required(options,
option -> PortRandomPagePolicy.page(category, option.value()),
new PortRankedChoice.Option<>(choices[0], 1)));
} }
} }
@@ -86,6 +86,7 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
private final long ageSeed; private final long ageSeed;
private final boolean libraries; private final boolean libraries;
private final List<Identifier> librarySymbols; private final List<Identifier> librarySymbols;
private final int floodSurface;
public PortFeatureChunkGenerator(ChunkGenerator base, PortRockPlan rocks, public PortFeatureChunkGenerator(ChunkGenerator base, PortRockPlan rocks,
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes, PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
@@ -107,8 +108,10 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
this.ageSeed = ageSeed; this.ageSeed = ageSeed;
this.libraries = libraries; this.libraries = libraries;
this.librarySymbols = List.copyOf(librarySymbols); this.librarySymbols = List.copyOf(librarySymbols);
this.floodSurface = PortFlooding.requested(librarySymbols);
} }
public int floodSurface() { return floodSurface; }
public ChunkGenerator base() { return base; } public ChunkGenerator base() { return base; }
public PortRockPlan rocks() { return rocks; } public PortRockPlan rocks() { return rocks; }
public PortVegetationPlan vegetation() { return vegetation; } public PortVegetationPlan vegetation() { return vegetation; }
@@ -289,6 +292,14 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
PortShelfMushrooms.decorate(level, chunk, mushroomHosts, random); PortShelfMushrooms.decorate(level, chunk, mushroomHosts, random);
continue; 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; if (!surfaceBiome) continue;
Identifier placedId = PortVegetationPlan.placedFeature(page); Identifier placedId = PortVegetationPlan.placedFeature(page);
PlacedFeature vanilla = registry.getOrThrow( PlacedFeature vanilla = registry.getOrThrow(
@@ -300,5 +311,6 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
} }
} }
if (libraries) PortLibraryFeature.generate(level, chunk, ageSeed, librarySymbols); if (libraries) PortLibraryFeature.generate(level, chunk, ageSeed, librarySymbols);
PortFlooding.apply(chunk, floodSurface);
} }
} }
@@ -0,0 +1,45 @@
package net.dnorberg.rivencraft.age;
import java.util.List;
import net.dnorberg.rivencraft.shared.FloodingRules;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.Identifier;
import net.minecraft.tags.FluidTags;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.chunk.ChunkAccess;
public final class PortFlooding {
public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "environment/flooded");
private PortFlooding() {}
public static int requested(List<Identifier> pages) {
return FloodingRules.requested(pages.stream().map(page -> {
if (page.equals(PAGE)) return FloodingRules.FLOODED;
if (page.getNamespace().equals("rivencraft") && page.getPath().startsWith("number/")) {
try {
int digit = Integer.parseInt(page.getPath().substring(7));
if (digit >= 0 && digit <= 24) return digit;
} catch (NumberFormatException ignored) { }
}
return FloodingRules.OTHER;
}).toList());
}
public static void apply(ChunkAccess chunk, int requested) {
int surface = FloodingRules.surface(requested, chunk.getMinY(), chunk.getMaxY());
if (surface == FloodingRules.NONE) return;
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
int startX = chunk.getPos().getMinBlockX(), startZ = chunk.getPos().getMinBlockZ();
for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) {
for (int y = chunk.getMinY(); y < chunk.getMaxY(); y++) {
pos.set(startX + x, y, startZ + z);
var state = chunk.getBlockState(pos);
if (y <= surface && state.isAir())
chunk.setBlockState(pos, Blocks.WATER.defaultBlockState());
else if (state.hasProperty(BlockStateProperties.WATERLOGGED))
chunk.setBlockState(pos, state.setValue(BlockStateProperties.WATERLOGGED, y <= surface));
else if (y > surface && state.getFluidState().is(FluidTags.WATER))
chunk.setBlockState(pos, Blocks.AIR.defaultBlockState());
}
}
}
}
@@ -333,9 +333,14 @@ public final class PortLibraryFeature {
} }
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode) { static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode) {
return symbolsForLoot(ageSymbols, mode, PortRandomPagePolicy.configured());
}
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode,
PortRandomPagePolicy policy) {
return mode == PortConfig.LibraryLootMode.AGE_ONLY return mode == PortConfig.LibraryLootMode.AGE_ONLY
? ageSymbols.stream().filter(id -> PortSymbolPages.find(id) != null).distinct().toList() ? ageSymbols.stream().filter(policy::allows).filter(id -> PortSymbolPages.find(id) != null).distinct().toList()
: PortSymbolPages.sealedCandidateIds(); : PortSymbolPages.libraryCandidateIds().stream().filter(policy::allows).toList();
} }
private static ItemStack page(List<Identifier> symbols, RandomSource random) { private static ItemStack page(List<Identifier> symbols, RandomSource random) {
@@ -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"));
}
}
@@ -17,20 +17,39 @@ public final class PortRandomAgeSelection {
public record Selection(PortAgeTerrain terrain, PortBiomePlan biomes) {} public record Selection(PortAgeTerrain terrain, PortBiomePlan biomes) {}
public static Selection select(MinecraftServer server, long seed) { public static Selection select(MinecraftServer server, long seed) {
return select(server, seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(MinecraftServer server, long seed, PortRandomPagePolicy policy) {
// Match the 1.21.1 Legacy-rank choices: Standard and Flat are common; // Match the 1.21.1 Legacy-rank choices: Standard and Flat are common;
// the other terrain families are rarer. The sorted order is deliberate. // the other terrain families are rarer. The sorted order is deliberate.
PortAgeTerrain terrain = terrain(seed); PortAgeTerrain terrain = terrain(seed, policy);
if (terrain == PortAgeTerrain.VOID) if (terrain == PortAgeTerrain.VOID)
return new Selection(terrain, new PortBiomePlan(PortBiomePlan.Distribution.SINGLE, return new Selection(terrain, new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,
List.of(Identifier.withDefaultNamespace("the_void")))); List.of(Identifier.withDefaultNamespace("the_void"))));
PortBiomePlan.Distribution distribution = distribution(seed); PortBiomePlan.Distribution distribution = distribution(seed, policy);
List<Identifier> eligible = eligibleBiomes(server, terrain); List<Identifier> eligible = eligibleBiomes(server, terrain);
if (eligible.size() < 2 && distribution != PortBiomePlan.Distribution.NATIVE) if (distribution != PortBiomePlan.Distribution.NATIVE) {
distribution = PortBiomePlan.Distribution.SINGLE; var filtered = new ArrayList<>(policy.eligible(eligible, PortRegistryPages::biomePageId));
// Native presets are not Page-selected. Other controllers retain their minimum,
// with the same preferred-biome/registry fallback as 1.21.1.
int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
Identifier preferred = Identifier.withDefaultNamespace(terrain == PortAgeTerrain.CAVE ? "deep_dark" : "plains");
if (filtered.size() < minimum && eligible.contains(preferred) && !filtered.contains(preferred))
filtered.add(preferred);
for (var candidate : eligible)
if (filtered.size() < minimum && !filtered.contains(candidate)) filtered.add(candidate);
eligible = List.copyOf(filtered);
if (eligible.size() < 2) distribution = PortBiomePlan.Distribution.SINGLE;
}
if (distribution == PortBiomePlan.Distribution.NATIVE) if (distribution == PortBiomePlan.Distribution.NATIVE)
return new Selection(terrain, new PortBiomePlan(distribution, 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; int count = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
if (count > 1) { if (count > 1) {
@@ -48,18 +67,28 @@ public final class PortRandomAgeSelection {
} }
public static PortAgeTerrain terrain(long seed) { public static PortAgeTerrain terrain(long seed) {
return weighted(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{1, 1, 5, 1, 6, 1}); return terrain(seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortAgeTerrain terrain(long seed, PortRandomPagePolicy policy) {
return ranked(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{3, 3, 2, 3, 1, 3},
policy, value -> PortRandomPagePolicy.page("terrain", value), PortAgeTerrain.STANDARD);
} }
/** First AgeTraits draw in 1.21.1; shared by random and partly authored Ages. */ /** First AgeTraits draw in 1.21.1; shared by random and partly authored Ages. */
public static PortBiomePlan.Distribution distribution(long seed) { public static PortBiomePlan.Distribution distribution(long seed) {
return weighted(new Random(seed ^ 0x524956454E435241L), return distribution(seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortBiomePlan.Distribution distribution(long seed, PortRandomPagePolicy policy) {
return ranked(new Random(seed ^ 0x524956454E435241L),
List.of(PortBiomePlan.Distribution.NATIVE, PortBiomePlan.Distribution.SINGLE, List.of(PortBiomePlan.Distribution.NATIVE, PortBiomePlan.Distribution.SINGLE,
PortBiomePlan.Distribution.MEDIUM, PortBiomePlan.Distribution.TILED, PortBiomePlan.Distribution.MEDIUM, PortBiomePlan.Distribution.TILED,
PortBiomePlan.Distribution.GRID, PortBiomePlan.Distribution.TINY, PortBiomePlan.Distribution.GRID, PortBiomePlan.Distribution.TINY,
PortBiomePlan.Distribution.SMALL, PortBiomePlan.Distribution.LARGE, PortBiomePlan.Distribution.SMALL, PortBiomePlan.Distribution.LARGE,
PortBiomePlan.Distribution.HUGE), PortBiomePlan.Distribution.HUGE),
new int[]{3, 3, 3, 1, 1, 1, 1, 1, 1}); new int[]{1, 1, 1, 2, 2, 2, 2, 2, 2}, policy,
value -> PortRandomPagePolicy.page("biome", value), PortBiomePlan.Distribution.NATIVE);
} }
public static List<Identifier> eligibleBiomes(MinecraftServer server, PortAgeTerrain terrain) { public static List<Identifier> eligibleBiomes(MinecraftServer server, PortAgeTerrain terrain) {
@@ -84,14 +113,13 @@ public final class PortRandomAgeSelection {
return caves.isEmpty() ? List.of(Identifier.withDefaultNamespace("lush_caves")) : caves; return caves.isEmpty() ? List.of(Identifier.withDefaultNamespace("lush_caves")) : caves;
} }
static <T> T weighted(Random random, List<T> choices, int[] weights) { private static <T> T ranked(Random random, List<T> choices, int[] ranks, PortRandomPagePolicy policy,
int total = 0; java.util.function.Function<T, Identifier> page, T fallback) {
for (int weight : weights) total += weight; var options = new ArrayList<PortRankedChoice.Option<T>>();
int ticket = random.nextInt(total); for (int i = 0; i < choices.size(); i++)
for (int index = 0; index < choices.size(); index++) { options.add(new PortRankedChoice.Option<>(choices.get(i), ranks[i]));
ticket -= weights[index]; var eligible = policy.eligible(options, option -> page.apply(option.value()));
if (ticket < 0) return choices.get(index); return eligible.isEmpty() ? fallback : PortRankedChoice.choose(random, eligible);
}
throw new IllegalStateException("Random Age ticket was not consumed");
} }
} }
@@ -14,8 +14,13 @@ public final class PortRandomFeatureSelection {
public static Selection select(net.minecraft.server.MinecraftServer server, long seed, public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
PortAgeTerrain terrain, PortBiomePlan biomes) { PortAgeTerrain terrain, PortBiomePlan biomes) {
var base = select(seed, terrain); return select(server, seed, terrain, biomes, PortRandomPagePolicy.UNRESTRICTED);
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes); }
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
PortAgeTerrain terrain, PortBiomePlan biomes, PortRandomPagePolicy policy) {
var base = select(seed, terrain, policy);
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes, policy);
var plan = base.terrain(); var plan = base.terrain();
plan = plan == null ? new PortTerrainFeaturePlan(List.of(), false, 0, false, structures.structures(), List.of(), true) plan = plan == null ? new PortTerrainFeaturePlan(List.of(), false, 0, false, structures.structures(), List.of(), true)
: new PortTerrainFeaturePlan(plan.choices(), plan.skylands(), plan.denseOres(), plan.starFissures(), : new PortTerrainFeaturePlan(plan.choices(), plan.skylands(), plan.denseOres(), plan.starFissures(),
@@ -24,6 +29,10 @@ public final class PortRandomFeatureSelection {
} }
public static Selection select(long seed, PortAgeTerrain terrain) { public static Selection select(long seed, PortAgeTerrain terrain) {
return select(seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(long seed, PortAgeTerrain terrain, PortRandomPagePolicy policy) {
var random = new Random(seed ^ 0x4D4154455249414CL); var random = new Random(seed ^ 0x4D4154455249414CL);
int count = random.nextInt(3); int count = random.nextInt(3);
var terrainPage = id("terrain/" + terrain.name().toLowerCase(java.util.Locale.ROOT)); var terrainPage = id("terrain/" + terrain.name().toLowerCase(java.util.Locale.ROOT));
@@ -31,12 +40,13 @@ public final class PortRandomFeatureSelection {
for (String name : List.of("rocks", "floating_islands", "tendrils", "spheres", "spikes", "obelisks", for (String name : List.of("rocks", "floating_islands", "tendrils", "spheres", "spikes", "obelisks",
"surface_lakes", "deep_lakes", "lava_lakes")) { "surface_lakes", "deep_lakes", "lava_lakes")) {
var page = id("feature/" + name); var page = id("feature/" + name);
if (PortAuthoredWriting.supports(List.of(terrainPage, page))) if (policy.allows(page) && PortAuthoredWriting.supports(List.of(terrainPage, page)))
candidates.add(new PortRankedChoice.Option<>(page, rank(name))); candidates.add(new PortRankedChoice.Option<>(page, rank(name)));
} }
var pages = new ArrayList<Identifier>(); var pages = new ArrayList<Identifier>();
pages.add(terrainPage); pages.add(terrainPage);
List<Identifier> solids = PortRegistryPages.solidMaterialIds(), fluids = PortRegistryPages.fluidMaterialIds(); List<Identifier> solids = policy.eligible(PortRegistryPages.solidMaterialIds(), PortRegistryPages::blockPageId);
List<Identifier> fluids = policy.eligible(PortRegistryPages.fluidMaterialIds(), PortRegistryPages::blockPageId);
for (int selected = 0; selected < count && !candidates.isEmpty();) { for (int selected = 0; selected < count && !candidates.isEmpty();) {
Identifier feature = PortRankedChoice.choose(random, candidates); Identifier feature = PortRankedChoice.choose(random, candidates);
candidates.removeIf(option -> option.value().equals(feature)); candidates.removeIf(option -> option.value().equals(feature));
@@ -46,12 +56,12 @@ public final class PortRandomFeatureSelection {
pages.add(feature); pages.add(feature);
selected++; selected++;
} }
if (terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID if (policy.allows(PortTerrainFeaturePlan.SKYLANDS) && terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID
&& Math.floorMod(mix(seed ^ 0x534B594C414E4453L), 8) == 0) && Math.floorMod(mix(seed ^ 0x534B594C414E4453L), 8) == 0)
pages.add(PortTerrainFeaturePlan.SKYLANDS); pages.add(PortTerrainFeaturePlan.SKYLANDS);
if (terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0) if (policy.allows(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS) && terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0)
pages.add(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS); pages.add(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS);
if (randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES); if (policy.allows(PortTerrainFeaturePlan.STAR_FISSURES) && randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES);
return new Selection(PortAuthoredWriting.rockPlan(pages, seed), PortAuthoredWriting.lakePlan(pages, seed), return new Selection(PortAuthoredWriting.rockPlan(pages, seed), PortAuthoredWriting.lakePlan(pages, seed),
PortAuthoredWriting.terrainFeaturePlan(pages, seed), 0); PortAuthoredWriting.terrainFeaturePlan(pages, seed), 0);
} }
@@ -0,0 +1,66 @@
package net.dnorberg.rivencraft.age;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import net.dnorberg.rivencraft.PortConfig;
import net.minecraft.resources.Identifier;
/** Creation-time eligibility; the resolved Age settings are saved, never reselected on reload. */
public record PortRandomPagePolicy(Set<Identifier> allowlist, Set<Identifier> blocklist) {
public static final PortRandomPagePolicy UNRESTRICTED = new PortRandomPagePolicy(Set.of(), Set.of());
public PortRandomPagePolicy {
allowlist = Set.copyOf(allowlist);
blocklist = Set.copyOf(blocklist);
}
public static PortRandomPagePolicy configured() {
return new PortRandomPagePolicy(parse(PortConfig.RANDOM_PAGE_ALLOWLIST.get()),
parse(PortConfig.RANDOM_PAGE_BLOCKLIST.get()));
}
private static Set<Identifier> parse(List<? extends String> ids) {
return ids.stream().map(PortRandomPagePolicy::parsePageId).collect(Collectors.toUnmodifiableSet());
}
/** Server config IDs may omit the built-in Rivencraft namespace. */
public static Identifier parsePageId(String value) {
Identifier id = Identifier.tryParse(value.contains(":") ? value : "rivencraft:" + value);
if (id == null) throw new IllegalArgumentException("Invalid Page ID " + value);
return id;
}
public boolean allows(Identifier id) {
if (blocklist.contains(id)) return false;
String category = category(id);
return !restricts(category) || allowlist.contains(id);
}
public boolean restricts(String category) {
return allowlist.stream().anyMatch(entry -> category(entry).equals(category));
}
public <T> List<T> eligible(List<T> candidates, java.util.function.Function<T, Identifier> pageId) {
return candidates.stream().filter(candidate -> allows(pageId.apply(candidate))).toList();
}
public <T> List<T> required(List<T> candidates, java.util.function.Function<T, Identifier> pageId,
T fallback) {
List<T> eligible = eligible(candidates, pageId);
return eligible.isEmpty() ? List.of(fallback) : eligible;
}
private static String category(Identifier id) {
String path = id.getPath();
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('/'));
}
public static Identifier page(String category, Enum<?> value) {
return Identifier.fromNamespaceAndPath("rivencraft", category + "/"
+ value.name().toLowerCase(java.util.Locale.ROOT));
}
}
@@ -19,6 +19,11 @@ public final class PortRandomStructureSelection {
} }
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan) { public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan) {
return select(server, seed, terrain, plan, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan,
PortRandomPagePolicy policy) {
Set<Identifier> biomes = actualBiomes(server, terrain, plan); Set<Identifier> biomes = actualBiomes(server, terrain, plan);
var eligible = new ArrayList<PortRankedChoice.Option<Identifier>>(); var eligible = new ArrayList<PortRankedChoice.Option<Identifier>>();
for (String name : List.of("dungeons", "mineshafts", "nether_fortresses", "strongholds", "villages", for (String name : List.of("dungeons", "mineshafts", "nether_fortresses", "strongholds", "villages",
@@ -32,7 +37,7 @@ public final class PortRandomStructureSelection {
.get(ResourceKey.create(Registries.PLACED_FEATURE, .get(ResourceKey.create(Registries.PLACED_FEATURE,
Identifier.fromNamespaceAndPath("rivencraft", "dungeons"))).isPresent() Identifier.fromNamespaceAndPath("rivencraft", "dungeons"))).isPresent()
: PortStructurePages.randomEligible(feature, terrain, biomes, server.registryAccess()); : PortStructurePages.randomEligible(feature, terrain, biomes, server.registryAccess());
if (allowed) eligible.add(new PortRankedChoice.Option<>(feature, rank(name))); if (allowed && policy.allows(feature)) eligible.add(new PortRankedChoice.Option<>(feature, rank(name)));
} }
var random = new Random(seed ^ 0x5354525543545552L); var random = new Random(seed ^ 0x5354525543545552L);
int count = random.nextInt(3), dungeons = 0; int count = random.nextInt(3), dungeons = 0;
@@ -40,6 +40,9 @@ public final class PortSeasonPolicies extends SavedData {
catch (IllegalArgumentException e) { return null; } catch (IllegalArgumentException e) { return null; }
} }
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed) { static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed) {
return select(pages, seed, terrain, installed, PortRandomPagePolicy.UNRESTRICTED);
}
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed, PortRandomPagePolicy policy) {
if (terrain == PortAgeTerrain.CAVE) return new Policy(Mode.NO_SEASONS, true); if (terrain == PortAgeTerrain.CAVE) return new Policy(Mode.NO_SEASONS, true);
Mode written = null; Mode written = null;
for (var page : pages) if (forPage(page) != null) written = forPage(page); for (var page : pages) if (forPage(page) != null) written = forPage(page);
@@ -49,9 +52,15 @@ public final class PortSeasonPolicies extends SavedData {
} }
if (!installed) return null; if (!installed) return null;
// 1.21.1 LegacyRankChoice ranks: Seasons=1, None=2, each Eternal=3. // 1.21.1 LegacyRankChoice ranks: Seasons=1, None=2, each Eternal=3.
int ticket = new Random(seed ^ 0x5E450A5E5EED21L).nextInt(15); var modes = List.of(new PortRankedChoice.Option<>(Mode.SEASONS, 1),
Mode mode = ticket < 6 ? Mode.SEASONS : ticket < 11 ? Mode.NO_SEASONS new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2),
: List.of(Mode.ETERNAL_WINTER, Mode.ETERNAL_SUMMER, Mode.ETERNAL_FALL, Mode.ETERNAL_SPRING).get(ticket - 11); new PortRankedChoice.Option<>(Mode.ETERNAL_WINTER, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_SUMMER, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_FALL, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_SPRING, 3));
Mode mode = PortRankedChoice.choose(new Random(seed ^ 0x5E450A5E5EED21L),
policy.required(modes, option -> PortRandomPagePolicy.page("season", option.value()),
new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2)));
return new Policy(mode, false); return new Policy(mode, false);
} }
} }
@@ -26,9 +26,13 @@ public enum PortSkyStyle {
} }
public static PortSkyStyle resolve(List<Identifier> pages, long seed) { public static PortSkyStyle resolve(List<Identifier> pages, long seed) {
return resolve(pages, seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortSkyStyle resolve(List<Identifier> pages, long seed, PortRandomPagePolicy policy) {
return pages.stream().map(PortSkyStyle::forPage).filter(java.util.Objects::nonNull) return pages.stream().map(PortSkyStyle::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> pages.stream().anyMatch(PortSkyStyle::isCelestial) .findFirst().orElseGet(() -> pages.stream().anyMatch(PortSkyStyle::isCelestial)
? OVERWORLD : random(seed)); ? OVERWORLD : random(seed, policy));
} }
/** Nether-style Ages use their fog clear color as the visible backdrop. */ /** Nether-style Ages use their fog clear color as the visible backdrop. */
@@ -50,11 +54,17 @@ public enum PortSkyStyle {
}; };
} }
private static PortSkyStyle random(long seed) { private static PortSkyStyle random(long seed, PortRandomPagePolicy policy) {
// Match the first draw in 1.21.1 AgeSkyProfile.random: its equally // Match the first draw in 1.21.1 AgeSkyProfile.random: its equally
// likely INHERITED and OVERWORLD slots currently share the native // likely INHERITED and OVERWORLD slots currently share the native
// Overworld presentation here. Do not add unported colors/bodies. // Overworld presentation here. Do not add unported colors/bodies.
int choice = new Random(seed ^ 0x534B5950524F464CL).nextInt(5); var styles = policy.required(java.util.stream.IntStream.range(0, 5).boxed()
.filter(slot -> slot != 0 || !policy.restricts("sky")).toList(),
slot -> Identifier.fromNamespaceAndPath("rivencraft", "sky/" + switch (slot) {
case 0 -> "inherited"; case 1 -> "overworld"; case 2 -> "nether";
case 3 -> "end"; default -> "static";
}), 0);
int choice = styles.get(new Random(seed ^ 0x534B5950524F464CL).nextInt(styles.size()));
return switch (choice) { return switch (choice) {
case 0, 1 -> OVERWORLD; case 0, 1 -> OVERWORLD;
case 2 -> NETHER; case 2 -> NETHER;
@@ -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));
}
}
}
@@ -169,6 +169,16 @@ public final class RuntimeAgeBackend {
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather, PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle, PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
List<Identifier> librarySymbols, String displayName) { List<Identifier> librarySymbols, String displayName) {
return create(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures,
weather, lighting, sky, colors, dayCycle, librarySymbols, displayName, PortRandomPagePolicy.UNRESTRICTED);
}
public static ServerLevel create(MinecraftServer server, Identifier id, long seed,
PortBiomePlan biomePlan, PortAgeTerrain terrain, PortRockPlan rocks,
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
List<Identifier> librarySymbols, String displayName, PortRandomPagePolicy policy) {
checkServerThread(server); checkServerThread(server);
String name = ageName(id); String name = ageName(id);
AgeLevelIndex index = index(server); AgeLevelIndex index = index(server);
@@ -186,7 +196,7 @@ public final class RuntimeAgeBackend {
ServerLevel level = null; ServerLevel level = null;
try { try {
seasons.put(id, PortSeasonPolicies.select(librarySymbols, seed, terrain, seasons.put(id, PortSeasonPolicies.select(librarySymbols, seed, terrain,
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available())); net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available(), policy));
writing.put(id, librarySymbols); writing.put(id, librarySymbols);
level = load(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, level = load(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes,
terrainFeatures, lighting, sky, colors, dayCycle); terrainFeatures, lighting, sky, colors, dayCycle);
@@ -396,6 +406,23 @@ public final class RuntimeAgeBackend {
return index(server).dayCycles(); return index(server).dayCycles();
} }
/** Snapshot only loaded Age settings; viewing a book never loads its destination. */
public static Map<Identifier, PortAgeDescription> loadedDescriptions(MinecraftServer server) {
checkServerThread(server);
AgeLevelIndex index = index(server);
var descriptions = new java.util.HashMap<Identifier, PortAgeDescription>();
var knownAges = index.entries().keySet();
for (var level : server.getAllLevels()) {
Identifier id = level.dimension().identifier();
if (!(level instanceof PortAgeLevel age) || !knownAges.contains(id)) continue;
PortBiomePlan biomes = index.biomePlan(id);
descriptions.put(id, new PortAgeDescription(index.terrain(id),
biomes == null ? PortBiomePlan.Distribution.NATIVE : biomes.distribution(),
index.lighting(id), age.weatherMode()));
}
return Map.copyOf(descriptions);
}
/** Includes retired IDs, which must never be silently reused by a new book. */ /** Includes retired IDs, which must never be silently reused by a new book. */
public static boolean isNameTaken(MinecraftServer server, Identifier id) { public static boolean isNameTaken(MinecraftServer server, Identifier id) {
checkServerThread(server); checkServerThread(server);
@@ -511,7 +538,8 @@ public final class RuntimeAgeBackend {
ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, id); ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, id);
if (server.getLevel(key) != null) throw new IllegalArgumentException("Level already loaded: " + id); if (server.getLevel(key) != null) throw new IllegalArgumentException("Level already loaded: " + id);
if (biomePlan != null && biomePlan.distribution() == PortBiomePlan.Distribution.NATIVE 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"); throw new IllegalArgumentException("Only Native Cave terrain may carry an explicit native biome pool");
// Noise terrains reuse the Overworld biome source unless a // Noise terrains reuse the Overworld biome source unless a
@@ -550,15 +578,24 @@ public final class RuntimeAgeBackend {
generator = biomePlan != null && biomePlan.biomes().size() > 1 generator = biomePlan != null && biomePlan.biomes().size() > 1
? new PortFlatChunkGenerator(authoredBiomeSource(server, biomePlan, seed), settings) ? new PortFlatChunkGenerator(authoredBiomeSource(server, biomePlan, seed), settings)
: new FlatLevelSource(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) { || terrain != PortAgeTerrain.STANDARD) {
if (!(generator instanceof NoiseBasedChunkGenerator noise)) // A Flat/skyblock Overworld has no noise generator to adapt. Native
throw new IllegalStateException("Overworld generator cannot accept authored noise settings"); // 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 var source = terrain == PortAgeTerrain.CAVE
? new FixedBiomeSource(server.registryAccess().lookupOrThrow(Registries.BIOME) ? new FixedBiomeSource(server.registryAccess().lookupOrThrow(Registries.BIOME)
.getOrThrow(Biomes.LUSH_CAVES)) .getOrThrow(Biomes.LUSH_CAVES))
: generator.getBiomeSource(); : noise.getBiomeSource();
if (terrain == PortAgeTerrain.CAVE && biomePlan != null) { if (terrain == PortAgeTerrain.CAVE && biomePlan != null
&& biomePlan.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN) {
var biomes = server.registryAccess().lookupOrThrow(Registries.BIOME); var biomes = server.registryAccess().lookupOrThrow(Registries.BIOME);
for (Identifier biomeId : biomePlan.biomes()) { for (Identifier biomeId : biomePlan.biomes()) {
var holder = biomes.get(ResourceKey.create(Registries.BIOME, biomeId)) var holder = biomes.get(ResourceKey.create(Registries.BIOME, biomeId))
@@ -568,6 +605,7 @@ public final class RuntimeAgeBackend {
} }
} }
if (biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE if (biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE
|| biomePlan.nativeKind() != net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN
|| terrain == PortAgeTerrain.CAVE && !biomePlan.biomes().isEmpty())) { || terrain == PortAgeTerrain.CAVE && !biomePlan.biomes().isEmpty())) {
source = authoredBiomeSource(server, biomePlan, seed); source = authoredBiomeSource(server, biomePlan, seed);
} }
@@ -40,7 +40,8 @@ public final class CrystalPortalBlock extends BaseEntityBlock {
@Override protected RenderShape getRenderShape(BlockState state) { @Override protected RenderShape getRenderShape(BlockState state) {
// Keep the animated fallback until the optional destination view has // Keep the animated fallback until the optional destination view has
// actually been established, including after a world restart. // actually been established, including after a world restart.
return RenderShape.MODEL; return net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.available() && state.getValue(LIVE_VIEW)
? RenderShape.INVISIBLE : RenderShape.MODEL;
} }
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CrystalPortalBlockEntity(pos, state); return new CrystalPortalBlockEntity(pos, state);
@@ -25,7 +25,10 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
public ItemStack getBook() { return book; } public ItemStack getBook() { return book; }
public int skyColor() { return skyColor; } public int skyColor() { return skyColor; }
public void setBook(ItemStack value) { public void setBook(ItemStack value) {
if (level instanceof ServerLevel server)
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
book = value.copyWithCount(1); book = value.copyWithCount(1);
restore = true;
skyColor = 0xffffff; skyColor = 0xffffff;
if (level instanceof ServerLevel source) { if (level instanceof ServerLevel source) {
var destination = book.get(Rivencraft.LINK_BOOK_TARGET.get()); var destination = book.get(Rivencraft.LINK_BOOK_TARGET.get());
@@ -53,7 +56,11 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
} }
sync(); sync();
} }
public ItemStack takeBook() { ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result; } public ItemStack takeBook() {
if (level instanceof ServerLevel server)
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
}
private void sync() { private void sync() {
setChanged(); setChanged();
if (level != null && !level.isClientSide()) { if (level != null && !level.isClientSide()) {
@@ -73,6 +80,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
boolean restoring = holder.restore; boolean restoring = holder.restore;
if (restoring && !plan.valid() && CrystalPortalNetwork.recoverSavedOwners(level, pos)) if (restoring && !plan.valid() && CrystalPortalNetwork.recoverSavedOwners(level, pos))
plan = CrystalPortalNetwork.plan(level, pos); plan = CrystalPortalNetwork.plan(level, pos);
if (restoring && plan.valid()) CrystalPortalNetwork.setLiveView(level, plan, false);
CrystalPortalNetwork.reconcile(level, pos, plan); CrystalPortalNetwork.reconcile(level, pos, plan);
holder.restore = false; holder.restore = false;
if (restoring) holder.sync(); if (restoring) holder.sync();
@@ -20,12 +20,15 @@ public final class AgeCatalogClient {
@SubscribeEvent @SubscribeEvent
public static void logout(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingOut event) { public static void logout(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingOut event) {
PortBookPreview.logout();
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(java.util.Map.of()); net.dnorberg.rivencraft.age.PortAgeColors.updateClient(java.util.Map.of());
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(java.util.Map.of()); net.dnorberg.rivencraft.age.PortDayCycle.updateClient(java.util.Map.of());
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(java.util.Map.of());
} }
@SubscribeEvent @SubscribeEvent
public static void register(RegisterClientPayloadHandlersEvent event) { public static void register(RegisterClientPayloadHandlersEvent event) {
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.WritingDeskCatalogPayload.TYPE, ClientWritingDeskCatalog::handle);
event.register(net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload.TYPE, (payload, context) -> event.register(net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload.TYPE, (payload, context) ->
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.acceptClient(payload.dimensionId(), payload.enabled())); net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.acceptClient(payload.dimensionId(), payload.enabled()));
@@ -33,6 +36,7 @@ public final class AgeCatalogClient {
if (!(context.listener() instanceof ClientPacketListener listener)) return; if (!(context.listener() instanceof ClientPacketListener listener)) return;
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(payload.colors()); net.dnorberg.rivencraft.age.PortAgeColors.updateClient(payload.colors());
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(payload.dayCycles()); net.dnorberg.rivencraft.age.PortDayCycle.updateClient(payload.dayCycles());
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(payload.descriptions());
if (listener.getLevel() != null) { if (listener.getLevel() != null) {
listener.getLevel().environmentAttributes().invalidateTickCache(); listener.getLevel().environmentAttributes().invalidateTickCache();
listener.getLevel().updateSkyBrightness(); listener.getLevel().updateSkyBrightness();
@@ -0,0 +1,109 @@
package net.dnorberg.rivencraft.client;
import com.mojang.blaze3d.pipeline.RenderTarget;
import com.mojang.blaze3d.pipeline.TextureTarget;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.renderpearl.api.GpuFormat;
import com.mojang.renderpearl.api.textures.FilterMode;
import net.dnorberg.rivencraft.item.LinkBookTarget;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.phys.Vec3;
import org.joml.Matrix4f;
import org.joml.Vector4f;
import qouteall.imm_ptl.core.ClientWorldLoader;
import qouteall.imm_ptl.core.render.GuiPortalRendering;
import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo;
/** 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 ImmersiveLiveBookPanel queued;
private LinkBookTarget destination;
private boolean closed;
private boolean exploring;
private Vec3 explorePosition;
private float yaw, pitch, playerYaw, playerPitch;
@Override public void exploring(boolean enabled) {
exploring = enabled;
if (enabled && destination != null) {
explorePosition = new Vec3(destination.x(), destination.y() + 1.62, destination.z());
yaw = destination.yaw(); pitch = destination.pitch();
var player = Minecraft.getInstance().player;
if (player != null) {
explorePosition = new Vec3(destination.x(), destination.y() + player.getEyeHeight(), destination.z());
playerYaw = player.getYRot(); playerPitch = player.getXRot();
}
}
}
@Override public void tick() {
var player = Minecraft.getInstance().player;
if (!exploring || destination == null || player == null) return;
yaw = destination.yaw() + net.minecraft.util.Mth.wrapDegrees(player.getYRot() - playerYaw);
pitch = Math.clamp(destination.pitch() + player.getXRot() - playerPitch, -89, 89);
}
@Override public void accept(LinkBookTarget value) { destination = value; }
@Override public boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time) {
if (closed || destination == null || !ClientWorldLoader.getIsInitialized()) return false;
var key = ResourceKey.create(Registries.DIMENSION, destination.dimension());
var world = ClientWorldLoader.getWorld(key);
if (world == null || !world.hasChunkAt(BlockPos.containing(destination.x(), destination.y(), destination.z()))) return false;
var minecraft = Minecraft.getInstance();
var main = minecraft.gameRenderer.mainRenderTarget();
if (target == null) target = new TextureTarget("Rivencraft live book", main.width, main.height,
GpuFormat.RGBA8_UNORM, main.getDepthTexture().getFormat());
Vec3 center = new Vec3(destination.x(), destination.y() + 2.5, destination.z());
double angle = time * 0.012;
Vec3 camera = center.add(Math.sin(angle) * 11, 5, Math.cos(angle) * 11);
Matrix4f transform;
if (exploring && explorePosition != null) {
camera = explorePosition;
transform = new Matrix4f().rotateX((float) Math.toRadians(pitch))
.rotateY((float) Math.toRadians(yaw + 180));
} else transform = new Matrix4f().rotateX((float) Math.toRadians(20)).rotateY((float) angle);
var info = new WorldRenderInfo.Builder().setWorld(world).setCameraPos(camera)
.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 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: 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;
}
graphics.blit(target.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR),
x, y, x + width, y + height, 0, 1, 1, 0);
graphics.outline(x, y, width, height, 0xFF7B6AA8);
return true;
}
/** Called by the optional engine mixin on the render thread, never during GUI drawing. */
public static void beginRender() {
if (queued == null || target == null) return;
RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(
target.getColorTexture(), new Vector4f(0, 0, 0, 1), target.getDepthTexture(), 0.0);
}
/** Remote render changes the shared camera; restore it before rain/audio use it. */
public static void endRender() {
if (queued == null) return;
queued = null;
var minecraft = Minecraft.getInstance();
if (minecraft.level != null && minecraft.getCameraEntity() != null) {
var camera = minecraft.gameRenderer.mainCamera();
camera.setLevel(minecraft.level);
camera.setEntity(minecraft.getCameraEntity());
camera.update(minecraft.getDeltaTracker());
}
}
@Override public void close() { exploring(false); closed = true; destination = null; }
}
@@ -0,0 +1,120 @@
package net.dnorberg.rivencraft.client;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.world.phys.Vec3;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.client.event.ClientTickEvent;
import net.neoforged.neoforge.client.event.InputEvent;
import net.neoforged.neoforge.client.event.RenderGuiEvent;
import com.mojang.blaze3d.platform.InputConstants;
/** Matches 1.21.1: grabbed mouse look with the book drawn over the source world. */
@EventBusSubscriber(modid = Rivencraft.MOD_ID, value = Dist.CLIENT)
public final class PortBookExploration {
private static PortBookExploration current;
private final PortLegacyLinkPanel panel;
private Screen owner;
private Button eye;
private Vec3 sourcePosition;
private net.minecraft.client.multiplayer.ClientLevel sourceLevel;
private int guiWidth, guiHeight;
private boolean active;
PortBookExploration(PortLegacyLinkPanel panel) { this.panel = panel; }
void attach(Screen screen, java.util.function.Consumer<Button> add, int left, int top, boolean stand) {
owner = screen;
eye = Button.builder(Component.literal("👁"), button -> {
var minecraft = Minecraft.getInstance();
if (stand || !panel.canExplore() || minecraft.player == null) return;
sourcePosition = minecraft.player.position();
sourceLevel = minecraft.level;
guiWidth = minecraft.getWindow().getGuiScaledWidth();
guiHeight = minecraft.getWindow().getGuiScaledHeight();
active = true;
current = this;
eye.visible = false;
panel.exploring(true);
KeyMapping.releaseAll();
// Removing the screen grabs the mouse normally. removed() preserves this session.
minecraft.gui.setScreen(null);
}).bounds(left + 229, top + 145, 20, 20).build();
eye.active = !stand;
eye.setTooltip(Tooltip.create(Component.literal("Look around destination (right-click to return)")));
add.accept(eye);
}
void tick(boolean frontPage) {
if (eye != null) eye.visible = !active && frontPage && panel.canExplore();
}
boolean active() { return active; }
void stop() {
active = false;
if (current == this) current = null;
sourcePosition = null;
sourceLevel = null;
panel.exploring(false);
}
@SubscribeEvent
public static void beforeTick(ClientTickEvent.Pre event) {
if (current != null) KeyMapping.releaseAll();
}
@SubscribeEvent
public static void afterTick(ClientTickEvent.Post event) {
var overlay = current;
if (overlay == null) return;
var minecraft = Minecraft.getInstance();
if (minecraft.player == null || minecraft.level != overlay.sourceLevel || minecraft.gui.screen() != null) {
overlay.stop();
overlay.panel.close();
return;
}
minecraft.player.setPos(overlay.sourcePosition);
minecraft.player.setDeltaMovement(Vec3.ZERO);
overlay.panel.tick();
}
@SubscribeEvent
public static void drawBook(RenderGuiEvent.Post event) {
var overlay = current;
var minecraft = Minecraft.getInstance();
if (overlay == null || minecraft.gui.screen() != null) return;
int width = minecraft.getWindow().getGuiScaledWidth();
int height = minecraft.getWindow().getGuiScaledHeight();
if (width != overlay.guiWidth || height != overlay.guiHeight) {
overlay.guiWidth = width;
overlay.guiHeight = height;
overlay.owner.resize(width, height);
overlay.eye.visible = false;
}
overlay.owner.extractRenderState(event.getGuiGraphics(), -1, -1,
event.getPartialTick().getGameTimeDeltaPartialTick(false));
}
@SubscribeEvent
public static void mouseButton(InputEvent.MouseButton.Pre event) {
var overlay = current;
if (overlay == null || Minecraft.getInstance().gui.screen() != null) return;
// Neither mouse button may use the held book or attack in the source world.
event.setCanceled(true);
if (event.getButton() == InputConstants.MOUSE_BUTTON_RIGHT && event.getAction() == InputConstants.PRESS) {
overlay.stop();
KeyMapping.releaseAll();
// Unlike 1.21.1 setScreen, setScreenAndShow forces a render immediately.
// Resume through the regular GUI lifecycle without nesting a new frame.
Minecraft.getInstance().gui.setScreen(overlay.owner);
}
}
}
@@ -0,0 +1,84 @@
package net.dnorberg.rivencraft.client;
import java.util.UUID;
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
import net.dnorberg.rivencraft.network.*;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
/** One session per open book; stale replies cannot replace another book's preview. */
public final class PortBookPreview {
interface LivePanel {
void accept(net.dnorberg.rivencraft.item.LinkBookTarget destination);
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time);
void close();
default void exploring(boolean enabled) {}
default void tick() {}
}
private static PortBookPreview active;
private final UUID session = UUID.randomUUID();
private final RequestBookPreviewPayload request;
private final LivePanel live;
private int ticks;
private boolean received;
private boolean closed;
private net.minecraft.resources.Identifier destination;
PortBookPreview(InteractionHand hand, ItemStack book, UseBookStandPayload stand) {
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 = ImmersiveBookPreviews.bookViewsEnabled();
live = enabled ? new ImmersiveLiveBookPanel() : null;
if (active != null) active.close();
active = this;
sendRequest();
}
private void sendRequest() {
if (!closed && live != null && request != null && Minecraft.getInstance().getConnection() != null)
ClientPacketDistributor.sendToServer(request);
}
void tick() {
ticks++;
if (live != null) live.tick();
if (ticks % (received ? 200 : 40) == 0) sendRequest();
}
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float partialTick) {
if (closed || !received || live == null) return false;
return live.render(graphics, x, y, width, height, ticks + partialTick);
}
boolean canExplore() { return live != null && received && !closed; }
void exploring(boolean enabled) { if (live != null) live.exploring(enabled); }
public static void accept(BookPreviewPayload payload) {
if (active == null || active.closed || active.live == null || !active.session.equals(payload.session())
|| !payload.destination().valid()) return;
active.destination = payload.destination().dimension();
active.received = true;
active.live.accept(payload.destination());
}
void close() {
if (closed) return;
closed = true;
if (live != null) {
live.close();
if (Minecraft.getInstance().getConnection() != null)
ClientPacketDistributor.sendToServer(new ReleaseBookPreviewPayload(session));
}
if (active == this) active = null;
}
public static void logout() { if (active != null) active.close(); }
public static boolean shouldMute(ClientLevel level) {
var player = Minecraft.getInstance().player;
return active != null && !active.closed && active.destination != null
&& level.dimension().identifier().equals(active.destination)
&& (player == null || level != player.level());
}
}
@@ -15,7 +15,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.client.network.ClientPacketDistributor; import net.neoforged.neoforge.client.network.ClientPacketDistributor;
/** Legacy book layout and authored glyph pages; destination rendering remains a port placeholder. */ /** Legacy book spreads, authored symbol pages and random-Age glyph descriptions. */
public final class PortDescriptiveBookScreen extends Screen { public final class PortDescriptiveBookScreen extends Screen {
private static final int WIDTH = 327; private static final int WIDTH = 327;
private static final int HEIGHT = 199; private static final int HEIGHT = 199;
@@ -23,8 +23,11 @@ public final class PortDescriptiveBookScreen extends Screen {
private final InteractionHand hand; private final InteractionHand hand;
private final ItemStack book;
private final boolean bound; private final boolean bound;
private final net.minecraft.resources.Identifier ageId;
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel(); private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel();
private final PortBookExploration exploration = new PortBookExploration(linkPanel);
private final net.dnorberg.rivencraft.writing.DescriptiveBookPages pages; private final net.dnorberg.rivencraft.writing.DescriptiveBookPages pages;
private int pageIndex; private int pageIndex;
private net.dnorberg.rivencraft.network.UseBookStandPayload standSource; private net.dnorberg.rivencraft.network.UseBookStandPayload standSource;
@@ -33,8 +36,10 @@ public final class PortDescriptiveBookScreen extends Screen {
public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) { public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) {
super(book.getHoverName()); super(book.getHoverName());
this.hand = hand; this.hand = hand;
this.book = book.copy();
pages = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(book); pages = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(book);
bound = book.has(Rivencraft.AGE_BOOK_ID.get()); ageId = book.get(Rivencraft.AGE_BOOK_ID.get());
bound = ageId != null;
} }
public PortDescriptiveBookScreen(net.dnorberg.rivencraft.network.UseBookStandPayload source) { public PortDescriptiveBookScreen(net.dnorberg.rivencraft.network.UseBookStandPayload source) {
@@ -44,7 +49,12 @@ public final class PortDescriptiveBookScreen extends Screen {
@Override @Override
protected void init() { protected void init() {
if (bound || standSource != null) return; if (bound) {
linkPanel.open(hand, book, standSource);
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null);
return;
}
if (standSource != null) return;
int left = (width - WIDTH) / 2; int left = (width - WIDTH) / 2;
int top = (height - HEIGHT) / 2; int top = (height - HEIGHT) / 2;
titleInput = new EditBox(font, left + 40, top + 69, 110, 20, titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
@@ -78,7 +88,9 @@ public final class PortDescriptiveBookScreen extends Screen {
int textY = PortLegacyBookArtwork.drawText(graphics, font, title, left + 40, top + 40, 110, TEXT_COLOR); int textY = PortLegacyBookArtwork.drawText(graphics, font, title, left + 40, top + 40, 110, TEXT_COLOR);
Component author = pages.author().isBlank() Component author = pages.author().isBlank()
? Component.translatable("screen.rivencraft.age.unknown_author") : Component.literal(pages.author()); ? Component.translatable("screen.rivencraft.age.unknown_author") : Component.literal(pages.author());
PortLegacyBookArtwork.drawText(graphics, font, author, left + 50, textY + 2, 100, TEXT_COLOR); int detailsY = PortLegacyBookArtwork.drawText(graphics, font, author,
left + 50, textY + 2, 100, TEXT_COLOR) + 4;
if (pages.symbols().isEmpty()) drawRandomDescription(graphics, left + 40, detailsY);
graphics.disableScissor(); graphics.disableScissor();
} else { } else {
graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false); graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false);
@@ -105,6 +117,32 @@ public final class PortDescriptiveBookScreen extends Screen {
super.extractRenderState(graphics, mouseX, mouseY, partialTick); super.extractRenderState(graphics, mouseX, mouseY, partialTick);
} }
private void drawRandomDescription(GuiGraphicsExtractor graphics, int x, int y) {
var description = net.dnorberg.rivencraft.age.PortAgeDescription.forClient(ageId);
if (description == null) return;
var cycle = net.dnorberg.rivencraft.age.PortDayCycle.forClient(ageId);
var lines = java.util.List.of(
Component.translatable("screen.rivencraft.age.generator",
Component.translatable("generator.rivencraft." + description.terrain().name().toLowerCase(java.util.Locale.ROOT))),
Component.translatable("screen.rivencraft.age.trait.biomes", trait("biome_distribution", description.distribution())),
Component.translatable("screen.rivencraft.age.trait.lighting", trait("lighting", description.lighting())),
Component.translatable("screen.rivencraft.age.trait.weather", trait("weather", description.weather())),
Component.translatable("screen.rivencraft.age.trait.day_length", cycle.period() == 0
? Component.translatable("trait.rivencraft.day_length.stopped")
: Component.literal(String.format(java.util.Locale.ROOT, "%.2fx", cycle.period()))),
Component.translatable("screen.rivencraft.age.trait.celestial_angle",
Component.literal(String.format(java.util.Locale.ROOT, "%.0f°", (float) cycle.bearing()))),
Component.translatable("screen.rivencraft.age.trait.celestial_phase",
Component.literal(String.format(java.util.Locale.ROOT, "%.0f%%", cycle.phaseTick() * 100F / 24000F))));
for (var line : lines)
y = PortSymbolPageTextures.drawGlyphText(graphics, line.getString(), x, y, 110) + 2;
}
private static Component trait(String group, Enum<?> value) {
return Component.translatable("trait.rivencraft." + group + "."
+ value.name().toLowerCase(java.util.Locale.ROOT));
}
@Override @Override
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
if (event.button() == InputConstants.MOUSE_BUTTON_LEFT) { if (event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
@@ -150,8 +188,11 @@ public final class PortDescriptiveBookScreen extends Screen {
@Override public void tick() { @Override public void tick() {
if (bound) linkPanel.tick(); if (bound) linkPanel.tick();
exploration.tick(pageIndex == 0);
} }
@Override public void removed() { if (!exploration.active()) { exploration.stop(); linkPanel.close(); } super.removed(); }
@Override @Override
public boolean isPauseScreen() { public boolean isPauseScreen() {
return false; return false;
@@ -14,6 +14,15 @@ final class PortLegacyLinkPanel {
private static final int CELL_SIZE = 3; private static final int CELL_SIZE = 3;
private static final int BORDER_COLOR = 0xFF7B6AA8; private static final int BORDER_COLOR = 0xFF7B6AA8;
private int ticks; private int ticks;
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);
}
void close() { if (preview != null) { preview.close(); preview = null; } }
boolean canExplore() { return preview != null && preview.canExplore(); }
void exploring(boolean value) { if (preview != null) preview.exploring(value); }
private static final int LINK_COLOR = 0xFF006666; private static final int LINK_COLOR = 0xFF006666;
static boolean contains(double x, double y) { static boolean contains(double x, double y) {
@@ -26,9 +35,11 @@ final class PortLegacyLinkPanel {
void tick() { void tick() {
ticks++; ticks++;
if (preview != null) preview.tick();
} }
private void render(GuiGraphicsExtractor graphics, int left, int top, int width, int height, float partialTick) { private void render(GuiGraphicsExtractor graphics, int left, int top, int width, int height, float partialTick) {
if (preview != null && preview.render(graphics, left, top, width, height, partialTick)) return;
graphics.fill(left, top, left + width, top + height, 0xFF000011); graphics.fill(left, top, left + width, top + height, 0xFF000011);
float time = (ticks + partialTick) * 0.035F; float time = (ticks + partialTick) * 0.035F;
@@ -23,18 +23,21 @@ public final class PortLinkingBookScreen extends Screen {
private final InteractionHand hand; private final InteractionHand hand;
private final ItemStack book;
private final boolean bound; private final boolean bound;
private final net.dnorberg.rivencraft.item.LinkBookTarget target; private final net.dnorberg.rivencraft.item.LinkBookTarget target;
private final boolean returnLink; private final boolean returnLink;
private final Component destination; private final Component destination;
private int pageIndex; private int pageIndex;
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel(); 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.UseBookStandPayload standSource;
private EditBox titleInput; private EditBox titleInput;
public PortLinkingBookScreen(InteractionHand hand, ItemStack book) { public PortLinkingBookScreen(InteractionHand hand, ItemStack book) {
super(book.getHoverName()); super(book.getHoverName());
this.hand = hand; this.hand = hand;
this.book = book.copy();
target = book.get(Rivencraft.LINK_BOOK_TARGET.get()); target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
bound = target != null; bound = target != null;
destination = bound ? net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(book, target) : Component.empty(); destination = bound ? net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(book, target) : Component.empty();
@@ -51,7 +54,12 @@ public final class PortLinkingBookScreen extends Screen {
@Override @Override
protected void init() { protected void init() {
if (bound || standSource != null) return; if (bound) {
linkPanel.open(hand, book, standSource);
exploration.attach(this, this::addRenderableWidget, (width - WIDTH) / 2, (height - HEIGHT) / 2, standSource != null);
return;
}
if (standSource != null) return;
int left = (width - WIDTH) / 2; int left = (width - WIDTH) / 2;
int top = (height - HEIGHT) / 2; int top = (height - HEIGHT) / 2;
titleInput = new EditBox(font, left + 40, top + 69, 110, 20, titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
@@ -145,8 +153,11 @@ public final class PortLinkingBookScreen extends Screen {
@Override public void tick() { @Override public void tick() {
if (bound) linkPanel.tick(); if (bound) linkPanel.tick();
exploration.tick(pageIndex == 0);
} }
@Override public void removed() { if (!exploration.active()) { exploration.stop(); linkPanel.close(); } super.removed(); }
@Override @Override
public boolean isPauseScreen() { public boolean isPauseScreen() {
return false; return false;
@@ -10,33 +10,43 @@ import com.mojang.renderpearl.api.buffers.GpuBuffer;
import com.mojang.renderpearl.api.buffers.GpuBufferSlice; import com.mojang.renderpearl.api.buffers.GpuBufferSlice;
import com.mojang.renderpearl.api.pipeline.PrimitiveTopology; import com.mojang.renderpearl.api.pipeline.PrimitiveTopology;
import java.util.Optional; import java.util.Optional;
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
import java.util.OptionalDouble; import java.util.OptionalDouble;
import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.renderer.RenderPipelines;
import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
import org.joml.Matrix4f; 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 { public final class PortStaticSky implements AutoCloseable {
private static final int GRID = 48; private int grid;
private final DynamicTexture texture = new DynamicTexture("Rivencraft static sky", GRID * 6, GRID, false); private DynamicTexture texture;
private final GpuBuffer cube = buildCube(); private final GpuBuffer cube = buildCube();
private long uploadedFrame = Long.MIN_VALUE; private long uploadedFrame = Long.MIN_VALUE;
private int uploadedTint = -1; 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 (tint < 0) tint = 0x929292;
if (uploadedFrame != frame || uploadedTint != tint) { if (uploadedFrame != frame || uploadedTint != tint) {
RandomSource random = RandomSource.create(frame); RandomSource random = RandomSource.create(frame);
var image = texture.getPixels(); var image = texture.getPixels();
for (int face = 0; face < 6; face++) { for (int face = 0; face < 6; face++) {
for (int y = 0; y < GRID; y++) { for (int y = 0; y < grid; y++) {
for (int x = 0; x < GRID; x++) { for (int x = 0; x < grid; x++) {
int noise = 65 + random.nextInt(160); int noise = 65 + random.nextInt(160);
int red = (tint >> 16 & 255) * noise / 255; int red = (tint >> 16 & 255) * noise / 255;
int green = (tint >> 8 & 255) * noise / 255; int green = (tint >> 8 & 255) * noise / 255;
int blue = (tint & 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() { @Override public void close() {
cube.close(); cube.close();
texture.close(); if (texture != null) texture.close();
} }
} }
@@ -183,6 +183,36 @@ public final class PortSymbolPageTextures {
return result; return result;
} }
/** Translated prose becomes Legacy word glyphs, with genuine base-25 numerals. */
public static int drawGlyphText(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
String text, int x, int y, int maxWidth) {
var layout = net.dnorberg.rivencraft.writing.PortGlyphTextLayout.layout(text, maxWidth, 12);
for (var glyph : layout.glyphs()) {
int number = net.dnorberg.rivencraft.writing.PortGlyphTextLayout.number(glyph.word());
if (number >= 0) drawNumeral(graphics, number, x + glyph.x(), y + glyph.y(), 12);
else for (int component : glyphs(glyph.word()))
drawComponent(graphics, component, x + glyph.x(), y + glyph.y(), 12);
}
return y + layout.height();
}
public static void drawNumeral(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
int number, int x, int y, int size) {
int[] digits = PortSymbolNumerals.digitsFor(number);
int digitSize = digits.length == 1 ? size : Math.max(8, size * 3 / 4);
for (int digit : digits) {
for (int component : PortSymbolNumerals.componentsForDigit(digit))
drawComponent(graphics, component, x, y + (size - digitSize) / 2, digitSize);
x += digitSize + 1;
}
}
private static void drawComponent(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
int component, int x, int y, int size) {
graphics.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED, COMPONENTS, x, y,
(component % 8) * 64, (component / 8) * 64, size, size, 64, 64, 512, 512, 0xFF211A14);
}
private static Identifier texture(String path) { private static Identifier texture(String path) {
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/" + path + ".png"); return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/" + path + ".png");
} }
@@ -0,0 +1,17 @@
package net.dnorberg.rivencraft.client;
import net.minecraft.client.multiplayer.ClientLevel;
import qouteall.imm_ptl.core.ClientWorldLoader;
/** Reborn's world map is briefly unavailable during vanilla dimension replacement. */
public final class RebornPredictionAcks {
private RebornPredictionAcks() {}
public static boolean handleDuringWorldReset(ClientLevel packetLevel, int sequence) {
if (ClientWorldLoader.getIsInitialized()) return false;
// The old remote worlds have been discarded. Preserve the vanilla ack for
// the packet listener's live world until Reborn rebuilds its multiworld map.
if (packetLevel != null) packetLevel.handleBlockChangedAck(sequence);
return true;
}
}
@@ -9,6 +9,8 @@ public interface StaticSkyState {
void rivencraft$bodies(java.util.List<Body> bodies); void rivencraft$bodies(java.util.List<Body> bodies);
long rivencraft$staticFrame(); long rivencraft$staticFrame();
void rivencraft$staticFrame(long frame); void rivencraft$staticFrame(long frame);
int rivencraft$staticResolution();
void rivencraft$staticResolution(int resolution);
int rivencraft$skyTint(); int rivencraft$skyTint();
void rivencraft$skyTint(int color); void rivencraft$skyTint(int color);
int rivencraft$orbitBearing(); int rivencraft$orbitBearing();
@@ -294,15 +294,7 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
} }
private static void drawNumeral(GuiGraphicsExtractor graphics, int number, int x, int y, int size) { private static void drawNumeral(GuiGraphicsExtractor graphics, int number, int x, int y, int size) {
int[] digits = net.dnorberg.rivencraft.writing.PortSymbolNumerals.digitsFor(number); PortSymbolPageTextures.drawNumeral(graphics, number, x, y, size);
int digitSize = digits.length == 1 ? size : Math.max(8, size * 3 / 4);
Identifier components = Identifier.fromNamespaceAndPath("rivencraft", "textures/gui/symbolcomponents.png");
for (int digit : digits) {
for (int component : net.dnorberg.rivencraft.writing.PortSymbolNumerals.componentsForDigit(digit))
graphics.blit(RenderPipelines.GUI_TEXTURED, components, x, y + (size - digitSize) / 2,
(component % 8) * 64, (component / 8) * 64, digitSize, digitSize, 64, 64, 512, 512, 0xFF211A14);
x += digitSize + 1;
}
} }
private DisplayPage pageAtMouse(double mouseX, double mouseY) { private DisplayPage pageAtMouse(double mouseX, double mouseY) {
@@ -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() {}
}
@@ -0,0 +1,29 @@
package net.dnorberg.rivencraft.compat;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
import net.minecraft.core.BlockPos;
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 ImmersiveCrystalPortals {
public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
boolean live = false;
if (ImmersiveBookPreviews.available()) {
try {
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 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 (ImmersiveBookPreviews.available()) ImmersiveCrystalView.remove(source, owner);
}
private ImmersiveCrystalPortals() {}
}
@@ -0,0 +1,131 @@
package net.dnorberg.rivencraft.compat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.item.LinkBookTarget;
import net.dnorberg.rivencraft.item.LinkProperties;
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
import net.dnorberg.rivencraft.portal.CrystalPortalSurfaces;
import net.dnorberg.rivencraft.portal.PortalBookTravel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import qouteall.imm_ptl.core.api.PortalAPI;
import qouteall.imm_ptl.core.portal.Portal;
import qouteall.imm_ptl.core.portal.shape.SpecialFlatPortalShape;
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 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) {}
static boolean refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
List<View> wanted = views(source, owner, plan, book);
if (wanted.isEmpty()) { remove(source, owner); return false; }
if (!complete(source, owner, wanted)) {
remove(source, owner);
for (View view : wanted) spawn(source, view);
}
return complete(source, owner, wanted);
}
private static List<View> views(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
List<View> views = new ArrayList<>();
boolean descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get());
boolean relative = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE).has(LinkProperties.RELATIVE_LINK);
// Ordinary descriptive arrival searches once, not for each side of each opening.
LinkBookTarget shared = relative ? null : PortalBookTravel.destination(source, book, owner, 0, 0);
if (!relative && (shared == null || !shared.valid())) return List.of();
for (var surface : CrystalPortalSurfaces.group(source, plan)) {
LinkBookTarget target = relative
? PortalBookTravel.destination(source, book, BlockPos.containing(surface.bounds().getCenter()), 0, 0) : shared;
if (target == null || !target.valid()) return List.of();
int shape = surface.cells().stream().mapToLong(BlockPos::asLong).sorted().boxed().toList().hashCode();
for (Direction normal : List.of(surface.normal(), surface.normal().getOpposite())) {
String tag = ownerTag(owner) + normal.getSerializedName() + ":" + shape + ":" + target + ":" + descriptive + ":" + relative;
views.add(new View(surface, normal, target, descriptive, relative, tag));
}
}
return List.copyOf(views);
}
static void remove(ServerLevel source, BlockPos owner) {
for (Portal portal : existing(source, owner)) portal.discard();
}
private static List<Portal> existing(ServerLevel source, BlockPos owner) {
String prefix = ownerTag(owner);
return source.getEntitiesOfClass(Portal.class,
new AABB(owner).inflate(CrystalPortalNetwork.MAX_RADIUS + 2),
entity -> entity.portalTag != null && entity.portalTag.startsWith(prefix));
}
private static boolean complete(ServerLevel source, BlockPos owner, List<View> wanted) {
List<Portal> existing = existing(source, owner);
if (existing.size() != wanted.size()) return false;
var tags = new HashSet<String>();
for (Portal view : existing) {
if (view.getTeleportable() || view.isInteractable() || !view.isPortalValid()
|| !tags.add(view.portalTag)) return false;
}
return tags.equals(wanted.stream().map(View::tag).collect(java.util.stream.Collectors.toSet()));
}
private static void spawn(ServerLevel source, View view) {
Portal portal = Portal.ENTITY_TYPE.create(source, EntitySpawnReason.TRIGGERED);
if (portal == null) return;
var surface = view.surface();
var normal = view.normal();
var target = view.target();
PortalAPI.setPortalOrthodoxShape(portal, normal, surface.bounds());
// Inside the opening's block thickness, so crystal frame edges stay in front.
portal.setOriginPos(portal.getOriginPos().add(normal.getUnitVec3().scale(-0.125)));
Mesh2D mesh = new Mesh2D();
double halfU = 1 / portal.getWidth(), halfV = 1 / portal.getHeight();
for (BlockPos cell : surface.cells()) {
Vec3 face = Vec3.atCenterOf(cell).add(normal.getUnitVec3().scale(0.5));
Vec3 offset = face.subtract(portal.getOriginPos());
double u = 2 * offset.dot(portal.getAxisW()) / portal.getWidth();
double v = 2 * offset.dot(portal.getAxisH()) / portal.getHeight();
mesh.addQuad(u - halfU, v - halfV, u + halfU, v + halfV);
}
portal.setPortalShape(new SpecialFlatPortalShape(mesh));
// Descriptive Book travel retains the approaching entity's yaw/pitch.
// Linking Books rotate the approach normal onto their written facing.
DQuaternion rotation = view.preserveFacing() ? DQuaternion.identity : cameraRotation(normal, target);
Vec3 eye = new Vec3(target.x(), target.y() + 1.62, target.z());
// Anchor a standing player's eyes above the opening's floor rather than
// above the mesh center (which changes when the frame is made taller).
Vec3 anchor = surface.bounds().getCenter();
if (normal.getAxis().isHorizontal()) anchor = new Vec3(anchor.x, surface.bounds().minY + 1.62, anchor.z);
else anchor = anchor.add(0, 1.62, 0);
Vec3 destination = eye.subtract(rotation.rotate(anchor.subtract(portal.getOriginPos())));
PortalAPI.setPortalTransformation(portal,
net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.DIMENSION, target.dimension()),
destination, rotation, 1);
portal.setTeleportable(false);
portal.setInteractable(false);
portal.setCrossPortalCollisionEnabled(false);
portal.portalTag = view.tag();
PortalAPI.spawnServerEntity(portal);
}
private static DQuaternion cameraRotation(Direction normal, LinkBookTarget target) {
Vec3 sourceLook = normal.getOpposite().getUnitVec3();
Vec3 sourceUp = normal.getAxis() == Direction.Axis.Y ? new Vec3(0, 0, -1) : new Vec3(0, 1, 0);
Vec3 destinationLook = Vec3.directionFromRotation(target.pitch(), target.yaw());
Vec3 destinationUp = Vec3.directionFromRotation(target.pitch() - 90, target.yaw());
DQuaternion from = DQuaternion.fromFacingVecs(sourceLook.cross(sourceUp), sourceUp);
DQuaternion to = DQuaternion.fromFacingVecs(destinationLook.cross(destinationUp), destinationUp);
return to.hamiltonProduct(from.getConjugated()).getNormalized();
}
private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; }
private ImmersiveCrystalView() {}
}
@@ -0,0 +1,38 @@
package net.dnorberg.rivencraft.compat;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.server.MinecraftServer;
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
/** Optional 26.3 Immersive Portals forks; only the guarded adapter links their API classes. */
public final class ImmersivePortalsCompatibility {
private ImmersivePortalsCompatibility() {}
public static boolean available() { return ModList.get().isLoaded("seamlessportals") || ModList.get().isLoaded("immersive_portals_reborn"); }
public static boolean synchronize(MinecraftServer server) { return synchronize(server, null); }
/** Login/catalog packets must precede Rivencraft's acknowledgement round trip. */
public static boolean beforeCatalog(net.minecraft.server.level.ServerPlayer player) {
return synchronize(player.level().getServer(), player);
}
private static boolean synchronize(MinecraftServer server, net.minecraft.server.level.ServerPlayer player) {
if (!available()) return true;
if (!server.isSameThread()) throw new IllegalStateException("Portal catalog update outside server thread");
try {
ImmersivePortalsDimensionAdapter.synchronize(server);
if (player != null) ImmersivePortalsDimensionAdapter.sendTo(player);
return true;
} catch (RuntimeException | LinkageError failure) {
Rivencraft.LOGGER.error("Could not synchronize the optional Immersive Portals dimension IDs; "
+ "Rivencraft catalog acknowledgement/travel remains blocked until synchronization succeeds", failure);
return false;
}
}
public static void onServerStarted(ServerStartedEvent event) {
synchronize(event.getServer());
}
}
@@ -0,0 +1,32 @@
package net.dnorberg.rivencraft.compat;
import java.util.Set;
import net.minecraft.server.MinecraftServer;
import qouteall.q_misc_util.dimension.DimensionIntId;
/** Updates the shared 26.3 dimension catalog without delegating Age construction. */
final class ImmersivePortalsDimensionAdapter {
private ImmersivePortalsDimensionAdapter() {}
static void sendTo(net.minecraft.server.level.ServerPlayer player) {
// Seamless's createPacket returns a vanilla Packet; Reborn's returns
// a CustomPacketPayload. Their createFromServer factory is shared and
// retains each fork's native (two- or three-tag) wire format.
player.connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(
qouteall.q_misc_util.MiscNetworking.DimIdSyncPacket.createFromServer(
player.level().getServer())));
}
static void synchronize(MinecraftServer server) {
var live = Set.copyOf(server.levelKeys());
var record = DimensionIntId.getServerMap(server);
if (record.getDimIdSet().equals(live)) return;
// This is the same public synchronization entry point called by its
// dynamic-update listener. The two supported forks have
// different event wrappers, but share this method. It updates IDs and
// sends native type/sea-level metadata before Rivencraft's catalog.
DimensionIntId.onServerDimensionChanged(server);
if (!DimensionIntId.getServerMap(server).getDimIdSet().equals(live))
throw new IllegalStateException("The portal mod did not accept the current server dimensions");
}
}
@@ -0,0 +1,112 @@
package net.dnorberg.rivencraft.compat;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.UUID;
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
import net.dnorberg.rivencraft.network.BookPreviewPayload;
import net.dnorberg.rivencraft.network.PortBookNetworking;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.age.AgeCatalogSync;
import net.dnorberg.rivencraft.age.PortAgeTravel;
import net.dnorberg.rivencraft.item.*;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.network.PacketDistributor;
import qouteall.imm_ptl.core.api.PortalAPI;
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 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;
private record Lease(UUID session, ChunkLoader loader, LinkBookTarget destination,
RequestBookPreviewPayload source, long expires) {}
static void open(ServerPlayer player, RequestBookPreviewPayload request) {
long now = player.level().getServer().getTickCount();
if (now - REQUESTS.getOrDefault(player, -100L) < 10) return;
REQUESTS.put(player, now);
ItemStack book = validated(player, request);
if (book.isEmpty()) { close(player); return; }
Lease previous = LEASES.get(player);
if (previous != null && previous.session().equals(request.session())
&& previous.source().offhand() == request.offhand()
&& previous.source().fromStand() == request.fromStand()
&& previous.source().sourceDimension().equals(request.sourceDimension())
&& previous.source().standPos().equals(request.standPos())
&& ItemStack.matches(previous.source().book(), request.book())) {
LEASES.put(player, new Lease(previous.session(), previous.loader(), previous.destination(), request, now + LIFETIME));
PacketDistributor.sendToPlayer(player, new BookPreviewPayload(request.session(), previous.destination()));
return;
}
close(player);
LinkBookTarget target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
var properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
var server = player.level().getServer();
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
var level = id == null ? null : server.getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null || !AgeCatalogSync.ready(player, id)) return;
BlockPos landing = PortAgeTravel.resolveLanding(level, player, properties.forDescriptiveBook());
if (landing == null) return;
target = new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
player.getYRot(), player.getXRot());
} else if (book.is(Rivencraft.LINKING_BOOK.get()) && target != null) {
var level = server.getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
if (level == null || !AgeCatalogSync.ready(player, target.dimension())) return;
target = PortLinkDestinations.resolve(player.level(), level, player.blockPosition(), target, properties);
} else return;
if (!target.valid()) return;
var level = server.getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
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. 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);
LEASES.put(player, new Lease(request.session(), loader, target, request, now + LIFETIME));
ImmPtlChunkTracking.immediatelyUpdateForPlayer(player);
PacketDistributor.sendToPlayer(player, new BookPreviewPayload(request.session(), target));
}
private static ItemStack validated(ServerPlayer player, RequestBookPreviewPayload request) {
if (!player.level().dimension().identifier().equals(request.sourceDimension()) || !player.isAlive()) return ItemStack.EMPTY;
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);
return ItemStack.matches(held, request.book()) ? held : ItemStack.EMPTY;
}
static void release(ServerPlayer player, UUID session) {
Lease lease = LEASES.get(player);
if (lease != null && lease.session().equals(session)) close(player);
}
static void close(ServerPlayer player) {
Lease lease = LEASES.remove(player);
if (lease != null) PortalAPI.removeChunkLoaderForPlayer(player, lease.loader());
}
static void tick(MinecraftServer server) {
if (server.getTickCount() % 20 != 0) return;
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) {
Lease lease = LEASES.get(player);
if (server.getTickCount() >= lease.expires()
|| server.getLevel(lease.loader().dimension()) == null
|| validated(player, lease.source()).isEmpty()) close(player);
}
}
static void logout(ServerPlayer player) { close(player); REQUESTS.remove(player); }
static void stop() {
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player);
REQUESTS.clear();
}
private ImmersivePreviewChunks() {}
}
@@ -0,0 +1,59 @@
package net.dnorberg.rivencraft.mixin;
import net.dnorberg.rivencraft.client.PortBookPreview;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.Holder;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Mutes only the remote client world displayed by a Rivencraft book preview. */
@Mixin(value = ClientLevel.class, priority = 2000)
public abstract class ClientLevelSoundMixin {
@Inject(
method = "playSound(DDDLnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FFZJ)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewPositionSound(
double x, double y, double z, SoundEvent sound, SoundSource source,
float volume, float pitch, boolean distanceDelay, long seed, CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
@Inject(
method = "playLocalSound(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FF)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewLocalEntitySound(
Entity entity, SoundEvent sound, SoundSource source, float volume, float pitch,
CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
@Inject(
method = "playSeededSound(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/Holder;Lnet/minecraft/sounds/SoundSource;FFJ)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewSeededEntitySound(
Entity player, Entity entity, Holder<SoundEvent> sound, SoundSource source,
float volume, float pitch, long seed, CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
private void rivencraft$cancelPreviewSound(CallbackInfo callback) {
if (PortBookPreview.shouldMute((ClientLevel)(Object)this)) {
callback.cancel();
}
}
}
@@ -0,0 +1,22 @@
package net.dnorberg.rivencraft.mixin;
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;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Pseudo
@Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false)
public abstract class ImmersiveGuiRenderingMixin {
@Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false)
private static void rivencraft$clearLiveTarget(CallbackInfo ci) {
if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.beginRender();
}
@Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false)
private static void rivencraft$restoreCamera(CallbackInfo ci) {
if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.endRender();
}
}
@@ -0,0 +1,26 @@
package net.dnorberg.rivencraft.mixin;
import net.dnorberg.rivencraft.client.RebornPredictionAcks;
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.network.protocol.game.ClientboundBlockChangedAckPacket;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Keep transitional acks out of Reborn's initialized-world assertion. */
@Mixin(value = ClientPacketListener.class, priority = 2000)
public abstract class RebornBlockAckMixin {
@Shadow private ClientLevel level;
@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() && ImmersiveBookPreviews.reborn()
&& RebornPredictionAcks.handleDuringWorldReset(level, packet.sequence())) callback.cancel();
}
}
@@ -52,7 +52,9 @@ public class StaticSkyRendererMixin {
key.identifier().getNamespace().equals("rivencraft") key.identifier().getNamespace().equals("rivencraft")
&& key.identifier().getPath().endsWith("_sky_static")).orElse(false); && key.identifier().getPath().endsWith("_sky_static")).orElse(false);
((StaticSkyState) state).rivencraft$staticFrame(enabled ? level.getGameTime() / 2 : Long.MIN_VALUE); ((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); var cycle = net.dnorberg.rivencraft.age.PortDayCycle.forLevel(level);
// 0=native Overworld/no authored overlay, 1=fog-only backdrop, // 0=native Overworld/no authored overlay, 1=fog-only backdrop,
// 2=native End backdrop, 3=custom Static backdrop. // 2=native End backdrop, 3=custom Static backdrop.
@@ -132,7 +134,8 @@ public class StaticSkyRendererMixin {
} }
if (frame == Long.MIN_VALUE) return; if (frame == Long.MIN_VALUE) return;
if (rivencraft$staticSky == null) rivencraft$staticSky = new PortStaticSky(); 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); if (((StaticSkyState) state).rivencraft$bodyOverlay() == 3) rivencraft$overlay(fog, state);
ci.cancel(); ci.cancel();
} }
@@ -12,6 +12,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class StaticSkyStateMixin implements StaticSkyState { public class StaticSkyStateMixin implements StaticSkyState {
@Unique private long rivencraft$frame = Long.MIN_VALUE; @Unique private long rivencraft$frame = Long.MIN_VALUE;
@Unique private int rivencraft$tint = -1; @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 int rivencraft$bearing = -1;
@Unique private float rivencraft$sunSize = 1F; @Unique private float rivencraft$sunSize = 1F;
@Unique private int rivencraft$celestialTint = -1; @Unique private int rivencraft$celestialTint = -1;
@@ -39,6 +42,7 @@ public class StaticSkyStateMixin implements StaticSkyState {
private void rivencraft$reset(CallbackInfo ci) { private void rivencraft$reset(CallbackInfo ci) {
rivencraft$frame = Long.MIN_VALUE; rivencraft$frame = Long.MIN_VALUE;
rivencraft$tint = -1; rivencraft$tint = -1;
rivencraft$resolution = net.dnorberg.rivencraft.shared.StaticSkyResolution.DEFAULT;
rivencraft$bearing = -1; rivencraft$bearing = -1;
rivencraft$sunSize = 1F; rivencraft$sunSize = 1F;
rivencraft$celestialTint = -1; rivencraft$celestialTint = -1;
@@ -0,0 +1,17 @@
package net.dnorberg.rivencraft.network;
import java.util.UUID;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.item.LinkBookTarget;
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 BookPreviewPayload(UUID session, LinkBookTarget destination) implements CustomPacketPayload {
public static final Type<BookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "book_preview"));
public static final StreamCodec<RegistryFriendlyByteBuf, BookPreviewPayload> STREAM_CODEC = StreamCodec.of(
(buf, value) -> { buf.writeUUID(value.session()); LinkBookTarget.STREAM_CODEC.encode(buf, value.destination()); },
buf -> new BookPreviewPayload(buf.readUUID(), LinkBookTarget.STREAM_CODEC.decode(buf)));
@Override public Type<BookPreviewPayload> type() { return TYPE; }
}
@@ -33,6 +33,17 @@ public final class PortBookNetworking {
public static void registerPayloads(RegisterPayloadHandlersEvent event) { public static void registerPayloads(RegisterPayloadHandlersEvent event) {
var registrar = event.registrar("1"); var registrar = event.registrar("1");
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.ImmersiveBookPreviews.open(player, payload);
});
registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC,
(payload, context) -> {
if (context.player() instanceof ServerPlayer player)
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.release(player, payload.session());
});
registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC, registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC,
(payload, context) -> { (payload, context) -> {
if (context.player() instanceof ServerPlayer player if (context.player() instanceof ServerPlayer player
@@ -130,6 +141,8 @@ public final class PortBookNetworking {
public static Identifier createAge(ServerPlayer player, String title, List<Identifier> pages) { public static Identifier createAge(ServerPlayer player, String title, List<Identifier> pages) {
if (title == null || title.isBlank() || title.length() > MAX_BOOK_TITLE_LENGTH) return null; if (title == null || title.isBlank() || title.length() > MAX_BOOK_TITLE_LENGTH) return null;
long seed = player.getRandom().nextLong(); long seed = player.getRandom().nextLong();
var policy = pages.isEmpty() ? net.dnorberg.rivencraft.age.PortRandomPagePolicy.configured()
: net.dnorberg.rivencraft.age.PortRandomPagePolicy.UNRESTRICTED;
var recovery = net.dnorberg.rivencraft.writing.PortWritingRecovery.recover(pages); var recovery = net.dnorberg.rivencraft.writing.PortWritingRecovery.recover(pages);
List<Identifier> activePages = recovery.activePages(); List<Identifier> activePages = recovery.activePages();
net.dnorberg.rivencraft.age.PortBiomePlan biomePlan; net.dnorberg.rivencraft.age.PortBiomePlan biomePlan;
@@ -137,7 +150,7 @@ public final class PortBookNetworking {
List<Identifier> generationPages; List<Identifier> generationPages;
try { try {
if (pages.isEmpty()) { if (pages.isEmpty()) {
var random = PortRandomAgeSelection.select(player.level().getServer(), seed); var random = PortRandomAgeSelection.select(player.level().getServer(), seed, policy);
terrain = random.terrain(); terrain = random.terrain();
biomePlan = random.biomes(); biomePlan = random.biomes();
generationPages = pages; generationPages = pages;
@@ -163,9 +176,9 @@ public final class PortBookNetworking {
id = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age/" + name); id = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age/" + name);
} }
try { try {
var environment = net.dnorberg.rivencraft.age.PortEnvironmentSelection.resolve(activePages, seed, terrain); var environment = net.dnorberg.rivencraft.age.PortEnvironmentSelection.resolve(activePages, seed, terrain, policy);
var randomFeatures = pages.isEmpty() var randomFeatures = pages.isEmpty()
? net.dnorberg.rivencraft.age.PortRandomFeatureSelection.select(server, seed, terrain, biomePlan) : null; ? net.dnorberg.rivencraft.age.PortRandomFeatureSelection.select(server, seed, terrain, biomePlan, policy) : null;
RuntimeAgeBackend.create(server, id, seed, biomePlan, terrain, RuntimeAgeBackend.create(server, id, seed, biomePlan, terrain,
randomFeatures == null ? PortAuthoredWriting.rockPlan(generationPages, seed) : randomFeatures.rocks(), randomFeatures == null ? PortAuthoredWriting.rockPlan(generationPages, seed) : randomFeatures.rocks(),
PortAuthoredWriting.vegetationPlan(generationPages), PortAuthoredWriting.vegetationPlan(generationPages),
@@ -175,7 +188,7 @@ public final class PortBookNetworking {
environment.weather(), environment.lighting(), environment.sky(), environment.weather(), environment.lighting(), environment.sky(),
net.dnorberg.rivencraft.age.PortAgeColors.resolve(pages, seed), net.dnorberg.rivencraft.age.PortAgeColors.resolve(pages, seed),
net.dnorberg.rivencraft.age.PortDayCycle.resolve(pages, seed, net.dnorberg.rivencraft.age.PortDayCycle.resolve(pages, seed,
net.dnorberg.rivencraft.age.PortDayCycle.nativeTicks(server.overworld())), pages, title); net.dnorberg.rivencraft.age.PortDayCycle.nativeTicks(server.overworld()), policy), pages, title, policy);
} catch (RuntimeException exception) { } catch (RuntimeException exception) {
Rivencraft.LOGGER.warn("Age creation failed for {}", id, exception); Rivencraft.LOGGER.warn("Age creation failed for {}", id, exception);
player.sendOverlayMessage(Component.literal("Age creation failed: " player.sendOverlayMessage(Component.literal("Age creation failed: "
@@ -0,0 +1,15 @@
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;
public record ReleaseBookPreviewPayload(UUID session) implements CustomPacketPayload {
public static final Type<ReleaseBookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "release_book_preview"));
public static final StreamCodec<RegistryFriendlyByteBuf, ReleaseBookPreviewPayload> STREAM_CODEC = StreamCodec.of(
(buf, value) -> buf.writeUUID(value.session()), buf -> new ReleaseBookPreviewPayload(buf.readUUID()));
@Override public Type<ReleaseBookPreviewPayload> type() { return TYPE; }
}
@@ -0,0 +1,24 @@
package net.dnorberg.rivencraft.network;
import java.util.UUID;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.core.BlockPos;
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 server verifies the actual held/stand book, never a client-supplied destination. */
public record RequestBookPreviewPayload(UUID session, boolean offhand, boolean fromStand,
Identifier sourceDimension, BlockPos standPos, ItemStack book) implements CustomPacketPayload {
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 -> new RequestBookPreviewPayload(buf.readUUID(), buf.readBoolean(), buf.readBoolean(),
Identifier.STREAM_CODEC.decode(buf), BlockPos.STREAM_CODEC.decode(buf), ItemStack.STREAM_CODEC.decode(buf)));
@Override public Type<RequestBookPreviewPayload> type() { return TYPE; }
}
@@ -176,10 +176,12 @@ public final class CrystalPortalNetwork {
return false; return false;
} }
} }
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
return true; return true;
} }
public static void shutdown(ServerLevel level, BlockPos receptacle) { public static void shutdown(ServerLevel level, BlockPos receptacle) {
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(level, receptacle);
// A broken support can disconnect the graph. Scan a bounded volume rather // A broken support can disconnect the graph. Scan a bounded volume rather
// than trusting a path through blocks that no longer exist. // than trusting a path through blocks that no longer exist.
for (BlockPos pos : BlockPos.betweenClosed(receptacle.offset(-CLEANUP_RADIUS, -CLEANUP_RADIUS, -CLEANUP_RADIUS), for (BlockPos pos : BlockPos.betweenClosed(receptacle.offset(-CLEANUP_RADIUS, -CLEANUP_RADIUS, -CLEANUP_RADIUS),
@@ -221,6 +223,8 @@ public final class CrystalPortalNetwork {
level.setBlock(pos, Blocks.AIR.defaultBlockState(), 3); level.setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
} }
orientSurfaces(level, plan); orientSurfaces(level, plan);
var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle);
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
return true; return true;
} }
@@ -24,6 +24,26 @@ public final class PortalBookTravel {
: book.has(Rivencraft.LINK_BOOK_TARGET.get()) ? book.get(Rivencraft.LINK_BOOK_TARGET.get()).dimension() : null; : book.has(Rivencraft.LINK_BOOK_TARGET.get()) ? book.get(Rivencraft.LINK_BOOK_TARGET.get()).dimension() : null;
return id != null && source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id)) != null; return id != null && source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id)) != null;
} }
/** The same destination rules serve native rendering and actual portal arrivals. */
public static LinkBookTarget destination(ServerLevel source, ItemStack book,
net.minecraft.core.BlockPos departure, float yaw, float pitch) {
var properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
var level = id == null ? null : source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null) return null;
var landing = PortAgeTravel.resolveLanding(level, source, departure, properties.forDescriptiveBook());
return landing == null ? null : new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(),
landing.getZ() + 0.5, yaw, pitch);
}
if (!book.is(Rivencraft.LINKING_BOOK.get())) return null;
var target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
if (target == null || !target.valid()) return null;
var level = source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
return level == null ? null : net.dnorberg.rivencraft.item.PortLinkDestinations.resolve(
source, level, departure, target, properties);
}
public static void travel(Entity entity, ServerLevel source, ItemStack book) { public static void travel(Entity entity, ServerLevel source, ItemStack book) {
if (entity instanceof ServerPlayer player) { if (entity instanceof ServerPlayer player) {
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) { if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
@@ -38,22 +58,10 @@ public final class PortalBookTravel {
LinkProperties properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE); LinkProperties properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
if (properties.has(LinkProperties.DISARM) && !LinkDisarmService.mayTravel(entity)) return; if (properties.has(LinkProperties.DISARM) && !LinkDisarmService.mayTravel(entity)) return;
boolean descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get()); boolean descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get());
LinkBookTarget destination = book.get(Rivencraft.LINK_BOOK_TARGET.get()); LinkBookTarget destination = destination(source, book, entity.blockPosition(), entity.getYRot(), entity.getXRot());
if (descriptive) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
ServerLevel level = id == null ? null : source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null) return;
var landing = PortAgeTravel.resolveLanding(level, entity, properties.forDescriptiveBook());
if (landing == null) return;
destination = new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
entity.getYRot(), entity.getXRot());
}
if (destination == null || !destination.valid()) return; if (destination == null || !destination.valid()) return;
ServerLevel target = source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, destination.dimension())); ServerLevel target = source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, destination.dimension()));
if (target == null || !entity.canTeleport(source, target) || !descriptive && !properties.allowsTravel(target == source)) return; if (target == null || !entity.canTeleport(source, target) || !descriptive && !properties.allowsTravel(target == source)) return;
if (!descriptive) destination = net.dnorberg.rivencraft.item.PortLinkDestinations.resolve(source, target,
entity.blockPosition(), destination, properties);
if (!destination.valid()) return;
var feet = net.minecraft.core.BlockPos.containing(destination.x(), destination.y(), destination.z()); var feet = net.minecraft.core.BlockPos.containing(destination.x(), destination.y(), destination.z());
if (feet.getY() < target.getMinY() || entity.getBbHeight() + feet.getY() >= target.getMaxY() if (feet.getY() < target.getMinY() || entity.getBbHeight() + feet.getY() >= target.getMaxY()
|| !target.getWorldBorder().isWithinBounds(feet)) return; || !target.getWorldBorder().isWithinBounds(feet)) return;
@@ -60,7 +60,8 @@ public final class PortAuthoredWriting {
|| net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available(); || net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available();
if (net.dnorberg.rivencraft.age.PortAgeColors.isModifier(page) if (net.dnorberg.rivencraft.age.PortAgeColors.isModifier(page)
|| net.dnorberg.rivencraft.age.PortDayCycle.supports(page)) return true; || net.dnorberg.rivencraft.age.PortDayCycle.supports(page)) return true;
if (page.equals(net.dnorberg.rivencraft.age.PortAcceleratedTicks.PAGE) if (page.equals(net.dnorberg.rivencraft.age.PortFlooding.PAGE)
|| page.equals(net.dnorberg.rivencraft.age.PortAcceleratedTicks.PAGE)
|| net.dnorberg.rivencraft.age.PortInstabilityData.isCorrupted(page)) return true; || net.dnorberg.rivencraft.age.PortInstabilityData.isCorrupted(page)) return true;
if (isTerrain(page) || controller(page) != null || PortWeatherMode.forPage(page) != null if (isTerrain(page) || controller(page) != null || PortWeatherMode.forPage(page) != null
|| PortLighting.forPage(page) != null || PortSkyStyle.forPage(page) != null) return true; || PortLighting.forPage(page) != null || PortSkyStyle.forPage(page) != null) return true;
@@ -135,7 +136,8 @@ public final class PortAuthoredWriting {
if (pendingMaterial != null && !(pendingMaterial.equals("rivencraft:block") if (pendingMaterial != null && !(pendingMaterial.equals("rivencraft:block")
&& (page.equals(ROCKS) || PortTerrainFeaturePlan.acceptsMaterial(page)) && (page.equals(ROCKS) || PortTerrainFeaturePlan.acceptsMaterial(page))
|| pendingMaterial.equals("rivencraft:fluid") && PortLakePlan.isLake(page))) return false; || pendingMaterial.equals("rivencraft:fluid") && PortLakePlan.isLake(page))) return false;
if (net.dnorberg.rivencraft.age.PortAgeColors.isModifier(page) if (page.equals(net.dnorberg.rivencraft.age.PortFlooding.PAGE)
|| net.dnorberg.rivencraft.age.PortAgeColors.isModifier(page)
|| net.dnorberg.rivencraft.age.PortDayCycle.supports(page)) { || net.dnorberg.rivencraft.age.PortDayCycle.supports(page)) {
// Shared colors target Sky, Ambient Light Color or Normal Time; trailing colors tint the sky. // Shared colors target Sky, Ambient Light Color or Normal Time; trailing colors tint the sky.
} else if (net.dnorberg.rivencraft.age.PortInstabilityData.isCorrupted(page)) { } else if (net.dnorberg.rivencraft.age.PortInstabilityData.isCorrupted(page)) {
@@ -239,7 +241,7 @@ public final class PortAuthoredWriting {
private static PortBiomePlan.Distribution controller(Identifier page) { private static PortBiomePlan.Distribution controller(Identifier page) {
if (!page.getNamespace().equals(Rivencraft.MOD_ID)) return null; if (!page.getNamespace().equals(Rivencraft.MOD_ID)) return null;
return switch (page.getPath()) { 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/single" -> PortBiomePlan.Distribution.SINGLE;
case "biome/tiled" -> PortBiomePlan.Distribution.TILED; case "biome/tiled" -> PortBiomePlan.Distribution.TILED;
case "biome/grid" -> PortBiomePlan.Distribution.GRID; case "biome/grid" -> PortBiomePlan.Distribution.GRID;
@@ -421,10 +423,15 @@ public final class PortAuthoredWriting {
? PortBiomePlan.Distribution.TILED : PortBiomePlan.Distribution.MEDIUM; ? PortBiomePlan.Distribution.TILED : PortBiomePlan.Distribution.MEDIUM;
} }
if (distribution == PortBiomePlan.Distribution.NATIVE) { if (distribution == PortBiomePlan.Distribution.NATIVE) {
var nativePool = caveTerrain var kind = pages.stream().filter(page -> controller(page) == PortBiomePlan.Distribution.NATIVE)
? (available != null ? available : net.dnorberg.rivencraft.age.PortRandomAgeSelection.caveBiomes(registries)) .map(page -> net.dnorberg.rivencraft.shared.NativeBiomeKind.controller(
: List.<Identifier>of(); page.getPath().substring("biome/".length())))
return new PortBiomePlan(distribution, nativePool); .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) { if (distribution != null && available != null) {
int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2; int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
@@ -0,0 +1,40 @@
package net.dnorberg.rivencraft.writing;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
/** Legacy prose word splitting and base-25 width, independent of the client renderer. */
public final class PortGlyphTextLayout {
private static final Pattern WORD_BREAK = Pattern.compile("[^\\p{L}\\p{N}]+");
private static final Pattern NUMERAL = Pattern.compile("[0-9]+");
public record Glyph(String word, int x, int y, int width) {}
public record Layout(List<Glyph> glyphs, int height) {
public Layout { glyphs = List.copyOf(glyphs); }
}
private PortGlyphTextLayout() {}
public static int number(String word) {
if (!NUMERAL.matcher(word).matches()) return -1;
try { return Integer.parseInt(word); }
catch (NumberFormatException exception) { return -1; }
}
public static Layout layout(String text, int maxWidth, int size) {
if (size < 1 || maxWidth < size) throw new IllegalArgumentException("Invalid glyph text dimensions");
var glyphs = new ArrayList<Glyph>();
int x = 0, y = 0;
for (String word : WORD_BREAK.split(text)) {
if (word.isEmpty()) continue;
int value = number(word), width = size;
if (value >= 0) {
int digits = PortSymbolNumerals.digitsFor(value).length;
if (digits > 1) width = digits * (Math.max(8, size * 3 / 4) + 1) - 1;
}
if (x != 0 && x + width > maxWidth) { x = 0; y += size + 1; }
glyphs.add(new Glyph(word, x, y, width));
x += width + 3;
}
return new Layout(glyphs, glyphs.isEmpty() ? 0 : y + size + 1);
}
}
@@ -55,6 +55,18 @@ public final class PortSymbolPages {
.map(Entry::id).sorted().toList(); .map(Entry::id).sorted().toList();
} }
/** Library loot includes exact Ruins templates; Sealed Notebooks keep their own pool. */
public static List<Identifier> libraryCandidateIds() {
return java.util.stream.Stream.concat(ENTRIES.values().stream()
.filter(entry -> entry.id().getNamespace().equals(Rivencraft.MOD_ID)
&& !entry.id().getPath().startsWith("block/")
&& !entry.id().getPath().startsWith("biome/")
&& !entry.role().equals("unknown")).map(Entry::id),
net.dnorberg.rivencraft.compat.RuinsTemplatePages.templates().stream()
.map(net.dnorberg.rivencraft.compat.RuinsTemplatePages::symbolId))
.distinct().sorted().toList();
}
public static List<ItemStack> pages(String category, HolderLookup.Provider registries) { public static List<ItemStack> pages(String category, HolderLookup.Provider registries) {
List<ItemStack> pages = new ArrayList<>(); List<ItemStack> pages = new ArrayList<>();
ENTRIES.values().stream().filter(entry -> entry.category().equals(category)) ENTRIES.values().stream().filter(entry -> entry.category().equals(category))
Loaded 100 of 160 files, more files were not shown because too many files have changed in this diff. Show more