Public Access
Compare commits
4
Commits
V26.3.0.1
...
V26.3.0.10
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d199ac253e | ||
|
|
90e4a98a7a | ||
|
|
441f2896d7 | ||
|
|
4a59fb5d02 |
No files matched your search
@@ -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
@@ -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
|
||||||
@@ -10,20 +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.
|
||||||
|
|
||||||
|
Current releases: **1.21.1.0.6** and **26.3.0.10**, with separate Minecraft-specific JARs and saves.
|
||||||
|
|
||||||
The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate
|
The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate
|
||||||
**Minecraft 26.3 release, 26.3.0.1**, uses Java 25, NeoForge 26.3.0.99 and a
|
**Minecraft 26.3 release** uses Java 25, NeoForge 26.3.0.99 and a first-party Age
|
||||||
first-party Age backend; it does not need Dynamic Dimensions or Bad Packets.
|
backend; it does not require Dynamic Dimensions or Bad Packets. Both tracks include
|
||||||
It includes authored/seeded Ages, writing stations and collections, libraries,
|
authored/seeded Ages, writing stations, libraries, crystal portals, celestials,
|
||||||
crystal portals, celestials/eclipses, instability and Link Modifier controls.
|
instability and Link Modifier controls. JEI, TerraBlender/Biomes O' Plenty,
|
||||||
JEI, TerraBlender/Biomes O' Plenty, Serene Seasons and Ruins remain optional.
|
Serene Seasons and Ruins remain optional. See the [26.3 guide](ports/mc263/README.md)
|
||||||
Immersive Portals Reborn 7.0.12 adds live book previews and crystal portal views;
|
and [parity review](docs/MC263_PARITY_REVIEW.md).
|
||||||
animated fallbacks work without it. Random-page eligibility and random-Age glyph
|
|
||||||
descriptions are included. Full 1.21.1 parity and the final expanded-catalog
|
These releases add [Native biome-family Pages](docs/NATIVE_BIOME_FAMILIES.md),
|
||||||
two-client regression remain ongoing. Reborn's Static Sky rendering bug is tracked
|
[desert vegetation](docs/DESERT_VEGETATION.md) and Number-controlled
|
||||||
in [#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116).
|
[Static Sky resolution](docs/STATIC_SKY_RESOLUTION.md).
|
||||||
See the [26.3 guide](ports/mc263/README.md) and
|
On 26.3, optional Immersive Portals Reborn or Seamless Portals provides live book
|
||||||
[release notes](ports/mc263/RELEASE_NOTES_26.3.0.1.md).
|
and crystal portal views, including look-only exploration in the book panel.
|
||||||
Keep the builds and their saves separate, and back up worlds before updating.
|
Install only one fork; built-in animations work without either.
|
||||||
|
Known Reborn/Seamless crashes and travel disconnects remain tracked in
|
||||||
|
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||||
|
Use matching client/server builds, keep Minecraft tracks separate and back up worlds before updating.
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -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.
|
||||||
@@ -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).
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
# Rivencraft 1.21.1.0.4
|
||||||
|
|
||||||
|
Local test build for issue #108; pending player validation and explicit publication.
|
||||||
|
|
||||||
|
- Trees add ordinary cacti in vanilla and tagged modded deserts.
|
||||||
|
- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes.
|
||||||
|
- Repeated pages add seeded attempts; normal biome decoration remains.
|
||||||
|
- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP
|
||||||
|
Dryland/Lush Desert are included; Cold Desert is unchanged.
|
||||||
|
- Candidate biome, air, ground and bounds checks protect existing blocks.
|
||||||
|
- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior.
|
||||||
|
- Flat Ages now apply these authored vegetation pages as well.
|
||||||
|
|
||||||
|
Shared placement checks passed. See [desert vegetation rules](docs/DESERT_VEGETATION.md).
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# Rivencraft 1.21.1.0.5
|
||||||
|
|
||||||
|
Local test build for Minecraft 1.21.1; pending player validation and explicit publication.
|
||||||
|
|
||||||
|
- Number Pages immediately before Static Sky set its cells per face in base 25.
|
||||||
|
Default 48; supported range 1–128, with zero and oversized inputs clamped.
|
||||||
|
- Resolution persists across travel/save/reload and synchronizes with clients.
|
||||||
|
Matching updated server/client builds are required.
|
||||||
|
- Static animation timing and tint remain independent; other skies are unchanged.
|
||||||
|
- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated.
|
||||||
|
- Includes the previously validated desert vegetation changes from issue #108.
|
||||||
|
|
||||||
|
Focused checks passed; GPU appearance awaits player validation. See [rules and tests](docs/STATIC_SKY_RESOLUTION.md).
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# Rivencraft 1.21.1.0.6
|
||||||
|
|
||||||
|
Release for Minecraft 1.21.1 / NeoForge 21.1.264 / Java 21.
|
||||||
|
Requires Dynamic Dimensions AR Edition and Bad Packets. Use matching client/server builds.
|
||||||
|
|
||||||
|
- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes.
|
||||||
|
- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether biome authoring on Cave terrain remains supported.
|
||||||
|
- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Works on Flat terrain, including BOP Dryland and Lush Desert.
|
||||||
|
- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution saves and synchronizes with clients.
|
||||||
|
- New Pages appear in the biome generation Creative tab and optional JEI. Updated tooltips explain the new behavior.
|
||||||
|
- Saves freeze the selected biome family and IDs. Existing frozen pools and generated chunks are not rewritten.
|
||||||
|
|
||||||
|
Player in-game checks passed for both supported Minecraft versions. Focused Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Desert and Static Sky checks also passed.
|
||||||
|
|
||||||
|
Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller.
|
||||||
+3
-1
@@ -17,7 +17,7 @@ tasks.named('wrapper', Wrapper).configure {
|
|||||||
version = mod_version
|
version = mod_version
|
||||||
group = mod_group_id
|
group = mod_group_id
|
||||||
|
|
||||||
List<String> archivedGameTestSuites = ['linking', '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')
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -43,11 +43,75 @@ JARs; use new worlds and remove them regardless of pass/fail. Stop test processe
|
|||||||
If generation stalls, hand the test to the user.
|
If generation stalls, hand the test to the user.
|
||||||
|
|
||||||
Before closing a port umbrella issue, compare its acceptance criteria and comments
|
Before closing a port umbrella issue, compare its acceptance criteria and comments
|
||||||
to actual evidence. Current expanded-catalog two-client create/travel/reconnect/
|
to actual evidence. The expanded-catalog matrix and manual restart/return handoff completed in #100.
|
||||||
restart/stale-ack regression remains in #100. #103 retains dual-line release
|
See [the final parity review](MC263_PARITY_REVIEW.md) for evidence and limits.
|
||||||
automation/regression completion and #104 retains the full parity gate.
|
|
||||||
Shared issues need both versions resolved before closure.
|
Shared issues need both versions resolved before closure.
|
||||||
|
|
||||||
For each release, document tested optional versions and no-optional fallbacks,
|
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
|
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.
|
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.
|
||||||
@@ -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
@@ -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.
|
||||||
@@ -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.
|
||||||
@@ -8,6 +8,18 @@ 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
|
||||||
|
|
||||||
[26.3.0.1](../ports/mc263/RELEASE_NOTES_26.3.0.1.md) collects the player-validated
|
[26.3.0.1](../ports/mc263/RELEASE_NOTES_26.3.0.1.md) collects the player-validated
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
# Native biome families — issue #111
|
||||||
|
|
||||||
|
Release builds: **1.21.1.0.6** and **26.3.0.10**. Player in-game validation passed on both versions (2026-11-17).
|
||||||
|
|
||||||
|
## Pages and terrain
|
||||||
|
|
||||||
|
| Controller Page | Biome selection |
|
||||||
|
| --- | --- |
|
||||||
|
| Native | Existing terrain default. On new Cave Ages, non-Nether cave biomes only. |
|
||||||
|
| Native Caves | All recognized non-Nether caves, using seeded regional placement. |
|
||||||
|
| Native Nether | All recognized Nether biomes, using seeded regional placement. |
|
||||||
|
| Native End | All recognized End biomes, using seeded regional placement. |
|
||||||
|
|
||||||
|
The three explicit family controllers work with Standard, Amplified, Island,
|
||||||
|
Cave, Flat and Void terrain. The **Terrain Page still controls geometry**.
|
||||||
|
Void stays empty; its biomes can affect weather and seasons. These controllers
|
||||||
|
do not select a sky style, dimension type or season.
|
||||||
|
|
||||||
|
The player chose **seeded regional layout including modded biomes** for Native
|
||||||
|
Nether/End, rather than vanilla climate or End-island placement. The family
|
||||||
|
controllers use the established Native Cave/Tiny regional scale (16-block
|
||||||
|
base cells), across the whole frozen family pool. A single available biome
|
||||||
|
uses a FixedBiomeSource.
|
||||||
|
|
||||||
|
Native controllers select their own pool. Individual biome Pages before one
|
||||||
|
retain the existing conflict/recovery rule: the manual biome entries are
|
||||||
|
discarded and instability applies. To choose/weight individual Nether biomes
|
||||||
|
on Cave terrain, use Single/Tiled/region controllers as before.
|
||||||
|
|
||||||
|
## Classification
|
||||||
|
|
||||||
|
- Caves: `rivencraft:cave_biomes`, including optional `c:is_cave`, plus
|
||||||
|
recognized vanilla cave keys. 26.3 retains its new **Sulfur Caves** biome.
|
||||||
|
- Nether: `minecraft:is_nether` **or** membership in a TerraBlender Nether
|
||||||
|
region. No mod-specific name list or namespace heuristic is used.
|
||||||
|
- End: `minecraft:is_end` and known vanilla End members. TerraBlender exposes
|
||||||
|
Overworld and Nether regions, not an End region in either supported API.
|
||||||
|
- Nether classification wins over Cave tagging for Native Caves, including
|
||||||
|
a biome that belongs to a Nether region but lacks `is_nether`.
|
||||||
|
- TerraBlender's internal deferred placeholder is never a native-family biome.
|
||||||
|
|
||||||
|
Family pools are sorted and deduplicated. Vanilla family members provide safe
|
||||||
|
fallbacks when broad tags are empty; Cave fallbacks are still checked against
|
||||||
|
Nether classification. A one-biome pool remains valid. If no cave family member
|
||||||
|
can be used at all, a registered non-Nether biome is the last-resort safety
|
||||||
|
fallback; an entirely unusable registry reports a binding error.
|
||||||
|
|
||||||
|
The broader Cave-compatible authoring pool is preserved. Explicit Nether
|
||||||
|
biome Pages on Cave terrain remain legal and retain existing materials.
|
||||||
|
Other terrain eligibility and non-Native distributions are not filtered by
|
||||||
|
this new default-pool rule.
|
||||||
|
|
||||||
|
## Random Ages and persistence
|
||||||
|
|
||||||
|
Ordinary random-Age controller ranks remain unchanged. When random or
|
||||||
|
seed-completed writing resolves to Cave terrain + Native, its new pool excludes
|
||||||
|
Nether biomes. The new family Pages are explicit authoring choices; they are
|
||||||
|
not added as extra rank tickets to the random controller deck.
|
||||||
|
|
||||||
|
The selected family is saved separately from the existing NATIVE distribution
|
||||||
|
enum, so seeded distribution ordinals/ranks do not change.
|
||||||
|
|
||||||
|
- Authored 1.21.1 plans save optional `NativeKind` with their frozen biome IDs.
|
||||||
|
- New random Native Cave Ages in 1.21.1 generation version **18** also save
|
||||||
|
`RandomBiomes` in the Age definition. Spawn updates and reseeding retain it.
|
||||||
|
- 26.3's existing frozen biome plan saves optional `native_kind`. Random Native
|
||||||
|
Cave Ages now explicitly freeze the CAVES family.
|
||||||
|
- Missing family fields on old saves mean TERRAIN and **do not re-filter the
|
||||||
|
old list**. Existing frozen Cave pools containing Nether biomes are preserved.
|
||||||
|
- Unplanned generation-16/17 Native Cave Ages retain their prior broad pool
|
||||||
|
algorithm; older Ages retain their existing legacy generator. They are not
|
||||||
|
silently migrated to the new family default.
|
||||||
|
- Regions use the Age seed; reseeding can change spatial placement in future
|
||||||
|
chunks while retaining the selected IDs. Existing chunks are not rewritten.
|
||||||
|
|
||||||
|
On 26.3, authored noise-terrain generation can now construct a vanilla noise
|
||||||
|
baseline when the primary Overworld is Flat/custom rather than a Noise generator.
|
||||||
|
This allows the independent Native-family/terrain pairing in that setup instead
|
||||||
|
of failing with “Overworld generator cannot accept authored noise settings.”
|
||||||
|
The existing path for an ordinary noise Overworld is unchanged. Issue #115's
|
||||||
|
separate material-abundance baseline work is not completed by this fix.
|
||||||
|
|
||||||
|
## Creative, JEI and loot policy
|
||||||
|
|
||||||
|
All three new JSON-backed controllers enter the existing **biome generation**
|
||||||
|
Creative category and optional JEI page feed. Glyphs use the existing component
|
||||||
|
renderer and poems; no new generated texture or recipe is needed.
|
||||||
|
Native/Cave tooltips explain the default-pool rule.
|
||||||
|
|
||||||
|
Page allow/block lists categorize the new IDs as biome controllers, separately
|
||||||
|
from individual biome IDs. Manual authoring is still unaffected by those lists.
|
||||||
|
Normal library eligibility can expose the new Pages; Age-only loot uses the
|
||||||
|
Age's own written/result Pages.
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
Run one target at a time:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
python3 scripts/regression_native111.py mc1211
|
||||||
|
python3 scripts/regression_native111.py mc263
|
||||||
|
python3 scripts/regression_native111.py mc1211 --biome-mods
|
||||||
|
python3 scripts/regression_native111.py mc263 --biome-mods
|
||||||
|
```
|
||||||
|
|
||||||
|
The optional-mod checks use the installed Dev instance's BOP/TerraBlender/
|
||||||
|
GlitchCore JARs. Every run uses the host-wide server lock, a new temporary
|
||||||
|
world, isolated fixture output and a 60-second stall handoff. Worlds and fixture
|
||||||
|
outputs are deleted on pass or fail; logs remain in
|
||||||
|
`build/verification/native111/`. The fixture code is not shipped in the mod
|
||||||
|
or added to the default GameTest deck.
|
||||||
|
|
||||||
|
Results: **91 checks per version without biome mods; 94 per version with
|
||||||
|
BOP/TerraBlender**. Coverage includes:
|
||||||
|
|
||||||
|
- All three explicit family controllers on all six terrains.
|
||||||
|
- Explicit Native, seed-completed Native and random Native Cave selection.
|
||||||
|
- Overlapping Cave/Nether tags, region-only Nether membership, empty-tag
|
||||||
|
fallback, a valid single-cave saved pool and optional-mod absence.
|
||||||
|
- Explicit Crimson Forest + Cave + Single authoring.
|
||||||
|
- Frozen plan/codec and root random-Age registry save/load behavior.
|
||||||
|
- Preservation of an older mixed Cave/Nether snapshot without a family field.
|
||||||
|
- Controller-policy categories, last-controller recovery, and new Creative/JEI index entries.
|
||||||
|
- 26.3 runtime source overrides on Standard, Void and Cave, including a Flat
|
||||||
|
primary world. Actual world appearance remains player validation.
|
||||||
|
|
||||||
|
### Player checks — both versions
|
||||||
|
|
||||||
|
1. Create **Cave + Native** Ages and explore: no Nether biomes should be selected.
|
||||||
|
Revisit after restart; the chosen cave pool should remain stable.
|
||||||
|
2. Try Native Caves, Native Nether and Native End with Standard or Flat terrain.
|
||||||
|
Confirm their biome IDs and normal travel, including optional BOP biome IDs.
|
||||||
|
3. Try those family Pages on Void terrain: no terrain should be added solely
|
||||||
|
by the controller. Biome-based weather/season behavior can still apply.
|
||||||
|
4. Create **Cave + Crimson Forest + Single** to confirm explicit Nether authoring
|
||||||
|
still works. Native End on Cave should also bind through the explicit family.
|
||||||
|
5. Verify all three Pages appear under biome generation in Creative and JEI.
|
||||||
|
6. Reopen an older Native Cave Age if available. Its saved mixed pool is kept;
|
||||||
|
create a new Age to test the new default rather than expecting migration.
|
||||||
@@ -1,10 +1,7 @@
|
|||||||
# Publishing Rivencraft with the Gitea, Modrinth, and CurseForge APIs
|
# 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
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
# Optional Seamless Portals integration — issue #117
|
||||||
|
|
||||||
|
Local candidate **26.3.0.9**, Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||||
|
Pending real-client validation; not committed or published. Minecraft 1.21.1
|
||||||
|
is unchanged by this issue.
|
||||||
|
|
||||||
|
## Supported engines and API boundary
|
||||||
|
|
||||||
|
Install **one** portal fork per instance:
|
||||||
|
|
||||||
|
- Seamless Portals **1.0.0**, installed file `seamlessportals-neoforge-1.0.0.jar`.
|
||||||
|
- Immersive Portals Reborn **7.0.12**, retaining its previously implemented path.
|
||||||
|
- Neither: Rivencraft's animated panels/surfaces and ordinary travel remain.
|
||||||
|
|
||||||
|
The actual installed Seamless JAR was inspected and compiled against, not
|
||||||
|
assumed compatible from its name. Used public GUI rendering, WorldRenderInfo
|
||||||
|
builder, chunk-loader and PortalAPI signatures match Reborn. ClientWorldLoader
|
||||||
|
and Portal have additional fork-specific members; Rivencraft does not use those
|
||||||
|
differences for live views. The native dimension adapter still uses each fork's
|
||||||
|
own `DimIdSyncPacket.createFromServer` factory and wire format.
|
||||||
|
|
||||||
|
The existing Reborn implementation has been renamed into shared
|
||||||
|
`ImmersiveBookPreviews`, `ImmersivePreviewChunks`, `ImmersiveLiveBookPanel`,
|
||||||
|
`ImmersiveCrystalPortals` and `ImmersiveCrystalView` classes. No second copy
|
||||||
|
of the rendering, destination, chunk-stream or mesh algorithms was introduced.
|
||||||
|
Optional API references remain behind availability guards; neither fork is
|
||||||
|
bundled or required.
|
||||||
|
|
||||||
|
The Reborn acknowledgement workaround is still **Reborn-only**. This change
|
||||||
|
does not resolve or establish a root cause for the Reborn crashes in
|
||||||
|
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
In `config/rivencraft-local.toml`:
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[book_previews]
|
||||||
|
seamless_live_views = true
|
||||||
|
seamless_crystal_live_views = true
|
||||||
|
reborn_live_views = true
|
||||||
|
reborn_crystal_live_views = true
|
||||||
|
```
|
||||||
|
|
||||||
|
The active fork uses its own switches. The existing Reborn preferences keep
|
||||||
|
their meanings; Seamless defaults to enabled. Book views are a local client
|
||||||
|
choice. Crystal views are server-controlled. Disable the relevant switch for
|
||||||
|
animated fallback; portal/book travel remains Rivencraft's responsibility.
|
||||||
|
|
||||||
|
## Books
|
||||||
|
|
||||||
|
Both Linking and Descriptive Books request a rotating live destination panel.
|
||||||
|
Stand books get the panel without exploration. The handheld eye enters
|
||||||
|
look-only exploration inside the book window; movement is disabled, and
|
||||||
|
right-click returns to ordinary book controls. The camera starts at the linked
|
||||||
|
arrival eye position. Missing/unready destination chunks retain the animation.
|
||||||
|
|
||||||
|
Each player has one validated preview stream, tied to source world, held or
|
||||||
|
stand book and session UUID. Requests are rate limited. A 30-second lease is
|
||||||
|
renewed by the open book and released on close, logout, dimension changes,
|
||||||
|
invalid source book, expiry and shutdown. Late responses cannot overwrite a
|
||||||
|
newer book session.
|
||||||
|
|
||||||
|
Only one GUI render target task is queued at once. The target stays alive
|
||||||
|
across deferred GUI frames rather than being destroyed while still referenced.
|
||||||
|
The shared engine hook clears the remote target before rendering and restores
|
||||||
|
the player's local camera afterward. Remote book-world sounds are filtered;
|
||||||
|
source rain/audio and camera restoration remain explicit player checks.
|
||||||
|
|
||||||
|
## Crystal portals
|
||||||
|
|
||||||
|
Native portals are render-only: Rivencraft portal cells retain travel,
|
||||||
|
cooldowns, link properties and destination safety rules. Connected cells are
|
||||||
|
grouped into one coplanar masked mesh per side of an opening, not repeated
|
||||||
|
per-block views. The linked standing eye position maps through the native
|
||||||
|
transform onto the actual destination eye position; the frame sits in front
|
||||||
|
of the live view.
|
||||||
|
|
||||||
|
A complete native surface disables the fallback texture. Missing/disabled
|
||||||
|
native views retain it. Receptacle maintenance restores views after reload;
|
||||||
|
book removal/frame shutdown removes native entities. Existing ownership tags
|
||||||
|
are preserved so maintenance can find saved views rather than duplicate them.
|
||||||
|
|
||||||
|
## Automated and player validation
|
||||||
|
|
||||||
|
The isolated `scripts/regression_portal117.py` probe accepts `none`,
|
||||||
|
`seamless --jar /path/to/seamless.jar`, or `reborn`. Run each separately;
|
||||||
|
the host-wide server lock prevents overlap. Every run uses a new temporary
|
||||||
|
world, removes it and fixture outputs regardless of result, and retains a log
|
||||||
|
under `build/verification/portal117/`. A 60-second stall is stopped and handed
|
||||||
|
to the player without retry.
|
||||||
|
|
||||||
|
The fixture explicitly warms a forced test chunk before querying native
|
||||||
|
entities. An unticked startup chunk does not expose its entities through the
|
||||||
|
normal spatial query. Portal widths/heights use the engine's W/H axes, which
|
||||||
|
can swap relative to world X/Y; assertions check world-space spans and the
|
||||||
|
actual eye transform.
|
||||||
|
|
||||||
|
Final sequential server results: **24 checks passed with Seamless, 24 with
|
||||||
|
Reborn, and 8 with neither**. Earlier fixture assertions were corrected for
|
||||||
|
entity-section visibility and native axis ordering; no stalled run was retried.
|
||||||
|
|
||||||
|
Server checks cover dynamic Age registration/catalog synchronization, six-cell
|
||||||
|
frame formation, one mesh per side, correct physical spans, exact eye mapping,
|
||||||
|
non-teleporting/non-interactive native surfaces, refresh reuse, config fallback,
|
||||||
|
reactivation and cleanup. They do **not** verify GPU output, connected preview
|
||||||
|
leases, multiplayer packet delivery, or real-client restart behavior.
|
||||||
|
|
||||||
|
### Required player matrix
|
||||||
|
|
||||||
|
Use Seamless alone with Rivencraft 26.3.0.9 on both ends:
|
||||||
|
|
||||||
|
1. Bind a new Descriptive Book, open/close it repeatedly and link through it.
|
||||||
|
Compare the live view with the real destination.
|
||||||
|
2. Test a Linking Book and a stand book. Confirm the panel stays inside the
|
||||||
|
book and stands have no eye exploration.
|
||||||
|
3. Enter handheld exploration, look around, right-click out, re-enter, close
|
||||||
|
and reopen. Confirm no movement or full-screen view, and local rain/audio
|
||||||
|
remain correct.
|
||||||
|
4. Form a multi-block crystal opening. Check one continuous view, frame
|
||||||
|
occlusion, no fallback overlay, matching arrival position/facing, and travel.
|
||||||
|
5. Remove/reinsert the book and break/rebuild the frame; no orphan views.
|
||||||
|
6. Reconnect and fully restart. Check saved books, previews and portal
|
||||||
|
reactivation, including initially unloaded destination chunks.
|
||||||
|
7. Explore across chunk boundaries for a sustained period. Do not assume
|
||||||
|
Seamless is free of the Reborn renderer problem without testing.
|
||||||
|
8. On a dedicated server, check two players using different books/portals,
|
||||||
|
closing/logging out independently, and creating a new Age after joining.
|
||||||
|
9. Disable each Seamless switch and verify its animated fallback and normal
|
||||||
|
travel. No portal mod and Reborn are separate regression configurations.
|
||||||
|
|
||||||
|
Inspected Seamless artifact SHA-256: `5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0`.
|
||||||
|
|
||||||
|
## Release validation (2026-11-17)
|
||||||
|
|
||||||
|
Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them.
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
# Static Sky resolution — issue #109
|
||||||
|
|
||||||
|
Local test builds: **Minecraft 1.21.1 / 1.21.1.0.5** and **Minecraft 26.3 /
|
||||||
|
26.3.0.8**. Pending player validation; not committed or published.
|
||||||
|
|
||||||
|
## Authoring
|
||||||
|
|
||||||
|
Place one or more Number Pages **immediately before Static Sky**. Digits are
|
||||||
|
0–24 in base 25, as with Flooded. No Number Pages means the existing **48 × 48
|
||||||
|
cells on each of six faces**.
|
||||||
|
|
||||||
|
| Written sequence | Resolution on each face |
|
||||||
|
| --- | --- |
|
||||||
|
| Static Sky | 48 × 48 |
|
||||||
|
| Number 0 → Static Sky | 1 × 1 (minimum) |
|
||||||
|
| Number 8 → Static Sky | 8 × 8 |
|
||||||
|
| Number 24 → Static Sky | 24 × 24 |
|
||||||
|
| Number 1 → Number 23 → Static Sky | 48 × 48 |
|
||||||
|
| Number 5 → Number 3 → Static Sky | 128 × 128 (maximum) |
|
||||||
|
| Number 24 → Number 24 → Static Sky | 128 × 128 (624 clamps) |
|
||||||
|
|
||||||
|
Any intervening non-number Page breaks the digit run. A Number followed by a
|
||||||
|
color still modifies that color, not the later sky. Other Sky styles do not
|
||||||
|
consume resolution numbers. Duplicate Sky controllers retain the existing
|
||||||
|
last-choice recovery and instability rules; the final unnumbered Static Sky
|
||||||
|
returns to 48. Dangling/misplaced numbers retain their usual diagnostics.
|
||||||
|
|
||||||
|
Higher values make smaller cells. Resolution does not change the animation
|
||||||
|
cadence, colors, celestial geometry, terrain or lighting. Random/unmodified
|
||||||
|
Static Ages retain 48; no new Page or recipe is added. Creative and JEI use
|
||||||
|
the existing Static Sky and Number items, with updated tooltips.
|
||||||
|
|
||||||
|
## Persistence and synchronization
|
||||||
|
|
||||||
|
- **1.21.1:** derive resolution from the persisted ordered semantic writing,
|
||||||
|
include it in AgeSkyProfile and its server-to-client sky payload.
|
||||||
|
- **26.3:** freeze resolution in the existing presentation settings record
|
||||||
|
(PortAgeColors), save optional `static_resolution` in the Age index and
|
||||||
|
synchronize it with the full Age catalog. Old records without the field
|
||||||
|
default to 48.
|
||||||
|
- Require matching updated client/server builds: sky payload protocol is 19
|
||||||
|
on 1.21.1 and Age catalog protocol is 12 on 26.3.
|
||||||
|
- No existing chunks or writing are rewritten. Existing unnumbered Static
|
||||||
|
Ages retain their old appearance. Save/revisit/reconnect/restart preserve
|
||||||
|
newly authored settings.
|
||||||
|
|
||||||
|
## Render bounds and lifecycle
|
||||||
|
|
||||||
|
Shared bounds are **1–128** cells per face, including the constructors and
|
||||||
|
client render entry points. Long digit runs saturate safely before clamping.
|
||||||
|
|
||||||
|
The 1.21.1 procedural renderer draws at most 98,304 quads (393,216 vertices),
|
||||||
|
roughly 6 MiB of position/color vertex data per draw. The bound limits its
|
||||||
|
existing per-cell work; the normal 48 setting is unchanged.
|
||||||
|
|
||||||
|
The 26.3 renderer keeps one 24-vertex cube. Its current noise atlas is at most
|
||||||
|
768 × 128 RGBA pixels (384 KiB of image data). It creates a replacement only
|
||||||
|
when the extracted resolution changes, closes the previous texture, invalidates
|
||||||
|
the frame/tint cache, and reuses the cube. World metadata is read during
|
||||||
|
extraction, never during drawing. Extracted state resets to 48; renderer close
|
||||||
|
releases both GPU resources. No growing per-Age texture cache is introduced.
|
||||||
|
|
||||||
|
## Automated checks
|
||||||
|
|
||||||
|
Run separately, sequentially:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
python3 scripts/regression_static109.py mc1211
|
||||||
|
python3 scripts/regression_static109.py mc263
|
||||||
|
```
|
||||||
|
|
||||||
|
These use the server lock, isolated startup fixtures and new temporary worlds,
|
||||||
|
with a 60-second stall handoff. They delete worlds and fixture outputs on
|
||||||
|
success or failure and retain logs in `build/verification/static109/`.
|
||||||
|
The probes do not enter the production JAR or default GameTest suite.
|
||||||
|
|
||||||
|
Results: 34 checks passed on 1.21.1 and 42 on 26.3 for unmodified/default,
|
||||||
|
zero, single and multi-digit writing, bounds, ordering, saved plan/codec and
|
||||||
|
full packet/catalog round trips, independent color, old-save defaults,
|
||||||
|
non-Static behavior and unchanged Flooded digit grammar. Actual GPU appearance
|
||||||
|
and preview interactions remain player checks.
|
||||||
|
|
||||||
|
## Player checks — both versions
|
||||||
|
|
||||||
|
1. Bind fresh Ages with Static Sky alone, Number 8 + Static Sky, Number 24 +
|
||||||
|
Static Sky, and Number 5 + Number 3 + Static Sky. Prefer the same remaining
|
||||||
|
Pages and an explicit celestial choice to make comparison straightforward.
|
||||||
|
2. Look up, down and around: all six faces should show the selected cell size
|
||||||
|
and keep animating. The plain book retains the previous fine static.
|
||||||
|
3. Check Number 0 gives the coarse minimum. Compare Number 1 + Number 23 to the
|
||||||
|
unnumbered default. Oversized values clamp instead of crashing.
|
||||||
|
4. Add numbered color Pages before the resolution digits; verify the tint and
|
||||||
|
resolution work independently.
|
||||||
|
5. Travel between different-resolution Ages, the Overworld and a non-Static
|
||||||
|
Age. Check book/portal destination views with the installed optional renderer
|
||||||
|
for leaked settings.
|
||||||
|
6. Revisit, reconnect and restart; the selected resolution must persist.
|
||||||
|
Update both ends if using a dedicated server.
|
||||||
|
|
||||||
|
## Release validation (2026-11-17)
|
||||||
|
|
||||||
|
Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them.
|
||||||
@@ -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
@@ -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
|
||||||
# Existing 1.21.1 release number. Adopt the Minecraft-prefixed policy in README.md on its next code release.
|
# 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
|
||||||
|
|||||||
+28
-15
@@ -1,26 +1,39 @@
|
|||||||
# Minecraft 26.3 beta port workspace
|
# Minecraft 26.3
|
||||||
|
|
||||||
The current **Minecraft 26.3 release is 26.3.0.1**, for NeoForge 26.3.0.99 and
|
The current **Minecraft 26.3 release is 26.3.0.10**, for NeoForge 26.3.0.99 and
|
||||||
Java 25. It uses Rivencraft's first-party Age backend, with no Dynamic Dimensions
|
Java 25. It uses Rivencraft's first-party Age backend, with no Dynamic Dimensions
|
||||||
or Bad Packets dependency. The writing loop, authored/seeded Ages, generation
|
or Bad Packets dependency. The writing loop, authored/seeded Ages, generation
|
||||||
features, weather/skies/celestials, libraries, crystal portals, live instability,
|
features, weather/skies/celestials, libraries, crystal portals, live instability,
|
||||||
and Link Modifier controls are ported. JEI, TerraBlender/Biomes O' Plenty, Serene
|
and Link Modifier controls are ported. JEI, TerraBlender/Biomes O' Plenty, Serene
|
||||||
Seasons/GlitchCore and Ruins are optional.
|
Seasons/GlitchCore and Ruins are optional.
|
||||||
|
|
||||||
Immersive Portals Reborn 7.0.12 optionally supplies rotating live book previews
|
Immersive Portals Reborn 7.0.12 or Seamless Portals 1.0.0 optionally supplies
|
||||||
and continuous crystal portal views. Built-in animations and normal travel remain
|
rotating live book previews, look-only exploration and continuous crystal portal
|
||||||
available without it. Random-page eligibility and glyph descriptions are included.
|
views. Install only one fork per instance. Built-in animations and normal travel
|
||||||
Use one portal fork per instance. The server controls crystal live views through
|
remain available without either. Independent settings under book_previews control
|
||||||
`book_previews.reborn_crystal_live_views`; clients can disable live book views
|
each fork's live book and crystal views.
|
||||||
with `book_previews.reborn_live_views` in `rivencraft-local.toml`.
|
|
||||||
Reborn's Static Sky rendering issue remains tracked in
|
|
||||||
[#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116).
|
|
||||||
|
|
||||||
This regular release is player-validated but does not claim complete 1.21.1 parity.
|
**Known portal-mod failures:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118)
|
||||||
Issues #100, #103 and #104 retain the final multiplayer/parity/release-workflow
|
tracks Reborn section-rebuild crashes and Reborn/Seamless acknowledgement disconnects
|
||||||
checks. Preview exploration controls and Create/Ponder scenes remain unported.
|
during travel. Rejoining recovered the observed Seamless Age-loading disconnect.
|
||||||
Use matching client/server builds, keep saves separate from 1.21.1 and back up
|
This release does not fix those failures. See [integration details](../../docs/SEAMLESS_PORTALS.md).
|
||||||
before updating. See [release notes](RELEASE_NOTES_26.3.0.1.md).
|
|
||||||
|
Native Caves/Nether/End Pages, desert vegetation and Number-controlled Static Sky
|
||||||
|
resolution passed player checks on both supported versions. Native controls select
|
||||||
|
their own seeded biome pool independently of terrain. Write Link Panel → Terrain
|
||||||
|
→ one Native choice. See [family rules](../../docs/NATIVE_BIOME_FAMILIES.md).
|
||||||
|
|
||||||
|
The port feature and acceptance review is recorded in
|
||||||
|
[the parity review](../../docs/MC263_PARITY_REVIEW.md). Book exploration matches
|
||||||
|
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.
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Rivencraft 26.3.0.10
|
||||||
|
|
||||||
|
Release for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||||
|
Uses Rivencraft's first-party Age backend. Use matching client/server builds.
|
||||||
|
|
||||||
|
- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes and 26.3 Sulfur Caves.
|
||||||
|
- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether authoring remains supported.
|
||||||
|
- Authored noise terrain can use a vanilla noise baseline when the primary Overworld uses Flat/custom generation.
|
||||||
|
- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Fixes Flat grass-surface placement in BOP Dryland.
|
||||||
|
- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution persists and synchronizes; the renderer releases replaced textures.
|
||||||
|
- Enables optional Seamless Portals 1.0.0 live book previews, look-only book exploration and continuous crystal-portal views. Install only one portal fork.
|
||||||
|
- Adds independent seamless_live_views and seamless_crystal_live_views configuration options. Animated previews and ordinary travel remain available without an optional renderer.
|
||||||
|
- New Pages enter the biome generation Creative/JEI feeds. Existing frozen pools and generated chunks are not rewritten.
|
||||||
|
|
||||||
|
Player in-game checks passed. Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Optional-portal server probes passed sequentially: Seamless 24, Reborn 24, neither 8.
|
||||||
|
|
||||||
|
Known issue: [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) tracks Reborn renderer crashes and Reborn/Seamless acknowledgement disconnects during travel. A Seamless disconnect occurred loading “caves on top”; rejoining loaded the Age successfully. This release does not fix that failure. Disable optional live views or remove the optional renderer if needed.
|
||||||
|
|
||||||
|
Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller.
|
||||||
@@ -0,0 +1,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.
|
||||||
@@ -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.
|
||||||
@@ -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).
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# Rivencraft 26.3.0.6
|
||||||
|
|
||||||
|
Local test build for issue #108; pending player validation and explicit publication.
|
||||||
|
|
||||||
|
- Trees add ordinary cacti in vanilla and tagged modded deserts.
|
||||||
|
- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes.
|
||||||
|
- Repeated pages add seeded attempts; normal biome decoration remains.
|
||||||
|
- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP
|
||||||
|
Dryland/Lush Desert are included; Cold Desert is unchanged.
|
||||||
|
- Candidate biome, air, ground and bounds checks protect existing blocks.
|
||||||
|
- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior.
|
||||||
|
|
||||||
|
Shared placement checks passed. See [desert vegetation rules](../../docs/DESERT_VEGETATION.md).
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
# Rivencraft 26.3.0.7
|
||||||
|
|
||||||
|
Local test build for issue #108; pending player retest and explicit publication.
|
||||||
|
|
||||||
|
- Includes the desert Trees, Huge Trees and Flowers page behavior from 26.3.0.6.
|
||||||
|
- Fixes cactus placement on Flat grass surfaces in BOP Dryland and other tagged
|
||||||
|
deserts: Minecraft 26.3 splits dirt and grass-like soils into separate tags.
|
||||||
|
- Keeps existing plants/blocks and normal biome decoration; old generated
|
||||||
|
chunks are not rewritten.
|
||||||
|
- The isolated BOP/TerraBlender server probe reproduced the failure, then
|
||||||
|
confirmed cactus and dead-bush placement with the corrected ground rule.
|
||||||
|
- Minecraft 1.21.1.0.4 passed player validation and is unchanged by this fix.
|
||||||
|
|
||||||
|
See [desert vegetation rules](../../docs/DESERT_VEGETATION.md).
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# Rivencraft 26.3.0.8
|
||||||
|
|
||||||
|
Local test build for Minecraft 26.3; pending player validation and explicit publication.
|
||||||
|
|
||||||
|
- Number Pages immediately before Static Sky set its cells per face in base 25.
|
||||||
|
Default 48; supported range 1–128, with zero and oversized inputs clamped.
|
||||||
|
- Resolution persists across travel/save/reload and synchronizes with clients.
|
||||||
|
Matching updated server/client builds are required.
|
||||||
|
- Static animation timing and tint remain independent; other skies are unchanged.
|
||||||
|
- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated.
|
||||||
|
- Includes the previously validated desert vegetation changes from issue #108.
|
||||||
|
|
||||||
|
The 26.3 renderer reuses its cube, resizes only the current noise texture,
|
||||||
|
and releases the previous texture on resolution changes.
|
||||||
|
|
||||||
|
Focused checks passed; GPU appearance awaits player validation. See [rules and tests](../../docs/STATIC_SKY_RESOLUTION.md).
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# Rivencraft 26.3.0.9
|
||||||
|
|
||||||
|
Local candidate for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25.
|
||||||
|
Pending player validation and explicit publication.
|
||||||
|
|
||||||
|
- Enables optional Seamless Portals 1.0.0 live rotating Linking/Descriptive Book
|
||||||
|
panels and handheld look-only exploration, reusing the established renderer.
|
||||||
|
- Enables continuous masked crystal portal views through the same adapter,
|
||||||
|
with Rivencraft retaining teleportation and link-property handling.
|
||||||
|
- Adds independent `seamless_live_views` and `seamless_crystal_live_views`
|
||||||
|
options under `book_previews`. Existing Reborn options remain unchanged.
|
||||||
|
- Shares preview leases, camera/audio restoration and portal maintenance across
|
||||||
|
the two optional forks. Install only one fork per instance.
|
||||||
|
- Retains animations/ordinary travel without a renderer or when disabled.
|
||||||
|
- Keeps the Reborn acknowledgement workaround Reborn-only. Known Reborn
|
||||||
|
renderer crashes in issue #118 are not fixed by this release.
|
||||||
|
- Includes the validated desert vegetation and Static Sky resolution changes
|
||||||
|
from issues #108 and #109.
|
||||||
|
|
||||||
|
Sequential focused server checks pass: Seamless 24, Reborn 24, no portal mod 8.
|
||||||
|
Actual client rendering and multiplayer/restart behavior await player validation.
|
||||||
|
|
||||||
|
See [Seamless integration and manual checks](../../docs/SEAMLESS_PORTALS.md).
|
||||||
@@ -53,6 +53,8 @@ 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
|
||||||
|
|
||||||
@@ -247,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'
|
||||||
|
|||||||
@@ -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=26.3.0.1
|
mod_version=26.3.0.10
|
||||||
|
|
||||||
jei_version=31.17.0.109
|
jei_version=31.17.0.109
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,8 @@
|
|||||||
"symbol.rivencraft.sky.overworld.description": "Use the native Overworld sky. Terrain and lighting remain independently authored.",
|
"symbol.rivencraft.sky.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.",
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ public final class PortConfig {
|
|||||||
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_BLOCKLIST;
|
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_BLOCKLIST;
|
||||||
public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS;
|
public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS;
|
||||||
public static final ModConfigSpec.BooleanValue CRYSTAL_LIVE_VIEWS;
|
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;
|
||||||
@@ -28,6 +30,14 @@ public final class PortConfig {
|
|||||||
CRYSTAL_LIVE_VIEWS = builder.comment("Server option: create native live crystal portal surfaces when Reborn is installed.",
|
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.")
|
"Disabling keeps crystal portal travel with the animated surface.")
|
||||||
.define("reborn_crystal_live_views", true);
|
.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.pop();
|
||||||
builder.push("random_pages");
|
builder.push("random_pages");
|
||||||
RANDOM_PAGE_ALLOWLIST = builder.comment(
|
RANDOM_PAGE_ALLOWLIST = builder.comment(
|
||||||
|
|||||||
@@ -249,7 +249,7 @@ 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.RebornBookPreviews.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);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public final class AgeCatalogSync {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
||||||
var registrar = event.registrar("11");
|
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) -> {
|
||||||
|
|||||||
@@ -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. */
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -76,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,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)
|
||||||
|
|||||||
@@ -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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||||
|
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
|
||||||
|
/** Family pools are resolved only when binding new writing, never re-filtered on load. */
|
||||||
|
public final class PortNativeBiomePools {
|
||||||
|
private PortNativeBiomePools() {}
|
||||||
|
public static final TagKey<Biome> CAVES = TagKey.create(Registries.BIOME,
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "cave_biomes"));
|
||||||
|
|
||||||
|
public static List<Identifier> pool(HolderLookup.Provider registries, NativeBiomeKind kind) {
|
||||||
|
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
||||||
|
var nether = java.util.Set.copyOf(TerraBlenderBiomes.nether(registries));
|
||||||
|
java.util.function.Predicate<Holder.Reference<Biome>> isNether =
|
||||||
|
biome -> biome.is(BiomeTags.IS_NETHER) || nether.contains(biome.key().identifier());
|
||||||
|
var selected = biomes.listElements()
|
||||||
|
.filter(biome -> !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||||
|
.filter(biome -> switch (kind) {
|
||||||
|
case CAVES -> biome.is(CAVES) && !isNether.test(biome);
|
||||||
|
case NETHER -> isNether.test(biome);
|
||||||
|
case END -> biome.is(BiomeTags.IS_END);
|
||||||
|
case TERRAIN -> throw new IllegalArgumentException("Terrain Native uses its own preset");
|
||||||
|
}).map(biome -> biome.key().identifier()).toList();
|
||||||
|
// Built-in family members remain recognizable if a data pack replaces the broad tags.
|
||||||
|
List<String> vanilla = switch (kind) {
|
||||||
|
case CAVES -> List.of("lush_caves", "dripstone_caves", "deep_dark", "sulfur_caves");
|
||||||
|
case NETHER -> List.of("nether_wastes", "soul_sand_valley", "crimson_forest", "warped_forest", "basalt_deltas");
|
||||||
|
case END -> List.of("the_end", "end_highlands", "end_midlands", "small_end_islands", "end_barrens");
|
||||||
|
default -> List.of();
|
||||||
|
};
|
||||||
|
var fallback = vanilla.stream().map(Identifier::withDefaultNamespace)
|
||||||
|
.filter(id -> biomes.get(ResourceKey.create(Registries.BIOME, id))
|
||||||
|
.filter(biome -> kind != NativeBiomeKind.CAVES || !isNether.test(biome)).isPresent());
|
||||||
|
var result = Stream.concat(selected.stream(), fallback).distinct().sorted().toList();
|
||||||
|
if (!result.isEmpty()) return result; // A one-biome family becomes a safe FixedBiomeSource.
|
||||||
|
var safe = kind == NativeBiomeKind.CAVES ? biomes.listElements().filter(biome -> !isNether.test(biome)
|
||||||
|
&& !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||||
|
.map(biome -> biome.key().identifier()).sorted().findFirst()
|
||||||
|
: java.util.Optional.<Identifier>empty();
|
||||||
|
return safe.map(List::of).orElseThrow(() -> new IllegalArgumentException("No usable " + kind + " biomes"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,7 +45,11 @@ public final class PortRandomAgeSelection {
|
|||||||
}
|
}
|
||||||
if (distribution == PortBiomePlan.Distribution.NATIVE)
|
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) {
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public record PortRandomPagePolicy(Set<Identifier> allowlist, Set<Identifier> bl
|
|||||||
|
|
||||||
private static String category(Identifier id) {
|
private static String category(Identifier id) {
|
||||||
String path = id.getPath();
|
String path = id.getPath();
|
||||||
if (path.startsWith("biome/") && java.util.Set.of("native", "single", "tiled", "grid",
|
if (path.startsWith("biome/") && java.util.Set.of("native", "native_caves", "native_nether", "native_end", "single", "tiled", "grid",
|
||||||
"tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length())))
|
"tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length())))
|
||||||
return "biome_distribution";
|
return "biome_distribution";
|
||||||
return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/'));
|
return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/'));
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
public final class PortStaticSkyResolution {
|
||||||
|
public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "sky/static");
|
||||||
|
private PortStaticSkyResolution() {}
|
||||||
|
|
||||||
|
public static int compile(List<Identifier> pages) {
|
||||||
|
return StaticSkyResolution.requested(pages.stream().map(page -> {
|
||||||
|
int number = PortAgeColors.number(page);
|
||||||
|
if (number >= 0) return number;
|
||||||
|
if (page.equals(PAGE)) return StaticSkyResolution.STATIC;
|
||||||
|
return PortSkyStyle.forPage(page) != null
|
||||||
|
? StaticSkyResolution.OTHER_SKY : StaticSkyResolution.OTHER;
|
||||||
|
}).toList());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortRegistryPages;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import net.dnorberg.rivencraft.shared.DesertVegetation;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.BlockTags;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacementContext;
|
||||||
|
|
||||||
|
/** Routes only the three generic plant pages by the actual candidate biome. */
|
||||||
|
public final class PortSurfaceVegetation {
|
||||||
|
public static final TagKey<Biome> DESERTS = TagKey.create(Registries.BIOME,
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "desert_vegetation"));
|
||||||
|
|
||||||
|
private PortSurfaceVegetation() {}
|
||||||
|
|
||||||
|
public static boolean isDesert(Holder<Biome> biome) {
|
||||||
|
return biome.is(DESERTS) && (!biome.is(net.minecraft.tags.BiomeTags.IS_END) && !PortRegistryPages.isCaveBiome(biome));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void place(WorldGenLevel level, ChunkGenerator generator, ChunkAccess chunk,
|
||||||
|
String page, Identifier placedId, RandomSource random) {
|
||||||
|
DesertVegetation.Kind kind = switch (page) {
|
||||||
|
case "flowers" -> DesertVegetation.Kind.FLOWERS;
|
||||||
|
case "trees" -> DesertVegetation.Kind.TREES;
|
||||||
|
case "huge_trees" -> DesertVegetation.Kind.HUGE_TREES;
|
||||||
|
default -> throw new IllegalArgumentException("Not a generic vegetation page: " + page);
|
||||||
|
};
|
||||||
|
int x = chunk.getPos().getMinBlockX();
|
||||||
|
int z = chunk.getPos().getMinBlockZ();
|
||||||
|
// Separate streams keep ordinary non-desert placement independent of desert attempts.
|
||||||
|
RandomSource desertRandom = RandomSource.create(random.nextLong());
|
||||||
|
DesertVegetation.place(new DesertVegetation.World() {
|
||||||
|
public int surfaceY(int px, int pz) {
|
||||||
|
return level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, px, pz);
|
||||||
|
}
|
||||||
|
public int maxY() { return level.getMaxY(); }
|
||||||
|
public boolean desert(int px, int py, int pz) {
|
||||||
|
return isDesert(level.getBiome(new BlockPos(px, py, pz)));
|
||||||
|
}
|
||||||
|
public DesertVegetation.Ground ground(int px, int py, int pz) {
|
||||||
|
var state = level.getBlockState(new BlockPos(px, py, pz));
|
||||||
|
if (state.is(Blocks.SAND) || state.is(Blocks.RED_SAND)) return DesertVegetation.Ground.SAND;
|
||||||
|
// Modern dirt and grass-like soils are separate tags.
|
||||||
|
return (state.is(BlockTags.DIRT) || state.is(BlockTags.GRASS_BLOCKS))
|
||||||
|
&& level.getBlockState(new BlockPos(px, py - 1, pz)).isFaceSturdy(
|
||||||
|
level, new BlockPos(px, py - 1, pz), net.minecraft.core.Direction.UP)
|
||||||
|
? DesertVegetation.Ground.SOIL : DesertVegetation.Ground.OTHER;
|
||||||
|
}
|
||||||
|
public boolean air(int px, int py, int pz) {
|
||||||
|
return level.getBlockState(new BlockPos(px, py, pz)).isAir();
|
||||||
|
}
|
||||||
|
public void set(int px, int py, int pz, DesertVegetation.Plant plant) {
|
||||||
|
var block = switch (plant) {
|
||||||
|
case SAND -> Blocks.SAND;
|
||||||
|
case CACTUS -> Blocks.CACTUS;
|
||||||
|
case DEAD_BUSH -> Blocks.DEAD_BUSH;
|
||||||
|
};
|
||||||
|
level.setBlock(new BlockPos(px, py, pz), block.defaultBlockState(), 2);
|
||||||
|
}
|
||||||
|
}, kind, x, z, desertRandom::nextInt);
|
||||||
|
|
||||||
|
var vanilla = level.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
|
.getOrThrow(ResourceKey.create(Registries.PLACED_FEATURE, placedId)).value();
|
||||||
|
var context = new PlacementContext(level, generator, Optional.empty());
|
||||||
|
placeOrdinary(vanilla, context, random, 0, new BlockPos(x, level.getMinY(), z));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void placeOrdinary(PlacedFeature feature, PlacementContext context,
|
||||||
|
RandomSource random, int index, BlockPos position) {
|
||||||
|
if (index == feature.placement().size()) {
|
||||||
|
Holder<Biome> biome = context.getLevel().getBiome(position);
|
||||||
|
if (!biome.is(net.minecraft.tags.BiomeTags.IS_END)
|
||||||
|
&& !PortRegistryPages.isCaveBiome(biome) && !isDesert(biome))
|
||||||
|
feature.feature().value().place(context.getLevel(), context.generator(), random, position);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var modifier = feature.placement().get(index);
|
||||||
|
if (modifier instanceof BiomeFilter) {
|
||||||
|
placeOrdinary(feature, context, random, index + 1, position);
|
||||||
|
} else {
|
||||||
|
modifier.modify(context, random, position,
|
||||||
|
candidate -> placeOrdinary(feature, context, random, index + 1, candidate));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -538,7 +538,8 @@ public final class RuntimeAgeBackend {
|
|||||||
ResourceKey<Level> key = ResourceKey.create(Registries.DIMENSION, id);
|
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
|
||||||
@@ -577,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))
|
||||||
@@ -595,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,7 @@ 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 net.dnorberg.rivencraft.compat.RebornBookPreviews.available() && state.getValue(LIVE_VIEW)
|
return net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.available() && state.getValue(LIVE_VIEW)
|
||||||
? RenderShape.INVISIBLE : RenderShape.MODEL;
|
? RenderShape.INVISIBLE : RenderShape.MODEL;
|
||||||
}
|
}
|
||||||
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
|||||||
+2
-2
@@ -26,7 +26,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
|
|||||||
public int skyColor() { return skyColor; }
|
public int skyColor() { return skyColor; }
|
||||||
public void setBook(ItemStack value) {
|
public void setBook(ItemStack value) {
|
||||||
if (level instanceof ServerLevel server)
|
if (level instanceof ServerLevel server)
|
||||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||||
book = value.copyWithCount(1);
|
book = value.copyWithCount(1);
|
||||||
restore = true;
|
restore = true;
|
||||||
skyColor = 0xffffff;
|
skyColor = 0xffffff;
|
||||||
@@ -58,7 +58,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
|
|||||||
}
|
}
|
||||||
public ItemStack takeBook() {
|
public ItemStack takeBook() {
|
||||||
if (level instanceof ServerLevel server)
|
if (level instanceof ServerLevel server)
|
||||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||||
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
|
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
|
||||||
}
|
}
|
||||||
private void sync() {
|
private void sync() {
|
||||||
|
|||||||
+38
-8
@@ -18,15 +18,36 @@ import qouteall.imm_ptl.core.ClientWorldLoader;
|
|||||||
import qouteall.imm_ptl.core.render.GuiPortalRendering;
|
import qouteall.imm_ptl.core.render.GuiPortalRendering;
|
||||||
import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo;
|
import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo;
|
||||||
|
|
||||||
/** Reborn renders before GUI drawing; the deferred GUI samples its target normally. */
|
/** The portal engine renders before GUI drawing; the deferred GUI samples its target normally. */
|
||||||
public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
|
public final class ImmersiveLiveBookPanel implements PortBookPreview.LivePanel {
|
||||||
// The engine retains queued tasks. Keep one reusable target alive across screen
|
// The engine retains queued tasks. Keep one reusable target alive across screen
|
||||||
// removal instead of deleting textures still referenced by a queued GUI frame.
|
// removal instead of deleting textures still referenced by a queued GUI frame.
|
||||||
private static RenderTarget target;
|
private static RenderTarget target;
|
||||||
private static RebornLiveBookPanel queued;
|
private static ImmersiveLiveBookPanel queued;
|
||||||
private LinkBookTarget destination;
|
private LinkBookTarget destination;
|
||||||
private boolean closed;
|
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 void accept(LinkBookTarget value) { destination = value; }
|
||||||
@Override public boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time) {
|
@Override public boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time) {
|
||||||
if (closed || destination == null || !ClientWorldLoader.getIsInitialized()) return false;
|
if (closed || destination == null || !ClientWorldLoader.getIsInitialized()) return false;
|
||||||
@@ -40,16 +61,25 @@ public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
|
|||||||
Vec3 center = new Vec3(destination.x(), destination.y() + 2.5, destination.z());
|
Vec3 center = new Vec3(destination.x(), destination.y() + 2.5, destination.z());
|
||||||
double angle = time * 0.012;
|
double angle = time * 0.012;
|
||||||
Vec3 camera = center.add(Math.sin(angle) * 11, 5, Math.cos(angle) * 11);
|
Vec3 camera = center.add(Math.sin(angle) * 11, 5, Math.cos(angle) * 11);
|
||||||
Matrix4f transform = new Matrix4f().rotateX((float) Math.toRadians(20))
|
Matrix4f transform;
|
||||||
.rotateY((float) angle);
|
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)
|
var info = new WorldRenderInfo.Builder().setWorld(world).setCameraPos(camera)
|
||||||
.setCameraTransformation(transform).setOverwriteCameraTransformation(true)
|
.setCameraTransformation(transform).setOverwriteCameraTransformation(true)
|
||||||
.setRenderDistance(Math.min(8, minecraft.options.getEffectiveRenderDistance()))
|
.setRenderDistance(Math.min(8, minecraft.options.getEffectiveRenderDistance()))
|
||||||
.setDoRenderHand(false).setEnableViewBobbing(false).setDoRenderSky(true).setHasFog(true).build();
|
.setDoRenderHand(false).setEnableViewBobbing(false).setDoRenderSky(true).setHasFog(true).build();
|
||||||
// Submit first: Reborn may resize the target, invalidating its old texture view.
|
// Overlay-to-screen transitions can extract this panel twice before the portal engine
|
||||||
// GPU clearing happens in beginRender(), after extraction but before remote rendering.
|
// 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);
|
GuiPortalRendering.submitNextFrameRendering(info, target);
|
||||||
queued = this;
|
queued = this;
|
||||||
|
}
|
||||||
graphics.blit(target.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR),
|
graphics.blit(target.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR),
|
||||||
x, y, x + width, y + height, 0, 1, 1, 0);
|
x, y, x + width, y + height, 0, 1, 1, 0);
|
||||||
graphics.outline(x, y, width, height, 0xFF7B6AA8);
|
graphics.outline(x, y, width, height, 0xFF7B6AA8);
|
||||||
@@ -75,5 +105,5 @@ public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
|
|||||||
camera.update(minecraft.getDeltaTracker());
|
camera.update(minecraft.getDeltaTracker());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Override public void close() { closed = true; destination = null; }
|
@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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package net.dnorberg.rivencraft.client;
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import net.dnorberg.rivencraft.PortConfig;
|
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
|
||||||
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
|
|
||||||
import net.dnorberg.rivencraft.network.*;
|
import net.dnorberg.rivencraft.network.*;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
@@ -18,6 +17,8 @@ public final class PortBookPreview {
|
|||||||
void accept(net.dnorberg.rivencraft.item.LinkBookTarget destination);
|
void accept(net.dnorberg.rivencraft.item.LinkBookTarget destination);
|
||||||
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time);
|
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time);
|
||||||
void close();
|
void close();
|
||||||
|
default void exploring(boolean enabled) {}
|
||||||
|
default void tick() {}
|
||||||
}
|
}
|
||||||
private static PortBookPreview active;
|
private static PortBookPreview active;
|
||||||
private final UUID session = UUID.randomUUID();
|
private final UUID session = UUID.randomUUID();
|
||||||
@@ -33,8 +34,8 @@ public final class PortBookPreview {
|
|||||||
request = minecraft.level == null ? null : new RequestBookPreviewPayload(session,
|
request = minecraft.level == null ? null : new RequestBookPreviewPayload(session,
|
||||||
hand == InteractionHand.OFF_HAND, stand != null, minecraft.level.dimension().identifier(),
|
hand == InteractionHand.OFF_HAND, stand != null, minecraft.level.dimension().identifier(),
|
||||||
stand == null ? BlockPos.ZERO : stand.pos(), book.copy());
|
stand == null ? BlockPos.ZERO : stand.pos(), book.copy());
|
||||||
boolean enabled = RebornBookPreviews.available() && PortConfig.LIVE_BOOK_PREVIEWS.get();
|
boolean enabled = ImmersiveBookPreviews.bookViewsEnabled();
|
||||||
live = enabled ? new RebornLiveBookPanel() : null;
|
live = enabled ? new ImmersiveLiveBookPanel() : null;
|
||||||
if (active != null) active.close();
|
if (active != null) active.close();
|
||||||
active = this;
|
active = this;
|
||||||
sendRequest();
|
sendRequest();
|
||||||
@@ -46,12 +47,16 @@ public final class PortBookPreview {
|
|||||||
}
|
}
|
||||||
void tick() {
|
void tick() {
|
||||||
ticks++;
|
ticks++;
|
||||||
|
if (live != null) live.tick();
|
||||||
if (ticks % (received ? 200 : 40) == 0) sendRequest();
|
if (ticks % (received ? 200 : 40) == 0) sendRequest();
|
||||||
}
|
}
|
||||||
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float partialTick) {
|
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float partialTick) {
|
||||||
if (closed || !received || live == null) return false;
|
if (closed || !received || live == null) return false;
|
||||||
return live.render(graphics, x, y, width, height, ticks + partialTick);
|
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) {
|
public static void accept(BookPreviewPayload payload) {
|
||||||
if (active == null || active.closed || active.live == null || !active.session.equals(payload.session())
|
if (active == null || active.closed || active.live == null || !active.session.equals(payload.session())
|
||||||
|| !payload.destination().valid()) return;
|
|| !payload.destination().valid()) return;
|
||||||
|
|||||||
+8
-2
@@ -27,6 +27,7 @@ public final class PortDescriptiveBookScreen extends Screen {
|
|||||||
private final boolean bound;
|
private final boolean bound;
|
||||||
private final net.minecraft.resources.Identifier ageId;
|
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;
|
||||||
@@ -48,7 +49,11 @@ public final class PortDescriptiveBookScreen extends Screen {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
if (bound) { linkPanel.open(hand, book, standSource); 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;
|
if (standSource != null) return;
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
@@ -183,9 +188,10 @@ 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() { linkPanel.close(); super.removed(); }
|
@Override public void removed() { if (!exploration.active()) { exploration.stop(); linkPanel.close(); } super.removed(); }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPauseScreen() {
|
public boolean isPauseScreen() {
|
||||||
|
|||||||
@@ -19,7 +19,9 @@ final class PortLegacyLinkPanel {
|
|||||||
net.dnorberg.rivencraft.network.UseBookStandPayload stand) {
|
net.dnorberg.rivencraft.network.UseBookStandPayload stand) {
|
||||||
if (preview == null) preview = new PortBookPreview(hand, book, stand);
|
if (preview == null) preview = new PortBookPreview(hand, book, stand);
|
||||||
}
|
}
|
||||||
void close() { if (preview != null) preview.close(); }
|
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;
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public final class PortLinkingBookScreen extends Screen {
|
|||||||
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;
|
||||||
|
|
||||||
@@ -53,7 +54,11 @@ public final class PortLinkingBookScreen extends Screen {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
if (bound) { linkPanel.open(hand, book, standSource); 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;
|
if (standSource != null) return;
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
@@ -148,9 +153,10 @@ 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() { linkPanel.close(); super.removed(); }
|
@Override public void removed() { if (!exploration.active()) { exploration.stop(); linkPanel.close(); } super.removed(); }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPauseScreen() {
|
public boolean isPauseScreen() {
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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();
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
import net.neoforged.neoforge.common.NeoForge;
|
||||||
|
|
||||||
|
/** No optional API appears in common class signatures. */
|
||||||
|
public final class ImmersiveBookPreviews {
|
||||||
|
public static boolean reborn() { return ModList.get().isLoaded("immersive_portals_reborn"); }
|
||||||
|
public static boolean seamless() { return ModList.get().isLoaded("seamlessportals"); }
|
||||||
|
public static boolean available() { return reborn() || seamless(); }
|
||||||
|
public static String engineName() { return seamless() ? "Seamless" : "Reborn"; }
|
||||||
|
public static boolean bookViewsEnabled() {
|
||||||
|
return seamless() ? PortConfig.SEAMLESS_BOOK_PREVIEWS.get()
|
||||||
|
: reborn() && PortConfig.LIVE_BOOK_PREVIEWS.get();
|
||||||
|
}
|
||||||
|
public static boolean crystalViewsEnabled() {
|
||||||
|
return seamless() ? PortConfig.SEAMLESS_CRYSTAL_VIEWS.get()
|
||||||
|
: reborn() && PortConfig.CRYSTAL_LIVE_VIEWS.get();
|
||||||
|
}
|
||||||
|
public static void open(ServerPlayer player, RequestBookPreviewPayload payload) {
|
||||||
|
if (!available()) return;
|
||||||
|
try { ImmersivePreviewChunks.open(player, payload); }
|
||||||
|
catch (RuntimeException | LinkageError error) {
|
||||||
|
Rivencraft.LOGGER.warn("{} book preview unavailable; retaining animated panel", engineName(), error);
|
||||||
|
ImmersivePreviewChunks.close(player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static void release(ServerPlayer player, java.util.UUID session) {
|
||||||
|
if (available()) ImmersivePreviewChunks.release(player, session);
|
||||||
|
}
|
||||||
|
public static void register() {
|
||||||
|
if (!available()) return;
|
||||||
|
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> ImmersivePreviewChunks.tick(event.getServer()));
|
||||||
|
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> {
|
||||||
|
if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.logout(player);
|
||||||
|
});
|
||||||
|
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> {
|
||||||
|
if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.close(player);
|
||||||
|
});
|
||||||
|
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> ImmersivePreviewChunks.stop());
|
||||||
|
}
|
||||||
|
private ImmersiveBookPreviews() {}
|
||||||
|
}
|
||||||
+9
-10
@@ -1,6 +1,5 @@
|
|||||||
package net.dnorberg.rivencraft.compat;
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
import net.dnorberg.rivencraft.PortConfig;
|
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
@@ -8,23 +7,23 @@ import net.minecraft.server.level.ServerLevel;
|
|||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
/** Render-only optional integration. Crystal portal blocks retain all travel rules. */
|
/** Render-only optional integration. Crystal portal blocks retain all travel rules. */
|
||||||
public final class RebornCrystalPortals {
|
public final class ImmersiveCrystalPortals {
|
||||||
public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
|
public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
|
||||||
boolean live = false;
|
boolean live = false;
|
||||||
if (RebornBookPreviews.available()) {
|
if (ImmersiveBookPreviews.available()) {
|
||||||
try {
|
try {
|
||||||
if (!book.isEmpty() && PortConfig.CRYSTAL_LIVE_VIEWS.get())
|
if (!book.isEmpty() && ImmersiveBookPreviews.crystalViewsEnabled())
|
||||||
live = RebornCrystalView.refresh(source, owner, plan, book);
|
live = ImmersiveCrystalView.refresh(source, owner, plan, book);
|
||||||
else RebornCrystalView.remove(source, owner);
|
else ImmersiveCrystalView.remove(source, owner);
|
||||||
} catch (RuntimeException | LinkageError failure) {
|
} catch (RuntimeException | LinkageError failure) {
|
||||||
Rivencraft.LOGGER.warn("Could not establish Reborn crystal view at {}; retaining portal travel and fallback", owner, failure);
|
Rivencraft.LOGGER.warn("Could not establish immersive crystal view at {}; retaining portal travel and fallback", owner, failure);
|
||||||
RebornCrystalView.remove(source, owner);
|
ImmersiveCrystalView.remove(source, owner);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CrystalPortalNetwork.setLiveView(source, plan, live);
|
CrystalPortalNetwork.setLiveView(source, plan, live);
|
||||||
}
|
}
|
||||||
public static void remove(ServerLevel source, BlockPos owner) {
|
public static void remove(ServerLevel source, BlockPos owner) {
|
||||||
if (RebornBookPreviews.available()) RebornCrystalView.remove(source, owner);
|
if (ImmersiveBookPreviews.available()) ImmersiveCrystalView.remove(source, owner);
|
||||||
}
|
}
|
||||||
private RebornCrystalPortals() {}
|
private ImmersiveCrystalPortals() {}
|
||||||
}
|
}
|
||||||
+2
-2
@@ -23,7 +23,7 @@ import qouteall.q_misc_util.my_util.DQuaternion;
|
|||||||
import qouteall.q_misc_util.my_util.Mesh2D;
|
import qouteall.q_misc_util.my_util.Mesh2D;
|
||||||
|
|
||||||
/** One native mesh per coplanar opening/side, not one repeated image per block. */
|
/** One native mesh per coplanar opening/side, not one repeated image per block. */
|
||||||
final class RebornCrystalView {
|
final class ImmersiveCrystalView {
|
||||||
private static final String PREFIX = "rivencraft:crystal:mc263:v1:";
|
private static final String PREFIX = "rivencraft:crystal:mc263:v1:";
|
||||||
private record View(CrystalPortalSurfaces.Surface surface, Direction normal,
|
private record View(CrystalPortalSurfaces.Surface surface, Direction normal,
|
||||||
LinkBookTarget target, boolean preserveFacing, boolean relative, String tag) {}
|
LinkBookTarget target, boolean preserveFacing, boolean relative, String tag) {}
|
||||||
@@ -127,5 +127,5 @@ final class RebornCrystalView {
|
|||||||
return to.hamiltonProduct(from.getConjugated()).getNormalized();
|
return to.hamiltonProduct(from.getConjugated()).getNormalized();
|
||||||
}
|
}
|
||||||
private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; }
|
private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; }
|
||||||
private RebornCrystalView() {}
|
private ImmersiveCrystalView() {}
|
||||||
}
|
}
|
||||||
+3
-3
@@ -23,7 +23,7 @@ import qouteall.imm_ptl.core.chunk_loading.ChunkLoader;
|
|||||||
import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking;
|
import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking;
|
||||||
|
|
||||||
/** Optional API class: one expiring stream per player, validated before any chunk load. */
|
/** Optional API class: one expiring stream per player, validated before any chunk load. */
|
||||||
final class RebornPreviewChunks {
|
final class ImmersivePreviewChunks {
|
||||||
private static final Map<ServerPlayer, Lease> LEASES = new IdentityHashMap<>();
|
private static final Map<ServerPlayer, Lease> LEASES = new IdentityHashMap<>();
|
||||||
private static final Map<ServerPlayer, Long> REQUESTS = new IdentityHashMap<>();
|
private static final Map<ServerPlayer, Long> REQUESTS = new IdentityHashMap<>();
|
||||||
private static final int LIFETIME = 600;
|
private static final int LIFETIME = 600;
|
||||||
@@ -69,7 +69,7 @@ final class RebornPreviewChunks {
|
|||||||
var center = BlockPos.containing(target.x(), target.y(), target.z());
|
var center = BlockPos.containing(target.x(), target.y(), target.z());
|
||||||
if (level == null || !level.isInWorldBounds(center) || !level.getWorldBorder().isWithinBounds(center)) return;
|
if (level == null || !level.isInWorldBounds(center) || !level.getWorldBorder().isWithinBounds(center)) return;
|
||||||
close(player);
|
close(player);
|
||||||
// Match the root live renderer's eight-chunk orbit view. Reborn schedules
|
// Match the root live renderer's eight-chunk orbit view. The portal engine schedules
|
||||||
// generation/streaming; no synchronous square of getChunk() calls here.
|
// generation/streaming; no synchronous square of getChunk() calls here.
|
||||||
var loader = new ChunkLoader(level.dimension(), center.getX() >> 4, center.getZ() >> 4, 8);
|
var loader = new ChunkLoader(level.dimension(), center.getX() >> 4, center.getZ() >> 4, 8);
|
||||||
PortalAPI.addChunkLoaderForPlayer(player, loader);
|
PortalAPI.addChunkLoaderForPlayer(player, loader);
|
||||||
@@ -108,5 +108,5 @@ final class RebornPreviewChunks {
|
|||||||
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player);
|
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player);
|
||||||
REQUESTS.clear();
|
REQUESTS.clear();
|
||||||
}
|
}
|
||||||
private RebornPreviewChunks() {}
|
private ImmersivePreviewChunks() {}
|
||||||
}
|
}
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
package net.dnorberg.rivencraft.compat;
|
|
||||||
|
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
|
||||||
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
|
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
|
||||||
import net.neoforged.fml.ModList;
|
|
||||||
import net.neoforged.neoforge.common.NeoForge;
|
|
||||||
|
|
||||||
/** No optional API appears in common class signatures. */
|
|
||||||
public final class RebornBookPreviews {
|
|
||||||
public static boolean available() { return ModList.get().isLoaded("immersive_portals_reborn"); }
|
|
||||||
public static void open(ServerPlayer player, RequestBookPreviewPayload payload) {
|
|
||||||
if (!available()) return;
|
|
||||||
try { RebornPreviewChunks.open(player, payload); }
|
|
||||||
catch (RuntimeException | LinkageError error) {
|
|
||||||
Rivencraft.LOGGER.warn("Reborn book preview unavailable; retaining animated panel", error);
|
|
||||||
RebornPreviewChunks.close(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public static void release(ServerPlayer player, java.util.UUID session) {
|
|
||||||
if (available()) RebornPreviewChunks.release(player, session);
|
|
||||||
}
|
|
||||||
public static void register() {
|
|
||||||
if (!available()) return;
|
|
||||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> RebornPreviewChunks.tick(event.getServer()));
|
|
||||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> {
|
|
||||||
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.logout(player);
|
|
||||||
});
|
|
||||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> {
|
|
||||||
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.close(player);
|
|
||||||
});
|
|
||||||
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> RebornPreviewChunks.stop());
|
|
||||||
}
|
|
||||||
private RebornBookPreviews() {}
|
|
||||||
}
|
|
||||||
+5
-5
@@ -1,7 +1,7 @@
|
|||||||
package net.dnorberg.rivencraft.mixin;
|
package net.dnorberg.rivencraft.mixin;
|
||||||
|
|
||||||
import net.dnorberg.rivencraft.client.RebornLiveBookPanel;
|
import net.dnorberg.rivencraft.client.ImmersiveLiveBookPanel;
|
||||||
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
|
import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Pseudo;
|
import org.spongepowered.asm.mixin.Pseudo;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@@ -10,13 +10,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
|
|
||||||
@Pseudo
|
@Pseudo
|
||||||
@Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false)
|
@Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false)
|
||||||
public abstract class RebornGuiRenderingMixin {
|
public abstract class ImmersiveGuiRenderingMixin {
|
||||||
@Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false)
|
@Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false)
|
||||||
private static void rivencraft$clearLiveTarget(CallbackInfo ci) {
|
private static void rivencraft$clearLiveTarget(CallbackInfo ci) {
|
||||||
if (RebornBookPreviews.available()) RebornLiveBookPanel.beginRender();
|
if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.beginRender();
|
||||||
}
|
}
|
||||||
@Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false)
|
@Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false)
|
||||||
private static void rivencraft$restoreCamera(CallbackInfo ci) {
|
private static void rivencraft$restoreCamera(CallbackInfo ci) {
|
||||||
if (RebornBookPreviews.available()) RebornLiveBookPanel.endRender();
|
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;
|
||||||
|
|||||||
@@ -37,12 +37,12 @@ public final class PortBookNetworking {
|
|||||||
registrar.playToServer(RequestBookPreviewPayload.TYPE, RequestBookPreviewPayload.STREAM_CODEC,
|
registrar.playToServer(RequestBookPreviewPayload.TYPE, RequestBookPreviewPayload.STREAM_CODEC,
|
||||||
(payload, context) -> {
|
(payload, context) -> {
|
||||||
if (context.player() instanceof ServerPlayer player)
|
if (context.player() instanceof ServerPlayer player)
|
||||||
net.dnorberg.rivencraft.compat.RebornBookPreviews.open(player, payload);
|
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.open(player, payload);
|
||||||
});
|
});
|
||||||
registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC,
|
registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC,
|
||||||
(payload, context) -> {
|
(payload, context) -> {
|
||||||
if (context.player() instanceof ServerPlayer player)
|
if (context.player() instanceof ServerPlayer player)
|
||||||
net.dnorberg.rivencraft.compat.RebornBookPreviews.release(player, payload.session());
|
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.release(player, payload.session());
|
||||||
});
|
});
|
||||||
registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC,
|
registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC,
|
||||||
(payload, context) -> {
|
(payload, context) -> {
|
||||||
|
|||||||
@@ -176,12 +176,12 @@ public final class CrystalPortalNetwork {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void shutdown(ServerLevel level, BlockPos receptacle) {
|
public static void shutdown(ServerLevel level, BlockPos receptacle) {
|
||||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(level, receptacle);
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(level, receptacle);
|
||||||
// A broken support can disconnect the graph. Scan a bounded volume rather
|
// 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),
|
||||||
@@ -224,7 +224,7 @@ public final class CrystalPortalNetwork {
|
|||||||
}
|
}
|
||||||
orientSurfaces(level, plan);
|
orientSurfaces(level, plan);
|
||||||
var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle);
|
var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle);
|
||||||
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import net.minecraft.resources.Identifier;
|
|||||||
|
|
||||||
/** 1.21.1 grammar diagnostics and singular-controller recovery; preserve ordered modifier chains. */
|
/** 1.21.1 grammar diagnostics and singular-controller recovery; preserve ordered modifier chains. */
|
||||||
public final class PortWritingRecovery {
|
public final class PortWritingRecovery {
|
||||||
private static final Set<String> SINGULAR = Set.of("terrain", "biome_controller", "weather", "season", "lighting", "sky");
|
private static final Set<String> SINGULAR = Set.of("terrain", "biome_controller", "weather", "season", "lighting", "sky", "flooding");
|
||||||
private static final Set<String> MODIFIERS = Set.of("period_modifier", "angle_modifier", "phase_modifier", "size_modifier",
|
private static final Set<String> MODIFIERS = Set.of("period_modifier", "angle_modifier", "phase_modifier", "size_modifier",
|
||||||
"celestial_color", "direction_modifier");
|
"celestial_color", "direction_modifier");
|
||||||
public record Diagnostic(String code, int index, int points) {}
|
public record Diagnostic(String code, int index, int points) {}
|
||||||
@@ -29,12 +29,13 @@ public final class PortWritingRecovery {
|
|||||||
var entry = PortSymbolPages.find(page);
|
var entry = PortSymbolPages.find(page);
|
||||||
if (entry == null || !PortAuthoredWriting.isPageImplemented(page)) { implemented = false; continue; }
|
if (entry == null || !PortAuthoredWriting.isPageImplemented(page)) { implemented = false; continue; }
|
||||||
String role = entry.role();
|
String role = entry.role();
|
||||||
if (pendingNumber != null && !numberTarget(role)) {
|
if (pendingNumber != null && !numberTarget(role, page)
|
||||||
|
&& !(role.equals("color_number") && numberRunTargetsInteger(pages, index))) {
|
||||||
diagnostics.add(new Diagnostic("misplaced_modifier", pendingNumber, 100));
|
diagnostics.add(new Diagnostic("misplaced_modifier", pendingNumber, 100));
|
||||||
pendingNumber = null;
|
pendingNumber = null;
|
||||||
}
|
}
|
||||||
if (role.equals("color_number")) pendingNumber = index;
|
if (role.equals("color_number")) pendingNumber = index;
|
||||||
else if (numberTarget(role)) pendingNumber = null;
|
else if (numberTarget(role, page)) pendingNumber = null;
|
||||||
if (MODIFIERS.contains(role)) pendingModifiers.put(role, index);
|
if (MODIFIERS.contains(role)) pendingModifiers.put(role, index);
|
||||||
else if (role.equals("celestial")) pendingModifiers.clear();
|
else if (role.equals("celestial")) pendingModifiers.clear();
|
||||||
if (SINGULAR.contains(role)) {
|
if (SINGULAR.contains(role)) {
|
||||||
@@ -55,7 +56,7 @@ public final class PortWritingRecovery {
|
|||||||
for (int index : pendingModifiers.values())
|
for (int index : pendingModifiers.values())
|
||||||
diagnostics.add(new Diagnostic("dangling_modifier", index, 100));
|
diagnostics.add(new Diagnostic("dangling_modifier", index, 100));
|
||||||
Integer controller = last.get("biome_controller");
|
Integer controller = last.get("biome_controller");
|
||||||
boolean nativeBiomes = controller != null && pages.get(controller).getPath().equals("biome/native");
|
boolean nativeBiomes = controller != null && net.dnorberg.rivencraft.shared.NativeBiomeKind.isController(pages.get(controller).getPath().substring("biome/".length()));
|
||||||
boolean single = controller != null && pages.get(controller).getPath().equals("biome/single");
|
boolean single = controller != null && pages.get(controller).getPath().equals("biome/single");
|
||||||
if (nativeBiomes && biomes > 0 || single && biomes > 1)
|
if (nativeBiomes && biomes > 0 || single && biomes > 1)
|
||||||
diagnostics.add(new Diagnostic("conflict", controller, 500));
|
diagnostics.add(new Diagnostic("conflict", controller, 500));
|
||||||
@@ -78,9 +79,20 @@ public final class PortWritingRecovery {
|
|||||||
// The port's category compilers select by role, so no physical resort is necessary.
|
// The port's category compilers select by role, so no physical resort is necessary.
|
||||||
return new Result(active, diagnostics, implemented);
|
return new Result(active, diagnostics, implemented);
|
||||||
}
|
}
|
||||||
private static boolean numberTarget(String role) {
|
private static boolean numberRunTargetsInteger(List<Identifier> pages, int index) {
|
||||||
|
for (int next = index + 1; next < pages.size(); next++) {
|
||||||
|
var entry = PortSymbolPages.find(pages.get(next));
|
||||||
|
if (entry == null) return false;
|
||||||
|
if (!entry.role().equals("color_number")) return entry.role().equals("flooding")
|
||||||
|
|| pages.get(next).equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean numberTarget(String role, Identifier page) {
|
||||||
return role.equals("color") || role.equals("period_modifier") || role.equals("angle_modifier")
|
return role.equals("color") || role.equals("period_modifier") || role.equals("angle_modifier")
|
||||||
|| role.equals("phase_modifier") || role.equals("size_modifier");
|
|| role.equals("phase_modifier") || role.equals("size_modifier") || role.equals("flooding")
|
||||||
|
|| page.equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE);
|
||||||
}
|
}
|
||||||
private static int stage(String role) {
|
private static int stage(String role) {
|
||||||
return switch (role) {
|
return switch (role) {
|
||||||
|
|||||||
@@ -3,6 +3,11 @@
|
|||||||
"values": [
|
"values": [
|
||||||
"minecraft:lush_caves",
|
"minecraft:lush_caves",
|
||||||
"minecraft:dripstone_caves",
|
"minecraft:dripstone_caves",
|
||||||
"minecraft:deep_dark"
|
"minecraft:deep_dark",
|
||||||
|
"minecraft:sulfur_caves",
|
||||||
|
{
|
||||||
|
"id": "#c:is_cave",
|
||||||
|
"required": false
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,9 @@
|
|||||||
"client": [
|
"client": [
|
||||||
"StaticSkyStateMixin",
|
"StaticSkyStateMixin",
|
||||||
"StaticSkyRendererMixin",
|
"StaticSkyRendererMixin",
|
||||||
"RebornGuiRenderingMixin",
|
"ImmersiveGuiRenderingMixin",
|
||||||
"ClientLevelSoundMixin"
|
"ClientLevelSoundMixin",
|
||||||
|
"RebornBlockAckMixin"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ issueTrackerURL="https://git.paddedcell.org/dnorberg/rivencraft/issues"
|
|||||||
[[mods]]
|
[[mods]]
|
||||||
modId="${mod_id}"
|
modId="${mod_id}"
|
||||||
version="${mod_version}"
|
version="${mod_version}"
|
||||||
displayName="${mod_name} 26.3 Beta"
|
displayName="${mod_name}"
|
||||||
displayURL="https://git.paddedcell.org/dnorberg/rivencraft"
|
displayURL="https://git.paddedcell.org/dnorberg/rivencraft"
|
||||||
authors="dnorberg and contributors"
|
authors="dnorberg and contributors"
|
||||||
description='''
|
description='''
|
||||||
Experimental Minecraft 26.3 beta with books, writing stations and selected
|
Minecraft 26.3 release with books, writing stations and selected
|
||||||
authored Age generation. Full 1.21.1 gameplay parity is still in progress.
|
authored Age generation. Full 1.21.1 gameplay parity is still in progress.
|
||||||
Use a test world and keep backups; 1.21.1 worlds are not compatible.
|
Use a test world and keep backups; 1.21.1 worlds are not compatible.
|
||||||
'''
|
'''
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Select affected game targets; docs and release tooling do not trigger game tests."""
|
||||||
|
import argparse
|
||||||
|
import json
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
|
def affected(paths):
|
||||||
|
targets = set()
|
||||||
|
for path in paths:
|
||||||
|
if path.startswith("src/main/java/") or path in {"build.gradle", "settings.gradle", "gradle.properties"}:
|
||||||
|
targets.add("mc1211")
|
||||||
|
if path.startswith("ports/mc263/") and not path.endswith(".md"):
|
||||||
|
targets.add("mc263")
|
||||||
|
if path.startswith(("src/main/resources/", "src/generated/", "buildSrc/", "gradle/", "shared/src/main/java/")) or path in {"gradlew", "gradlew.bat"}:
|
||||||
|
targets.update(("mc1211", "mc263"))
|
||||||
|
return sorted(targets)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__)
|
||||||
|
parser.add_argument("--base", required=True)
|
||||||
|
args = parser.parse_args()
|
||||||
|
paths = subprocess.check_output(["git", "diff", "--name-only", args.base, "HEAD"], text=True).splitlines()
|
||||||
|
values = {"mc1211": ("21", "build"), "mc263": ("25", "-p ports/mc263 build")}
|
||||||
|
matrix = {"include": [{"target": target, "java": values[target][0], "gradle_args": values[target][1]}
|
||||||
|
for target in affected(paths)]}
|
||||||
|
print(json.dumps(matrix, separators=(",", ":")))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.shared.DesertVegetation;
|
||||||
|
import net.dnorberg.rivencraft.shared.DesertVegetation.*;
|
||||||
|
|
||||||
|
/** Storage-free shared placement checks; no fixture is packaged into either mod JAR. */
|
||||||
|
public class DesertVegetationChecks {
|
||||||
|
record Pos(int x, int y, int z) {}
|
||||||
|
static class World implements DesertVegetation.World {
|
||||||
|
final Map<Pos, Plant> plants = new HashMap<>();
|
||||||
|
Ground ground = Ground.SAND;
|
||||||
|
boolean desert = true;
|
||||||
|
boolean mixed;
|
||||||
|
boolean blocked;
|
||||||
|
int ceiling = 320;
|
||||||
|
int readsOutside;
|
||||||
|
public int surfaceY(int x, int z) { return 4; }
|
||||||
|
public int maxY() { return ceiling; }
|
||||||
|
public boolean desert(int x, int y, int z) { return desert && (!mixed || x < 8); }
|
||||||
|
public Ground ground(int x, int y, int z) { return ground; }
|
||||||
|
public boolean air(int x, int y, int z) {
|
||||||
|
if (x < 0 || x > 15 || z < 0 || z > 15) readsOutside++;
|
||||||
|
return y >= 4 && !blocked && !plants.containsKey(new Pos(x,y,z));
|
||||||
|
}
|
||||||
|
public void set(int x, int y, int z, Plant plant) {
|
||||||
|
if (x < 0 || x > 15 || z < 0 || z > 15 || y >= ceiling)
|
||||||
|
throw new AssertionError("Write outside chunk/world bounds");
|
||||||
|
if (plants.putIfAbsent(new Pos(x,y,z),plant) != null)
|
||||||
|
throw new AssertionError("Overwrote existing vegetation");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static int place(World w, Kind k, long seed) {
|
||||||
|
return DesertVegetation.place(w,k,0,0,new Random(seed)::nextInt);
|
||||||
|
}
|
||||||
|
static void check(boolean condition, String label) {
|
||||||
|
if (!condition) throw new AssertionError(label);
|
||||||
|
}
|
||||||
|
public static void main(String[] args) {
|
||||||
|
for (Kind kind : Kind.values()) {
|
||||||
|
var a = new World();
|
||||||
|
int count = place(a,kind,108);
|
||||||
|
check(count > 0,"Page produces plants: "+kind);
|
||||||
|
var b = new World();
|
||||||
|
place(b,kind,108);
|
||||||
|
check(a.plants.equals(b.plants),"Seeded repeatability: "+kind);
|
||||||
|
check(a.readsOutside == 0,"Chunk-local checks: "+kind);
|
||||||
|
if (kind == Kind.FLOWERS)
|
||||||
|
check(a.plants.values().stream().allMatch(p -> p == Plant.DEAD_BUSH),"Desert plants only");
|
||||||
|
else {
|
||||||
|
int max = a.plants.keySet().stream().mapToInt(Pos::y).max().orElseThrow() - 3;
|
||||||
|
check(kind == Kind.HUGE_TREES ? max >= 5 && max <= 9 : max <= 3,"Cactus heights");
|
||||||
|
}
|
||||||
|
int original = a.plants.size();
|
||||||
|
for (int n=1;n<4;n++) place(a,kind,108+n);
|
||||||
|
check(a.plants.size() > original,"Repeated pages add plants: "+kind);
|
||||||
|
|
||||||
|
var outside = new World(); outside.desert = false;
|
||||||
|
check(place(outside,kind,108)==0 && outside.plants.isEmpty(),"No non-desert writes");
|
||||||
|
var unsupported = new World(); unsupported.ground=Ground.OTHER;
|
||||||
|
check(place(unsupported,kind,108)==0 && unsupported.plants.isEmpty(),"Preserve rock/invalid ground");
|
||||||
|
var blocked = new World(); blocked.blocked=true; blocked.ground=Ground.SOIL;
|
||||||
|
check(place(blocked,kind,108)==0 && blocked.plants.isEmpty(),"No partial writes when obstructed");
|
||||||
|
var mixed = new World(); mixed.mixed=true;
|
||||||
|
place(mixed,kind,108);
|
||||||
|
check(mixed.plants.keySet().stream().allMatch(p -> p.x()<8),"Candidate biome selection");
|
||||||
|
}
|
||||||
|
var flat = new World(); flat.ground=Ground.SOIL;
|
||||||
|
int cacti=place(flat,Kind.TREES,108);
|
||||||
|
check(cacti>0 && flat.plants.values().stream().filter(p -> p==Plant.SAND).count()==cacti,
|
||||||
|
"Flat soil converts exactly one base per cactus");
|
||||||
|
var low = new World(); low.ceiling=8;
|
||||||
|
check(place(low,Kind.HUGE_TREES,108)==0 && low.plants.isEmpty(),"No truncated tall cactus/headroom writes");
|
||||||
|
System.out.println("DESERT108_PASS: placement, heights, repeated pages, seed repeatability, biome boundaries, "
|
||||||
|
+"chunk bounds, obstruction, ground protection, Flat bases and ceiling");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortRegistryPages;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public class DesertProbe {
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try {
|
||||||
|
var server=event.getServer();
|
||||||
|
for (String name : List.of("minecraft:desert","biomesoplenty:dryland")) {
|
||||||
|
var biome=server.registryAccess().lookupOrThrow(Registries.BIOME)
|
||||||
|
.getOrThrow(ResourceKey.create(Registries.BIOME,Identifier.parse(name)));
|
||||||
|
System.out.println("DESERT263_CLASSIFY "+name+" own="+biome.is(PortSurfaceVegetation.DESERTS)
|
||||||
|
+" common="+biome.is(TagKey.<Biome>create(Registries.BIOME,Identifier.parse("c:is_desert")))
|
||||||
|
+" cave="+PortRegistryPages.isCaveBiome(biome));
|
||||||
|
var level=RuntimeAgeBackend.create(server,Identifier.parse("rivencraft:age/probe_"+name.split(":")[1]),
|
||||||
|
1115555888188619066L,
|
||||||
|
new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,List.of(Identifier.parse(name))),
|
||||||
|
PortAgeTerrain.FLAT,null,
|
||||||
|
new PortVegetationPlan(List.of(PortVegetationPlan.TREES,PortVegetationPlan.HUGE_TREES,
|
||||||
|
PortVegetationPlan.FLOWERS)),0,null,null);
|
||||||
|
level.getChunk(0,0);
|
||||||
|
var probePos=new BlockPos(8,3,8);
|
||||||
|
System.out.println("DESERT263_HEIGHT "+name
|
||||||
|
+" motion="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,8,8)
|
||||||
|
+" wg="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE_WG,8,8)
|
||||||
|
+" ground="+level.getBlockState(probePos)
|
||||||
|
+" dirt="+level.getBlockState(probePos).is(net.minecraft.tags.BlockTags.DIRT)
|
||||||
|
+" belowSturdy="+level.getBlockState(probePos.below()).isFaceSturdy(level,probePos.below(),net.minecraft.core.Direction.UP));
|
||||||
|
java.util.Map<String,Integer> ground=new java.util.TreeMap<>();
|
||||||
|
int cacti=0,bushes=0;
|
||||||
|
for(int x=0;x<16;x++)for(int z=0;z<16;z++) {
|
||||||
|
ground.merge(level.getBlockState(new BlockPos(x,4,z)).toString(),1,Integer::sum);
|
||||||
|
for(int y=4;y<20;y++) {
|
||||||
|
var state=level.getBlockState(new BlockPos(x,y,z));
|
||||||
|
if(state.is(Blocks.CACTUS))cacti++;
|
||||||
|
if(state.is(Blocks.DEAD_BUSH))bushes++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
System.out.println("DESERT263_RESULT "+name+" cacti="+cacti+" bushes="+bushes+" ground="+ground);
|
||||||
|
if(cacti==0)
|
||||||
|
throw new AssertionError("No authored cactus in "+name);
|
||||||
|
}
|
||||||
|
System.out.println("DESERT263_PASS");
|
||||||
|
}catch(Throwable error){
|
||||||
|
System.out.println("DESERT263_FAIL "+error);
|
||||||
|
error.printStackTrace();
|
||||||
|
}finally{event.getServer().halt(false);}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import com.mojang.serialization.JsonOps;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.writing.*;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.shared.FloodingRules;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.LevelHeightAccessor;
|
||||||
|
import net.minecraft.world.level.biome.Biomes;
|
||||||
|
import net.minecraft.world.level.biome.FixedBiomeSource;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.world.level.chunk.*;
|
||||||
|
import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
|
||||||
|
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
|
||||||
|
/** Isolated fixture: never part of the production source set or JAR. */
|
||||||
|
@EventBusSubscriber(modid = "rivencraft")
|
||||||
|
public final class FloodedProbe {
|
||||||
|
private static int checks;
|
||||||
|
private static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft", path); }
|
||||||
|
private static void check(boolean pass, String label) {
|
||||||
|
if (!pass) throw new AssertionError(label);
|
||||||
|
checks++;
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try {
|
||||||
|
run(event.getServer());
|
||||||
|
System.out.println("FLOODED263_PASS checks=" + checks);
|
||||||
|
} catch (Throwable error) {
|
||||||
|
System.out.println("FLOODED263_FAIL " + error);
|
||||||
|
error.printStackTrace();
|
||||||
|
} finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
private static void run(MinecraftServer server) throws Exception {
|
||||||
|
var pages = List.of(id("terrain/cave"), id("biome/lush_caves"), id("biome/single"),
|
||||||
|
id("number/2"), id("number/24"), PortFlooding.PAGE);
|
||||||
|
check(PortAuthoredWriting.supports(pages), "Cave + Flooded writing supported");
|
||||||
|
check(PortFlooding.requested(pages) == 74, "2,24 means Y=74");
|
||||||
|
check(PortFlooding.requested(List.of(PortFlooding.PAGE)) == 63, "default");
|
||||||
|
check(PortFlooding.requested(List.of(id("number/4"), PortFlooding.PAGE, PortFlooding.PAGE)) == 63,
|
||||||
|
"last unnumbered instruction resets");
|
||||||
|
check(PortFlooding.requested(List.of()) == FloodingRules.NONE, "opt-in");
|
||||||
|
check(PortWritingRecovery.recover(pages).diagnostics().stream().noneMatch(d ->
|
||||||
|
d.code().equals("dangling_modifier") || d.code().equals("misplaced_modifier")), "digit grammar");
|
||||||
|
check(PortAuthoredWriting.isPageImplemented(PortFlooding.PAGE), "page supported");
|
||||||
|
check(PortSymbolPages.pages("rivencraft:environment", server.registryAccess()).stream().anyMatch(stack ->
|
||||||
|
PageItem.content(stack).symbol().map(ref -> ref.id().equals(PortFlooding.PAGE)).orElse(false)),
|
||||||
|
"Creative/JEI feed");
|
||||||
|
var chunk = new ProtoChunk(new ChunkPos(0, 0), UpgradeData.EMPTY,
|
||||||
|
LevelHeightAccessor.create(-64, 256), PalettedContainerFactory.create(server.registryAccess()), null);
|
||||||
|
chunk.setBlockState(new BlockPos(2, 10, 2), Blocks.DIAMOND_BLOCK.defaultBlockState());
|
||||||
|
chunk.setBlockState(new BlockPos(2, 90, 2), Blocks.STONE.defaultBlockState());
|
||||||
|
chunk.setBlockState(new BlockPos(3, 60, 3), Blocks.WATER.defaultBlockState());
|
||||||
|
chunk.setBlockState(new BlockPos(4, 60, 4), Blocks.OAK_FENCE.defaultBlockState()
|
||||||
|
.setValue(BlockStateProperties.WATERLOGGED, true));
|
||||||
|
PortFlooding.apply(chunk, FloodingRules.NONE);
|
||||||
|
check(chunk.getBlockState(new BlockPos(1, 24, 1)).isAir(), "dry unchanged");
|
||||||
|
PortFlooding.apply(chunk, 24);
|
||||||
|
check(chunk.getBlockState(new BlockPos(1, 24, 1)).is(Blocks.WATER), "low water");
|
||||||
|
check(chunk.getBlockState(new BlockPos(1, 25, 1)).isAir(), "low upper bound");
|
||||||
|
check(chunk.getBlockState(new BlockPos(3, 60, 3)).isAir(), "drain higher water");
|
||||||
|
check(!chunk.getBlockState(new BlockPos(4, 60, 4)).getValue(BlockStateProperties.WATERLOGGED), "dry fence");
|
||||||
|
PortFlooding.apply(chunk, 74);
|
||||||
|
check(chunk.getBlockState(new BlockPos(1, 74, 1)).is(Blocks.WATER), "high water");
|
||||||
|
check(chunk.getBlockState(new BlockPos(1, 75, 1)).isAir(), "high upper bound");
|
||||||
|
check(chunk.getBlockState(new BlockPos(2, 10, 2)).is(Blocks.DIAMOND_BLOCK)
|
||||||
|
&& chunk.getBlockState(new BlockPos(2, 90, 2)).is(Blocks.STONE), "features/roof preserved");
|
||||||
|
var biomes = server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||||
|
var settings = FlatLevelGeneratorSettings.getDefault(biomes,
|
||||||
|
server.registryAccess().lookupOrThrow(Registries.STRUCTURE_SET),
|
||||||
|
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE));
|
||||||
|
var base = new PortFlatChunkGenerator(new FixedBiomeSource(biomes.getOrThrow(Biomes.DESERT)), settings);
|
||||||
|
var generator = new PortFeatureChunkGenerator(base, null, null, 0, null, null, 107L, false, pages);
|
||||||
|
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||||
|
var encoded = PortFeatureChunkGenerator.CODEC.codec().encodeStart(ops, generator).getOrThrow();
|
||||||
|
var restored = PortFeatureChunkGenerator.CODEC.codec().parse(ops, encoded).getOrThrow();
|
||||||
|
check(restored.floodSurface() == 74, "codec water level");
|
||||||
|
check(restored.getBiomeSource().possibleBiomes().stream().allMatch(b -> b.is(Biomes.DESERT)),
|
||||||
|
"non-cave authored biome");
|
||||||
|
var method = RuntimeAgeBackend.class.getDeclaredMethod("dryCaveSettings", MinecraftServer.class);
|
||||||
|
method.setAccessible(true);
|
||||||
|
var dry = (NoiseGeneratorSettings) ((Holder<?>) method.invoke(null, server)).value();
|
||||||
|
check(dry.defaultFluid().isAir() && dry.aquifers().isEmpty() && dry.seaLevel() < dry.noiseSettings().minY(),
|
||||||
|
"dry Cave default");
|
||||||
|
check(FloodingRules.surface(Integer.MAX_VALUE, -64, 320) == 315, "water clamp");
|
||||||
|
check(FloodingRules.platformFloor(Integer.MAX_VALUE, -64, 320) + 1 == 317, "safe fallback height");
|
||||||
|
}
|
||||||
|
}
|
||||||
+58
@@ -0,0 +1,58 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.network.*;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.neoforged.api.distmarker.Dist;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid = "rivencraft", value = Dist.CLIENT)
|
||||||
|
public final class MatrixClient {
|
||||||
|
private static MatrixPayloads.Step pending;
|
||||||
|
private static int delay;
|
||||||
|
@SubscribeEvent public static void register(net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent event) {
|
||||||
|
event.register(MatrixPayloads.Step.TYPE, (payload, context) -> { pending = payload; delay = 0; });
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void tick(net.neoforged.neoforge.client.event.ClientTickEvent.Post event) {
|
||||||
|
var minecraft = Minecraft.getInstance();
|
||||||
|
// A player object/catalog can arrive before the receiving-level screen
|
||||||
|
// finishes. Real book input is only possible once normal play resumes.
|
||||||
|
if (pending == null || minecraft.player == null || minecraft.gui.screen() != null || ++delay < 8) return;
|
||||||
|
var step = pending; pending = null;
|
||||||
|
String result = "ok";
|
||||||
|
try {
|
||||||
|
switch (step.action()) {
|
||||||
|
case "bind" -> ClientPacketDistributor.sendToServer(new BindDescriptiveBookPayload(false, "Matrix Live A"));
|
||||||
|
case "enter" -> ClientPacketDistributor.sendToServer(new UseDescriptiveBookPayload(false));
|
||||||
|
case "return" -> ClientPacketDistributor.sendToServer(new UseLinkingBookPayload(false));
|
||||||
|
case "stale" -> {
|
||||||
|
ClientPacketDistributor.sendToServer(new AgeCatalogAckPayload(step.version()));
|
||||||
|
ClientPacketDistributor.sendToServer(new UseDescriptiveBookPayload(false));
|
||||||
|
}
|
||||||
|
case "verify" -> {
|
||||||
|
var listener = minecraft.getConnection();
|
||||||
|
if (listener == null || !listener.levels.contains(ResourceKey.create(Registries.DIMENSION, step.age())))
|
||||||
|
throw new AssertionError("missing live dimension");
|
||||||
|
String actual = PortAgeDescription.forClient(step.age()) + "|" + PortDayCycle.forClient(step.age());
|
||||||
|
if (!actual.equals(step.expected())) throw new AssertionError("environment differs: " + actual);
|
||||||
|
result = "verified";
|
||||||
|
}
|
||||||
|
case "verify_removed" -> {
|
||||||
|
var listener = minecraft.getConnection();
|
||||||
|
if (listener == null || listener.levels.contains(ResourceKey.create(Registries.DIMENSION, step.age())))
|
||||||
|
throw new AssertionError("retired dimension retained");
|
||||||
|
if (PortAgeDescription.forClient(step.age()) != null) throw new AssertionError("stale description retained");
|
||||||
|
result = "removed";
|
||||||
|
}
|
||||||
|
case "exit" -> { minecraft.stop(); return; }
|
||||||
|
default -> throw new AssertionError("unknown action");
|
||||||
|
}
|
||||||
|
} catch (Throwable error) { result = "FAIL " + error; }
|
||||||
|
ClientPacketDistributor.sendToServer(new MatrixPayloads.Report(result));
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
|
import net.minecraft.network.codec.ByteBufCodecs;
|
||||||
|
import net.minecraft.network.codec.StreamCodec;
|
||||||
|
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Test-only channels; these sources are never part of either shipping source set. */
|
||||||
|
public final class MatrixPayloads {
|
||||||
|
public record Step(String action, Identifier age, String expected, int version) implements CustomPacketPayload {
|
||||||
|
public static final Type<Step> TYPE = new Type<>(Identifier.fromNamespaceAndPath("rivencraft", "regression_step"));
|
||||||
|
public static final StreamCodec<RegistryFriendlyByteBuf, Step> CODEC = StreamCodec.composite(
|
||||||
|
ByteBufCodecs.STRING_UTF8, Step::action, Identifier.STREAM_CODEC, Step::age,
|
||||||
|
ByteBufCodecs.STRING_UTF8, Step::expected, ByteBufCodecs.VAR_INT, Step::version, Step::new);
|
||||||
|
@Override public Type<Step> type() { return TYPE; }
|
||||||
|
}
|
||||||
|
public record Report(String result) implements CustomPacketPayload {
|
||||||
|
public static final Type<Report> TYPE = new Type<>(Identifier.fromNamespaceAndPath("rivencraft", "regression_report"));
|
||||||
|
public static final StreamCodec<RegistryFriendlyByteBuf, Report> CODEC =
|
||||||
|
StreamCodec.composite(ByteBufCodecs.STRING_UTF8, Report::result, Report::new);
|
||||||
|
@Override public Type<Report> type() { return TYPE; }
|
||||||
|
}
|
||||||
|
private MatrixPayloads() {}
|
||||||
|
}
|
||||||
+208
@@ -0,0 +1,208 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.*;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkBookTarget;
|
||||||
|
import net.dnorberg.rivencraft.network.PortBookNetworking;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
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.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.storage.LevelResource;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.network.PacketDistributor;
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid = "rivencraft")
|
||||||
|
public final class MatrixServer {
|
||||||
|
private static final Map<String, String> reports = new HashMap<>();
|
||||||
|
private static int phase, ticks, checks;
|
||||||
|
private static boolean initialized, restart, finished;
|
||||||
|
private static Identifier a, b;
|
||||||
|
private static long seed;
|
||||||
|
private static final long RESEED = 102030405060L;
|
||||||
|
|
||||||
|
@SubscribeEvent public static void payloads(net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent event) {
|
||||||
|
var registrar = event.registrar("matrix-1");
|
||||||
|
registrar.playToClient(MatrixPayloads.Step.TYPE, MatrixPayloads.Step.CODEC);
|
||||||
|
registrar.playToServer(MatrixPayloads.Report.TYPE, MatrixPayloads.Report.CODEC, (payload, context) -> {
|
||||||
|
if (context.player() instanceof ServerPlayer player) {
|
||||||
|
if (payload.result().startsWith("FAIL")) {
|
||||||
|
finished = true; System.out.println("MC263_MATRIX FAIL " + player.getName().getString() + ": " + payload.result()); return;
|
||||||
|
}
|
||||||
|
reports.put(player.getName().getString(), payload.result());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void check(boolean ok, String message) {
|
||||||
|
if (!ok) throw new AssertionError(message);
|
||||||
|
checks++;
|
||||||
|
}
|
||||||
|
private static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft", path); }
|
||||||
|
private static Path marker(MinecraftServer server) { return server.getWorldPath(LevelResource.ROOT).resolve("matrix.properties"); }
|
||||||
|
private static void phase(int next, String label) {
|
||||||
|
phase = next; ticks = 0; reports.clear();
|
||||||
|
System.out.println("MC263_MATRIX PHASE " + next + " " + label);
|
||||||
|
}
|
||||||
|
private static List<ServerPlayer> players(MinecraftServer server) {
|
||||||
|
return server.getPlayerList().getPlayers().stream().sorted(Comparator.comparing(p -> p.getName().getString())).toList();
|
||||||
|
}
|
||||||
|
private static void send(ServerPlayer player, String action, Identifier age, String expected, int version) {
|
||||||
|
PacketDistributor.sendToPlayer(player, new MatrixPayloads.Step(action, age, expected, version));
|
||||||
|
}
|
||||||
|
private static void both(MinecraftServer server, String action, Identifier age, String expected) {
|
||||||
|
for (var player : players(server)) send(player, action, age, expected, 0);
|
||||||
|
}
|
||||||
|
private static void give(ServerPlayer player, ItemStack book) {
|
||||||
|
player.getInventory().setSelectedSlot(0);
|
||||||
|
player.getInventory().setItem(0, book.copy());
|
||||||
|
player.containerMenu.broadcastChanges();
|
||||||
|
}
|
||||||
|
private static ItemStack book(Identifier age) {
|
||||||
|
var stack = new ItemStack(Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
stack.set(Rivencraft.AGE_BOOK_ID.get(), age);
|
||||||
|
return stack;
|
||||||
|
}
|
||||||
|
private static boolean ready(MinecraftServer server, Identifier age) {
|
||||||
|
return players(server).size() == 2 && players(server).stream().allMatch(p -> AgeCatalogSync.ready(p, age));
|
||||||
|
}
|
||||||
|
private static boolean arrived(MinecraftServer server, Identifier age) {
|
||||||
|
return players(server).size() == 2 && players(server).stream().allMatch(p -> p.level().dimension().identifier().equals(age));
|
||||||
|
}
|
||||||
|
private static boolean reported(String expected) {
|
||||||
|
return reports.size() == 2 && reports.values().stream().allMatch(expected::equals);
|
||||||
|
}
|
||||||
|
private static String presentation(MinecraftServer server, Identifier age) {
|
||||||
|
return RuntimeAgeBackend.loadedDescriptions(server).get(age) + "|" + RuntimeAgeBackend.savedDayCycles(server).get(age);
|
||||||
|
}
|
||||||
|
private static void enter(MinecraftServer server, Identifier age) {
|
||||||
|
for (var player : players(server)) { give(player, book(age)); send(player, "enter", age, "", 0); }
|
||||||
|
}
|
||||||
|
private static void leave(MinecraftServer server) {
|
||||||
|
var source = server.overworld();
|
||||||
|
for (var player : players(server)) {
|
||||||
|
int x = player.getName().getString().endsWith("One") ? -4 : 4;
|
||||||
|
int y = source.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING, x, 0);
|
||||||
|
var stack = new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
stack.set(Rivencraft.LINK_BOOK_TARGET.get(), new LinkBookTarget(Level.OVERWORLD.identifier(), x + .5, y, .5, 0, 0));
|
||||||
|
give(player, stack); send(player, "return", Level.OVERWORLD.identifier(), "", 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent public static void tick(net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) {
|
||||||
|
if (finished) return;
|
||||||
|
var server = event.getServer();
|
||||||
|
try {
|
||||||
|
if (!initialized) {
|
||||||
|
initialized = true;
|
||||||
|
restart = Files.exists(marker(server));
|
||||||
|
if (restart) {
|
||||||
|
var p = new Properties();
|
||||||
|
try (var input = Files.newInputStream(marker(server))) { p.load(input); }
|
||||||
|
a = Identifier.parse(p.getProperty("a")); b = Identifier.parse(p.getProperty("b"));
|
||||||
|
seed = Long.parseLong(p.getProperty("seed"));
|
||||||
|
}
|
||||||
|
phase(0, restart ? "await restarted clients" : "await two connected clients");
|
||||||
|
}
|
||||||
|
ticks++;
|
||||||
|
var ps = players(server);
|
||||||
|
if (phase == 0) {
|
||||||
|
if (ps.size() != 2 || !ready(server, restart ? a : Level.OVERWORLD.identifier())) return;
|
||||||
|
for (var player : ps) player.setGameMode(net.minecraft.world.level.GameType.CREATIVE);
|
||||||
|
if (restart) {
|
||||||
|
check(arrived(server, a), "both saved players restored in Age A");
|
||||||
|
check(RuntimeAgeBackend.savedAges(server).get(a) == seed, "reseed survives full restart");
|
||||||
|
check(!RuntimeAgeBackend.savedAges(server).containsKey(b), "retired Age not restored");
|
||||||
|
both(server, "verify", a, presentation(server, a)); phase(20, "restarted catalog and presentation");
|
||||||
|
} else {
|
||||||
|
PortConfig.RANDOM_PAGE_ALLOWLIST.set(List.of("terrain/flat", "biome/single", "biome/minecraft/plains",
|
||||||
|
"sky/static", "weather/storm", "lighting/bright"));
|
||||||
|
give(ps.getFirst(), new ItemStack(Rivencraft.DESCRIPTIVE_BOOK.get()));
|
||||||
|
send(ps.getFirst(), "bind", Level.OVERWORLD.identifier(), "", 0);
|
||||||
|
phase(1, "normal handheld binding with both clients online");
|
||||||
|
}
|
||||||
|
} else if (phase == 1) {
|
||||||
|
var age = ps.getFirst().getMainHandItem().get(Rivencraft.AGE_BOOK_ID.get());
|
||||||
|
if (age == null || !ready(server, age)) return;
|
||||||
|
a = age;
|
||||||
|
check(ps.stream().allMatch(p -> p.level().dimension() == Level.OVERWORLD), "creation does not teleport either player");
|
||||||
|
both(server, "verify", a, presentation(server, a)); phase(2, "new catalog reached both clients without reconnect");
|
||||||
|
} else if (phase == 2 && reported("verified")) {
|
||||||
|
b = PortBookNetworking.createAge(ps.getLast(), "Matrix Authored B", List.of(
|
||||||
|
id("terrain/flat"), id("biome/single"), id("biome/minecraft/plains"),
|
||||||
|
id("sky/end"), id("lighting/dark"), id("weather/off")));
|
||||||
|
check(b != null && !a.equals(b), "distinct authored Age from normal Binder backend");
|
||||||
|
phase(3, "expanded authored catalog");
|
||||||
|
} else if (phase == 3 && ready(server, b)) {
|
||||||
|
both(server, "verify", b, presentation(server, b)); phase(4, "authored environment arrived at both clients");
|
||||||
|
} else if (phase == 4 && reported("verified")) {
|
||||||
|
enter(server, a); phase(5, "normal books enter live-created Age A");
|
||||||
|
} else if (phase == 5 && arrived(server, a)) {
|
||||||
|
check(true, "both clients entered live-created A");
|
||||||
|
leave(server); phase(6, "normal Linking Books return");
|
||||||
|
} else if (phase == 6 && arrived(server, Level.OVERWORLD.identifier())) {
|
||||||
|
// Deliberately withhold readiness; the stale acknowledgement itself is a real client payload.
|
||||||
|
var field = AgeCatalogSync.class.getDeclaredField("STATES"); field.setAccessible(true);
|
||||||
|
var state = ((Map<?, ?>) field.get(null)).get(server);
|
||||||
|
var ack = state.getClass().getDeclaredField("acknowledged"); ack.setAccessible(true);
|
||||||
|
((Map<?, ?>) ack.get(state)).remove(ps.getLast().getUUID());
|
||||||
|
var version = state.getClass().getDeclaredField("version"); version.setAccessible(true);
|
||||||
|
give(ps.getLast(), book(a));
|
||||||
|
send(ps.getLast(), "stale", a, "", version.getInt(state) - 1);
|
||||||
|
phase(7, "stale acknowledgement and failed travel");
|
||||||
|
} else if (phase == 7 && ticks >= 30 && reports.containsKey(ps.getLast().getName().getString())) {
|
||||||
|
check(ps.getLast().level().dimension() == Level.OVERWORLD, "unacknowledged travel stays at source");
|
||||||
|
check(!AgeCatalogSync.ready(ps.getLast(), a), "stale payload did not acknowledge current catalog");
|
||||||
|
AgeCatalogSync.onCatalogChanged(server); phase(8, "fresh catalog recovery");
|
||||||
|
} else if (phase == 8 && ready(server, b)) {
|
||||||
|
enter(server, b); phase(9, "normal books enter authored Age B");
|
||||||
|
} else if (phase == 9 && arrived(server, b)) {
|
||||||
|
boolean refused = false;
|
||||||
|
try { RuntimeAgeBackend.unload(server, b); } catch (RuntimeException expected) { refused = true; }
|
||||||
|
check(refused, "occupied Age unload refused");
|
||||||
|
leave(server); phase(10, "vacate before lifecycle operations");
|
||||||
|
} else if (phase == 10 && arrived(server, Level.OVERWORLD.identifier())) {
|
||||||
|
RuntimeAgeBackend.unload(server, a);
|
||||||
|
check(server.getLevel(ResourceKey.create(Registries.DIMENSION, a)) == null, "unload removed live level");
|
||||||
|
RuntimeAgeBackend.reload(server, a);
|
||||||
|
RuntimeAgeBackend.reseed(server, a, RESEED);
|
||||||
|
check(RuntimeAgeBackend.savedAges(server).get(a) == RESEED, "new seed persisted");
|
||||||
|
RuntimeAgeBackend.retire(server, b);
|
||||||
|
check(!RuntimeAgeBackend.savedAges(server).containsKey(b), "retired B removed from catalog");
|
||||||
|
phase(11, "unload reload reseed retire catalog propagation");
|
||||||
|
} else if (phase == 11 && ready(server, a)) {
|
||||||
|
both(server, "verify_removed", b, ""); phase(12, "both clients removed retired dimension");
|
||||||
|
} else if (phase == 12 && reported("removed")) {
|
||||||
|
enter(server, b); phase(13, "stale retired book cannot recreate B");
|
||||||
|
} else if (phase == 13 && ticks >= 30 && reported("ok")) {
|
||||||
|
check(arrived(server, Level.OVERWORLD.identifier()), "retired books leave players at source");
|
||||||
|
enter(server, a); phase(14, "save both players inside surviving Age");
|
||||||
|
} else if (phase == 14 && arrived(server, a)) {
|
||||||
|
var p = new Properties(); p.setProperty("a", a.toString()); p.setProperty("b", b.toString());
|
||||||
|
p.setProperty("seed", Long.toString(RESEED));
|
||||||
|
try (var output = Files.newOutputStream(marker(server))) { p.store(output, "Disposable multiplayer restart evidence"); }
|
||||||
|
both(server, "exit", a, ""); finished = true;
|
||||||
|
System.out.println("MC263_MATRIX FIRST_PASS checks=" + checks);
|
||||||
|
} else if (phase == 20 && reported("verified")) {
|
||||||
|
both(server, "verify_removed", b, ""); phase(21, "retirement persisted through restart");
|
||||||
|
} else if (phase == 21 && reported("removed")) {
|
||||||
|
leave(server); phase(22, "return linking works after reconnect and restart");
|
||||||
|
} else if (phase == 22 && arrived(server, Level.OVERWORLD.identifier())) {
|
||||||
|
check(true, "both players returned after full restart");
|
||||||
|
both(server, "exit", a, ""); finished = true;
|
||||||
|
System.out.println("MC263_MATRIX RESTART_PASS checks=" + checks);
|
||||||
|
}
|
||||||
|
} catch (Throwable error) {
|
||||||
|
finished = true; System.out.println("MC263_MATRIX FAIL phase=" + phase); error.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
import java.util.*;
|
||||||
|
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||||
|
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.world.level.biome.*;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public final class NativeBiomeProbe {
|
||||||
|
static net.dnorberg.rivencraft.writing.WritingEntry page(String path) {
|
||||||
|
return net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||||
|
new net.dnorberg.rivencraft.writing.SymbolReference(id(path)));
|
||||||
|
}
|
||||||
|
static int checks;
|
||||||
|
static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; }
|
||||||
|
static ResourceLocation id(String path) { return ResourceLocation.fromNamespaceAndPath("rivencraft",path); }
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); }
|
||||||
|
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||||
|
finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
static void run(MinecraftServer server) throws Exception {
|
||||||
|
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||||
|
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||||
|
nether.remove(ResourceLocation.parse("terrablender:deferred_placeholder"));
|
||||||
|
var caves=NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||||
|
check(caves.size()>=3,"Multiple baseline caves");
|
||||||
|
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||||
|
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||||
|
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||||
|
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||||
|
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||||
|
bind.setAccessible(true);
|
||||||
|
var old=lush.tags().toList();
|
||||||
|
try {
|
||||||
|
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||||
|
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||||
|
"Nether wins over overlapping Cave tag");
|
||||||
|
} finally { bind.invoke(lush,old); }
|
||||||
|
if(!nether.isEmpty()) {
|
||||||
|
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||||
|
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||||
|
var original=biome.tags().toList();
|
||||||
|
try {
|
||||||
|
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(NativeBiomePools.CAVES);
|
||||||
|
bind.invoke(biome,tags);
|
||||||
|
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||||
|
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||||
|
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||||
|
} finally { bind.invoke(biome,original); }
|
||||||
|
}
|
||||||
|
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||||
|
try {
|
||||||
|
registry.listElements().forEach(biome->{
|
||||||
|
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||||
|
var stripped=new ArrayList<>(tags);stripped.remove(NativeBiomePools.CAVES);
|
||||||
|
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||||
|
});
|
||||||
|
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||||
|
"Empty cave tag has non-Nether vanilla fallback");
|
||||||
|
} finally {
|
||||||
|
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||||
|
}
|
||||||
|
var traits=AgeTraits.select(111L).withBiomeDistribution(AgeTraits.BiomeDistribution.NATIVE);
|
||||||
|
var sourceMethod=AgeDimensionService.class.getDeclaredMethod("createBiomeSource",
|
||||||
|
MinecraftServer.class,AgeDefinition.class,AgeRuntimeProfile.class);
|
||||||
|
sourceMethod.setAccessible(true);
|
||||||
|
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||||
|
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||||
|
var writing=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||||
|
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/"+terrain),
|
||||||
|
page("biome/native_"+family.name().toLowerCase(Locale.ROOT))));
|
||||||
|
var plan=AgeGenerationPlan.compile(writing,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||||
|
check(plan.biomeSelection().nativeKind()==family,"Family on "+terrain);
|
||||||
|
check(plan.biomeSelection().biomes().equals(NativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||||
|
var loaded=AgeGenerationPlan.load(plan.save());
|
||||||
|
check(loaded.biomeSelection().equals(plan.biomeSelection()),"Plan reload");
|
||||||
|
var age=new AgeDefinition(UUID.randomUUID(),"probe",111L,AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeDefinition.CURRENT_GENERATION_VERSION,0L,id("age/probe"),null,traits,loaded);
|
||||||
|
var source=(BiomeSource)sourceMethod.invoke(null,server,age,loaded.runtimeProfile());
|
||||||
|
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().location()).collect(java.util.stream.Collectors.toSet())
|
||||||
|
.equals(new HashSet<>(plan.biomeSelection().biomes())),"Generator consumes family on "+terrain);
|
||||||
|
}
|
||||||
|
var repeated=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||||
|
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/flat"),
|
||||||
|
page("biome/native_nether"),page("biome/native_end")));
|
||||||
|
check(AgeGenerationPlan.compile(repeated,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||||
|
.biomeSelection().nativeKind()==NativeBiomeKind.END,"Last family controller wins");
|
||||||
|
var caveProfile=AgeRuntimeProfiles.resolve(AgeGenerationProfiles.CAVE);
|
||||||
|
var empty=net.dnorberg.rivencraft.writing.WritingGrammar.parse(net.dnorberg.rivencraft.writing.OrderedWriting.EMPTY);
|
||||||
|
var omitted=AgeBiomeSelection.compile(empty,traits,caveProfile,111L,server.registryAccess());
|
||||||
|
check(omitted.nativeKind()==NativeBiomeKind.CAVES && omitted.biomes().equals(caves),"Seed-completed Cave Native");
|
||||||
|
var nativeWriting=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||||
|
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),page("biome/native")));
|
||||||
|
check(AgeGenerationPlan.compile(nativeWriting,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||||
|
.biomeSelection().biomes().equals(caves),"Explicit Cave Native");
|
||||||
|
var authored=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||||
|
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),
|
||||||
|
page("biome/crimson_forest"),page("biome/single")));
|
||||||
|
check(AgeGenerationPlan.compile(authored,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||||
|
.biomeSelection().biomes().equals(List.of(ResourceLocation.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||||
|
var oldPool=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(
|
||||||
|
ResourceLocation.withDefaultNamespace("lush_caves"),ResourceLocation.withDefaultNamespace("crimson_forest")));
|
||||||
|
var tag=oldPool.save();tag.remove("NativeKind");
|
||||||
|
check(AgeBiomeSelection.load(tag).equals(oldPool),"Old frozen mixed pool retained");
|
||||||
|
var one=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(ResourceLocation.withDefaultNamespace("lush_caves")),NativeBiomeKind.CAVES);
|
||||||
|
check(AgeBiomeSelection.load(one.save()).equals(one),"Single-cave pool is valid");
|
||||||
|
var policy=new RandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||||
|
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Controller lists do not restrict individual biomes");
|
||||||
|
String name=null;
|
||||||
|
for(int i=0;i<10000;i++) {
|
||||||
|
String candidate="native111_"+i;
|
||||||
|
long seed=server.overworld().getSeed()+AgeDefinition.namedDimensionId(candidate).hashCode();
|
||||||
|
if(AgeRuntimeProfiles.select(seed).equals(AgeGenerationProfiles.CAVE)
|
||||||
|
&& AgeTraits.select(seed).biomeDistribution()==AgeTraits.BiomeDistribution.NATIVE) {name=candidate;break;}
|
||||||
|
}
|
||||||
|
check(name!=null,"Find random Native Cave seed");
|
||||||
|
var age=AgeRegistrySavedData.resolveOrCreate(server.overworld(),new AgeReference(UUID.randomUUID(),name));
|
||||||
|
check(age.randomBiomes()!=null && age.randomBiomes().nativeKind()==NativeBiomeKind.CAVES,"Random Native Cave frozen at creation");
|
||||||
|
check(age.withSpawn(new net.minecraft.core.BlockPos(0,64,0)).randomBiomes().equals(age.randomBiomes()),"Spawn update preserves pool");
|
||||||
|
var saved=AgeRegistrySavedData.get(server.overworld()).save(new net.minecraft.nbt.CompoundTag(),server.registryAccess());
|
||||||
|
var restored=AgeRegistrySavedData.load(saved,server.registryAccess()).find(age.id()).orElseThrow();
|
||||||
|
check(restored.randomBiomes().equals(age.randomBiomes()),"Random pool registry round trip");
|
||||||
|
|
||||||
|
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||||
|
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||||
|
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||||
|
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||||
|
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
import java.util.*;
|
||||||
|
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||||
|
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.world.level.biome.*;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public final class NativeBiomeProbe {
|
||||||
|
static int checks;
|
||||||
|
static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; }
|
||||||
|
static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft",path); }
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); }
|
||||||
|
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||||
|
finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
static void run(MinecraftServer server) throws Exception {
|
||||||
|
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||||
|
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||||
|
nether.remove(Identifier.parse("terrablender:deferred_placeholder"));
|
||||||
|
var caves=PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||||
|
check(caves.size()>=3,"Multiple baseline caves");
|
||||||
|
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||||
|
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||||
|
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||||
|
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||||
|
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||||
|
bind.setAccessible(true);
|
||||||
|
var old=lush.tags().toList();
|
||||||
|
try {
|
||||||
|
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||||
|
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||||
|
"Nether wins over overlapping Cave tag");
|
||||||
|
} finally { bind.invoke(lush,old); }
|
||||||
|
if(!nether.isEmpty()) {
|
||||||
|
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||||
|
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||||
|
var original=biome.tags().toList();
|
||||||
|
try {
|
||||||
|
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(PortNativeBiomePools.CAVES);
|
||||||
|
bind.invoke(biome,tags);
|
||||||
|
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||||
|
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||||
|
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||||
|
} finally { bind.invoke(biome,original); }
|
||||||
|
}
|
||||||
|
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||||
|
try {
|
||||||
|
registry.listElements().forEach(biome->{
|
||||||
|
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||||
|
var stripped=new ArrayList<>(tags);stripped.remove(PortNativeBiomePools.CAVES);
|
||||||
|
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||||
|
});
|
||||||
|
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||||
|
"Empty cave tag has non-Nether vanilla fallback");
|
||||||
|
} finally {
|
||||||
|
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||||
|
}
|
||||||
|
var sourceMethod=RuntimeAgeBackend.class.getDeclaredMethod("authoredBiomeSource",
|
||||||
|
MinecraftServer.class,PortBiomePlan.class,long.class);sourceMethod.setAccessible(true);
|
||||||
|
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||||
|
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||||
|
var selected=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||||
|
id("terrain/"+terrain),id("biome/native_"+family.name().toLowerCase(Locale.ROOT))),111L);
|
||||||
|
var plan=selected.biomes();
|
||||||
|
check(plan.nativeKind()==family,"Family on "+terrain);
|
||||||
|
check(plan.biomes().equals(PortNativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||||
|
var saved=PortBiomePlan.CODEC.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,plan).getOrThrow();
|
||||||
|
check(PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().equals(plan),"Plan codec reload");
|
||||||
|
var source=(BiomeSource)sourceMethod.invoke(null,server,plan,111L);
|
||||||
|
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().identifier()).collect(java.util.stream.Collectors.toSet())
|
||||||
|
.equals(new HashSet<>(plan.biomes())),"Source consumes family");
|
||||||
|
}
|
||||||
|
check(net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(List.of(id("terrain/flat"),
|
||||||
|
id("biome/native_nether"),id("biome/native_end")),server,111L).nativeKind()==NativeBiomeKind.END,
|
||||||
|
"Last family controller wins even for direct compiler calls");
|
||||||
|
var explicit=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||||
|
List.of(id("terrain/cave"),id("biome/native")),111L).biomes();
|
||||||
|
check(explicit.nativeKind()==NativeBiomeKind.CAVES && explicit.biomes().equals(caves),"Explicit Cave Native");
|
||||||
|
long nativeSeed=0;
|
||||||
|
while(PortRandomAgeSelection.distribution(nativeSeed)!=PortBiomePlan.Distribution.NATIVE)nativeSeed++;
|
||||||
|
var omitted=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||||
|
List.of(id("terrain/cave")),nativeSeed).biomes();
|
||||||
|
check(omitted.nativeKind()==NativeBiomeKind.CAVES,"Seed-completed Native Cave");
|
||||||
|
long randomSeed=0;
|
||||||
|
while(PortRandomAgeSelection.terrain(randomSeed)!=PortAgeTerrain.CAVE
|
||||||
|
|| PortRandomAgeSelection.distribution(randomSeed)!=PortBiomePlan.Distribution.NATIVE)randomSeed++;
|
||||||
|
var random=PortRandomAgeSelection.select(server,randomSeed);
|
||||||
|
check(random.biomes().nativeKind()==NativeBiomeKind.CAVES && random.biomes().biomes().equals(caves),"Random Native Cave");
|
||||||
|
var authored=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||||
|
id("terrain/cave"),id("biome/crimson_forest"),id("biome/single")),111L).biomes();
|
||||||
|
check(authored.biomes().equals(List.of(Identifier.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||||
|
var oldJson=com.google.gson.JsonParser.parseString(
|
||||||
|
"{\"distribution\":\"NATIVE\",\"biomes\":[\"minecraft:lush_caves\",\"minecraft:crimson_forest\"]}");
|
||||||
|
var oldPool=PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,oldJson).getOrThrow();
|
||||||
|
check(oldPool.nativeKind()==NativeBiomeKind.TERRAIN && oldPool.biomes().size()==2,"Old frozen mixed pool retained");
|
||||||
|
var policy=new PortRandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||||
|
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Policy category");
|
||||||
|
int n=0;
|
||||||
|
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) {
|
||||||
|
var terrain=family==NativeBiomeKind.CAVES?PortAgeTerrain.VOID:family==NativeBiomeKind.NETHER?PortAgeTerrain.STANDARD:PortAgeTerrain.CAVE;
|
||||||
|
var plan=new PortBiomePlan(PortBiomePlan.Distribution.NATIVE,PortNativeBiomePools.pool(server.registryAccess(),family),family);
|
||||||
|
var age=RuntimeAgeBackend.create(server,id("age/native111_"+n++),111L,plan,terrain);
|
||||||
|
check(age.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().size()==plan.biomes().size(),"Runtime terrain override "+terrain);
|
||||||
|
}
|
||||||
|
check(registry.get(ResourceKey.create(Registries.BIOME,Identifier.withDefaultNamespace("sulfur_caves"))).isEmpty()
|
||||||
|
|| caves.contains(Identifier.withDefaultNamespace("sulfur_caves")),"New vanilla Sulfur Caves included");
|
||||||
|
|
||||||
|
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||||
|
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||||
|
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||||
|
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||||
|
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.compat.*;
|
||||||
|
import net.dnorberg.rivencraft.portal.*;
|
||||||
|
import net.dnorberg.rivencraft.block.*;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkBookTarget;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public final class PortalEngineProbe {
|
||||||
|
private static int checks;
|
||||||
|
@SubscribeEvent public static void join(net.neoforged.neoforge.event.entity.EntityJoinLevelEvent event) {
|
||||||
|
if(event.getEntity().getClass().getName().startsWith("qouteall.imm_ptl"))
|
||||||
|
System.out.println("PORTAL117_SPAWN "+event.getEntity()+" at "+event.getEntity().getBoundingBox());
|
||||||
|
}
|
||||||
|
private static void check(boolean pass,String label) {
|
||||||
|
if(!pass) throw new AssertionError(label);
|
||||||
|
checks++;
|
||||||
|
}
|
||||||
|
private static int warmup;
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().overworld().setChunkForced(0,0,true);
|
||||||
|
warmup=3;
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void tick(net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) {
|
||||||
|
if(warmup<=0 || --warmup!=0) return;
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try {
|
||||||
|
run(event.getServer());
|
||||||
|
System.out.println("PORTAL117_PASS checks="+checks);
|
||||||
|
}catch(Throwable error) {
|
||||||
|
System.out.println("PORTAL117_FAIL "+error);
|
||||||
|
error.printStackTrace();
|
||||||
|
}finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
private static void run(net.minecraft.server.MinecraftServer server) {
|
||||||
|
boolean nativeViews=ImmersiveBookPreviews.available();
|
||||||
|
check(ImmersiveBookPreviews.bookViewsEnabled()==nativeViews,"Default book view selection");
|
||||||
|
check(ImmersiveBookPreviews.crystalViewsEnabled()==nativeViews,"Default crystal view selection");
|
||||||
|
var id=Identifier.parse("rivencraft:age/portal117");
|
||||||
|
var destination=RuntimeAgeBackend.create(server,id,117L,null,PortAgeTerrain.FLAT);
|
||||||
|
check(ImmersivePortalsCompatibility.synchronize(server),"Dynamic catalog sync");
|
||||||
|
check(server.getLevel(destination.dimension())==destination,"First-party Age remains authoritative");
|
||||||
|
destination.getChunkAt(new BlockPos(24,4,24));
|
||||||
|
var level=server.overworld();
|
||||||
|
level.getChunk(0,0);
|
||||||
|
var owner=new BlockPos(7,65,7);
|
||||||
|
for(int x=7;x<=10;x++) for(int y=64;y<=68;y++)
|
||||||
|
if(x==7 || x==10 || y==64 || y==68)
|
||||||
|
level.setBlock(new BlockPos(x,y,8),Rivencraft.CRYSTAL_BLOCK.get().defaultBlockState(),2);
|
||||||
|
level.setBlock(owner,Rivencraft.BOOK_RECEPTACLE.get().defaultBlockState()
|
||||||
|
.setValue(BookReceptacleBlock.FACING,Direction.NORTH),2);
|
||||||
|
var holder=(BookReceptacleBlockEntity)level.getBlockEntity(owner);
|
||||||
|
var book=new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
book.set(Rivencraft.LINK_BOOK_TARGET.get(),new LinkBookTarget(id,24.5,4,24.5,90,0));
|
||||||
|
holder.setBook(book);
|
||||||
|
var plan=CrystalPortalNetwork.plan(level,owner);
|
||||||
|
check(plan.valid() && plan.portalCells().size()==6,"One six-cell opening");
|
||||||
|
check(CrystalPortalNetwork.activate(level,owner,plan,null),"Frame activation");
|
||||||
|
System.out.println("PORTAL117_SURFACES "+CrystalPortalSurfaces.group(level,plan));
|
||||||
|
System.out.println("PORTAL117_DEST "+PortalBookTravel.destination(level,book,owner,0,0));
|
||||||
|
if(nativeViews) System.out.println("PORTAL117_NATIVE "+Native.count(level,owner));
|
||||||
|
check(plan.portalCells().stream().allMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)==nativeViews),
|
||||||
|
"Native or fallback state");
|
||||||
|
if(nativeViews) Native.checkViews(level,owner,plan,id);
|
||||||
|
CrystalPortalNetwork.shutdown(level,owner);
|
||||||
|
if(nativeViews) check(Native.count(level,owner)==0,"Shutdown removes native surfaces");
|
||||||
|
check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).is(Rivencraft.CRYSTAL_PORTAL.get())),
|
||||||
|
"Shutdown removes cells");
|
||||||
|
}
|
||||||
|
private static final class Native {
|
||||||
|
static java.util.List<qouteall.imm_ptl.core.portal.Portal> portals(
|
||||||
|
net.minecraft.server.level.ServerLevel level,BlockPos owner) {
|
||||||
|
return level.getEntitiesOfClass(qouteall.imm_ptl.core.portal.Portal.class,new AABB(owner).inflate(20),
|
||||||
|
e->e.portalTag!=null && e.portalTag.startsWith("rivencraft:crystal:mc263:v1:"));
|
||||||
|
}
|
||||||
|
static int count(net.minecraft.server.level.ServerLevel level,BlockPos owner) { return portals(level,owner).size(); }
|
||||||
|
static void checkViews(net.minecraft.server.level.ServerLevel level,BlockPos owner,
|
||||||
|
CrystalPortalNetwork.Plan plan,Identifier id) {
|
||||||
|
var views=portals(level,owner);
|
||||||
|
check(views.size()==2,"One continuous mesh per side, not six repeated views");
|
||||||
|
for(var view:views) {
|
||||||
|
check(!view.getTeleportable() && !view.isInteractable(),"Rivencraft retains travel/interactions");
|
||||||
|
double spanX=Math.abs(view.getAxisW().x*view.getWidth())+Math.abs(view.getAxisH().x*view.getHeight());
|
||||||
|
double spanY=Math.abs(view.getAxisW().y*view.getWidth())+Math.abs(view.getAxisH().y*view.getHeight());
|
||||||
|
check(Math.abs(spanX-2)<0.00001 && Math.abs(spanY-3)<0.00001,"Whole opening dimensions");
|
||||||
|
var eye=new net.minecraft.world.phys.Vec3(9,65+1.62,8.5);
|
||||||
|
check(view.transformPoint(eye).distanceTo(new net.minecraft.world.phys.Vec3(24.5,4+1.62,24.5))<0.00001,
|
||||||
|
"Standing eye maps to exact linked arrival");
|
||||||
|
check(view.getDestDim().identifier().equals(id),"Dynamic destination");
|
||||||
|
check(view.getPortalShape() instanceof qouteall.imm_ptl.core.portal.shape.SpecialFlatPortalShape,
|
||||||
|
"Masked opening mesh");
|
||||||
|
}
|
||||||
|
var ids=views.stream().map(net.minecraft.world.entity.Entity::getUUID).collect(java.util.stream.Collectors.toSet());
|
||||||
|
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||||
|
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||||
|
check(portals(level,owner).stream().allMatch(p->ids.contains(p.getUUID())),"Refresh reuses existing views");
|
||||||
|
var setting=ImmersiveBookPreviews.seamless()?PortConfig.SEAMLESS_CRYSTAL_VIEWS:PortConfig.CRYSTAL_LIVE_VIEWS;
|
||||||
|
setting.set(false);
|
||||||
|
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||||
|
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||||
|
check(count(level,owner)==0,"Config disable removes views");
|
||||||
|
check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)),
|
||||||
|
"Disabled config restores animated fallback");
|
||||||
|
setting.set(true);
|
||||||
|
ImmersiveCrystalPortals.refresh(level,owner,plan,
|
||||||
|
((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook());
|
||||||
|
check(count(level,owner)==2,"Config enable rebuilds views");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+70
@@ -0,0 +1,70 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
import java.util.List;
|
||||||
|
import io.netty.buffer.Unpooled;
|
||||||
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
import net.dnorberg.rivencraft.book.*;
|
||||||
|
import net.dnorberg.rivencraft.writing.*;
|
||||||
|
import net.dnorberg.rivencraft.network.AgeCelestialAnglePayload;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public class StaticSkyProbe {
|
||||||
|
static int checks;
|
||||||
|
static void check(boolean condition,String label) {
|
||||||
|
if(!condition) throw new AssertionError(label);
|
||||||
|
checks++;
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try {
|
||||||
|
run(event.getServer());
|
||||||
|
System.out.println("STATIC109_PASS checks="+checks);
|
||||||
|
}catch(Throwable error) {
|
||||||
|
System.out.println("STATIC109_FAIL "+error);
|
||||||
|
error.printStackTrace();
|
||||||
|
}finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
static WritingEntry page(String id) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath("rivencraft",id)));
|
||||||
|
}
|
||||||
|
static AgeGenerationPlan plan(net.minecraft.server.MinecraftServer server,String... ids) {
|
||||||
|
var entries=new java.util.ArrayList<WritingEntry>();
|
||||||
|
entries.add(WritingEntry.linkPanel());
|
||||||
|
for(var id:ids) entries.add(page(id));
|
||||||
|
return AgeGenerationPlan.compile(new OrderedWriting(entries),109L,
|
||||||
|
AgeGenerationProfiles.STANDARD,AgeTraits.select(109L),server.registryAccess());
|
||||||
|
}
|
||||||
|
static void run(net.minecraft.server.MinecraftServer server) {
|
||||||
|
String[][] pages={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"},
|
||||||
|
{"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"},
|
||||||
|
{"number/24","number/24","sky/static"}};
|
||||||
|
int[] expected={48,1,8,48,128,128};
|
||||||
|
for(int i=0;i<pages.length;i++) {
|
||||||
|
var plan=plan(server,pages[i]);
|
||||||
|
check(plan.writingInstability()==0,"No number/order penalty");
|
||||||
|
var sky=AgeSkyProfile.compile(plan,AgeTraits.select(109L));
|
||||||
|
check(sky.staticResolution()==expected[i],"Resolution");
|
||||||
|
var loaded=AgeGenerationPlan.load(plan.save());
|
||||||
|
check(AgeSkyProfile.compile(loaded,AgeTraits.select(109L)).equals(sky),"Frozen plan persistence");
|
||||||
|
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),server.registryAccess());
|
||||||
|
try {
|
||||||
|
var packet=new AgeCelestialAnglePayload(net.minecraft.world.level.Level.OVERWORLD,0F,sky);
|
||||||
|
AgeCelestialAnglePayload.STREAM_CODEC.encode(buffer,packet);
|
||||||
|
check(AgeCelestialAnglePayload.STREAM_CODEC.decode(buffer).equals(packet),"Network round trip");
|
||||||
|
check(buffer.readableBytes()==0,"No unread bytes");
|
||||||
|
}finally { buffer.release(); }
|
||||||
|
}
|
||||||
|
var color=plan(server,"number/10","color/red","number/8","sky/static");
|
||||||
|
var sky=AgeSkyProfile.compile(color,AgeTraits.select(109L));
|
||||||
|
check(sky.color()==0x640000 && sky.staticResolution()==8,"Independent color and resolution");
|
||||||
|
check(AgeSkyProfile.compile(plan(server,"sky/overworld"),AgeTraits.select(109L)).staticResolution()==48,
|
||||||
|
"Non-static default");
|
||||||
|
var misplaced=plan(server,"number/8","color/red","sky/static");
|
||||||
|
check(AgeSkyProfile.compile(misplaced,AgeTraits.select(109L)).staticResolution()==48,"Adjacent only");
|
||||||
|
var flood=plan(server,"number/2","number/24","environment/flooded");
|
||||||
|
check(AgeFlooding.requested(flood)==74 && flood.writingInstability()==0,"Flooded digit grammar unchanged");
|
||||||
|
}
|
||||||
|
}
|
||||||
+71
@@ -0,0 +1,71 @@
|
|||||||
|
package net.dnorberg.rivencraft.regression;
|
||||||
|
import java.util.List;
|
||||||
|
import io.netty.buffer.Unpooled;
|
||||||
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||||
|
import net.dnorberg.rivencraft.age.*;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortWritingRecovery;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import com.mojang.serialization.JsonOps;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
@EventBusSubscriber(modid="rivencraft")
|
||||||
|
public class StaticSkyProbe {
|
||||||
|
static int checks;
|
||||||
|
static void check(boolean condition,String label) {
|
||||||
|
if(!condition) throw new AssertionError(label);
|
||||||
|
checks++;
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||||
|
event.getServer().execute(() -> {
|
||||||
|
try {
|
||||||
|
run(event.getServer());
|
||||||
|
System.out.println("STATIC109_PASS checks="+checks);
|
||||||
|
}catch(Throwable error) {
|
||||||
|
System.out.println("STATIC109_FAIL "+error);
|
||||||
|
error.printStackTrace();
|
||||||
|
}finally { event.getServer().halt(false); }
|
||||||
|
});
|
||||||
|
}
|
||||||
|
static List<Identifier> pages(String... paths) {
|
||||||
|
return java.util.Arrays.stream(paths).map(s->Identifier.fromNamespaceAndPath("rivencraft",s)).toList();
|
||||||
|
}
|
||||||
|
static void run(net.minecraft.server.MinecraftServer server) {
|
||||||
|
String[][] cases={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"},
|
||||||
|
{"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"},
|
||||||
|
{"number/24","number/24","sky/static"}};
|
||||||
|
int[] expected={48,1,8,48,128,128};
|
||||||
|
for(int i=0;i<cases.length;i++) {
|
||||||
|
var writing=pages(cases[i]);
|
||||||
|
check(PortWritingRecovery.recover(writing).diagnostics().isEmpty(),"No number/order penalty");
|
||||||
|
check(PortAgeColors.validNumbers(writing),"Numeric writing valid");
|
||||||
|
var colors=PortAgeColors.compile(writing,109L);
|
||||||
|
check(colors.staticResolution()==expected[i],"Resolution");
|
||||||
|
var saved=PortAgeColors.CODEC.encodeStart(JsonOps.INSTANCE,colors).getOrThrow();
|
||||||
|
check(PortAgeColors.CODEC.parse(JsonOps.INSTANCE,saved).getOrThrow().equals(colors),"Saved codec");
|
||||||
|
var buffer=new RegistryFriendlyByteBuf(Unpooled.buffer(),server.registryAccess());
|
||||||
|
try {
|
||||||
|
var id=Identifier.parse("rivencraft:age/static_probe");
|
||||||
|
var packet=new AgeCatalogPayload(109,List.of(id),java.util.Map.of(id,colors),
|
||||||
|
java.util.Map.of(),java.util.Map.of());
|
||||||
|
AgeCatalogPayload.STREAM_CODEC.encode(buffer,packet);
|
||||||
|
check(AgeCatalogPayload.STREAM_CODEC.decode(buffer).equals(packet),"Full catalog round trip");
|
||||||
|
check(buffer.readableBytes()==0,"No unread bytes");
|
||||||
|
}finally { buffer.release(); }
|
||||||
|
}
|
||||||
|
var old=PortAgeColors.CODEC.parse(JsonOps.INSTANCE,JsonParser.parseString(
|
||||||
|
"{\"sky\":-1,\"ambient\":-1}")).getOrThrow();
|
||||||
|
check(old.staticResolution()==48 && old.equals(PortAgeColors.NATIVE),"Old save default");
|
||||||
|
var color=PortAgeColors.compile(pages("number/10","color/red","number/8","sky/static"),109L);
|
||||||
|
check(color.sky()==0x640000 && color.staticResolution()==8,"Independent color");
|
||||||
|
check(PortAgeColors.compile(pages("number/8","color/red","sky/static"),109L).staticResolution()==48,
|
||||||
|
"Adjacent only");
|
||||||
|
check(PortAgeColors.compile(pages("sky/overworld"),109L).staticResolution()==48,"Non-static default");
|
||||||
|
var flood=pages("number/2","number/24","environment/flooded");
|
||||||
|
check(PortFlooding.requested(flood)==74 && PortWritingRecovery.recover(flood).diagnostics().isEmpty(),
|
||||||
|
"Flooded grammar unchanged");
|
||||||
|
check(!PortWritingRecovery.recover(pages("number/8","sky/overworld")).diagnostics().isEmpty(),
|
||||||
|
"Other sky does not consume number");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,8 @@ from pathlib import Path
|
|||||||
import secrets
|
import secrets
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import tomllib
|
||||||
|
import zipfile
|
||||||
import urllib.error
|
import urllib.error
|
||||||
import urllib.request
|
import urllib.request
|
||||||
|
|
||||||
@@ -97,7 +99,8 @@ def request_json(url: str, *, token: str | None = None, token_header: str = "Aut
|
|||||||
request = urllib.request.Request(url, data=payload, headers=headers, method=method)
|
request = urllib.request.Request(url, data=payload, headers=headers, method=method)
|
||||||
try:
|
try:
|
||||||
with urllib.request.urlopen(request, timeout=120) as response:
|
with urllib.request.urlopen(request, timeout=120) as response:
|
||||||
return json.load(response)
|
body = response.read()
|
||||||
|
return json.loads(body) if body else None
|
||||||
except urllib.error.HTTPError as error:
|
except urllib.error.HTTPError as error:
|
||||||
if error.code == 404 and not_found_ok:
|
if error.code == 404 and not_found_ok:
|
||||||
return None
|
return None
|
||||||
@@ -150,6 +153,15 @@ def release_metadata(args: argparse.Namespace) -> tuple[dict, dict]:
|
|||||||
"releaseType": args.channel,
|
"releaseType": args.channel,
|
||||||
"isMarkedForManualRelease": False,
|
"isMarkedForManualRelease": False,
|
||||||
}
|
}
|
||||||
|
if args.minecraft == "1.21.1":
|
||||||
|
modrinth["dependencies"] = [
|
||||||
|
{"project_id": "ftdbN0KK", "dependency_type": "required"},
|
||||||
|
{"project_id": "qbUzidyB", "dependency_type": "required"},
|
||||||
|
]
|
||||||
|
curseforge["relations"] = {"projects": [
|
||||||
|
{"slug": "badpackets", "type": "requiredDependency"},
|
||||||
|
{"slug": "dynamicdimension-ar-edition", "projectID": 1469680, "type": "requiredDependency"},
|
||||||
|
]}
|
||||||
return modrinth, curseforge
|
return modrinth, curseforge
|
||||||
|
|
||||||
|
|
||||||
@@ -180,6 +192,27 @@ def publish_curseforge(metadata: dict, jar: Path) -> None:
|
|||||||
print(f"CurseForge: https://www.curseforge.com/minecraft/mc-mods/rivencraft/files/{result['id']} (pending approval)")
|
print(f"CurseForge: https://www.curseforge.com/minecraft/mc-mods/rivencraft/files/{result['id']} (pending approval)")
|
||||||
|
|
||||||
|
|
||||||
|
def verify_artifact(jar: Path, version: str, minecraft: str, java: str, channel: str) -> None:
|
||||||
|
"""Refuse renamed/wrong-track artifacts before obtaining any upload credential."""
|
||||||
|
expected_java = {"1.21.1": "21", "26.3": "25"}
|
||||||
|
if minecraft not in expected_java or java != expected_java[minecraft]:
|
||||||
|
raise RuntimeError("Unsupported Minecraft/Java target pairing")
|
||||||
|
_, filename = release_identity(version, minecraft, channel)
|
||||||
|
if jar.name != filename:
|
||||||
|
raise RuntimeError("JAR filename does not match Minecraft and release versions")
|
||||||
|
with zipfile.ZipFile(jar) as archive:
|
||||||
|
metadata = tomllib.loads(archive.read("META-INF/neoforge.mods.toml").decode())
|
||||||
|
mod = next((entry for entry in metadata.get("mods", []) if entry.get("modId") == "rivencraft"), None)
|
||||||
|
if mod is None or mod.get("version") != version:
|
||||||
|
raise RuntimeError("Embedded mod version does not match the requested release")
|
||||||
|
dependencies = metadata.get("dependencies", {}).get("rivencraft", [])
|
||||||
|
game = next((entry for entry in dependencies if entry.get("modId") == "minecraft"), None)
|
||||||
|
if game is None or game.get("versionRange") != f"[{minecraft}]":
|
||||||
|
raise RuntimeError("Embedded Minecraft range does not match the requested target")
|
||||||
|
if any(name.startswith("net/dnorberg/rivencraft/regression/") for name in archive.namelist()):
|
||||||
|
raise RuntimeError("Refusing an artifact containing disposable multiplayer test fixtures")
|
||||||
|
|
||||||
|
|
||||||
def release_identity(version: str, minecraft: str, channel: str) -> tuple[str, str]:
|
def release_identity(version: str, minecraft: str, channel: str) -> tuple[str, str]:
|
||||||
"""New releases prefix the version with Minecraft; retain old beta upload support."""
|
"""New releases prefix the version with Minecraft; retain old beta upload support."""
|
||||||
if version.startswith(minecraft + "."):
|
if version.startswith(minecraft + "."):
|
||||||
@@ -271,11 +304,7 @@ def main() -> None:
|
|||||||
raise RuntimeError(f"JAR does not exist: {args.jar}")
|
raise RuntimeError(f"JAR does not exist: {args.jar}")
|
||||||
if not args.changelog.is_file():
|
if not args.changelog.is_file():
|
||||||
raise RuntimeError(f"Changelog does not exist: {args.changelog}")
|
raise RuntimeError(f"Changelog does not exist: {args.changelog}")
|
||||||
if args.minecraft != "26.3":
|
verify_artifact(args.jar, args.version, args.minecraft, args.java, args.channel)
|
||||||
raise RuntimeError("Only the 26.3 line is configured; 1.21.1 needs required dependency relations")
|
|
||||||
_, expected_filename = release_identity(args.version, args.minecraft, args.channel)
|
|
||||||
if args.jar.name != expected_filename:
|
|
||||||
raise RuntimeError("JAR filename does not match Minecraft and release versions")
|
|
||||||
modrinth, curseforge = release_metadata(args)
|
modrinth, curseforge = release_metadata(args)
|
||||||
sites = SITES if args.site == "all" else (("modrinth", "curseforge") if args.site == "both" else (args.site,))
|
sites = SITES if args.site == "all" else (("modrinth", "curseforge") if args.site == "both" else (args.site,))
|
||||||
print(f"JAR: {args.jar.resolve()} ({args.jar.stat().st_size} bytes)")
|
print(f"JAR: {args.jar.resolve()} ({args.jar.stat().st_size} bytes)")
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Focused modded desert checks in one disposable 26.3 server; fixtures never ship."""
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
from smoke_server import stop
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
logs = ROOT / "build/verification/desert108"
|
||||||
|
logs.mkdir(parents=True, exist_ok=True)
|
||||||
|
log = logs / "mc263.log"
|
||||||
|
with server_test_lock(), tempfile.TemporaryDirectory(prefix="rivencraft-desert263-") as directory:
|
||||||
|
work = Path(directory)
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
mods = Path("/home/dnorberg/.local/share/PrismLauncher/instances/Dev 26.3/minecraft/mods")
|
||||||
|
extra = [next(mods.glob(pattern)) for pattern in ("BiomesOPlenty*.jar", "TerraBlender*.jar", "GlitchCore*.jar")]
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.dependencies.add('localRuntime', p.files('""" + "','".join(str(path) for path in extra) + """'))
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/desert263") + """'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=107\nview-distance=2\nsimulation-distance=2\n"
|
||||||
|
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen([str(ROOT / "gradlew"), "-p", str(ROOT / "ports/mc263"),
|
||||||
|
"--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"],
|
||||||
|
cwd=ROOT, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT,
|
||||||
|
text=True, start_new_session=True)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=60)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("HANDOFF: Desert probe stalled; stopping without retry. Use docs/DESERT_VEGETATION.md.")
|
||||||
|
return 2
|
||||||
|
text = log.read_text()
|
||||||
|
if process.returncode or "DESERT263_PASS" not in text or "DESERT263_FAIL" in text:
|
||||||
|
print(text[-10000:])
|
||||||
|
return 1
|
||||||
|
print(next(line for line in text.splitlines() if "DESERT263_PASS" in line))
|
||||||
|
return 0
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
print("Removing temporary server world, fixture configuration and isolated outputs. Log:", log)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
raise SystemExit(run())
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Focused Flooded checks in one disposable 26.3 server; fixtures never ship."""
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
from smoke_server import stop
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
logs = ROOT / "build/verification/flood107"
|
||||||
|
logs.mkdir(parents=True, exist_ok=True)
|
||||||
|
log = logs / "mc263.log"
|
||||||
|
with server_test_lock(), tempfile.TemporaryDirectory(prefix="rivencraft-flood263-") as directory:
|
||||||
|
work = Path(directory)
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/flood263") + """'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=107\nview-distance=2\nsimulation-distance=2\n"
|
||||||
|
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen([str(ROOT / "gradlew"), "-p", str(ROOT / "ports/mc263"),
|
||||||
|
"--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"],
|
||||||
|
cwd=ROOT, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT,
|
||||||
|
text=True, start_new_session=True)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=60)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("HANDOFF: Flooded probe stalled; stopping without retry. Use docs/FLOODED_PAGES.md.")
|
||||||
|
return 2
|
||||||
|
text = log.read_text()
|
||||||
|
if process.returncode or "FLOODED263_PASS" not in text or "FLOODED263_FAIL" in text:
|
||||||
|
print(text[-10000:])
|
||||||
|
return 1
|
||||||
|
print(next(line for line in text.splitlines() if "FLOODED263_PASS" in line))
|
||||||
|
return 0
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
print("Removing temporary server world, fixture configuration and isolated outputs. Log:", log)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
raise SystemExit(run())
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Two real 26.3 clients, one sequential server, normal book travel and full restart."""
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import shutil
|
||||||
|
import signal
|
||||||
|
import socket
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
LOGS = ROOT / "build/verification/multiplayer263"
|
||||||
|
|
||||||
|
|
||||||
|
class Handoff(RuntimeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def wait_for(processes, log, marker, timeout=60):
|
||||||
|
last_progress = time.monotonic()
|
||||||
|
last_stage = ""
|
||||||
|
while True:
|
||||||
|
text = log.read_text(errors="replace") if log.exists() else ""
|
||||||
|
if marker in text:
|
||||||
|
return
|
||||||
|
if "MC263_MATRIX FAIL" in text:
|
||||||
|
raise RuntimeError(f"Multiplayer assertion failed; inspect {log}")
|
||||||
|
stages = [line for line in text.splitlines() if "MC263_MATRIX PHASE" in line]
|
||||||
|
if stages and stages[-1] != last_stage:
|
||||||
|
last_stage = stages[-1]
|
||||||
|
last_progress = time.monotonic()
|
||||||
|
print(last_stage, flush=True)
|
||||||
|
if any(process.poll() is not None for process in processes):
|
||||||
|
raise RuntimeError(f"Process exited before {marker}; inspect {LOGS}")
|
||||||
|
if time.monotonic() - last_progress >= timeout:
|
||||||
|
raise Handoff(f"Stalled at {last_stage or marker}; stop and hand off, do not retry")
|
||||||
|
time.sleep(.25)
|
||||||
|
|
||||||
|
|
||||||
|
def stop(process, server=False):
|
||||||
|
if process is None or process.poll() is not None:
|
||||||
|
return
|
||||||
|
if server:
|
||||||
|
try:
|
||||||
|
process.stdin.write("stop\n")
|
||||||
|
process.stdin.flush()
|
||||||
|
process.wait(timeout=25)
|
||||||
|
return
|
||||||
|
except (BrokenPipeError, subprocess.TimeoutExpired):
|
||||||
|
pass
|
||||||
|
os.killpg(process.pid, signal.SIGTERM)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=10)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
os.killpg(process.pid, signal.SIGKILL)
|
||||||
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
def run():
|
||||||
|
if not os.environ.get("DISPLAY") and not os.environ.get("WAYLAND_DISPLAY"):
|
||||||
|
raise SystemExit("This real-client matrix needs a graphics session. Use the manual checklist.")
|
||||||
|
LOGS.mkdir(parents=True, exist_ok=True)
|
||||||
|
work = Path(tempfile.mkdtemp(prefix="rivencraft-multiplayer263-"))
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
with socket.socket() as reservation:
|
||||||
|
reservation.bind(("127.0.0.1", 0))
|
||||||
|
port = reservation.getsockname()[1]
|
||||||
|
settings = {"layers": [{"height": 1, "block": "minecraft:bedrock"},
|
||||||
|
{"height": 2, "block": "minecraft:dirt"},
|
||||||
|
{"height": 1, "block": "minecraft:grass_block"}],
|
||||||
|
"biome": "minecraft:plains"}
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
f"server-ip=127.0.0.1\nserver-port={port}\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"view-distance=2\nsimulation-distance=2\ngenerate-structures=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=263100\ngenerator-settings=" + json.dumps(settings) + "\n")
|
||||||
|
for name in ("One", "Two"):
|
||||||
|
client = work / f"client-{name}"
|
||||||
|
(client / "config").mkdir(parents=True)
|
||||||
|
(client / "config/neoforge-client.toml").write_text("showLoadWarnings=false\n")
|
||||||
|
(client / "options.txt").write_text("renderDistance:2\nsimulationDistance:5\nmaxFps:25\npauseOnLostFocus:false\n")
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file(System.getenv('RIVENCRAFT_MATRIX_WORK') + '/build'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/mc263_multiplayer") + """'))
|
||||||
|
p.neoForge.runs.client.gameDirectory = p.file(System.getenv('RIVENCRAFT_MATRIX_WORK') + '/client-' + p.findProperty('matrixClient'))
|
||||||
|
p.neoForge.runs.client.programArgument('--width')
|
||||||
|
p.neoForge.runs.client.programArgument('640')
|
||||||
|
p.neoForge.runs.client.programArgument('--height')
|
||||||
|
p.neoForge.runs.client.programArgument('480')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
env = dict(os.environ, RIVENCRAFT_MATRIX_WORK=str(work))
|
||||||
|
base = [str(ROOT / "gradlew"), "-p", str(ROOT / "ports/mc263"),
|
||||||
|
"-I", str(init), "--no-daemon", "--console=plain"]
|
||||||
|
server_process = None
|
||||||
|
clients = []
|
||||||
|
handles = []
|
||||||
|
try:
|
||||||
|
# Build fixture classes once in an isolated output tree. Shipping outputs
|
||||||
|
# are never overwritten or packaged with these extra test channels.
|
||||||
|
with (LOGS / "compile.log").open("w") as output:
|
||||||
|
subprocess.run(base + ["classes"], cwd=ROOT, env=env, stdout=output,
|
||||||
|
stderr=subprocess.STDOUT, check=True, timeout=300)
|
||||||
|
for phase in ("first", "restart"):
|
||||||
|
log = LOGS / f"server-{phase}.log"
|
||||||
|
output = log.open("w")
|
||||||
|
handles.append(output)
|
||||||
|
server_process = subprocess.Popen(base + ["runServer", f"-PserverRunDir={server}"],
|
||||||
|
cwd=ROOT, env=env, stdin=subprocess.PIPE, stdout=output,
|
||||||
|
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||||
|
wait_for([server_process], log, "Done (")
|
||||||
|
clients = []
|
||||||
|
for name in ("One", "Two"):
|
||||||
|
output = (LOGS / f"client-{name}-{phase}.log").open("w")
|
||||||
|
handles.append(output)
|
||||||
|
clients.append(subprocess.Popen(base + ["runClient", f"-PmatrixClient={name}",
|
||||||
|
f"-PclientName=Matrix{name}", f"-PconnectAddress=127.0.0.1:{port}"],
|
||||||
|
cwd=ROOT, env=env, stdout=output, stderr=subprocess.STDOUT,
|
||||||
|
text=True, start_new_session=True))
|
||||||
|
wait_for([server_process], log, "MC263_MATRIX " + ("FIRST_PASS" if phase == "first" else "RESTART_PASS"))
|
||||||
|
for process in clients:
|
||||||
|
process.wait(timeout=30)
|
||||||
|
if process.returncode:
|
||||||
|
raise RuntimeError("Client exited unsuccessfully; inspect client log")
|
||||||
|
clients.clear()
|
||||||
|
stop(server_process, server=True)
|
||||||
|
if server_process.returncode:
|
||||||
|
raise RuntimeError("Server exited unsuccessfully")
|
||||||
|
server_process = None
|
||||||
|
print(f"PASS two-client {phase}", flush=True)
|
||||||
|
except Handoff as error:
|
||||||
|
directions = (
|
||||||
|
f"{error}\n\nManual test: two clients on one 26.3 server. Create a new Age while both "
|
||||||
|
"are online; both visit via Descriptive Books and return via Linking Books. "
|
||||||
|
"Create a second Age with different sky/lighting/weather. Restart and reconnect both, "
|
||||||
|
"confirm names, seeds and return links. Refuse occupied unload, then vacate and "
|
||||||
|
"unload/reload/reseed/retire an empty Age. A retired book must leave the player at source.\n"
|
||||||
|
"Temporary worlds were removed; do not rerun this stalled test automatically.\n")
|
||||||
|
(LOGS / "HANDOFF.md").write_text(directions)
|
||||||
|
print("HANDOFF: " + directions, flush=True)
|
||||||
|
raise SystemExit(2)
|
||||||
|
finally:
|
||||||
|
for process in clients:
|
||||||
|
stop(process)
|
||||||
|
stop(server_process, server=True)
|
||||||
|
for handle in handles:
|
||||||
|
handle.close()
|
||||||
|
shutil.rmtree(work)
|
||||||
|
print(f"Removed all temporary client/server worlds and fixture outputs; logs: {LOGS}", flush=True)
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
with server_test_lock():
|
||||||
|
run()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Check Native biome-family contracts; real rendering remains player validation."""
|
||||||
|
import argparse
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
from smoke_server import stop
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
def run(target, biome_mods=False):
|
||||||
|
log = ROOT / f"build/verification/native111/{target}-{'bop' if biome_mods else 'vanilla'}.log"
|
||||||
|
log.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-native111-{target}-") as directory:
|
||||||
|
work = Path(directory)
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/native111" / target) + """'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
if biome_mods:
|
||||||
|
game = "1.21.1" if target == "mc1211" else "26.3"
|
||||||
|
mods = Path.home() / ".local/share/PrismLauncher/instances" / ("Dev " + game) / "minecraft/mods"
|
||||||
|
jars = [next(mods.glob(pattern)) for pattern in ("BiomesOPlenty*.jar", "TerraBlender*.jar", "GlitchCore*.jar")]
|
||||||
|
init.write_text(init.read_text() + "\ngradle.projectsEvaluated { gradle.rootProject.dependencies.add('localRuntime', gradle.rootProject.files("
|
||||||
|
+ ",".join("'" + str(jar) + "'" for jar in jars) + ")) }\n")
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n"
|
||||||
|
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
args = [str(ROOT / "gradlew")]
|
||||||
|
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||||
|
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||||
|
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=60)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("HANDOFF: Native biome probe stalled; stopping without retry. Use docs/NATIVE_BIOME_FAMILIES.md.")
|
||||||
|
return 2
|
||||||
|
text = log.read_text()
|
||||||
|
if process.returncode or "NATIVE111_PASS" not in text or "NATIVE111_FAIL" in text:
|
||||||
|
print(text[-8000:])
|
||||||
|
return 1
|
||||||
|
print(next(line for line in text.splitlines() if "NATIVE111_PASS" in line))
|
||||||
|
return 0
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("target", choices=("mc1211", "mc263"))
|
||||||
|
parser.add_argument("--biome-mods", action="store_true")
|
||||||
|
args=parser.parse_args()
|
||||||
|
raise SystemExit(run(args.target,args.biome_mods))
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Check optional portal engines sequentially; actual client rendering remains player validation."""
|
||||||
|
import argparse
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
from smoke_server import stop
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
def run(engine, jar=None):
|
||||||
|
target="mc263"
|
||||||
|
log = ROOT / f"build/verification/portal117/{engine}.log"
|
||||||
|
log.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-portal117-{engine}-") as directory:
|
||||||
|
work = Path(directory)
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/portal117") + """'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n"
|
||||||
|
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
args = [str(ROOT / "gradlew")]
|
||||||
|
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||||
|
if engine == "seamless":
|
||||||
|
args += ["-PwithSeamlessPortals", f"-PseamlessPortalsJar={jar}"]
|
||||||
|
elif engine == "reborn":
|
||||||
|
args += ["-PwithImmersivePortalsReborn"]
|
||||||
|
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||||
|
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=60)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("HANDOFF: Portal engine probe stalled; stopping without retry. Use docs/SEAMLESS_PORTALS.md.")
|
||||||
|
return 2
|
||||||
|
text = log.read_text()
|
||||||
|
if process.returncode or "PORTAL117_PASS" not in text or "PORTAL117_FAIL" in text:
|
||||||
|
print(text[-8000:])
|
||||||
|
return 1
|
||||||
|
print(next(line for line in text.splitlines() if "PORTAL117_PASS" in line))
|
||||||
|
return 0
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("engine", choices=("none", "seamless", "reborn"))
|
||||||
|
parser.add_argument("--jar", type=Path)
|
||||||
|
args=parser.parse_args()
|
||||||
|
if args.engine=="seamless" and (args.jar is None or not args.jar.is_file()):
|
||||||
|
parser.error("Seamless test needs --jar pointing at its actual 26.3 JAR")
|
||||||
|
raise SystemExit(run(args.engine,args.jar))
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Check Static Sky writing/save/network contracts; real rendering remains player validation."""
|
||||||
|
import argparse
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
from smoke_server import stop
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
def run(target):
|
||||||
|
log = ROOT / f"build/verification/static109/{target}.log"
|
||||||
|
log.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-static109-{target}-") as directory:
|
||||||
|
work = Path(directory)
|
||||||
|
init = work / "fixture.gradle"
|
||||||
|
init.write_text("""
|
||||||
|
gradle.beforeProject { p ->
|
||||||
|
p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """'))
|
||||||
|
p.afterEvaluate {
|
||||||
|
p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/static109" / target) + """'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""")
|
||||||
|
server = work / "server"
|
||||||
|
server.mkdir()
|
||||||
|
(server / "eula.txt").write_text("eula=true\n")
|
||||||
|
(server / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n"
|
||||||
|
'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n')
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
args = [str(ROOT / "gradlew")]
|
||||||
|
if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")]
|
||||||
|
args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"]
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output,
|
||||||
|
stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=60)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
print("HANDOFF: Static Sky probe stalled; stopping without retry. Use docs/STATIC_SKY_RESOLUTION.md.")
|
||||||
|
return 2
|
||||||
|
text = log.read_text()
|
||||||
|
if process.returncode or "STATIC109_PASS" not in text or "STATIC109_FAIL" in text:
|
||||||
|
print(text[-8000:])
|
||||||
|
return 1
|
||||||
|
print(next(line for line in text.splitlines() if "STATIC109_PASS" in line))
|
||||||
|
return 0
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
print("Removed temporary test world and isolated fixture outputs. Log:", log)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument("target", choices=("mc1211", "mc263"))
|
||||||
|
raise SystemExit(run(parser.parse_args().target))
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
"""One managed temporary Minecraft server at a time on this host."""
|
||||||
|
from contextlib import contextmanager
|
||||||
|
import fcntl
|
||||||
|
from pathlib import Path
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
|
||||||
|
@contextmanager
|
||||||
|
def server_test_lock():
|
||||||
|
with (Path(tempfile.gettempdir()) / "rivencraft-server-tests.lock").open("a") as lock:
|
||||||
|
try:
|
||||||
|
fcntl.flock(lock, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||||
|
except BlockingIOError:
|
||||||
|
raise SystemExit("Another Rivencraft server test is active; finish it before starting this one")
|
||||||
|
try:
|
||||||
|
yield
|
||||||
|
finally:
|
||||||
|
fcntl.flock(lock, fcntl.LOCK_UN)
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Small dual-target dedicated smoke. Worlds are disposable; stalled checks hand off."""
|
||||||
|
import argparse
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import shutil
|
||||||
|
import signal
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
|
||||||
|
class StalledTest(RuntimeError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def wait_for(process, log, marker, timeout=60):
|
||||||
|
started = time.monotonic()
|
||||||
|
while time.monotonic() - started < timeout:
|
||||||
|
text = log.read_text(errors="replace") if log.exists() else ""
|
||||||
|
if marker in text:
|
||||||
|
return text
|
||||||
|
if process.poll() is not None:
|
||||||
|
raise RuntimeError(f"Server exited before {marker!r}; inspect {log}")
|
||||||
|
time.sleep(0.25)
|
||||||
|
raise StalledTest(f"No result for {marker!r} within {timeout}s; stop and hand off, do not retry")
|
||||||
|
|
||||||
|
|
||||||
|
def stop(process):
|
||||||
|
if process is None or process.poll() is not None:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
process.stdin.write("stop\n")
|
||||||
|
process.stdin.flush()
|
||||||
|
process.wait(timeout=25)
|
||||||
|
except (BrokenPipeError, subprocess.TimeoutExpired):
|
||||||
|
os.killpg(process.pid, signal.SIGTERM)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=10)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
os.killpg(process.pid, signal.SIGKILL)
|
||||||
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__)
|
||||||
|
parser.add_argument("--target", choices=("mc1211", "mc263"), required=True)
|
||||||
|
args = parser.parse_args()
|
||||||
|
logs = ROOT / "build/verification" / args.target
|
||||||
|
logs.mkdir(parents=True, exist_ok=True)
|
||||||
|
work = Path(tempfile.mkdtemp(prefix=f"rivencraft-{args.target}-smoke-"))
|
||||||
|
settings = {"layers": [{"height": 1, "block": "minecraft:bedrock"},
|
||||||
|
{"height": 2, "block": "minecraft:dirt"},
|
||||||
|
{"height": 1, "block": "minecraft:grass_block"}],
|
||||||
|
"biome": "minecraft:plains"}
|
||||||
|
(work / "eula.txt").write_text("eula=true\n")
|
||||||
|
(work / "server.properties").write_text(
|
||||||
|
"server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n"
|
||||||
|
"view-distance=2\nsimulation-distance=2\ngenerate-structures=false\n"
|
||||||
|
"level-type=minecraft:flat\nlevel-seed=263100\ngenerator-settings=" + json.dumps(settings) + "\n")
|
||||||
|
command = [str(ROOT / "gradlew")]
|
||||||
|
if args.target == "mc263":
|
||||||
|
command += ["-p", str(ROOT / "ports/mc263")]
|
||||||
|
command += ["--no-daemon", "runServer", f"-PserverRunDir={work}", "--console=plain"]
|
||||||
|
process = None
|
||||||
|
try:
|
||||||
|
for phase in ("first", "restart"):
|
||||||
|
log = logs / f"{phase}.log"
|
||||||
|
with log.open("w") as output:
|
||||||
|
process = subprocess.Popen(command, cwd=ROOT, stdin=subprocess.PIPE,
|
||||||
|
stdout=output, stderr=subprocess.STDOUT, text=True, start_new_session=True)
|
||||||
|
wait_for(process, log, "Done (")
|
||||||
|
if args.target == "mc263":
|
||||||
|
if phase == "first":
|
||||||
|
for name, seed in (("smoke_a", 123456789), ("smoke_b", 987654321)):
|
||||||
|
process.stdin.write(f"rivencraft_port age create {name} {seed} flat\n")
|
||||||
|
process.stdin.flush()
|
||||||
|
wait_for(process, log, f"Created rivencraft:age/{name} with seed {seed}")
|
||||||
|
else:
|
||||||
|
text = log.read_text()
|
||||||
|
for name, seed in (("smoke_a", 123456789), ("smoke_b", 987654321)):
|
||||||
|
if f"Loaded 26.3 prototype Age rivencraft:age/{name} with seed {seed}" not in text:
|
||||||
|
raise RuntimeError("Age identity/seed failed full restart")
|
||||||
|
process.stdin.write("rivencraft_port age list\n")
|
||||||
|
process.stdin.flush()
|
||||||
|
process.stdin.write("save-all flush\n")
|
||||||
|
process.stdin.flush()
|
||||||
|
wait_for(process, log, "Saved the game")
|
||||||
|
else:
|
||||||
|
# 1.21.1's Gradle launcher does not forward this pipe. Its
|
||||||
|
# unchanged gameplay uses the recorded/manual regression;
|
||||||
|
# this smoke checks startup and graceful process shutdown.
|
||||||
|
os.killpg(process.pid, signal.SIGINT)
|
||||||
|
if args.target == "mc1211":
|
||||||
|
try:
|
||||||
|
process.wait(timeout=25)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
stop(process)
|
||||||
|
else:
|
||||||
|
stop(process)
|
||||||
|
if process.returncode not in (0, 130, -signal.SIGINT):
|
||||||
|
raise RuntimeError(f"Server exited with {process.returncode}; inspect {log}")
|
||||||
|
process = None
|
||||||
|
print(f"PASS {args.target} {phase}", flush=True)
|
||||||
|
except StalledTest as error:
|
||||||
|
print(f"HANDOFF: {error}. Manual check: start {args.target}, create two Ages, travel, "
|
||||||
|
"restart and revisit both; confirm names/seeds and return travel.", flush=True)
|
||||||
|
raise SystemExit(2)
|
||||||
|
finally:
|
||||||
|
stop(process)
|
||||||
|
shutil.rmtree(work)
|
||||||
|
print(f"Removed temporary world; logs: {logs}", flush=True)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
with server_test_lock():
|
||||||
|
main()
|
||||||
+2
-323
@@ -1,326 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Disposable, headless smoke check for the incomplete 26.3 runtime Age backend.
|
# Compatibility entry point; keep smoke narrow instead of rerunning every feature probe.
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
repo_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
|
repo_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
|
||||||
smoke_dir=$(mktemp -d "${TMPDIR:-/tmp}/rivencraft-263-smoke.XXXXXX")
|
exec python3 "$repo_dir/scripts/smoke_server.py" --target mc263
|
||||||
server_dir="$smoke_dir/server"
|
|
||||||
server_pid=
|
|
||||||
input_fd=
|
|
||||||
|
|
||||||
cleanup() {
|
|
||||||
if [[ -n "$server_pid" ]] && kill -0 "$server_pid" 2>/dev/null; then
|
|
||||||
if [[ -n "$input_fd" ]]; then printf 'stop\n' >&"$input_fd" || true; fi
|
|
||||||
wait "$server_pid" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
if [[ -n "$input_fd" ]]; then exec {input_fd}>&-; fi
|
|
||||||
rm -rf -- "$smoke_dir"
|
|
||||||
}
|
|
||||||
trap cleanup EXIT
|
|
||||||
|
|
||||||
mkdir -p "$server_dir"
|
|
||||||
printf 'eula=true\n' > "$server_dir/eula.txt"
|
|
||||||
printf 'server-port=0\nonline-mode=false\nwhite-list=false\n' > "$server_dir/server.properties"
|
|
||||||
|
|
||||||
wait_for_log() {
|
|
||||||
local log_file=$1 pattern=$2 seconds=$3
|
|
||||||
local tries=$((seconds * 4))
|
|
||||||
for ((i = 0; i < tries; i++)); do
|
|
||||||
if grep -Fq -- "$pattern" "$log_file" 2>/dev/null; then return 0; fi
|
|
||||||
if ! kill -0 "$server_pid" 2>/dev/null; then
|
|
||||||
printf 'Server exited before: %s\n' "$pattern" >&2
|
|
||||||
tail -80 "$log_file" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
sleep 0.25
|
|
||||||
done
|
|
||||||
printf 'Timed out waiting for: %s\n' "$pattern" >&2
|
|
||||||
tail -80 "$log_file" >&2
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
start_server() {
|
|
||||||
local phase=$1
|
|
||||||
log_file="$smoke_dir/$phase.log"
|
|
||||||
fifo="$smoke_dir/$phase.stdin"
|
|
||||||
mkfifo "$fifo"
|
|
||||||
exec {input_fd}<>"$fifo"
|
|
||||||
"$repo_dir/gradlew" -p "$repo_dir/ports/mc263" runServer \
|
|
||||||
-PserverRunDir="$server_dir" --no-daemon < "$fifo" > "$log_file" 2>&1 &
|
|
||||||
server_pid=$!
|
|
||||||
wait_for_log "$log_file" 'Done (' 120
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_server() {
|
|
||||||
printf 'stop\n' >&"$input_fd"
|
|
||||||
wait "$server_pid"
|
|
||||||
server_pid=
|
|
||||||
exec {input_fd}>&-
|
|
||||||
rm -- "$fifo"
|
|
||||||
}
|
|
||||||
|
|
||||||
send_and_wait() {
|
|
||||||
local command=$1 result=$2
|
|
||||||
printf '%s\n' "$command" >&"$input_fd"
|
|
||||||
wait_for_log "$log_file" "$result" 60
|
|
||||||
}
|
|
||||||
|
|
||||||
start_server first
|
|
||||||
send_and_wait 'rivencraft_port compat' 'Registered biomes by namespace:'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_alpha 123456789' 'Created rivencraft:age/smoke_alpha with seed 123456789'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_beta 987654321' 'Created rivencraft:age/smoke_beta with seed 987654321'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_flat 24680 flat' 'Created rivencraft:age/smoke_flat with seed 24680 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_void 13579 void' 'Created rivencraft:age/smoke_void with seed 13579 terrain=VOID'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_cave 112233 cave' 'Created rivencraft:age/smoke_cave with seed 112233 terrain=CAVE'
|
|
||||||
send_and_wait 'rivencraft_port age create_multi smoke_flat_multi 24681 flat' 'Created rivencraft:age/smoke_flat_multi with seed 24681 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_multi smoke_void_multi 13580 void' 'Created rivencraft:age/smoke_void_multi with seed 13580 terrain=VOID'
|
|
||||||
send_and_wait 'rivencraft_port age create_multi smoke_cave_multi 112234 cave' 'Created rivencraft:age/smoke_cave_multi with seed 112234 terrain=CAVE'
|
|
||||||
send_and_wait 'rivencraft_port age create_random smoke_random 889900' 'Random Age plan: terrain='
|
|
||||||
send_and_wait 'rivencraft_port age create_rocks smoke_rocks 445566' 'Created rivencraft:age/smoke_rocks with seed 445566 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_rocks_multi smoke_rocks_multi 445566' 'Created rivencraft:age/smoke_rocks_multi with seed 445566 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_rocks_random smoke_rocks_random 445566' 'Created rivencraft:age/smoke_rocks_random with seed 445566 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_vegetation smoke_vegetation 24680' 'Created rivencraft:age/smoke_vegetation with seed 24680 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_dungeons smoke_dungeons 135791' 'Created rivencraft:age/smoke_dungeons with seed 135791 terrain=STANDARD'
|
|
||||||
send_and_wait 'rivencraft_port age create smoke_lake_control 667788' 'Created rivencraft:age/smoke_lake_control with seed 667788 terrain=STANDARD'
|
|
||||||
send_and_wait 'rivencraft_port age create_lakes smoke_lakes 667788' 'Created rivencraft:age/smoke_lakes with seed 667788 terrain=STANDARD'
|
|
||||||
send_and_wait 'rivencraft_port age create_lakes_random smoke_lakes_random 667788' 'Created rivencraft:age/smoke_lakes_random with seed 667788 terrain=STANDARD'
|
|
||||||
# This fixture includes a rare island candidate near the origin at normal rarity.
|
|
||||||
send_and_wait 'rivencraft_port age create_islands smoke_islands 887767 void' 'Created rivencraft:age/smoke_islands with seed 887767 terrain=VOID'
|
|
||||||
send_and_wait 'rivencraft_port age create_islands smoke_islands_flat 887767 flat' 'Created rivencraft:age/smoke_islands_flat with seed 887767 terrain=FLAT'
|
|
||||||
send_and_wait 'rivencraft_port age create_islands smoke_islands_noise 887767 standard' 'Created rivencraft:age/smoke_islands_noise with seed 887767 terrain=STANDARD'
|
|
||||||
send_and_wait 'rivencraft_port age create_islands_random smoke_islands_random 887767 void' 'Created rivencraft:age/smoke_islands_random with seed 887767 terrain=VOID'
|
|
||||||
# The index must reach disk while the server is still running. A graceful
|
|
||||||
# shutdown would hide the interrupted-save regression this checks.
|
|
||||||
index_file="$server_dir/world/dimensions/minecraft/overworld/data/rivencraft/runtime_ages.dat"
|
|
||||||
[[ -s "$index_file" ]] || {
|
|
||||||
printf 'Age index was not persisted before shutdown: %s\n' "$index_file" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_alpha'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_beta'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_flat'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_void'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_cave'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_flat_multi'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_void_multi'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_cave_multi'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_random'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_rocks'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_rocks_multi'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_rocks_random'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_vegetation'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_dungeons'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_lakes'
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq 'rivencraft:age/smoke_lakes_random'
|
|
||||||
for island_age in smoke_islands smoke_islands_flat smoke_islands_noise smoke_islands_random; do
|
|
||||||
gzip -dc "$index_file" | strings | grep -Fq "rivencraft:age/$island_age"
|
|
||||||
done
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_alpha' 'rivencraft:age/smoke_alpha seed=123456789 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_beta' 'rivencraft:age/smoke_beta seed=987654321 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_flat' 'rivencraft:age/smoke_flat seed=24680 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_void' 'rivencraft:age/smoke_void seed=13579 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_cave' 'rivencraft:age/smoke_cave seed=112233 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_flat_multi' 'rivencraft:age/smoke_flat_multi seed=24681 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_void_multi' 'rivencraft:age/smoke_void_multi seed=13580 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_cave_multi' 'rivencraft:age/smoke_cave_multi seed=112234 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_random' 'rivencraft:age/smoke_random seed=889900 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks' 'rivencraft:age/smoke_rocks seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks_multi' 'rivencraft:age/smoke_rocks_multi seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks_random' 'rivencraft:age/smoke_rocks_random seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_vegetation' 'rivencraft:age/smoke_vegetation seed=24680 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_dungeons' 'rivencraft:age/smoke_dungeons seed=135791 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age dungeons_probe smoke_dungeons' 'Dungeons probe rivencraft:age/smoke_dungeons pages=8 spawners='
|
|
||||||
dungeons_before=$(grep -F 'Dungeons probe rivencraft:age/smoke_dungeons pages=8 spawners=' "$log_file" | tail -1 | sed 's/.*spawners=//')
|
|
||||||
[[ "$dungeons_before" =~ ^[1-9][0-9]*$ ]] || {
|
|
||||||
printf 'Authored Dungeons placed no monster spawners: %s\n' "$dungeons_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'rivencraft_port age lakes_probe smoke_lake_control' 'Lakes probe rivencraft:age/smoke_lake_control pages=0'
|
|
||||||
lake_control=$(grep -F 'Lakes probe rivencraft:age/smoke_lake_control pages=0' "$log_file" | tail -1 | sed 's/.* water=//; s/ lava=.*//')
|
|
||||||
send_and_wait 'rivencraft_port age lakes_probe smoke_lakes' 'Lakes probe rivencraft:age/smoke_lakes pages=24 fluids=[minecraft:water]'
|
|
||||||
lakes_before=$(grep -F 'Lakes probe rivencraft:age/smoke_lakes pages=24' "$log_file" | tail -1 | sed 's/.*Lakes probe /Lakes probe /')
|
|
||||||
lake_water=$(printf '%s' "$lakes_before" | sed 's/.* water=//; s/ lava=.*//')
|
|
||||||
[[ "$lake_water" -gt "$lake_control" ]] || {
|
|
||||||
printf 'Water lake pages did not add water: %s -> %s\n%s\n' "$lake_control" "$lake_water" "$lakes_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'rivencraft_port age lakes_probe smoke_lakes_random' 'Lakes probe rivencraft:age/smoke_lakes_random pages=24'
|
|
||||||
lakes_random_before=$(grep -F 'Lakes probe rivencraft:age/smoke_lakes_random pages=24' "$log_file" | tail -1 | sed 's/.*Lakes probe /Lakes probe /')
|
|
||||||
[[ "$lakes_random_before" == *minecraft:water* && "$lakes_random_before" == *minecraft:lava* ]] || {
|
|
||||||
printf 'Unmodified lake pages did not resolve both vanilla fluids: %s\n' "$lakes_random_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
declare -A islands_before
|
|
||||||
for island_age in smoke_islands smoke_islands_flat smoke_islands_noise smoke_islands_random; do
|
|
||||||
send_and_wait "rivencraft_port age islands_probe $island_age" "Islands probe rivencraft:age/$island_age pages=4"
|
|
||||||
island_result=$(grep -F "Islands probe rivencraft:age/$island_age pages=4" "$log_file" | tail -1 | sed 's/.*Islands probe /Islands probe /')
|
|
||||||
island_blocks=$(printf '%s' "$island_result" | sed 's/.* count=//; s/ fingerprint=.*//')
|
|
||||||
[[ "$island_blocks" =~ ^[1-9][0-9]*$ ]] || {
|
|
||||||
printf 'Floating Islands placed no selected material: %s\n' "$island_result" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
islands_before[$island_age]=$island_result
|
|
||||||
done
|
|
||||||
island_materials=${islands_before[smoke_islands_random]#*materials=[}
|
|
||||||
island_materials=${island_materials%%]*}
|
|
||||||
IFS=',' read -r -a island_material_list <<< "$island_materials"
|
|
||||||
[[ ${#island_material_list[@]} -eq 4 ]] || {
|
|
||||||
printf 'Repeated unmodified islands did not choose independent materials: %s\n' "$island_materials" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_islands if block 0 0 0 minecraft:air run say Island Void remains empty below' 'Island Void remains empty below'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_islands_flat if block 0 0 0 minecraft:bedrock run say Island Flat retains its floor' 'Island Flat retains its floor'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_islands 128 128' 'rivencraft:age/smoke_islands biome at 128,128=minecraft:forest'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_flat run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_flat to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_void run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_void to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_flat_multi run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_flat_multi to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_void_multi run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_void_multi to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_cave run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_cave to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_cave_multi run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_cave_multi to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_rocks run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_rocks to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_rocks_multi run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_rocks_multi to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_rocks_random run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_rocks_random to be force loaded'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_vegetation run forceload add 0 0' 'Marked chunk [0, 0] in rivencraft:age/smoke_vegetation to be force loaded'
|
|
||||||
send_and_wait 'rivencraft_port age vegetation_probe smoke_flat' 'Vegetation probe rivencraft:age/smoke_flat flowers='
|
|
||||||
flat_vegetation=$(grep -F 'Vegetation probe rivencraft:age/smoke_flat flowers=' "$log_file" | tail -1 | sed 's/.*flowers=//')
|
|
||||||
send_and_wait 'rivencraft_port age vegetation_probe smoke_vegetation' 'Vegetation probe rivencraft:age/smoke_vegetation flowers='
|
|
||||||
authored_vegetation=$(grep -F 'Vegetation probe rivencraft:age/smoke_vegetation flowers=' "$log_file" | tail -1 | sed 's/.*flowers=//')
|
|
||||||
flat_flowers=${flat_vegetation%% logs=*}
|
|
||||||
flat_logs=${flat_vegetation##* logs=}
|
|
||||||
authored_flowers=${authored_vegetation%% logs=*}
|
|
||||||
authored_logs=${authored_vegetation##* logs=}
|
|
||||||
[[ "$authored_flowers" -gt "$flat_flowers" && "$authored_logs" -gt "$flat_logs" ]] || {
|
|
||||||
printf 'Authored vegetation did not increase flowers and logs: %s -> %s\n' \
|
|
||||||
"$flat_vegetation" "$authored_vegetation" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks' 'Rocks probe rivencraft:age/smoke_rocks materials=[minecraft:gold_block] count='
|
|
||||||
rocks_before=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks materials=[minecraft:gold_block] count=' "$log_file" | tail -1 | sed 's/.*count=//')
|
|
||||||
[[ "$rocks_before" =~ ^[1-9][0-9]*$ ]] || {
|
|
||||||
printf 'Authored Rocks placed no gold blocks: %s\n' "$rocks_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks_multi' 'Rocks probe rivencraft:age/smoke_rocks_multi materials=[minecraft:gold_block, minecraft:gold_block, minecraft:gold_block, minecraft:gold_block] count='
|
|
||||||
rocks_multi_before=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks_multi materials=' "$log_file" | tail -1 | sed 's/.*count=//')
|
|
||||||
[[ "$rocks_multi_before" =~ ^[1-9][0-9]*$ && "$rocks_multi_before" -gt "$rocks_before" ]] || {
|
|
||||||
printf 'Repeated Rocks pages did not increase placement: %s -> %s\n' "$rocks_before" "$rocks_multi_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks_random' 'Rocks probe rivencraft:age/smoke_rocks_random materials=['
|
|
||||||
rocks_random_before=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks_random materials=' "$log_file" | tail -1 | sed 's/.*Rocks probe /Rocks probe /')
|
|
||||||
[[ "$rocks_random_before" =~ count=[1-9][0-9]*$ ]] || {
|
|
||||||
printf 'Unmodified Rocks page placed no material: %s\n' "$rocks_random_before" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_flat if block 0 0 0 minecraft:bedrock run say Flat bedrock starts at Y0' 'Flat bedrock starts at Y0'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_flat if block 0 3 0 minecraft:grass_block run say Flat surface is Y3' 'Flat surface is Y3'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_void if block 0 0 0 minecraft:air run say Void remains empty' 'Void remains empty'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_flat_multi if block 0 0 0 minecraft:bedrock run say Multi Flat bedrock starts at Y0' 'Multi Flat bedrock starts at Y0'
|
|
||||||
send_and_wait 'execute in rivencraft:age/smoke_void_multi if block 0 0 0 minecraft:air run say Multi Void remains empty' 'Multi Void remains empty'
|
|
||||||
# Check region interiors after loading the sampled chunks.
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_flat_multi 128 128' 'rivencraft:age/smoke_flat_multi biome at 128,128=minecraft:plains'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_flat_multi 384 128' 'rivencraft:age/smoke_flat_multi biome at 384,128=minecraft:forest'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_void_multi 384 128' 'rivencraft:age/smoke_void_multi biome at 384,128=minecraft:forest'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_cave_multi 128 128' 'rivencraft:age/smoke_cave_multi biome at 128,128=minecraft:lush_caves'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_cave_multi 384 128' 'rivencraft:age/smoke_cave_multi biome at 384,128=minecraft:dripstone_caves'
|
|
||||||
alpha_before=$(grep -F 'rivencraft:age/smoke_alpha seed=123456789 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
beta_before=$(grep -F 'rivencraft:age/smoke_beta seed=987654321 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
flat_before=$(grep -F 'rivencraft:age/smoke_flat seed=24680 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
void_before=$(grep -F 'rivencraft:age/smoke_void seed=13579 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
random_before=$(grep -F 'rivencraft:age/smoke_random seed=889900 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
if [[ "$alpha_before" == "$beta_before" ]]; then
|
|
||||||
printf 'Different Age seeds produced the same terrain probe: %s\n' "$alpha_before" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [[ "$flat_before" == "$void_before" ]]; then
|
|
||||||
printf 'Flat and Void Ages produced the same height probe: %s\n' "$flat_before" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
stop_server
|
|
||||||
|
|
||||||
start_server restart
|
|
||||||
send_and_wait 'rivencraft_port age list' 'smoke_alpha'
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_alpha' 'rivencraft:age/smoke_alpha seed=123456789 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_beta' 'rivencraft:age/smoke_beta seed=987654321 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_flat' 'rivencraft:age/smoke_flat seed=24680 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_void' 'rivencraft:age/smoke_void seed=13579 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_cave' 'rivencraft:age/smoke_cave seed=112233 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_flat_multi' 'rivencraft:age/smoke_flat_multi seed=24681 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_void_multi' 'rivencraft:age/smoke_void_multi seed=13580 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_cave_multi' 'rivencraft:age/smoke_cave_multi seed=112234 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_random' 'rivencraft:age/smoke_random seed=889900 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks' 'rivencraft:age/smoke_rocks seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks_multi' 'rivencraft:age/smoke_rocks_multi seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_rocks_random' 'rivencraft:age/smoke_rocks_random seed=445566 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_vegetation' 'rivencraft:age/smoke_vegetation seed=24680 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age sample smoke_dungeons' 'rivencraft:age/smoke_dungeons seed=135791 chunkOffset=0 terrain='
|
|
||||||
send_and_wait 'rivencraft_port age dungeons_probe smoke_dungeons' 'Dungeons probe rivencraft:age/smoke_dungeons pages=8 spawners='
|
|
||||||
dungeons_after=$(grep -F 'Dungeons probe rivencraft:age/smoke_dungeons pages=8 spawners=' "$log_file" | tail -1 | sed 's/.*spawners=//')
|
|
||||||
send_and_wait 'rivencraft_port age lakes_probe smoke_lakes' 'Lakes probe rivencraft:age/smoke_lakes pages=24 fluids=[minecraft:water]'
|
|
||||||
lakes_after=$(grep -F 'Lakes probe rivencraft:age/smoke_lakes pages=24' "$log_file" | tail -1 | sed 's/.*Lakes probe /Lakes probe /')
|
|
||||||
send_and_wait 'rivencraft_port age lakes_probe smoke_lakes_random' 'Lakes probe rivencraft:age/smoke_lakes_random pages=24'
|
|
||||||
lakes_random_after=$(grep -F 'Lakes probe rivencraft:age/smoke_lakes_random pages=24' "$log_file" | tail -1 | sed 's/.*Lakes probe /Lakes probe /')
|
|
||||||
for island_age in smoke_islands smoke_islands_flat smoke_islands_noise smoke_islands_random; do
|
|
||||||
send_and_wait "rivencraft_port age islands_probe $island_age" "Islands probe rivencraft:age/$island_age pages=4"
|
|
||||||
island_result=$(grep -F "Islands probe rivencraft:age/$island_age pages=4" "$log_file" | tail -1 | sed 's/.*Islands probe /Islands probe /')
|
|
||||||
[[ "${islands_before[$island_age]}" == "$island_result" ]] || {
|
|
||||||
printf 'Floating Islands changed across restart: %s\n%s\n' "${islands_before[$island_age]}" "$island_result" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
done
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks' 'Rocks probe rivencraft:age/smoke_rocks materials=[minecraft:gold_block] count='
|
|
||||||
rocks_after=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks materials=[minecraft:gold_block] count=' "$log_file" | tail -1 | sed 's/.*count=//')
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks_multi' 'Rocks probe rivencraft:age/smoke_rocks_multi materials=['
|
|
||||||
rocks_multi_after=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks_multi materials=' "$log_file" | tail -1 | sed 's/.*count=//')
|
|
||||||
send_and_wait 'rivencraft_port age rocks_probe smoke_rocks_random' 'Rocks probe rivencraft:age/smoke_rocks_random materials=['
|
|
||||||
rocks_random_after=$(grep -F 'Rocks probe rivencraft:age/smoke_rocks_random materials=' "$log_file" | tail -1 | sed 's/.*Rocks probe /Rocks probe /')
|
|
||||||
send_and_wait 'rivencraft_port age vegetation_probe smoke_vegetation' 'Vegetation probe rivencraft:age/smoke_vegetation flowers='
|
|
||||||
authored_vegetation_after=$(grep -F 'Vegetation probe rivencraft:age/smoke_vegetation flowers=' "$log_file" | tail -1 | sed 's/.*flowers=//')
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_flat_multi 384 128' 'rivencraft:age/smoke_flat_multi biome at 384,128=minecraft:forest'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_void_multi 384 128' 'rivencraft:age/smoke_void_multi biome at 384,128=minecraft:forest'
|
|
||||||
send_and_wait 'rivencraft_port age biome smoke_cave_multi 384 128' 'rivencraft:age/smoke_cave_multi biome at 384,128=minecraft:dripstone_caves'
|
|
||||||
alpha_after=$(grep -F 'rivencraft:age/smoke_alpha seed=123456789 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
beta_after=$(grep -F 'rivencraft:age/smoke_beta seed=987654321 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
flat_after=$(grep -F 'rivencraft:age/smoke_flat seed=24680 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
void_after=$(grep -F 'rivencraft:age/smoke_void seed=13579 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
random_after=$(grep -F 'rivencraft:age/smoke_random seed=889900 chunkOffset=0 terrain=' "$log_file" | tail -1 | sed 's/.*terrain=//')
|
|
||||||
[[ "$alpha_before" == "$alpha_after" && "$beta_before" == "$beta_after" ]] || {
|
|
||||||
printf 'Age terrain changed across restart: %s/%s -> %s/%s\n' \
|
|
||||||
"$alpha_before" "$beta_before" "$alpha_after" "$beta_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$flat_before" == "$flat_after" && "$void_before" == "$void_after" ]] || {
|
|
||||||
printf 'Flat/Void terrain changed across restart: %s/%s -> %s/%s\n' \
|
|
||||||
"$flat_before" "$void_before" "$flat_after" "$void_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$random_before" == "$random_after" ]] || {
|
|
||||||
printf 'Random Age terrain changed across restart: %s -> %s\n' \
|
|
||||||
"$random_before" "$random_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$rocks_before" == "$rocks_after" ]] || {
|
|
||||||
printf 'Authored Rocks changed across restart: %s -> %s\n' \
|
|
||||||
"$rocks_before" "$rocks_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$rocks_multi_before" == "$rocks_multi_after" && "$rocks_random_before" == "$rocks_random_after" ]] || {
|
|
||||||
printf 'Repeated or unmodified Rocks changed across restart\n' >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$authored_vegetation" == "$authored_vegetation_after" ]] || {
|
|
||||||
printf 'Authored vegetation changed across restart: %s -> %s\n' \
|
|
||||||
"$authored_vegetation" "$authored_vegetation_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$dungeons_before" == "$dungeons_after" ]] || {
|
|
||||||
printf 'Authored Dungeons changed across restart: %s -> %s\n' \
|
|
||||||
"$dungeons_before" "$dungeons_after" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
[[ "$lakes_before" == "$lakes_after" && "$lakes_random_before" == "$lakes_random_after" ]] || {
|
|
||||||
printf 'Explicit or random lake plans/blocks changed across restart\n' >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
stop_server
|
|
||||||
printf '26.3 dedicated-server smoke passed: terrain, biomes, Rocks, vegetation, Dungeons, lakes, and Floating Islands persisted across restart.\n'
|
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Run the shared desert placement checks without a server or saved world."""
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parents[1]
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
with tempfile.TemporaryDirectory(prefix="rivencraft-desert108-") as directory:
|
||||||
|
subprocess.run(["javac", "--release", "21", "-d", directory,
|
||||||
|
str(ROOT / "shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java"),
|
||||||
|
str(ROOT / "scripts/fixtures/desert108/DesertVegetationChecks.java")], check=True)
|
||||||
|
subprocess.run(["java", "-cp", directory, "DesertVegetationChecks"], check=True)
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Offline checks for track selection, release identity, dependency metadata and server exclusion."""
|
||||||
|
import argparse
|
||||||
|
from pathlib import Path
|
||||||
|
import tempfile
|
||||||
|
import unittest
|
||||||
|
import zipfile
|
||||||
|
|
||||||
|
from changed_targets import affected
|
||||||
|
from publish_mod_sites import release_identity, release_metadata, verify_artifact
|
||||||
|
from server_test_lock import server_test_lock
|
||||||
|
|
||||||
|
|
||||||
|
class WorkflowChecks(unittest.TestCase):
|
||||||
|
def test_changes_stay_on_their_track(self):
|
||||||
|
self.assertEqual(affected(["src/main/java/net/dnorberg/rivencraft/Rivencraft.java"]), ["mc1211"])
|
||||||
|
self.assertEqual(affected(["ports/mc263/src/main/java/Example.java"]), ["mc263"])
|
||||||
|
self.assertEqual(affected(["src/main/resources/assets/rivencraft/sounds.json"]), ["mc1211", "mc263"])
|
||||||
|
self.assertEqual(affected(["shared/src/main/java/Rules.java"]), ["mc1211", "mc263"])
|
||||||
|
self.assertEqual(affected(["README.md", "scripts/publish_mod_sites.py"]), [])
|
||||||
|
|
||||||
|
def test_release_identity_rejects_mislabeled_channels(self):
|
||||||
|
self.assertEqual(release_identity("26.3.0.3", "26.3", "release"),
|
||||||
|
("V26.3.0.3", "rivencraft-26.3.0.3.jar"))
|
||||||
|
self.assertEqual(release_identity("1.21.1.0.1", "1.21.1", "release"),
|
||||||
|
("V1.21.1.0.1", "rivencraft-1.21.1.0.1.jar"))
|
||||||
|
for version, channel in [("26.3.0.3-beta.1", "release"), ("26.3.0.3", "beta")]:
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
release_identity(version, "26.3", channel)
|
||||||
|
|
||||||
|
def test_required_dependencies_follow_minecraft(self):
|
||||||
|
with tempfile.TemporaryDirectory() as work:
|
||||||
|
notes = Path(work) / "notes.md"
|
||||||
|
notes.write_text("Release notes")
|
||||||
|
args = argparse.Namespace(changelog=notes, name="Rivencraft", version="1.21.1.0.1",
|
||||||
|
minecraft="1.21.1", java="21", channel="release")
|
||||||
|
mr, cf = release_metadata(args)
|
||||||
|
self.assertEqual(len(mr["dependencies"]), 2)
|
||||||
|
self.assertTrue(all(d["dependency_type"] == "required" for d in mr["dependencies"]))
|
||||||
|
self.assertEqual(len(cf["relations"]["projects"]), 2)
|
||||||
|
self.assertIsInstance(cf["relations"]["projects"][1]["projectID"], int)
|
||||||
|
args.minecraft, args.java, args.version = "26.3", "25", "26.3.0.3"
|
||||||
|
mr, cf = release_metadata(args)
|
||||||
|
self.assertEqual(mr["dependencies"], [])
|
||||||
|
self.assertNotIn("relations", cf)
|
||||||
|
|
||||||
|
def test_wrong_track_and_fixture_jars_are_rejected(self):
|
||||||
|
with tempfile.TemporaryDirectory() as work:
|
||||||
|
jar = Path(work) / "rivencraft-26.3.0.3.jar"
|
||||||
|
metadata = (
|
||||||
|
'[[mods]]\nmodId="rivencraft"\nversion="26.3.0.3"\n'
|
||||||
|
'[[dependencies.rivencraft]]\nmodId="minecraft"\nversionRange="[26.3]"\n'
|
||||||
|
)
|
||||||
|
with zipfile.ZipFile(jar, "w") as archive:
|
||||||
|
archive.writestr("META-INF/neoforge.mods.toml", metadata)
|
||||||
|
verify_artifact(jar, "26.3.0.3", "26.3", "25", "release")
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
verify_artifact(jar, "26.3.0.3", "26.3", "21", "release")
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
verify_artifact(jar, "1.21.1.0.1", "1.21.1", "21", "release")
|
||||||
|
with zipfile.ZipFile(jar, "a") as archive:
|
||||||
|
archive.writestr("net/dnorberg/rivencraft/regression/Fixture.class", b"test")
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
verify_artifact(jar, "26.3.0.3", "26.3", "25", "release")
|
||||||
|
|
||||||
|
def test_server_lock_refuses_overlap_and_releases(self):
|
||||||
|
with server_test_lock():
|
||||||
|
with self.assertRaises(SystemExit):
|
||||||
|
with server_test_lock():
|
||||||
|
self.fail("overlapping server admitted")
|
||||||
|
with server_test_lock():
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user