Public Access
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d199ac253e | ||
|
|
90e4a98a7a | ||
|
|
441f2896d7 | ||
|
|
4a59fb5d02 | ||
|
|
41daff1e61 | ||
|
|
f9097967b9 | ||
|
|
32c52e635f | ||
|
|
d2904eaa8d |
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,21 +10,25 @@ also lets you author modern terrain, biomes, structures, seasons, and celestial
|
|||||||
bodies. It is an independently developed project, not a byte-for-byte copy of
|
bodies. It is an independently developed project, not a byte-for-byte copy of
|
||||||
the 1.12.2 mod.
|
the 1.12.2 mod.
|
||||||
|
|
||||||
The gameplay guide below describes the **Minecraft 1.21.1 release**. A separate,
|
Current releases: **1.21.1.0.6** and **26.3.0.10**, with separate Minecraft-specific JARs and saves.
|
||||||
incomplete **Minecraft 26.3 beta** is available: Java 25, NeoForge 26.3.0.99,
|
|
||||||
and a first-party Age backend (no Dynamic Dimensions or Bad Packets). It now
|
The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate
|
||||||
supports authored terrain/biomes, structure and vegetation pages, independent
|
**Minecraft 26.3 release** uses Java 25, NeoForge 26.3.0.99 and a first-party Age
|
||||||
Age weather/lighting, seeded and colorable Overworld/Nether/End/Static skies,
|
backend; it does not require Dynamic Dimensions or Bad Packets. Both tracks include
|
||||||
independent Sun/Moon controls, multiple bodies and eclipses, seeded biome and
|
authored/seeded Ages, writing stations, libraries, crystal portals, celestials,
|
||||||
feature completion, and random structure selection. Nether/End noise-biome
|
instability and Link Modifier controls. JEI, TerraBlender/Biomes O' Plenty,
|
||||||
materials now follow their native rules. Books now have Legacy-style spreads,
|
Serene Seasons and Ruins remain optional. See the [26.3 guide](ports/mc263/README.md)
|
||||||
animated fallback panels and saved destination labels; lectern stands, open-book
|
and [parity review](docs/MC263_PARITY_REVIEW.md).
|
||||||
drops, page collections, stations and basic progression are also ported.
|
|
||||||
The beta does not yet provide full
|
These releases add [Native biome-family Pages](docs/NATIVE_BIOME_FAMILIES.md),
|
||||||
1.21.1 gameplay or optional-integration parity.
|
[desert vegetation](docs/DESERT_VEGETATION.md) and Number-controlled
|
||||||
See the [26.3 beta guide](ports/mc263/README.md) and
|
[Static Sky resolution](docs/STATIC_SKY_RESOLUTION.md).
|
||||||
[latest beta release notes](ports/mc263/RELEASE_NOTES_1.0.1.115-beta.1.md).
|
On 26.3, optional Immersive Portals Reborn or Seamless Portals provides live book
|
||||||
Keep the builds and their saves separate, and back up worlds before updating.
|
and crystal portal views, including look-only exploration in the book panel.
|
||||||
|
Install only one fork; built-in animations work without either.
|
||||||
|
Known Reborn/Seamless crashes and travel disconnects remain tracked in
|
||||||
|
[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118).
|
||||||
|
Use matching client/server builds, keep Minecraft tracks separate and back up worlds before updating.
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|
||||||
@@ -126,8 +130,10 @@ checks from manual evidence and known limitations.
|
|||||||
|
|
||||||
The JAR is written to `build/libs/`. Development runs need the required mods;
|
The JAR is written to `build/libs/`. Development runs need the required mods;
|
||||||
see [GameTest guidance](docs/GAMETESTS.md) for focused archived suites.
|
see [GameTest guidance](docs/GAMETESTS.md) for focused archived suites.
|
||||||
Versions use `x.y.z.b`: major release, completed milestone, release slice,
|
New versions prefix the Minecraft version, followed by the milestone/release
|
||||||
then fixes/additional work within that slice.
|
slice and fixes/additional-work iteration. For example, `26.3.0.1` produces
|
||||||
|
`rivencraft-26.3.0.1.jar`. Existing 1.21.1 artifacts keep their published legacy
|
||||||
|
numbers until that line's next code release. See the [release workflow](docs/DUAL_VERSION_RELEASE.md).
|
||||||
|
|
||||||
Rivencraft is licensed under LGPL-3.0-or-later. Legacy-derived material is
|
Rivencraft is licensed under LGPL-3.0-or-later. Legacy-derived material is
|
||||||
credited in [NOTICE](NOTICE) and [asset provenance](docs/ASSET_PROVENANCE.md).
|
credited in [NOTICE](NOTICE) and [asset provenance](docs/ASSET_PROVENANCE.md).
|
||||||
@@ -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.
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
# Dual-version release workflow
|
||||||
|
|
||||||
|
Maintain Minecraft 1.21.1 and 26.3 independently. The 1.21.1 line retains Dynamic
|
||||||
|
Dimensions AR Edition and Bad Packets. The 26.3 line uses its first-party backend.
|
||||||
|
Do not widen either artifact's Minecraft dependency range or import saves between
|
||||||
|
the tracks.
|
||||||
|
|
||||||
|
## Version identity
|
||||||
|
|
||||||
|
From 26.3.0.1 onward, prefix the Minecraft version and append the milestone/release
|
||||||
|
slice and iteration: Minecraft.release-slice.iteration. Example:
|
||||||
|
`26.3.0.1` -> `rivencraft-26.3.0.1.jar`, Gitea tag `V26.3.0.1`.
|
||||||
|
An explicitly selected prerelease uses a suffix such as `-beta.1`.
|
||||||
|
The existing 1.21.1 release keeps its published version until its next code update;
|
||||||
|
then use the corresponding `1.21.1.<slice>.<iteration>` convention.
|
||||||
|
|
||||||
|
The user authorized regular release status for 26.3.0.1. Release-channel status
|
||||||
|
does not close unfinished parity or multiplayer issues automatically.
|
||||||
|
|
||||||
|
## Build and publish
|
||||||
|
|
||||||
|
For 26.3, update `ports/mc263/gradle.properties`, then run
|
||||||
|
`./gradlew -p ports/mc263 build --console=plain` with Java 25 available.
|
||||||
|
Use the exact built/player-validated artifact; naming/metadata-only changes do
|
||||||
|
not change generation or save behavior.
|
||||||
|
|
||||||
|
Write release notes, audit the guide/wiki/project description, commit and push
|
||||||
|
the changes, then create and push the matching annotated tag. Preview the
|
||||||
|
`scripts/publish_mod_sites.py release` command with the JAR, changelog, version,
|
||||||
|
display name, Minecraft version, Java version and channel; add `--publish` to
|
||||||
|
upload to Gitea, Modrinth and CurseForge. Tokens stay in the system keyring.
|
||||||
|
Verify published metadata and downloaded artifact hashes. CurseForge approval
|
||||||
|
may remain pending after a successful upload.
|
||||||
|
|
||||||
|
The publisher accepts legacy Minecraft-prefixed archive filenames and beta tags
|
||||||
|
for already numbered historical uploads; new releases use the identity above.
|
||||||
|
|
||||||
|
## Validation gates and issue audit
|
||||||
|
|
||||||
|
Run appropriate builds and targeted server checks for changed behavior. The user
|
||||||
|
performs visual/gameplay validation. Keep temporary test fixtures out of shipped
|
||||||
|
JARs; use new worlds and remove them regardless of pass/fail. Stop test processes.
|
||||||
|
If generation stalls, hand the test to the user.
|
||||||
|
|
||||||
|
Before closing a port umbrella issue, compare its acceptance criteria and comments
|
||||||
|
to actual evidence. The expanded-catalog matrix and manual restart/return handoff completed in #100.
|
||||||
|
See [the final parity review](MC263_PARITY_REVIEW.md) for evidence and limits.
|
||||||
|
Shared issues need both versions resolved before closure.
|
||||||
|
|
||||||
|
For each release, document tested optional versions and no-optional fallbacks,
|
||||||
|
match client/server JARs, preserve the independent 1.21.1 support line, update wiki
|
||||||
|
and platform descriptions, and keep known bugs linked in the release notes.
|
||||||
|
|
||||||
|
## Changed-target validation policy
|
||||||
|
|
||||||
|
Only test a Minecraft target when its code/resources changed. Select targets with
|
||||||
|
`python3 scripts/changed_targets.py --base <commit>`. Shared assets can select
|
||||||
|
both; temporary servers must run sequentially. Earlier gameplay sign-off remains
|
||||||
|
valid for unchanged 1.21.1 code.
|
||||||
|
|
||||||
|
Repeatable local checks:
|
||||||
|
|
||||||
|
- Java 21 / 1.21.1: `./gradlew build --console=plain`.
|
||||||
|
- Java 25 / 26.3: `./gradlew -p ports/mc263 build --console=plain`.
|
||||||
|
- Smoke one changed target: `python3 scripts/smoke_server.py --target mc1211`
|
||||||
|
or `--target mc263`.
|
||||||
|
- Two-client 26.3 acceptance: `python3 scripts/regression_multiplayer_263.py`.
|
||||||
|
Fixture sources remain outside the shipping JAR. If a test stalls, stop it,
|
||||||
|
preserve logs, delete temporary worlds and hand the remaining check to the user.
|
||||||
|
Do not automatically retry.
|
||||||
|
|
||||||
|
GitHub and Gitea workflow definitions select changed targets and use
|
||||||
|
`max-parallel: 1`. Hosted execution is not yet verified. Repository runner
|
||||||
|
inventory alone does not establish availability of instance-wide runners.
|
||||||
|
The publisher checks embedded version/Minecraft metadata, Java selection,
|
||||||
|
filename identity, absence of test fixtures and required 1.21.1 dependencies.
|
||||||
|
|
||||||
|
Apply relevant fixes to both supported lines, with separate implementation and
|
||||||
|
validation per target. Keep version-specific fixes on the affected line. Advancing
|
||||||
|
the newer Minecraft/NeoForge target requires a compatibility audit and must not
|
||||||
|
silently replace 1.21.1 support or widen an existing JAR dependency range.
|
||||||
|
|
||||||
|
## Current acceptance evidence (2026-11-14)
|
||||||
|
|
||||||
|
26.3.0.3 builds and the user passed book-window mouse-look, right-click return
|
||||||
|
and re-entry. Beta branding is removed. The release collects these changes,
|
||||||
|
the workflow tools and the final parity review.
|
||||||
|
|
||||||
|
The expanded-catalog dedicated matrix ran with two real clients. Both received
|
||||||
|
runtime-created Ages and authored environment data, traveled using normal books,
|
||||||
|
and passed stale-ack rejection/recovery, occupied-unload refusal, empty-Age
|
||||||
|
reload/reseed and retirement checks. After full server restart both reconnected in
|
||||||
|
the surviving Age with its saved seed and presentation, without the retired Age.
|
||||||
|
The run stalled at the final post-restart return Linking Book step (phase 22).
|
||||||
|
It was stopped, temporary worlds deleted, and the last check handed off rather
|
||||||
|
than retried. Singleplayer preview sign-off does not replace that dedicated check.
|
||||||
|
|
||||||
|
The player completed the manual dedicated-server restart/return check on
|
||||||
|
2026-11-14 and explicitly accepted #100. This was one player-operated client,
|
||||||
|
complementing the automated two-client evidence; it is not described as a new
|
||||||
|
automated two-client pass. The test server was stopped, logs retained under
|
||||||
|
build/verification/issue100-manual, and its temporary world removed.
|
||||||
|
See [the final parity review](MC263_PARITY_REVIEW.md). Renderer bug #116 remains
|
||||||
|
separately tracked. #103/#104 and parent #96 close after release verification.
|
||||||
|
|
||||||
|
## 2026-11-15 release update
|
||||||
|
|
||||||
|
The first Minecraft-prefixed 1.21.1 release is 1.21.1.0.3, collecting Mixer #105,
|
||||||
|
Flat #106 and Flooded #107. The matching 26.3 release is 26.3.0.5 with Flooded and
|
||||||
|
the Reborn acknowledgement guard. Both player checks passed; publication was
|
||||||
|
explicitly authorized. Reborn is not crash-free: #118 remains open. #117 owns
|
||||||
|
full Seamless support. #116 was user-closed as resolved. Prior dated evidence
|
||||||
|
above remains historical; unchanged earlier artifacts are not relabeled.
|
||||||
|
|
||||||
|
## 2026-11-17 release update
|
||||||
|
|
||||||
|
Player-approved 1.21.1.0.6 and 26.3.0.10 collect #108 desert vegetation, #109 Static Sky resolution and #111 Native biome families. The 26.3 release also includes #117 optional Seamless live rendering. #118 remains open for Reborn/Seamless failures, including the recovered caves_on_top acknowledgement disconnect. Both JARs retain their player-tested hashes.
|
||||||
@@ -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.
|
||||||
+947
-3
@@ -8,6 +8,33 @@ 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
|
||||||
|
|
||||||
|
[26.3.0.1](../ports/mc263/RELEASE_NOTES_26.3.0.1.md) collects the player-validated
|
||||||
|
.137–.142 slices: random-page eligibility, random-Age glyph descriptions, optional
|
||||||
|
portal-engine dimension synchronization, and Reborn live book/crystal portal views.
|
||||||
|
It is published on the regular release channel at the user's request, using the
|
||||||
|
new Minecraft-prefixed version scheme. Minecraft 1.21.1 remains unchanged.
|
||||||
|
|
||||||
|
#102's optional-integration audit/port is complete; the Static Sky/Reborn rendering
|
||||||
|
bug is tracked separately in #116. #100 still requires the current expanded-catalog
|
||||||
|
dedicated two-client matrix. #103/#104 and parent #96 retain the remaining workflow
|
||||||
|
and parity gates. Full parity is not implied by the release channel. Shared
|
||||||
|
follow-ups stay open where one or both implementations are pending. Earlier
|
||||||
|
entries are historical records and may describe limitations resolved later.
|
||||||
|
|
||||||
## Version boundary
|
## Version boundary
|
||||||
|
|
||||||
Local slice `1.0.1.106-beta.1` ports the Writing Desk's two-part block,
|
Local slice `1.0.1.106-beta.1` ports the Writing Desk's two-part block,
|
||||||
@@ -87,8 +114,8 @@ range of the 1.21.1 JAR. The official [26.3 release notes](https://www.minecraft
|
|||||||
[NeoForge 26.3 Maven metadata](https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml),
|
[NeoForge 26.3 Maven metadata](https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml),
|
||||||
[NeoForge Java 25 setting](https://github.com/neoforged/NeoForge/blob/26.3.x/gradle.properties),
|
[NeoForge Java 25 setting](https://github.com/neoforged/NeoForge/blob/26.3.x/gradle.properties),
|
||||||
and [NeoForge migration primers](https://docs.neoforged.net/primer/docs/)
|
and [NeoForge migration primers](https://docs.neoforged.net/primer/docs/)
|
||||||
are the version sources. NeoForge 26.3.0.99 is the newest listed stable build
|
are the version sources. NeoForge 26.3.0.99 is the validated target for this release; the availability
|
||||||
at the time of this check.
|
of newer NeoForge builds does not imply they have been validated.
|
||||||
|
|
||||||
## Dependency availability
|
## Dependency availability
|
||||||
|
|
||||||
@@ -106,7 +133,8 @@ Rivencraft. Recheck immediately before choosing versions for a port build.
|
|||||||
| [Biomes O' Plenty](https://modrinth.com/mod/biomes-o-plenty) | Optional TerraBlender test addon | Yes | Test modded biome registration and decoration. |
|
| [Biomes O' Plenty](https://modrinth.com/mod/biomes-o-plenty) | Optional TerraBlender test addon | Yes | Test modded biome registration and decoration. |
|
||||||
| [Ruins (Structure Spawning System)](https://www.curseforge.com/minecraft/mc-mods/ruins-structure-spawning-system) | Optional authored ruins integration | Yes | Port and verify its generation hooks. |
|
| [Ruins (Structure Spawning System)](https://www.curseforge.com/minecraft/mc-mods/ruins-structure-spawning-system) | Optional authored ruins integration | Yes | Port and verify its generation hooks. |
|
||||||
| [Create](https://modrinth.com/mod/create) / bundled Ponder | Optional scene renderer | No advertised 26.3 version | Use Rivencraft's existing legacy-animation preview fallback for this target until a compatible release exists. |
|
| [Create](https://modrinth.com/mod/create) / bundled Ponder | Optional scene renderer | No advertised 26.3 version | Use Rivencraft's existing legacy-animation preview fallback for this target until a compatible release exists. |
|
||||||
| [Immersive Portals for (Neo)Forge](https://modrinth.com/mod/immersive-portals-neoforge) | Optional live views and portal teleport integration | No advertised 26.3 version | Use the fallback portal surface and normal Rivencraft linking. Do not claim live destination views on 26.3. |
|
| [Immersive Portal / Seamless Portals](https://www.curseforge.com/minecraft/mc-mods/immersive-portal/files/9218525) | Optional live views and portal integration | Latest file 9218525: displayed 10.0.0, internal 1.0.0 | Runtime-Age/native packet checks passed; live rendering still pending. Old file 8937394 has an upstream startup failure. |
|
||||||
|
| [Immersive Portals Reborn](https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354) | Alternative optional portal engine | NeoForge 7.0.12 for 26.3; later 7.0.18 is Fabric | .141–.142 port live book/crystal views; player, dedicated/client and restart checks passed. Static Sky bug: #116. Use one fork per instance. |
|
||||||
|
|
||||||
Ecliptic Seasons publishes 26.3, but Rivencraft's Ecliptic integration was
|
Ecliptic Seasons publishes 26.3, but Rivencraft's Ecliptic integration was
|
||||||
deferred and is not a replacement for the current Serene integration.
|
deferred and is not a replacement for the current Serene integration.
|
||||||
@@ -2169,3 +2197,919 @@ Server stopped and temporary world removed. Manual checks: Q/inventory toss,
|
|||||||
death/Disarm, broken stand, full-inventory delivery/retrieval, open-book visual
|
death/Disarm, broken stand, full-inventory delivery/retrieval, open-book visual
|
||||||
orientation, motion, ownership/pickup, component preservation and restart. Root
|
orientation, motion, ownership/pickup, component preservation and restart. Root
|
||||||
1.21.1 remains unchanged and #114 stays open until both tracks are complete.
|
1.21.1 remains unchanged and #114 stays open until both tracks are complete.
|
||||||
|
|
||||||
|
## Handheld Link Panel resource policy
|
||||||
|
|
||||||
|
`1.0.1.116-beta.1` adapts root WritingInkService and the configurable
|
||||||
|
`writing.link_panel_ink_cost` (2 default, 1–16 allowed). The item delegates the
|
||||||
|
server transaction to the service; Writing Desk cost reads also use its shared
|
||||||
|
getter. Mixer cost remains independently fixed at one ink per Link Panel.
|
||||||
|
Unsynchronized LOCAL config is not consulted for client affordability prediction;
|
||||||
|
the server validates both inputs and constructs outputs before mutation.
|
||||||
|
|
||||||
|
Build passed. No additional server fixtures were added; the user offered manual
|
||||||
|
validation. Check default/custom cost, insufficient ink, final bottle, both hands,
|
||||||
|
stacked/full-inventory inputs and dedicated-server cost differing from the client.
|
||||||
|
Root 1.21.1 is unchanged; no commit/push/publication was performed.
|
||||||
|
|
||||||
|
## Library discovery port
|
||||||
|
|
||||||
|
`1.0.1.117-beta.1` ports MystcraftLibraryFeature from the 1.21.1 implementation,
|
||||||
|
using the shared schematic/loot table and final five-stand orientation. Natural
|
||||||
|
placement runs after all vanilla/authored decoration via the Age feature wrapper,
|
||||||
|
with the same bounded footprint, candidate RNG/spacing, slope/footing and obstruction
|
||||||
|
rules. The wrapper now applies to every runtime Age; Cave terrain disables libraries
|
||||||
|
as in root. Existing chunks are not rewritten and vanilla Overworld generation is
|
||||||
|
not modified.
|
||||||
|
|
||||||
|
A separate saved writing map holds the original symbol list for AGE_ONLY loot,
|
||||||
|
avoiding expansion of the already-large backend index record. Creation stores it
|
||||||
|
before constructing/publishing the level; the wrapper captures an immutable list
|
||||||
|
and serializes library flags/list in its codec. Reload reconstructs the same pool.
|
||||||
|
LEGACY is the default; AGE_ONLY uses known distinct written IDs. Full random-page
|
||||||
|
policy integration remains pending. The snapshot list does not alter generation
|
||||||
|
traits or the book's original contents.
|
||||||
|
|
||||||
|
Added operator placement, session-only spacing override, cheap candidate reporting,
|
||||||
|
current-chunk probe/loot inspection and a locator restricted to loaded nearby chunks.
|
||||||
|
The locator checks a clear, dry, footed aisle; it never performs a mass remote
|
||||||
|
chunk-generation search. Explicit test placement checks empty space and entities.
|
||||||
|
|
||||||
|
Build passed; shared schematic/Sealed Notebook loot packaging verified. Dedicated
|
||||||
|
server startup passed. The user offered manual testing, so generation/loot checks
|
||||||
|
were handed over before running them. Temporary server stopped and world removed.
|
||||||
|
No new test fixture, commit or publication. This is a substantial discovery-system
|
||||||
|
slice; instability/recovery, crystal portals and remaining optional integrations
|
||||||
|
remain the other large parity gaps.
|
||||||
|
|
||||||
|
|
||||||
|
## .118 crystal portal gameplay port
|
||||||
|
|
||||||
|
The player confirmed .117 library generation and retracted the missing-library report.
|
||||||
|
Ported the 1.21.1 Book Receptacle, bounded crystal flood/tension network, portal
|
||||||
|
surface ownership and orientation, activation protection checks and rollback, removal
|
||||||
|
cleanup, queued transport and cooldown. Reused existing crystal, portal and receptacle
|
||||||
|
assets, recipe and progression node. The book renderer retains all final six mounting
|
||||||
|
orientations and explicitly clears its extracted presence when the book is removed.
|
||||||
|
|
||||||
|
Player traversal uses existing Linking/Descriptive Book paths, with portal audio
|
||||||
|
precedence. Descriptive arrival resolution is now shared; no separate portal offset
|
||||||
|
or generated exit position is introduced. Existing Intra-Linking, Disarm, momentum,
|
||||||
|
client Age acknowledgement, Return Link configuration and progression remain in force.
|
||||||
|
Non-player traversal uses modern TeleportTransition, collision/permission checks,
|
||||||
|
and the same landing resolver. A shared Disarm helper supports container/horse/mob
|
||||||
|
inventory and equipment without requiring the old protected-method mixin.
|
||||||
|
|
||||||
|
Book and owner pointers use modern ValueInput/ValueOutput and update packets. Startup
|
||||||
|
waits for loaded frame chunks; periodic bounded reconciliation retains root's cleanup
|
||||||
|
of disconnected cells, staggered every 200 ticks per holder. The surface remains the
|
||||||
|
animated facing-only fallback, tinted to the saved destination sky. Live portal views
|
||||||
|
are still optional integration work, not advertised as ported.
|
||||||
|
|
||||||
|
Build/resources and dedicated-server startup passed. A command-seeded 3x3 opening
|
||||||
|
verified exact-coordinate entity transport, persistence and traversal after restart,
|
||||||
|
and support-removal teardown/open-book recovery. Player interaction and client visuals
|
||||||
|
are handed over for manual testing. Temporary server stopped/world deleted; no new
|
||||||
|
permanent GameTest, commit, push or publication. Version: 1.0.1.118-beta.1.
|
||||||
|
|
||||||
|
|
||||||
|
## .119 instability foundation and status-effect gameplay
|
||||||
|
|
||||||
|
The player passed .118. Ported the complete five-deck catalog and deterministic
|
||||||
|
provider selection from 1.21.1. Separate modern codec SavedData freezes new Ages'
|
||||||
|
scoring contributions, seed, selected providers/levels and an enabled flag. Older
|
||||||
|
Ages remain neutral. Creation-time scoring currently covers Bright Lighting,
|
||||||
|
Accelerated, all three Corrupted sizes, ignored Cave weather/celestial modifiers,
|
||||||
|
excess/biome-forced structures and additional suns. Original page indices are retained.
|
||||||
|
Corrupted Pages now bind and contribute their Legacy costs; existing redacted rendering
|
||||||
|
is reused. The new Abandoned Camps structure follows the same modern-structure costs.
|
||||||
|
|
||||||
|
Adapted the bounded occupied-Age scheduler and the 18 local/global/general/hostile
|
||||||
|
potion providers, preserving 1.21.1 defaults, effect durations, level-based amplifiers,
|
||||||
|
sky exposure and Survival/Adventure targeting. The owned-instance lease system revokes
|
||||||
|
only Rivencraft's effects on exit/disable/shutdown, preserving other sources. Runtime
|
||||||
|
uses already-loaded chunks and shared per-Age work budgets; failed providers receive
|
||||||
|
a temporary quarantine. The config retains server ownership and can disable providers
|
||||||
|
without rerolling stored plans.
|
||||||
|
|
||||||
|
OP-only `/rivencraft_port instability` supplies status/breakdown, persistent enabled
|
||||||
|
control, session-only score override/reset and one-provider pulses. Pulse output tracks
|
||||||
|
successful application separately from attempted work so event-cancelled effects are
|
||||||
|
not reported as applied. No scoring data is sent to player book/Binder UI. Unimplemented
|
||||||
|
hazards stay selected with an explicit status; they are never replaced or rerolled.
|
||||||
|
|
||||||
|
Build/startup passed. Temporary dedicated-server checks verified neutral creation,
|
||||||
|
provider selection at a test score, Poison application/duration, immediate owned-effect
|
||||||
|
revocation, unrelated stronger-effect retention, local-versus-global roof behavior,
|
||||||
|
enabled-state persistence and test-score reset across restart. Server stopped/world
|
||||||
|
deleted; no new permanent GameTests, commit, push or publication. Manual checks cover
|
||||||
|
authored Corrupted/Accelerated/lighting score contributions, automatic player-occupied
|
||||||
|
scheduling, Survival/Creative policy, exit cleanup and hostile buffs. Version .119.
|
||||||
|
|
||||||
|
Still pending: full writing grammar recovery/penalties, live block abundance, decay,
|
||||||
|
lightning/explosions, meteors, burning and erosion, plus optional integration parity.
|
||||||
|
|
||||||
|
|
||||||
|
## .120 colored decay gameplay
|
||||||
|
|
||||||
|
The player passed .119. Ported the 1.21.1 DecayBlock, four provider handlers and bounded
|
||||||
|
frontier persistence. Reused all four active 16x16 block textures/models and the
|
||||||
|
protected-block tag. Modern adaptation uses BreakBlockEvent, Value/codec SavedData,
|
||||||
|
ChunkPos accessors, loaded-chunk lookup and server-side magic damage for White.
|
||||||
|
No decay item/recipe/drop is added.
|
||||||
|
|
||||||
|
Provider metadata now distinguishes world-mutating handlers, so world_mutation gates
|
||||||
|
decay independently of potion policy. Defaults remain enabled/four neighbor attempts,
|
||||||
|
one successful conversion per call under the shared scheduler budget. Conversion
|
||||||
|
hardness/air/color odds, infrastructure/BE/fluid/unbreakable protection, positioned
|
||||||
|
fake-player claim events and placement rollback are retained from 1.21.1.
|
||||||
|
|
||||||
|
The instability record adds an optional first resolved spawn, preserving old records'
|
||||||
|
scores/plans and enable flags. Shared Descriptive Book landing resolution records it
|
||||||
|
once; decay protects the same +/-4 horizontal and -2..+4 vertical region as root.
|
||||||
|
Older Ages record this on the next book/portal arrival; OP status exposes the point.
|
||||||
|
Frontiers and attempt counters live in each Age, capped at 1,024 positions per color.
|
||||||
|
|
||||||
|
Added OP-only `/rivencraft_port instability decay <color> [1..32 attempts]`, reporting
|
||||||
|
actual changes and nearby tracked positions. Existing generic pulses now report block
|
||||||
|
as well as entity actions. Invalid input/out-of-Age commands use proper command errors.
|
||||||
|
White block contact damage retains root's decay/world_mutation policy; disabling an
|
||||||
|
Age scheduler stops spread but does not remove existing decay or alter its block form.
|
||||||
|
|
||||||
|
Build/startup passed. All four colors seeded/spread through bounded command pulses.
|
||||||
|
A full restart retained each frontier and advanced attempts from 32 to 40 while Red
|
||||||
|
continued growing. Bedrock and water generated empty frontiers, and the saved Age
|
||||||
|
disable blocked further provider changes. Textures verified 16x16. A stationary NoAI
|
||||||
|
sheep did not exercise the stepping hook, so White stepping damage remains a player
|
||||||
|
manual check, alongside visuals, arrival protection, normal scheduler/claim integration.
|
||||||
|
Server stopped/test world removed; no permanent tests, commit, push or publication.
|
||||||
|
Version: 1.0.1.120-beta.1. Other hazards, full writing recovery and live abundance
|
||||||
|
profiling remain pending.
|
||||||
|
|
||||||
|
|
||||||
|
## .120 release sign-off
|
||||||
|
|
||||||
|
The user passed .120 and authorized commit, push and publication of the accumulated
|
||||||
|
.116–.120 work. Both target builds passed. Consolidated release notes distinguish
|
||||||
|
implemented libraries, fallback crystal portals and partial instability/decay from
|
||||||
|
remaining gameplay and optional-integration parity. Tracking issues #98/#102/#104
|
||||||
|
remain open; #114 still requires the matching 1.21.1 fix.
|
||||||
|
|
||||||
|
|
||||||
|
## .121 lightning/explosion providers
|
||||||
|
|
||||||
|
The player passed .120. Adapted the 1.21.1 hazard implementation, independent hazard
|
||||||
|
scheduler lane, loaded-only ring candidates, Legacy aggregated rates, bounded explosion
|
||||||
|
calculator, entity/Creative policy, protected-block/spawn checks and event guards.
|
||||||
|
Modern differences: EntityTypes registry constants, explicit entity spawn reason,
|
||||||
|
server damage API, gamerule registry, spatial fire-spread permission, BreakBlockEvent,
|
||||||
|
and explosion damage exposure argument. Since Level.explode now returns void, the
|
||||||
|
calculator retains its approved positions for bounded post-blast fire and records
|
||||||
|
whether an uncancelled explosion actually began. Lightning dispatch also reports
|
||||||
|
whether its entity was accepted. Existing optional mods are not required.
|
||||||
|
|
||||||
|
Per-Age modern SavedData persists attempt count and separate hazard cooldowns (with
|
||||||
|
the meteor field retained for the next provider port). Default config matches 1.21.1.
|
||||||
|
Added OP `/rivencraft_port instability hazard lightning|explosions` to skip probability
|
||||||
|
without bypassing cooldowns, loaded terrain, Age/config/provider policy or spawn
|
||||||
|
exclusion. Console sources may supply dimension/position explicitly. Neither the
|
||||||
|
command nor provider registration changes saved instability scores/decks.
|
||||||
|
|
||||||
|
Version 1.0.1.121-beta.1 builds and starts a dedicated server. The user offered manual
|
||||||
|
damage/block-destruction testing, so the temporary server was stopped before running
|
||||||
|
those fixtures and the world removed. Effects, visual/audio behavior, damage/block
|
||||||
|
caps and policy/restart checks are handed over; they are not reported as tested.
|
||||||
|
No new permanent GameTests, commit, push or publication. Meteor, burning, erosion,
|
||||||
|
crumble, full grammar recovery and live material profiling remain pending.
|
||||||
|
|
||||||
|
|
||||||
|
## .122 meteor provider
|
||||||
|
|
||||||
|
The player passed .121. Extracted the meteor-specific portion of the existing 1.21.1
|
||||||
|
AgeEnvironmentalProviders into a focused modern provider. The effect remains the
|
||||||
|
30-tick flame/smoke flight and roar followed by a strength-3 bounded impact, without
|
||||||
|
inventing a new rendered entity. Natural chance, randomized chunk/central coordinates,
|
||||||
|
48-block descent height, headroom/spawn checks, 200-tick cooldown, one active flight
|
||||||
|
per Age and 16 active Ages retain the root values.
|
||||||
|
|
||||||
|
The selected card uses an independent scheduler pass, sharing the existing hazard
|
||||||
|
candidate ring and saved attempt/cooldown data. The impact reuses the .121 blast
|
||||||
|
guards with meteor-specific config (24 blocks, eight entities, 12 damage by default).
|
||||||
|
Event handlers cancel active flights on disabled policy, absent players, unavailable
|
||||||
|
target chunk, Age unload or shutdown; session-only descent state is not replayed.
|
||||||
|
Modern changes use loaded ChunkPos accessors, max-Y API and codec SavedData already
|
||||||
|
ported for hazards. No optional mod dependency or new asset was introduced.
|
||||||
|
|
||||||
|
Added OP `/rivencraft_port instability meteor`, bypassing chance only. Status reports
|
||||||
|
meteor config distinctly from potion policy. The original roar is verified in the
|
||||||
|
built JAR. Version 1.0.1.122-beta.1 builds; effects, damage/protection, cooldown and
|
||||||
|
cancellation/restart behavior are delegated to the player's manual testing as offered.
|
||||||
|
No server/test world was launched, no permanent test added, and no commit/publication.
|
||||||
|
Burning, erosion/crumble, full grammar recovery and live material profiling remain.
|
||||||
|
|
||||||
|
|
||||||
|
## .123 burning and erosion
|
||||||
|
|
||||||
|
The player passed .122. Extracted/adapted the 1.21.1 burning/erosion handlers into a
|
||||||
|
focused provider class, retaining bounded candidate scans, seeded attempt sequence,
|
||||||
|
independent scheduler budgets and protection/event logic. Burning keeps the active
|
||||||
|
Legacy card, sky exposure, Survival/Adventure targeting, four targets per pass and
|
||||||
|
4..12-second duration. The manual pulse targets the player and uses modern water/rain
|
||||||
|
checking rather than the removed isInWaterRainOrBubble API.
|
||||||
|
|
||||||
|
Erosion stays absent from the Legacy deck, with the prior requested testing default
|
||||||
|
of enabled at >=10,000 current instability. It converts at most one eligible sampled
|
||||||
|
block to an adjacent above/horizontal source fluid. Current score resolves creation
|
||||||
|
contributions or an explicit session override; live profiling is not yet claimed.
|
||||||
|
The pulse requires a real aimed block within six blocks and the same threshold and
|
||||||
|
mutation/protection policy. Modern BreakBlockEvent and snapshot placement rollback
|
||||||
|
are reused. Provider status distinguishes these controls from potion policy.
|
||||||
|
|
||||||
|
Added OP `/rivencraft_port instability environment burning|erosion`. No scores/plans
|
||||||
|
are changed by provider registration or test pulses. Config names/defaults match the
|
||||||
|
1.21.1 scorching/erosion sections. Version 1.0.1.123-beta.1 builds; visual/damage/fluid,
|
||||||
|
exemption, policy and natural scheduling checks are handed to the player. No temporary
|
||||||
|
server/world or permanent fixtures were created; no commit/push/publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .124 live material profiling
|
||||||
|
|
||||||
|
The player passed .123. Crumble has no active 1.21.1 handler, so it remains explicitly
|
||||||
|
unavailable. Ported AgeBlockInstability and modern per-dimension profile SavedData,
|
||||||
|
using the same 401/500 readiness thresholds, 1,024 sample cap, watched/native/modded
|
||||||
|
weights, 5% Overworld allowance, 100,000-point cap and difficulty scaling. Registry
|
||||||
|
material eligibility reuses the Page pool rules; common ore/storage tags use modern
|
||||||
|
BlockItems tag accessors. Installed content remains optional; exact weight overrides
|
||||||
|
retain the existing root syntax and validation.
|
||||||
|
|
||||||
|
Deferred chunk-load sampling processes four entries/tick with a bounded queue. Spawn
|
||||||
|
completion requests one chunk per second across occupied profiling Ages and their
|
||||||
|
baseline, with at most one request in flight. The off-thread getChunkFuture path was
|
||||||
|
verified in the local 26.3 source to avoid main-thread managedBlock. Completion checks
|
||||||
|
server stop/level identity. Existing sampled chunks are not recounted. Effective
|
||||||
|
provider plans now combine live points and frozen writing, cache stable totals/seeds,
|
||||||
|
and retain the original saved plan. Old neutral Ages stay excluded. OP status shows
|
||||||
|
progress/totals and session override reset restores the live effective plan.
|
||||||
|
|
||||||
|
Version 1.0.1.124-beta.1 builds and starts a dedicated server. Real chunk-load sampling
|
||||||
|
persisted 25 snapshots and counted a fixture Diamond Block. A bounded restart test
|
||||||
|
used synthetic sample records, plus resumed actual loads: 423 Age / 522 baseline
|
||||||
|
samples yielded 2,987 live points (independently calculated), a frozen writing score
|
||||||
|
of zero and live selected providers. Override reset restored that plan. No hundreds-
|
||||||
|
of-chunks generation test was run; occupied-Age background generation and generated
|
||||||
|
material/modded/config checks are delegated to the player. Server stopped and world
|
||||||
|
removed. No permanent fixtures, commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .125 ordered controller recovery
|
||||||
|
|
||||||
|
The player passed .124. Added semantic-role metadata to the port symbol index and
|
||||||
|
a focused recovery pass for singular-controller duplicates/conflicts, category
|
||||||
|
order, Native-with-biomes and Single-with-extra-biomes. Last singular choice wins;
|
||||||
|
Single retains the first biome; Native drops authored biome choices. Duplicate or
|
||||||
|
conflict diagnostics contribute 500 points and order diagnostics 100, following
|
||||||
|
the corresponding 1.21.1 grammar rules. Costs retain original page indices.
|
||||||
|
|
||||||
|
Binder support and server terrain/environment selection share recovered choices.
|
||||||
|
Original book/library pages, color boundaries and celestial-chain indices remain
|
||||||
|
intact; raw number/celestial validation and all unimplemented-page guards still
|
||||||
|
apply. Missing biome registry entries are checked even if recovery would discard
|
||||||
|
the page. Ambient Color has its own stage and is not a singular lighting choice.
|
||||||
|
Existing Ages are unchanged. This is the first recovery slice, not completion of
|
||||||
|
celestial/dangling/material grammar recovery or season integration.
|
||||||
|
|
||||||
|
Version 1.0.1.125-beta.1 builds; 13 temporary focused checks pass, covering recovery,
|
||||||
|
costs, preserved chains and rejection boundaries. No server/test world or permanent
|
||||||
|
fixtures. In-game last-choice behavior, original-page retention and OP diagnostics
|
||||||
|
are delegated to the player. No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .126 ordered celestial and number recovery
|
||||||
|
|
||||||
|
The player passed .125. Ported the 1.21.1 grammar treatment of pending celestial
|
||||||
|
modifiers and numeric adjacency. Repeated Length/Phase/Angle/Size/Direction pages
|
||||||
|
before a celestial use the final value of that kind without a duplicate penalty.
|
||||||
|
Only the final unconsumed modifier of each kind adds 100 dangling-modifier points.
|
||||||
|
A number without an immediately following supported Color/Length/Phase/Angle/Size
|
||||||
|
page adds 100 points (misplaced, or dangling at the end). Consecutive numbers leave
|
||||||
|
only the last available for the next target. Colors still mix in written order.
|
||||||
|
|
||||||
|
These defects no longer block binding. Numbers and celestial compilation retain
|
||||||
|
the original page sequence and seeded color indices; controller recovery never
|
||||||
|
moves a number next to a new target. A trailing modifier cannot rewrite an earlier
|
||||||
|
body, including the optimized single-body compilation path. Missing celestial
|
||||||
|
branches retain their existing seeded completion; dangling controls do not apply
|
||||||
|
to those generated bodies. All original book/library pages remain. Unsupported
|
||||||
|
pages and the ten-sun/ten-moon limit still block binding; existing Ages are unchanged.
|
||||||
|
|
||||||
|
Version 1.0.1.126-beta.1 builds. Seventeen temporary focused checks passed, covering
|
||||||
|
last-value selection, dangling costs/indices, numeric adjacency, per-body isolation,
|
||||||
|
seeded color stability, valid numbered writing, body limits, unsupported pages and
|
||||||
|
cycle codec round-trip. No server/world or permanent test fixture was created.
|
||||||
|
Manual validation: bind a book with Half Length, Double Length, Sun and verify the
|
||||||
|
last length; bind Sun followed by Large Size and confirm it does not resize that
|
||||||
|
sun. Test a trailing Number page and inspect the added writing contribution with
|
||||||
|
`/rivencraft_port instability status`. Original pages should remain visible.
|
||||||
|
No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .127 Link Modifier station: title and core link properties
|
||||||
|
|
||||||
|
The player passed .126. Started the missing 1.21.1 Link Modifier station port,
|
||||||
|
reusing its block model, textures, horizontal facing variants and Legacy 176x166
|
||||||
|
single-book GUI. The item is available in the main creative tab or via
|
||||||
|
`/give @s rivencraft:link_modifier`; it has no crafting recipe. As in 1.21.1,
|
||||||
|
creative acquisition does not impose a new permission restriction on ordinary
|
||||||
|
book edits once the station has been placed.
|
||||||
|
|
||||||
|
One persistent slot accepts Linking and Descriptive Books, including unbound
|
||||||
|
books, with normal and shift-click transfers. The server menu handles renaming
|
||||||
|
and Disarm, Maintain Momentum and Intra Linking toggles. Descriptive Books cannot
|
||||||
|
toggle Intra Linking, which only governs same-dimension Linking Book travel.
|
||||||
|
Existing target, author, symbols and Age identity are retained. Renaming changes
|
||||||
|
the item's custom title, not the Age's saved folder/registry identity. Removing
|
||||||
|
the title restores the item's normal name. Text editing consumes inventory/hotbar
|
||||||
|
shortcuts while focused; Escape closes the screen. Programmatic text refreshes do
|
||||||
|
not send rename packets. Menu identity, owner, distance and live station checks
|
||||||
|
protect edits; unknown button IDs and non-book inputs are rejected.
|
||||||
|
|
||||||
|
The book is saved with modern ValueInput/ValueOutput container serialization.
|
||||||
|
Station removal uses block-entity preRemoveSideEffects to release the stored book
|
||||||
|
once, including non-player removal. No tick handler or renderer is needed.
|
||||||
|
|
||||||
|
This is a station slice, not full Link Modifier parity. Seed editing, Age retirement,
|
||||||
|
Relative Link, Intra-Linking Only and platform overrides remain unported and are
|
||||||
|
not presented as working controls. Existing core flag behavior is reused unchanged.
|
||||||
|
Manual validation: place the station in multiple orientations, insert/shift-click
|
||||||
|
both book types, rename using text containing E, toggle each available property,
|
||||||
|
remove the book and use it to check travel effects. Confirm Descriptive Book Intra
|
||||||
|
Linking is unavailable, restart with a book left in the station, and break a loaded
|
||||||
|
station to recover one book. Build and dedicated persistence results are recorded
|
||||||
|
below. No commit, push or publication.
|
||||||
|
|
||||||
|
Version 1.0.1.127-beta.1 builds. Packaged model, GUI, texture, item definition,
|
||||||
|
loot table and localization checks passed; no station recipe is included. A
|
||||||
|
fresh dedicated server placed the station and serialized a named Linking Book
|
||||||
|
with all three core flags. Restart retained the same book/name/flags and station
|
||||||
|
removal completed normally. The first harness run expected the wrong wording
|
||||||
|
for vanilla force-load cleanup; the corrected harness completed successfully.
|
||||||
|
Both temporary worlds were deleted and servers stopped. No permanent tests were
|
||||||
|
added. UI interaction, transfer counts and modifier travel effects await the
|
||||||
|
player's in-game check.
|
||||||
|
|
||||||
|
|
||||||
|
## .128 six Link Modifier controls
|
||||||
|
|
||||||
|
The player reported that .127 exposed only three of 1.21.1's six controls. Added
|
||||||
|
the remaining Intra-Linking Only, Relative Link and Generate Platform controls in
|
||||||
|
the existing two-column, three-row Legacy layout, with matching bit values and
|
||||||
|
server-owned menu actions. Enabling Intra-Linking Only enables Intra Linking too;
|
||||||
|
disabling Intra Linking clears Intra-Linking Only. Both intra controls are disabled
|
||||||
|
for Descriptive Books. Unknown actions and out-of-range menu edits remain rejected.
|
||||||
|
|
||||||
|
Linking Book Intra-Linking Only blocks cross-dimension travel. Relative Link uses
|
||||||
|
the traveller's block offset from the source world's spawn, applied to destination
|
||||||
|
spawn, preserving destination yaw/pitch. Normal links retain their precise bound
|
||||||
|
coordinates. Player and non-player portal travel share the new flags and relative
|
||||||
|
coordinate helper. Descriptive relative arrivals still require proper footing.
|
||||||
|
|
||||||
|
Generate Platform is off by default for Linking Books. When enabled, a successful
|
||||||
|
link fills one missing floor block with cloud platform only if the block two above
|
||||||
|
the arrival is air, matching the 1.21.1 helper. Existing floors are retained.
|
||||||
|
Descriptive Books instead default to enabled and use Disable Platform internally;
|
||||||
|
turning it off prevents fallback platform creation and refuses travel if no footed
|
||||||
|
landing is available. Receptacle tint preparation respects that setting too.
|
||||||
|
New flags serialize in the shared component and appear in book/panel tooltips.
|
||||||
|
Existing three-flag books remain valid. Seed editing and Age retirement remain
|
||||||
|
separate, unfinished station work.
|
||||||
|
|
||||||
|
Version 1.0.1.128-beta.1 builds. A temporary dedicated-server fixture passed 19
|
||||||
|
checks: menu actions/dependencies, descriptive intra rejection, numeric flag codec,
|
||||||
|
relative offsets, platform-off/default behavior, platform placement/preservation,
|
||||||
|
invalid input and remote edit protection. It did not perform real client travel.
|
||||||
|
The test server stopped and its world/fixture sources were removed. The production
|
||||||
|
JAR is rebuilt without that fixture. Manual checks: all six buttons and tooltips,
|
||||||
|
same/cross-dimension Intra-Linking Only, Relative Link offsets, and platform on/off
|
||||||
|
for both book types (including a new Void Age without footing). No commit, push
|
||||||
|
or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .129 Link Modifier mouse input repair
|
||||||
|
|
||||||
|
The player reported that none of the six controls responded. Confirmed the
|
||||||
|
26.3 input constants in the local Minecraft artifact: left/middle/right are
|
||||||
|
1/2/3, while the custom Link Modifier handler checked the old left-button value
|
||||||
|
0. Its server actions therefore passed the prior direct-menu fixture while
|
||||||
|
real mouse clicks never sent an action.
|
||||||
|
|
||||||
|
Replaced the manually drawn/clicked areas with six registered Minecraft Button
|
||||||
|
widgets at the same Legacy positions. Their callbacks send the existing validated
|
||||||
|
menu action IDs, and their custom rendering retains the square controls. Native
|
||||||
|
input provides correct mouse mapping, focus, click sound and keyboard activation.
|
||||||
|
All six tooltips expose their On/Off state; unavailable Descriptive Book intra
|
||||||
|
controls remain disabled. Tooltip objects update only when state changes so their
|
||||||
|
hover delay is not reset every tick. Book mutations/travel code is unchanged.
|
||||||
|
|
||||||
|
Version 1.0.1.129-beta.1 builds. The native widget's left-button mapping and callback
|
||||||
|
dispatch were verified in the local Minecraft bytecode. No client click test or
|
||||||
|
new server run was performed; the previous 19 checks covered server actions, not
|
||||||
|
client input. Please click each option with an inserted Linking Book and verify
|
||||||
|
its selected shading and tooltip/book properties change, then repeat supported
|
||||||
|
options with a Descriptive Book. No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .130 Link Modifier seed editing
|
||||||
|
|
||||||
|
Ported the 1.21.1 station's seed field into the Legacy GUI. It is visible for a
|
||||||
|
bound Descriptive Book whose Age is still indexed, including an unloaded Age.
|
||||||
|
The complete signed 64-bit seed synchronizes through four 16-bit menu data words;
|
||||||
|
zero and negative seeds are not treated as missing data. Linking Books and unbound
|
||||||
|
or retired references do not expose an editable seed.
|
||||||
|
|
||||||
|
Enter/keypad Enter or clicking outside the field applies the edit; Escape closes
|
||||||
|
without applying unfinished text. Focused typing consumes inventory/hotbar shortcuts.
|
||||||
|
Modern InputConstants are used rather than legacy numeric key values. The bounded
|
||||||
|
payload validates the open menu ID and expected Age ID, plus menu owner, station
|
||||||
|
identity and distance. Invalid/overflowing input and occupied Ages are refused.
|
||||||
|
This matches 1.21.1's ordinary creative-acquired station editing permissions.
|
||||||
|
|
||||||
|
Successful edits use RuntimeAgeBackend.reseed, not a display-only book component.
|
||||||
|
Existing chunks and book identity remain intact, while newly generated chunks use
|
||||||
|
the changed seed. Existing backend unload/save/catalog synchronization is reused;
|
||||||
|
frozen written choices and instability history are not rerolled. Retirement UI
|
||||||
|
remains a later port slice.
|
||||||
|
|
||||||
|
Version 1.0.1.130-beta.1 builds. A temporary dedicated-server fixture passed 16 menu/
|
||||||
|
backend checks plus two restart checks: bound/unbound visibility, malformed/overflow
|
||||||
|
input, stale expected Age, occupied and remote refusal, retained old terrain,
|
||||||
|
changed index/level seed, unloaded reseeding including Long.MIN_VALUE, retained
|
||||||
|
book identity and full restart persistence. Future-chunk height fingerprints from
|
||||||
|
the menu-reseeded Age matched a fresh new-seed control and differed from an old-seed
|
||||||
|
control (new=-1541880620; retained origin=924831745). The initial flat-world fixture
|
||||||
|
could not distinguish terrain seeds; the terrain comparison used a normal-world
|
||||||
|
fixture. All temporary test worlds and fixture sources were removed and the server
|
||||||
|
stopped. The production JAR was rebuilt without fixtures. Client field input,
|
||||||
|
feedback and real travel validation are delegated to the player. No commit, push
|
||||||
|
or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .131 Link Modifier Age retirement
|
||||||
|
|
||||||
|
The player passed .130 seed editing. Ported the remaining 1.21.1 station retirement
|
||||||
|
control through the existing 26.3 lifecycle backend. A bound, active Descriptive
|
||||||
|
Book exposes the control only to players with modern Gamemaster (OP level 2)
|
||||||
|
permission. The first native button arms retirement; a separate red confirmation
|
||||||
|
button performs it. The arm and confirm actions have distinct IDs so repeating the
|
||||||
|
initial click cannot silently confirm. Normal book editing permissions are unchanged.
|
||||||
|
|
||||||
|
Confirmation is server-owned and tied to the exact Age and book components.
|
||||||
|
Replacing/removing the book, renaming, changing properties or applying a seed edit
|
||||||
|
clears confirmation; reopening the menu starts unarmed. Invalid, stale, non-OP and
|
||||||
|
remote actions cannot retire an Age. The target must be empty of players, including
|
||||||
|
the operator. A failed attempt clears confirmation and reports refusal.
|
||||||
|
|
||||||
|
Successful retirement uses RuntimeAgeBackend.retire: flush/unload the target,
|
||||||
|
persist its tombstone, archive only its directory beside the active world and
|
||||||
|
synchronize the runtime catalog. Other Ages are retained. The inserted book keeps
|
||||||
|
its now-dead identity, cannot reopen the retired Age, and no longer exposes seed or
|
||||||
|
retirement controls. Storage failures reuse backend rollback and display failure.
|
||||||
|
This follows 1.21.1 archival behavior rather than permanently erasing the files.
|
||||||
|
|
||||||
|
Version 1.0.1.131-beta.1 builds. Eighteen temporary dedicated-server checks plus four
|
||||||
|
restart checks passed: permission boundary, arm/confirm order, edits and book swaps,
|
||||||
|
occupied/remote refusal, successful retirement, exact archive and surviving control
|
||||||
|
Age, retained dead-book identity, repeated confirmation refusal, persisted tombstone,
|
||||||
|
and refusal to reload/recreate after restart. Test servers were stopped and all
|
||||||
|
worlds, archives and fixture sources removed. Production JAR rebuilt without the
|
||||||
|
fixture. Client button visibility, tooltip/feedback, occupied refusal and travel
|
||||||
|
through an old book are delegated to the player. No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .132 failed Age-creation rollback (#99)
|
||||||
|
|
||||||
|
The player passed .131 retirement. Wrapped new runtime Age setup in one rollback
|
||||||
|
boundary: library writing, level construction/load event, weather and Accelerated
|
||||||
|
settings, index/initial display name, instability record and initial SavedData save.
|
||||||
|
The catalog is published only after those steps succeed. Book creation now supplies
|
||||||
|
its initial name to this operation and no longer configures acceleration/name after
|
||||||
|
commit. Operator/default callers retain the prior overloads.
|
||||||
|
|
||||||
|
A failed attempt closes the level stores, dispatches unload cleanup, removes its
|
||||||
|
new index/environment entries without leaving a retirement tombstone, restores the
|
||||||
|
prior library/instability metadata and saves that restoration. It removes only the
|
||||||
|
exact, newly allocated Age directory with a non-following tree walk. Existing Age
|
||||||
|
storage, live levels, retired IDs and unsafe/symlink paths are refused before any
|
||||||
|
setup. Pre-existing directories are never reused or erased. Cleanup failures are
|
||||||
|
attached to the original exception; if stores cannot close, files are retained to
|
||||||
|
avoid racing an active writer. Book failures are logged/reported and do not move
|
||||||
|
the caller. This covers recoverable runtime exceptions, not arbitrary process death
|
||||||
|
or a guarantee against persistent filesystem/I/O failure.
|
||||||
|
|
||||||
|
Index entry cleanup is shared with retirement without removing the retained display
|
||||||
|
name needed by retirement rollback. No existing Age scores, generation or settings
|
||||||
|
are migrated. No production fault-injection command/hook was introduced.
|
||||||
|
|
||||||
|
Version 1.0.1.132-beta.1 builds. A temporary dedicated fixture passed 36 checks plus
|
||||||
|
seven restart checks. Injected failures during LevelEvent.Load, instability creation
|
||||||
|
and late display-name validation left no live/indexed Age, restored prior writing,
|
||||||
|
dispatched one unload and removed only the new directory. Clean retries of the same
|
||||||
|
IDs succeeded. An existing directory marker survived refusal. A failed book-creation
|
||||||
|
call returned no Age and left its caller in the original world. Restart confirmed
|
||||||
|
failed metadata stayed absent while committed names/Accelerated settings persisted.
|
||||||
|
Fixture source, worlds and servers were removed/stopped; production JAR rebuilt
|
||||||
|
without the fixture. Client validation: create two Ages with distinct names, travel
|
||||||
|
and restart, including a book with Accelerated pages, and confirm their names,
|
||||||
|
settings and destinations remain independent. No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
## .133 optional JEI integration (#102)
|
||||||
|
|
||||||
|
The player passed .132. Adapted the 1.21.1 JEI plugin to the current 26.3 API and
|
||||||
|
render extraction path. At the player's request, the target is the newest published
|
||||||
|
26.3 NeoForge build, 31.17.0.109 (JEI labels it beta), verified against its official
|
||||||
|
Maven metadata and Modrinth release API. This supersedes the initially inspected
|
||||||
|
installed 31.17.0.94. The latest release channel differs from the latest published
|
||||||
|
build; this slice deliberately targets the newer 31.17.0.109 build.
|
||||||
|
|
||||||
|
Added searchable component-aware Symbol Pages, all eight mixer Link Panel variants
|
||||||
|
and category/volume Symbol Portfolios. Registered biome and eligible Block/Fluid
|
||||||
|
pages use the same pools as Creative, including installed registry content. Runtime
|
||||||
|
registration fills any missing world-dependent variants; Blank Pages and the empty
|
||||||
|
base portfolio are removed from JEI's ingredient list. Future pages entering the
|
||||||
|
shared category pools participate automatically. Shared link-panel variant creation
|
||||||
|
now supplies both Creative and JEI.
|
||||||
|
|
||||||
|
Reused the Writing and Ink Mixer recipe-guide categories, additive chance guides,
|
||||||
|
and Ink Vial/Writing Desk/Book Binder/Ink Mixer catalysts. The port-specific mixer
|
||||||
|
text correctly states one paper plus one ink per panel, 16 units per vial and reset
|
||||||
|
of additives on output pickup. Added Link Modifier information, without a recipe.
|
||||||
|
Wrapped guide text uses opaque, shadow-free rendering and extra Mixer guide height.
|
||||||
|
These are explanatory guides; no auto-transfer handler or fictitious Blank Page
|
||||||
|
crafting recipe is introduced.
|
||||||
|
|
||||||
|
JEI is compile-only and isolated in its annotated scanner plugin. It is not bundled
|
||||||
|
or a required runtime dependency; no common class loads its plugin. The developer
|
||||||
|
`-PwithJei` option adds JEI locally, including its Maven dependencies. The current
|
||||||
|
109 POM requires MezzConfig 0.6.10 (and its GUI module); the existing test instance's
|
||||||
|
0.6.9 must be updated alongside JEI as required by the mod's distribution metadata.
|
||||||
|
Maven repository filters include JEI and MezzConfig groups only.
|
||||||
|
|
||||||
|
Version 1.0.1.133-beta.1 builds against the 109 API. A fresh dedicated server started
|
||||||
|
without JEI or any optional mods and stopped normally; its world was removed. Client
|
||||||
|
plugin discovery, ingredient counts/subtype uniqueness, guide rendering and category
|
||||||
|
navigation await the player's check with JEI 31.17.0.109 and its dependencies. Other
|
||||||
|
optional integrations remain unported; #102 is not complete. No commit, push or
|
||||||
|
publication, and no user's instance files were replaced.
|
||||||
|
|
||||||
|
|
||||||
|
## .134 optional TerraBlender regions (#102)
|
||||||
|
|
||||||
|
The player passed .133 JEI. Ported the 1.21.1 optional TerraBlender region adapter
|
||||||
|
to the current 26.3 API, compile-only at 26.3.0.0.9 (the latest published 26.3
|
||||||
|
build checked on Modrinth). The core boundary never exposes TerraBlender types.
|
||||||
|
Absent/broken optional API falls back to existing tags/native pools, with one
|
||||||
|
warning for API failures. No content mod is required or bundled. A developer
|
||||||
|
`-PwithTerraBlender` runtime option is available.
|
||||||
|
|
||||||
|
Enumerates registered non-vanilla biome keys from Overworld and Nether regions,
|
||||||
|
excluding TerraBlender's deferred placeholder. Overworld additions extend random
|
||||||
|
and seed-completed Standard/Amplified/Island/Flat pools. Nether-region membership
|
||||||
|
extends Cave-compatible selection and Cave Page classification even without an
|
||||||
|
is_nether tag. Registry-derived Creative and JEI page pools share that result.
|
||||||
|
Runtime Age construction primes membership before biome validation/generation;
|
||||||
|
Nether material-rule conditions also include recognized TerraBlender Nether keys.
|
||||||
|
|
||||||
|
Region scans are cached per registry access with weak keys; hot generation queries
|
||||||
|
use weak-holder membership rather than rescanning all regions. Tags updates refresh
|
||||||
|
the relevant registry entry, and a lowest-priority server-about-to-start callback
|
||||||
|
refreshes after TerraBlender loads data-driven regions. Frozen saved biome pools
|
||||||
|
are not rerolled or migrated. No mod-specific biome names are hardcoded.
|
||||||
|
|
||||||
|
Both 1.21.1 and 26.3 APIs expose OVERWORLD/NETHER, but no CAVE or END region type.
|
||||||
|
This distinction and the need for cave tags/metadata were posted and verified in
|
||||||
|
#111 (comment 605), including Nether precedence for overlapping Cave/Nether tags,
|
||||||
|
explicit authoring, and the planned Native Nether/End pages. This slice retains
|
||||||
|
current Native Cave eligibility: excluding Nether from its default pool and adding
|
||||||
|
those new pages remain #111, for both version tracks. No 1.21.1 code was changed.
|
||||||
|
|
||||||
|
Version 1.0.1.134-beta.1 builds. A clean dedicated server without TerraBlender
|
||||||
|
starts normally. A fresh server with TerraBlender 26.3.0.0.9, BOP 26.3.0.0.16 and
|
||||||
|
GlitchCore 26.3.0.0.5 passed nine focused checks: 59 Overworld additions, five Nether
|
||||||
|
additions, placeholder exclusion, completion pools, Cave Page placement, an injected
|
||||||
|
Nether region referencing an untagged biome, cache removal after region removal,
|
||||||
|
and Cave Age acceptance/reload with a modded Nether biome. No bulk generation or
|
||||||
|
client rendering was claimed. Test servers stopped, worlds and fixture sources
|
||||||
|
removed; production JAR rebuilt without fixtures. Client Creative/JEI placement,
|
||||||
|
actual BOP surface/Cave terrain materials and decoration remain player checks.
|
||||||
|
No commit, push or publication. Other #102 integrations remain incomplete.
|
||||||
|
|
||||||
|
|
||||||
|
## .135 optional Serene Seasons per-Age policies (#102)
|
||||||
|
|
||||||
|
The player passed .134. Ported 1.21.1's six modes: No Seasons, cycling Seasons,
|
||||||
|
Eternal Winter/Summer/Fall/Spring. Uses the latest published 26.3 Serene build
|
||||||
|
26.1.2.0.7 (QnvW5HPm) and GlitchCore 26.3.0.0.5 (pQgy3bfh), matching the test
|
||||||
|
instance. Both APIs are compile-only behind a guarded adapter, never bundled or
|
||||||
|
required. The developer -PwithSereneSeasons flag adds them to the local runtime.
|
||||||
|
|
||||||
|
New Ages freeze an authored or seed-selected policy in separate SavedData. Omitted
|
||||||
|
choices randomize only when Serene is installed, matching root Legacy ranks:
|
||||||
|
Seasons weight 6, No Seasons 5 and each Eternal 1. Cave terrain always disables
|
||||||
|
seasons. Existing Ages without a stored policy retain legacy cycling behavior
|
||||||
|
when integration/auto-whitelisting is enabled; they are not randomly reassigned.
|
||||||
|
No Seasons is usable without the optional mod; other seasonal pages require it.
|
||||||
|
Singular page recovery keeps the last seasonal controller with existing penalties.
|
||||||
|
|
||||||
|
The guarded adapter writes only the target Age's whitelist entry and persists it
|
||||||
|
through Serene/GlitchCore's config API. Connected-client updates and login replay
|
||||||
|
apply the same entries without a restart. Existing unrelated entries are retained.
|
||||||
|
Eternal policies hold the middle sub-season in a bounded mid-season window, avoiding
|
||||||
|
per-tick dirty data and leaving the Overworld calendar unchanged. Server config
|
||||||
|
serene_seasons.auto_whitelist_ages defaults true, matching 1.21.1: explicit policies
|
||||||
|
still apply when disabled, while existing whitelist entries are not removed merely
|
||||||
|
by disabling automatic behavior.
|
||||||
|
|
||||||
|
Policy selection participates in creation rollback before catalog publication;
|
||||||
|
optional whitelist changes happen only after successful creation. Reload/reseed
|
||||||
|
reuse the frozen policy. Retirement removes its whitelist entry only after backend
|
||||||
|
retirement succeeds, while policy history can remain in global metadata. Client
|
||||||
|
messages are limited to Rivencraft Age IDs. Compatibility failures log once rather
|
||||||
|
than flood every level tick. No Ecliptic Seasons support is added.
|
||||||
|
|
||||||
|
Version 1.0.1.135-beta.1 builds. A clean dedicated server starts without optional
|
||||||
|
mods. With Serene/GlitchCore, 25 checks passed on creation and 22 after full restart:
|
||||||
|
all six saved modes/whitelist policies, each eternal mid-season and recovery from a
|
||||||
|
changed cycle value, unchanged Overworld season data, unrelated whitelist entries,
|
||||||
|
deterministic omitted choices, no random choice when the mod is absent, and Cave
|
||||||
|
suppression. The initial restart assertion was corrected to allow the deliberate
|
||||||
|
mid-season hold window inherited from 1.21.1. Test worlds/fixtures were removed and
|
||||||
|
servers stopped; production JAR rebuilt without fixtures. Client visual effects,
|
||||||
|
reconnect/live whitelist synchronization, normal season progression, authoring and
|
||||||
|
retirement with a real connected client remain player validation. No commit, push
|
||||||
|
or publication; other #102 integrations remain open.
|
||||||
|
|
||||||
|
|
||||||
|
### Optional Ruins template pages — 1.0.1.136-beta.1
|
||||||
|
|
||||||
|
The preceding Serene Seasons slice passed the player's in-game check. Ruins now
|
||||||
|
uses the 1.21.1 exact-template bridge: each unambiguous installed `.tml` filename
|
||||||
|
gets a dynamic glyph page in a Ruins creative tab, portfolios, and JEI's page pool.
|
||||||
|
Names preserve case and Unicode through reversible IDs. Discovery reads Ruins'
|
||||||
|
active `config/ruins_config` directory, with its bundled archive as the first-launch
|
||||||
|
fallback. Duplicate basenames disable the bridge because Ruins' event cannot
|
||||||
|
identify which directory supplied the template.
|
||||||
|
|
||||||
|
Authored template choices and all duplicate counts are frozen in the Age's terrain
|
||||||
|
feature plan and restored before its load event. Only selected templates pass the
|
||||||
|
Age dimension and pre-spawn gates; other worlds retain Ruins' own behavior. Ruins'
|
||||||
|
biome/surface/distance requirements remain applicable. Copies multiply template
|
||||||
|
weight and increase attempts by one per extra page, capped at 32 attempts without
|
||||||
|
lowering an explicitly higher Ruins configuration. The first three copies are free;
|
||||||
|
each later copy adds 100 instability, including copies beyond the attempt cap.
|
||||||
|
Material pages do not modify Ruins structures. Unloading clears bridge state and
|
||||||
|
reloading restores it; optional Ruins classes are not loaded when the mod is absent.
|
||||||
|
|
||||||
|
The reproducible compile-only baseline is Ruins 26.3.1NF (CurseForge file 8962119);
|
||||||
|
the installed Ruins 26.3.2NF was used for integration validation. For development,
|
||||||
|
`-PwithRuins` adds the baseline runtime, or combine it with
|
||||||
|
`-PruinsJar=/absolute/path/to/ruins-26.3.2NF.jar` to run a local current build.
|
||||||
|
Neither dependency is bundled or required to run Rivencraft.
|
||||||
|
|
||||||
|
Build and clean dedicated-server startup without Ruins passed. With Ruins 26.3.2NF,
|
||||||
|
21 checks passed on creation and 10 after restart, covering 25 discovered templates,
|
||||||
|
creative/JEI pool parity, readable/case-sensitive IDs, authoring, codec roundtrip,
|
||||||
|
50 retained copies, attempt limits, 4,700 excess-page instability, exact template
|
||||||
|
filtering, both dimension gates, spawn-event veto, and a real Tiki Head placement
|
||||||
|
(149 non-air blocks counted in the checked volume). Restart, unload, and reload
|
||||||
|
retained the counts. Temporary fixtures and test worlds were removed; test servers
|
||||||
|
were stopped. Client glyph/GUI checks and natural spawning while exploring an Age
|
||||||
|
remain player validation. No commit, push, or publication; #102 remains open.
|
||||||
|
|
||||||
|
|
||||||
|
### Random Page eligibility and library discovery — 1.0.1.137-beta.1
|
||||||
|
|
||||||
|
The player passed .136 and authorized its publication. This slice adapts 1.21.1's
|
||||||
|
RandomPagePolicy and random_pages allowlist/blocklist. Short paths (sky/static)
|
||||||
|
and fully namespaced Page IDs are accepted; blocklist wins, and allowlist entries
|
||||||
|
restrict only their own categories. Biome controllers are a separate category
|
||||||
|
from individual biomes. Creative/JEI availability and manual book authoring are
|
||||||
|
not filtered.
|
||||||
|
|
||||||
|
Normal Link-Panel-only book creation takes one immutable policy snapshot and
|
||||||
|
passes it through terrain, biome distribution/Page completion, environment,
|
||||||
|
celestial kinds, material features/materials, optional formations and structures.
|
||||||
|
Seasons use the same snapshot before their saved policy is committed. Resolved
|
||||||
|
choices are already frozen in Age index/season data, so reload/reseed never reads
|
||||||
|
the current lists to reselect an old Age. Authored and partly authored books use
|
||||||
|
the existing unrestricted completion behavior, matching the 1.21.1 boundary.
|
||||||
|
|
||||||
|
Required empty categories use Standard terrain, Native distribution, Normal
|
||||||
|
lighting/weather, inherited Overworld sky, or No Seasons. Optional features or
|
||||||
|
materials with no candidates are omitted, not filled with a forbidden random
|
||||||
|
Page. Non-Native biome distributions preserve their required minimum using the
|
||||||
|
terrain's preferred/native fallback pool; necessary fallback biomes can therefore
|
||||||
|
bypass a filter. Native noise biomes come from the preset, not biome Page selection,
|
||||||
|
and remain unfiltered just as in 1.21.1. Void still has its required Void biome.
|
||||||
|
Cave weather/season safety overrides remain unchanged. Original unrestricted
|
||||||
|
terrain/distribution seed choices are unchanged; filtered ranks are recalculated
|
||||||
|
using the shared Legacy rank chooser instead of a duplicate weighted routine.
|
||||||
|
|
||||||
|
Newly placed direct library Pages apply the current policy in both LEGACY and
|
||||||
|
AGE_ONLY modes. Existing inventory contents are not rewritten. The Legacy library
|
||||||
|
pool now includes exact Ruins templates and semantic bundled pages rather than
|
||||||
|
reusing the Sealed Notebook's narrower pool. Sealed Notebook opening retains its
|
||||||
|
1.21.1 pool behavior; this setting does not retroactively edit unopened/old loot.
|
||||||
|
No policy filtering is applied to JEI or creative portfolios.
|
||||||
|
|
||||||
|
Build passed. A disposable no-optional dedicated server passed 766 creation/policy
|
||||||
|
checks over 48 seeds and six restart checks: normal book binding, manual blocked
|
||||||
|
Page authoring, immutable saved settings under a changed policy, unload/reload,
|
||||||
|
required category/biome fallbacks, optional empty pools, material eligibility,
|
||||||
|
Native distinction, season policies without requiring Serene classes, library
|
||||||
|
filtering and unchanged Creative entries. The later rank revision added default
|
||||||
|
seed-compatibility and minimum-biome checks. These are temporary fixtures, not
|
||||||
|
new permanent game tests. Worlds and fixtures removed, servers stopped, production
|
||||||
|
JAR rebuilt. Player config/GUI/world validation remains pending. No commit, push
|
||||||
|
or publication.
|
||||||
|
|
||||||
|
|
||||||
|
### Random-Age book glyph prose — 1.0.1.138-beta.1
|
||||||
|
|
||||||
|
The player passed the .137 eligibility slice. Ported 1.21.1's first-page random-Age
|
||||||
|
glyph description: the Age name and author remain ordinary text on the left,
|
||||||
|
followed by layered Legacy word glyphs and real base-25 numerals for terrain,
|
||||||
|
distribution, lighting, weather and the first celestial cycle's period/angle/phase.
|
||||||
|
Authored books keep their existing name/author front page and single-symbol middle
|
||||||
|
pages; no writing notes or instability scores are introduced. The right-side
|
||||||
|
animated link panel and its click-to-travel behavior are unchanged.
|
||||||
|
|
||||||
|
The existing symbolcomponents.png atlas and deterministic word mappings are reused
|
||||||
|
directly with tinted GUI_TEXTURED blits; no generated art or per-frame dynamic
|
||||||
|
textures are added. A common prose layout helper handles Unicode word boundaries,
|
||||||
|
numeric width and wrapping. Writing Desk tab numerals now use the same rendering
|
||||||
|
routine, retaining their existing size/position/color.
|
||||||
|
|
||||||
|
Public terrain/distribution/lighting/weather metadata is sent in the Age catalog,
|
||||||
|
with celestial data reused from its existing saved-cycle map. These are actual
|
||||||
|
loaded Age settings rather than a reroll from the book ID or current config.
|
||||||
|
Metadata excludes seeds, instability scores and providers. It does not load an
|
||||||
|
unavailable destination merely to display a book. Full catalog replacement removes
|
||||||
|
unloaded/retired entries; logout clears description/cycle caches. Older books with
|
||||||
|
no authored symbol component use the random-description path. Existing Age/save
|
||||||
|
formats remain readable. Catalog network protocol is now 11 (previously 10):
|
||||||
|
client and server must use matching builds.
|
||||||
|
|
||||||
|
Build passed; disposable no-optional dedicated-server checks passed catalog
|
||||||
|
serialization, immutable snapshots, actual saved setting capture, cache
|
||||||
|
replacement/clear, real restart, unload/reload and retirement. Pure layout checks
|
||||||
|
covered Legacy word splitting, Unicode, wrapping, base-25 width and oversized
|
||||||
|
numeric fallback. Test worlds and fixtures removed, server stopped and production
|
||||||
|
JAR rebuilt. Visual glyph layering, book/lectern appearance and actual client
|
||||||
|
catalog receipt remain player validation. No commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
### Renamed Immersive Portals dimension bridge — 1.0.1.139-beta.1
|
||||||
|
|
||||||
|
The player passed .138. Confirmed the user's correction: the 26.3 Immersive Portal
|
||||||
|
implementation uses the Seamless Portals name/mod ID, retaining qouteall rendering,
|
||||||
|
chunk-loading and dimension APIs. Added an optional shared dimension-ID adapter
|
||||||
|
before Rivencraft catalog publication/acknowledgement. It synchronizes integer
|
||||||
|
IDs and native type/sea-level metadata without delegating Age ownership. Failed
|
||||||
|
synchronization blocks acknowledgement/travel rather than making a successfully
|
||||||
|
committed Age appear to have failed binding. Startup, unload/reload, reseed and
|
||||||
|
retirement are covered. Live book/crystal rendering remains later work.
|
||||||
|
|
||||||
|
The installed working build passed 35 server creation/catalog checks plus 13 after
|
||||||
|
restart. Normal book binding, native metadata, API ID roundtrips, two Ages,
|
||||||
|
lifecycle changes and failed-creation nonpublication were checked. No-optional
|
||||||
|
startup passed. Real client travel remains pending; Prism files were not changed.
|
||||||
|
|
||||||
|
Correction to the initial artifact audit: old CurseForge file 8937394 fails during
|
||||||
|
its own constructor on .99 with missing DataPackRegistryEvent$NewRegistry; this is
|
||||||
|
NOT the latest release. The latest file is 9218525, displayed as 10.0.0 while its
|
||||||
|
filename/internal metadata still say 1.0.0. Its SHA-256 exactly matches the user's
|
||||||
|
installed working file:
|
||||||
|
5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0.
|
||||||
|
The compile dependency is corrected to 9218525 in .140. The earlier broad claim
|
||||||
|
that the current published build cannot start was wrong and is superseded here.
|
||||||
|
|
||||||
|
NeoForge audit on 2026-11-11: official Maven metadata lists .102 as latest in the
|
||||||
|
26.3 line. Its universal JAR still lacks the old NewRegistry class, so upgrading
|
||||||
|
cannot fix that OLD portal artifact. Current target remains validated .99; a
|
||||||
|
separate .102 build/client/server check is recommended. No release authorized.
|
||||||
|
|
||||||
|
|
||||||
|
### Immersive Portals Reborn comparison and shared bridge — 1.0.1.140-beta.1
|
||||||
|
|
||||||
|
The user suggested Reborn. Verified the NeoForge 26.3 release is 7.0.12, file
|
||||||
|
9435354 in CurseForge project 1721833. The newer 7.0.18 is Fabric. The Reborn JAR
|
||||||
|
registers immersive_portals_reborn plus its legacy core aliases and retains the
|
||||||
|
qouteall GUI rendering/portal/chunk/dimension APIs. It starts on NeoForge .99
|
||||||
|
without Cloth Config or other optional mods in the test environment.
|
||||||
|
|
||||||
|
Generalized the optional bridge to recognize either Reborn or Seamless. Both
|
||||||
|
share DimensionIntId.onServerDimensionChanged and the createFromServer packet
|
||||||
|
factory. Seamless's createPacket returns a vanilla Packet; Reborn's returns a
|
||||||
|
CustomPacketPayload. The adapter now wraps createFromServer in the vanilla
|
||||||
|
clientbound payload packet, preserving each fork's native two-/three-tag wire
|
||||||
|
format. No cross-fork packet schema is invented and neither dependency is bundled.
|
||||||
|
The compat probe recognizes both. A development run may select
|
||||||
|
-PwithImmersivePortalsReborn or -PwithSeamlessPortals; requesting both is rejected
|
||||||
|
because the forks share classes/mixins. The normal build remains optional-free.
|
||||||
|
|
||||||
|
Reborn passed 32 creation/catalog checks and 15 after restart: real book-binding
|
||||||
|
entry point, two runtime Ages, ID/type metadata, native wire roundtrip, per-player
|
||||||
|
packet preparation, unload/reload, reseed, retirement isolation and persistence.
|
||||||
|
Seamless latest file 9218525 passed the same 32 lifecycle/packet and 15 restart checks against the shared adapter.
|
||||||
|
These are server/packet checks, not evidence of renderer quality or real client
|
||||||
|
packet receipt. Reborn is a viable next client-test target; no performance
|
||||||
|
superiority is claimed. Live snapshots, chunk leases/audio isolation, and live
|
||||||
|
crystal surfaces still need porting. Player files were not modified. Temporary
|
||||||
|
worlds/fixtures removed; no commit, push or publication.
|
||||||
|
|
||||||
|
|
||||||
|
### Reborn live book previews — 1.0.1.141-beta.1
|
||||||
|
|
||||||
|
Linking and Descriptive Book front panels now use Immersive Portals Reborn's
|
||||||
|
live GUI-world renderer when Reborn is installed on both sides. This carries
|
||||||
|
forward the 1.21.1 camera orbit (11-block radius, five blocks above the focus),
|
||||||
|
destination sky/fog, chunk streaming and remote-audio isolation. Server destination
|
||||||
|
resolution uses the actual held book or a nearby loaded stand's matching book;
|
||||||
|
the client cannot request arbitrary destination coordinates.
|
||||||
|
|
||||||
|
A unique session ID prevents stale replies or close packets from replacing or
|
||||||
|
releasing another book's preview. One per-player eight-chunk-radius loader streams
|
||||||
|
the view asynchronously, renews while the book stays open, and expires if its
|
||||||
|
heartbeat is lost. Closing, logout, death/source invalidation, dimension changes,
|
||||||
|
and shutdown release the lease. Destination resolution for Descriptive Books
|
||||||
|
uses the same footing/platform rules as book travel.
|
||||||
|
|
||||||
|
The rendering integration uses 26.3 GPU texture views with the deferred GUI.
|
||||||
|
Reborn may resize its target before extraction records the texture view; clearing
|
||||||
|
is deferred to its render hook, and the normal GUI draws the image beneath the
|
||||||
|
Legacy panel cutout. The target uses the main framebuffer's depth/stencil format.
|
||||||
|
The player camera is restored after remote rendering, and remote preview-world
|
||||||
|
sounds are suppressed without muting the player's world.
|
||||||
|
|
||||||
|
Set `[book_previews] reborn_live_views = false` in the local configuration to use
|
||||||
|
animated panels. Missing Reborn or unavailable terrain also retains the animated
|
||||||
|
fallback. Seamless's dimension-ID bridge remains available, but this live GUI
|
||||||
|
implementation is activated only for Reborn. Live crystal portal surfaces and
|
||||||
|
preview exploration controls remain separate port work.
|
||||||
|
|
||||||
|
Validation: production build passed. An isolated real NeoForge 26.3.0.99
|
||||||
|
dedicated-server/client run with Reborn 7.0.12 displayed the remote live Linking
|
||||||
|
Book view; screenshot inspected for the panel cutout, upright image and actual
|
||||||
|
terrain. The client completed without a renderer exception and logout left no
|
||||||
|
preview chunk leases. The user also reported that the books displayed live views
|
||||||
|
perfectly. All temporary worlds/client directories and fixture sources were
|
||||||
|
removed, and the distributable was rebuilt without test classes.
|
||||||
|
|
||||||
|
Startup warnings in this isolated run included Reborn's four deprecated
|
||||||
|
`logoFile` metadata entries; these are upstream branding metadata warnings.
|
||||||
|
The Linux narrator also lacks `libflite`, unrelated to the book renderer.
|
||||||
|
|
||||||
|
|
||||||
|
### Reborn live crystal portals — 1.0.1.142-beta.1
|
||||||
|
|
||||||
|
Crystal portals now create optional native Reborn render-only surfaces. Each
|
||||||
|
coplanar opening is one masked mesh on each side, including irregular outlines;
|
||||||
|
the destination image does not repeat once per portal block. Mesh planes sit
|
||||||
|
inside the portal block thickness so the crystal frame remains in front. Once
|
||||||
|
native surfaces are established, LIVE_VIEW hides only the animated portal model.
|
||||||
|
The blocks and their receptacle owner pointers stay intact.
|
||||||
|
|
||||||
|
Live views share destination resolution with portal book travel. Linking Books
|
||||||
|
use their written facing, while Descriptive Books preserve the approaching
|
||||||
|
entity's facing as their travel path does. The reference camera is anchored to
|
||||||
|
standing eye height above the opening's floor, rather than to its vertical center.
|
||||||
|
This prevents taller frames from shifting the preview's arrival height. Relative
|
||||||
|
links resolve using the opening's center as the view reference; the actual
|
||||||
|
entity's departure position is still used for travel.
|
||||||
|
|
||||||
|
Native surfaces cannot teleport entities, accept remote interaction or perform
|
||||||
|
cross-portal collision. Existing Rivencraft collision/queue and book rules remain
|
||||||
|
authoritative, including catalog readiness, Disarm, momentum and arrival safety.
|
||||||
|
Reborn handles visible-destination streaming through its normal portal system.
|
||||||
|
|
||||||
|
Geometry/destination tags allow maintenance to reuse matching entities and replace
|
||||||
|
stale ones. Activation establishes views immediately; normal receptacle maintenance
|
||||||
|
restores them after restart. Book removal, frame shutdown, missing destinations
|
||||||
|
and disabling the integration remove the native surfaces. Without Reborn the
|
||||||
|
animated surface and ordinary travel continue to work. The server setting is
|
||||||
|
[book_previews] reborn_crystal_live_views, default true.
|
||||||
|
|
||||||
|
Validation on NeoForge 26.3.0.99 / Reborn 7.0.12: 68 server checks passed, covering
|
||||||
|
all three plane axes, both sides, one mesh per opening, eye-position and facing
|
||||||
|
transforms, entity reuse, fallback toggling and book removal. Five additional
|
||||||
|
restart checks passed. An isolated real client/dedicated server rendered the live
|
||||||
|
opening, then crossed into the correct Age through normal Rivencraft travel.
|
||||||
|
Screenshots before/after were inspected; the user also reported success.
|
||||||
|
|
||||||
|
An initial render test mistakenly bound its synthetic Linking Book at Y=1 inside
|
||||||
|
the flat world's solid layers. The view correctly displayed underground terrain
|
||||||
|
and the collision check refused travel. The corrected fixture bound to the actual
|
||||||
|
surface (Y=4) and passed. No production spawn-height workaround was added for an
|
||||||
|
invalid synthetic book. All temporary fixtures and test worlds were removed, and
|
||||||
|
the distributable was rebuilt without test classes.
|
||||||
@@ -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
|
||||||
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
# Minecraft.release-slice.iteration; independent of the 26.3 release track.
|
||||||
mod_version=1.0.1.1
|
mod_version=1.21.1.0.6
|
||||||
immersive_portals_version=6.0.7
|
immersive_portals_version=6.0.7
|
||||||
terrablender_version=4.1.0.8
|
terrablender_version=4.1.0.8
|
||||||
serene_seasons_version_id=pHEgQQUE
|
serene_seasons_version_id=pHEgQQUE
|
||||||
|
|||||||
+1169
-14
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,85 @@
|
|||||||
|
# Rivencraft 26.3 beta 1.0.1.120-beta.1
|
||||||
|
|
||||||
|
Collects the player-validated .116–.120 port slices since 1.0.1.115-beta.1.
|
||||||
|
For Minecraft 26.3, NeoForge 26.3.0.99 and Java 25. The independent 1.21.1
|
||||||
|
release is unchanged; full gameplay and optional-integration parity remain incomplete.
|
||||||
|
|
||||||
|
## Libraries and writing
|
||||||
|
|
||||||
|
- Ported Legacy library generation, shared schematic, chest loot and five correctly
|
||||||
|
oriented book/page stands. Libraries generate after decoration in eligible new
|
||||||
|
non-Cave Age chunks, using the 1.21.1 spacing, terrain and clearance checks.
|
||||||
|
- Library loot defaults to `LEGACY`; optional `AGE_ONLY` limits new library Pages
|
||||||
|
to known symbols originally written into that Age. Original writing is saved
|
||||||
|
separately and restored on reload. Older Ages without it have an empty Age-only
|
||||||
|
pool. Ordinary Books replace stand Pages when that pool is empty.
|
||||||
|
- Added operator library placement, candidate/probe/loot diagnostics, session-only
|
||||||
|
test spacing and a locator limited to nearby already-loaded chunks.
|
||||||
|
- Hand-prepared Link Panel ink cost is server-configurable (default two). The
|
||||||
|
Ink Mixer still consumes one ink unit and one paper per panel. Writing Desk
|
||||||
|
ink handling now uses the shared service.
|
||||||
|
|
||||||
|
## Crystal portals
|
||||||
|
|
||||||
|
- Ported craftable Book Receptacles with all six mounting orientations and the
|
||||||
|
existing 1.21.1 model/book transforms. A bound Linking or Descriptive Book
|
||||||
|
activates a valid connected crystal frame, including supported irregular frames.
|
||||||
|
- Reused the bounded crystal flood/tension algorithm, placement protection events,
|
||||||
|
rollback, owner persistence, restart repair, frame cleanup and traversal cooldown.
|
||||||
|
- Empty-hand removal closes the portal and returns the book. Breaking the holder
|
||||||
|
or its crystal support closes it and drops a recoverable open-book entity.
|
||||||
|
- Player and non-player travel reuse book destinations, safe arrival, Intra-Linking,
|
||||||
|
Disarm and momentum rules. Descriptive Books share the same landing resolver
|
||||||
|
with portals; no separate portal exit offset is added. Player Return Link policy
|
||||||
|
and progression remain in force.
|
||||||
|
- The animated fallback surface renders its facing sides and uses destination sky
|
||||||
|
tint. The Open Portal advancement and receptacle recipe unlock are restored.
|
||||||
|
Live destination views are still pending optional integration work.
|
||||||
|
|
||||||
|
## Instability and colored decay
|
||||||
|
|
||||||
|
- New Ages save operator-only creation-time score contributions and deterministic
|
||||||
|
provider selections using all five Legacy decks. Existing Ages remain neutral;
|
||||||
|
reloads/config changes do not reroll stored plans.
|
||||||
|
- Initial scoring covers Bright Lighting, Accelerated, Corrupted Pages, ineffective
|
||||||
|
Cave sky/weather modifiers, excess and biome-forced structures, and extra suns.
|
||||||
|
Corrupted Pages now bind successfully and retain their animated redacted text.
|
||||||
|
- Ported 18 potion providers: local/global Blindness, Fatigue, Hunger, Nausea,
|
||||||
|
Poison, Slowness, Weakness and Wither, plus hostile Regeneration/Resistance.
|
||||||
|
General effects affect eligible Survival/Adventure players and living entities;
|
||||||
|
Creative/Spectator remain exempt. Local variants require sky exposure.
|
||||||
|
- Added a bounded occupied-Age scheduler, owned-effect cleanup, provider controls
|
||||||
|
and operator score/status, enable/disable, session test-score and pulse commands.
|
||||||
|
Effects supplied or extended by another source are preserved.
|
||||||
|
- Ported Blue, Purple, Red and White decay with the existing 16x16 textures,
|
||||||
|
hardness/air conversion odds, saved per-color frontiers and attempt sequence.
|
||||||
|
White retains stepping-contact magic damage. Decay has no item form or drops.
|
||||||
|
- Spread uses only already-loaded candidate chunks, bounded attempts and action
|
||||||
|
budgets. Fluids, block entities, critical/unbreakable blocks, infrastructure,
|
||||||
|
protected tags and claim events prevent conversion.
|
||||||
|
- The first resolved book/portal arrival is saved for spawn protection. Re-enter
|
||||||
|
an older Age once to record it. Global/Age/provider and world-mutation controls
|
||||||
|
gate spread; existing decay blocks remain when spreading is disabled.
|
||||||
|
- Test a color with `/rivencraft_port instability decay blue 32` (also `purple`,
|
||||||
|
`red`, `white`); output includes actual changes and nearby tracked coordinates.
|
||||||
|
Scores are not added to ordinary book or Binder displays.
|
||||||
|
|
||||||
|
## Validation and remaining work
|
||||||
|
|
||||||
|
Player in-game checks passed .116–.120. Both the 26.3 and 1.21.1 builds passed;
|
||||||
|
Gradle has no standalone test sources. Targeted disposable dedicated-server checks
|
||||||
|
covered library placement, portal entity travel and restart ownership/cleanup,
|
||||||
|
potion application/cleanup and persistence, all four decay colors, saved spread
|
||||||
|
continuation, and bedrock/fluid protection. Test servers were stopped and their
|
||||||
|
worlds removed.
|
||||||
|
|
||||||
|
Full writing recovery/penalties, live material-abundance profiling, other instability
|
||||||
|
hazards, remaining discovery/stations and optional integrations still need port work.
|
||||||
|
Unported hazard cards remain saved and are reported as unavailable, rather than
|
||||||
|
being replaced with different cards. Book previews remain the animated fallback.
|
||||||
|
Machine acceleration (#112), Writing Desk model placement (#113), and the matching
|
||||||
|
1.21.1 universal dropped-book fix (#114) remain tracked separately.
|
||||||
|
|
||||||
|
Use matching client/server beta builds (catalog protocol 10). Keep Minecraft tracks
|
||||||
|
and saves separate, back up beta worlds, and do not downgrade saves containing new
|
||||||
|
blocks or data to earlier betas.
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
# Rivencraft 26.3 beta 1.0.1.129-beta.1
|
||||||
|
|
||||||
|
Collects the player-validated .121–.129 port slices since 1.0.1.120-beta.1.
|
||||||
|
For Minecraft 26.3, NeoForge 26.3.0.99 and Java 25. The independent Minecraft
|
||||||
|
1.21.1 release is unchanged. Full parity and optional integrations remain in progress.
|
||||||
|
|
||||||
|
## Instability hazards and live profiling
|
||||||
|
|
||||||
|
- Ported lightning, explosions, falling meteor effects, burning and erosion with
|
||||||
|
bounded loaded-chunk scans, spawn protection, claim events and configurable
|
||||||
|
world/entity damage. Meteor flight uses the existing sound and particle effects.
|
||||||
|
- Natural hazards choose randomized locations; operator test commands provide
|
||||||
|
targeted checks with independent cooldowns. Erosion retains its requested testing
|
||||||
|
default of enabled above 10,000 effective instability, outside the Legacy deck.
|
||||||
|
- Ported persistent live material profiling, including native ores, valuable blocks,
|
||||||
|
recognized installed-mod materials and configurable modded block weight overrides.
|
||||||
|
No content mod is required. Profiling starts scoring after 401 Age and 500
|
||||||
|
Overworld baseline samples, with bounded gradual background sampling while an
|
||||||
|
eligible Age is occupied. A chunk snapshot is counted once.
|
||||||
|
- Effective instability and deterministic provider selection now update as material
|
||||||
|
abundance is measured; the original writing contribution remains frozen. Added
|
||||||
|
difficulty scaling and operator-only sampling/score diagnostics. Older neutral
|
||||||
|
Ages remain neutral. Normal book/Binder screens do not reveal scores.
|
||||||
|
|
||||||
|
## Ordered writing recovery
|
||||||
|
|
||||||
|
- Repeated singular terrain, distribution, weather, lighting and sky controllers
|
||||||
|
use the last choice, adding 500 instability per duplicate/conflict. Category-order
|
||||||
|
mistakes add 100. Native distribution ignores supplied biomes; Single retains the
|
||||||
|
first biome when too many are supplied, with conflict penalties.
|
||||||
|
- Repeated celestial modifiers use the final pending value of each kind. Dangling
|
||||||
|
modifiers and misplaced/trailing numbers allow binding and add 100 instability.
|
||||||
|
Numbers only attach to the immediately following supported target.
|
||||||
|
- Preserved original book/library pages, ordered color mixing and independent
|
||||||
|
celestial chains. A trailing modifier cannot change an earlier sun or moon.
|
||||||
|
Unported pages, unsupported combinations and body limits remain enforced.
|
||||||
|
|
||||||
|
## Link Modifier station
|
||||||
|
|
||||||
|
- Added the creative-only Link Modifier with its existing model, textures and
|
||||||
|
Legacy single-book GUI. There is no crafting recipe.
|
||||||
|
- Books can be renamed and edited through all six controls: Disarm, Intra-Linking,
|
||||||
|
Intra-Linking Only, Maintain Momentum, Relative Link and Generate Platform.
|
||||||
|
- Intra-Linking Only enables Intra-Linking and prevents cross-dimension Linking
|
||||||
|
Book travel. Both intra controls are unavailable for Descriptive Books.
|
||||||
|
- Relative Link preserves the traveller's offset from the source dimension spawn
|
||||||
|
at the destination spawn. Linking Book platform generation defaults off;
|
||||||
|
Descriptive Book fallback platforms default on and can be disabled.
|
||||||
|
- Player and non-player portal paths share the new properties. Book contents and
|
||||||
|
flags persist in the station. Removal releases its stored book.
|
||||||
|
- Fixed the controls ignoring real clicks: 26.3 left-click is button 1, not 0.
|
||||||
|
Registered native button widgets now handle input, focus, sound and state tooltips.
|
||||||
|
|
||||||
|
## Validation and remaining work
|
||||||
|
|
||||||
|
The player passed every included slice, including the six controls and click fix.
|
||||||
|
Both Minecraft builds pass (no standalone Gradle test sources). Targeted temporary
|
||||||
|
checks covered grammar/celestial recovery, component serialization, station actions,
|
||||||
|
platform rules and dedicated-server save/restart behavior. Live profiling was checked
|
||||||
|
with real snapshots plus synthetic threshold records; natural gameplay was validated
|
||||||
|
by the player. Temporary servers were stopped and their test worlds removed.
|
||||||
|
|
||||||
|
Link Modifier seed editing/retirement, remaining discovery/config policy and optional
|
||||||
|
integrations are not complete. Live previews remain unavailable; books and portals
|
||||||
|
use the animated fallback. Crumble has no active 1.21.1 handler and is not invented
|
||||||
|
in this port. The dual-version follow-up issues and full multiplayer/parity gate
|
||||||
|
remain open. Use matching client/server beta builds and keep Minecraft version
|
||||||
|
tracks and their saves separate.
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
# Rivencraft 26.3 beta 1.0.1.136-beta.1
|
||||||
|
|
||||||
|
Collects the player-validated .130–.136 port slices since 1.0.1.129-beta.1.
|
||||||
|
For Minecraft 26.3, NeoForge 26.3.0.99 and Java 25. The Minecraft 1.21.1
|
||||||
|
release and its Dynamic Dimensions backend are unchanged. This remains an
|
||||||
|
incomplete beta port; use matching client/server builds and separate saves.
|
||||||
|
|
||||||
|
## Link Modifier and Age creation
|
||||||
|
|
||||||
|
- Edit a Descriptive Book Age's full signed 64-bit seed. Existing chunks remain;
|
||||||
|
newly generated terrain uses the new seed. Occupied Ages and stale/remote menu
|
||||||
|
requests are refused. Seed input supports Enter or focus loss without game keys
|
||||||
|
taking over while typing.
|
||||||
|
- Operators can retire an unoccupied Age through a separate confirmation action.
|
||||||
|
Its exact dimension directory is archived under `world-retired-ages`; the Age
|
||||||
|
is tombstoned and cannot reload after restart. Other Age data remains intact.
|
||||||
|
- Failed Age creation now rolls back the new level, index, initial name, library
|
||||||
|
writing, instability and season policy before publishing the catalog. Cleanup
|
||||||
|
removes only the newly created directory; pre-existing storage is protected.
|
||||||
|
Persistent filesystem failures or process crashes are not transactional guarantees.
|
||||||
|
|
||||||
|
## Optional integrations
|
||||||
|
|
||||||
|
All integrations remain optional and are never bundled.
|
||||||
|
|
||||||
|
- **JEI:** searchable symbol pages, Link Panel variants and portfolios, with Ink
|
||||||
|
Mixer/Writing Desk/Book Binder guidance. Internal Blank Pages and empty portfolios
|
||||||
|
remain hidden. Tested with JEI 31.17.0.109 and MezzConfig 0.7.1.
|
||||||
|
- **TerraBlender:** recognizes registered Overworld and Nether region biomes from
|
||||||
|
installed biome mods, including Biomes O' Plenty. Nether-region biomes join the
|
||||||
|
Cave-compatible authoring pool and use Nether material rules. Tested with
|
||||||
|
TerraBlender 26.3.0.0.9 and Biomes O' Plenty 26.3.0.0.16. The requested Native Cave
|
||||||
|
pool changes and Native Nether/End pages remain separate work in #111.
|
||||||
|
- **Serene Seasons:** No Seasons, Seasons and all four Eternal modes operate per
|
||||||
|
Age. Missing policies are seed-selected only when Serene is installed; Cave Ages
|
||||||
|
disable seasons. Dynamic whitelist updates synchronize without restarting, while
|
||||||
|
eternal policies leave the Overworld calendar unchanged. Tested with Serene
|
||||||
|
Seasons 26.1.2.0.7 and GlitchCore 26.3.0.0.5.
|
||||||
|
- **Ruins:** exact-template pages appear in creative and JEI. Authored Ages permit
|
||||||
|
only their selected templates; Ruins' surface, biome and distance checks remain.
|
||||||
|
Duplicate pages increase selection weight and attempts (32-attempt cap, without
|
||||||
|
lowering higher Ruins settings). The first three copies are free; each later
|
||||||
|
copy adds 100 instability, even beyond the attempt cap. Tested with Ruins
|
||||||
|
26.3.2NF. Duplicate template basenames disable the bridge to prevent ambiguity.
|
||||||
|
|
||||||
|
## Validation and remaining work
|
||||||
|
|
||||||
|
Both Minecraft builds pass. Every included slice passed player in-game checks;
|
||||||
|
the latest client log confirms JEI, TerraBlender/BOP, Serene/GlitchCore and Ruins
|
||||||
|
loaded together. Disposable dedicated-server checks covered seed changes with
|
||||||
|
unchanged old chunks, retirement/archive isolation, injected creation failures,
|
||||||
|
optional-mod absence, region discovery, season policies, Ruins template placement
|
||||||
|
and restart/unload/reload persistence. Test fixtures/worlds were removed and test
|
||||||
|
servers stopped. No permanent game tests were added.
|
||||||
|
|
||||||
|
Books and crystal portals still use animated fallback previews. Live destination
|
||||||
|
renderers, remaining discovery/configuration parity and random-Age glyph descriptions
|
||||||
|
remain unfinished. The current expanded-catalog dedicated two-client regression
|
||||||
|
and full parity/release gates remain open. Shared 1.21.1/26.3 follow-up issues are
|
||||||
|
not complete merely because one version's implementation works.
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
# Rivencraft 26.3.0.1
|
||||||
|
|
||||||
|
For **Minecraft 26.3**, **NeoForge 26.3.0.99** and **Java 25**.
|
||||||
|
|
||||||
|
This regular release collects the player-validated .137–.142 development slices
|
||||||
|
since 1.0.1.136-beta.1. Versions now use the Minecraft version followed by the
|
||||||
|
release slice and its iteration: `26.3.0.1`. The JAR is
|
||||||
|
`rivencraft-26.3.0.1.jar`. The existing Minecraft 1.21.1 release is unchanged.
|
||||||
|
|
||||||
|
## Live destination views with Immersive Portals Reborn
|
||||||
|
|
||||||
|
- Optional live rotating destination views in Linking and Descriptive Books,
|
||||||
|
including books on stands. Reborn streams the actual destination chunks.
|
||||||
|
- Crystal portals show a continuous live view across each coplanar opening,
|
||||||
|
masked to its shape, with the crystal frame remaining in front.
|
||||||
|
- Linking Book views use the written destination/facing; Descriptive Book
|
||||||
|
portals preserve the traveler's facing. Views anchor standing eye height to
|
||||||
|
the opening's floor, so taller frames do not shift arrival height.
|
||||||
|
- Rivencraft retains control of portal travel, Disarm, momentum and arrival
|
||||||
|
safety. The native view cannot independently teleport or interact remotely.
|
||||||
|
- Preview sessions release their chunk streams on close, logout, invalidation
|
||||||
|
or expiry. Remote book-preview audio is suppressed and the player camera
|
||||||
|
restored after rendering.
|
||||||
|
- Portal maintenance restores views after restart and removes them when the
|
||||||
|
book is removed or the frame is shut down.
|
||||||
|
- Tested with **[Immersive Portals Reborn 7.0.12 for NeoForge 26.3](https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354)**.
|
||||||
|
Use one portal fork per instance. No optional mod is bundled or required.
|
||||||
|
- The renamed Seamless fork also receives runtime Age dimension/metadata
|
||||||
|
synchronization; this release's live rendering is enabled for Reborn.
|
||||||
|
|
||||||
|
## Random Ages, pages and book descriptions
|
||||||
|
|
||||||
|
- New random-Age and library-page allowlists/blocklists accept short paths such
|
||||||
|
as `sky/static`, as well as full namespaced IDs.
|
||||||
|
- Blocklists take precedence. An allowlist restricts only the categories it
|
||||||
|
mentions. Existing Ages and manually authored books remain usable.
|
||||||
|
- Required empty categories use safe defaults; optional empty categories can be
|
||||||
|
omitted. Native preset biome pools and necessary biome minimum fallbacks can
|
||||||
|
bypass individual biome-page exclusions.
|
||||||
|
- Random-Age Descriptive Books show Legacy glyph descriptions of their public
|
||||||
|
traits, beneath the readable Age name/author. Seed and instability scores
|
||||||
|
remain absent from these descriptions.
|
||||||
|
- Optional portal-engine dimension IDs and native metadata synchronize before
|
||||||
|
the Rivencraft catalog acknowledgement permits travel.
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
In `config/rivencraft-local.toml`:
|
||||||
|
|
||||||
|
- `random_pages.allowlist` and `random_pages.blocklist`: default empty.
|
||||||
|
- `book_previews.reborn_live_views`: default `true`; disable locally for
|
||||||
|
animated book panels.
|
||||||
|
- `book_previews.reborn_crystal_live_views`: default `true`; the server
|
||||||
|
controls live crystal surfaces. Disabling retains animated surfaces and travel.
|
||||||
|
|
||||||
|
The built-in Legacy animation remains available without optional renderers.
|
||||||
|
Dynamic Dimensions and Bad Packets are not required by the 26.3 line.
|
||||||
|
|
||||||
|
## Validation and known limits
|
||||||
|
|
||||||
|
The user passed the included slices in game. Disposable checks covered random
|
||||||
|
policy resolution, description/catalog serialization and persistence, native
|
||||||
|
dimension IDs and packet formats for both portal forks, preview rendering and
|
||||||
|
chunk-lease cleanup, all three crystal portal plane axes, both sides, destination
|
||||||
|
eye/facing transforms, fallback toggling and full restart restoration. A real
|
||||||
|
dedicated server/client displayed the live crystal view and crossed into its Age.
|
||||||
|
The no-optional-mod server also started successfully. Temporary fixtures/worlds
|
||||||
|
were removed and the production JAR contains no test or optional-engine classes.
|
||||||
|
|
||||||
|
**Known issue [#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116):**
|
||||||
|
with Reborn active, a Static Sky Age can render its sky outside the book GUI.
|
||||||
|
Use the animated book panel option if affected.
|
||||||
|
|
||||||
|
26.3 is now published on the regular release channel at the user's request.
|
||||||
|
This is not a claim that every 1.21.1 behavior or the final expanded-catalog
|
||||||
|
two-client regression is complete. The remaining multiplayer, parity and shared
|
||||||
|
follow-up issues stay open. Preview exploration controls and Create/Ponder scenes
|
||||||
|
are not included in this release.
|
||||||
|
|
||||||
|
Use matching client/server JARs. Back up worlds, keep the Minecraft tracks and
|
||||||
|
saves separate, and do not downgrade worlds containing newer data.
|
||||||
@@ -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).
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
# Random Page policy test — 1.0.1.137-beta.1
|
||||||
|
|
||||||
|
Install the new JAR and launch once so the new entries appear in
|
||||||
|
Minecraft's config/rivencraft-local.toml. Close the instance before editing.
|
||||||
|
On a dedicated server edit its own config, not the client's.
|
||||||
|
|
||||||
|
For a visible check, replace only the existing random_pages section with:
|
||||||
|
|
||||||
|
```toml
|
||||||
|
[random_pages]
|
||||||
|
allowlist = ["terrain/flat", "biome/single", "biome/plains", "sky/static", "lighting/normal", "weather/off", "feature/not_present"]
|
||||||
|
blocklist = ["sky/nether", "celestial/sun", "celestial/moon"]
|
||||||
|
```
|
||||||
|
|
||||||
|
The deliberately nonexistent feature entry restricts only optional features,
|
||||||
|
leaving an empty feature pool for this test.
|
||||||
|
|
||||||
|
1. Bind a Descriptive Book with only a Link Panel. Enter it: expect Flat terrain,
|
||||||
|
Plains, Static Sky, normal lighting, no rain and no suns/moons. Optional Page
|
||||||
|
features/structures should be absent; native biome decoration is independent.
|
||||||
|
2. Bind an authored Flat/Plains/Single/Nether Sky book. Nether Sky remains usable
|
||||||
|
despite the blocklist; the setting controls random generation and direct
|
||||||
|
library loot, not manual authorship. The Page remains visible in Creative/JEI.
|
||||||
|
3. Change sky/static to sky/end, restart and revisit the first Age. It must retain
|
||||||
|
Static Sky. A newly bound Link-Panel-only book should get End Sky.
|
||||||
|
4. Optional library check: allowlist = ["sky/static"], blocklist = ["sky/nether"].
|
||||||
|
New library direct Pages may include Static Sky or other unrestricted
|
||||||
|
categories, but never another Sky Page. Test both library loot modes where
|
||||||
|
desired. Existing chests/stands remain untouched; AGE_ONLY may have no Pages
|
||||||
|
when the book's written Page set has no eligible entries.
|
||||||
|
|
||||||
|
Restore both lists to [] afterward unless you want the restrictions to persist.
|
||||||
|
No existing Age should change. Keep the full world backup customary for beta
|
||||||
|
updates. Native biome presets and required minimum-biome fallbacks intentionally
|
||||||
|
bypass biome-Page filters; Sealed Notebooks keep their separate 1.21.1 draw pool.
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Random-Age glyph description test — 1.0.1.138-beta.1
|
||||||
|
|
||||||
|
Use the new build on both client and server (Age catalog protocol 11).
|
||||||
|
|
||||||
|
1. Open an existing or new Link-Panel-only Descriptive Book. Its front spread
|
||||||
|
should retain the plain-text Age name and author on the left, with the generated
|
||||||
|
description below rendered as Legacy glyphs. The destination animation remains
|
||||||
|
on the right and clicking it still travels.
|
||||||
|
2. Put the same book on a lectern and open it. The description and panel should
|
||||||
|
match handheld use.
|
||||||
|
3. Open an authored book containing Symbol Pages. Its front spread should retain
|
||||||
|
just the name/author, and page turning should show one authored symbol at a time.
|
||||||
|
4. Reconnect or restart, then reopen the random book. Glyph traits should remain
|
||||||
|
consistent with its saved Age. Test a longer name and GUI scale for clipping.
|
||||||
|
5. Check Writing Desk tab numbers around 24/25 and 49/50. Their existing glyph
|
||||||
|
size/position and base-25 behavior should be unchanged.
|
||||||
|
|
||||||
|
Descriptions are available only for loaded Ages; viewing a book does not force-load
|
||||||
|
an unloaded/retired Age. No instability score or seed appears in the description.
|
||||||
|
The desktop glyph display still needs your visual check; server/codec/layout
|
||||||
|
validation does not substitute for a real client render check.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# Superseded by the 1.0.1.140-beta.1 portal-fork test
|
||||||
|
|
||||||
|
Use TESTING_1.0.1.140-beta.1.md. It covers both supported fork candidates.
|
||||||
|
|
||||||
|
Correction: the user's installed Seamless file exactly matches current published
|
||||||
|
CurseForge file 9218525 (displayed 10.0.0, internal version/filename 1.0.0).
|
||||||
|
The startup failure applies only to older file 8937394. The earlier recommendation
|
||||||
|
to avoid the current download was incorrect.
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Portal fork runtime compatibility — 1.0.1.140-beta.1
|
||||||
|
|
||||||
|
Candidate downloads for Minecraft 26.3 / NeoForge:
|
||||||
|
- Immersive Portals Reborn 7.0.12:
|
||||||
|
https://www.curseforge.com/minecraft/mc-mods/immersive-portals-reborn-unofficial-fork/files/9435354
|
||||||
|
Version 7.0.18 is Fabric, so use the NeoForge 7.0.12 file for this test.
|
||||||
|
- Seamless latest file 9218525:
|
||||||
|
https://www.curseforge.com/minecraft/mc-mods/immersive-portal/files/9218525
|
||||||
|
Display name is 10.0.0, but its downloaded filename/internal version remain 1.0.0.
|
||||||
|
This exactly matches the user's installed working JAR.
|
||||||
|
|
||||||
|
Use ONE portal fork per instance: they share engine classes and mixins.
|
||||||
|
Prism files were left unchanged. Install matching Rivencraft builds on both sides
|
||||||
|
for dedicated testing. Current tested loader is NeoForge 26.3.0.99.
|
||||||
|
|
||||||
|
1. Enable/install the chosen fork and Rivencraft .140.
|
||||||
|
2. Create an authored Descriptive Book after joining, using a distinctive sky and
|
||||||
|
lighting. Travel into its newly created Age without reconnecting.
|
||||||
|
3. Return using a bound Linking Book and test a second freshly created Age.
|
||||||
|
4. Restart and revisit both Ages. Check for unknown/unloaded-dimension rejection,
|
||||||
|
disconnects or incorrect sky/lighting.
|
||||||
|
5. Test existing crystal portals through the usual Rivencraft fallback path.
|
||||||
|
|
||||||
|
This slice synchronizes runtime Ages and native metadata. Live book panels and
|
||||||
|
live crystal portal surfaces are NOT ported yet; animated fallbacks are expected.
|
||||||
|
Actual client travel/packet handling needs your check. Server lifecycle, packet
|
||||||
|
serialization and restart checks passed with both Reborn and latest Seamless
|
||||||
|
(32 lifecycle/packet plus 15 restart checks each). NeoForge .102 is a candidate for a later isolated upgrade
|
||||||
|
check; the project target has not been changed yet.
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# 1.0.1.141-beta.1 — Reborn live book previews
|
||||||
|
|
||||||
|
Use NeoForge 26.3.0.99 and Immersive Portals Reborn 7.0.12, CurseForge file 9435354.
|
||||||
|
Install one portal fork per instance and matching Rivencraft builds on a dedicated
|
||||||
|
server/client. Reborn remains optional; nothing is bundled.
|
||||||
|
|
||||||
|
The user reports live views working in both book types. Follow-up coverage:
|
||||||
|
1. View a Linking Book and Descriptive Book pointing to different Ages. Check
|
||||||
|
orbiting terrain, upright orientation, destination lighting/sky and the panel
|
||||||
|
cutout. Click the live panel to travel using the existing book controls.
|
||||||
|
2. Repeat from a book stand, including a destination whose chunks are not loaded.
|
||||||
|
3. Close/reopen, switch books quickly and restart/revisit the Age. A stale view
|
||||||
|
must not replace the newly selected destination.
|
||||||
|
4. During rain, confirm the source world's weather audio remains audible and the
|
||||||
|
remote world's sounds do not leak into the GUI.
|
||||||
|
5. Set [book_previews] reborn_live_views = false in rivencraft-local.toml to
|
||||||
|
verify the animated fallback; restore true for live views.
|
||||||
|
|
||||||
|
The live image streams actual destination chunks. It is not restricted to the
|
||||||
|
old fixed block snapshot volume. Exploration controls and live crystal portal
|
||||||
|
surfaces are not included in this slice.
|
||||||
|
|
||||||
|
Build and isolated dedicated/client rendering check passed, with a live Linking
|
||||||
|
Book screenshot inspected and zero remaining preview leases on logout. Temporary
|
||||||
|
test worlds were removed regardless of result. Reborn's four deprecated logoFile
|
||||||
|
startup warnings concern its metadata, not Rivencraft rendering.
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# 1.0.1.142-beta.1 — Reborn live crystal portal surfaces
|
||||||
|
|
||||||
|
Use Reborn 7.0.12 for NeoForge 26.3, CurseForge file 9435354, with NeoForge
|
||||||
|
26.3.0.99. Use one portal fork and matching Rivencraft builds on a server/client.
|
||||||
|
|
||||||
|
Implemented and validated:
|
||||||
|
- One continuous view per opening on each side, masked to the portal cells.
|
||||||
|
- Correct destination eye-height reference; Linking Book facing and Descriptive
|
||||||
|
Book inherited facing.
|
||||||
|
- Native surfaces render only; Rivencraft's blocks retain transport and effects.
|
||||||
|
- Fallback model hidden only for established live surfaces.
|
||||||
|
- Maintenance restores views after restart and removes them on shutdown/removal.
|
||||||
|
- Optional server setting [book_previews] reborn_crystal_live_views = false retains
|
||||||
|
animated surfaces and ordinary portal travel.
|
||||||
|
|
||||||
|
68 server checks and five restart checks passed, plus a real dedicated/client
|
||||||
|
live-view and walking-through check. Screenshots were inspected and the user
|
||||||
|
reported success. Temporary worlds were deleted and fixture sources removed.
|
||||||
|
|
||||||
|
Useful follow-up manual coverage:
|
||||||
|
1. Try both book types, compare portal arrival to using the same book, and inspect
|
||||||
|
both sides of the frame.
|
||||||
|
2. Try taller, horizontal and irregular frames; check that frame edges occlude the
|
||||||
|
scene and the view does not repeat per cell.
|
||||||
|
3. Restart, revisit, remove/reinsert the book and break a frame block.
|
||||||
|
4. Check a destination with different sky/lighting and an initially unloaded
|
||||||
|
destination area.
|
||||||
|
|
||||||
|
The initial synthetic render fixture used a blocked Y=1 target; that was corrected
|
||||||
|
to the resolved Y=4 surface. No global landing-height behavior was changed.
|
||||||
@@ -3,11 +3,63 @@ plugins {
|
|||||||
id 'net.neoforged.moddev' version '2.0.148'
|
id 'net.neoforged.moddev' version '2.0.148'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven { url = 'https://www.cursemaven.com'; content { includeGroup 'curse.maven' } }
|
||||||
|
maven { url = 'https://api.modrinth.com/maven'; content { includeGroup 'maven.modrinth' } }
|
||||||
|
maven {
|
||||||
|
name = 'TerraBlenderMaven'
|
||||||
|
url = 'https://maven.minecraftforge.net/releases/'
|
||||||
|
content { includeGroup 'com.github.glitchfiend' }
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = 'JaredsMaven'
|
||||||
|
url = 'https://maven.blamejared.com'
|
||||||
|
content { includeGroup 'mezz.jei'; includeGroup 'net.mezzdev.config' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Optional APIs stay out of published dependency metadata.
|
||||||
|
configurations {
|
||||||
|
localRuntime
|
||||||
|
runtimeClasspath.extendsFrom localRuntime
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// Both optional forks retain qouteall APIs, but must never be loaded together.
|
||||||
|
if (project.hasProperty('withSeamlessPortals') && project.hasProperty('withImmersivePortalsReborn'))
|
||||||
|
throw new GradleException('Choose one Immersive Portals fork for the development run')
|
||||||
|
def portalDependency = project.hasProperty('withImmersivePortalsReborn')
|
||||||
|
? 'curse.maven:immersive-portals-reborn-unofficial-fork-1721833:9435354'
|
||||||
|
: project.hasProperty('seamlessPortalsJar') ? files(project.property('seamlessPortalsJar'))
|
||||||
|
: project.hasProperty('withSeamlessPortals') ? 'curse.maven:immersive-portal-1511174:9218525'
|
||||||
|
: 'curse.maven:immersive-portals-reborn-unofficial-fork-1721833:9435354'
|
||||||
|
compileOnly portalDependency
|
||||||
|
if (project.hasProperty('withSeamlessPortals') || project.hasProperty('withImmersivePortalsReborn'))
|
||||||
|
localRuntime portalDependency
|
||||||
|
// Compile against the 26.3 baseline API; a local current Ruins JAR can override it.
|
||||||
|
def ruinsDependency = project.hasProperty('ruinsJar') ? files(project.property('ruinsJar'))
|
||||||
|
: 'curse.maven:ruins-227873:8962119'
|
||||||
|
compileOnly ruinsDependency
|
||||||
|
if (project.hasProperty('withRuins')) localRuntime ruinsDependency
|
||||||
|
compileOnly "maven.modrinth:e0bNACJD:${serene_seasons_version_id}"
|
||||||
|
compileOnly "maven.modrinth:s3dmwKy5:${glitchcore_version_id}"
|
||||||
|
if (project.hasProperty('withSereneSeasons')) {
|
||||||
|
localRuntime "maven.modrinth:e0bNACJD:${serene_seasons_version_id}"
|
||||||
|
localRuntime "maven.modrinth:s3dmwKy5:${glitchcore_version_id}"
|
||||||
|
}
|
||||||
|
compileOnly "com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}"
|
||||||
|
if (project.hasProperty('withTerraBlender')) localRuntime "com.github.glitchfiend:TerraBlender-neoforge:${minecraft_version}-${terrablender_version}"
|
||||||
|
// Plugin-only API dependency: JEI is never bundled or required at runtime.
|
||||||
|
compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
|
||||||
|
if (project.hasProperty('withJei')) localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets.main.java.srcDir('../../shared/src/main/java')
|
||||||
|
|
||||||
group = 'net.dnorberg.rivencraft'
|
group = 'net.dnorberg.rivencraft'
|
||||||
version = mod_version
|
version = mod_version
|
||||||
|
|
||||||
base {
|
base {
|
||||||
archivesName = "rivencraft-${minecraft_version}"
|
archivesName = "rivencraft"
|
||||||
}
|
}
|
||||||
|
|
||||||
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
|
java.toolchain.languageVersion = JavaLanguageVersion.of(25)
|
||||||
@@ -193,6 +245,11 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'data/rivencraft/worldgen/structure_set/bastions.json'
|
include 'data/rivencraft/worldgen/structure_set/bastions.json'
|
||||||
include 'assets/rivencraft/models/block/star_fissure.json'
|
include 'assets/rivencraft/models/block/star_fissure.json'
|
||||||
include 'assets/rivencraft/blockstates/star_fissure.json'
|
include 'assets/rivencraft/blockstates/star_fissure.json'
|
||||||
|
include 'assets/rivencraft/blockstates/decay.json'
|
||||||
|
include 'assets/rivencraft/models/block/decay_*.json'
|
||||||
|
include 'assets/rivencraft/textures/block/decay_*.png'
|
||||||
|
include 'data/rivencraft/tags/block/decay_protected.json'
|
||||||
|
include 'data/rivencraft/tags/worldgen/biome/desert_vegetation.json'
|
||||||
include 'assets/rivencraft/sounds.json'
|
include 'assets/rivencraft/sounds.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'
|
||||||
@@ -221,7 +278,6 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'assets/rivencraft/blockstates/writing_desk.json'
|
include 'assets/rivencraft/blockstates/writing_desk.json'
|
||||||
include 'data/rivencraft/loot_table/blocks/writing_desk.json'
|
include 'data/rivencraft/loot_table/blocks/writing_desk.json'
|
||||||
include 'data/rivencraft/advancement/progression/*.json'
|
include 'data/rivencraft/advancement/progression/*.json'
|
||||||
exclude 'data/rivencraft/advancement/progression/open_portal.json'
|
|
||||||
exclude 'data/rivencraft/advancement/progression/root.json'
|
exclude 'data/rivencraft/advancement/progression/root.json'
|
||||||
include 'assets/rivencraft/textures/item/ink_vial.png.mcmeta'
|
include 'assets/rivencraft/textures/item/ink_vial.png.mcmeta'
|
||||||
include 'assets/rivencraft/models/item/ink_vial.json'
|
include 'assets/rivencraft/models/item/ink_vial.json'
|
||||||
@@ -241,6 +297,12 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'assets/rivencraft/textures/block/book_binder.png'
|
include 'assets/rivencraft/textures/block/book_binder.png'
|
||||||
include 'assets/rivencraft/textures/block/book_binder_press.png'
|
include 'assets/rivencraft/textures/block/book_binder_press.png'
|
||||||
include 'assets/rivencraft/textures/gui/book_binder_legacy.png'
|
include 'assets/rivencraft/textures/gui/book_binder_legacy.png'
|
||||||
|
include 'assets/rivencraft/textures/gui/link_modifier_legacy.png'
|
||||||
|
include 'assets/rivencraft/textures/block/link_modifier_*.png'
|
||||||
|
include 'assets/rivencraft/models/block/link_modifier.json'
|
||||||
|
include 'assets/rivencraft/models/item/link_modifier.json'
|
||||||
|
include 'assets/rivencraft/blockstates/link_modifier.json'
|
||||||
|
include 'data/rivencraft/loot_table/blocks/link_modifier.json'
|
||||||
include 'assets/rivencraft/textures/gui/ink_mixer_legacy.png'
|
include 'assets/rivencraft/textures/gui/ink_mixer_legacy.png'
|
||||||
include 'assets/rivencraft/textures/block/inkwell_base.png'
|
include 'assets/rivencraft/textures/block/inkwell_base.png'
|
||||||
include 'assets/rivencraft/textures/block/inkwell_cup.png'
|
include 'assets/rivencraft/textures/block/inkwell_cup.png'
|
||||||
@@ -253,8 +315,19 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'assets/rivencraft/models/block/book_binder.json'
|
include 'assets/rivencraft/models/block/book_binder.json'
|
||||||
include 'assets/rivencraft/models/item/book_binder.json'
|
include 'assets/rivencraft/models/item/book_binder.json'
|
||||||
include 'assets/rivencraft/blockstates/book_binder.json'
|
include 'assets/rivencraft/blockstates/book_binder.json'
|
||||||
|
include 'assets/rivencraft/blockstates/book_receptacle.json'
|
||||||
|
include 'assets/rivencraft/blockstates/crystal_portal.json'
|
||||||
|
include 'assets/rivencraft/models/block/book_receptacle.json'
|
||||||
|
include 'assets/rivencraft/models/block/crystal_portal.json'
|
||||||
|
include 'assets/rivencraft/models/item/book_receptacle.json'
|
||||||
|
include 'assets/rivencraft/textures/block/book_receptacle.png'
|
||||||
|
include 'assets/rivencraft/textures/block/crystal_portal.png'
|
||||||
|
include 'assets/rivencraft/textures/block/crystal_portal.png.mcmeta'
|
||||||
|
include 'data/rivencraft/loot_table/blocks/book_receptacle.json'
|
||||||
include 'assets/rivencraft/blockstates/book_stand.json'
|
include 'assets/rivencraft/blockstates/book_stand.json'
|
||||||
include 'data/rivencraft/loot_table/blocks/book_stand.json'
|
include 'data/rivencraft/loot_table/blocks/book_stand.json'
|
||||||
|
include 'data/rivencraft/loot_table/chests/mystcraft_library.json'
|
||||||
|
include 'data/rivencraft/structure/mystcraft_library.nbt'
|
||||||
include 'data/rivencraft/loot_table/blocks/book_binder.json'
|
include 'data/rivencraft/loot_table/blocks/book_binder.json'
|
||||||
include 'assets/rivencraft/models/block/crystal_block.json'
|
include 'assets/rivencraft/models/block/crystal_block.json'
|
||||||
include 'assets/rivencraft/blockstates/crystal_block.json'
|
include 'assets/rivencraft/blockstates/crystal_block.json'
|
||||||
|
|||||||
@@ -7,4 +7,11 @@ neo_version=26.3.0.99
|
|||||||
mod_id=rivencraft
|
mod_id=rivencraft
|
||||||
mod_name=Rivencraft
|
mod_name=Rivencraft
|
||||||
mod_license=LGPL-3.0-or-later
|
mod_license=LGPL-3.0-or-later
|
||||||
mod_version=1.0.1.115-beta.1
|
mod_version=26.3.0.10
|
||||||
|
|
||||||
|
jei_version=31.17.0.109
|
||||||
|
|
||||||
|
terrablender_version=26.3.0.0.9
|
||||||
|
|
||||||
|
serene_seasons_version_id=QnvW5HPm
|
||||||
|
glitchcore_version_id=pQgy3bfh
|
||||||
@@ -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.",
|
||||||
@@ -106,5 +103,9 @@
|
|||||||
"symbol.rivencraft.feature.ruined_portals.description": "Allow ruined portals in noise terrain, including Cave, regardless of normal biome eligibility.",
|
"symbol.rivencraft.feature.ruined_portals.description": "Allow ruined portals in noise terrain, including Cave, regardless of normal biome eligibility.",
|
||||||
"symbol.rivencraft.feature.nether_fossils.description": "Allow Nether fossils in Cave terrain; the authored page overrides biome eligibility.",
|
"symbol.rivencraft.feature.nether_fossils.description": "Allow Nether fossils in Cave terrain; the authored page overrides biome eligibility.",
|
||||||
"symbol.rivencraft.feature.ancient_cities.description": "Allow underground Ancient Cities in noise terrain, including Cave, regardless of biome eligibility.",
|
"symbol.rivencraft.feature.ancient_cities.description": "Allow underground Ancient Cities in noise terrain, including Cave, regardless of biome eligibility.",
|
||||||
"symbol.rivencraft.feature.trail_ruins.description": "Allow Trail Ruins in surface noise terrain, including outside their usual biomes."
|
"symbol.rivencraft.feature.trail_ruins.description": "Allow Trail Ruins in surface noise terrain, including outside their usual biomes.",
|
||||||
|
"jei.rivencraft.ink_mixer.usage": "Paper + ink makes a Link Panel. Each panel uses one paper and one ink. A vial supplies 16 ink and returns a glass bottle; additives reset when a panel is taken.",
|
||||||
|
"jei.rivencraft.link_modifier": "Creative-only tool; no crafting recipe. Insert a book to rename it and edit link properties. Bound Descriptive Books also allow seed editing while their Age is empty. Age retirement requires OP permission and a separate confirmation; its data is archived.",
|
||||||
|
"symbol.rivencraft.ruins.description": "Generates this Ruins template. Repeated pages increase its selection weight and spawn attempts.",
|
||||||
|
"itemGroup.rivencraft.pages.ruins": "Rivencraft Ruins Pages"
|
||||||
}
|
}
|
||||||
@@ -4,23 +4,72 @@ import net.neoforged.neoforge.common.ModConfigSpec;
|
|||||||
|
|
||||||
/** Server-owned gameplay policies adapted from 1.21.1. */
|
/** Server-owned gameplay policies adapted from 1.21.1. */
|
||||||
public final class PortConfig {
|
public final class PortConfig {
|
||||||
|
public enum LibraryLootMode { LEGACY, AGE_ONLY }
|
||||||
|
public static final ModConfigSpec.EnumValue<LibraryLootMode> LIBRARY_LOOT_MODE;
|
||||||
public enum ReturnLinkMode { ON_CREATION, ALWAYS, DISABLED }
|
public enum ReturnLinkMode { ON_CREATION, ALWAYS, DISABLED }
|
||||||
|
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_ALLOWLIST;
|
||||||
|
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_BLOCKLIST;
|
||||||
|
public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS;
|
||||||
|
public static final ModConfigSpec.BooleanValue CRYSTAL_LIVE_VIEWS;
|
||||||
|
public static final ModConfigSpec.BooleanValue SEAMLESS_BOOK_PREVIEWS;
|
||||||
|
public static final ModConfigSpec.BooleanValue SEAMLESS_CRYSTAL_VIEWS;
|
||||||
public static final ModConfigSpec SPEC;
|
public static final ModConfigSpec SPEC;
|
||||||
|
public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES;
|
||||||
public static final ModConfigSpec.IntValue SYMBOL_INK_COST;
|
public static final ModConfigSpec.IntValue SYMBOL_INK_COST;
|
||||||
|
public static final ModConfigSpec.IntValue LINK_PANEL_INK_COST;
|
||||||
public static final ModConfigSpec.EnumValue<ReturnLinkMode> RETURN_LINK_MODE;
|
public static final ModConfigSpec.EnumValue<ReturnLinkMode> RETURN_LINK_MODE;
|
||||||
public static final ModConfigSpec.IntValue ACCELERATED_MAX_CHUNKS;
|
public static final ModConfigSpec.IntValue ACCELERATED_MAX_CHUNKS;
|
||||||
public static final ModConfigSpec.IntValue ACCELERATED_MAX_ATTEMPTS;
|
public static final ModConfigSpec.IntValue ACCELERATED_MAX_ATTEMPTS;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
var builder = new ModConfigSpec.Builder();
|
var builder = new ModConfigSpec.Builder();
|
||||||
|
builder.push("book_previews");
|
||||||
|
LIVE_BOOK_PREVIEWS = builder.comment("Show live rotating destination views when Immersive Portals Reborn is installed on client and server.",
|
||||||
|
"Disable locally to retain the animated Legacy link panels.")
|
||||||
|
.define("reborn_live_views", true);
|
||||||
|
CRYSTAL_LIVE_VIEWS = builder.comment("Server option: create native live crystal portal surfaces when Reborn is installed.",
|
||||||
|
"Disabling keeps crystal portal travel with the animated surface.")
|
||||||
|
.define("reborn_crystal_live_views", true);
|
||||||
|
SEAMLESS_BOOK_PREVIEWS = builder.comment(
|
||||||
|
"Show rotating live book views and handheld look-only exploration with Seamless on client and server.",
|
||||||
|
"Disable locally to retain animated Legacy link panels; existing Reborn switches remain independent.")
|
||||||
|
.define("seamless_live_views", true);
|
||||||
|
SEAMLESS_CRYSTAL_VIEWS = builder.comment(
|
||||||
|
"Server option: create native live crystal portal surfaces when Seamless is installed.",
|
||||||
|
"Disabling retains normal portal travel and the animated surface.")
|
||||||
|
.define("seamless_crystal_live_views", true);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("random_pages");
|
||||||
|
RANDOM_PAGE_ALLOWLIST = builder.comment(
|
||||||
|
"Page paths allowed in new random Ages and newly generated library pages.",
|
||||||
|
"Restricts only categories it mentions; other categories remain unrestricted.",
|
||||||
|
"Example: [\"sky/static\"]; full namespaced IDs are accepted too.")
|
||||||
|
.defineList("allowlist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
|
||||||
|
RANDOM_PAGE_BLOCKLIST = builder.comment(
|
||||||
|
"Page paths excluded from new random Ages and newly generated library pages.",
|
||||||
|
"Blocklist wins. Existing Ages, Creative/JEI pages and manually authored books remain usable.",
|
||||||
|
"Required empty categories use safe defaults; Native biomes come from the preset, not biome pages.")
|
||||||
|
.defineList("blocklist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("serene_seasons");
|
||||||
|
AUTO_WHITELIST_SERENE_AGES = builder.comment("Automatically whitelist Ages with seed-selected/legacy cycling seasons. Explicit pages still apply; existing entries are preserved when disabled.")
|
||||||
|
.define("auto_whitelist_ages", true);
|
||||||
|
builder.pop();
|
||||||
builder.push("descriptive_books");
|
builder.push("descriptive_books");
|
||||||
RETURN_LINK_MODE = builder.comment("Controls automatic Return Links for successful Descriptive Book travel.",
|
RETURN_LINK_MODE = builder.comment("Controls automatic Return Links for successful Descriptive Book travel.",
|
||||||
"ON_CREATION issues one on the first arrival per Age/world; ALWAYS issues one each arrival; DISABLED issues none.")
|
"ON_CREATION issues one on the first arrival per Age/world; ALWAYS issues one each arrival; DISABLED issues none.")
|
||||||
.defineEnum("return_link_mode", ReturnLinkMode.DISABLED);
|
.defineEnum("return_link_mode", ReturnLinkMode.DISABLED);
|
||||||
builder.pop();
|
builder.pop();
|
||||||
|
builder.push("libraries");
|
||||||
|
LIBRARY_LOOT_MODE = builder.comment("LEGACY uses writing supplies/Sealed Notebooks and random lectern pages; AGE_ONLY uses only pages written into this Age.")
|
||||||
|
.defineEnum("loot_mode", LibraryLootMode.LEGACY);
|
||||||
|
builder.pop();
|
||||||
builder.push("writing");
|
builder.push("writing");
|
||||||
SYMBOL_INK_COST = builder.comment("Ink units consumed for one Writing Desk symbol copy.")
|
SYMBOL_INK_COST = builder.comment("Ink units consumed for one Writing Desk symbol copy.")
|
||||||
.defineInRange("symbol_ink_cost", 1, 1, 16);
|
.defineInRange("symbol_ink_cost", 1, 1, 16);
|
||||||
|
LINK_PANEL_INK_COST = builder.comment("Ink units consumed when preparing one baseline Link Panel by hand with paper.",
|
||||||
|
"The Ink Mixer uses one ink unit per panel independently of this setting.")
|
||||||
|
.defineInRange("link_panel_ink_cost", 2, 1, 16);
|
||||||
builder.pop();
|
builder.pop();
|
||||||
builder.push("accelerated_age");
|
builder.push("accelerated_age");
|
||||||
ACCELERATED_MAX_CHUNKS = builder.comment("Maximum already-loaded player-nearby chunks given extra random ticks per Age tick.")
|
ACCELERATED_MAX_CHUNKS = builder.comment("Maximum already-loaded player-nearby chunks given extra random ticks per Age tick.")
|
||||||
@@ -28,8 +77,14 @@ public final class PortConfig {
|
|||||||
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables Accelerated.")
|
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables Accelerated.")
|
||||||
.defineInRange("max_random_tick_attempts_per_tick", 16384, 0, 65536);
|
.defineInRange("max_random_tick_attempts_per_tick", 16384, 0, 65536);
|
||||||
builder.pop();
|
builder.pop();
|
||||||
|
net.dnorberg.rivencraft.age.PortInstabilityConfig.define(builder);
|
||||||
SPEC = builder.build();
|
SPEC = builder.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean validPageId(Object value) {
|
||||||
|
if (!(value instanceof String id)) return false;
|
||||||
|
try { net.dnorberg.rivencraft.age.PortRandomPagePolicy.parsePageId(id); return true; }
|
||||||
|
catch (IllegalArgumentException exception) { return false; }
|
||||||
|
}
|
||||||
private PortConfig() {}
|
private PortConfig() {}
|
||||||
}
|
}
|
||||||
@@ -131,6 +131,23 @@ public final class Rivencraft {
|
|||||||
BLOCKS.registerBlock("cloud_platform", net.dnorberg.rivencraft.block.CloudPlatformBlock::new,
|
BLOCKS.registerBlock("cloud_platform", net.dnorberg.rivencraft.block.CloudPlatformBlock::new,
|
||||||
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK)
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK)
|
||||||
.mapColor(MapColor.COLOR_BLUE).strength(0.3F).noLootTable());
|
.mapColor(MapColor.COLOR_BLUE).strength(0.3F).noLootTable());
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.BookReceptacleBlock> BOOK_RECEPTACLE =
|
||||||
|
BLOCKS.registerBlock("book_receptacle", net.dnorberg.rivencraft.block.BookReceptacleBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK).noOcclusion().mapColor(MapColor.COLOR_BLUE));
|
||||||
|
public static final DeferredItem<BlockItem> BOOK_RECEPTACLE_ITEM = ITEMS.registerSimpleBlockItem(BOOK_RECEPTACLE);
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.CrystalPortalBlock> CRYSTAL_PORTAL =
|
||||||
|
BLOCKS.registerBlock("crystal_portal", net.dnorberg.rivencraft.block.CrystalPortalBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.NETHER_PORTAL)
|
||||||
|
.noCollision().noOcclusion().lightLevel(state -> 11).noLootTable());
|
||||||
|
public static final Supplier<BlockEntityType<net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity>> BOOK_RECEPTACLE_BLOCK_ENTITY =
|
||||||
|
BLOCK_ENTITY_TYPES.register("book_receptacle", () -> new BlockEntityType<>(
|
||||||
|
net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity::new, BOOK_RECEPTACLE.get()));
|
||||||
|
public static final Supplier<BlockEntityType<net.dnorberg.rivencraft.block.entity.CrystalPortalBlockEntity>> CRYSTAL_PORTAL_BLOCK_ENTITY =
|
||||||
|
BLOCK_ENTITY_TYPES.register("crystal_portal", () -> new BlockEntityType<>(
|
||||||
|
net.dnorberg.rivencraft.block.entity.CrystalPortalBlockEntity::new, CRYSTAL_PORTAL.get()));
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.DecayBlock> DECAY =
|
||||||
|
BLOCKS.registerBlock("decay", net.dnorberg.rivencraft.block.DecayBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).strength(5.0F, 10.0F).noLootTable());
|
||||||
public static final DeferredBlock<StarFissureBlock> STAR_FISSURE =
|
public static final DeferredBlock<StarFissureBlock> STAR_FISSURE =
|
||||||
BLOCKS.registerBlock("star_fissure", StarFissureBlock::new,
|
BLOCKS.registerBlock("star_fissure", StarFissureBlock::new,
|
||||||
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.END_PORTAL).lightLevel(state -> 6));
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.END_PORTAL).lightLevel(state -> 6));
|
||||||
@@ -147,6 +164,15 @@ public final class Rivencraft {
|
|||||||
"book_binder", PortBookBinderBlock::new,
|
"book_binder", PortBookBinderBlock::new,
|
||||||
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion());
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion());
|
||||||
public static final DeferredItem<BlockItem> BOOK_BINDER_ITEM = ITEMS.registerSimpleBlockItem(BOOK_BINDER);
|
public static final DeferredItem<BlockItem> BOOK_BINDER_ITEM = ITEMS.registerSimpleBlockItem(BOOK_BINDER);
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.LinkModifierBlock> LINK_MODIFIER = BLOCKS.registerBlock(
|
||||||
|
"link_modifier", net.dnorberg.rivencraft.block.LinkModifierBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.STONE).noOcclusion());
|
||||||
|
public static final DeferredItem<BlockItem> LINK_MODIFIER_ITEM = ITEMS.registerSimpleBlockItem(LINK_MODIFIER);
|
||||||
|
public static final Supplier<BlockEntityType<net.dnorberg.rivencraft.block.entity.LinkModifierBlockEntity>> LINK_MODIFIER_BLOCK_ENTITY =
|
||||||
|
BLOCK_ENTITY_TYPES.register("link_modifier", () -> new BlockEntityType<>(
|
||||||
|
net.dnorberg.rivencraft.block.entity.LinkModifierBlockEntity::new, LINK_MODIFIER.get()));
|
||||||
|
public static final Supplier<MenuType<net.dnorberg.rivencraft.menu.LinkModifierMenu>> LINK_MODIFIER_MENU =
|
||||||
|
MENUS.register("link_modifier", () -> IMenuTypeExtension.create(net.dnorberg.rivencraft.menu.LinkModifierMenu::new));
|
||||||
public static final DeferredBlock<InkMixerBlock> INK_MIXER = BLOCKS.registerBlock(
|
public static final DeferredBlock<InkMixerBlock> INK_MIXER = BLOCKS.registerBlock(
|
||||||
"ink_mixer", InkMixerBlock::new,
|
"ink_mixer", InkMixerBlock::new,
|
||||||
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion());
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion());
|
||||||
@@ -222,19 +248,34 @@ public final class Rivencraft {
|
|||||||
MENUS.register(modEventBus);
|
MENUS.register(modEventBus);
|
||||||
COMPONENTS.register(modEventBus);
|
COMPONENTS.register(modEventBus);
|
||||||
RECIPE_SERIALIZERS.register(modEventBus);
|
RECIPE_SERIALIZERS.register(modEventBus);
|
||||||
|
net.dnorberg.rivencraft.compat.RuinsCompatibility.register();
|
||||||
|
net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.register();
|
||||||
ModCreativeTabs.register(modEventBus);
|
ModCreativeTabs.register(modEventBus);
|
||||||
PortBiomeSources.register(modEventBus);
|
PortBiomeSources.register(modEventBus);
|
||||||
PortChunkGenerators.register(modEventBus);
|
PortChunkGenerators.register(modEventBus);
|
||||||
NeoForge.EVENT_BUS.addListener(RuntimeAgeBackend::onLevelLoad);
|
NeoForge.EVENT_BUS.addListener(RuntimeAgeBackend::onLevelLoad);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.neoforged.bus.api.EventPriority.LOWEST,
|
||||||
|
net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility::onServerStarted);
|
||||||
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAgeWeather::onLevelTickPre);
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAgeWeather::onLevelTickPre);
|
||||||
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAcceleratedTicks::onLevelTickPost);
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAcceleratedTicks::onLevelTickPost);
|
||||||
NeoForge.EVENT_BUS.addListener(PortAgeCommands::register);
|
NeoForge.EVENT_BUS.addListener(PortAgeCommands::register);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.compat.TerraBlenderBiomes::onTagsUpdated);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.neoforged.bus.api.EventPriority.LOWEST,
|
||||||
|
net.dnorberg.rivencraft.compat.TerraBlenderBiomes::onServerAboutToStart);
|
||||||
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.event.BookStandConversionHandler::onRightClickBlock);
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.event.BookStandConversionHandler::onRightClickBlock);
|
||||||
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onLogin);
|
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onLogin);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility::onLevelLoad);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility::onLogin);
|
||||||
|
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility::onLevelTickPost);
|
||||||
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onLogout);
|
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onLogout);
|
||||||
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onServerStopped);
|
NeoForge.EVENT_BUS.addListener(AgeCatalogSync::onServerStopped);
|
||||||
modEventBus.addListener(AgeCatalogSync::registerPayloads);
|
modEventBus.addListener(AgeCatalogSync::registerPayloads);
|
||||||
modEventBus.addListener(PortBookNetworking::registerPayloads);
|
modEventBus.addListener(PortBookNetworking::registerPayloads);
|
||||||
|
net.dnorberg.rivencraft.age.PortStatusEffectProviders.register();
|
||||||
|
net.dnorberg.rivencraft.age.PortDecayProviders.register();
|
||||||
|
net.dnorberg.rivencraft.age.PortHazardProviders.register();
|
||||||
|
net.dnorberg.rivencraft.age.PortMeteorProvider.register();
|
||||||
|
net.dnorberg.rivencraft.age.PortEnvironmentalProviders.register();
|
||||||
LOGGER.info("Initializing Rivencraft 26.3 port slice (not release-ready)");
|
LOGGER.info("Initializing Rivencraft 26.3 port slice (not release-ready)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
@@ -7,6 +7,7 @@ import net.minecraft.server.level.ServerPlayer;
|
|||||||
|
|
||||||
/** Awards action-only progression after the server has committed the action. */
|
/** Awards action-only progression after the server has committed the action. */
|
||||||
public final class ProgressionAdvancements {
|
public final class ProgressionAdvancements {
|
||||||
|
public static final String OPEN_PORTAL = "open_portal";
|
||||||
public static final String LINK_PANEL = "link_panel";
|
public static final String LINK_PANEL = "link_panel";
|
||||||
public static final String COPY_PAGE = "copy_page";
|
public static final String COPY_PAGE = "copy_page";
|
||||||
public static final String BIND_AGE = "bind_age";
|
public static final String BIND_AGE = "bind_age";
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ import net.minecraft.resources.Identifier;
|
|||||||
/** Full server level catalog, sent on login and after a runtime Age is added. */
|
/** Full server level catalog, sent on login and after a runtime Age is added. */
|
||||||
public record AgeCatalogPayload(int version, List<Identifier> dimensions,
|
public record AgeCatalogPayload(int version, List<Identifier> dimensions,
|
||||||
Map<Identifier, PortAgeColors> colors,
|
Map<Identifier, PortAgeColors> colors,
|
||||||
Map<Identifier, PortDayCycle> dayCycles) implements CustomPacketPayload {
|
Map<Identifier, PortDayCycle> dayCycles,
|
||||||
|
Map<Identifier, PortAgeDescription> descriptions) implements CustomPacketPayload {
|
||||||
public static final Type<AgeCatalogPayload> TYPE = new Type<>(
|
public static final Type<AgeCatalogPayload> TYPE = new Type<>(
|
||||||
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age_catalog"));
|
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age_catalog"));
|
||||||
public static final StreamCodec<RegistryFriendlyByteBuf, AgeCatalogPayload> STREAM_CODEC = StreamCodec.composite(
|
public static final StreamCodec<RegistryFriendlyByteBuf, AgeCatalogPayload> STREAM_CODEC = StreamCodec.composite(
|
||||||
@@ -21,6 +22,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
|
|||||||
Identifier.STREAM_CODEC.apply(ByteBufCodecs.list()), AgeCatalogPayload::dimensions,
|
Identifier.STREAM_CODEC.apply(ByteBufCodecs.list()), AgeCatalogPayload::dimensions,
|
||||||
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeColors.STREAM_CODEC), AgeCatalogPayload::colors,
|
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeColors.STREAM_CODEC), AgeCatalogPayload::colors,
|
||||||
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortDayCycle.STREAM_CODEC), AgeCatalogPayload::dayCycles,
|
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortDayCycle.STREAM_CODEC), AgeCatalogPayload::dayCycles,
|
||||||
|
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeDescription.STREAM_CODEC), AgeCatalogPayload::descriptions,
|
||||||
AgeCatalogPayload::new
|
AgeCatalogPayload::new
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -28,6 +30,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
|
|||||||
dimensions = List.copyOf(dimensions);
|
dimensions = List.copyOf(dimensions);
|
||||||
colors = Map.copyOf(colors);
|
colors = Map.copyOf(colors);
|
||||||
dayCycles = Map.copyOf(dayCycles);
|
dayCycles = Map.copyOf(dayCycles);
|
||||||
|
descriptions = Map.copyOf(descriptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public final class AgeCatalogSync {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
|
||||||
var registrar = event.registrar("10");
|
var registrar = event.registrar("12");
|
||||||
registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC);
|
registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC);
|
||||||
registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC,
|
registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC,
|
||||||
(payload, context) -> {
|
(payload, context) -> {
|
||||||
@@ -55,6 +55,9 @@ public final class AgeCatalogSync {
|
|||||||
State state = state(server);
|
State state = state(server);
|
||||||
state.version++;
|
state.version++;
|
||||||
state.acknowledged.clear();
|
state.acknowledged.clear();
|
||||||
|
// Optional synchronization failures must not turn a committed Age into a
|
||||||
|
// reported binding failure. Withhold acknowledgements, so travel stays safe.
|
||||||
|
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.synchronize(server)) return;
|
||||||
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
|
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
|
||||||
try {
|
try {
|
||||||
send(player);
|
send(player);
|
||||||
@@ -76,9 +79,11 @@ public final class AgeCatalogSync {
|
|||||||
MinecraftServer server = player.level().getServer();
|
MinecraftServer server = player.level().getServer();
|
||||||
State state = state(server);
|
State state = state(server);
|
||||||
state.acknowledged.remove(player.getUUID());
|
state.acknowledged.remove(player.getUUID());
|
||||||
|
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.beforeCatalog(player))
|
||||||
|
throw new IllegalStateException("Optional portal dimension catalog is unavailable");
|
||||||
var dimensions = server.levelKeys().stream().map(key -> key.identifier()).sorted().toList();
|
var dimensions = server.levelKeys().stream().map(key -> key.identifier()).sorted().toList();
|
||||||
PacketDistributor.sendToPlayer(player, new AgeCatalogPayload(state.version, dimensions,
|
PacketDistributor.sendToPlayer(player, new AgeCatalogPayload(state.version, dimensions,
|
||||||
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server)));
|
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void acknowledge(ServerPlayer player, int version) {
|
private static void acknowledge(ServerPlayer player, int version) {
|
||||||
|
|||||||
@@ -182,8 +182,15 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
setDirty();
|
setDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
void retire(Identifier id) {
|
/** Failed creation is not retirement: release the new identity for a clean retry. */
|
||||||
if (ages.remove(id) == null) throw new IllegalArgumentException("Age not indexed: " + id);
|
void discardCreation(Identifier id) {
|
||||||
|
if (retired.contains(id)) throw new IllegalArgumentException("Cannot discard a retired Age: " + id);
|
||||||
|
removeActive(id);
|
||||||
|
displayNames.remove(id);
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
private void removeActive(Identifier id) {
|
||||||
|
ages.remove(id);
|
||||||
biomeOverrides.remove(id);
|
biomeOverrides.remove(id);
|
||||||
biomePlans.remove(id);
|
biomePlans.remove(id);
|
||||||
terrain.remove(id);
|
terrain.remove(id);
|
||||||
@@ -196,6 +203,10 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
sky.remove(id);
|
sky.remove(id);
|
||||||
colors.remove(id);
|
colors.remove(id);
|
||||||
dayCycles.remove(id);
|
dayCycles.remove(id);
|
||||||
|
}
|
||||||
|
void retire(Identifier id) {
|
||||||
|
if (!ages.containsKey(id)) throw new IllegalArgumentException("Age not indexed: " + id);
|
||||||
|
removeActive(id);
|
||||||
retired.add(id);
|
retired.add(id);
|
||||||
setDirty();
|
setDirty();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Frozen Legacy 0.13.7.06 deck cards and default activation costs, not effect implementations. */
|
||||||
|
public final class InstabilityProviderCatalog {
|
||||||
|
public enum Deck {
|
||||||
|
BASIC(0), HARSH(2_500), DESTRUCTIVE(10_000), EATING(15_000), DEATH(20_000);
|
||||||
|
|
||||||
|
private final int entryCost;
|
||||||
|
|
||||||
|
Deck(int entryCost) { this.entryCost = entryCost; }
|
||||||
|
public int entryCost() { return entryCost; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public record Card(Identifier id, int cost) {
|
||||||
|
public Card {
|
||||||
|
if (cost <= 0) throw new IllegalArgumentException("Provider cost must be positive");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final List<List<Card>> DECKS = createDecks();
|
||||||
|
|
||||||
|
private InstabilityProviderCatalog() {}
|
||||||
|
|
||||||
|
public static List<Card> cards(Deck deck) { return DECKS.get(deck.ordinal()); }
|
||||||
|
|
||||||
|
public static boolean contains(Identifier id) {
|
||||||
|
return DECKS.stream().flatMap(List::stream).anyMatch(card -> card.id().equals(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<List<Card>> createDecks() {
|
||||||
|
List<List<Card>> decks = new ArrayList<>();
|
||||||
|
for (Deck ignored : Deck.values()) decks.add(new ArrayList<>());
|
||||||
|
add(decks, "blindness", 1000, 0, 0, 0, 1, 0);
|
||||||
|
add(decks, "blindness_global", 1500, 0, 0, 0, 0, 1);
|
||||||
|
add(decks, "enemyregen_global", 1000, 5, 2, 0, 0, 0);
|
||||||
|
add(decks, "enemyresist_global", 1000, 2, 1, 0, 0, 0);
|
||||||
|
add(decks, "fatigue", 500, 5, 0, 0, 0, 0);
|
||||||
|
add(decks, "fatigue_global", 1000, 0, 5, 0, 0, 0);
|
||||||
|
add(decks, "hunger", 500, 8, 2, 0, 0, 0);
|
||||||
|
add(decks, "hunger_global", 1000, 0, 5, 0, 0, 0);
|
||||||
|
add(decks, "nausea", 1000, 0, 0, 0, 1, 0);
|
||||||
|
add(decks, "nausea_global", 1500, 0, 0, 0, 0, 1);
|
||||||
|
add(decks, "poison", 500, 9, 3, 0, 0, 0);
|
||||||
|
add(decks, "poison_global", 1000, 0, 5, 0, 0, 0);
|
||||||
|
add(decks, "slow", 500, 6, 1, 0, 0, 0);
|
||||||
|
add(decks, "slow_global", 1000, 0, 5, 0, 0, 0);
|
||||||
|
add(decks, "weakness", 500, 8, 2, 0, 0, 0);
|
||||||
|
add(decks, "weakness_global", 1000, 0, 5, 0, 0, 0);
|
||||||
|
add(decks, "wither", 1000, 0, 1, 1, 2, 0);
|
||||||
|
add(decks, "wither_global", 2000, 0, 0, 1, 1, 1);
|
||||||
|
add(decks, "burning", 500, 0, 1, 0, 0, 0);
|
||||||
|
add(decks, "crumble", 2000, 0, 0, 6, 0, 0);
|
||||||
|
add(decks, "decayblue", 2000, 0, 0, 0, 2, 1);
|
||||||
|
add(decks, "decaypurple", 2000, 0, 0, 0, 2, 1);
|
||||||
|
add(decks, "decayred", 2000, 0, 0, 0, 2, 1);
|
||||||
|
add(decks, "decaywhite", 5000, 0, 0, 0, 1, 3);
|
||||||
|
add(decks, "explosions", 1000, 0, 0, 8, 0, 0);
|
||||||
|
add(decks, "lightning", 1000, 0, 4, 4, 0, 0);
|
||||||
|
add(decks, "meteors", 1000, 0, 0, 4, 0, 0);
|
||||||
|
return decks.stream().map(List::copyOf).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void add(List<List<Card>> decks, String path, int cost, int... copies) {
|
||||||
|
Card card = new Card(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, path), cost);
|
||||||
|
for (Deck deck : Deck.values()) {
|
||||||
|
for (int copy = 0; copy < copies[deck.ordinal()]; copy++) decks.get(deck.ordinal()).add(card);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,16 +68,23 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PortAgeColors compile(List<Identifier> pages, long seed) {
|
public static PortAgeColors compile(List<Identifier> pages, long seed) {
|
||||||
if (!validNumbers(pages)) throw new IllegalArgumentException("Number pages must precede a supported Color, Length, Phase, Angle, or Size modifier");
|
// Numbers only attach to the immediately following target. Misplaced
|
||||||
|
// numbers are diagnosed by PortWritingRecovery, never moved to a later color.
|
||||||
int red = 0, green = 0, blue = 0, sky = -1, ambient = -1, celestial = -1;
|
int red = 0, green = 0, blue = 0, sky = -1, ambient = -1, celestial = -1;
|
||||||
boolean written = false;
|
boolean written = false;
|
||||||
for (int i = 0; i < pages.size(); i++) {
|
for (int i = 0; i < pages.size(); i++) {
|
||||||
@@ -100,7 +115,7 @@ public record PortAgeColors(int sky, int ambient, int celestial) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (written) sky = clamp(red) << 16 | clamp(green) << 8 | clamp(blue);
|
if (written) sky = clamp(red) << 16 | clamp(green) << 8 | clamp(blue);
|
||||||
return new PortAgeColors(sky, ambient, celestial);
|
return new PortAgeColors(sky, ambient, celestial, PortStaticSkyResolution.compile(pages));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Only pageless random Ages receive a random sky tint, as in 1.21.1. */
|
/** Only pageless random Ages receive a random sky tint, as in 1.21.1. */
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public final class PortAgeCommands {
|
|||||||
StringBuilder mods = new StringBuilder("Optional mods: ");
|
StringBuilder mods = new StringBuilder("Optional mods: ");
|
||||||
for (String id : new String[]{"jei", "terrablender", "biomesoplenty",
|
for (String id : new String[]{"jei", "terrablender", "biomesoplenty",
|
||||||
"sereneseasons", "glitchcore", "ruins", "create",
|
"sereneseasons", "glitchcore", "ruins", "create",
|
||||||
"ponder", "immersive_portals_core"}) {
|
"ponder", "immersive_portals_core", "seamlessportals", "immersive_portals_reborn"}) {
|
||||||
if (mods.length() > "Optional mods: ".length()) mods.append(", ");
|
if (mods.length() > "Optional mods: ".length()) mods.append(", ");
|
||||||
mods.append(id).append('=').append(ModList.get().isLoaded(id));
|
mods.append(id).append('=').append(ModList.get().isLoaded(id));
|
||||||
}
|
}
|
||||||
@@ -819,8 +819,8 @@ public final class PortAgeCommands {
|
|||||||
|| new PortDayCycle(true, 2, 0).ticks(12000) != 6000
|
|| new PortDayCycle(true, 2, 0).ticks(12000) != 6000
|
||||||
|| new PortDayCycle(true, 0, 321).ticks(-123456) != 321
|
|| new PortDayCycle(true, 0, 321).ticks(-123456) != 321
|
||||||
|| new PortDayCycle(true, 0, 321).ticks(123456) != 321
|
|| new PortDayCycle(true, 0, 321).ticks(123456) != 321
|
||||||
|| PortDayCycle.validWriting(java.util.List.of(symbol.apply("period/half")))
|
|| !PortDayCycle.validWriting(java.util.List.of(symbol.apply("period/half")))
|
||||||
|| PortDayCycle.validWriting(java.util.List.of(PortDayCycle.NORMAL_TIME, symbol.apply("period/half"))))
|
|| !PortDayCycle.validWriting(java.util.List.of(PortDayCycle.NORMAL_TIME, symbol.apply("period/half"))))
|
||||||
throw new IllegalStateException("Day cycle fixture failed");
|
throw new IllegalStateException("Day cycle fixture failed");
|
||||||
var server = context.getSource().getServer();
|
var server = context.getSource().getServer();
|
||||||
var biomes = net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(pages, server.registryAccess());
|
var biomes = net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(pages, server.registryAccess());
|
||||||
@@ -1616,7 +1616,7 @@ public final class PortAgeCommands {
|
|||||||
|| Math.abs(moving.bodyAngle(origin + 100) + 3F) > 0.0001F
|
|| Math.abs(moving.bodyAngle(origin + 100) + 3F) > 0.0001F
|
||||||
|| !PortDayCycle.validWriting(java.util.List.of(target, PortDayCycle.NORMAL_TIME))
|
|| !PortDayCycle.validWriting(java.util.List.of(target, PortDayCycle.NORMAL_TIME))
|
||||||
|| !PortDayCycle.validWriting(java.util.List.of(target, target))
|
|| !PortDayCycle.validWriting(java.util.List.of(target, target))
|
||||||
|| PortDayCycle.validWriting(java.util.List.of(target, symbol.apply("size/large"))))
|
|| !PortDayCycle.validWriting(java.util.List.of(target, symbol.apply("size/large"))))
|
||||||
throw new IllegalStateException("Single-body modifier/order invariant failed");
|
throw new IllegalStateException("Single-body modifier/order invariant failed");
|
||||||
}
|
}
|
||||||
var older = PortDayCycle.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,
|
var older = PortDayCycle.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,
|
||||||
@@ -1777,7 +1777,7 @@ public final class PortAgeCommands {
|
|||||||
|
|
||||||
private static void verifyCatalogRoundTrip(net.minecraft.server.MinecraftServer server) {
|
private static void verifyCatalogRoundTrip(net.minecraft.server.MinecraftServer server) {
|
||||||
var payload = new AgeCatalogPayload(1, server.levelKeys().stream().map(key -> key.identifier()).toList(),
|
var payload = new AgeCatalogPayload(1, server.levelKeys().stream().map(key -> key.identifier()).toList(),
|
||||||
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server));
|
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server));
|
||||||
var buffer = new net.minecraft.network.RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(),
|
var buffer = new net.minecraft.network.RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(),
|
||||||
server.registryAccess(), net.neoforged.neoforge.network.connection.ConnectionType.NEOFORGE);
|
server.registryAccess(), net.neoforged.neoforge.network.connection.ConnectionType.NEOFORGE);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
|
import net.minecraft.network.codec.ByteBufCodecs;
|
||||||
|
import net.minecraft.network.codec.StreamCodec;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Public presentation only: no seed, instability score or provider information. */
|
||||||
|
public record PortAgeDescription(PortAgeTerrain terrain, PortBiomePlan.Distribution distribution,
|
||||||
|
PortLighting lighting, PortWeatherMode weather) {
|
||||||
|
public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeDescription> STREAM_CODEC = StreamCodec.composite(
|
||||||
|
ByteBufCodecs.STRING_UTF8.map(PortAgeTerrain::valueOf, PortAgeTerrain::name), PortAgeDescription::terrain,
|
||||||
|
ByteBufCodecs.STRING_UTF8.map(PortBiomePlan.Distribution::valueOf, PortBiomePlan.Distribution::name), PortAgeDescription::distribution,
|
||||||
|
ByteBufCodecs.STRING_UTF8.map(PortLighting::valueOf, PortLighting::name), PortAgeDescription::lighting,
|
||||||
|
ByteBufCodecs.STRING_UTF8.map(PortWeatherMode::valueOf, PortWeatherMode::name), PortAgeDescription::weather,
|
||||||
|
PortAgeDescription::new);
|
||||||
|
private static volatile Map<Identifier, PortAgeDescription> clientDescriptions = Map.of();
|
||||||
|
|
||||||
|
public static void updateClient(Map<Identifier, PortAgeDescription> descriptions) {
|
||||||
|
clientDescriptions = Map.copyOf(descriptions);
|
||||||
|
}
|
||||||
|
public static PortAgeDescription forClient(Identifier id) { return clientDescriptions.get(id); }
|
||||||
|
}
|
||||||
@@ -51,6 +51,8 @@ final class PortAgeLevel extends ServerLevel {
|
|||||||
return ageWeather == null ? super.getWeatherData() : ageWeather;
|
return ageWeather == null ? super.getWeatherData() : ageWeather;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean caveTerrain() { return cave; }
|
||||||
|
|
||||||
PortWeatherMode weatherMode() { return cave ? PortWeatherMode.OFF : weatherSettings.mode(); }
|
PortWeatherMode weatherMode() { return cave ? PortWeatherMode.OFF : weatherSettings.mode(); }
|
||||||
|
|
||||||
void configureWeather(PortWeatherMode mode) {
|
void configureWeather(PortWeatherMode mode) {
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -18,26 +20,49 @@ public final class PortAgeTravel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String enter(ServerPlayer player, Identifier id) {
|
public static String enter(ServerPlayer player, Identifier id) {
|
||||||
|
return enter(player, id, net.dnorberg.rivencraft.item.LinkProperties.NONE);
|
||||||
|
}
|
||||||
|
public static String enter(ServerPlayer player, Identifier id, net.dnorberg.rivencraft.item.LinkProperties properties) {
|
||||||
ServerLevel target = player.level().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
|
ServerLevel target = player.level().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
|
||||||
if (target == null) return "Age not loaded: " + id;
|
if (target == null) return "Age not loaded: " + id;
|
||||||
if (!AgeCatalogSync.ready(player, id)) {
|
if (!AgeCatalogSync.ready(player, id)) {
|
||||||
return "Age catalog not acknowledged by client; remaining in source dimension";
|
return "Age catalog not acknowledged by client; remaining in source dimension";
|
||||||
}
|
}
|
||||||
|
BlockPos landing = resolveLanding(target, player, properties);
|
||||||
|
if (landing == null) return "No safe landing available; remaining in source dimension";
|
||||||
|
boolean moved = player.teleportTo(target, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
|
||||||
|
Set.of(), player.getYRot(), player.getXRot(), true);
|
||||||
|
return moved ? null : "Teleportation failed; remaining in source dimension";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static BlockPos resolveLanding(ServerLevel target) { return resolveLanding(target, true); }
|
||||||
|
public static BlockPos resolveLanding(ServerLevel target, net.minecraft.world.entity.Entity entity,
|
||||||
|
net.dnorberg.rivencraft.item.LinkProperties properties) {
|
||||||
|
return resolveLanding(target, (ServerLevel) entity.level(), entity.blockPosition(), properties);
|
||||||
|
}
|
||||||
|
public static BlockPos resolveLanding(ServerLevel target, ServerLevel source, BlockPos departure,
|
||||||
|
net.dnorberg.rivencraft.item.LinkProperties properties) {
|
||||||
|
BlockPos landing = resolveLanding(target, !properties.has(net.dnorberg.rivencraft.item.LinkProperties.DISABLE_PLATFORM));
|
||||||
|
if (landing == null || !properties.has(net.dnorberg.rivencraft.item.LinkProperties.RELATIVE_LINK)) return landing;
|
||||||
|
return findFootedDestination(target, net.dnorberg.rivencraft.item.PortLinkDestinations.relativeOrigin(
|
||||||
|
source, target, departure)).orElse(null);
|
||||||
|
}
|
||||||
|
public static BlockPos resolveLanding(ServerLevel target, boolean generatePlatform) {
|
||||||
boolean fissure = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
|
boolean fissure = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
|
||||||
&& features.terrainFeatures() != null && features.terrainFeatures().starFissures();
|
&& features.terrainFeatures() != null && features.terrainFeatures().starFissures();
|
||||||
BlockPos landing = fissure ? PortStarFissureFeature.savedSpawn(target) : null;
|
BlockPos landing = fissure ? PortStarFissureFeature.savedSpawn(target) : null;
|
||||||
if (landing != null) landing = isCaveTerrain(target)
|
if (landing != null) landing = isCaveTerrain(target)
|
||||||
? findFootedDestination(target, landing).orElse(null)
|
? findFootedDestination(target, landing).orElse(null)
|
||||||
: findSurfaceLanding(target, landing.getX(), landing.getZ());
|
: findSurfaceLanding(target, landing.getX(), landing.getZ());
|
||||||
if (landing == null) landing = findLanding(target);
|
if (landing == null) landing = findLanding(target, generatePlatform);
|
||||||
if (landing == null) return "No safe test landing available; remaining in source dimension";
|
if (landing == null) return null;
|
||||||
if (fissure) PortStarFissureFeature.generateOnce(target, landing, isCaveTerrain(target));
|
if (fissure) PortStarFissureFeature.generateOnce(target, landing, isCaveTerrain(target));
|
||||||
boolean moved = player.teleportTo(target, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
|
if (target instanceof PortAgeLevel) PortInstabilityData.get(target.getServer()).recordSpawn(target, landing);
|
||||||
Set.of(), player.getYRot(), player.getXRot(), true);
|
return landing;
|
||||||
return moved ? null : "Teleportation failed; remaining in source dimension";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static BlockPos findLanding(ServerLevel target) {
|
static BlockPos findLanding(ServerLevel target) { return findLanding(target, true); }
|
||||||
|
static BlockPos findLanding(ServerLevel target, boolean generatePlatform) {
|
||||||
if (isCaveTerrain(target)) {
|
if (isCaveTerrain(target)) {
|
||||||
// The cave roof is not a valid arrival surface. Search down from
|
// The cave roof is not a valid arrival surface. Search down from
|
||||||
// Legacy's Y=64 start, then construct the normal safety platform
|
// Legacy's Y=64 start, then construct the normal safety platform
|
||||||
@@ -53,15 +78,19 @@ public final class PortAgeTravel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return makePlatform(target, new BlockPos(0, 64, 0));
|
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
|
||||||
return makePlatform(target, new BlockPos(0, y, 0));
|
&& 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
static BlockPos findSurfaceLanding(ServerLevel target, int originX, int originZ) {
|
static BlockPos findSurfaceLanding(ServerLevel target, int originX, int originZ) {
|
||||||
@@ -101,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
|
||||||
|
|||||||
@@ -16,12 +16,18 @@ final class PortBiomeMaterialRules {
|
|||||||
static Holder<NoiseGeneratorSettings> apply(HolderLookup.Provider registries, NoiseGeneratorSettings base) {
|
static Holder<NoiseGeneratorSettings> apply(HolderLookup.Provider registries, NoiseGeneratorSettings base) {
|
||||||
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
||||||
var rules = registries.lookupOrThrow(Registries.MATERIAL_RULE);
|
var rules = registries.lookupOrThrow(Registries.MATERIAL_RULE);
|
||||||
|
var nether = java.util.stream.Stream.concat(java.util.stream.Stream.of(Biomes.NETHER_WASTES,
|
||||||
|
Biomes.SOUL_SAND_VALLEY, Biomes.CRIMSON_FOREST, Biomes.WARPED_FOREST, Biomes.BASALT_DELTAS),
|
||||||
|
net.dnorberg.rivencraft.compat.TerraBlenderBiomes.nether(registries).stream()
|
||||||
|
.map(id -> net.minecraft.resources.ResourceKey.create(Registries.BIOME, id)))
|
||||||
|
.distinct().toList();
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
net.minecraft.resources.ResourceKey<net.minecraft.world.level.biome.Biome>[] netherKeys = nether.toArray(net.minecraft.resources.ResourceKey[]::new);
|
||||||
var materials = MaterialRules.sequence(
|
var materials = MaterialRules.sequence(
|
||||||
MaterialRules.ifTrue(MaterialRules.isBiome(biomes, Biomes.THE_END, Biomes.END_HIGHLANDS,
|
MaterialRules.ifTrue(MaterialRules.isBiome(biomes, Biomes.THE_END, Biomes.END_HIGHLANDS,
|
||||||
Biomes.END_MIDLANDS, Biomes.SMALL_END_ISLANDS, Biomes.END_BARRENS),
|
Biomes.END_MIDLANDS, Biomes.SMALL_END_ISLANDS, Biomes.END_BARRENS),
|
||||||
MaterialRules.getRule(rules, EndMaterialRules.END)),
|
MaterialRules.getRule(rules, EndMaterialRules.END)),
|
||||||
MaterialRules.ifTrue(MaterialRules.isBiome(biomes, Biomes.NETHER_WASTES, Biomes.SOUL_SAND_VALLEY,
|
MaterialRules.ifTrue(MaterialRules.isBiome(biomes, netherKeys),
|
||||||
Biomes.CRIMSON_FOREST, Biomes.WARPED_FOREST, Biomes.BASALT_DELTAS),
|
|
||||||
MaterialRules.getRule(rules, NetherMaterialRules.NETHER)),
|
MaterialRules.getRule(rules, NetherMaterialRules.NETHER)),
|
||||||
base.materialRule().value());
|
base.materialRule().value());
|
||||||
return Holder.direct(new NoiseGeneratorSettings(base.noiseSettings(), base.defaultBlock(), base.defaultFluid(),
|
return Holder.direct(new NoiseGeneratorSettings(base.noiseSettings(), base.defaultBlock(), base.defaultFluid(),
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -0,0 +1,314 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.ArrayDeque;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.writing.PortRegistryPages;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.chunk.status.ChunkStatus;
|
||||||
|
import net.neoforged.neoforge.common.Tags;
|
||||||
|
import net.neoforged.neoforge.event.level.ChunkEvent;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||||
|
|
||||||
|
/** Legacy-style excess-block profiling with gradual spawn-area generation. */
|
||||||
|
@net.neoforged.fml.common.EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class PortBlockInstability {
|
||||||
|
// Legacy's watched blocks and factor-1 values; modern ore variants share their parent weight.
|
||||||
|
// Storage blocks are deliberate extensions, including the requested diamond-block case.
|
||||||
|
private static final Map<Identifier, Double> VANILLA_WEIGHTS = weights();
|
||||||
|
private static final Map<String, Double> COMMON_MINERAL_WEIGHTS = Map.ofEntries(
|
||||||
|
Map.entry("coal", 5.0), Map.entry("sulfur", 5.0), Map.entry("sulphur", 5.0),
|
||||||
|
Map.entry("salt", 5.0), Map.entry("tin", 60.0), Map.entry("lead", 60.0),
|
||||||
|
Map.entry("aluminum", 60.0), Map.entry("aluminium", 60.0),
|
||||||
|
Map.entry("zinc", 60.0), Map.entry("copper", 60.0),
|
||||||
|
Map.entry("iron", 60.0), Map.entry("nickel", 200.0),
|
||||||
|
Map.entry("osmium", 200.0), Map.entry("silver", 200.0),
|
||||||
|
Map.entry("emerald", 200.0), Map.entry("ruby", 200.0),
|
||||||
|
Map.entry("sapphire", 200.0), Map.entry("redstone", 250.0),
|
||||||
|
Map.entry("gold", 750.0), Map.entry("uranium", 750.0),
|
||||||
|
Map.entry("platinum", 750.0), Map.entry("diamond", 4000.0),
|
||||||
|
Map.entry("iridium", 4000.0), Map.entry("netherite", 8000.0));
|
||||||
|
private static final int MAX_PENDING = 2048;
|
||||||
|
private static final int SAMPLES_PER_TICK = 4;
|
||||||
|
private static final int GENERATION_INTERVAL_TICKS = 20;
|
||||||
|
private static final List<ChunkPos> SPAWN_OFFSETS = spawnOffsets();
|
||||||
|
private static final Map<MinecraftServer, ArrayDeque<Pending>> PENDING = new java.util.WeakHashMap<>();
|
||||||
|
private static final Map<MinecraftServer, Map<Identifier, Integer>> NEXT_SPAWN_SAMPLE =
|
||||||
|
new java.util.WeakHashMap<>();
|
||||||
|
private static final Map<MinecraftServer, Integer> NEXT_TARGET = new java.util.WeakHashMap<>();
|
||||||
|
private static final Map<MinecraftServer, Boolean> GENERATION_IN_FLIGHT =
|
||||||
|
new java.util.WeakHashMap<>();
|
||||||
|
|
||||||
|
private PortBlockInstability() {}
|
||||||
|
|
||||||
|
/** Track recognized materials from installed mods without requiring any mod-specific API. */
|
||||||
|
static boolean tracked(Identifier id) {
|
||||||
|
if (VANILLA_WEIGHTS.containsKey(id)) return true;
|
||||||
|
if (id.getNamespace().equals("minecraft") || id.getNamespace().equals("rivencraft")) return false;
|
||||||
|
if (!BuiltInRegistries.BLOCK.containsKey(id)) return false;
|
||||||
|
var block = BuiltInRegistries.BLOCK.getValue(id);
|
||||||
|
return eligibleMaterial(block) && (configuredOverride(id) != null || inferredModdedWeight(id, block) > 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static double weight(Identifier id) {
|
||||||
|
Double vanilla = VANILLA_WEIGHTS.get(id);
|
||||||
|
if (vanilla != null) return vanilla;
|
||||||
|
if (id.getNamespace().equals("minecraft") || id.getNamespace().equals("rivencraft")
|
||||||
|
|| !BuiltInRegistries.BLOCK.containsKey(id)) return 0;
|
||||||
|
var block = BuiltInRegistries.BLOCK.getValue(id);
|
||||||
|
if (!eligibleMaterial(block)) return 0;
|
||||||
|
return moddedWeight(id, inferredModdedWeight(id, block),
|
||||||
|
PortInstabilityConfig.moddedMaterialOverrides());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligibleMaterial(net.minecraft.world.level.block.Block block) {
|
||||||
|
return PortRegistryPages.materialCategory(block) != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Double configuredOverride(Identifier id) {
|
||||||
|
return configuredOverride(id, PortInstabilityConfig.moddedMaterialOverrides());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Double configuredOverride(Identifier id, List<? extends String> overrides) {
|
||||||
|
for (String entry : overrides) {
|
||||||
|
int separator = entry.lastIndexOf('=');
|
||||||
|
if (separator > 0 && entry.substring(0, separator).equals(id.toString()))
|
||||||
|
return (double) Integer.parseInt(entry.substring(separator + 1));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
static double moddedWeight(Identifier id, double inferred, List<? extends String> overrides) {
|
||||||
|
Double override = configuredOverride(id, overrides);
|
||||||
|
return override == null ? inferred : override;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double inferredModdedWeight(Identifier id, net.minecraft.world.level.block.Block block) {
|
||||||
|
if ("rivencraft:fluid".equals(PortRegistryPages.materialCategory(block))) return 1.25;
|
||||||
|
var state = block.defaultBlockState();
|
||||||
|
String path = id.getPath();
|
||||||
|
boolean ore = state.is(Tags.BlockItems.ORES.block()) || path.endsWith("_ore") || path.contains("_ore_");
|
||||||
|
boolean storage = state.is(Tags.BlockItems.STORAGE_BLOCKS.block())
|
||||||
|
|| (path.endsWith("_block") || path.startsWith("block_of_"))
|
||||||
|
&& namedMineralWeight(path) != null;
|
||||||
|
return inferredModdedWeight(id, ore, storage, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static double inferredModdedWeight(Identifier id, boolean ore, boolean storage, boolean fluid) {
|
||||||
|
if (fluid) return 1.25;
|
||||||
|
Double named = namedMineralWeight(id.getPath());
|
||||||
|
if (ore) return named == null ? 60.0 : named;
|
||||||
|
if (storage) return named == null ? 120.0 : named;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Double namedMineralWeight(String path) {
|
||||||
|
for (String part : path.split("[/_]")) {
|
||||||
|
Double value = COMMON_MINERAL_WEIGHTS.get(part);
|
||||||
|
if (value != null) return value;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onChunkLoad(ChunkEvent.Load event) {
|
||||||
|
if (!(event.getLevel() instanceof ServerLevel level)
|
||||||
|
|| !(event.getChunk() instanceof LevelChunk chunk)) return;
|
||||||
|
boolean overworld = level.dimension() == net.minecraft.world.level.Level.OVERWORLD;
|
||||||
|
if (!overworld && !PortInstabilityRuntime.isAge(level)) return;
|
||||||
|
// Chunk-load callbacks can occur while chunk storage is updating. Defer saved-data
|
||||||
|
// access to a bounded server-tick lane to avoid reentering that storage path.
|
||||||
|
synchronized (PENDING) {
|
||||||
|
var queue = PENDING.computeIfAbsent(level.getServer(), ignored -> new ArrayDeque<>());
|
||||||
|
if (queue.size() < MAX_PENDING) queue.addLast(new Pending(level, chunk));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onServerTickPost(ServerTickEvent.Post event) {
|
||||||
|
for (int index = 0; index < SAMPLES_PER_TICK; index++) {
|
||||||
|
Pending pending;
|
||||||
|
synchronized (PENDING) {
|
||||||
|
var queue = PENDING.get(event.getServer());
|
||||||
|
pending = queue == null ? null : queue.pollFirst();
|
||||||
|
}
|
||||||
|
if (pending == null) break;
|
||||||
|
var pos = pending.chunk().getPos();
|
||||||
|
if (pending.level().getServer().getLevel(pending.level().dimension()) == pending.level()
|
||||||
|
&& pending.level().getChunkSource().getChunkNow(pos.x(), pos.z()) == pending.chunk())
|
||||||
|
PortBlockProfileSavedData.get(pending.level()).sample(pending.chunk());
|
||||||
|
}
|
||||||
|
if (event.getServer().getTickCount() % GENERATION_INTERVAL_TICKS == 0) {
|
||||||
|
generateNextSpawnSample(event.getServer());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onServerStopping(ServerStoppingEvent event) {
|
||||||
|
synchronized (PENDING) { PENDING.remove(event.getServer()); }
|
||||||
|
NEXT_SPAWN_SAMPLE.remove(event.getServer());
|
||||||
|
NEXT_TARGET.remove(event.getServer());
|
||||||
|
GENERATION_IN_FLIGHT.remove(event.getServer());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Generate at most one chunk per second across the active Age and its Overworld baseline. */
|
||||||
|
private static void generateNextSpawnSample(MinecraftServer server) {
|
||||||
|
if (GENERATION_IN_FLIGHT.containsKey(server)) return;
|
||||||
|
List<SampleTarget> targets = new ArrayList<>();
|
||||||
|
for (ServerLevel level : server.getAllLevels()) {
|
||||||
|
if (!PortInstabilityRuntime.isAge(level)
|
||||||
|
|| level.players().isEmpty()) continue;
|
||||||
|
var data = PortInstabilityData.get(server);
|
||||||
|
if (!data.supportsProfiling(level)) continue;
|
||||||
|
var age = data.age(level);
|
||||||
|
targets.add(new SampleTarget(level, age.spawn().orElseGet(() -> level.getRespawnData().pos()),
|
||||||
|
PortBlockProfileSavedData.MIN_AGE_SAMPLES));
|
||||||
|
}
|
||||||
|
if (targets.isEmpty()) return;
|
||||||
|
ServerLevel overworld = server.overworld();
|
||||||
|
targets.add(0, new SampleTarget(overworld, overworld.getRespawnData().pos(),
|
||||||
|
PortBlockProfileSavedData.MIN_BASELINE_SAMPLES));
|
||||||
|
int first = Math.floorMod(NEXT_TARGET.getOrDefault(server, 0), targets.size());
|
||||||
|
for (int offset = 0; offset < targets.size(); offset++) {
|
||||||
|
int index = (first + offset) % targets.size();
|
||||||
|
SampleTarget target = targets.get(index);
|
||||||
|
if (generateNextSpawnSample(target.level(), target.origin(), target.minimum(), server)) {
|
||||||
|
NEXT_TARGET.put(server, index + 1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean generateNextSpawnSample(ServerLevel level, net.minecraft.core.BlockPos origin,
|
||||||
|
int minimum, MinecraftServer server) {
|
||||||
|
PortBlockProfileSavedData profile = PortBlockProfileSavedData.get(level);
|
||||||
|
if (profile.count() >= minimum) return false;
|
||||||
|
Map<Identifier, Integer> cursors = NEXT_SPAWN_SAMPLE.computeIfAbsent(server,
|
||||||
|
ignored -> new HashMap<>());
|
||||||
|
Identifier dimension = level.dimension().identifier();
|
||||||
|
int index = cursors.getOrDefault(dimension, 0);
|
||||||
|
ChunkPos center = ChunkPos.containing(origin);
|
||||||
|
while (index < SPAWN_OFFSETS.size()) {
|
||||||
|
ChunkPos offset = SPAWN_OFFSETS.get(index++);
|
||||||
|
ChunkPos target = new ChunkPos(center.x() + offset.x(), center.z() + offset.z());
|
||||||
|
if (profile.contains(target)) continue;
|
||||||
|
cursors.put(dimension, index);
|
||||||
|
GENERATION_IN_FLIGHT.put(server, true);
|
||||||
|
// getChunkFuture blocks when called on the server thread. Its off-thread
|
||||||
|
// path schedules generation on Minecraft's chunk executor instead.
|
||||||
|
CompletableFuture.supplyAsync(() -> level.getChunkSource()
|
||||||
|
.getChunkFuture(target.x(), target.z(), ChunkStatus.FULL, true))
|
||||||
|
.thenCompose(future -> future)
|
||||||
|
.whenComplete((result, error) -> {
|
||||||
|
if (server.isStopped()) return;
|
||||||
|
server.execute(() -> {
|
||||||
|
if (GENERATION_IN_FLIGHT.remove(server) == null) return;
|
||||||
|
if (error != null) {
|
||||||
|
Rivencraft.LOGGER.warn("Could not profile chunk {} in {}", target, dimension, error);
|
||||||
|
} else if (server.getLevel(level.dimension()) == level
|
||||||
|
&& result.orElse(null) instanceof LevelChunk chunk) {
|
||||||
|
profile.sample(chunk);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ChunkPos> spawnOffsets() {
|
||||||
|
List<ChunkPos> offsets = new ArrayList<>(PortBlockProfileSavedData.MAX_SAMPLES);
|
||||||
|
offsets.add(new ChunkPos(0, 0));
|
||||||
|
for (int radius = 1; offsets.size() < PortBlockProfileSavedData.MAX_SAMPLES; radius++) {
|
||||||
|
for (int x = -radius; x <= radius; x++) {
|
||||||
|
offsets.add(new ChunkPos(x, -radius));
|
||||||
|
offsets.add(new ChunkPos(x, radius));
|
||||||
|
}
|
||||||
|
for (int z = -radius + 1; z < radius; z++) {
|
||||||
|
offsets.add(new ChunkPos(-radius, z));
|
||||||
|
offsets.add(new ChunkPos(radius, z));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return List.copyOf(offsets.subList(0, PortBlockProfileSavedData.MAX_SAMPLES));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Zero until the Age exceeds 400 samples and the baseline reaches 500. */
|
||||||
|
static int score(PortBlockProfileSavedData age, PortBlockProfileSavedData baseline) {
|
||||||
|
return score(age.totals(), age.count(), baseline.totals(), baseline.count());
|
||||||
|
}
|
||||||
|
|
||||||
|
static int score(Map<Identifier, Long> age, int ageChunks,
|
||||||
|
Map<Identifier, Long> baseline, int baselineChunks) {
|
||||||
|
if (ageChunks < PortBlockProfileSavedData.MIN_AGE_SAMPLES
|
||||||
|
|| baselineChunks < PortBlockProfileSavedData.MIN_BASELINE_SAMPLES) return 0;
|
||||||
|
double result = 0;
|
||||||
|
Set<Identifier> watched = new HashSet<>(age.keySet());
|
||||||
|
watched.addAll(baseline.keySet());
|
||||||
|
for (Identifier id : watched) {
|
||||||
|
double weight = weight(id);
|
||||||
|
if (weight <= 0) continue;
|
||||||
|
double excess = age.getOrDefault(id, 0L) / (double) ageChunks
|
||||||
|
- 1.05 * baseline.getOrDefault(id, 0L) / (double) baselineChunks;
|
||||||
|
if (excess > 0) result += excess * weight;
|
||||||
|
}
|
||||||
|
return (int) Math.min(100_000, Math.round(result));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int score(ServerLevel level) {
|
||||||
|
if (!PortInstabilityRuntime.isAge(level) || !PortInstabilityData.get(level.getServer()).supportsProfiling(level)) return 0;
|
||||||
|
return score(PortBlockProfileSavedData.get(level), PortBlockProfileSavedData.get(level.getServer().overworld()));
|
||||||
|
}
|
||||||
|
public static int sampledChunks(ServerLevel level) { return PortBlockProfileSavedData.get(level).count(); }
|
||||||
|
|
||||||
|
public static int difficultyScore(long rawScore, int difficulty) {
|
||||||
|
double multiplier = switch (difficulty) {
|
||||||
|
case 0 -> 0.25;
|
||||||
|
case 1 -> 0.5;
|
||||||
|
case 2 -> 1.0;
|
||||||
|
case 3 -> 1.75;
|
||||||
|
default -> throw new IllegalArgumentException("Unknown instability difficulty " + difficulty);
|
||||||
|
};
|
||||||
|
return (int) Math.min(Integer.MAX_VALUE, Math.max(0, rawScore * multiplier));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<Identifier, Double> weights() {
|
||||||
|
Map<Identifier, Double> values = new HashMap<>();
|
||||||
|
add(values, 5, "coal_ore", "deepslate_coal_ore", "lapis_ore", "deepslate_lapis_ore");
|
||||||
|
add(values, 60, "iron_ore", "deepslate_iron_ore");
|
||||||
|
add(values, 200, "emerald_ore", "deepslate_emerald_ore");
|
||||||
|
add(values, 250, "redstone_ore", "deepslate_redstone_ore");
|
||||||
|
add(values, 750, "gold_ore", "deepslate_gold_ore");
|
||||||
|
add(values, 4000, "diamond_ore", "deepslate_diamond_ore", "diamond_block");
|
||||||
|
add(values, 20, "nether_quartz_ore");
|
||||||
|
add(values, 50, "glowstone");
|
||||||
|
values.put(Identifier.parse("rivencraft:crystal_block"), 20.0);
|
||||||
|
// Valuable blocks introduced after Legacy, and storage forms authorable in Rivencraft.
|
||||||
|
add(values, 200, "emerald_block");
|
||||||
|
add(values, 750, "gold_block", "raw_gold_block");
|
||||||
|
add(values, 4000, "ancient_debris");
|
||||||
|
add(values, 60, "iron_block", "raw_iron_block");
|
||||||
|
add(values, 8000, "netherite_block");
|
||||||
|
return Map.copyOf(values);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void add(Map<Identifier, Double> values, int weight, String... paths) {
|
||||||
|
for (String path : paths) values.put(Identifier.withDefaultNamespace(path), (double) weight);
|
||||||
|
}
|
||||||
|
|
||||||
|
private record Pending(ServerLevel level, LevelChunk chunk) {}
|
||||||
|
|
||||||
|
private record SampleTarget(ServerLevel level, net.minecraft.core.BlockPos origin, int minimum) {}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Persistent generated-chunk snapshots. Each chunk is counted once, up to the 1.21.1 cap. */
|
||||||
|
final class PortBlockProfileSavedData extends SavedData {
|
||||||
|
static final int MIN_AGE_SAMPLES = 401, MIN_BASELINE_SAMPLES = 500, MAX_SAMPLES = 1024;
|
||||||
|
private static final int VERSION = 2;
|
||||||
|
private record Sample(long chunk, Map<Identifier, Integer> counts) {
|
||||||
|
private static final Codec<Sample> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
Codec.LONG.fieldOf("chunk").forGetter(Sample::chunk),
|
||||||
|
Codec.unboundedMap(Identifier.CODEC, Codec.intRange(1, Integer.MAX_VALUE))
|
||||||
|
.fieldOf("blocks").forGetter(Sample::counts)
|
||||||
|
).apply(instance, Sample::new));
|
||||||
|
}
|
||||||
|
private static final Codec<PortBlockProfileSavedData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
Codec.INT.fieldOf("version").forGetter(data -> VERSION),
|
||||||
|
Sample.CODEC.listOf(0, MAX_SAMPLES).fieldOf("samples").forGetter(data -> data.samples.entrySet().stream()
|
||||||
|
.map(entry -> new Sample(entry.getKey(), entry.getValue())).toList())
|
||||||
|
).apply(instance, PortBlockProfileSavedData::new));
|
||||||
|
private static final SavedDataType<PortBlockProfileSavedData> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "block_profile"),
|
||||||
|
() -> new PortBlockProfileSavedData(VERSION, List.of()), CODEC);
|
||||||
|
private final Map<Long, Map<Identifier, Integer>> samples = new HashMap<>();
|
||||||
|
private final Map<Identifier, Long> totals = new HashMap<>();
|
||||||
|
private PortBlockProfileSavedData(int version, List<Sample> values) {
|
||||||
|
if (version == VERSION) for (var value : values) put(value.chunk(), value.counts());
|
||||||
|
}
|
||||||
|
static PortBlockProfileSavedData get(ServerLevel level) { return level.getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
int count() { return samples.size(); }
|
||||||
|
boolean contains(ChunkPos pos) { return samples.containsKey(pos.pack()); }
|
||||||
|
Map<Identifier, Long> totals() { return Map.copyOf(totals); }
|
||||||
|
boolean sample(LevelChunk chunk) {
|
||||||
|
if (count() >= MAX_SAMPLES || contains(chunk.getPos())) return false;
|
||||||
|
Map<Identifier, Integer> counts = new HashMap<>();
|
||||||
|
for (var section : chunk.getSections()) {
|
||||||
|
if (section.hasOnlyAir()) continue;
|
||||||
|
section.getStates().count((state, amount) -> {
|
||||||
|
Identifier id = BuiltInRegistries.BLOCK.getKey(state.getBlock());
|
||||||
|
if (PortBlockInstability.tracked(id)) counts.merge(id, amount, Integer::sum);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
put(chunk.getPos().pack(), counts);
|
||||||
|
setDirty();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
private void put(long pos, Map<Identifier, Integer> counts) {
|
||||||
|
if (count() >= MAX_SAMPLES || samples.containsKey(pos)) return;
|
||||||
|
samples.put(pos, Map.copyOf(counts));
|
||||||
|
counts.forEach((id, amount) -> totals.merge(id, amount.longValue(), Long::sum));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -127,19 +127,15 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean validWriting(List<Identifier> pages) {
|
public static boolean validWriting(List<Identifier> pages) {
|
||||||
int periods = 0, phases = 0, directions = 0, angles = 0, sizes = 0, suns = 0, moons = 0;
|
int suns = 0, moons = 0;
|
||||||
for (Identifier page : pages) {
|
for (Identifier page : pages) if (isController(page)) {
|
||||||
if (isPeriod(page) && ++periods > 1 || isPhase(page) && ++phases > 1
|
if (!page.getPath().equals("celestial/moon")) suns++;
|
||||||
|| isDirection(page) && ++directions > 1 || isAngle(page) && ++angles > 1
|
if (!page.getPath().equals("celestial/sun")) moons++;
|
||||||
|| isSize(page) && ++sizes > 1) return false;
|
if (suns > 10 || moons > 10) return false;
|
||||||
if (isController(page)) {
|
|
||||||
if (!page.getPath().equals("celestial/moon")) suns++;
|
|
||||||
if (!page.getPath().equals("celestial/sun")) moons++;
|
|
||||||
if (suns > 10 || moons > 10) return false;
|
|
||||||
periods = phases = directions = angles = sizes = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return periods + phases + directions + angles + sizes == 0;
|
// Repeated modifiers overwrite the pending value. Unconsumed modifiers
|
||||||
|
// earn grammar instability, but never affect an earlier body.
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PortDayCycle compile(List<Identifier> pages, long seed) {
|
public static PortDayCycle compile(List<Identifier> pages, long seed) {
|
||||||
@@ -148,15 +144,20 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
|
|||||||
|
|
||||||
/** Creation-only completion. Exact diagnostic fixtures can still use compile. */
|
/** Creation-only completion. Exact diagnostic fixtures can still use compile. */
|
||||||
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks) {
|
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks) {
|
||||||
if (!validWriting(pages) || !PortAgeColors.validNumbers(pages))
|
return resolve(pages, seed, nativeTicks, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
throw new IllegalArgumentException("Invalid celestial modifier order");
|
}
|
||||||
|
|
||||||
|
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks, PortRandomPagePolicy policy) {
|
||||||
|
if (!validWriting(pages))
|
||||||
|
throw new IllegalArgumentException("An Age may have at most ten suns and ten moons");
|
||||||
if (pages.stream().anyMatch(PortDayCycle::isController)) return compile(pages, seed, nativeTicks);
|
if (pages.stream().anyMatch(PortDayCycle::isController)) return compile(pages, seed, nativeTicks);
|
||||||
// Match root AgeSkyProfile.random's count draw positions: sky style,
|
// Match root AgeSkyProfile.random's count draw positions: sky style,
|
||||||
// mixed sky color, then independent 0..3 sun and moon counts.
|
// mixed sky color, then independent 0..3 sun and moon counts.
|
||||||
var random = new Random(seed ^ 0x534B5950524F464CL);
|
var random = new Random(seed ^ 0x534B5950524F464CL);
|
||||||
random.nextInt(5);
|
random.nextInt(5);
|
||||||
randomColor(random);
|
randomColor(random);
|
||||||
int suns = random.nextInt(4), moons = random.nextInt(4);
|
int suns = policy.allows(Identifier.parse("rivencraft:celestial/sun")) ? random.nextInt(4) : 0;
|
||||||
|
int moons = policy.allows(Identifier.parse("rivencraft:celestial/moon")) ? random.nextInt(4) : 0;
|
||||||
var bodies = new java.util.ArrayList<PortCelestialBody>();
|
var bodies = new java.util.ArrayList<PortCelestialBody>();
|
||||||
for (int i = 0; i < suns + moons; i++)
|
for (int i = 0; i < suns + moons; i++)
|
||||||
bodies.addAll(randomUnmodified(seed, i, nativeTicks, i < suns ? SUN : MOON).bodies);
|
bodies.addAll(randomUnmodified(seed, i, nativeTicks, i < suns ? SUN : MOON).bodies);
|
||||||
@@ -167,7 +168,7 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static PortDayCycle compile(List<Identifier> pages, long seed, long nativeTicks) {
|
public static PortDayCycle compile(List<Identifier> pages, long seed, long nativeTicks) {
|
||||||
if (!validWriting(pages)) throw new IllegalArgumentException("Place at most one of each celestial modifier before its controller; limit ten suns and ten moons");
|
if (!validWriting(pages)) throw new IllegalArgumentException("An Age may have at most ten suns and ten moons");
|
||||||
if (pages.stream().filter(PortDayCycle::isController).count() <= 1)
|
if (pages.stream().filter(PortDayCycle::isController).count() <= 1)
|
||||||
return compileOne(pages, seed, nativeTicks, 0);
|
return compileOne(pages, seed, nativeTicks, 0);
|
||||||
var bodies = new java.util.ArrayList<PortCelestialBody>();
|
var bodies = new java.util.ArrayList<PortCelestialBody>();
|
||||||
@@ -190,8 +191,13 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static PortDayCycle compileOne(List<Identifier> pages, long seed, long nativeTicks, int ordinal) {
|
private static PortDayCycle compileOne(List<Identifier> pages, long seed, long nativeTicks, int ordinal) {
|
||||||
var controller = pages.stream().filter(PortDayCycle::isController).findFirst().orElse(null);
|
int controllerIndex = -1;
|
||||||
if (controller == null) return NATIVE;
|
for (int i = 0; i < pages.size(); i++) if (isController(pages.get(i))) { controllerIndex = i; break; }
|
||||||
|
// Only preceding modifiers belong to this controller. In particular, a
|
||||||
|
// trailing dangling modifier must not rewrite the single-body fast path.
|
||||||
|
if (controllerIndex < 0) return NATIVE;
|
||||||
|
pages = pages.subList(0, controllerIndex + 1);
|
||||||
|
var controller = pages.getLast();
|
||||||
int mode = controller.getPath().equals("celestial/sun") ? SUN
|
int mode = controller.getPath().equals("celestial/sun") ? SUN
|
||||||
: controller.getPath().equals("celestial/moon") ? MOON : PAIRED;
|
: controller.getPath().equals("celestial/moon") ? MOON : PAIRED;
|
||||||
if (mode != PAIRED && !hasBodyModifiers(pages)) return randomUnmodified(seed, ordinal, nativeTicks, mode);
|
if (mode != PAIRED && !hasBodyModifiers(pages)) return randomUnmodified(seed, ordinal, nativeTicks, mode);
|
||||||
@@ -308,6 +314,8 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
|
|||||||
net.minecraft.core.registries.Registries.WORLD_CLOCK).getOrThrow(WorldClocks.OVERWORLD)).totalTicks();
|
net.minecraft.core.registries.Registries.WORLD_CLOCK).getOrThrow(WorldClocks.OVERWORLD)).totalTicks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static PortDayCycle forClient(Identifier id) { return clientCycles.getOrDefault(id, NATIVE); }
|
||||||
|
|
||||||
public static void updateClient(Map<Identifier, PortDayCycle> cycles) { clientCycles = Map.copyOf(cycles); }
|
public static void updateClient(Map<Identifier, PortDayCycle> cycles) { clientCycles = Map.copyOf(cycles); }
|
||||||
public static PortDayCycle forLevel(Level level) {
|
public static PortDayCycle forLevel(Level level) {
|
||||||
if (level instanceof PortAgeLevel age) return age.dayCycle();
|
if (level instanceof PortAgeLevel age) return age.dayCycle();
|
||||||
|
|||||||
@@ -0,0 +1,202 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.DecayBlock;
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.tags.BlockTags;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.neoforged.neoforge.common.NeoForge;
|
||||||
|
import net.neoforged.neoforge.common.util.BlockSnapshot;
|
||||||
|
import net.neoforged.neoforge.common.util.FakePlayerFactory;
|
||||||
|
import net.neoforged.neoforge.event.level.BlockEvent;
|
||||||
|
|
||||||
|
/** Bounded, per-Age decay seeding and six-direction Legacy-style spreading. */
|
||||||
|
public final class PortDecayProviders {
|
||||||
|
public static final TagKey<Block> PROTECTED = TagKey.create(Registries.BLOCK,
|
||||||
|
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "decay_protected"));
|
||||||
|
private static final Map<Identifier, DecayBlock.Color> COLORS = Map.of(
|
||||||
|
id("decayblue"), DecayBlock.Color.BLUE,
|
||||||
|
id("decaypurple"), DecayBlock.Color.PURPLE,
|
||||||
|
id("decayred"), DecayBlock.Color.RED,
|
||||||
|
id("decaywhite"), DecayBlock.Color.WHITE);
|
||||||
|
private static final Direction[] DIRECTIONS = Direction.values();
|
||||||
|
|
||||||
|
private PortDecayProviders() {}
|
||||||
|
|
||||||
|
public static void register() {
|
||||||
|
COLORS.keySet().forEach(id -> PortInstabilityRuntime.register(id, true, PortDecayProviders::apply));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Operator test hook; never changes the Age's saved instability score or provider plan. */
|
||||||
|
public static int pulseForTesting(ServerPlayer player, DecayBlock.Color color, int count) {
|
||||||
|
ServerLevel level = player.level();
|
||||||
|
if (!PortInstabilityConfig.decayEnabled() || !PortInstabilityConfig.instabilityWorldMutation()
|
||||||
|
|| !PortInstabilityRuntime.isAge(level)
|
||||||
|
|| level.getChunkSource().getChunkNow(player.chunkPosition().x(), player.chunkPosition().z()) == null) return -1;
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
Identifier id = id("decay" + color.getSerializedName());
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !age.enabled()
|
||||||
|
|| !PortInstabilityConfig.instabilityProviderEnabled(id)) return -1;
|
||||||
|
int changed = 0;
|
||||||
|
for (int i = 0; i < Math.min(count, 32); i++) {
|
||||||
|
PortInstabilityRuntime.Budget budget = new PortInstabilityRuntime.Budget(1);
|
||||||
|
apply(new PortInstabilityRuntime.Context(level, age, List.of(player.chunkPosition()),
|
||||||
|
level.getServer().getTickCount(), budget), id, 1);
|
||||||
|
changed += budget.applied();
|
||||||
|
}
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void apply(PortInstabilityRuntime.Context context, Identifier id, int level) {
|
||||||
|
if (!PortInstabilityConfig.decayEnabled() || !PortInstabilityConfig.instabilityWorldMutation()
|
||||||
|
|| !PortInstabilityRuntime.isAge(context.level())
|
||||||
|
|| context.loadedChunks().isEmpty()) return;
|
||||||
|
DecayBlock.Color color = COLORS.get(id);
|
||||||
|
if (color == null) return;
|
||||||
|
PortDecaySavedData data = PortDecaySavedData.get(context.level());
|
||||||
|
Random random = new Random(context.age().seed() ^ data.nextAttempt() * 0x9E3779B97F4A7C15L
|
||||||
|
^ id.hashCode());
|
||||||
|
List<BlockPos> frontier = data.frontier(color);
|
||||||
|
BlockPos source = selectLoadedSource(context.level(), context.loadedChunks(), frontier, random);
|
||||||
|
if (source == null) {
|
||||||
|
seed(context, color, data, random);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
BlockState sourceState = context.level().getBlockState(source);
|
||||||
|
if (!sourceState.is(Rivencraft.DECAY.get()) || sourceState.getValue(DecayBlock.COLOR) != color) {
|
||||||
|
data.remove(color, source);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (int attempt = 0; attempt < PortInstabilityConfig.decayMaxAttempts(); attempt++) {
|
||||||
|
BlockPos target = source.relative(DIRECTIONS[random.nextInt(DIRECTIONS.length)]);
|
||||||
|
if (!isLoadedTarget(context.level(), context.loadedChunks(), target)
|
||||||
|
|| isSpawnProtected(context.age(), target)) continue;
|
||||||
|
BlockState prior = context.level().getBlockState(target);
|
||||||
|
if (!canReplace(context.level(), target, prior, color)) continue;
|
||||||
|
int difficulty = conversionDifficulty(context.level(), target, prior, color);
|
||||||
|
if (random.nextInt(difficulty) != 0) continue;
|
||||||
|
if (replace(context, target, prior, color)) data.add(color, target);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void seed(PortInstabilityRuntime.Context context, DecayBlock.Color color,
|
||||||
|
PortDecaySavedData data, Random random) {
|
||||||
|
ChunkPos chunk = context.loadedChunks().get(random.nextInt(context.loadedChunks().size()));
|
||||||
|
int x = chunk.getMinBlockX() + random.nextInt(16);
|
||||||
|
int z = chunk.getMinBlockZ() + random.nextInt(16);
|
||||||
|
BlockPos pos = new BlockPos(x,
|
||||||
|
context.level().getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z) - 1, z);
|
||||||
|
if (!isLoadedTarget(context.level(), context.loadedChunks(), pos)
|
||||||
|
|| isSpawnProtected(context.age(), pos)) return;
|
||||||
|
BlockState prior = context.level().getBlockState(pos);
|
||||||
|
if (canReplace(context.level(), pos, prior, color) && replace(context, pos, prior, color)) {
|
||||||
|
data.add(color, pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static BlockPos selectLoadedSource(ServerLevel level, List<ChunkPos> chunks,
|
||||||
|
List<BlockPos> frontier, Random random) {
|
||||||
|
if (frontier.isEmpty()) return null;
|
||||||
|
int start = random.nextInt(frontier.size());
|
||||||
|
for (int i = 0; i < Math.min(frontier.size(), 16); i++) {
|
||||||
|
BlockPos pos = frontier.get((start + i) % frontier.size());
|
||||||
|
if (isLoadedTarget(level, chunks, pos)) return pos;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean isLoadedTarget(ServerLevel level, List<ChunkPos> chunks, BlockPos pos) {
|
||||||
|
return level.isInWorldBounds(pos) && level.getChunkSource().getChunkNow(pos.getX() >> 4, pos.getZ() >> 4) != null
|
||||||
|
&& chunks.contains(ChunkPos.containing(pos));
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean isSpawnProtected(PortInstabilityData.Age age, BlockPos pos) {
|
||||||
|
BlockPos spawn = age.spawn().orElse(null);
|
||||||
|
return spawn != null && Math.abs(pos.getX() - spawn.getX()) <= 4
|
||||||
|
&& Math.abs(pos.getZ() - spawn.getZ()) <= 4
|
||||||
|
&& pos.getY() >= spawn.getY() - 2 && pos.getY() <= spawn.getY() + 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean canReplace(ServerLevel level, BlockPos pos, BlockState prior, DecayBlock.Color color) {
|
||||||
|
if (!PortInstabilityRuntime.isAge(level)
|
||||||
|
|| !level.isInWorldBounds(pos) || level.getChunkSource().getChunkNow(pos.getX() >> 4, pos.getZ() >> 4) == null
|
||||||
|
|| prior.is(PROTECTED) || prior.is(BlockTags.PORTALS)
|
||||||
|
|| prior.hasBlockEntity() || level.getBlockEntity(pos) != null
|
||||||
|
|| prior.getDestroySpeed(level, pos) < 0 || !prior.getFluidState().isEmpty()
|
||||||
|
|| isCritical(prior)) return false;
|
||||||
|
return !prior.is(Rivencraft.DECAY.get()) || prior.getValue(DecayBlock.COLOR) != color;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isCritical(BlockState prior) {
|
||||||
|
return prior.is(Blocks.BEDROCK) || prior.is(Blocks.BARRIER)
|
||||||
|
|| prior.is(Blocks.END_PORTAL) || prior.is(Blocks.END_PORTAL_FRAME)
|
||||||
|
|| prior.is(Blocks.END_GATEWAY) || prior.is(Blocks.NETHER_PORTAL)
|
||||||
|
|| prior.is(Blocks.COMMAND_BLOCK) || prior.is(Blocks.CHAIN_COMMAND_BLOCK)
|
||||||
|
|| prior.is(Blocks.REPEATING_COMMAND_BLOCK) || prior.is(Blocks.STRUCTURE_BLOCK)
|
||||||
|
|| prior.is(Blocks.JIGSAW) || prior.is(Blocks.LIGHT)
|
||||||
|
|| prior.is(Blocks.REINFORCED_DEEPSLATE)
|
||||||
|
|| prior.getBlock() != Rivencraft.DECAY.get()
|
||||||
|
&& net.minecraft.core.registries.BuiltInRegistries.BLOCK.getKey(prior.getBlock())
|
||||||
|
.getNamespace().equals(Rivencraft.MOD_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int conversionDifficulty(ServerLevel level, BlockPos pos, BlockState state, DecayBlock.Color color) {
|
||||||
|
if (state.isAir()) return switch (color) {
|
||||||
|
case BLUE, RED -> 20;
|
||||||
|
case PURPLE -> 8;
|
||||||
|
case WHITE -> 50;
|
||||||
|
};
|
||||||
|
if (state.is(Rivencraft.DECAY.get())) return color == DecayBlock.Color.WHITE ? 1 : 5;
|
||||||
|
float hardness = Math.min(1000.0F, Math.max(0.0F, state.getDestroySpeed(level, pos)));
|
||||||
|
return switch (color) {
|
||||||
|
case BLUE -> Math.max(1, (int) hardness * 2);
|
||||||
|
case RED -> Math.max(1, (int) hardness);
|
||||||
|
case PURPLE -> Math.max(1, ((int) hardness + 1) * 10);
|
||||||
|
case WHITE -> 1;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean replace(PortInstabilityRuntime.Context context, BlockPos pos, BlockState prior,
|
||||||
|
DecayBlock.Color color) {
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
// A fake player gives claim/protection listeners the Age and exact block position.
|
||||||
|
var actor = FakePlayerFactory.getMinecraft(level);
|
||||||
|
actor.setPos(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
|
if (!prior.isAir()) {
|
||||||
|
var breakEvent = new net.neoforged.neoforge.event.level.block.BreakBlockEvent(level, pos, prior, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(breakEvent);
|
||||||
|
if (breakEvent.isCanceled()) return false;
|
||||||
|
}
|
||||||
|
if (level.getBlockState(pos) != prior || !context.budget().claim()) return false;
|
||||||
|
var snapshot = BlockSnapshot.create(level.dimension(), level, pos);
|
||||||
|
BlockState decay = Rivencraft.DECAY.get().defaultBlockState().setValue(DecayBlock.COLOR, color);
|
||||||
|
if (!level.setBlock(pos, decay, 3)) return false;
|
||||||
|
var placeEvent = new BlockEvent.EntityPlaceEvent(snapshot, prior, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(placeEvent);
|
||||||
|
if (placeEvent.isCanceled()) {
|
||||||
|
snapshot.restore();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
context.budget().recordApplied();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Identifier id(String path) {
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.EnumMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import net.dnorberg.rivencraft.block.DecayBlock;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.StringRepresentable;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Persisted per-Age frontier and attempt sequence, bounded to 1,024 positions per color. */
|
||||||
|
public final class PortDecaySavedData extends SavedData {
|
||||||
|
private static final int MAX_FRONTIER_PER_COLOR = 1024;
|
||||||
|
private static final Codec<PortDecaySavedData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
net.minecraft.util.ExtraCodecs.NON_NEGATIVE_LONG.optionalFieldOf("attempts", 0L).forGetter(data -> data.attempts),
|
||||||
|
Codec.unboundedMap(StringRepresentable.fromEnum(DecayBlock.Color::values),
|
||||||
|
BlockPos.CODEC.listOf(0, MAX_FRONTIER_PER_COLOR)).fieldOf("frontiers").forGetter(data -> data.frontiers)
|
||||||
|
).apply(instance, PortDecaySavedData::new));
|
||||||
|
private static final SavedDataType<PortDecaySavedData> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "decay"), () -> new PortDecaySavedData(0, Map.of()), CODEC);
|
||||||
|
private final EnumMap<DecayBlock.Color, List<BlockPos>> frontiers = new EnumMap<>(DecayBlock.Color.class);
|
||||||
|
private long attempts;
|
||||||
|
private PortDecaySavedData(long attempts, Map<DecayBlock.Color, List<BlockPos>> positions) {
|
||||||
|
this.attempts = attempts;
|
||||||
|
for (var color : DecayBlock.Color.values()) frontiers.put(color,
|
||||||
|
new ArrayList<>(positions.getOrDefault(color, List.of()).stream().distinct().map(BlockPos::immutable).toList()));
|
||||||
|
}
|
||||||
|
public static PortDecaySavedData get(ServerLevel level) { return level.getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
public long nextAttempt() { setDirty(); return attempts++; }
|
||||||
|
public List<BlockPos> frontier(DecayBlock.Color color) { return frontiers.get(color); }
|
||||||
|
public void add(DecayBlock.Color color, BlockPos pos) {
|
||||||
|
var frontier = frontiers.get(color);
|
||||||
|
if (frontier.contains(pos)) return;
|
||||||
|
if (frontier.size() >= MAX_FRONTIER_PER_COLOR) frontier.removeFirst();
|
||||||
|
frontier.add(pos.immutable()); setDirty();
|
||||||
|
}
|
||||||
|
public void remove(DecayBlock.Color color, BlockPos pos) { if (frontiers.get(color).remove(pos)) setDirty(); }
|
||||||
|
}
|
||||||
+18
-12
@@ -1,6 +1,5 @@
|
|||||||
package net.dnorberg.rivencraft.age;
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import net.minecraft.resources.Identifier;
|
import net.minecraft.resources.Identifier;
|
||||||
@@ -8,21 +7,28 @@ import net.minecraft.resources.Identifier;
|
|||||||
/** Seed-completes missing environment controllers once, before an Age is saved. */
|
/** Seed-completes missing environment controllers once, before an Age is saved. */
|
||||||
public record PortEnvironmentSelection(PortWeatherMode weather, PortLighting lighting, PortSkyStyle sky) {
|
public record PortEnvironmentSelection(PortWeatherMode weather, PortLighting lighting, PortSkyStyle sky) {
|
||||||
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain) {
|
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain) {
|
||||||
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull)
|
return resolve(pages, seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values()));
|
|
||||||
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
|
|
||||||
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
|
|
||||||
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values()));
|
|
||||||
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T> T rankedDefault(Random random, T[] choices) {
|
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain,
|
||||||
|
PortRandomPagePolicy policy) {
|
||||||
|
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull)
|
||||||
|
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values(), "lighting", policy));
|
||||||
|
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
|
||||||
|
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
|
||||||
|
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values(), "weather", policy));
|
||||||
|
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed, policy));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static <T extends Enum<T>> T rankedDefault(Random random, T[] choices, String category, PortRandomPagePolicy policy) {
|
||||||
// LegacyRankChoice: the first (Normal) option is rank 1, the rest rank 2.
|
// LegacyRankChoice: the first (Normal) option is rank 1, the rest rank 2.
|
||||||
// Its rank-1 weight is the complete rare group plus one. Derive this
|
// Its rank-1 weight is the complete rare group plus one. Derive this
|
||||||
// from the supported pool, rather than selecting unported weather.
|
// from the supported pool, rather than selecting unported weather.
|
||||||
int[] weights = new int[choices.length];
|
var options = new java.util.ArrayList<PortRankedChoice.Option<T>>();
|
||||||
Arrays.fill(weights, 1);
|
for (int i = 0; i < choices.length; i++)
|
||||||
weights[0] = choices.length;
|
options.add(new PortRankedChoice.Option<>(choices[i], i == 0 ? 1 : 2));
|
||||||
return PortRandomAgeSelection.weighted(random, List.of(choices), weights);
|
return PortRankedChoice.choose(random, policy.required(options,
|
||||||
|
option -> PortRandomPagePolicy.page(category, option.value()),
|
||||||
|
new PortRankedChoice.Option<>(choices[0], 1)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+178
@@ -0,0 +1,178 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.DecayBlock;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.entity.EntityTypeTest;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.neoforged.neoforge.common.NeoForge;
|
||||||
|
import net.neoforged.neoforge.common.util.BlockSnapshot;
|
||||||
|
import net.neoforged.neoforge.common.util.FakePlayerFactory;
|
||||||
|
import net.neoforged.neoforge.event.level.BlockEvent;
|
||||||
|
|
||||||
|
/** Active Legacy burning and the 1.21.1 test-enabled erosion policy. */
|
||||||
|
public final class PortEnvironmentalProviders {
|
||||||
|
public static final Identifier BURNING = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "burning");
|
||||||
|
public static final Identifier EROSION = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "erosion");
|
||||||
|
private static final Direction[] FLUID_SIDES = {
|
||||||
|
Direction.UP, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST
|
||||||
|
};
|
||||||
|
private PortEnvironmentalProviders() {}
|
||||||
|
public static void register() {
|
||||||
|
PortInstabilityRuntime.register(BURNING, false, (context, id, level) -> {
|
||||||
|
if (PortInstabilityRuntime.isAge(context.level()) && !context.loadedChunks().isEmpty()) scorch(context, level);
|
||||||
|
});
|
||||||
|
PortInstabilityRuntime.register(EROSION, true, (context, id, level) -> {
|
||||||
|
if (PortInstabilityRuntime.isAge(context.level()) && !context.loadedChunks().isEmpty()) erode(context);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
public static boolean isEnvironmental(Identifier id) { return id.equals(BURNING) || id.equals(EROSION); }
|
||||||
|
static void tickPlanned(ServerLevel level, PortInstabilityData.Age age, long tick,
|
||||||
|
List<PortInstabilityPlan.ProviderLevel> providers) {
|
||||||
|
var cards = providers.stream().filter(card -> isEnvironmental(card.id())).toList();
|
||||||
|
boolean erosion = PortInstabilityConfig.erosionEnabled() && PortInstabilityRuntime.effectiveScore(level)
|
||||||
|
>= InstabilityProviderCatalog.Deck.DESTRUCTIVE.entryCost();
|
||||||
|
if (cards.isEmpty() && !erosion) return;
|
||||||
|
var chunks = PortHazardProviders.loadedChunksNearPlayers(level, PortInstabilityConfig.hazardsMaxChunks());
|
||||||
|
if (chunks.isEmpty()) return;
|
||||||
|
for (var card : cards) {
|
||||||
|
int budget = card.id().equals(BURNING) ? PortInstabilityConfig.scorchMaxTargets() : 1;
|
||||||
|
PortInstabilityRuntime.invoke(new PortInstabilityRuntime.Context(level, age, chunks, tick,
|
||||||
|
new PortInstabilityRuntime.Budget(budget)), card.id(), card.level());
|
||||||
|
}
|
||||||
|
if (erosion && cards.stream().noneMatch(card -> card.id().equals(EROSION)))
|
||||||
|
PortInstabilityRuntime.invoke(new PortInstabilityRuntime.Context(level, age, chunks, tick,
|
||||||
|
new PortInstabilityRuntime.Budget(1)), EROSION, 1);
|
||||||
|
}
|
||||||
|
/** Skips random burning selection or looks at one erosion target, preserving policy. */
|
||||||
|
public static int pulseForTesting(ServerPlayer player, String effect) {
|
||||||
|
ServerLevel level = player.level();
|
||||||
|
if (!PortInstabilityRuntime.isAge(level)) return -1;
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
Identifier id = effect.equals("burning") ? BURNING : EROSION;
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !age.enabled()
|
||||||
|
|| !PortInstabilityConfig.instabilityProviderEnabled(id)) return 0;
|
||||||
|
var chunks = PortHazardProviders.loadedChunksNearPlayers(level, 16);
|
||||||
|
if (chunks.isEmpty()) return 0;
|
||||||
|
var context = new PortInstabilityRuntime.Context(level, age, chunks,
|
||||||
|
level.getServer().getTickCount(), new PortInstabilityRuntime.Budget(1));
|
||||||
|
if (effect.equals("burning")) {
|
||||||
|
if (!PortInstabilityConfig.scorchEnabled() || !PortInstabilityConfig.scorchPlayers()
|
||||||
|
|| !eligibleScorch(context, player)) return 0;
|
||||||
|
if (player.isInWaterOrRain()) return -2;
|
||||||
|
player.igniteForSeconds(4);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (!effect.equals("erosion") || !PortInstabilityConfig.erosionEnabled() || !PortHazardProviders.canMutate(level)
|
||||||
|
|| PortInstabilityRuntime.effectiveScore(level) < InstabilityProviderCatalog.Deck.DESTRUCTIVE.entryCost()
|
||||||
|
|| !(player.pick(6.0, 0.0F, false) instanceof BlockHitResult hit)
|
||||||
|
|| hit.getType() != net.minecraft.world.phys.HitResult.Type.BLOCK) return 0;
|
||||||
|
return erodeAt(context, hit.getBlockPos()) ? 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void scorch(PortInstabilityRuntime.Context context, int effectiveLevel) {
|
||||||
|
if (!PortInstabilityConfig.scorchEnabled() || PortInstabilityConfig.scorchMaxTargets() == 0) return;
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
Random random = new Random(context.age().seed() ^ PortHazardSavedData.get(level).nextAttempt()
|
||||||
|
* 0x9E3779B97F4A7C15L ^ BURNING.hashCode());
|
||||||
|
int start = random.nextInt(context.loadedChunks().size());
|
||||||
|
int affected = 0;
|
||||||
|
for (int offset = 0; offset < Math.min(8, context.loadedChunks().size()); offset++) {
|
||||||
|
ChunkPos chunk = context.loadedChunks().get((start + offset) % context.loadedChunks().size());
|
||||||
|
AABB bounds = new AABB(chunk.getMinBlockX(), level.getMinY(), chunk.getMinBlockZ(),
|
||||||
|
chunk.getMaxBlockX() + 1, level.getMaxY(), chunk.getMaxBlockZ() + 1);
|
||||||
|
List<LivingEntity> candidates = new ArrayList<>();
|
||||||
|
level.getEntities(EntityTypeTest.forClass(LivingEntity.class), bounds,
|
||||||
|
entity -> eligibleScorch(context, entity), candidates, 8);
|
||||||
|
candidates.sort(Comparator.comparing(Entity::getUUID));
|
||||||
|
for (LivingEntity entity : candidates) {
|
||||||
|
if (affected >= PortInstabilityConfig.scorchMaxTargets() || context.budget().remaining() == 0) return;
|
||||||
|
// Legacy sampled each chunk each tick with a 1/10 gate. With 20 ticks/pass this
|
||||||
|
// gives at least one opportunity for nearly every inspected loaded chunk.
|
||||||
|
if (random.nextDouble() >= PortHazardProviders.legacyChance(1,
|
||||||
|
PortInstabilityConfig.instabilityCooldown(), 1, 10)) continue;
|
||||||
|
if (!context.budget().claim()) return;
|
||||||
|
entity.igniteForSeconds(Math.min(12, 4 * effectiveLevel));
|
||||||
|
context.budget().recordApplied();
|
||||||
|
affected++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligibleScorch(PortInstabilityRuntime.Context context, LivingEntity entity) {
|
||||||
|
if (!entity.isAlive() || entity.isRemoved() || entity.level() != context.level()
|
||||||
|
|| !context.level().canSeeSky(entity.blockPosition())
|
||||||
|
|| PortDecayProviders.isSpawnProtected(context.age(), entity.blockPosition())) return false;
|
||||||
|
if (entity instanceof Player player) return PortInstabilityConfig.scorchPlayers()
|
||||||
|
&& !player.isCreative() && !player.isSpectator();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void erode(PortInstabilityRuntime.Context context) {
|
||||||
|
if (!PortInstabilityConfig.erosionEnabled() || !PortHazardProviders.canMutate(context.level())) return;
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
Random random = new Random(context.age().seed() ^ PortHazardSavedData.get(level).nextAttempt()
|
||||||
|
* 0xC2B2AE3D27D4EB4FL ^ EROSION.hashCode());
|
||||||
|
for (int attempt = 0; attempt < 8; attempt++) {
|
||||||
|
ChunkPos chunk = context.loadedChunks().get(random.nextInt(context.loadedChunks().size()));
|
||||||
|
int x = chunk.getMinBlockX() + random.nextInt(16);
|
||||||
|
int z = chunk.getMinBlockZ() + random.nextInt(16);
|
||||||
|
int y = level.getMinY() + 1 + random.nextInt(level.getHeight() - 2);
|
||||||
|
if (erodeAt(context, new BlockPos(x, y, z))) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean erodeAt(PortInstabilityRuntime.Context context, BlockPos pos) {
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
if (!PortDecayProviders.isLoadedTarget(level, context.loadedChunks(), pos)
|
||||||
|
|| PortDecayProviders.isSpawnProtected(context.age(), pos)) return false;
|
||||||
|
BlockState prior = level.getBlockState(pos);
|
||||||
|
if (!PortDecayProviders.canReplace(level, pos, prior, DecayBlock.Color.BLUE)) return false;
|
||||||
|
for (Direction direction : FLUID_SIDES) {
|
||||||
|
BlockPos neighbor = pos.relative(direction);
|
||||||
|
if (!PortDecayProviders.isLoadedTarget(level, context.loadedChunks(), neighbor)) continue;
|
||||||
|
var fluid = level.getFluidState(neighbor);
|
||||||
|
if (fluid.isSource() && replaceFluid(context, pos, prior, fluid.createLegacyBlock())) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean replaceFluid(PortInstabilityRuntime.Context context, BlockPos pos,
|
||||||
|
BlockState prior, BlockState fluidBlock) {
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
var actor = FakePlayerFactory.getMinecraft(level);
|
||||||
|
actor.setPos(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
|
if (!prior.isAir()) {
|
||||||
|
var breaking = new net.neoforged.neoforge.event.level.block.BreakBlockEvent(level, pos, prior, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(breaking);
|
||||||
|
if (breaking.isCanceled()) return false;
|
||||||
|
}
|
||||||
|
if (level.getBlockState(pos) != prior || !context.budget().claim()) return false;
|
||||||
|
var snapshot = BlockSnapshot.create(level.dimension(), level, pos);
|
||||||
|
if (!level.setBlock(pos, fluidBlock, 3)) return false;
|
||||||
|
var placing = new BlockEvent.EntityPlaceEvent(snapshot, prior, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(placing);
|
||||||
|
if (placing.isCanceled()) {
|
||||||
|
snapshot.restore();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
context.budget().recordApplied();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+29
-3
@@ -70,10 +70,12 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
|
|||||||
.forGetter(generator -> Optional.ofNullable(generator.lakes)),
|
.forGetter(generator -> Optional.ofNullable(generator.lakes)),
|
||||||
PortTerrainFeaturePlan.CODEC.optionalFieldOf("terrain_features")
|
PortTerrainFeaturePlan.CODEC.optionalFieldOf("terrain_features")
|
||||||
.forGetter(generator -> Optional.ofNullable(generator.terrainFeatures)),
|
.forGetter(generator -> Optional.ofNullable(generator.terrainFeatures)),
|
||||||
com.mojang.serialization.Codec.LONG.fieldOf("age_seed").forGetter(generator -> generator.ageSeed)
|
com.mojang.serialization.Codec.LONG.fieldOf("age_seed").forGetter(generator -> generator.ageSeed),
|
||||||
).apply(instance, (base, rocks, vegetation, dungeons, lakes, terrainFeatures, seed) ->
|
com.mojang.serialization.Codec.BOOL.optionalFieldOf("libraries", false).forGetter(generator -> generator.libraries),
|
||||||
|
Identifier.CODEC.listOf().optionalFieldOf("library_symbols", List.of()).forGetter(generator -> generator.librarySymbols)
|
||||||
|
).apply(instance, (base, rocks, vegetation, dungeons, lakes, terrainFeatures, seed, libraries, symbols) ->
|
||||||
new PortFeatureChunkGenerator(base, rocks.orElse(null), vegetation.orElse(null),
|
new PortFeatureChunkGenerator(base, rocks.orElse(null), vegetation.orElse(null),
|
||||||
dungeons, lakes.orElse(null), terrainFeatures.orElse(null), seed)));
|
dungeons, lakes.orElse(null), terrainFeatures.orElse(null), seed, libraries, symbols)));
|
||||||
|
|
||||||
private final ChunkGenerator base;
|
private final ChunkGenerator base;
|
||||||
private final PortRockPlan rocks;
|
private final PortRockPlan rocks;
|
||||||
@@ -82,10 +84,20 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
|
|||||||
private final PortLakePlan lakes;
|
private final PortLakePlan lakes;
|
||||||
private final PortTerrainFeaturePlan terrainFeatures;
|
private final PortTerrainFeaturePlan terrainFeatures;
|
||||||
private final long ageSeed;
|
private final long ageSeed;
|
||||||
|
private final boolean libraries;
|
||||||
|
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,
|
||||||
PortTerrainFeaturePlan terrainFeatures, long ageSeed) {
|
PortTerrainFeaturePlan terrainFeatures, long ageSeed) {
|
||||||
|
this(base, rocks, vegetation, dungeons, lakes, terrainFeatures, ageSeed, false, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
public PortFeatureChunkGenerator(ChunkGenerator base, PortRockPlan rocks,
|
||||||
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
|
PortTerrainFeaturePlan terrainFeatures, long ageSeed,
|
||||||
|
boolean libraries, List<Identifier> librarySymbols) {
|
||||||
super(base.getBiomeSource(), base::getBiomeGenerationSettings);
|
super(base.getBiomeSource(), base::getBiomeGenerationSettings);
|
||||||
this.base = base;
|
this.base = base;
|
||||||
this.rocks = rocks;
|
this.rocks = rocks;
|
||||||
@@ -94,8 +106,12 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
|
|||||||
this.lakes = lakes;
|
this.lakes = lakes;
|
||||||
this.terrainFeatures = terrainFeatures;
|
this.terrainFeatures = terrainFeatures;
|
||||||
this.ageSeed = ageSeed;
|
this.ageSeed = ageSeed;
|
||||||
|
this.libraries = libraries;
|
||||||
|
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; }
|
||||||
@@ -276,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(
|
||||||
@@ -286,5 +310,7 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator {
|
|||||||
if (PortVegetationPlan.addsLogs(page)) mushroomHosts = null;
|
if (PortVegetationPlan.addsLogs(page)) mushroomHosts = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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,356 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.tags.BlockTags;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.entity.EntityTypes;
|
||||||
|
import net.minecraft.world.entity.LightningBolt;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.level.BlockGetter;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.Explosion;
|
||||||
|
import net.minecraft.world.level.ExplosionDamageCalculator;
|
||||||
|
import net.minecraft.world.level.gamerules.GameRules;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraft.world.level.material.FluidState;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.neoforged.neoforge.common.NeoForge;
|
||||||
|
import net.neoforged.neoforge.common.util.FakePlayerFactory;
|
||||||
|
import net.neoforged.neoforge.event.level.BlockEvent;
|
||||||
|
|
||||||
|
/** Legacy hazard cards, with one loaded-chunk event and explicit damage budgets. */
|
||||||
|
public final class PortHazardProviders {
|
||||||
|
private static final Identifier LIGHTNING = id("lightning");
|
||||||
|
private static final Identifier EXPLOSIONS = id("explosions");
|
||||||
|
|
||||||
|
private PortHazardProviders() {}
|
||||||
|
|
||||||
|
public static void register() {
|
||||||
|
// Visuals and entity damage remain available when block mutation is disabled.
|
||||||
|
PortInstabilityRuntime.register(LIGHTNING, false, PortHazardProviders::apply);
|
||||||
|
PortInstabilityRuntime.register(EXPLOSIONS, false, PortHazardProviders::apply);
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean isHazard(Identifier id) {
|
||||||
|
return LIGHTNING.equals(id) || EXPLOSIONS.equals(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Roll every selected hazard card each scheduler pass, independently of other providers. */
|
||||||
|
static void tickPlanned(ServerLevel level, PortInstabilityData.Age age, long tick,
|
||||||
|
List<PortInstabilityPlan.ProviderLevel> providers) {
|
||||||
|
if (!PortInstabilityConfig.hazardsEnabled()) return;
|
||||||
|
List<PortInstabilityPlan.ProviderLevel> hazards = providers.stream()
|
||||||
|
.filter(provider -> isHazard(provider.id())).toList();
|
||||||
|
if (hazards.isEmpty()) return;
|
||||||
|
List<ChunkPos> chunks = loadedChunksNearPlayers(level, PortInstabilityConfig.hazardsMaxChunks());
|
||||||
|
if (chunks.isEmpty()) return;
|
||||||
|
for (PortInstabilityPlan.ProviderLevel hazard : hazards) {
|
||||||
|
var context = new PortInstabilityRuntime.Context(level, age, chunks, tick,
|
||||||
|
new PortInstabilityRuntime.Budget(1));
|
||||||
|
PortInstabilityRuntime.invoke(context, hazard.id(), hazard.level());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<ChunkPos> loadedChunksNearPlayers(ServerLevel level, int maximum) {
|
||||||
|
List<ChunkPos> players = level.players().stream()
|
||||||
|
.sorted(Comparator.comparing(Entity::getUUID))
|
||||||
|
.map(ServerPlayer::chunkPosition).toList();
|
||||||
|
return candidateChunks(players, maximum,
|
||||||
|
chunk -> level.getChunkSource().getChunkNow(chunk.x(), chunk.z()) != null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Pure candidate selection; the caller's predicate must only report already-loaded chunks. */
|
||||||
|
static List<ChunkPos> candidateChunks(List<ChunkPos> players, int maximum,
|
||||||
|
Predicate<ChunkPos> loaded) {
|
||||||
|
if (maximum <= 0) return List.of();
|
||||||
|
Set<ChunkPos> chunks = new LinkedHashSet<>();
|
||||||
|
for (int radius = 0; radius <= 4; radius++) {
|
||||||
|
for (int dx = -radius; dx <= radius; dx++) {
|
||||||
|
for (int dz = -radius; dz <= radius; dz++) {
|
||||||
|
if (Math.max(Math.abs(dx), Math.abs(dz)) != radius) continue;
|
||||||
|
for (ChunkPos center : players) {
|
||||||
|
int x = center.x() + dx;
|
||||||
|
int z = center.z() + dz;
|
||||||
|
ChunkPos candidate = new ChunkPos(x, z);
|
||||||
|
if (loaded.test(candidate)) chunks.add(candidate);
|
||||||
|
if (chunks.size() >= maximum) return List.copyOf(chunks);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return List.copyOf(chunks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Operator-only test pulse; skips the random roll, not Age, cooldown, or safety checks. */
|
||||||
|
public static int pulseForTesting(ServerPlayer player, boolean lightning) {
|
||||||
|
return pulseForTesting(player.level(), player.blockPosition(), lightning);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int pulseForTesting(ServerLevel level, BlockPos origin, boolean lightning) {
|
||||||
|
if (!PortInstabilityConfig.hazardsEnabled()
|
||||||
|
|| !PortInstabilityRuntime.isAge(level)) return -1;
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !age.enabled()
|
||||||
|
|| !PortInstabilityConfig.instabilityProviderEnabled(lightning ? LIGHTNING : EXPLOSIONS)) return -1;
|
||||||
|
PortHazardSavedData data = PortHazardSavedData.get(level);
|
||||||
|
if (!data.ready(lightning, level.getGameTime(), PortInstabilityConfig.hazardsMinInterval())) return 0;
|
||||||
|
ChunkPos center = ChunkPos.containing(origin);
|
||||||
|
for (int dx = -1; dx <= 1; dx++) {
|
||||||
|
for (int dz = -1; dz <= 1; dz++) {
|
||||||
|
ChunkPos chunk = new ChunkPos(center.x() + dx, center.z() + dz);
|
||||||
|
if (level.getChunkSource().getChunkNow(chunk.x(), chunk.z()) == null) continue;
|
||||||
|
int x = chunk.getMinBlockX() + 8;
|
||||||
|
int z = chunk.getMinBlockZ() + 8;
|
||||||
|
int y = lightning ? level.getHeight(Heightmap.Types.MOTION_BLOCKING, x, z)
|
||||||
|
: origin.getY();
|
||||||
|
BlockPos pos = new BlockPos(x, y, z);
|
||||||
|
var context = new PortInstabilityRuntime.Context(level, age, List.of(chunk),
|
||||||
|
level.getServer().getTickCount(), new PortInstabilityRuntime.Budget(1));
|
||||||
|
if (!safeTarget(context, pos, 8)) continue;
|
||||||
|
data.nextAttempt();
|
||||||
|
data.record(lightning, level.getGameTime());
|
||||||
|
return (lightning ? strike(level, age, chunk, pos) : explode(level, age, chunk, pos)) ? 1 : 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void apply(PortInstabilityRuntime.Context context, Identifier id, int effectiveLevel) {
|
||||||
|
ServerLevel level = context.level();
|
||||||
|
if (!PortInstabilityConfig.hazardsEnabled() || context.loadedChunks().isEmpty()
|
||||||
|
|| !PortInstabilityRuntime.isAge(level)) return;
|
||||||
|
boolean lightning = id.equals(LIGHTNING);
|
||||||
|
if (!lightning && !id.equals(EXPLOSIONS)) return;
|
||||||
|
PortHazardSavedData data = PortHazardSavedData.get(level);
|
||||||
|
long gameTime = level.getGameTime();
|
||||||
|
if (!data.ready(lightning, gameTime, PortInstabilityConfig.hazardsMinInterval())) return;
|
||||||
|
Random random = new Random(context.age().seed() ^ data.nextAttempt() * 0x9E3779B97F4A7C15L
|
||||||
|
^ id.hashCode());
|
||||||
|
int legacyDenominator = lightning ? level.isRaining() && level.isThundering() ? 5000 : 100000 : 1000;
|
||||||
|
// Legacy rolled once per chunk per tick; the shared scheduler visits this Age every >=20 ticks.
|
||||||
|
double chance = legacyChance(context.loadedChunks().size(), PortInstabilityConfig.instabilityCooldown(),
|
||||||
|
effectiveLevel, legacyDenominator);
|
||||||
|
if (random.nextDouble() >= chance) return;
|
||||||
|
ChunkPos chunk = context.loadedChunks().get(random.nextInt(context.loadedChunks().size()));
|
||||||
|
int margin = lightning ? 2 : 6;
|
||||||
|
int x = chunk.getMinBlockX() + margin + random.nextInt(16 - margin * 2);
|
||||||
|
int z = chunk.getMinBlockZ() + margin + random.nextInt(16 - margin * 2);
|
||||||
|
int y = lightning ? level.getHeight(Heightmap.Types.MOTION_BLOCKING, x, z)
|
||||||
|
: level.getMinY() + 1 + random.nextInt(level.getHeight() - 2);
|
||||||
|
BlockPos pos = new BlockPos(x, y, z);
|
||||||
|
if (!safeTarget(context, pos, 8) || !context.budget().claim()) return;
|
||||||
|
data.record(lightning, gameTime); // persist before dispatch so a restart cannot replay the event
|
||||||
|
if (lightning ? strike(level, context.age(), chunk, pos) : explode(level, context.age(), chunk, pos))
|
||||||
|
context.budget().recordApplied();
|
||||||
|
}
|
||||||
|
|
||||||
|
static double legacyChance(int loadedChunks, int intervalTicks, int copies, int denominator) {
|
||||||
|
if (loadedChunks <= 0 || intervalTicks <= 0 || copies <= 0 || denominator <= 0) return 0;
|
||||||
|
return 1.0 - Math.pow(1.0 - 1.0 / denominator, (double) loadedChunks * intervalTicks * copies);
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean safeTarget(PortInstabilityRuntime.Context context, BlockPos pos, int spawnMargin) {
|
||||||
|
if (!PortDecayProviders.isLoadedTarget(context.level(), context.loadedChunks(), pos)) return false;
|
||||||
|
BlockPos spawn = context.age().spawn().orElse(null);
|
||||||
|
return spawn == null || Math.abs(pos.getX() - spawn.getX()) > spawnMargin
|
||||||
|
|| Math.abs(pos.getZ() - spawn.getZ()) > spawnMargin;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean strike(ServerLevel level, PortInstabilityData.Age age, ChunkPos chunk, BlockPos pos) {
|
||||||
|
AABB bounds = new AABB(pos).inflate(2);
|
||||||
|
if (!level.getEntitiesOfClass(LightningBolt.class, bounds).isEmpty()) return false;
|
||||||
|
LightningBolt bolt = EntityTypes.LIGHTNING_BOLT.create(level, net.minecraft.world.entity.EntitySpawnReason.TRIGGERED);
|
||||||
|
if (bolt == null) return false;
|
||||||
|
bolt.setPos(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5);
|
||||||
|
bolt.setVisualOnly(true); // vanilla bolt damage/fire bypasses our explicit budgets
|
||||||
|
if (!level.addFreshEntity(bolt)) return false;
|
||||||
|
List<LivingEntity> targets = level.getEntitiesOfClass(LivingEntity.class, bounds,
|
||||||
|
entity -> entity.isAlive() && entity.level() == level && eligibleEntity(entity));
|
||||||
|
targets.sort(Comparator.comparing(Entity::getUUID));
|
||||||
|
int count = 0;
|
||||||
|
for (LivingEntity target : targets) {
|
||||||
|
if (count++ >= PortInstabilityConfig.hazardsMaxEntities()) break;
|
||||||
|
if (PortInstabilityConfig.hazardsMaxDamage() > 0)
|
||||||
|
target.hurtServer(level, level.damageSources().lightningBolt(), Math.min(5, PortInstabilityConfig.hazardsMaxDamage()));
|
||||||
|
}
|
||||||
|
// Legacy lightning started fires. Keep it separately gated by block policy and game rule.
|
||||||
|
if (canMutate(level) && PortInstabilityConfig.hazardsFire()
|
||||||
|
&& level.canSpreadFireAround(pos)
|
||||||
|
&& !PortDecayProviders.isSpawnProtected(age, pos)
|
||||||
|
&& PortDecayProviders.isLoadedTarget(level, List.of(chunk), pos)) ignite(level, pos);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean explode(ServerLevel level, PortInstabilityData.Age age, ChunkPos chunk, BlockPos pos) {
|
||||||
|
return explodeBounded(level, age, chunk, pos, PortInstabilityConfig.hazardsBlockDamage(),
|
||||||
|
PortInstabilityConfig.hazardsPlayerDamage(), PortInstabilityConfig.hazardsFire(),
|
||||||
|
PortInstabilityConfig.hazardsMaxBlocks(), PortInstabilityConfig.hazardsMaxEntities(),
|
||||||
|
PortInstabilityConfig.hazardsMaxDamage(), PortInstabilityConfig.hazardsExplosionRadius());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Shared blast guard for meteor impacts; each effect supplies its own damage policy. */
|
||||||
|
static boolean explodeBounded(ServerLevel level, PortInstabilityData.Age age, ChunkPos chunk, BlockPos pos,
|
||||||
|
boolean blockDamage, boolean playerDamage, boolean ignite, int maxBlocks, int maxEntities,
|
||||||
|
int maxDamage, int radius) {
|
||||||
|
boolean grief = destructiveBlocksAllowed(PortInstabilityConfig.instabilityWorldMutation(),
|
||||||
|
level.getGameRules().get(GameRules.MOB_GRIEFING), blockDamage, maxBlocks);
|
||||||
|
boolean fire = grief && ignite
|
||||||
|
&& level.canSpreadFireAround(pos);
|
||||||
|
BoundedExplosion calculator = new BoundedExplosion(level, age, chunk, grief,
|
||||||
|
playerDamage, maxBlocks, maxEntities, maxDamage);
|
||||||
|
level.explode(null, null, calculator,
|
||||||
|
pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5,
|
||||||
|
radius, false,
|
||||||
|
grief ? Level.ExplosionInteraction.BLOCK : Level.ExplosionInteraction.NONE);
|
||||||
|
if (fire) {
|
||||||
|
int ignited = 0;
|
||||||
|
for (BlockPos affected : calculator.approved) {
|
||||||
|
if (ignited >= 4) break;
|
||||||
|
if (level.canSpreadFireAround(affected) && !PortDecayProviders.isSpawnProtected(age, affected)
|
||||||
|
&& ignite(level, affected)) ignited++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return calculator.started;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean ignite(ServerLevel level, BlockPos pos) {
|
||||||
|
if (!level.getBlockState(pos).isAir() || !Blocks.FIRE.defaultBlockState().canSurvive(level, pos))
|
||||||
|
return false;
|
||||||
|
var actor = FakePlayerFactory.getMinecraft(level);
|
||||||
|
actor.setPos(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5);
|
||||||
|
var snapshot = net.neoforged.neoforge.common.util.BlockSnapshot.create(level.dimension(), level, pos);
|
||||||
|
BlockState prior = level.getBlockState(pos);
|
||||||
|
if (!level.setBlock(pos, Blocks.FIRE.defaultBlockState(), 3)) return false;
|
||||||
|
var place = new BlockEvent.EntityPlaceEvent(snapshot, prior, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(place);
|
||||||
|
if (place.isCanceled()) {
|
||||||
|
snapshot.restore();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean canMutate(ServerLevel level) {
|
||||||
|
return PortInstabilityConfig.instabilityWorldMutation()
|
||||||
|
&& level.getGameRules().get(GameRules.MOB_GRIEFING);
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean destructiveBlocksAllowed(boolean worldMutation, boolean mobGriefing,
|
||||||
|
boolean blockDamage, int maxBlocks) {
|
||||||
|
return worldMutation && mobGriefing && blockDamage && maxBlocks > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean protectedBlock(ServerLevel level, PortInstabilityData.Age age, BlockPos pos, BlockState state) {
|
||||||
|
return state.isAir() || state.hasBlockEntity() || state.is(Blocks.TNT)
|
||||||
|
|| state.is(PortDecayProviders.PROTECTED) || state.is(BlockTags.PORTALS)
|
||||||
|
|| PortDecayProviders.isSpawnProtected(age, pos)
|
||||||
|
|| state.getDestroySpeed(level, pos) < 0
|
||||||
|
|| BuiltInRegistries.BLOCK.getKey(state.getBlock()).getNamespace().equals(Rivencraft.MOD_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligibleEntity(Entity entity) {
|
||||||
|
return eligibleEntity(entity, PortInstabilityConfig.hazardsPlayerDamage());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligibleEntity(Entity entity, boolean playerDamage) {
|
||||||
|
return !(entity instanceof Player player) || playerDamage
|
||||||
|
&& !player.isCreative() && !player.isSpectator();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Identifier id(String path) {
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class BoundedExplosion extends ExplosionDamageCalculator {
|
||||||
|
private final ServerLevel level;
|
||||||
|
private final PortInstabilityData.Age age;
|
||||||
|
private final ChunkPos chunk;
|
||||||
|
private final boolean grief;
|
||||||
|
private final boolean playerDamage;
|
||||||
|
private final int maxBlocks;
|
||||||
|
private final int maxEntities;
|
||||||
|
private final int maxDamage;
|
||||||
|
private final Set<BlockPos> approved = new LinkedHashSet<>();
|
||||||
|
private final Set<UUID> damagedEntities = new HashSet<>();
|
||||||
|
private int damaged;
|
||||||
|
private boolean started;
|
||||||
|
|
||||||
|
private BoundedExplosion(ServerLevel level, PortInstabilityData.Age age, ChunkPos chunk, boolean grief,
|
||||||
|
boolean playerDamage, int maxBlocks, int maxEntities, int maxDamage) {
|
||||||
|
this.level = level;
|
||||||
|
this.age = age;
|
||||||
|
this.chunk = chunk;
|
||||||
|
this.grief = grief;
|
||||||
|
this.playerDamage = playerDamage;
|
||||||
|
this.maxBlocks = maxBlocks;
|
||||||
|
this.maxEntities = maxEntities;
|
||||||
|
this.maxDamage = maxDamage;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<Float> getBlockExplosionResistance(Explosion explosion, BlockGetter reader,
|
||||||
|
BlockPos pos, BlockState state, FluidState fluid) {
|
||||||
|
started = true;
|
||||||
|
if (!inLoadedChunk(pos)) return Optional.of(Float.MAX_VALUE);
|
||||||
|
return super.getBlockExplosionResistance(explosion, reader, pos, state, fluid);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldBlockExplode(Explosion explosion, BlockGetter reader, BlockPos pos,
|
||||||
|
BlockState state, float power) {
|
||||||
|
if (!grief || !inLoadedChunk(pos) || protectedBlock(level, age, pos, state)) return false;
|
||||||
|
if (approved.contains(pos)) return true;
|
||||||
|
if (approved.size() >= maxBlocks) return false;
|
||||||
|
var actor = FakePlayerFactory.getMinecraft(level);
|
||||||
|
actor.setPos(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||||
|
var event = new net.neoforged.neoforge.event.level.block.BreakBlockEvent(level, pos, state, actor);
|
||||||
|
NeoForge.EVENT_BUS.post(event);
|
||||||
|
if (event.isCanceled()) return false;
|
||||||
|
approved.add(pos.immutable());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldDamageEntity(Explosion explosion, Entity entity) {
|
||||||
|
if (damaged >= maxEntities || !eligibleEntity(entity, playerDamage)
|
||||||
|
|| maxDamage == 0) return false;
|
||||||
|
damaged++;
|
||||||
|
damagedEntities.add(entity.getUUID());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getEntityDamageAmount(Explosion explosion, Entity entity, float exposure) {
|
||||||
|
return Math.min(super.getEntityDamageAmount(explosion, entity, exposure), maxDamage);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getKnockbackMultiplier(Entity entity) {
|
||||||
|
return damagedEntities.contains(entity.getUUID()) ? 1.0F : 0.0F;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean inLoadedChunk(BlockPos pos) {
|
||||||
|
return level.isInWorldBounds(pos) && ChunkPos.containing(pos).equals(chunk)
|
||||||
|
&& level.getChunkSource().getChunkNow(chunk.x(), chunk.z()) != null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Per-Age random sequence and event cooldowns survive unload and restart. */
|
||||||
|
public final class PortHazardSavedData extends SavedData {
|
||||||
|
private static final Codec<PortHazardSavedData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
net.minecraft.util.ExtraCodecs.NON_NEGATIVE_LONG.optionalFieldOf("attempts", 0L).forGetter(data -> data.attempts),
|
||||||
|
Codec.LONG.optionalFieldOf("last_lightning", Long.MIN_VALUE).forGetter(data -> data.lastLightning),
|
||||||
|
Codec.LONG.optionalFieldOf("last_explosion", Long.MIN_VALUE).forGetter(data -> data.lastExplosion),
|
||||||
|
Codec.LONG.optionalFieldOf("last_meteor", Long.MIN_VALUE).forGetter(data -> data.lastMeteor)
|
||||||
|
).apply(instance, PortHazardSavedData::new));
|
||||||
|
private static final SavedDataType<PortHazardSavedData> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "hazards"),
|
||||||
|
() -> new PortHazardSavedData(0, Long.MIN_VALUE, Long.MIN_VALUE, Long.MIN_VALUE), CODEC);
|
||||||
|
private long attempts, lastLightning, lastExplosion, lastMeteor;
|
||||||
|
private PortHazardSavedData(long attempts, long lightning, long explosion, long meteor) {
|
||||||
|
this.attempts = attempts; lastLightning = lightning; lastExplosion = explosion; lastMeteor = meteor;
|
||||||
|
}
|
||||||
|
public static PortHazardSavedData get(ServerLevel level) { return level.getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
public long nextAttempt() { setDirty(); return attempts++; }
|
||||||
|
public boolean ready(boolean lightning, long time, int interval) {
|
||||||
|
long last = lightning ? lastLightning : lastExplosion;
|
||||||
|
return last == Long.MIN_VALUE || time < last || time - last >= interval;
|
||||||
|
}
|
||||||
|
public void record(boolean lightning, long time) { if (lightning) lastLightning = time; else lastExplosion = time; setDirty(); }
|
||||||
|
public boolean meteorReady(long time, int interval) { return lastMeteor == Long.MIN_VALUE || time < lastMeteor || time - lastMeteor >= interval; }
|
||||||
|
public void recordMeteor(long time) { lastMeteor = time; setDirty(); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.brigadier.arguments.BoolArgumentType;
|
||||||
|
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||||
|
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.commands.Commands;
|
||||||
|
import net.minecraft.commands.CommandSourceStack;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.RegisterCommandsEvent;
|
||||||
|
|
||||||
|
/** Scores and test overrides are deliberately operator-only, never book tooltip data. */
|
||||||
|
@EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class PortInstabilityCommands {
|
||||||
|
private PortInstabilityCommands() {}
|
||||||
|
@SubscribeEvent public static void register(RegisterCommandsEvent event) {
|
||||||
|
event.getDispatcher().register(Commands.literal("rivencraft_port")
|
||||||
|
.requires(Commands.hasPermission(Commands.LEVEL_ADMINS))
|
||||||
|
.then(Commands.literal("instability")
|
||||||
|
.then(Commands.literal("status").executes(context -> {
|
||||||
|
var source = context.getSource(); var level = requireAge(source);
|
||||||
|
var age = PortInstabilityData.get(source.getServer()).age(level);
|
||||||
|
source.sendSuccess(() -> Component.literal("Age " + level.dimension().identifier()
|
||||||
|
+ ": frozen score=" + age.score() + ", enabled=" + age.enabled()
|
||||||
|
+ ", session test score=" + PortInstabilityRuntime.testScore(level)
|
||||||
|
+ ", protected spawn=" + age.spawn().map(BlockPos::toShortString).orElse("not recorded; re-enter this Age")), false);
|
||||||
|
source.sendSuccess(() -> Component.literal(" live block score=" + PortBlockInstability.score(level)
|
||||||
|
+ "; effective score=" + PortInstabilityRuntime.effectiveScore(level)
|
||||||
|
+ "; difficulty=" + PortInstabilityConfig.instabilityDifficulty()
|
||||||
|
+ "; samples Age=" + PortBlockInstability.sampledChunks(level) + "/" + PortBlockProfileSavedData.MIN_AGE_SAMPLES
|
||||||
|
+ ", Overworld=" + PortBlockInstability.sampledChunks(source.getServer().overworld()) + "/" + PortBlockProfileSavedData.MIN_BASELINE_SAMPLES
|
||||||
|
+ "; profiling=" + PortInstabilityData.get(source.getServer()).supportsProfiling(level)), false);
|
||||||
|
for (var cost : age.contributions()) source.sendSuccess(() -> Component.literal(
|
||||||
|
" " + cost.reason() + " page=" + cost.page() + " +" + cost.points()), false);
|
||||||
|
source.sendSuccess(() -> Component.literal(" erosion testing policy (not a saved card): "
|
||||||
|
+ PortInstabilityRuntime.providerStatus(level, PortEnvironmentalProviders.EROSION)
|
||||||
|
+ "; current score=" + PortInstabilityRuntime.effectiveScore(level)), false);
|
||||||
|
for (var provider : PortInstabilityRuntime.plan(level).providers())
|
||||||
|
source.sendSuccess(() -> Component.literal(" " + provider.id() + " level=" + provider.level()
|
||||||
|
+ " [" + PortInstabilityRuntime.providerStatus(level, provider.id()) + "]"), false);
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("enabled").then(Commands.argument("enabled", BoolArgumentType.bool())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = requireAge(context.getSource());
|
||||||
|
boolean enabled = BoolArgumentType.getBool(context, "enabled");
|
||||||
|
PortInstabilityData.get(level.getServer()).enabled(level, enabled);
|
||||||
|
if (!enabled) PortStatusEffectProviders.clearAge(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Age instability enabled=" + enabled
|
||||||
|
+ "; saved score and provider selection unchanged"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("test_score").then(Commands.argument("score", IntegerArgumentType.integer(0, 1_000_000))
|
||||||
|
.executes(context -> {
|
||||||
|
var level = requireAge(context.getSource());
|
||||||
|
PortInstabilityRuntime.testScore(level, IntegerArgumentType.getInteger(context, "score"));
|
||||||
|
PortStatusEffectProviders.clearAge(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Session-only score override set; frozen score unchanged. Restart or clear_test_score removes it."), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("clear_test_score").executes(context -> {
|
||||||
|
var level = requireAge(context.getSource()); PortInstabilityRuntime.testScore(level, null);
|
||||||
|
PortStatusEffectProviders.clearAge(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Cleared test override; restored live effective provider selection"), false); return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("decay").then(Commands.argument("color", StringArgumentType.word())
|
||||||
|
.suggests((context, builder) -> {
|
||||||
|
for (var color : net.dnorberg.rivencraft.block.DecayBlock.Color.values())
|
||||||
|
if (color.getSerializedName().startsWith(builder.getRemaining())) builder.suggest(color.getSerializedName());
|
||||||
|
return builder.buildFuture();
|
||||||
|
}).executes(context -> decay(context, 1))
|
||||||
|
.then(Commands.argument("attempts", IntegerArgumentType.integer(1, 32))
|
||||||
|
.executes(context -> decay(context, IntegerArgumentType.getInteger(context, "attempts"))))))
|
||||||
|
.then(Commands.literal("environment").then(Commands.argument("effect", StringArgumentType.word())
|
||||||
|
.suggests((context, builder) -> {
|
||||||
|
for (String effect : java.util.List.of("burning", "erosion"))
|
||||||
|
if (effect.startsWith(builder.getRemaining())) builder.suggest(effect);
|
||||||
|
return builder.buildFuture();
|
||||||
|
}).executes(context -> {
|
||||||
|
var source = context.getSource(); requireAge(source);
|
||||||
|
String effect = StringArgumentType.getString(context, "effect");
|
||||||
|
if (!effect.equals("burning") && !effect.equals("erosion")) {
|
||||||
|
source.sendFailure(Component.literal("Choose burning or erosion")); return 0;
|
||||||
|
}
|
||||||
|
int result = PortEnvironmentalProviders.pulseForTesting(source.getPlayerOrException(), effect);
|
||||||
|
if (result > 0) source.sendSuccess(() -> Component.literal("Applied " + effect + "; saved score/plan unchanged"), false);
|
||||||
|
else source.sendFailure(Component.literal(result == -2 ? "Burning would be extinguished by water or rain"
|
||||||
|
: "No effect applied. Check Age/config/provider policy, spawn protection and sky exposure; burning requires Survival/Adventure, erosion requires score >=10000 and a source fluid beside/above the targeted block."));
|
||||||
|
return Math.max(0, result);
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("meteor").executes(context -> {
|
||||||
|
var source = context.getSource(); requireAge(source);
|
||||||
|
int result = PortMeteorProvider.pulseForTesting(source.getPlayerOrException());
|
||||||
|
if (result > 0) source.sendSuccess(() -> Component.literal("Meteor descent scheduled; impact in 30 ticks. Saved score/plan unchanged."), false);
|
||||||
|
else source.sendFailure(Component.literal("No meteor scheduled: check cooldown (200 ticks), active flight, safe loaded terrain and Age/config/provider policy."));
|
||||||
|
return Math.max(0, result);
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("hazard").then(Commands.argument("type", StringArgumentType.word())
|
||||||
|
.suggests((context, builder) -> {
|
||||||
|
for (String type : java.util.List.of("lightning", "explosions"))
|
||||||
|
if (type.startsWith(builder.getRemaining())) builder.suggest(type);
|
||||||
|
return builder.buildFuture();
|
||||||
|
}).executes(context -> {
|
||||||
|
var source = context.getSource(); var level = requireAge(source);
|
||||||
|
String type = StringArgumentType.getString(context, "type");
|
||||||
|
if (!type.equals("lightning") && !type.equals("explosions")) {
|
||||||
|
source.sendFailure(Component.literal("Choose lightning or explosions")); return 0;
|
||||||
|
}
|
||||||
|
int result = PortHazardProviders.pulseForTesting(level, BlockPos.containing(source.getPosition()), type.equals("lightning"));
|
||||||
|
if (result > 0) source.sendSuccess(() -> Component.literal("Triggered " + type
|
||||||
|
+ " in a nearby loaded chunk; saved score/plan unchanged"), false);
|
||||||
|
else source.sendFailure(Component.literal(result < 0 ? "Hazard disabled by config, Age or provider policy"
|
||||||
|
: "No hazard triggered: cooldown, protected spawn, unloaded terrain or event cancellation"));
|
||||||
|
return Math.max(0, result);
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("pulse").then(Commands.argument("provider", StringArgumentType.word())
|
||||||
|
.suggests((context, builder) -> {
|
||||||
|
for (var deck : InstabilityProviderCatalog.Deck.values()) for (var card : InstabilityProviderCatalog.cards(deck))
|
||||||
|
if (card.id().getPath().startsWith(builder.getRemaining())) builder.suggest(card.id().getPath());
|
||||||
|
return builder.buildFuture();
|
||||||
|
}).executes(context -> {
|
||||||
|
var source = context.getSource(); var level = requireAge(source);
|
||||||
|
String name = StringArgumentType.getString(context, "provider");
|
||||||
|
Identifier id = Identifier.tryParse(name.contains(":") ? name : "rivencraft:" + name);
|
||||||
|
if (id == null || !InstabilityProviderCatalog.contains(id)) throw new com.mojang.brigadier.exceptions.SimpleCommandExceptionType(Component.literal("Unknown instability provider")).create();
|
||||||
|
var chunk = net.minecraft.world.level.ChunkPos.containing(BlockPos.containing(source.getPosition()));
|
||||||
|
if (level.getChunkSource().getChunkNow(chunk.x(), chunk.z()) == null)
|
||||||
|
throw new com.mojang.brigadier.exceptions.SimpleCommandExceptionType(Component.literal("Current chunk must already be loaded")).create();
|
||||||
|
var budget = new PortInstabilityRuntime.Budget(1);
|
||||||
|
var effect = new PortInstabilityRuntime.Context(level, PortInstabilityData.get(level.getServer()).age(level),
|
||||||
|
java.util.List.of(chunk), source.getServer().getTickCount(), budget);
|
||||||
|
boolean attempted = PortInstabilityRuntime.invoke(effect, id, 1);
|
||||||
|
boolean applied = attempted && budget.applied() > 0;
|
||||||
|
if (applied) source.sendSuccess(() -> Component.literal("Applied " + id + " (" + budget.applied() + " successful action in this chunk)"), false);
|
||||||
|
else source.sendFailure(Component.literal("No effect applied. Check eligible targets/terrain, sky exposure, existing effects and protection. Provider status: "
|
||||||
|
+ PortInstabilityRuntime.providerStatus(level, id)));
|
||||||
|
return applied ? 1 : 0;
|
||||||
|
})))));
|
||||||
|
}
|
||||||
|
private static int decay(com.mojang.brigadier.context.CommandContext<CommandSourceStack> context, int attempts)
|
||||||
|
throws com.mojang.brigadier.exceptions.CommandSyntaxException {
|
||||||
|
requireAge(context.getSource());
|
||||||
|
var color = java.util.Arrays.stream(net.dnorberg.rivencraft.block.DecayBlock.Color.values())
|
||||||
|
.filter(value -> value.getSerializedName().equalsIgnoreCase(StringArgumentType.getString(context, "color")))
|
||||||
|
.findFirst().orElse(null);
|
||||||
|
if (color == null) {
|
||||||
|
context.getSource().sendFailure(Component.literal("Choose blue, purple, red or white")); return 0;
|
||||||
|
}
|
||||||
|
int changed = PortDecayProviders.pulseForTesting(context.getSource().getPlayerOrException(), color, attempts);
|
||||||
|
if (changed < 0) {
|
||||||
|
context.getSource().sendFailure(Component.literal("Decay is disabled by config, Age or provider policy")); return 0;
|
||||||
|
}
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Decay " + color.getSerializedName() + ": " + changed
|
||||||
|
+ " block changes from " + attempts + " bounded attempts; saved score/plan unchanged"), false);
|
||||||
|
var player = context.getSource().getPlayerOrException();
|
||||||
|
var nearby = PortDecaySavedData.get(player.level()).frontier(color).reversed().stream()
|
||||||
|
.filter(pos -> net.minecraft.world.level.ChunkPos.containing(pos).equals(player.chunkPosition()))
|
||||||
|
.limit(4).map(BlockPos::toShortString).toList();
|
||||||
|
if (!nearby.isEmpty()) context.getSource().sendSuccess(() -> Component.literal("Nearby tracked decay: " + nearby), false);
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
private static net.minecraft.server.level.ServerLevel requireAge(CommandSourceStack source)
|
||||||
|
throws com.mojang.brigadier.exceptions.CommandSyntaxException {
|
||||||
|
if (!PortInstabilityRuntime.isAge(source.getLevel())) throw new com.mojang.brigadier.exceptions.SimpleCommandExceptionType(
|
||||||
|
Component.literal("Use this command inside a Rivencraft Age")).create();
|
||||||
|
return source.getLevel();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.neoforged.neoforge.common.ModConfigSpec;
|
||||||
|
|
||||||
|
/** The 1.21.1 scheduler and status-provider defaults, in the port's server-owned config. */
|
||||||
|
public final class PortInstabilityConfig {
|
||||||
|
private static ModConfigSpec.BooleanValue enabled, status, players, nonplayers, hostiles, worldMutation, decay;
|
||||||
|
private static ModConfigSpec.IntValue cooldown, ages, providers, actions, level, chunks, active, candidates, duration, decayAttempts;
|
||||||
|
private static ModConfigSpec.ConfigValue<List<? extends String>> disabledProviders;
|
||||||
|
private static ModConfigSpec.BooleanValue hazards, hazardBlocks, hazardPlayers, hazardFire;
|
||||||
|
private static ModConfigSpec.IntValue hazardInterval, hazardChunks, hazardMaxBlocks, hazardEntities, hazardDamage, hazardRadius;
|
||||||
|
private static ModConfigSpec.BooleanValue meteor, meteorBlocks, meteorPlayers, meteorFire;
|
||||||
|
private static ModConfigSpec.IntValue meteorMaxBlocks, meteorEntities, meteorDamage;
|
||||||
|
private static ModConfigSpec.BooleanValue scorch, scorchPlayers, erosion;
|
||||||
|
private static ModConfigSpec.IntValue scorchTargets;
|
||||||
|
private static ModConfigSpec.IntValue difficulty;
|
||||||
|
private static ModConfigSpec.ConfigValue<List<? extends String>> materialOverrides;
|
||||||
|
private PortInstabilityConfig() {}
|
||||||
|
public static void define(ModConfigSpec.Builder builder) {
|
||||||
|
builder.push("instability");
|
||||||
|
enabled = builder.comment("Run implemented instability providers. Saved scores and plans remain unchanged when disabled.")
|
||||||
|
.define("enabled", true);
|
||||||
|
difficulty = builder.comment("Legacy instability difficulty: 0=quarter, 1=half, 2=normal, 3=1.75x; saved scores stay unchanged.")
|
||||||
|
.defineInRange("difficulty", 2, 0, 3);
|
||||||
|
worldMutation = builder.comment("Allow implemented instability providers to change blocks, as in 1.21.1.")
|
||||||
|
.define("world_mutation", true);
|
||||||
|
cooldown = builder.defineInRange("cooldown_ticks", 20, 20, 1200);
|
||||||
|
ages = builder.defineInRange("max_ages_per_tick", 4, 1, 16);
|
||||||
|
providers = builder.defineInRange("max_providers_per_age", 2, 1, 16);
|
||||||
|
actions = builder.defineInRange("max_actions_per_age", 1, 1, 16);
|
||||||
|
level = builder.defineInRange("max_effect_level", 3, 1, 16);
|
||||||
|
chunks = builder.defineInRange("max_loaded_chunks", 16, 1, 64);
|
||||||
|
disabledProviders = builder.comment("Disable particular providers without changing saved selections. Accepts poison or rivencraft:poison.")
|
||||||
|
.defineListAllowEmpty("disabled_providers", List.of(), () -> "poison", value -> value instanceof String text
|
||||||
|
&& Identifier.tryParse(text) != null);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_status_effects");
|
||||||
|
status = builder.define("enabled", true);
|
||||||
|
players = builder.comment("Affect Survival/Adventure players; Creative and Spectator remain exempt.")
|
||||||
|
.define("affect_players", true);
|
||||||
|
nonplayers = builder.define("affect_nonplayers", true);
|
||||||
|
hostiles = builder.define("buff_hostiles", true);
|
||||||
|
active = builder.defineInRange("max_active_per_age", 32, 1, 128);
|
||||||
|
candidates = builder.defineInRange("max_candidates_per_attempt", 8, 1, 16);
|
||||||
|
duration = builder.defineInRange("max_duration_ticks", 200, 20, 200);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_decay");
|
||||||
|
decay = builder.comment("Allow colored decay in loaded Ages. Also requires instability.world_mutation.")
|
||||||
|
.define("enabled", true);
|
||||||
|
decayAttempts = builder.comment("Maximum six-neighbor conversion attempts per provider call; at most one block changes.")
|
||||||
|
.defineInRange("max_attempts_per_call", 4, 1, 6);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_hazards");
|
||||||
|
hazards = builder.comment("Run Legacy lightning and explosion cards in loaded Ages.").define("enabled", true);
|
||||||
|
hazardBlocks = builder.comment("Allow block destruction; also requires world_mutation and mobGriefing.").define("block_damage", true);
|
||||||
|
hazardPlayers = builder.comment("Allow damage to Survival/Adventure players.").define("player_damage", true);
|
||||||
|
hazardFire = builder.comment("Allow ignition where the vanilla fire-spread rule permits it.").define("fire", true);
|
||||||
|
hazardInterval = builder.defineInRange("minimum_gap_ticks", 20, 20, 12000);
|
||||||
|
hazardChunks = builder.defineInRange("max_loaded_chunks", 81, 1, 169);
|
||||||
|
hazardMaxBlocks = builder.defineInRange("max_explosion_blocks", 16, 0, 64);
|
||||||
|
hazardEntities = builder.defineInRange("max_damaged_entities", 8, 0, 32);
|
||||||
|
hazardDamage = builder.defineInRange("max_entity_damage", 12, 0, 40);
|
||||||
|
hazardRadius = builder.comment("Legacy strength 3, bounded to one already-loaded chunk.").defineInRange("explosion_radius", 3, 1, 3);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_meteor");
|
||||||
|
meteor = builder.comment("Run the active Legacy meteor card in loaded Ages.").define("enabled", true);
|
||||||
|
meteorBlocks = builder.comment("Allow impact block destruction; also requires world_mutation and mobGriefing.")
|
||||||
|
.define("block_damage", true);
|
||||||
|
meteorPlayers = builder.comment("Allow impacts to hurt Survival/Adventure players.").define("player_damage", true);
|
||||||
|
meteorFire = builder.comment("Allow impact fire where the vanilla fire-spread rule permits it.").define("fire", true);
|
||||||
|
meteorMaxBlocks = builder.defineInRange("max_impact_blocks", 24, 0, 64);
|
||||||
|
meteorEntities = builder.defineInRange("max_damaged_entities", 8, 0, 32);
|
||||||
|
meteorDamage = builder.defineInRange("max_entity_damage", 12, 0, 40);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_scorching");
|
||||||
|
scorch = builder.comment("Run Legacy's active burning card on sky-exposed entities.").define("enabled", true);
|
||||||
|
scorchPlayers = builder.comment("Allow burning on Survival/Adventure players.").define("affect_players", true);
|
||||||
|
scorchTargets = builder.defineInRange("max_targets_per_pass", 4, 0, 16);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_erosion");
|
||||||
|
erosion = builder.comment("Enable Legacy's dormant erosion effect for testing; no saved card is added.",
|
||||||
|
"Ages with a score of at least 10000 can spread adjacent source fluid into one eligible block per pass.")
|
||||||
|
.define("enabled", true);
|
||||||
|
builder.pop();
|
||||||
|
builder.push("instability_modded_materials");
|
||||||
|
materialOverrides = builder.comment("Recognized ores, mineral blocks and source fluids from installed mods are scored automatically.",
|
||||||
|
"Optional exact modid:block_id=points overrides; zero excludes a block. No content mod is required.")
|
||||||
|
.defineListAllowEmpty("block_weight_overrides", List.of(), () -> "examplemod:rare_ore=4000", PortInstabilityConfig::validMaterialOverride);
|
||||||
|
builder.pop();
|
||||||
|
}
|
||||||
|
private static boolean validMaterialOverride(Object value) {
|
||||||
|
if (!(value instanceof String entry)) return false;
|
||||||
|
int separator = entry.lastIndexOf('=');
|
||||||
|
if (separator < 1) return false;
|
||||||
|
Identifier id = Identifier.tryParse(entry.substring(0, separator));
|
||||||
|
if (id == null || !entry.substring(0, separator).contains(":")
|
||||||
|
|| id.getNamespace().equals("minecraft") || id.getNamespace().equals("rivencraft")) return false;
|
||||||
|
try { int weight = Integer.parseInt(entry.substring(separator + 1)); return weight >= 0 && weight <= 100000; }
|
||||||
|
catch (NumberFormatException ignored) { return false; }
|
||||||
|
}
|
||||||
|
public static int instabilityDifficulty() { return difficulty.get(); }
|
||||||
|
public static List<? extends String> moddedMaterialOverrides() { return materialOverrides.get(); }
|
||||||
|
public static boolean scorchEnabled() { return scorch.get(); }
|
||||||
|
public static boolean scorchPlayers() { return scorchPlayers.get(); }
|
||||||
|
public static int scorchMaxTargets() { return scorchTargets.get(); }
|
||||||
|
public static boolean erosionEnabled() { return erosion.get(); }
|
||||||
|
public static boolean meteorEnabled() { return meteor.get(); }
|
||||||
|
public static boolean meteorBlockDamage() { return meteorBlocks.get(); }
|
||||||
|
public static boolean meteorPlayerDamage() { return meteorPlayers.get(); }
|
||||||
|
public static boolean meteorFire() { return meteorFire.get(); }
|
||||||
|
public static int meteorMaxBlocks() { return meteorMaxBlocks.get(); }
|
||||||
|
public static int meteorMaxEntities() { return meteorEntities.get(); }
|
||||||
|
public static int meteorMaxDamage() { return meteorDamage.get(); }
|
||||||
|
public static boolean hazardsEnabled() { return hazards.get(); }
|
||||||
|
public static boolean hazardsBlockDamage() { return hazardBlocks.get(); }
|
||||||
|
public static boolean hazardsPlayerDamage() { return hazardPlayers.get(); }
|
||||||
|
public static boolean hazardsFire() { return hazardFire.get(); }
|
||||||
|
public static int hazardsMinInterval() { return hazardInterval.get(); }
|
||||||
|
public static int hazardsMaxChunks() { return hazardChunks.get(); }
|
||||||
|
public static int hazardsMaxBlocks() { return hazardMaxBlocks.get(); }
|
||||||
|
public static int hazardsMaxEntities() { return hazardEntities.get(); }
|
||||||
|
public static int hazardsMaxDamage() { return hazardDamage.get(); }
|
||||||
|
public static int hazardsExplosionRadius() { return hazardRadius.get(); }
|
||||||
|
public static boolean instabilityWorldMutation() { return worldMutation.get(); }
|
||||||
|
public static boolean decayEnabled() { return decay.get(); }
|
||||||
|
public static int decayMaxAttempts() { return decayAttempts.get(); }
|
||||||
|
public static boolean instabilityEnabled() { return enabled.get(); }
|
||||||
|
public static boolean instabilityProviderEnabled(Identifier id) {
|
||||||
|
return disabledProviders.get().stream().noneMatch(value -> value.equals(id.toString())
|
||||||
|
|| id.getNamespace().equals("rivencraft") && value.equals(id.getPath()));
|
||||||
|
}
|
||||||
|
public static int instabilityCooldown() { return cooldown.get(); }
|
||||||
|
public static int instabilityMaxAges() { return ages.get(); }
|
||||||
|
public static int instabilityMaxProviders() { return providers.get(); }
|
||||||
|
public static int instabilityMaxActions() { return actions.get(); }
|
||||||
|
public static int instabilityMaxLevel() { return level.get(); }
|
||||||
|
public static int instabilityMaxChunks() { return chunks.get(); }
|
||||||
|
public static boolean statusEffectsEnabled() { return status.get(); }
|
||||||
|
public static boolean statusEffectsPlayers() { return players.get(); }
|
||||||
|
public static boolean statusEffectsNonplayers() { return nonplayers.get(); }
|
||||||
|
public static boolean statusEffectsHostiles() { return hostiles.get(); }
|
||||||
|
public static int statusEffectsMaxActive() { return active.get(); }
|
||||||
|
public static int statusEffectsMaxCandidates() { return candidates.get(); }
|
||||||
|
public static int statusEffectsMaxDuration() { return duration.get(); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Frozen creation-time contributions and Legacy deck selections. Never silently rescores older Ages. */
|
||||||
|
public final class PortInstabilityData extends SavedData {
|
||||||
|
public record Contribution(String reason, int page, int points) {
|
||||||
|
public static final Codec<Contribution> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
Codec.STRING.fieldOf("reason").forGetter(Contribution::reason),
|
||||||
|
Codec.INT.fieldOf("page").forGetter(Contribution::page),
|
||||||
|
Codec.intRange(0, Integer.MAX_VALUE).fieldOf("points").forGetter(Contribution::points)
|
||||||
|
).apply(instance, Contribution::new));
|
||||||
|
}
|
||||||
|
public record Age(long seed, List<Contribution> contributions, PortInstabilityPlan plan, boolean enabled, java.util.Optional<net.minecraft.core.BlockPos> spawn) {
|
||||||
|
public static final Codec<Age> CODEC = RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
Codec.LONG.fieldOf("seed").forGetter(Age::seed),
|
||||||
|
Contribution.CODEC.listOf().fieldOf("contributions").forGetter(Age::contributions),
|
||||||
|
PortInstabilityPlan.CODEC.fieldOf("plan").forGetter(Age::plan),
|
||||||
|
Codec.BOOL.optionalFieldOf("enabled", true).forGetter(Age::enabled),
|
||||||
|
net.minecraft.core.BlockPos.CODEC.optionalFieldOf("spawn").forGetter(Age::spawn)
|
||||||
|
).apply(instance, Age::new));
|
||||||
|
public Age { contributions = List.copyOf(contributions); spawn = spawn.map(net.minecraft.core.BlockPos::immutable); }
|
||||||
|
public Age(long seed, List<Contribution> contributions, PortInstabilityPlan plan, boolean enabled) {
|
||||||
|
this(seed, contributions, plan, enabled, java.util.Optional.empty());
|
||||||
|
}
|
||||||
|
public int score() { return contributions.stream().mapToInt(Contribution::points).reduce(0, Math::addExact); }
|
||||||
|
}
|
||||||
|
private static final SavedDataType<PortInstabilityData> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "instability"), () -> new PortInstabilityData(Map.of()),
|
||||||
|
Codec.unboundedMap(Identifier.CODEC, Age.CODEC).fieldOf("ages").codec()
|
||||||
|
.xmap(PortInstabilityData::new, data -> Map.copyOf(data.ages)));
|
||||||
|
private final Map<Identifier, Age> ages = new HashMap<>();
|
||||||
|
private PortInstabilityData(Map<Identifier, Age> values) { ages.putAll(values); }
|
||||||
|
public static PortInstabilityData get(MinecraftServer server) { return server.overworld().getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
Age snapshot(Identifier id) { return ages.get(id); }
|
||||||
|
void restore(Identifier id, Age snapshot) {
|
||||||
|
if (snapshot == null) ages.remove(id); else ages.put(id, snapshot);
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
public Age age(ServerLevel level) {
|
||||||
|
Age age = ages.get(level.dimension().identifier());
|
||||||
|
return age != null ? age : new Age(level.getSeed(),
|
||||||
|
List.of(new Contribution("predates_instability", -1, 0)), PortInstabilityPlan.empty(), true);
|
||||||
|
}
|
||||||
|
/** Older neutral Ages stay neutral even if an arrival or enabled flag was later saved. */
|
||||||
|
public boolean supportsProfiling(ServerLevel level) {
|
||||||
|
Age state = ages.get(level.dimension().identifier());
|
||||||
|
return state != null && state.contributions().stream().noneMatch(cost -> cost.reason().equals("predates_instability"));
|
||||||
|
}
|
||||||
|
public void enabled(ServerLevel level, boolean enabled) {
|
||||||
|
Age previous = age(level);
|
||||||
|
ages.put(level.dimension().identifier(), new Age(previous.seed(), previous.contributions(), previous.plan(), enabled, previous.spawn()));
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
/** First resolved arrival remains protected without rescoring or rerolling the Age. */
|
||||||
|
public void recordSpawn(ServerLevel level, net.minecraft.core.BlockPos spawn) {
|
||||||
|
Age previous = age(level);
|
||||||
|
if (previous.spawn().isPresent()) return;
|
||||||
|
ages.put(level.dimension().identifier(), new Age(previous.seed(), previous.contributions(), previous.plan(),
|
||||||
|
previous.enabled(), java.util.Optional.of(spawn.immutable())));
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
public void create(ServerLevel level, List<Identifier> pages, PortAgeTerrain terrain,
|
||||||
|
PortLighting lighting, PortDayCycle cycle) {
|
||||||
|
Identifier id = level.dimension().identifier();
|
||||||
|
if (ages.containsKey(id)) throw new IllegalArgumentException("Instability already recorded for " + id);
|
||||||
|
List<Contribution> costs = new ArrayList<>();
|
||||||
|
costs.add(new Contribution(pages.isEmpty() ? "random_baseline" : "authored_baseline", -1, 0));
|
||||||
|
for (var diagnostic : net.dnorberg.rivencraft.writing.PortWritingRecovery.recover(pages).diagnostics())
|
||||||
|
costs.add(new Contribution("writing_" + diagnostic.code(), diagnostic.index(), diagnostic.points()));
|
||||||
|
boolean authoredBright = false;
|
||||||
|
Map<Identifier, Integer> structures = new HashMap<>();
|
||||||
|
var biomes = level.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().stream()
|
||||||
|
.flatMap(holder -> holder.unwrapKey().stream()).map(key -> key.identifier()).toList();
|
||||||
|
for (int i = 0; i < pages.size(); i++) {
|
||||||
|
Identifier page = pages.get(i);
|
||||||
|
if (!page.getNamespace().equals("rivencraft")) continue;
|
||||||
|
String path = page.getPath();
|
||||||
|
if (path.equals("lighting/bright")) { costs.add(new Contribution("bright_lighting", i, 500)); authoredBright = true; }
|
||||||
|
if (page.equals(PortAcceleratedTicks.PAGE)) costs.add(new Contribution("accelerated", i, 1000));
|
||||||
|
if (isCorrupted(page)) costs.add(new Contribution("corrupted_" + path.substring(10), i,
|
||||||
|
path.endsWith("small") ? 2000 : path.endsWith("medium") ? 1000 : 0));
|
||||||
|
// Legacy charges for sky/weather controllers that Cave terrain cannot apply.
|
||||||
|
if (terrain == PortAgeTerrain.CAVE && (PortWeatherMode.forPage(page) != null
|
||||||
|
|| PortDayCycle.isController(page) || PortDayCycle.isPeriod(page)
|
||||||
|
|| PortDayCycle.isPhase(page) || PortDayCycle.isAngle(page) || PortDayCycle.isDirection(page)))
|
||||||
|
costs.add(new Contribution("cave_ignored_" + path.replace('/', '_'), i, 100));
|
||||||
|
if (net.dnorberg.rivencraft.compat.RuinsTemplatePages.isSymbol(page)) {
|
||||||
|
if (structures.merge(page, 1, Integer::sum) > 3)
|
||||||
|
costs.add(new Contribution("excess_" + path, i, 100));
|
||||||
|
}
|
||||||
|
if (PortStructurePages.supports(page)) {
|
||||||
|
int count = structures.merge(page, 1, Integer::sum);
|
||||||
|
if (count > 3) costs.add(new Contribution("excess_" + path, i, 100));
|
||||||
|
var allowed = PortStructurePages.compatibleBiomes(page, level.registryAccess());
|
||||||
|
if (!allowed.isEmpty() && biomes.stream().anyMatch(biome -> !allowed.contains(biome)))
|
||||||
|
costs.add(new Contribution("forced_biome_" + path, i, 100));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (lighting == PortLighting.BRIGHT && !authoredBright) costs.add(new Contribution("seeded_bright_lighting", -1, 500));
|
||||||
|
int suns = 0;
|
||||||
|
for (var body : cycle.bodies()) if (body.kind() == PortDayCycle.SUN && ++suns > 2)
|
||||||
|
costs.add(new Contribution("extra_sun_" + suns, -1, 1000 * (suns - 2)));
|
||||||
|
int score = costs.stream().mapToInt(Contribution::points).reduce(0, Math::addExact);
|
||||||
|
ages.put(id, new Age(level.getSeed(), costs, PortInstabilityPlan.select(score, level.getSeed()), true));
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
public static boolean isCorrupted(Identifier page) {
|
||||||
|
return page.getNamespace().equals("rivencraft") && switch (page.getPath()) {
|
||||||
|
case "corrupted/large", "corrupted/medium", "corrupted/small" -> true;
|
||||||
|
default -> false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Random;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Frozen provider selection; handler availability and server settings never reroll this plan. */
|
||||||
|
public record PortInstabilityPlan(int version, List<ProviderLevel> providers) {
|
||||||
|
public static final com.mojang.serialization.Codec<PortInstabilityPlan> CODEC =
|
||||||
|
com.mojang.serialization.codecs.RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
com.mojang.serialization.Codec.INT.fieldOf("version").forGetter(PortInstabilityPlan::version),
|
||||||
|
ProviderLevel.CODEC.listOf().fieldOf("providers").forGetter(PortInstabilityPlan::providers)
|
||||||
|
).apply(instance, PortInstabilityPlan::new));
|
||||||
|
public static final int CURRENT_VERSION = 1;
|
||||||
|
|
||||||
|
public PortInstabilityPlan {
|
||||||
|
if (version != CURRENT_VERSION) throw new IllegalArgumentException("Unsupported provider-plan version " + version);
|
||||||
|
providers = List.copyOf(providers);
|
||||||
|
if (providers.stream().map(ProviderLevel::id).distinct().count() != providers.size()) {
|
||||||
|
throw new IllegalArgumentException("Duplicate provider ID in saved Age plan");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortInstabilityPlan empty() { return new PortInstabilityPlan(CURRENT_VERSION, List.of()); }
|
||||||
|
|
||||||
|
public static PortInstabilityPlan select(int score, long ageSeed) {
|
||||||
|
int roundedScore = score / 500 * 500;
|
||||||
|
Map<Identifier, Integer> levels = new LinkedHashMap<>();
|
||||||
|
for (InstabilityProviderCatalog.Deck deck : InstabilityProviderCatalog.Deck.values()) {
|
||||||
|
int remaining = roundedScore - deck.entryCost();
|
||||||
|
if (remaining <= 0) continue;
|
||||||
|
List<InstabilityProviderCatalog.Card> cards = new ArrayList<>(InstabilityProviderCatalog.cards(deck));
|
||||||
|
Collections.shuffle(cards, new Random(ageSeed ^ (0x9E3779B97F4A7C15L * (deck.ordinal() + 1))));
|
||||||
|
for (InstabilityProviderCatalog.Card card : cards) {
|
||||||
|
if (remaining < card.cost()) break;
|
||||||
|
remaining -= card.cost();
|
||||||
|
levels.merge(card.id(), 1, Integer::sum);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new PortInstabilityPlan(CURRENT_VERSION, levels.entrySet().stream()
|
||||||
|
.map(entry -> new ProviderLevel(entry.getKey(), entry.getValue())).toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public record ProviderLevel(Identifier id, int level) {
|
||||||
|
public static final com.mojang.serialization.Codec<ProviderLevel> CODEC =
|
||||||
|
com.mojang.serialization.codecs.RecordCodecBuilder.create(instance -> instance.group(
|
||||||
|
Identifier.CODEC.fieldOf("id").forGetter(ProviderLevel::id),
|
||||||
|
com.mojang.serialization.Codec.intRange(1, 255).fieldOf("level").forGetter(ProviderLevel::level)
|
||||||
|
).apply(instance, ProviderLevel::new));
|
||||||
|
public ProviderLevel {
|
||||||
|
Objects.requireNonNull(id, "id");
|
||||||
|
if (level < 1 || level > 255) throw new IllegalArgumentException("Invalid provider level " + level);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.WeakHashMap;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||||
|
|
||||||
|
/** The 1.21.1 bounded Age scheduler. Unported cards remain saved and visibly unavailable to operators. */
|
||||||
|
@EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class PortInstabilityRuntime {
|
||||||
|
private static final Map<ServerLevel, CachedPlan> PLANS = new WeakHashMap<>();
|
||||||
|
private record CachedPlan(int score, long seed, PortInstabilityPlan plan) {}
|
||||||
|
private static final Map<Identifier, Handler> HANDLERS = new HashMap<>();
|
||||||
|
private static final Map<ServerLevel, Map<Identifier, Long>> FAILURES = new WeakHashMap<>();
|
||||||
|
private static final Map<MinecraftServer, Map<Identifier, Integer>> TEST_SCORES = new WeakHashMap<>();
|
||||||
|
private static final Map<MinecraftServer, TickState> TICKS = new WeakHashMap<>();
|
||||||
|
private PortInstabilityRuntime() {}
|
||||||
|
public static void register(Identifier id, ProviderEffect handler) {
|
||||||
|
register(id, false, handler);
|
||||||
|
}
|
||||||
|
public static void register(Identifier id, boolean worldMutating, ProviderEffect handler) {
|
||||||
|
if (HANDLERS.putIfAbsent(id, new Handler(worldMutating, handler)) != null)
|
||||||
|
throw new IllegalArgumentException("Duplicate instability provider " + id);
|
||||||
|
}
|
||||||
|
public static boolean isAge(ServerLevel level) { return level instanceof PortAgeLevel; }
|
||||||
|
public static PortInstabilityPlan plan(ServerLevel level) {
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
Integer test = testScore(level);
|
||||||
|
int profile = test == null ? PortBlockInstability.score(level) : 0;
|
||||||
|
int difficulty = PortInstabilityConfig.instabilityDifficulty();
|
||||||
|
if (test == null && difficulty == 2 && profile == 0) return age.plan();
|
||||||
|
int score = test != null ? test : PortBlockInstability.difficultyScore((long) age.score() + profile, difficulty);
|
||||||
|
var cached = PLANS.get(level);
|
||||||
|
if (cached == null || cached.score() != score || cached.seed() != age.seed()) {
|
||||||
|
cached = new CachedPlan(score, age.seed(), PortInstabilityPlan.select(score, age.seed()));
|
||||||
|
PLANS.put(level, cached);
|
||||||
|
}
|
||||||
|
return cached.plan();
|
||||||
|
}
|
||||||
|
public static Integer testScore(ServerLevel level) {
|
||||||
|
return TEST_SCORES.getOrDefault(level.getServer(), Map.of()).get(level.dimension().identifier());
|
||||||
|
}
|
||||||
|
public static int effectiveScore(ServerLevel level) {
|
||||||
|
Integer test = testScore(level);
|
||||||
|
if (test != null) return test;
|
||||||
|
return PortBlockInstability.difficultyScore((long) PortInstabilityData.get(level.getServer()).age(level).score()
|
||||||
|
+ PortBlockInstability.score(level), PortInstabilityConfig.instabilityDifficulty());
|
||||||
|
}
|
||||||
|
public static void testScore(ServerLevel level, Integer score) {
|
||||||
|
var values = TEST_SCORES.computeIfAbsent(level.getServer(), ignored -> new HashMap<>());
|
||||||
|
if (score == null) values.remove(level.dimension().identifier()); else values.put(level.dimension().identifier(), score);
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void tick(LevelTickEvent.Post event) {
|
||||||
|
if (!(event.getLevel() instanceof ServerLevel level) || !isAge(level) || level.players().isEmpty()
|
||||||
|
|| !PortInstabilityConfig.instabilityEnabled()) return;
|
||||||
|
var server = level.getServer();
|
||||||
|
long tick = server.getTickCount();
|
||||||
|
int cooldown = PortInstabilityConfig.instabilityCooldown();
|
||||||
|
if (tick % cooldown != 0) return;
|
||||||
|
TickState state = TICKS.computeIfAbsent(server, ignored -> new TickState());
|
||||||
|
if (state.tick != tick) {
|
||||||
|
state.tick = tick;
|
||||||
|
var eligible = new ArrayList<Identifier>();
|
||||||
|
for (var loaded : server.getAllLevels()) if (isAge(loaded) && !loaded.players().isEmpty()
|
||||||
|
&& PortInstabilityData.get(server).age(loaded).enabled() && !plan(loaded).providers().isEmpty())
|
||||||
|
eligible.add(loaded.dimension().identifier());
|
||||||
|
eligible.sort(Comparator.comparing(Identifier::toString));
|
||||||
|
state.eligible = List.copyOf(eligible);
|
||||||
|
}
|
||||||
|
int index = state.eligible.indexOf(level.dimension().identifier());
|
||||||
|
if (index < 0 || state.eligible.size() > PortInstabilityConfig.instabilityMaxAges()
|
||||||
|
&& Math.floorMod(index - (int) Math.floorMod(tick / cooldown, state.eligible.size()), state.eligible.size())
|
||||||
|
>= PortInstabilityConfig.instabilityMaxAges()) return;
|
||||||
|
var age = PortInstabilityData.get(server).age(level);
|
||||||
|
if (!age.enabled()) return;
|
||||||
|
var providers = plan(level).providers();
|
||||||
|
PortHazardProviders.tickPlanned(level, age, tick, providers);
|
||||||
|
PortMeteorProvider.tickPlanned(level, age, tick, providers);
|
||||||
|
PortEnvironmentalProviders.tickPlanned(level, age, tick, providers);
|
||||||
|
var chunks = loadedChunks(level);
|
||||||
|
if (providers.isEmpty() || chunks.isEmpty()) return;
|
||||||
|
Context context = new Context(level, age, chunks, tick, new Budget(PortInstabilityConfig.instabilityMaxActions()));
|
||||||
|
int first = (int) Math.floorMod(tick / cooldown + age.seed(), providers.size());
|
||||||
|
int ran = 0;
|
||||||
|
for (int offset = 0; offset < providers.size() && ran < PortInstabilityConfig.instabilityMaxProviders()
|
||||||
|
&& context.budget().remaining() > 0; offset++) {
|
||||||
|
var provider = providers.get((first + offset) % providers.size());
|
||||||
|
if (!PortHazardProviders.isHazard(provider.id()) && !provider.id().equals(PortMeteorProvider.METEORS)
|
||||||
|
&& !PortEnvironmentalProviders.isEnvironmental(provider.id()) && invoke(context, provider.id(), provider.level())) ran++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static boolean invoke(Context context, Identifier id, int level) {
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !PortInstabilityConfig.instabilityProviderEnabled(id)
|
||||||
|
|| !PortInstabilityData.get(context.level().getServer()).age(context.level()).enabled()) return false;
|
||||||
|
Handler handler = HANDLERS.get(id);
|
||||||
|
if (handler == null || handler.worldMutating() && !PortInstabilityConfig.instabilityWorldMutation()) return false;
|
||||||
|
var failures = FAILURES.computeIfAbsent(context.level(), ignored -> new HashMap<>());
|
||||||
|
if (context.serverTick() < failures.getOrDefault(id, 0L)) return false;
|
||||||
|
try {
|
||||||
|
handler.effect().apply(context, id, Math.min(level, PortInstabilityConfig.instabilityMaxLevel()));
|
||||||
|
} catch (RuntimeException exception) {
|
||||||
|
failures.put(id, context.serverTick() + Math.max(200L, PortInstabilityConfig.instabilityCooldown() * 10L));
|
||||||
|
Rivencraft.LOGGER.error("Instability provider {} failed in {}; temporarily quarantined", id,
|
||||||
|
context.level().dimension().identifier(), exception);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
public static String providerStatus(ServerLevel level, Identifier id) {
|
||||||
|
if (!HANDLERS.containsKey(id)) return "not ported yet";
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled()) return "global config off";
|
||||||
|
if (!PortInstabilityData.get(level.getServer()).age(level).enabled()) return "Age disabled";
|
||||||
|
if (!PortInstabilityConfig.instabilityProviderEnabled(id)) return "provider config off";
|
||||||
|
if (PortHazardProviders.isHazard(id)) {
|
||||||
|
if (!PortInstabilityConfig.hazardsEnabled()) return "hazards config off";
|
||||||
|
} else if (id.equals(PortMeteorProvider.METEORS)) {
|
||||||
|
if (!PortInstabilityConfig.meteorEnabled()) return "meteor config off";
|
||||||
|
} else if (id.equals(PortEnvironmentalProviders.BURNING)) {
|
||||||
|
if (!PortInstabilityConfig.scorchEnabled()) return "burning config off";
|
||||||
|
if (PortInstabilityConfig.scorchMaxTargets() == 0) return "burning target budget zero";
|
||||||
|
} else if (HANDLERS.get(id).worldMutating()) {
|
||||||
|
if (!PortInstabilityConfig.instabilityWorldMutation()) return "world mutation off";
|
||||||
|
if (id.getPath().startsWith("decay") && !PortInstabilityConfig.decayEnabled()) return "decay config off";
|
||||||
|
if (id.equals(PortEnvironmentalProviders.EROSION)) {
|
||||||
|
if (!PortInstabilityConfig.erosionEnabled()) return "erosion config off";
|
||||||
|
if (!PortHazardProviders.canMutate(level)) return "mobGriefing off";
|
||||||
|
if (effectiveScore(level) < InstabilityProviderCatalog.Deck.DESTRUCTIVE.entryCost()) return "erosion threshold not met";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!PortInstabilityConfig.statusEffectsEnabled()) return "status effects config off";
|
||||||
|
if (id.getPath().startsWith("enemy") && !PortInstabilityConfig.statusEffectsHostiles()) return "hostile buffs disabled";
|
||||||
|
if (!id.getPath().startsWith("enemy") && !PortInstabilityConfig.statusEffectsPlayers()
|
||||||
|
&& !PortInstabilityConfig.statusEffectsNonplayers()) return "all general targets disabled";
|
||||||
|
}
|
||||||
|
if (level.getServer().getTickCount() < FAILURES.getOrDefault(level, Map.of()).getOrDefault(id, 0L)) return "quarantined";
|
||||||
|
return level.players().isEmpty() ? "no players in Age" : "eligible; sky, targets and budgets still apply";
|
||||||
|
}
|
||||||
|
static List<ChunkPos> loadedChunks(ServerLevel level) {
|
||||||
|
var chunks = new LinkedHashSet<ChunkPos>();
|
||||||
|
for (var player : level.players()) {
|
||||||
|
ChunkPos center = player.chunkPosition();
|
||||||
|
for (int x = -1; x <= 1; x++) for (int z = -1; z <= 1; z++) {
|
||||||
|
if (level.getChunkSource().getChunkNow(center.x() + x, center.z() + z) != null)
|
||||||
|
chunks.add(new ChunkPos(center.x() + x, center.z() + z));
|
||||||
|
if (chunks.size() >= PortInstabilityConfig.instabilityMaxChunks()) return List.copyOf(chunks);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return List.copyOf(chunks);
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void stopping(ServerStoppingEvent event) {
|
||||||
|
TEST_SCORES.remove(event.getServer()); TICKS.remove(event.getServer()); FAILURES.clear(); PLANS.clear();
|
||||||
|
}
|
||||||
|
public interface ProviderEffect { void apply(Context context, Identifier id, int level); }
|
||||||
|
public record Context(ServerLevel level, PortInstabilityData.Age age, List<ChunkPos> loadedChunks,
|
||||||
|
long serverTick, Budget budget) { public Context { loadedChunks = List.copyOf(loadedChunks); } }
|
||||||
|
public static final class Budget {
|
||||||
|
private int remaining;
|
||||||
|
private int applied;
|
||||||
|
public Budget(int maximum) { remaining = maximum; }
|
||||||
|
public boolean claim() { if (remaining <= 0) return false; remaining--; return true; }
|
||||||
|
public int remaining() { return remaining; }
|
||||||
|
public void recordApplied() { applied++; }
|
||||||
|
public int applied() { return applied; }
|
||||||
|
}
|
||||||
|
private record Handler(boolean worldMutating, ProviderEffect effect) {}
|
||||||
|
private static final class TickState { long tick = Long.MIN_VALUE; List<Identifier> eligible = List.of(); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,121 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||||
|
import net.minecraft.commands.Commands;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.ChestBlock;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.RegisterCommandsEvent;
|
||||||
|
|
||||||
|
/** Explicit operator tools; normal generation does not search or force-load remote chunks. */
|
||||||
|
@EventBusSubscriber(modid = "rivencraft")
|
||||||
|
public final class PortLibraryCommands {
|
||||||
|
@SubscribeEvent public static void register(RegisterCommandsEvent event) {
|
||||||
|
var root = Commands.literal("rivencraft_port").requires(Commands.hasPermission(Commands.LEVEL_ADMINS));
|
||||||
|
root.then(Commands.literal("library")
|
||||||
|
.then(Commands.literal("test_place").executes(context -> {
|
||||||
|
var level = context.getSource().getLevel();
|
||||||
|
var direction = context.getSource().getEntity() instanceof net.minecraft.world.entity.player.Player player
|
||||||
|
? player.getDirection() : net.minecraft.core.Direction.NORTH;
|
||||||
|
var result = PortLibraryFeature.testPlace(level, BlockPos.containing(context.getSource().getPosition()), direction,
|
||||||
|
level.getSeed(), PortLibraryWriting.get(level.getServer()).symbols(level.dimension().identifier()));
|
||||||
|
if (result.isEmpty()) { context.getSource().sendFailure(Component.literal("No clear placement nearby; use open ground with headroom.")); return 0; }
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Library placed. Chest: " + result.get().toShortString()), false);
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("test_spacing").then(Commands.argument("chunks", IntegerArgumentType.integer(1, 32))
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getLevel();
|
||||||
|
if (!RuntimeAgeBackend.savedAges(level.getServer()).containsKey(level.dimension().identifier()))
|
||||||
|
throw new IllegalArgumentException("Use this test override inside a Rivencraft Age");
|
||||||
|
int spacing = IntegerArgumentType.getInteger(context, "chunks");
|
||||||
|
PortLibraryFeature.setTestSpacing(level.getSeed(), spacing);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Session-only library spacing: " + spacing
|
||||||
|
+ " chunks. Applies to newly generated chunks; 32 restores normal spacing."), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("candidate").executes(context -> {
|
||||||
|
var level = context.getSource().getLevel();
|
||||||
|
var origin = ChunkPos.containing(BlockPos.containing(context.getSource().getPosition()));
|
||||||
|
ChunkPos best = null;
|
||||||
|
long distance = Long.MAX_VALUE;
|
||||||
|
for (int spacing : new int[]{32, PortLibraryFeature.spacing(level.getSeed())}) {
|
||||||
|
int rx = Math.floorDiv(origin.x(), spacing), rz = Math.floorDiv(origin.z(), spacing);
|
||||||
|
for (int dx = -2; dx <= 2; dx++) for (int dz = -2; dz <= 2; dz++) {
|
||||||
|
var candidate = PortLibraryFeature.candidateChunk(level.getSeed(), rx + dx, rz + dz, spacing);
|
||||||
|
long x = candidate.x() - origin.x(), z = candidate.z() - origin.z();
|
||||||
|
long d = x * x + z * z;
|
||||||
|
if (d < distance) { best = candidate; distance = d; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var candidate = best;
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Nearest candidate chunk " + candidate
|
||||||
|
+ ", center X=" + (candidate.getMinBlockX() + 8) + " Z=" + (candidate.getMinBlockZ() + 8)
|
||||||
|
+ ". A candidate is not a guaranteed library: footing, slope and clear space must pass."), false);
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("probe").executes(context -> {
|
||||||
|
var level = context.getSource().getLevel();
|
||||||
|
var chunk = level.getChunkAt(BlockPos.containing(context.getSource().getPosition()));
|
||||||
|
var chest = PortLibraryFeature.libraryChest(chunk);
|
||||||
|
if (chest.isPresent()) context.getSource().sendSuccess(() -> Component.literal("Generated library chest: " + chest.get().toShortString()), false);
|
||||||
|
else {
|
||||||
|
var check = PortLibraryFeature.check(level, chunk.getPos(), level.getSeed());
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal(check.eligible() ? "Eligible library candidate, floor Y=" + check.floorY()
|
||||||
|
: "No library in this chunk: " + check.reason()), false);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("inspect_loot").executes(context -> {
|
||||||
|
var level = context.getSource().getLevel();
|
||||||
|
var chunk = level.getChunkAt(BlockPos.containing(context.getSource().getPosition()));
|
||||||
|
var pos = PortLibraryFeature.libraryChest(chunk);
|
||||||
|
if (pos.isEmpty()) { context.getSource().sendFailure(Component.literal("No marked library chest in this chunk.")); return 0; }
|
||||||
|
var chest = (net.minecraft.world.level.block.entity.ChestBlockEntity) level.getBlockEntity(pos.get());
|
||||||
|
var items = new java.util.ArrayList<String>();
|
||||||
|
for (int i = 0; i < chest.getContainerSize(); i++) {
|
||||||
|
var item = chest.getItem(i); // Materializes loot exactly as opening the chest does.
|
||||||
|
if (!item.isEmpty()) items.add(item.getCount() + "x " + item.getHoverName().getString());
|
||||||
|
}
|
||||||
|
long stands = chunk.getBlockEntities().values().stream()
|
||||||
|
.filter(be -> be instanceof net.dnorberg.rivencraft.block.entity.BookStandBlockEntity).count();
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Library at " + pos.get().toShortString()
|
||||||
|
+ "; stands in this chunk=" + stands + "; chest=" + items), false);
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
|
.then(Commands.literal("nearest_loaded").executes(context -> {
|
||||||
|
var player = context.getSource().getPlayerOrException();
|
||||||
|
var level = player.level();
|
||||||
|
var origin = player.chunkPosition();
|
||||||
|
BlockPos best = null; double distance = Double.MAX_VALUE;
|
||||||
|
for (int x = origin.x() - 16; x <= origin.x() + 16; x++) for (int z = origin.z() - 16; z <= origin.z() + 16; z++) {
|
||||||
|
var chunk = level.getChunkSource().getChunkNow(x, z);
|
||||||
|
if (chunk == null) continue;
|
||||||
|
var found = PortLibraryFeature.libraryChest(chunk);
|
||||||
|
if (found.isPresent()) {
|
||||||
|
double d = player.distanceToSqr(Vec3.atCenterOf(found.get()));
|
||||||
|
if (d < distance) { best = found.get(); distance = d; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (best == null) { context.getSource().sendFailure(Component.literal("No library in loaded chunks within 16 chunks. Use candidate or test_spacing to explore new terrain.")); return 0; }
|
||||||
|
var facing = level.getBlockState(best).getValue(ChestBlock.FACING);
|
||||||
|
var feet = best.relative(facing, 2).relative(facing.getCounterClockWise());
|
||||||
|
var target = Vec3.atBottomCenterOf(feet);
|
||||||
|
if (!level.getBlockState(feet.below()).isFaceSturdy(level, feet.below(), net.minecraft.core.Direction.UP)
|
||||||
|
|| !level.getFluidState(feet).isEmpty() || !level.getFluidState(feet.above()).isEmpty()
|
||||||
|
|| !level.noCollision(player, player.getBoundingBox().move(target.subtract(player.position())))) {
|
||||||
|
context.getSource().sendFailure(Component.literal("Library found at " + best.toShortString() + " but its aisle is obstructed.")); return 0;
|
||||||
|
}
|
||||||
|
player.teleportTo(level, target.x, target.y, target.z, java.util.Set.of(), facing.getOpposite().toYRot(), 0, true);
|
||||||
|
return 1;
|
||||||
|
})));
|
||||||
|
event.getDispatcher().register(root);
|
||||||
|
}
|
||||||
|
@SubscribeEvent public static void stopped(net.neoforged.neoforge.event.server.ServerStoppedEvent event) {
|
||||||
|
PortLibraryFeature.clearTestSpacing();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,363 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.block.BookStandBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.tags.BlockTags;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.ChestBlock;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.block.entity.ChestBlockEntity;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraft.world.level.levelgen.LegacyRandomSource;
|
||||||
|
import net.minecraft.world.level.levelgen.WorldgenRandom;
|
||||||
|
import net.minecraft.world.level.storage.loot.LootTable;
|
||||||
|
import net.minecraft.world.level.block.Rotation;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
|
||||||
|
/** Sparse, page-free Age library. Its entire footprint lives in its candidate chunk. */
|
||||||
|
public final class PortLibraryFeature {
|
||||||
|
public static final int REGION = 32;
|
||||||
|
static final int FOOTPRINT = 11;
|
||||||
|
private static final int OFFSET_BOUND = 24;
|
||||||
|
private static final int MAX_SUPPORT_DEPTH = 24;
|
||||||
|
private static final int SALT = 14357617;
|
||||||
|
private static final int TEST_SALT = 0x4C494252;
|
||||||
|
private static final String CHEST_MARKER = "RivencraftLibrary";
|
||||||
|
private static final ConcurrentHashMap<Long, Integer> TEST_SPACING = new ConcurrentHashMap<>();
|
||||||
|
// x, y, z, clockwise turns relative to the left stand. The middle row
|
||||||
|
// faces across the room; the far stand faces back toward the entrance.
|
||||||
|
private static final int[][] STANDS = {{6, 1, 2, 0}, {8, 1, 4, 1}, {8, 1, 5, 1},
|
||||||
|
{8, 1, 6, 1}, {6, 1, 8, 2}};
|
||||||
|
private static final Identifier TEMPLATE = Identifier.fromNamespaceAndPath(
|
||||||
|
"rivencraft", "mystcraft_library");
|
||||||
|
private static final ResourceKey<LootTable> CHEST_LOOT = ResourceKey.create(Registries.LOOT_TABLE,
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "chests/mystcraft_library"));
|
||||||
|
|
||||||
|
private PortLibraryFeature() {}
|
||||||
|
|
||||||
|
record Site(int x, int z, int rotation) {}
|
||||||
|
|
||||||
|
public static int spacing(long seed) {
|
||||||
|
return TEST_SPACING.getOrDefault(seed, REGION);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Session-only testing override; normal 32-chunk sites always remain eligible. */
|
||||||
|
public static void setTestSpacing(long seed, int chunks) {
|
||||||
|
if (chunks < 1 || chunks > REGION) throw new IllegalArgumentException("Invalid library spacing " + chunks);
|
||||||
|
if (chunks == REGION) TEST_SPACING.remove(seed);
|
||||||
|
else TEST_SPACING.put(seed, chunks);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void clearTestSpacing() {
|
||||||
|
TEST_SPACING.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The single deterministic candidate in one Legacy-sized region. */
|
||||||
|
public static ChunkPos candidateChunk(long seed, int regionX, int regionZ) {
|
||||||
|
return candidateChunk(seed, regionX, regionZ, REGION);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ChunkPos candidateChunk(long seed, int regionX, int regionZ, int spacing) {
|
||||||
|
if (spacing < 1 || spacing > REGION) throw new IllegalArgumentException("Invalid library spacing " + spacing);
|
||||||
|
WorldgenRandom random = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
random.setLargeFeatureWithSalt(seed, regionX, regionZ,
|
||||||
|
spacing == REGION ? SALT : TEST_SALT ^ spacing);
|
||||||
|
int bound = spacing == REGION ? OFFSET_BOUND : spacing;
|
||||||
|
return new ChunkPos(regionX * spacing + random.nextInt(bound),
|
||||||
|
regionZ * spacing + random.nextInt(bound));
|
||||||
|
}
|
||||||
|
|
||||||
|
static Site site(long seed, ChunkPos chunk) {
|
||||||
|
Site normal = site(seed, chunk, REGION);
|
||||||
|
return normal != null ? normal : spacing(seed) == REGION ? null : site(seed, chunk, spacing(seed));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Site site(long seed, ChunkPos chunk, int spacing) {
|
||||||
|
int rx = Math.floorDiv(chunk.x(), spacing);
|
||||||
|
int rz = Math.floorDiv(chunk.z(), spacing);
|
||||||
|
WorldgenRandom random = new WorldgenRandom(new LegacyRandomSource(0L));
|
||||||
|
random.setLargeFeatureWithSalt(seed, rx, rz,
|
||||||
|
spacing == REGION ? SALT : TEST_SALT ^ spacing);
|
||||||
|
int bound = spacing == REGION ? OFFSET_BOUND : spacing;
|
||||||
|
int candidateX = rx * spacing + random.nextInt(bound);
|
||||||
|
int candidateZ = rz * spacing + random.nextInt(bound);
|
||||||
|
if (chunk.x() != candidateX || chunk.z() != candidateZ) return null;
|
||||||
|
return new Site(chunk.getMinBlockX() + 2, chunk.getMinBlockZ() + 2, random.nextInt(4));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A saved marker distinguishes a generated library from player-built chests. */
|
||||||
|
public static Optional<BlockPos> libraryChest(LevelChunk chunk) {
|
||||||
|
return chunk.getBlockEntities().entrySet().stream()
|
||||||
|
.filter(entry -> entry.getValue() instanceof ChestBlockEntity chest
|
||||||
|
&& chest.getPersistentData().getBooleanOr(CHEST_MARKER, false))
|
||||||
|
.map(java.util.Map.Entry::getKey).findFirst();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Recognize libraries generated before the chest marker was introduced. */
|
||||||
|
public static Optional<BlockPos> libraryChest(LevelChunk chunk, long seed) {
|
||||||
|
Optional<BlockPos> marked = libraryChest(chunk);
|
||||||
|
if (marked.isPresent()) return marked;
|
||||||
|
Site site = site(seed, chunk.getPos());
|
||||||
|
if (site == null) return Optional.empty();
|
||||||
|
for (var entry : chunk.getBlockEntities().entrySet()) {
|
||||||
|
if (!(entry.getValue() instanceof ChestBlockEntity chest)) continue;
|
||||||
|
int y = entry.getKey().getY();
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
if (!entry.getKey().equals(mapped(site, cursor, 4, y, 2))
|
||||||
|
|| !chunk.getBlockState(mapped(site, cursor, 2, y, 2)).is(Blocks.BOOKSHELF)
|
||||||
|
|| !chunk.getBlockState(mapped(site, cursor, 2, y + 1, 2)).is(Blocks.BOOKSHELF)
|
||||||
|
|| !chunk.getBlockState(mapped(site, cursor, 4, y + 6, 2)).is(Blocks.OAK_PLANKS))
|
||||||
|
continue;
|
||||||
|
chest.getPersistentData().putBoolean(CHEST_MARKER, true);
|
||||||
|
chest.setChanged();
|
||||||
|
return Optional.of(entry.getKey());
|
||||||
|
}
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Open interior aisle, directly above the cobblestone floor. */
|
||||||
|
public static BlockPos arrival(long seed, ChunkPos chunk, int chestY) {
|
||||||
|
Site site = site(seed, chunk);
|
||||||
|
if (site == null) throw new IllegalArgumentException("Not a library candidate chunk: " + chunk);
|
||||||
|
return mapped(site, new BlockPos.MutableBlockPos(), 5, chestY, 4).immutable();
|
||||||
|
}
|
||||||
|
|
||||||
|
public record PlacementCheck(String reason, int floorY, int[][] heights) {
|
||||||
|
public boolean eligible() { return reason == null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Inspect one candidate without placing blocks. The same test gates natural placement. */
|
||||||
|
public static PlacementCheck check(WorldGenLevel level, ChunkPos chunk, long seed) {
|
||||||
|
Site site = site(seed, chunk);
|
||||||
|
if (site == null) return rejected("not a candidate chunk");
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
int low = Integer.MAX_VALUE;
|
||||||
|
int high = Integer.MIN_VALUE;
|
||||||
|
int[][] heights = new int[FOOTPRINT][FOOTPRINT];
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++) {
|
||||||
|
int wx = site.x() + x;
|
||||||
|
int wz = site.z() + z;
|
||||||
|
int y = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, wx, wz);
|
||||||
|
// The heightmap includes tree canopies. Libraries sit on terrain, not leaves.
|
||||||
|
while (y > level.getMinY() + 2) {
|
||||||
|
BlockState below = level.getBlockState(cursor.set(wx, y - 1, wz));
|
||||||
|
if (!below.isAir() && !isVegetation(below)) break;
|
||||||
|
y--;
|
||||||
|
}
|
||||||
|
if (y < level.getMinY() + 2) return rejected("no surface footing");
|
||||||
|
BlockState ground = level.getBlockState(cursor.set(wx, y - 1, wz));
|
||||||
|
if (!ground.getFluidState().isEmpty()) return rejected("fluid at ground level");
|
||||||
|
if (ground.hasBlockEntity() || !ground.isFaceSturdy(level, cursor, Direction.UP))
|
||||||
|
return rejected("ground is not sturdy terrain");
|
||||||
|
heights[x][z] = y;
|
||||||
|
low = Math.min(low, y);
|
||||||
|
high = Math.max(high, y);
|
||||||
|
}
|
||||||
|
if (high + 10 >= level.getMaxY()) return rejected("insufficient build height");
|
||||||
|
if (high - low > MAX_SUPPORT_DEPTH) return rejected("slope exceeds support depth ("
|
||||||
|
+ (high - low) + " > " + MAX_SUPPORT_DEPTH + ")");
|
||||||
|
// Check the entire raised foundation and house. Foliage can be cleared, but not
|
||||||
|
// structures, fluids, or block entities already occupying this volume.
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++)
|
||||||
|
for (int y = heights[x][z]; y <= high + 10; y++) {
|
||||||
|
BlockState state = level.getBlockState(cursor.set(site.x() + x, y, site.z() + z));
|
||||||
|
if (!state.getFluidState().isEmpty()) return rejected("fluid inside footprint");
|
||||||
|
if (state.hasBlockEntity()) return rejected("block entity inside footprint");
|
||||||
|
if (!(state.isAir() || state.canBeReplaced() || isVegetation(state)))
|
||||||
|
return rejected("solid obstruction inside footprint: "
|
||||||
|
+ state.getBlock().getDescriptionId());
|
||||||
|
}
|
||||||
|
return new PlacementCheck(null, high, heights);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static PlacementCheck rejected(String reason) {
|
||||||
|
return new PlacementCheck(reason, 0, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isVegetation(BlockState state) {
|
||||||
|
return state.is(BlockTags.LEAVES) || state.is(BlockTags.LOGS)
|
||||||
|
|| state.is(BlockTags.FLOWERS) || state.is(BlockTags.SAPLINGS)
|
||||||
|
|| !state.isAir() && state.canBeReplaced() && state.getFluidState().isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean generate(WorldGenLevel level, ChunkAccess chunk, long seed,
|
||||||
|
List<Identifier> ageSymbols) {
|
||||||
|
Site site = site(seed, chunk.getPos());
|
||||||
|
if (site == null) return false;
|
||||||
|
PlacementCheck check = check(level, chunk.getPos(), seed);
|
||||||
|
if (!check.eligible()) return false;
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++)
|
||||||
|
for (int y = check.heights()[x][z]; y <= check.floorY() + 10; y++) {
|
||||||
|
BlockPos pos = cursor.set(site.x() + x, y, site.z() + z);
|
||||||
|
if (isVegetation(level.getBlockState(pos))) level.setBlock(pos, Blocks.AIR.defaultBlockState(), 2);
|
||||||
|
}
|
||||||
|
return build(level, site, check.floorY(), check.heights(), seed, ageSymbols);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Explicit OP testing placement. Never overwrites existing blocks or entities. */
|
||||||
|
public static Optional<BlockPos> testPlace(ServerLevel level, BlockPos playerPos, Direction facing,
|
||||||
|
long seed, List<Identifier> ageSymbols) {
|
||||||
|
Direction horizontal = facing.getAxis().isHorizontal() ? facing : Direction.NORTH;
|
||||||
|
BlockPos center = playerPos.relative(horizontal, 13);
|
||||||
|
int rotation = switch (horizontal) {
|
||||||
|
case NORTH -> 2;
|
||||||
|
case EAST -> 3;
|
||||||
|
case WEST -> 1;
|
||||||
|
default -> 0;
|
||||||
|
};
|
||||||
|
Site site = new Site(center.getX() - FOOTPRINT / 2, center.getZ() - FOOTPRINT / 2, rotation);
|
||||||
|
int floorY = playerPos.getY() + 2;
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++)
|
||||||
|
floorY = Math.max(floorY, level.getHeight(Heightmap.Types.WORLD_SURFACE,
|
||||||
|
site.x() + x, site.z() + z) + 1);
|
||||||
|
if (floorY + 10 >= level.getMaxY() || floorY - playerPos.getY() > 20)
|
||||||
|
return Optional.empty();
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++)
|
||||||
|
for (int y = floorY; y <= floorY + 10; y++) {
|
||||||
|
BlockPos pos = cursor.set(site.x() + x, y, site.z() + z);
|
||||||
|
if (!level.getWorldBorder().isWithinBounds(pos) || !level.getBlockState(pos).isAir())
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
if (!level.getEntities(null, new AABB(site.x(), floorY, site.z(),
|
||||||
|
site.x() + FOOTPRINT, floorY + 11, site.z() + FOOTPRINT)).isEmpty())
|
||||||
|
return Optional.empty();
|
||||||
|
if (!build(level, site, floorY, null, seed, ageSymbols)) return Optional.empty();
|
||||||
|
return Optional.of(mapped(site, cursor, 4, floorY + 1, 2).immutable());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean build(WorldGenLevel level, Site site, int floorY, int[][] heights,
|
||||||
|
long seed, List<Identifier> ageSymbols) {
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
var template = level.getLevel().getStructureTemplateManager().get(TEMPLATE).orElse(null);
|
||||||
|
if (template == null || template.getSize().getX() != FOOTPRINT
|
||||||
|
|| template.getSize().getY() != FOOTPRINT || template.getSize().getZ() != FOOTPRINT)
|
||||||
|
return false;
|
||||||
|
for (int x = 0; x < FOOTPRINT; x++) for (int z = 0; z < FOOTPRINT; z++) {
|
||||||
|
for (int y = heights == null ? floorY : heights[x][z] - 1; y <= floorY; y++)
|
||||||
|
place(level, site, cursor, x, y, z, Blocks.COBBLESTONE.defaultBlockState());
|
||||||
|
}
|
||||||
|
Rotation rotation = switch (site.rotation()) {
|
||||||
|
case 1 -> Rotation.CLOCKWISE_90;
|
||||||
|
case 2 -> Rotation.CLOCKWISE_180;
|
||||||
|
case 3 -> Rotation.COUNTERCLOCKWISE_90;
|
||||||
|
default -> Rotation.NONE;
|
||||||
|
};
|
||||||
|
BlockPos origin = new BlockPos(site.x(), floorY, site.z());
|
||||||
|
var settings = new StructurePlaceSettings().setRotation(rotation)
|
||||||
|
.setRotationPivot(new BlockPos(5, 0, 5)).setIgnoreEntities(true);
|
||||||
|
long positionSalt = new ChunkPos(site.x() >> 4, site.z() >> 4).pack();
|
||||||
|
if (!template.placeInWorld(level, origin, origin, settings,
|
||||||
|
RandomSource.create(seed ^ positionSalt), 2)) return false;
|
||||||
|
|
||||||
|
BlockPos chestPos = mapped(site, cursor, 4, floorY + 1, 2).immutable();
|
||||||
|
level.setBlock(chestPos, Blocks.CHEST.defaultBlockState().setValue(ChestBlock.FACING,
|
||||||
|
Direction.from2DDataValue(site.rotation())), 2);
|
||||||
|
PortConfig.LibraryLootMode mode = PortConfig.LIBRARY_LOOT_MODE.get();
|
||||||
|
boolean ageOnly = mode == PortConfig.LibraryLootMode.AGE_ONLY;
|
||||||
|
List<Identifier> symbols = symbolsForLoot(ageSymbols, mode);
|
||||||
|
RandomSource random = RandomSource.create(seed ^ positionSalt ^ SALT);
|
||||||
|
if (level.getBlockEntity(chestPos) instanceof ChestBlockEntity chest) {
|
||||||
|
chest.getPersistentData().putBoolean(CHEST_MARKER, true);
|
||||||
|
chest.setChanged();
|
||||||
|
if (ageOnly) {
|
||||||
|
// Pages are frozen in the Age generator, then saved as real chest items.
|
||||||
|
boolean[] occupied = new boolean[chest.getContainerSize()];
|
||||||
|
for (int i = 0, count = symbols.isEmpty() ? 0 : 4 + random.nextInt(5); i < count; i++) {
|
||||||
|
int slot;
|
||||||
|
do slot = random.nextInt(occupied.length); while (occupied[slot]);
|
||||||
|
occupied[slot] = true;
|
||||||
|
chest.setItem(slot, page(symbols, random));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
chest.setLootTable(CHEST_LOOT, seed ^ chestPos.asLong());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int[] standCoords : STANDS) {
|
||||||
|
BlockPos pos = mapped(site, cursor, standCoords[0], floorY + standCoords[1], standCoords[2]).immutable();
|
||||||
|
if (!level.getBlockState(pos).isAir()) continue;
|
||||||
|
level.setBlock(pos, Rivencraft.BOOK_STAND.get().defaultBlockState()
|
||||||
|
.setValue(BookStandBlock.FACING, standFacing(site, standCoords[3]))
|
||||||
|
.setValue(BookStandBlock.HAS_BOOK, true), 2);
|
||||||
|
if (level.getBlockEntity(pos) instanceof BookStandBlockEntity stand) {
|
||||||
|
stand.setBook(symbols.isEmpty() ? new ItemStack(Items.BOOK) : page(symbols, random));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static Direction standFacing(Site site, int clockwiseTurns) {
|
||||||
|
return Direction.from2DDataValue((site.rotation() + clockwiseTurns) & 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Correct older generated stands in place, retaining their block entities and pages. */
|
||||||
|
public static int repairStandFacings(ServerLevel level, LevelChunk chunk, long seed) {
|
||||||
|
Site site = site(seed, chunk.getPos());
|
||||||
|
if (site == null || libraryChest(chunk, seed).isEmpty()) return -1;
|
||||||
|
int changed = 0;
|
||||||
|
BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
|
||||||
|
int chestY = libraryChest(chunk, seed).orElseThrow().getY();
|
||||||
|
for (int[] standCoords : STANDS) {
|
||||||
|
BlockPos pos = mapped(site, cursor, standCoords[0], chestY, standCoords[2]);
|
||||||
|
BlockState state = level.getBlockState(pos);
|
||||||
|
if (!state.is(Rivencraft.BOOK_STAND.get())) continue;
|
||||||
|
Direction facing = standFacing(site, standCoords[3]);
|
||||||
|
if (state.getValue(BookStandBlock.FACING) != facing) {
|
||||||
|
level.setBlock(pos, state.setValue(BookStandBlock.FACING, facing), 3);
|
||||||
|
changed++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode) {
|
||||||
|
return symbolsForLoot(ageSymbols, mode, PortRandomPagePolicy.configured());
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode,
|
||||||
|
PortRandomPagePolicy policy) {
|
||||||
|
return mode == PortConfig.LibraryLootMode.AGE_ONLY
|
||||||
|
? ageSymbols.stream().filter(policy::allows).filter(id -> PortSymbolPages.find(id) != null).distinct().toList()
|
||||||
|
: PortSymbolPages.libraryCandidateIds().stream().filter(policy::allows).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemStack page(List<Identifier> symbols, RandomSource random) {
|
||||||
|
return PageItem.createSymbolPage(symbols.get(random.nextInt(symbols.size())));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static BlockPos.MutableBlockPos mapped(Site site, BlockPos.MutableBlockPos cursor, int x, int y, int z) {
|
||||||
|
return switch (site.rotation()) {
|
||||||
|
case 1 -> cursor.set(site.x() + FOOTPRINT - 1 - z, y, site.z() + x);
|
||||||
|
case 2 -> cursor.set(site.x() + FOOTPRINT - 1 - x, y, site.z() + FOOTPRINT - 1 - z);
|
||||||
|
case 3 -> cursor.set(site.x() + z, y, site.z() + FOOTPRINT - 1 - x);
|
||||||
|
default -> cursor.set(site.x() + x, y, site.z() + z);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void place(WorldGenLevel level, Site site, BlockPos.MutableBlockPos cursor,
|
||||||
|
int x, int y, int z, BlockState state) {
|
||||||
|
level.setBlock(mapped(site, cursor, x, y, z), state, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Written pages for library Age-only loot, kept outside the legacy backend index codec. */
|
||||||
|
final class PortLibraryWriting extends SavedData {
|
||||||
|
static final Codec<PortLibraryWriting> CODEC = Codec.unboundedMap(Identifier.CODEC, Identifier.CODEC.listOf())
|
||||||
|
.fieldOf("ages").codec().xmap(PortLibraryWriting::new, data -> Map.copyOf(data.pages));
|
||||||
|
static final SavedDataType<PortLibraryWriting> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "library_writing"), () -> new PortLibraryWriting(Map.of()), CODEC);
|
||||||
|
private final Map<Identifier, List<Identifier>> pages = new HashMap<>();
|
||||||
|
private PortLibraryWriting(Map<Identifier, List<Identifier>> pages) { pages.forEach((id, list) -> this.pages.put(id, List.copyOf(list))); }
|
||||||
|
static PortLibraryWriting get(MinecraftServer server) { return server.overworld().getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
List<Identifier> symbols(Identifier id) { return pages.getOrDefault(id, List.of()); }
|
||||||
|
void put(Identifier id, List<Identifier> symbols) {
|
||||||
|
if (symbols.isEmpty()) pages.remove(id); else pages.put(id, List.copyOf(symbols));
|
||||||
|
setDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.WeakHashMap;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.particles.ParticleTypes;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.sounds.SoundSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.level.LevelEvent;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||||
|
|
||||||
|
/** The 1.21.1 meteor's short particle descent and bounded impact, without a new entity. */
|
||||||
|
@EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class PortMeteorProvider {
|
||||||
|
public static final Identifier METEORS = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "meteors");
|
||||||
|
private static final int METEOR_FLIGHT_TICKS = 30;
|
||||||
|
private static final int MAX_ACTIVE_AGES = 16;
|
||||||
|
private static final Map<ServerLevel, Meteor> ACTIVE = new WeakHashMap<>();
|
||||||
|
private PortMeteorProvider() {}
|
||||||
|
public static void register() {
|
||||||
|
PortInstabilityRuntime.register(METEORS, false, (context, id, level) -> {
|
||||||
|
if (PortInstabilityRuntime.isAge(context.level())) scheduleMeteor(context, level, false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
static void tickPlanned(ServerLevel level, PortInstabilityData.Age age, long tick,
|
||||||
|
List<PortInstabilityPlan.ProviderLevel> providers) {
|
||||||
|
var card = providers.stream().filter(provider -> provider.id().equals(METEORS)).findFirst();
|
||||||
|
if (card.isEmpty() || !PortInstabilityConfig.meteorEnabled()) return;
|
||||||
|
var chunks = PortHazardProviders.loadedChunksNearPlayers(level, PortInstabilityConfig.hazardsMaxChunks());
|
||||||
|
if (!chunks.isEmpty()) PortInstabilityRuntime.invoke(new PortInstabilityRuntime.Context(level, age, chunks,
|
||||||
|
tick, new PortInstabilityRuntime.Budget(1)), METEORS, card.get().level());
|
||||||
|
}
|
||||||
|
/** Skip the chance roll only; retain per-Age policy, loading, active-flight and cooldown checks. */
|
||||||
|
public static int pulseForTesting(ServerPlayer player) {
|
||||||
|
ServerLevel level = player.level();
|
||||||
|
if (!PortInstabilityRuntime.isAge(level)) return -1;
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !PortInstabilityConfig.meteorEnabled()
|
||||||
|
|| !age.enabled() || !PortInstabilityConfig.instabilityProviderEnabled(METEORS)) return 0;
|
||||||
|
var chunks = PortHazardProviders.loadedChunksNearPlayers(level, 16);
|
||||||
|
if (chunks.isEmpty()) return 0;
|
||||||
|
return scheduleMeteor(new PortInstabilityRuntime.Context(level, age, chunks,
|
||||||
|
level.getServer().getTickCount(), new PortInstabilityRuntime.Budget(1)), 1, true) ? 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean scheduleMeteor(PortInstabilityRuntime.Context context, int effectiveLevel, boolean force) {
|
||||||
|
if (!PortInstabilityConfig.meteorEnabled() || ACTIVE.containsKey(context.level())
|
||||||
|
|| ACTIVE.size() >= MAX_ACTIVE_AGES) return false;
|
||||||
|
PortHazardSavedData data = PortHazardSavedData.get(context.level());
|
||||||
|
long gameTime = context.level().getGameTime();
|
||||||
|
if (!data.meteorReady(gameTime, 200)) return false;
|
||||||
|
Random random = new Random(context.age().seed() ^ data.nextAttempt() * 0xD1B54A32D192ED03L
|
||||||
|
^ METEORS.hashCode());
|
||||||
|
if (!force && random.nextDouble() >= PortHazardProviders.legacyChance(context.loadedChunks().size(),
|
||||||
|
PortInstabilityConfig.instabilityCooldown(), effectiveLevel, 50000)) return false;
|
||||||
|
int start = random.nextInt(context.loadedChunks().size());
|
||||||
|
for (int offset = 0; offset < Math.min(16, context.loadedChunks().size()); offset++) {
|
||||||
|
ChunkPos chunk = context.loadedChunks().get((start + offset) % context.loadedChunks().size());
|
||||||
|
int x = chunk.getMinBlockX() + 6 + random.nextInt(4);
|
||||||
|
int z = chunk.getMinBlockZ() + 6 + random.nextInt(4);
|
||||||
|
int surfaceY = context.level().getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, x, z);
|
||||||
|
BlockPos impact = new BlockPos(x, surfaceY, z);
|
||||||
|
if (surfaceY >= context.level().getMaxY() - 8
|
||||||
|
|| !PortHazardProviders.safeTarget(context, impact, 8)) continue;
|
||||||
|
if (!context.budget().claim()) return false;
|
||||||
|
int startY = Math.min(context.level().getMaxY() - 2, surfaceY + 48);
|
||||||
|
data.recordMeteor(gameTime);
|
||||||
|
ACTIVE.put(context.level(), new Meteor(chunk, impact, startY, METEOR_FLIGHT_TICKS));
|
||||||
|
context.level().playSound(null, impact, Rivencraft.METEOR_ROAR.get(), SoundSource.WEATHER, 2.0F, 1.0F);
|
||||||
|
context.budget().recordApplied();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onLevelTickPost(LevelTickEvent.Post event) {
|
||||||
|
if (!(event.getLevel() instanceof ServerLevel level)) return;
|
||||||
|
Meteor meteor = ACTIVE.get(level);
|
||||||
|
if (meteor == null) return;
|
||||||
|
if (!PortInstabilityConfig.instabilityEnabled() || !PortInstabilityConfig.meteorEnabled()
|
||||||
|
|| !PortInstabilityRuntime.isAge(level)
|
||||||
|
|| level.players().isEmpty()
|
||||||
|
|| level.getChunkSource().getChunkNow(meteor.chunk().x(), meteor.chunk().z()) == null) {
|
||||||
|
ACTIVE.remove(level);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var age = PortInstabilityData.get(level.getServer()).age(level);
|
||||||
|
if (!age.enabled()
|
||||||
|
|| !PortInstabilityConfig.instabilityProviderEnabled(METEORS)) {
|
||||||
|
ACTIVE.remove(level);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
int remaining = meteor.remaining() - 1;
|
||||||
|
if (remaining <= 0) {
|
||||||
|
ACTIVE.remove(level); // clear before impact so an exception cannot replay it
|
||||||
|
PortHazardProviders.explodeBounded(level, age, meteor.chunk(), meteor.impact(),
|
||||||
|
PortInstabilityConfig.meteorBlockDamage(), PortInstabilityConfig.meteorPlayerDamage(),
|
||||||
|
PortInstabilityConfig.meteorFire(), PortInstabilityConfig.meteorMaxBlocks(),
|
||||||
|
PortInstabilityConfig.meteorMaxEntities(), PortInstabilityConfig.meteorMaxDamage(), 3);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
double progress = 1.0 - remaining / (double) METEOR_FLIGHT_TICKS;
|
||||||
|
double y = meteor.startY() + (meteor.impact().getY() - meteor.startY()) * progress;
|
||||||
|
double x = meteor.impact().getX() + 0.5 + (1.0 - progress) * 2.0;
|
||||||
|
double z = meteor.impact().getZ() + 0.5 + (1.0 - progress) * 2.0;
|
||||||
|
level.sendParticles(ParticleTypes.FLAME, x, y, z, 5, 0.25, 0.25, 0.25, 0.01);
|
||||||
|
level.sendParticles(ParticleTypes.LARGE_SMOKE, x, y, z, 2, 0.3, 0.3, 0.3, 0.02);
|
||||||
|
ACTIVE.put(level, new Meteor(meteor.chunk(), meteor.impact(), meteor.startY(), remaining));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onServerStopping(ServerStoppingEvent event) {
|
||||||
|
ACTIVE.clear(); // an interrupted descent is cancelled, never replayed after restart
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onLevelUnload(LevelEvent.Unload event) {
|
||||||
|
if (event.getLevel() instanceof ServerLevel level) ACTIVE.remove(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
private record Meteor(ChunkPos chunk, BlockPos impact, int startY, int remaining) {}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||||
|
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
|
||||||
|
/** Family pools are resolved only when binding new writing, never re-filtered on load. */
|
||||||
|
public final class PortNativeBiomePools {
|
||||||
|
private PortNativeBiomePools() {}
|
||||||
|
public static final TagKey<Biome> CAVES = TagKey.create(Registries.BIOME,
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "cave_biomes"));
|
||||||
|
|
||||||
|
public static List<Identifier> pool(HolderLookup.Provider registries, NativeBiomeKind kind) {
|
||||||
|
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
||||||
|
var nether = java.util.Set.copyOf(TerraBlenderBiomes.nether(registries));
|
||||||
|
java.util.function.Predicate<Holder.Reference<Biome>> isNether =
|
||||||
|
biome -> biome.is(BiomeTags.IS_NETHER) || nether.contains(biome.key().identifier());
|
||||||
|
var selected = biomes.listElements()
|
||||||
|
.filter(biome -> !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||||
|
.filter(biome -> switch (kind) {
|
||||||
|
case CAVES -> biome.is(CAVES) && !isNether.test(biome);
|
||||||
|
case NETHER -> isNether.test(biome);
|
||||||
|
case END -> biome.is(BiomeTags.IS_END);
|
||||||
|
case TERRAIN -> throw new IllegalArgumentException("Terrain Native uses its own preset");
|
||||||
|
}).map(biome -> biome.key().identifier()).toList();
|
||||||
|
// Built-in family members remain recognizable if a data pack replaces the broad tags.
|
||||||
|
List<String> vanilla = switch (kind) {
|
||||||
|
case CAVES -> List.of("lush_caves", "dripstone_caves", "deep_dark", "sulfur_caves");
|
||||||
|
case NETHER -> List.of("nether_wastes", "soul_sand_valley", "crimson_forest", "warped_forest", "basalt_deltas");
|
||||||
|
case END -> List.of("the_end", "end_highlands", "end_midlands", "small_end_islands", "end_barrens");
|
||||||
|
default -> List.of();
|
||||||
|
};
|
||||||
|
var fallback = vanilla.stream().map(Identifier::withDefaultNamespace)
|
||||||
|
.filter(id -> biomes.get(ResourceKey.create(Registries.BIOME, id))
|
||||||
|
.filter(biome -> kind != NativeBiomeKind.CAVES || !isNether.test(biome)).isPresent());
|
||||||
|
var result = Stream.concat(selected.stream(), fallback).distinct().sorted().toList();
|
||||||
|
if (!result.isEmpty()) return result; // A one-biome family becomes a safe FixedBiomeSource.
|
||||||
|
var safe = kind == NativeBiomeKind.CAVES ? biomes.listElements().filter(biome -> !isNether.test(biome)
|
||||||
|
&& !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder")))
|
||||||
|
.map(biome -> biome.key().identifier()).sorted().findFirst()
|
||||||
|
: java.util.Optional.<Identifier>empty();
|
||||||
|
return safe.map(List::of).orElseThrow(() -> new IllegalArgumentException("No usable " + kind + " biomes"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,20 +17,39 @@ public final class PortRandomAgeSelection {
|
|||||||
public record Selection(PortAgeTerrain terrain, PortBiomePlan biomes) {}
|
public record Selection(PortAgeTerrain terrain, PortBiomePlan biomes) {}
|
||||||
|
|
||||||
public static Selection select(MinecraftServer server, long seed) {
|
public static Selection select(MinecraftServer server, long seed) {
|
||||||
|
return select(server, seed, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Selection select(MinecraftServer server, long seed, PortRandomPagePolicy policy) {
|
||||||
// Match the 1.21.1 Legacy-rank choices: Standard and Flat are common;
|
// Match the 1.21.1 Legacy-rank choices: Standard and Flat are common;
|
||||||
// the other terrain families are rarer. The sorted order is deliberate.
|
// the other terrain families are rarer. The sorted order is deliberate.
|
||||||
PortAgeTerrain terrain = terrain(seed);
|
PortAgeTerrain terrain = terrain(seed, policy);
|
||||||
if (terrain == PortAgeTerrain.VOID)
|
if (terrain == PortAgeTerrain.VOID)
|
||||||
return new Selection(terrain, new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,
|
return new Selection(terrain, new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,
|
||||||
List.of(Identifier.withDefaultNamespace("the_void"))));
|
List.of(Identifier.withDefaultNamespace("the_void"))));
|
||||||
|
|
||||||
PortBiomePlan.Distribution distribution = distribution(seed);
|
PortBiomePlan.Distribution distribution = distribution(seed, policy);
|
||||||
List<Identifier> eligible = eligibleBiomes(server, terrain);
|
List<Identifier> eligible = eligibleBiomes(server, terrain);
|
||||||
if (eligible.size() < 2 && distribution != PortBiomePlan.Distribution.NATIVE)
|
if (distribution != PortBiomePlan.Distribution.NATIVE) {
|
||||||
distribution = PortBiomePlan.Distribution.SINGLE;
|
var filtered = new ArrayList<>(policy.eligible(eligible, PortRegistryPages::biomePageId));
|
||||||
|
// Native presets are not Page-selected. Other controllers retain their minimum,
|
||||||
|
// with the same preferred-biome/registry fallback as 1.21.1.
|
||||||
|
int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
|
||||||
|
Identifier preferred = Identifier.withDefaultNamespace(terrain == PortAgeTerrain.CAVE ? "deep_dark" : "plains");
|
||||||
|
if (filtered.size() < minimum && eligible.contains(preferred) && !filtered.contains(preferred))
|
||||||
|
filtered.add(preferred);
|
||||||
|
for (var candidate : eligible)
|
||||||
|
if (filtered.size() < minimum && !filtered.contains(candidate)) filtered.add(candidate);
|
||||||
|
eligible = List.copyOf(filtered);
|
||||||
|
if (eligible.size() < 2) distribution = PortBiomePlan.Distribution.SINGLE;
|
||||||
|
}
|
||||||
if (distribution == PortBiomePlan.Distribution.NATIVE)
|
if (distribution == PortBiomePlan.Distribution.NATIVE)
|
||||||
return new Selection(terrain, new PortBiomePlan(distribution,
|
return new Selection(terrain, new PortBiomePlan(distribution,
|
||||||
terrain == PortAgeTerrain.CAVE ? eligible : List.of()));
|
terrain == PortAgeTerrain.CAVE
|
||||||
|
? PortNativeBiomePools.pool(server.registryAccess(), net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES)
|
||||||
|
: List.of(), terrain == PortAgeTerrain.CAVE
|
||||||
|
? net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES
|
||||||
|
: net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN));
|
||||||
|
|
||||||
int count = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
|
int count = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
|
||||||
if (count > 1) {
|
if (count > 1) {
|
||||||
@@ -48,18 +67,28 @@ public final class PortRandomAgeSelection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static PortAgeTerrain terrain(long seed) {
|
public static PortAgeTerrain terrain(long seed) {
|
||||||
return weighted(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{1, 1, 5, 1, 6, 1});
|
return terrain(seed, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortAgeTerrain terrain(long seed, PortRandomPagePolicy policy) {
|
||||||
|
return ranked(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{3, 3, 2, 3, 1, 3},
|
||||||
|
policy, value -> PortRandomPagePolicy.page("terrain", value), PortAgeTerrain.STANDARD);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** First AgeTraits draw in 1.21.1; shared by random and partly authored Ages. */
|
/** First AgeTraits draw in 1.21.1; shared by random and partly authored Ages. */
|
||||||
public static PortBiomePlan.Distribution distribution(long seed) {
|
public static PortBiomePlan.Distribution distribution(long seed) {
|
||||||
return weighted(new Random(seed ^ 0x524956454E435241L),
|
return distribution(seed, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortBiomePlan.Distribution distribution(long seed, PortRandomPagePolicy policy) {
|
||||||
|
return ranked(new Random(seed ^ 0x524956454E435241L),
|
||||||
List.of(PortBiomePlan.Distribution.NATIVE, PortBiomePlan.Distribution.SINGLE,
|
List.of(PortBiomePlan.Distribution.NATIVE, PortBiomePlan.Distribution.SINGLE,
|
||||||
PortBiomePlan.Distribution.MEDIUM, PortBiomePlan.Distribution.TILED,
|
PortBiomePlan.Distribution.MEDIUM, PortBiomePlan.Distribution.TILED,
|
||||||
PortBiomePlan.Distribution.GRID, PortBiomePlan.Distribution.TINY,
|
PortBiomePlan.Distribution.GRID, PortBiomePlan.Distribution.TINY,
|
||||||
PortBiomePlan.Distribution.SMALL, PortBiomePlan.Distribution.LARGE,
|
PortBiomePlan.Distribution.SMALL, PortBiomePlan.Distribution.LARGE,
|
||||||
PortBiomePlan.Distribution.HUGE),
|
PortBiomePlan.Distribution.HUGE),
|
||||||
new int[]{3, 3, 3, 1, 1, 1, 1, 1, 1});
|
new int[]{1, 1, 1, 2, 2, 2, 2, 2, 2}, policy,
|
||||||
|
value -> PortRandomPagePolicy.page("biome", value), PortBiomePlan.Distribution.NATIVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Identifier> eligibleBiomes(MinecraftServer server, PortAgeTerrain terrain) {
|
public static List<Identifier> eligibleBiomes(MinecraftServer server, PortAgeTerrain terrain) {
|
||||||
@@ -69,24 +98,28 @@ public final class PortRandomAgeSelection {
|
|||||||
}
|
}
|
||||||
List<Identifier> surface = server.overworld().getChunkSource().getGenerator().getBiomeSource()
|
List<Identifier> surface = server.overworld().getChunkSource().getGenerator().getBiomeSource()
|
||||||
.possibleBiomes().stream().flatMap(holder -> holder.unwrapKey().stream())
|
.possibleBiomes().stream().flatMap(holder -> holder.unwrapKey().stream())
|
||||||
.map(key -> key.identifier()).distinct().sorted(Comparator.naturalOrder()).toList();
|
.map(key -> key.identifier()).filter(id -> !id.equals(PortRegistryPages.DEFERRED_PLACEHOLDER))
|
||||||
|
.distinct().sorted(Comparator.naturalOrder()).toList();
|
||||||
|
surface = java.util.stream.Stream.concat(surface.stream(),
|
||||||
|
net.dnorberg.rivencraft.compat.TerraBlenderBiomes.overworld(server.registryAccess()).stream())
|
||||||
|
.distinct().sorted().toList();
|
||||||
return surface.isEmpty() ? List.of(Identifier.withDefaultNamespace("plains")) : surface;
|
return surface.isEmpty() ? List.of(Identifier.withDefaultNamespace("plains")) : surface;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Identifier> caveBiomes(net.minecraft.core.HolderLookup.Provider registries) {
|
public static List<Identifier> caveBiomes(net.minecraft.core.HolderLookup.Provider registries) {
|
||||||
|
net.dnorberg.rivencraft.compat.TerraBlenderBiomes.nether(registries);
|
||||||
var caves = registries.lookupOrThrow(Registries.BIOME).listElements()
|
var caves = registries.lookupOrThrow(Registries.BIOME).listElements()
|
||||||
.filter(PortRegistryPages::isCaveBiome).map(holder -> holder.key().identifier()).sorted().toList();
|
.filter(PortRegistryPages::isCaveBiome).map(holder -> holder.key().identifier()).sorted().toList();
|
||||||
return caves.isEmpty() ? List.of(Identifier.withDefaultNamespace("lush_caves")) : caves;
|
return caves.isEmpty() ? List.of(Identifier.withDefaultNamespace("lush_caves")) : caves;
|
||||||
}
|
}
|
||||||
|
|
||||||
static <T> T weighted(Random random, List<T> choices, int[] weights) {
|
private static <T> T ranked(Random random, List<T> choices, int[] ranks, PortRandomPagePolicy policy,
|
||||||
int total = 0;
|
java.util.function.Function<T, Identifier> page, T fallback) {
|
||||||
for (int weight : weights) total += weight;
|
var options = new ArrayList<PortRankedChoice.Option<T>>();
|
||||||
int ticket = random.nextInt(total);
|
for (int i = 0; i < choices.size(); i++)
|
||||||
for (int index = 0; index < choices.size(); index++) {
|
options.add(new PortRankedChoice.Option<>(choices.get(i), ranks[i]));
|
||||||
ticket -= weights[index];
|
var eligible = policy.eligible(options, option -> page.apply(option.value()));
|
||||||
if (ticket < 0) return choices.get(index);
|
return eligible.isEmpty() ? fallback : PortRankedChoice.choose(random, eligible);
|
||||||
}
|
|
||||||
throw new IllegalStateException("Random Age ticket was not consumed");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+18
-8
@@ -14,16 +14,25 @@ public final class PortRandomFeatureSelection {
|
|||||||
|
|
||||||
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
|
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
|
||||||
PortAgeTerrain terrain, PortBiomePlan biomes) {
|
PortAgeTerrain terrain, PortBiomePlan biomes) {
|
||||||
var base = select(seed, terrain);
|
return select(server, seed, terrain, biomes, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes);
|
}
|
||||||
|
|
||||||
|
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
|
||||||
|
PortAgeTerrain terrain, PortBiomePlan biomes, PortRandomPagePolicy policy) {
|
||||||
|
var base = select(seed, terrain, policy);
|
||||||
|
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes, policy);
|
||||||
var plan = base.terrain();
|
var plan = base.terrain();
|
||||||
plan = plan == null ? new PortTerrainFeaturePlan(List.of(), false, 0, false, structures.structures(), List.of(), true)
|
plan = plan == null ? new PortTerrainFeaturePlan(List.of(), false, 0, false, structures.structures(), List.of(), true)
|
||||||
: new PortTerrainFeaturePlan(plan.choices(), plan.skylands(), plan.denseOres(), plan.starFissures(),
|
: new PortTerrainFeaturePlan(plan.choices(), plan.skylands(), plan.denseOres(), plan.starFissures(),
|
||||||
structures.structures(), plan.carvers(), true);
|
structures.structures(), plan.carvers(), true, plan.ruins());
|
||||||
return new Selection(base.rocks(), base.lakes(), plan, structures.dungeons());
|
return new Selection(base.rocks(), base.lakes(), plan, structures.dungeons());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Selection select(long seed, PortAgeTerrain terrain) {
|
public static Selection select(long seed, PortAgeTerrain terrain) {
|
||||||
|
return select(seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Selection select(long seed, PortAgeTerrain terrain, PortRandomPagePolicy policy) {
|
||||||
var random = new Random(seed ^ 0x4D4154455249414CL);
|
var random = new Random(seed ^ 0x4D4154455249414CL);
|
||||||
int count = random.nextInt(3);
|
int count = random.nextInt(3);
|
||||||
var terrainPage = id("terrain/" + terrain.name().toLowerCase(java.util.Locale.ROOT));
|
var terrainPage = id("terrain/" + terrain.name().toLowerCase(java.util.Locale.ROOT));
|
||||||
@@ -31,12 +40,13 @@ public final class PortRandomFeatureSelection {
|
|||||||
for (String name : List.of("rocks", "floating_islands", "tendrils", "spheres", "spikes", "obelisks",
|
for (String name : List.of("rocks", "floating_islands", "tendrils", "spheres", "spikes", "obelisks",
|
||||||
"surface_lakes", "deep_lakes", "lava_lakes")) {
|
"surface_lakes", "deep_lakes", "lava_lakes")) {
|
||||||
var page = id("feature/" + name);
|
var page = id("feature/" + name);
|
||||||
if (PortAuthoredWriting.supports(List.of(terrainPage, page)))
|
if (policy.allows(page) && PortAuthoredWriting.supports(List.of(terrainPage, page)))
|
||||||
candidates.add(new PortRankedChoice.Option<>(page, rank(name)));
|
candidates.add(new PortRankedChoice.Option<>(page, rank(name)));
|
||||||
}
|
}
|
||||||
var pages = new ArrayList<Identifier>();
|
var pages = new ArrayList<Identifier>();
|
||||||
pages.add(terrainPage);
|
pages.add(terrainPage);
|
||||||
List<Identifier> solids = PortRegistryPages.solidMaterialIds(), fluids = PortRegistryPages.fluidMaterialIds();
|
List<Identifier> solids = policy.eligible(PortRegistryPages.solidMaterialIds(), PortRegistryPages::blockPageId);
|
||||||
|
List<Identifier> fluids = policy.eligible(PortRegistryPages.fluidMaterialIds(), PortRegistryPages::blockPageId);
|
||||||
for (int selected = 0; selected < count && !candidates.isEmpty();) {
|
for (int selected = 0; selected < count && !candidates.isEmpty();) {
|
||||||
Identifier feature = PortRankedChoice.choose(random, candidates);
|
Identifier feature = PortRankedChoice.choose(random, candidates);
|
||||||
candidates.removeIf(option -> option.value().equals(feature));
|
candidates.removeIf(option -> option.value().equals(feature));
|
||||||
@@ -46,12 +56,12 @@ public final class PortRandomFeatureSelection {
|
|||||||
pages.add(feature);
|
pages.add(feature);
|
||||||
selected++;
|
selected++;
|
||||||
}
|
}
|
||||||
if (terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID
|
if (policy.allows(PortTerrainFeaturePlan.SKYLANDS) && terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID
|
||||||
&& Math.floorMod(mix(seed ^ 0x534B594C414E4453L), 8) == 0)
|
&& Math.floorMod(mix(seed ^ 0x534B594C414E4453L), 8) == 0)
|
||||||
pages.add(PortTerrainFeaturePlan.SKYLANDS);
|
pages.add(PortTerrainFeaturePlan.SKYLANDS);
|
||||||
if (terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0)
|
if (policy.allows(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS) && terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0)
|
||||||
pages.add(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS);
|
pages.add(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS);
|
||||||
if (randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES);
|
if (policy.allows(PortTerrainFeaturePlan.STAR_FISSURES) && randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES);
|
||||||
return new Selection(PortAuthoredWriting.rockPlan(pages, seed), PortAuthoredWriting.lakePlan(pages, seed),
|
return new Selection(PortAuthoredWriting.rockPlan(pages, seed), PortAuthoredWriting.lakePlan(pages, seed),
|
||||||
PortAuthoredWriting.terrainFeaturePlan(pages, seed), 0);
|
PortAuthoredWriting.terrainFeaturePlan(pages, seed), 0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Creation-time eligibility; the resolved Age settings are saved, never reselected on reload. */
|
||||||
|
public record PortRandomPagePolicy(Set<Identifier> allowlist, Set<Identifier> blocklist) {
|
||||||
|
public static final PortRandomPagePolicy UNRESTRICTED = new PortRandomPagePolicy(Set.of(), Set.of());
|
||||||
|
|
||||||
|
public PortRandomPagePolicy {
|
||||||
|
allowlist = Set.copyOf(allowlist);
|
||||||
|
blocklist = Set.copyOf(blocklist);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortRandomPagePolicy configured() {
|
||||||
|
return new PortRandomPagePolicy(parse(PortConfig.RANDOM_PAGE_ALLOWLIST.get()),
|
||||||
|
parse(PortConfig.RANDOM_PAGE_BLOCKLIST.get()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Set<Identifier> parse(List<? extends String> ids) {
|
||||||
|
return ids.stream().map(PortRandomPagePolicy::parsePageId).collect(Collectors.toUnmodifiableSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Server config IDs may omit the built-in Rivencraft namespace. */
|
||||||
|
public static Identifier parsePageId(String value) {
|
||||||
|
Identifier id = Identifier.tryParse(value.contains(":") ? value : "rivencraft:" + value);
|
||||||
|
if (id == null) throw new IllegalArgumentException("Invalid Page ID " + value);
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean allows(Identifier id) {
|
||||||
|
if (blocklist.contains(id)) return false;
|
||||||
|
String category = category(id);
|
||||||
|
return !restricts(category) || allowlist.contains(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean restricts(String category) {
|
||||||
|
return allowlist.stream().anyMatch(entry -> category(entry).equals(category));
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T> List<T> eligible(List<T> candidates, java.util.function.Function<T, Identifier> pageId) {
|
||||||
|
return candidates.stream().filter(candidate -> allows(pageId.apply(candidate))).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T> List<T> required(List<T> candidates, java.util.function.Function<T, Identifier> pageId,
|
||||||
|
T fallback) {
|
||||||
|
List<T> eligible = eligible(candidates, pageId);
|
||||||
|
return eligible.isEmpty() ? List.of(fallback) : eligible;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String category(Identifier id) {
|
||||||
|
String path = id.getPath();
|
||||||
|
if (path.startsWith("biome/") && java.util.Set.of("native", "native_caves", "native_nether", "native_end", "single", "tiled", "grid",
|
||||||
|
"tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length())))
|
||||||
|
return "biome_distribution";
|
||||||
|
return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Identifier page(String category, Enum<?> value) {
|
||||||
|
return Identifier.fromNamespaceAndPath("rivencraft", category + "/"
|
||||||
|
+ value.name().toLowerCase(java.util.Locale.ROOT));
|
||||||
|
}
|
||||||
|
}
|
||||||
+6
-1
@@ -19,6 +19,11 @@ public final class PortRandomStructureSelection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan) {
|
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan) {
|
||||||
|
return select(server, seed, terrain, plan, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan,
|
||||||
|
PortRandomPagePolicy policy) {
|
||||||
Set<Identifier> biomes = actualBiomes(server, terrain, plan);
|
Set<Identifier> biomes = actualBiomes(server, terrain, plan);
|
||||||
var eligible = new ArrayList<PortRankedChoice.Option<Identifier>>();
|
var eligible = new ArrayList<PortRankedChoice.Option<Identifier>>();
|
||||||
for (String name : List.of("dungeons", "mineshafts", "nether_fortresses", "strongholds", "villages",
|
for (String name : List.of("dungeons", "mineshafts", "nether_fortresses", "strongholds", "villages",
|
||||||
@@ -32,7 +37,7 @@ public final class PortRandomStructureSelection {
|
|||||||
.get(ResourceKey.create(Registries.PLACED_FEATURE,
|
.get(ResourceKey.create(Registries.PLACED_FEATURE,
|
||||||
Identifier.fromNamespaceAndPath("rivencraft", "dungeons"))).isPresent()
|
Identifier.fromNamespaceAndPath("rivencraft", "dungeons"))).isPresent()
|
||||||
: PortStructurePages.randomEligible(feature, terrain, biomes, server.registryAccess());
|
: PortStructurePages.randomEligible(feature, terrain, biomes, server.registryAccess());
|
||||||
if (allowed) eligible.add(new PortRankedChoice.Option<>(feature, rank(name)));
|
if (allowed && policy.allows(feature)) eligible.add(new PortRankedChoice.Option<>(feature, rank(name)));
|
||||||
}
|
}
|
||||||
var random = new Random(seed ^ 0x5354525543545552L);
|
var random = new Random(seed ^ 0x5354525543545552L);
|
||||||
int count = random.nextInt(3), dungeons = 0;
|
int count = random.nextInt(3), dungeons = 0;
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** Frozen per-Age season choice, separate from the backend's legacy index codec. */
|
||||||
|
public final class PortSeasonPolicies extends SavedData {
|
||||||
|
public enum Mode {
|
||||||
|
NO_SEASONS, SEASONS, ETERNAL_WINTER, ETERNAL_SUMMER, ETERNAL_FALL, ETERNAL_SPRING;
|
||||||
|
public boolean eternal() { return this != NO_SEASONS && this != SEASONS; }
|
||||||
|
}
|
||||||
|
public record Policy(Mode mode, boolean authored) {
|
||||||
|
static final Codec<Policy> CODEC = RecordCodecBuilder.create(i -> i.group(
|
||||||
|
Codec.STRING.xmap(Mode::valueOf, Mode::name).fieldOf("mode").forGetter(Policy::mode),
|
||||||
|
Codec.BOOL.fieldOf("authored").forGetter(Policy::authored)).apply(i, Policy::new));
|
||||||
|
}
|
||||||
|
private static final SavedDataType<PortSeasonPolicies> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "season_policies"), () -> new PortSeasonPolicies(Map.of()),
|
||||||
|
Codec.unboundedMap(Identifier.CODEC, Policy.CODEC).fieldOf("ages").codec()
|
||||||
|
.xmap(PortSeasonPolicies::new, data -> Map.copyOf(data.policies)));
|
||||||
|
private final Map<Identifier, Policy> policies = new HashMap<>();
|
||||||
|
private PortSeasonPolicies(Map<Identifier, Policy> values) { policies.putAll(values); }
|
||||||
|
public static PortSeasonPolicies get(MinecraftServer server) { return server.overworld().getDataStorage().computeIfAbsent(TYPE); }
|
||||||
|
Policy snapshot(Identifier id) { return policies.get(id); }
|
||||||
|
void put(Identifier id, Policy policy) { if (policy == null) policies.remove(id); else policies.put(id, policy); setDirty(); }
|
||||||
|
public Policy forLevel(ServerLevel level) {
|
||||||
|
if (level instanceof PortAgeLevel age && age.caveTerrain()) return new Policy(Mode.NO_SEASONS, true);
|
||||||
|
// Existing Ages retain cycling behavior when integration is installed later.
|
||||||
|
return policies.getOrDefault(level.dimension().identifier(), new Policy(Mode.SEASONS, false));
|
||||||
|
}
|
||||||
|
public static Mode forPage(Identifier id) {
|
||||||
|
if (!id.getNamespace().equals("rivencraft") || !id.getPath().startsWith("season/")) return null;
|
||||||
|
try { return Mode.valueOf(id.getPath().substring(7).toUpperCase(Locale.ROOT)); }
|
||||||
|
catch (IllegalArgumentException e) { return null; }
|
||||||
|
}
|
||||||
|
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed) {
|
||||||
|
return select(pages, seed, terrain, installed, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed, PortRandomPagePolicy policy) {
|
||||||
|
if (terrain == PortAgeTerrain.CAVE) return new Policy(Mode.NO_SEASONS, true);
|
||||||
|
Mode written = null;
|
||||||
|
for (var page : pages) if (forPage(page) != null) written = forPage(page);
|
||||||
|
if (written != null) {
|
||||||
|
if (!installed && written != Mode.NO_SEASONS) throw new IllegalArgumentException("Seasonal pages require Serene Seasons");
|
||||||
|
return new Policy(written, true);
|
||||||
|
}
|
||||||
|
if (!installed) return null;
|
||||||
|
// 1.21.1 LegacyRankChoice ranks: Seasons=1, None=2, each Eternal=3.
|
||||||
|
var modes = List.of(new PortRankedChoice.Option<>(Mode.SEASONS, 1),
|
||||||
|
new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2),
|
||||||
|
new PortRankedChoice.Option<>(Mode.ETERNAL_WINTER, 3),
|
||||||
|
new PortRankedChoice.Option<>(Mode.ETERNAL_SUMMER, 3),
|
||||||
|
new PortRankedChoice.Option<>(Mode.ETERNAL_FALL, 3),
|
||||||
|
new PortRankedChoice.Option<>(Mode.ETERNAL_SPRING, 3));
|
||||||
|
Mode mode = PortRankedChoice.choose(new Random(seed ^ 0x5E450A5E5EED21L),
|
||||||
|
policy.required(modes, option -> PortRandomPagePolicy.page("season", option.value()),
|
||||||
|
new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2)));
|
||||||
|
return new Policy(mode, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,9 +26,13 @@ public enum PortSkyStyle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static PortSkyStyle resolve(List<Identifier> pages, long seed) {
|
public static PortSkyStyle resolve(List<Identifier> pages, long seed) {
|
||||||
|
return resolve(pages, seed, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortSkyStyle resolve(List<Identifier> pages, long seed, PortRandomPagePolicy policy) {
|
||||||
return pages.stream().map(PortSkyStyle::forPage).filter(java.util.Objects::nonNull)
|
return pages.stream().map(PortSkyStyle::forPage).filter(java.util.Objects::nonNull)
|
||||||
.findFirst().orElseGet(() -> pages.stream().anyMatch(PortSkyStyle::isCelestial)
|
.findFirst().orElseGet(() -> pages.stream().anyMatch(PortSkyStyle::isCelestial)
|
||||||
? OVERWORLD : random(seed));
|
? OVERWORLD : random(seed, policy));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Nether-style Ages use their fog clear color as the visible backdrop. */
|
/** Nether-style Ages use their fog clear color as the visible backdrop. */
|
||||||
@@ -50,11 +54,17 @@ public enum PortSkyStyle {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private static PortSkyStyle random(long seed) {
|
private static PortSkyStyle random(long seed, PortRandomPagePolicy policy) {
|
||||||
// Match the first draw in 1.21.1 AgeSkyProfile.random: its equally
|
// Match the first draw in 1.21.1 AgeSkyProfile.random: its equally
|
||||||
// likely INHERITED and OVERWORLD slots currently share the native
|
// likely INHERITED and OVERWORLD slots currently share the native
|
||||||
// Overworld presentation here. Do not add unported colors/bodies.
|
// Overworld presentation here. Do not add unported colors/bodies.
|
||||||
int choice = new Random(seed ^ 0x534B5950524F464CL).nextInt(5);
|
var styles = policy.required(java.util.stream.IntStream.range(0, 5).boxed()
|
||||||
|
.filter(slot -> slot != 0 || !policy.restricts("sky")).toList(),
|
||||||
|
slot -> Identifier.fromNamespaceAndPath("rivencraft", "sky/" + switch (slot) {
|
||||||
|
case 0 -> "inherited"; case 1 -> "overworld"; case 2 -> "nether";
|
||||||
|
case 3 -> "end"; default -> "static";
|
||||||
|
}), 0);
|
||||||
|
int choice = styles.get(new Random(seed ^ 0x534B5950524F464CL).nextInt(styles.size()));
|
||||||
return switch (choice) {
|
return switch (choice) {
|
||||||
case 0, 1 -> OVERWORLD;
|
case 0, 1 -> OVERWORLD;
|
||||||
case 2 -> NETHER;
|
case 2 -> NETHER;
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.shared.StaticSkyResolution;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
public final class PortStaticSkyResolution {
|
||||||
|
public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "sky/static");
|
||||||
|
private PortStaticSkyResolution() {}
|
||||||
|
|
||||||
|
public static int compile(List<Identifier> pages) {
|
||||||
|
return StaticSkyResolution.requested(pages.stream().map(page -> {
|
||||||
|
int number = PortAgeColors.number(page);
|
||||||
|
if (number >= 0) return number;
|
||||||
|
if (page.equals(PAGE)) return StaticSkyResolution.STATIC;
|
||||||
|
return PortSkyStyle.forPage(page) != null
|
||||||
|
? StaticSkyResolution.OTHER_SKY : StaticSkyResolution.OTHER;
|
||||||
|
}).toList());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,233 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.WeakHashMap;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.world.effect.MobEffect;
|
||||||
|
import net.minecraft.world.effect.MobEffectInstance;
|
||||||
|
import net.minecraft.world.effect.MobEffects;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import net.minecraft.world.entity.monster.Monster;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.entity.EntityTypeTest;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.neoforged.neoforge.event.entity.EntityTravelToDimensionEvent;
|
||||||
|
import net.neoforged.neoforge.event.entity.player.PlayerEvent;
|
||||||
|
import net.neoforged.neoforge.event.server.ServerStoppingEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||||
|
|
||||||
|
/** Legacy potion cards adapted to bounded, Age-local server effects. */
|
||||||
|
@net.neoforged.fml.common.EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class PortStatusEffectProviders {
|
||||||
|
private static final int MAX_TRACKED_AGES = 64;
|
||||||
|
private static final Map<Identifier, Spec> SPECS = createSpecs();
|
||||||
|
private static final Map<ServerLevel, List<Lease>> LEASES = new WeakHashMap<>();
|
||||||
|
|
||||||
|
private PortStatusEffectProviders() {}
|
||||||
|
|
||||||
|
public static void register() {
|
||||||
|
SPECS.keySet().forEach(id -> PortInstabilityRuntime.register(id, PortStatusEffectProviders::apply));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void apply(PortInstabilityRuntime.Context context, Identifier id, int level) {
|
||||||
|
if (!PortInstabilityConfig.statusEffectsEnabled()
|
||||||
|
|| !PortInstabilityRuntime.isAge(context.level())) return;
|
||||||
|
Spec spec = SPECS.get(id);
|
||||||
|
if (spec == null || spec.target() == Target.HOSTILE && !PortInstabilityConfig.statusEffectsHostiles()
|
||||||
|
|| spec.target() == Target.GENERAL && !PortInstabilityConfig.statusEffectsPlayers()
|
||||||
|
&& !PortInstabilityConfig.statusEffectsNonplayers()) return;
|
||||||
|
List<Lease> leases = LEASES.get(context.level());
|
||||||
|
if (leases == null) {
|
||||||
|
if (LEASES.size() >= MAX_TRACKED_AGES) return;
|
||||||
|
leases = new ArrayList<>();
|
||||||
|
LEASES.put(context.level(), leases);
|
||||||
|
}
|
||||||
|
prune(context.level(), leases, context.serverTick(), false);
|
||||||
|
if (leases.size() >= PortInstabilityConfig.statusEffectsMaxActive()) return;
|
||||||
|
|
||||||
|
Random random = new Random(context.age().seed() ^ (context.serverTick() * 0x9E3779B97F4A7C15L)
|
||||||
|
^ id.hashCode());
|
||||||
|
ChunkPos chunk = context.loadedChunks().get(random.nextInt(context.loadedChunks().size()));
|
||||||
|
AABB bounds = new AABB(chunk.getMinBlockX(), context.level().getMinY(), chunk.getMinBlockZ(),
|
||||||
|
chunk.getMaxBlockX() + 1, context.level().getMaxY(), chunk.getMaxBlockZ() + 1);
|
||||||
|
int duration = Math.min(spec.legacyDuration(), PortInstabilityConfig.statusEffectsMaxDuration());
|
||||||
|
int amplifier = Math.max(0, level - 1);
|
||||||
|
MobEffectInstance instance = new MobEffectInstance(spec.effect(), duration, amplifier);
|
||||||
|
List<LivingEntity> candidates = new ArrayList<>();
|
||||||
|
context.level().getEntities(EntityTypeTest.forClass(LivingEntity.class), bounds,
|
||||||
|
entity -> eligible(context.level(), entity, spec, instance), candidates,
|
||||||
|
PortInstabilityConfig.statusEffectsMaxCandidates());
|
||||||
|
if (candidates.isEmpty()) return;
|
||||||
|
candidates.sort(Comparator.comparing(Entity::getUUID));
|
||||||
|
LivingEntity target = candidates.get(random.nextInt(candidates.size()));
|
||||||
|
if (!context.budget().claim() || !target.addEffect(instance)) return;
|
||||||
|
context.budget().recordApplied();
|
||||||
|
leases.add(new Lease(id, new WeakReference<>(target), instance,
|
||||||
|
context.serverTick() + duration, spec.target()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean eligible(ServerLevel level, LivingEntity entity, Spec spec,
|
||||||
|
MobEffectInstance instance) {
|
||||||
|
if (!entity.isAlive() || entity.isRemoved() || entity.level() != level
|
||||||
|
|| entity.getEffect(spec.effect()) != null || !entity.canBeAffected(instance)
|
||||||
|
|| !spec.global() && !level.canSeeSky(entity.blockPosition())) return false;
|
||||||
|
return allowedByPolicy(spec.target(), entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean allowedByPolicy(Target target, LivingEntity entity) {
|
||||||
|
if (entity instanceof Player player) {
|
||||||
|
return target == Target.GENERAL && PortInstabilityConfig.statusEffectsPlayers()
|
||||||
|
&& !player.isCreative() && !player.isSpectator();
|
||||||
|
}
|
||||||
|
return target == Target.GENERAL ? PortInstabilityConfig.statusEffectsNonplayers()
|
||||||
|
: entity instanceof Monster && PortInstabilityConfig.statusEffectsHostiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onServerTickPost(ServerTickEvent.Post event) {
|
||||||
|
if (event.getServer().getTickCount() % 20 != 0) return;
|
||||||
|
boolean disabled = !PortInstabilityConfig.instabilityEnabled() || !PortInstabilityConfig.statusEffectsEnabled();
|
||||||
|
long tick = event.getServer().getTickCount();
|
||||||
|
for (var entry : LEASES.entrySet()) {
|
||||||
|
prune(entry.getKey(), entry.getValue(), tick, disabled
|
||||||
|
|| !PortInstabilityData.get(entry.getKey().getServer()).age(entry.getKey()).enabled());
|
||||||
|
}
|
||||||
|
LEASES.values().removeIf(List::isEmpty);
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onEntityTravel(EntityTravelToDimensionEvent event) {
|
||||||
|
Entity entity = event.getEntity();
|
||||||
|
if (entity instanceof LivingEntity living && !entity.level().dimension().equals(event.getDimension())) {
|
||||||
|
clearEntity(living);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
|
||||||
|
if (event.getEntity() instanceof ServerPlayer player) clearEntity(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
|
||||||
|
if (event.getEntity() instanceof ServerPlayer player) clearEntity(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
@net.neoforged.bus.api.SubscribeEvent
|
||||||
|
public static void onServerStopping(ServerStoppingEvent event) {
|
||||||
|
long tick = event.getServer().getTickCount();
|
||||||
|
for (var entry : LEASES.entrySet()) prune(entry.getKey(), entry.getValue(), tick, true);
|
||||||
|
LEASES.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void clearAge(ServerLevel level) {
|
||||||
|
var leases = LEASES.remove(level);
|
||||||
|
if (leases != null) prune(level, leases, level.getServer().getTickCount(), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void clearEntity(LivingEntity entity) {
|
||||||
|
for (List<Lease> leases : LEASES.values()) {
|
||||||
|
Iterator<Lease> iterator = leases.iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
Lease lease = iterator.next();
|
||||||
|
if (lease.entity().get() != entity) continue;
|
||||||
|
removeOwnedEffect(entity, lease);
|
||||||
|
iterator.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void prune(ServerLevel level, List<Lease> leases, long tick, boolean removeAll) {
|
||||||
|
Iterator<Lease> iterator = leases.iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
Lease lease = iterator.next();
|
||||||
|
LivingEntity entity = lease.entity().get();
|
||||||
|
if (entity == null || entity.isRemoved() || entity.getEffect(lease.instance().getEffect()) == null) {
|
||||||
|
iterator.remove();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
boolean revoke = removeAll || !PortInstabilityConfig.instabilityProviderEnabled(lease.provider())
|
||||||
|
|| entity.level() != level
|
||||||
|
|| !allowedByPolicy(lease.target(), entity);
|
||||||
|
if (revoke || tick >= lease.expiresAt()) {
|
||||||
|
removeOwnedEffect(entity, lease);
|
||||||
|
iterator.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void removeOwnedEffect(LivingEntity entity, Lease lease) {
|
||||||
|
// addEffect stores the supplied instance when no effect exists. Do not remove
|
||||||
|
// a replacement from another mod (or a stronger/extended effect).
|
||||||
|
if (entity.getEffect(lease.instance().getEffect()) == lease.instance()
|
||||||
|
&& lease.instance().getAmplifier() == lease.amplifier()
|
||||||
|
&& lease.instance().getDuration() <= lease.originalDuration()) {
|
||||||
|
entity.removeEffect(lease.instance().getEffect());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int legacyDuration(Identifier id) {
|
||||||
|
Spec spec = SPECS.get(id);
|
||||||
|
return spec == null ? -1 : spec.legacyDuration();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean localRequiresSky(Identifier id) {
|
||||||
|
Spec spec = SPECS.get(id);
|
||||||
|
return spec != null && !spec.global();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean eligibleTarget(ServerLevel level, LivingEntity entity, Identifier id) {
|
||||||
|
Spec spec = SPECS.get(id);
|
||||||
|
return spec != null && eligible(level, entity, spec,
|
||||||
|
new MobEffectInstance(spec.effect(), spec.legacyDuration(), 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<Identifier, Spec> createSpecs() {
|
||||||
|
Map<Identifier, Spec> specs = new HashMap<>();
|
||||||
|
addPair(specs, "blindness", MobEffects.BLINDNESS, 60);
|
||||||
|
addPair(specs, "fatigue", MobEffects.MINING_FATIGUE, 80);
|
||||||
|
addPair(specs, "hunger", MobEffects.HUNGER, 80);
|
||||||
|
addPair(specs, "nausea", MobEffects.NAUSEA, 60);
|
||||||
|
addPair(specs, "poison", MobEffects.POISON, 80);
|
||||||
|
addPair(specs, "slow", MobEffects.SLOWNESS, 80);
|
||||||
|
addPair(specs, "weakness", MobEffects.WEAKNESS, 80);
|
||||||
|
addPair(specs, "wither", MobEffects.WITHER, 30);
|
||||||
|
specs.put(id("enemyregen_global"), new Spec(MobEffects.REGENERATION, 200, true, Target.HOSTILE));
|
||||||
|
specs.put(id("enemyresist_global"), new Spec(MobEffects.RESISTANCE, 200, true, Target.HOSTILE));
|
||||||
|
return Map.copyOf(specs);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addPair(Map<Identifier, Spec> specs, String name,
|
||||||
|
Holder<MobEffect> effect, int duration) {
|
||||||
|
specs.put(id(name), new Spec(effect, duration, false, Target.GENERAL));
|
||||||
|
specs.put(id(name + "_global"), new Spec(effect, duration, true, Target.GENERAL));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Identifier id(String path) {
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum Target { GENERAL, HOSTILE }
|
||||||
|
private record Spec(Holder<MobEffect> effect, int legacyDuration, boolean global, Target target) {}
|
||||||
|
private record Lease(Identifier provider, WeakReference<LivingEntity> entity, MobEffectInstance instance, long expiresAt,
|
||||||
|
Target target, int amplifier, int originalDuration) {
|
||||||
|
private Lease(Identifier provider, WeakReference<LivingEntity> entity, MobEffectInstance instance, long expiresAt,
|
||||||
|
Target target) {
|
||||||
|
this(provider, entity, instance, expiresAt, target, instance.getAmplifier(), instance.getDuration());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,7 +10,7 @@ import net.minecraft.resources.Identifier;
|
|||||||
/** Frozen terrain filters and ordered solid/surface features for an Age. */
|
/** Frozen terrain filters and ordered solid/surface features for an Age. */
|
||||||
public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int denseOres,
|
public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int denseOres,
|
||||||
boolean starFissures, List<Identifier> structures, List<Identifier> carvers,
|
boolean starFissures, List<Identifier> structures, List<Identifier> carvers,
|
||||||
boolean structureControl) {
|
boolean structureControl, List<Identifier> ruins) {
|
||||||
public static final Identifier FLOATING_ISLANDS = Identifier.fromNamespaceAndPath(
|
public static final Identifier FLOATING_ISLANDS = Identifier.fromNamespaceAndPath(
|
||||||
Rivencraft.MOD_ID, "feature/floating_islands");
|
Rivencraft.MOD_ID, "feature/floating_islands");
|
||||||
public static final Identifier TENDRILS = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "feature/tendrils");
|
public static final Identifier TENDRILS = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "feature/tendrils");
|
||||||
@@ -32,7 +32,8 @@ public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int
|
|||||||
Codec.BOOL.optionalFieldOf("star_fissures", false).forGetter(PortTerrainFeaturePlan::starFissures),
|
Codec.BOOL.optionalFieldOf("star_fissures", false).forGetter(PortTerrainFeaturePlan::starFissures),
|
||||||
Identifier.CODEC.listOf().optionalFieldOf("structures", List.of()).forGetter(PortTerrainFeaturePlan::structures),
|
Identifier.CODEC.listOf().optionalFieldOf("structures", List.of()).forGetter(PortTerrainFeaturePlan::structures),
|
||||||
Identifier.CODEC.listOf().optionalFieldOf("carvers", List.of()).forGetter(PortTerrainFeaturePlan::carvers),
|
Identifier.CODEC.listOf().optionalFieldOf("carvers", List.of()).forGetter(PortTerrainFeaturePlan::carvers),
|
||||||
Codec.BOOL.optionalFieldOf("structure_control", false).forGetter(PortTerrainFeaturePlan::structureControl)
|
Codec.BOOL.optionalFieldOf("structure_control", false).forGetter(PortTerrainFeaturePlan::structureControl),
|
||||||
|
Identifier.CODEC.listOf().optionalFieldOf("ruins", List.of()).forGetter(PortTerrainFeaturePlan::ruins)
|
||||||
).apply(instance, PortTerrainFeaturePlan::new));
|
).apply(instance, PortTerrainFeaturePlan::new));
|
||||||
|
|
||||||
public record Choice(Identifier page, Identifier material) {
|
public record Choice(Identifier page, Identifier material) {
|
||||||
@@ -50,6 +51,9 @@ public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int
|
|||||||
}
|
}
|
||||||
|
|
||||||
public PortTerrainFeaturePlan {
|
public PortTerrainFeaturePlan {
|
||||||
|
ruins = List.copyOf(ruins);
|
||||||
|
if (ruins.size() > 252 || ruins.stream().anyMatch(id -> !net.dnorberg.rivencraft.compat.RuinsTemplatePages.isSymbol(id)))
|
||||||
|
throw new IllegalArgumentException("Invalid Ruins template pages");
|
||||||
choices = List.copyOf(choices);
|
choices = List.copyOf(choices);
|
||||||
structures = List.copyOf(structures);
|
structures = List.copyOf(structures);
|
||||||
carvers = List.copyOf(carvers);
|
carvers = List.copyOf(carvers);
|
||||||
@@ -57,7 +61,7 @@ public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int
|
|||||||
PortCarverPages.validateCounts(carvers);
|
PortCarverPages.validateCounts(carvers);
|
||||||
if (denseOres < 0 || denseOres > MAX_PER_FEATURE)
|
if (denseOres < 0 || denseOres > MAX_PER_FEATURE)
|
||||||
throw new IllegalArgumentException("Dense Ores permits at most 32 occurrences");
|
throw new IllegalArgumentException("Dense Ores permits at most 32 occurrences");
|
||||||
if (choices.isEmpty() && !skylands && denseOres == 0 && !starFissures && structures.isEmpty() && carvers.isEmpty() && !structureControl)
|
if (choices.isEmpty() && !skylands && denseOres == 0 && !starFissures && structures.isEmpty() && carvers.isEmpty() && !structureControl && ruins.isEmpty())
|
||||||
throw new IllegalArgumentException("Terrain feature plan must not be empty");
|
throw new IllegalArgumentException("Terrain feature plan must not be empty");
|
||||||
var counts = new HashMap<Identifier, Integer>();
|
var counts = new HashMap<Identifier, Integer>();
|
||||||
for (Choice choice : choices) {
|
for (Choice choice : choices) {
|
||||||
@@ -66,6 +70,12 @@ public record PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int denseOres,
|
||||||
|
boolean starFissures, List<Identifier> structures, List<Identifier> carvers,
|
||||||
|
boolean structureControl) {
|
||||||
|
this(choices, skylands, denseOres, starFissures, structures, carvers, structureControl, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
public PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int denseOres,
|
public PortTerrainFeaturePlan(List<Choice> choices, boolean skylands, int denseOres,
|
||||||
boolean starFissures, List<Identifier> structures, List<Identifier> carvers) {
|
boolean starFissures, List<Identifier> structures, List<Identifier> carvers) {
|
||||||
this(choices, skylands, denseOres, starFissures, structures, carvers, false);
|
this(choices, skylands, denseOres, starFissures, structures, carvers, false);
|
||||||
|
|||||||
@@ -149,22 +149,130 @@ public final class RuntimeAgeBackend {
|
|||||||
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
|
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
|
||||||
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle) {
|
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle) {
|
||||||
|
return create(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes,
|
||||||
|
terrainFeatures, weather, lighting, sky, colors, dayCycle, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ServerLevel create(MinecraftServer server, Identifier id, long seed,
|
||||||
|
PortBiomePlan biomePlan, PortAgeTerrain terrain, PortRockPlan rocks,
|
||||||
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
|
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
|
||||||
|
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
|
||||||
|
List<Identifier> librarySymbols) {
|
||||||
|
return create(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures,
|
||||||
|
weather, lighting, sky, colors, dayCycle, librarySymbols, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ServerLevel create(MinecraftServer server, Identifier id, long seed,
|
||||||
|
PortBiomePlan biomePlan, PortAgeTerrain terrain, PortRockPlan rocks,
|
||||||
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
|
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
|
||||||
|
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
|
||||||
|
List<Identifier> librarySymbols, String displayName) {
|
||||||
|
return create(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures,
|
||||||
|
weather, lighting, sky, colors, dayCycle, librarySymbols, displayName, PortRandomPagePolicy.UNRESTRICTED);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ServerLevel create(MinecraftServer server, Identifier id, long seed,
|
||||||
|
PortBiomePlan biomePlan, PortAgeTerrain terrain, PortRockPlan rocks,
|
||||||
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
|
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
|
||||||
|
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
|
||||||
|
List<Identifier> librarySymbols, String displayName, PortRandomPagePolicy policy) {
|
||||||
checkServerThread(server);
|
checkServerThread(server);
|
||||||
ageName(id);
|
String name = ageName(id);
|
||||||
AgeLevelIndex index = index(server);
|
AgeLevelIndex index = index(server);
|
||||||
if (index.contains(id)) throw new IllegalArgumentException("Age already exists: " + id);
|
if (index.contains(id) || server.getLevel(dimensionKey(id)) != null)
|
||||||
ServerLevel level = load(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes,
|
throw new IllegalArgumentException("Age already exists: " + id);
|
||||||
terrainFeatures, lighting, sky, colors, dayCycle);
|
Path directory = archivePaths(server, name).live();
|
||||||
((PortAgeLevel) level).configureWeather(weather);
|
if (Files.exists(directory, LinkOption.NOFOLLOW_LINKS))
|
||||||
index.add(id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures, lighting, sky, colors, dayCycle);
|
throw new IllegalArgumentException("Age storage already exists: " + id);
|
||||||
// A newly bound book may be used immediately. Persist its Age identity
|
PortLibraryWriting writing = PortLibraryWriting.get(server);
|
||||||
// before publishing the catalog so a later crash cannot leave that
|
List<Identifier> priorWriting = writing.symbols(id);
|
||||||
// book pointing at a world omitted from the on-disk index.
|
PortInstabilityData instability = PortInstabilityData.get(server);
|
||||||
server.overworld().getDataStorage().saveAndJoin();
|
PortInstabilityData.Age priorInstability = instability.snapshot(id);
|
||||||
|
PortSeasonPolicies seasons = PortSeasonPolicies.get(server);
|
||||||
|
PortSeasonPolicies.Policy priorSeason = seasons.snapshot(id);
|
||||||
|
ServerLevel level = null;
|
||||||
|
try {
|
||||||
|
seasons.put(id, PortSeasonPolicies.select(librarySymbols, seed, terrain,
|
||||||
|
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available(), policy));
|
||||||
|
writing.put(id, librarySymbols);
|
||||||
|
level = load(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes,
|
||||||
|
terrainFeatures, lighting, sky, colors, dayCycle);
|
||||||
|
((PortAgeLevel) level).configureWeather(weather);
|
||||||
|
int accelerated = PortAcceleratedTicks.pageCount(librarySymbols);
|
||||||
|
if (accelerated > 0) PortAcceleratedTicks.configure(level, accelerated);
|
||||||
|
index.add(id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures, lighting, sky, colors, dayCycle);
|
||||||
|
instability.create(level, librarySymbols, terrain, lighting, dayCycle);
|
||||||
|
if (displayName != null) index.setDisplayName(id, displayName);
|
||||||
|
// Commit all initial metadata before announcing an enterable Age.
|
||||||
|
level.getDataStorage().saveAndJoin();
|
||||||
|
server.overworld().getDataStorage().saveAndJoin();
|
||||||
|
} catch (RuntimeException failure) {
|
||||||
|
boolean closed = !(failure instanceof FailedAgeCleanupException);
|
||||||
|
if (level != null) {
|
||||||
|
try { closeFailedCreation(server, level); }
|
||||||
|
catch (RuntimeException cleanup) { closed = false; failure.addSuppressed(cleanup); }
|
||||||
|
}
|
||||||
|
index.discardCreation(id);
|
||||||
|
writing.put(id, priorWriting);
|
||||||
|
instability.restore(id, priorInstability);
|
||||||
|
seasons.put(id, priorSeason);
|
||||||
|
try { server.overworld().getDataStorage().saveAndJoin(); }
|
||||||
|
catch (RuntimeException cleanup) { failure.addSuppressed(cleanup); }
|
||||||
|
// Only the exact, previously absent directory belongs to this attempt.
|
||||||
|
// If closing failed, leave its files in place rather than race a writer.
|
||||||
|
if (closed) {
|
||||||
|
try { removeFailedCreationDirectory(server, name, directory); }
|
||||||
|
catch (IOException | RuntimeException cleanup) { failure.addSuppressed(cleanup); }
|
||||||
|
}
|
||||||
|
throw failure;
|
||||||
|
}
|
||||||
|
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.apply(level);
|
||||||
AgeCatalogSync.onCatalogChanged(server);
|
AgeCatalogSync.onCatalogChanged(server);
|
||||||
return level;
|
return level;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final class FailedAgeCleanupException extends IllegalStateException {
|
||||||
|
FailedAgeCleanupException(RuntimeException cause) { super("Failed Age stores could not close; files retained", cause); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void closeFailedCreation(MinecraftServer server, ServerLevel level) {
|
||||||
|
if (!level.players().isEmpty()) throw new IllegalStateException("Failed Age contains players: " + level.dimension().identifier());
|
||||||
|
RuntimeException error = null;
|
||||||
|
try { level.getChunkSource().deactivateTicketsOnClosing(); }
|
||||||
|
catch (RuntimeException failure) { error = failure; }
|
||||||
|
try { level.close(); }
|
||||||
|
catch (IOException | RuntimeException failure) {
|
||||||
|
if (error == null) error = new IllegalStateException("Could not close failed Age", failure);
|
||||||
|
else error.addSuppressed(failure);
|
||||||
|
} finally {
|
||||||
|
server.levels.remove(level.dimension(), level);
|
||||||
|
try { NeoForge.EVENT_BUS.post(new LevelEvent.Unload(level)); }
|
||||||
|
catch (RuntimeException failure) {
|
||||||
|
if (error == null) error = failure; else error.addSuppressed(failure);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (error != null) throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void removeFailedCreationDirectory(MinecraftServer server, String name, Path directory) throws IOException {
|
||||||
|
if (!archivePaths(server, name).live().equals(directory)) throw new IOException("Age directory changed during rollback");
|
||||||
|
if (!Files.exists(directory, LinkOption.NOFOLLOW_LINKS)) return;
|
||||||
|
Files.walkFileTree(directory, new java.nio.file.SimpleFileVisitor<Path>() {
|
||||||
|
@Override public java.nio.file.FileVisitResult visitFile(Path file, java.nio.file.attribute.BasicFileAttributes attributes) throws IOException {
|
||||||
|
Files.delete(file);
|
||||||
|
return java.nio.file.FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
@Override public java.nio.file.FileVisitResult postVisitDirectory(Path dir, IOException error) throws IOException {
|
||||||
|
if (error != null) throw error;
|
||||||
|
Files.delete(dir);
|
||||||
|
return java.nio.file.FileVisitResult.CONTINUE;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/** Unloads an Age only when no player remains; save(true) flushes other entities. */
|
/** Unloads an Age only when no player remains; save(true) flushes other entities. */
|
||||||
public static void unload(MinecraftServer server, Identifier id) {
|
public static void unload(MinecraftServer server, Identifier id) {
|
||||||
checkServerThread(server);
|
checkServerThread(server);
|
||||||
@@ -266,6 +374,7 @@ public final class RuntimeAgeBackend {
|
|||||||
}
|
}
|
||||||
throw new IllegalStateException("Could not archive Age " + id, exception);
|
throw new IllegalStateException("Could not archive Age " + id, exception);
|
||||||
}
|
}
|
||||||
|
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.retired(server, id);
|
||||||
AgeCatalogSync.onCatalogChanged(server);
|
AgeCatalogSync.onCatalogChanged(server);
|
||||||
Rivencraft.LOGGER.info("Retired 26.3 prototype Age {} (archived at {})", id, paths.archive());
|
Rivencraft.LOGGER.info("Retired 26.3 prototype Age {} (archived at {})", id, paths.archive());
|
||||||
}
|
}
|
||||||
@@ -297,6 +406,23 @@ public final class RuntimeAgeBackend {
|
|||||||
return index(server).dayCycles();
|
return index(server).dayCycles();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Snapshot only loaded Age settings; viewing a book never loads its destination. */
|
||||||
|
public static Map<Identifier, PortAgeDescription> loadedDescriptions(MinecraftServer server) {
|
||||||
|
checkServerThread(server);
|
||||||
|
AgeLevelIndex index = index(server);
|
||||||
|
var descriptions = new java.util.HashMap<Identifier, PortAgeDescription>();
|
||||||
|
var knownAges = index.entries().keySet();
|
||||||
|
for (var level : server.getAllLevels()) {
|
||||||
|
Identifier id = level.dimension().identifier();
|
||||||
|
if (!(level instanceof PortAgeLevel age) || !knownAges.contains(id)) continue;
|
||||||
|
PortBiomePlan biomes = index.biomePlan(id);
|
||||||
|
descriptions.put(id, new PortAgeDescription(index.terrain(id),
|
||||||
|
biomes == null ? PortBiomePlan.Distribution.NATIVE : biomes.distribution(),
|
||||||
|
index.lighting(id), age.weatherMode()));
|
||||||
|
}
|
||||||
|
return Map.copyOf(descriptions);
|
||||||
|
}
|
||||||
|
|
||||||
/** Includes retired IDs, which must never be silently reused by a new book. */
|
/** Includes retired IDs, which must never be silently reused by a new book. */
|
||||||
public static boolean isNameTaken(MinecraftServer server, Identifier id) {
|
public static boolean isNameTaken(MinecraftServer server, Identifier id) {
|
||||||
checkServerThread(server);
|
checkServerThread(server);
|
||||||
@@ -408,10 +534,12 @@ public final class RuntimeAgeBackend {
|
|||||||
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
|
||||||
PortTerrainFeaturePlan terrainFeatures, PortLighting lighting, PortSkyStyle sky,
|
PortTerrainFeaturePlan terrainFeatures, PortLighting lighting, PortSkyStyle sky,
|
||||||
PortAgeColors colors, PortDayCycle dayCycle) {
|
PortAgeColors colors, PortDayCycle dayCycle) {
|
||||||
|
net.dnorberg.rivencraft.compat.TerraBlenderBiomes.nether(server.registryAccess());
|
||||||
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
|
||||||
@@ -450,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))
|
||||||
@@ -468,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);
|
||||||
}
|
}
|
||||||
@@ -482,8 +620,8 @@ public final class RuntimeAgeBackend {
|
|||||||
};
|
};
|
||||||
generator = new NoiseBasedChunkGenerator(source, PortBiomeMaterialRules.apply(server.registryAccess(), settings.value()));
|
generator = new NoiseBasedChunkGenerator(source, PortBiomeMaterialRules.apply(server.registryAccess(), settings.value()));
|
||||||
}
|
}
|
||||||
if (rocks != null || vegetation != null || dungeons > 0 || lakes != null || terrainFeatures != null)
|
generator = new PortFeatureChunkGenerator(generator, rocks, vegetation, dungeons, lakes, terrainFeatures, seed,
|
||||||
generator = new PortFeatureChunkGenerator(generator, rocks, vegetation, dungeons, lakes, terrainFeatures, seed);
|
terrain != PortAgeTerrain.CAVE, PortLibraryWriting.get(server).symbols(id));
|
||||||
LevelStem stem = new LevelStem(lighting.dimensionType(server, terrain, overworldStem.type(), sky),
|
LevelStem stem = new LevelStem(lighting.dimensionType(server, terrain, overworldStem.type(), sky),
|
||||||
generator, OptionalLong.of(seed));
|
generator, OptionalLong.of(seed));
|
||||||
long biomeZoomSeed = BiomeManager.obfuscateSeed(server.getWorldGenSettings().options().seed());
|
long biomeZoomSeed = BiomeManager.obfuscateSeed(server.getWorldGenSettings().options().seed());
|
||||||
@@ -494,6 +632,7 @@ public final class RuntimeAgeBackend {
|
|||||||
// Publish only after the constructor succeeds. If the load event fails,
|
// Publish only after the constructor succeeds. If the load event fails,
|
||||||
// roll back the map and close the newly opened chunk/entity stores.
|
// roll back the map and close the newly opened chunk/entity stores.
|
||||||
try {
|
try {
|
||||||
|
net.dnorberg.rivencraft.compat.RuinsCompatibility.registerAge(id, terrainFeatures);
|
||||||
server.levels.put(key, level);
|
server.levels.put(key, level);
|
||||||
level.getWorldBorder().setAbsoluteMaxSize(server.getAbsoluteMaxWorldSize());
|
level.getWorldBorder().setAbsoluteMaxSize(server.getAbsoluteMaxWorldSize());
|
||||||
server.getPlayerList().addWorldborderListener(level);
|
server.getPlayerList().addWorldborderListener(level);
|
||||||
@@ -506,11 +645,10 @@ public final class RuntimeAgeBackend {
|
|||||||
Rivencraft.LOGGER.info("Loaded 26.3 prototype Age {} with seed {}", id, seed);
|
Rivencraft.LOGGER.info("Loaded 26.3 prototype Age {} with seed {}", id, seed);
|
||||||
return level;
|
return level;
|
||||||
} catch (RuntimeException exception) {
|
} catch (RuntimeException exception) {
|
||||||
server.levels.remove(key);
|
try { closeFailedCreation(server, level); }
|
||||||
try {
|
catch (RuntimeException cleanup) {
|
||||||
level.close();
|
exception.addSuppressed(cleanup);
|
||||||
} catch (IOException closeException) {
|
throw new FailedAgeCleanupException(exception);
|
||||||
exception.addSuppressed(closeException);
|
|
||||||
}
|
}
|
||||||
throw exception;
|
throw exception;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,136 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.advancement.ProgressionAdvancements;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
||||||
|
import net.dnorberg.rivencraft.portal.PortalBookTravel;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.sounds.SoundEvents;
|
||||||
|
import net.minecraft.sounds.SoundSource;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.InteractionResult;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.BlockGetter;
|
||||||
|
import net.minecraft.world.level.block.BaseEntityBlock;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.RenderShape;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntityTicker;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||||
|
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.block.state.StateDefinition;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.world.level.block.state.properties.EnumProperty;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BooleanProperty;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
import net.minecraft.world.phys.shapes.CollisionContext;
|
||||||
|
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||||
|
|
||||||
|
/** A book-holding crystal attachment, with server-authoritative frame activation. */
|
||||||
|
public final class BookReceptacleBlock extends BaseEntityBlock {
|
||||||
|
public static final EnumProperty<Direction> FACING = BlockStateProperties.FACING;
|
||||||
|
public static final BooleanProperty HAS_BOOK = BlockStateProperties.HAS_BOOK;
|
||||||
|
|
||||||
|
public BookReceptacleBlock(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(HAS_BOOK, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; }
|
||||||
|
@Override protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos,
|
||||||
|
CollisionContext context) {
|
||||||
|
return switch (state.getValue(FACING)) {
|
||||||
|
case NORTH -> Block.box(0, 0, 10, 16, 16, 16);
|
||||||
|
case SOUTH -> Block.box(0, 0, 0, 16, 16, 6);
|
||||||
|
case EAST -> Block.box(0, 0, 0, 6, 16, 16);
|
||||||
|
case WEST -> Block.box(10, 0, 0, 16, 16, 16);
|
||||||
|
case UP -> Block.box(0, 0, 0, 16, 6, 16);
|
||||||
|
case DOWN -> Block.box(0, 10, 0, 16, 16, 16);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
@Override protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||||
|
builder.add(FACING, HAS_BOOK);
|
||||||
|
}
|
||||||
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
return new BookReceptacleBlockEntity(pos, state);
|
||||||
|
}
|
||||||
|
@Override public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state,
|
||||||
|
BlockEntityType<T> type) {
|
||||||
|
return level instanceof ServerLevel
|
||||||
|
? createTickerHelper(type, Rivencraft.BOOK_RECEPTACLE_BLOCK_ENTITY.get(), (world, pos, current, holder) -> BookReceptacleBlockEntity.serverTick((ServerLevel) world, pos, holder))
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
@Override public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||||
|
Direction face = context.getClickedFace();
|
||||||
|
if (!context.getLevel().getBlockState(
|
||||||
|
context.getClickedPos().relative(face.getOpposite())).is(Rivencraft.CRYSTAL_BLOCK.get())) return null;
|
||||||
|
return defaultBlockState().setValue(FACING, face);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected InteractionResult useItemOn(ItemStack stack, BlockState state, Level level, BlockPos pos,
|
||||||
|
Player player, InteractionHand hand, BlockHitResult hit) {
|
||||||
|
if (!isBoundBook(stack)) return InteractionResult.TRY_WITH_EMPTY_HAND;
|
||||||
|
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||||
|
if (!(level instanceof ServerLevel server) ||
|
||||||
|
!(level.getBlockEntity(pos) instanceof BookReceptacleBlockEntity holder)) return InteractionResult.FAIL;
|
||||||
|
if (!holder.getBook().isEmpty()) return InteractionResult.FAIL;
|
||||||
|
CrystalPortalNetwork.Plan plan = CrystalPortalNetwork.plan(server, pos);
|
||||||
|
if (!plan.valid()) {
|
||||||
|
if (player instanceof ServerPlayer serverPlayer) serverPlayer.sendOverlayMessage(Component.translatable("message.rivencraft.portal.invalid_frame"));
|
||||||
|
return InteractionResult.FAIL;
|
||||||
|
}
|
||||||
|
if (!PortalBookTravel.available(server, stack)) {
|
||||||
|
if (player instanceof ServerPlayer serverPlayer) serverPlayer.sendOverlayMessage(Component.translatable("message.rivencraft.descriptive_book.unavailable"));
|
||||||
|
return InteractionResult.FAIL;
|
||||||
|
}
|
||||||
|
holder.setBook(stack.copyWithCount(1));
|
||||||
|
if (!CrystalPortalNetwork.activate(server, pos, plan, player)) {
|
||||||
|
holder.takeBook();
|
||||||
|
return InteractionResult.FAIL;
|
||||||
|
}
|
||||||
|
if (!player.getAbilities().instabuild) stack.shrink(1);
|
||||||
|
level.playSound(null, pos, SoundEvents.ENCHANTMENT_TABLE_USE, SoundSource.BLOCKS, 1, 1);
|
||||||
|
if (player instanceof ServerPlayer serverPlayer)
|
||||||
|
ProgressionAdvancements.award(serverPlayer, ProgressionAdvancements.OPEN_PORTAL);
|
||||||
|
return InteractionResult.SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos,
|
||||||
|
Player player, BlockHitResult hit) {
|
||||||
|
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||||
|
if (level instanceof ServerLevel server && level.getBlockEntity(pos) instanceof BookReceptacleBlockEntity holder
|
||||||
|
&& !holder.getBook().isEmpty()) {
|
||||||
|
CrystalPortalNetwork.shutdown(server, pos);
|
||||||
|
ItemStack book = holder.takeBook();
|
||||||
|
if (!player.getInventory().add(book)) player.drop(book, false, net.minecraft.util.Prediction.SERVER_ONLY);
|
||||||
|
level.playSound(null, pos, SoundEvents.BOOK_PAGE_TURN, SoundSource.BLOCKS, 1, 1);
|
||||||
|
return InteractionResult.SUCCESS;
|
||||||
|
}
|
||||||
|
return InteractionResult.PASS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighbor,
|
||||||
|
net.minecraft.world.level.redstone.Orientation orientation, boolean moved) {
|
||||||
|
super.neighborChanged(state, level, pos, neighbor, orientation, moved);
|
||||||
|
BlockPos support = pos.relative(state.getValue(FACING).getOpposite());
|
||||||
|
if (!level.isClientSide() && level.hasChunkAt(support) && !level.getBlockState(support)
|
||||||
|
.is(Rivencraft.CRYSTAL_BLOCK.get())) level.destroyBlock(pos, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isBoundBook(ItemStack stack) {
|
||||||
|
return stack.is(Rivencraft.LINKING_BOOK.get()) && stack.has(Rivencraft.LINK_BOOK_TARGET.get())
|
||||||
|
|| stack.is(Rivencraft.DESCRIPTIVE_BOOK.get()) && stack.has(Rivencraft.AGE_BOOK_ID.get());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.CrystalPortalBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
||||||
|
import net.dnorberg.rivencraft.portal.PortalTravelCooldown;
|
||||||
|
import net.dnorberg.rivencraft.portal.PortalTravelQueue;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.BaseEntityBlock;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.RenderShape;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.block.state.StateDefinition;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BooleanProperty;
|
||||||
|
import net.minecraft.world.level.block.state.properties.EnumProperty;
|
||||||
|
import net.minecraft.world.level.material.Fluid;
|
||||||
|
|
||||||
|
/** Non-solid linked surface; all travel is delegated to the held book's rules. */
|
||||||
|
public final class CrystalPortalBlock extends BaseEntityBlock {
|
||||||
|
// Retained so portal blocks already saved with this state still deserialize.
|
||||||
|
public static final BooleanProperty LIVE_VIEW = BooleanProperty.create("live_view");
|
||||||
|
public static final EnumProperty<Direction.Axis> AXIS = EnumProperty.create("axis", Direction.Axis.class);
|
||||||
|
|
||||||
|
public CrystalPortalBlock(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
registerDefaultState(stateDefinition.any().setValue(LIVE_VIEW, false).setValue(AXIS, Direction.Axis.Z));
|
||||||
|
}
|
||||||
|
@Override protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||||
|
builder.add(LIVE_VIEW, AXIS);
|
||||||
|
}
|
||||||
|
@Override protected RenderShape getRenderShape(BlockState state) {
|
||||||
|
// Keep the animated fallback until the optional destination view has
|
||||||
|
// actually been established, including after a world restart.
|
||||||
|
return net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.available() && state.getValue(LIVE_VIEW)
|
||||||
|
? RenderShape.INVISIBLE : RenderShape.MODEL;
|
||||||
|
}
|
||||||
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
return new CrystalPortalBlockEntity(pos, state);
|
||||||
|
}
|
||||||
|
@Override protected boolean canBeReplaced(BlockState state, Fluid fluid) { return false; }
|
||||||
|
|
||||||
|
@Override protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, net.minecraft.world.entity.InsideBlockEffectApplier effects, boolean precise) {
|
||||||
|
if (!(level instanceof ServerLevel server) || !entity.canUsePortal(false)) return;
|
||||||
|
long now = server.getServer().getTickCount();
|
||||||
|
if (PortalTravelCooldown.blocked(entity, now)) return;
|
||||||
|
if (!(level.getBlockEntity(pos) instanceof CrystalPortalBlockEntity portal)
|
||||||
|
|| portal.receptacle() == null || !level.hasChunkAt(portal.receptacle())
|
||||||
|
|| !(level.getBlockEntity(portal.receptacle()) instanceof BookReceptacleBlockEntity holder)) return;
|
||||||
|
ItemStack book = holder.getBook();
|
||||||
|
if (book.isEmpty()) return;
|
||||||
|
PortalTravelCooldown.mark(entity, now);
|
||||||
|
PortalTravelQueue.enqueue(entity, server, pos, portal.receptacle(), book, now);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block neighbor,
|
||||||
|
net.minecraft.world.level.redstone.Orientation orientation, boolean moved) {
|
||||||
|
super.neighborChanged(state, level, pos, neighbor, orientation, moved);
|
||||||
|
if (!(level instanceof ServerLevel server)
|
||||||
|
|| !(level.getBlockEntity(pos) instanceof CrystalPortalBlockEntity portal)
|
||||||
|
|| portal.receptacle() == null) return;
|
||||||
|
// Like a vanilla portal, validate when the frame changes, not on a
|
||||||
|
// repeating timer that can race block entities loading after restart.
|
||||||
|
if (CrystalPortalNetwork.cellStatus(server, pos, portal.receptacle())
|
||||||
|
== CrystalPortalNetwork.CellStatus.INVALID) server.removeBlock(pos, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
||||||
|
// Ignore validation ticks saved by older builds. Frame edits are
|
||||||
|
// handled by neighborChanged, and the receptacle maintains the view.
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.age.PortInstabilityRuntime;
|
||||||
|
import net.dnorberg.rivencraft.age.PortInstabilityConfig;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.util.StringRepresentable;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.block.state.StateDefinition;
|
||||||
|
import net.minecraft.world.level.block.state.properties.EnumProperty;
|
||||||
|
|
||||||
|
/** The four colored decay variants selected by the current instability deck. */
|
||||||
|
public final class DecayBlock extends Block {
|
||||||
|
public static final EnumProperty<Color> COLOR = EnumProperty.create("color", Color.class);
|
||||||
|
|
||||||
|
public DecayBlock(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
registerDefaultState(stateDefinition.any().setValue(COLOR, Color.BLUE));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||||
|
builder.add(COLOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
|
||||||
|
if (level instanceof net.minecraft.server.level.ServerLevel server && state.getValue(COLOR) == Color.WHITE
|
||||||
|
&& PortInstabilityConfig.decayEnabled() && PortInstabilityConfig.instabilityWorldMutation()
|
||||||
|
&& PortInstabilityRuntime.isAge(server)) {
|
||||||
|
entity.hurtServer(server, level.damageSources().magic(), 1.0F);
|
||||||
|
}
|
||||||
|
super.stepOn(level, pos, state, entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum Color implements StringRepresentable {
|
||||||
|
BLUE, PURPLE, RED, WHITE;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getSerializedName() {
|
||||||
|
return name().toLowerCase(java.util.Locale.ROOT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.block.entity.LinkModifierBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.menu.LinkModifierMenu;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.world.InteractionResult;
|
||||||
|
import net.minecraft.world.SimpleMenuProvider;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.BaseEntityBlock;
|
||||||
|
import net.minecraft.world.level.block.RenderShape;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.block.state.StateDefinition;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.world.level.block.state.properties.EnumProperty;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
|
||||||
|
public final class LinkModifierBlock extends BaseEntityBlock {
|
||||||
|
public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
|
||||||
|
|
||||||
|
public LinkModifierBlock(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void createBlockStateDefinition(StateDefinition.Builder<net.minecraft.world.level.block.Block,
|
||||||
|
BlockState> builder) { builder.add(FACING); }
|
||||||
|
@Override public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||||
|
return defaultBlockState().setValue(FACING, context.getHorizontalDirection().getOpposite());
|
||||||
|
}
|
||||||
|
@Override protected RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; }
|
||||||
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
return new LinkModifierBlockEntity(pos, state);
|
||||||
|
}
|
||||||
|
@Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos,
|
||||||
|
Player player, BlockHitResult hit) {
|
||||||
|
if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer
|
||||||
|
&& level.getBlockEntity(pos) instanceof LinkModifierBlockEntity modifier) {
|
||||||
|
serverPlayer.openMenu(new SimpleMenuProvider(
|
||||||
|
(id, inventory, ignored) -> new LinkModifierMenu(id, inventory, modifier),
|
||||||
|
Component.translatable("container.rivencraft.link_modifier")),
|
||||||
|
buffer -> buffer.writeBlockPos(pos));
|
||||||
|
}
|
||||||
|
return InteractionResult.SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
+110
@@ -0,0 +1,110 @@
|
|||||||
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BookReceptacleBlock;
|
||||||
|
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.storage.ValueInput;
|
||||||
|
import net.minecraft.world.level.storage.ValueOutput;
|
||||||
|
|
||||||
|
/** One persisted book owns the whole crystal network. Portal cells retain only its position. */
|
||||||
|
public final class BookReceptacleBlockEntity extends BlockEntity {
|
||||||
|
private ItemStack book = ItemStack.EMPTY;
|
||||||
|
private boolean restore = true;
|
||||||
|
private int skyColor = 0xffffff;
|
||||||
|
public BookReceptacleBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
super(Rivencraft.BOOK_RECEPTACLE_BLOCK_ENTITY.get(), pos, state);
|
||||||
|
}
|
||||||
|
public ItemStack getBook() { return book; }
|
||||||
|
public int skyColor() { return skyColor; }
|
||||||
|
public void setBook(ItemStack value) {
|
||||||
|
if (level instanceof ServerLevel server)
|
||||||
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||||
|
book = value.copyWithCount(1);
|
||||||
|
restore = true;
|
||||||
|
skyColor = 0xffffff;
|
||||||
|
if (level instanceof ServerLevel source) {
|
||||||
|
var destination = book.get(Rivencraft.LINK_BOOK_TARGET.get());
|
||||||
|
var id = book.is(Rivencraft.DESCRIPTIVE_BOOK.get()) ? book.get(Rivencraft.AGE_BOOK_ID.get())
|
||||||
|
: destination == null ? null : destination.dimension();
|
||||||
|
var target = id == null ? null : source.getServer().getLevel(net.minecraft.resources.ResourceKey.create(
|
||||||
|
net.minecraft.core.registries.Registries.DIMENSION, id));
|
||||||
|
if (target != null) {
|
||||||
|
var pos = destination == null ? net.dnorberg.rivencraft.age.PortAgeTravel.resolveLanding(target, !book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(),
|
||||||
|
net.dnorberg.rivencraft.item.LinkProperties.NONE).has(net.dnorberg.rivencraft.item.LinkProperties.DISABLE_PLATFORM))
|
||||||
|
: BlockPos.containing(destination.x(), destination.y(), destination.z());
|
||||||
|
if (pos != null) {
|
||||||
|
int written = net.dnorberg.rivencraft.age.PortAgeColors.forLevel(target).sky();
|
||||||
|
String type = target.dimensionTypeRegistration().unwrapKey()
|
||||||
|
.map(key -> key.identifier().getPath()).orElse("");
|
||||||
|
skyColor = written >= 0 ? written
|
||||||
|
: target.dimension() == net.minecraft.world.level.Level.NETHER || type.endsWith("_sky_nether")
|
||||||
|
? 0x6b2725
|
||||||
|
: target.dimension() == net.minecraft.world.level.Level.END || type.endsWith("_sky_end")
|
||||||
|
? 0x211835
|
||||||
|
: net.minecraft.util.ARGB.colorFromVector3f(target.environmentAttributes().getValue(
|
||||||
|
net.minecraft.world.attribute.EnvironmentAttributes.SKY_COLOR, pos)) & 0xffffff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sync();
|
||||||
|
}
|
||||||
|
public ItemStack takeBook() {
|
||||||
|
if (level instanceof ServerLevel server)
|
||||||
|
net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition);
|
||||||
|
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
|
||||||
|
}
|
||||||
|
private void sync() {
|
||||||
|
setChanged();
|
||||||
|
if (level != null && !level.isClientSide()) {
|
||||||
|
BlockState current = level.getBlockState(worldPosition);
|
||||||
|
if (current.is(Rivencraft.BOOK_RECEPTACLE.get())) {
|
||||||
|
level.setBlock(worldPosition, current.setValue(BookReceptacleBlock.HAS_BOOK, !book.isEmpty()), 2);
|
||||||
|
level.sendBlockUpdated(worldPosition, current, level.getBlockState(worldPosition), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static void serverTick(ServerLevel level, BlockPos pos, BookReceptacleBlockEntity holder) {
|
||||||
|
if (holder.book.isEmpty()) { holder.restore = false; return; }
|
||||||
|
int interval = holder.restore ? 20 : 200;
|
||||||
|
if (level.getGameTime() % interval != Math.floorMod(pos.asLong(), interval)) return;
|
||||||
|
var plan = CrystalPortalNetwork.plan(level, pos);
|
||||||
|
if (plan.waitingForChunks()) return;
|
||||||
|
boolean restoring = holder.restore;
|
||||||
|
if (restoring && !plan.valid() && CrystalPortalNetwork.recoverSavedOwners(level, pos))
|
||||||
|
plan = CrystalPortalNetwork.plan(level, pos);
|
||||||
|
if (restoring && plan.valid()) CrystalPortalNetwork.setLiveView(level, plan, false);
|
||||||
|
CrystalPortalNetwork.reconcile(level, pos, plan);
|
||||||
|
holder.restore = false;
|
||||||
|
if (restoring) holder.sync();
|
||||||
|
}
|
||||||
|
@Override protected void loadAdditional(ValueInput input) {
|
||||||
|
super.loadAdditional(input);
|
||||||
|
book = input.read("Book", ItemStack.CODEC).orElse(ItemStack.EMPTY);
|
||||||
|
skyColor = input.getIntOr("SkyColor", 0xffffff);
|
||||||
|
restore = true;
|
||||||
|
}
|
||||||
|
@Override protected void saveAdditional(ValueOutput output) {
|
||||||
|
super.saveAdditional(output);
|
||||||
|
if (!book.isEmpty()) output.store("Book", ItemStack.CODEC, book);
|
||||||
|
output.putInt("SkyColor", skyColor);
|
||||||
|
}
|
||||||
|
@Override public CompoundTag getUpdateTag(HolderLookup.Provider registries) { return saveWithoutMetadata(registries); }
|
||||||
|
@Override public ClientboundBlockEntityDataPacket getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); }
|
||||||
|
@Override public void preRemoveSideEffects(BlockPos pos, BlockState oldState) {
|
||||||
|
if (level instanceof ServerLevel server) {
|
||||||
|
CrystalPortalNetwork.shutdown(server, pos);
|
||||||
|
ItemStack removed = book;
|
||||||
|
book = ItemStack.EMPTY;
|
||||||
|
net.minecraft.world.Containers.dropItemStack(level, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, removed);
|
||||||
|
}
|
||||||
|
super.preRemoveSideEffects(pos, oldState);
|
||||||
|
}
|
||||||
|
}
|
||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.storage.ValueInput;
|
||||||
|
import net.minecraft.world.level.storage.ValueOutput;
|
||||||
|
|
||||||
|
/** One stored book or page, synchronized independently of the player's inventory. */
|
||||||
|
public final class CrystalPortalBlockEntity extends BlockEntity {
|
||||||
|
private BlockPos receptacle;
|
||||||
|
public CrystalPortalBlockEntity(BlockPos pos, BlockState state) { super(Rivencraft.CRYSTAL_PORTAL_BLOCK_ENTITY.get(), pos, state); }
|
||||||
|
public BlockPos receptacle() { return receptacle; }
|
||||||
|
public void setReceptacle(BlockPos pos) {
|
||||||
|
receptacle = pos.immutable();
|
||||||
|
setChanged();
|
||||||
|
if (level != null && !level.isClientSide()) level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), 2);
|
||||||
|
}
|
||||||
|
@Override protected void loadAdditional(ValueInput input) {
|
||||||
|
super.loadAdditional(input);
|
||||||
|
receptacle = input.read("Receptacle", BlockPos.CODEC).orElse(null);
|
||||||
|
}
|
||||||
|
@Override protected void saveAdditional(ValueOutput output) {
|
||||||
|
super.saveAdditional(output);
|
||||||
|
if (receptacle != null) output.store("Receptacle", BlockPos.CODEC, receptacle);
|
||||||
|
}
|
||||||
|
@Override public CompoundTag getUpdateTag(HolderLookup.Provider registries) { return saveWithoutMetadata(registries); }
|
||||||
|
@Override public ClientboundBlockEntityDataPacket getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); }
|
||||||
|
}
|
||||||
+69
@@ -0,0 +1,69 @@
|
|||||||
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.level.storage.ValueInput;
|
||||||
|
import net.minecraft.world.level.storage.ValueOutput;
|
||||||
|
import net.minecraft.core.NonNullList;
|
||||||
|
import net.minecraft.world.Container;
|
||||||
|
import net.minecraft.world.ContainerHelper;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
|
/** One persisted book slot; edits are performed by the server menu. */
|
||||||
|
public final class LinkModifierBlockEntity extends BlockEntity implements Container {
|
||||||
|
private NonNullList<ItemStack> items = NonNullList.withSize(1, ItemStack.EMPTY);
|
||||||
|
|
||||||
|
public LinkModifierBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
super(Rivencraft.LINK_MODIFIER_BLOCK_ENTITY.get(), pos, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public int getContainerSize() { return 1; }
|
||||||
|
@Override public boolean isEmpty() { return items.getFirst().isEmpty(); }
|
||||||
|
@Override public ItemStack getItem(int slot) { return items.get(slot); }
|
||||||
|
@Override public ItemStack removeItem(int slot, int amount) {
|
||||||
|
ItemStack removed = ContainerHelper.removeItem(items, slot, amount);
|
||||||
|
if (!removed.isEmpty()) setChanged();
|
||||||
|
return removed;
|
||||||
|
}
|
||||||
|
@Override public ItemStack removeItemNoUpdate(int slot) {
|
||||||
|
ItemStack removed = ContainerHelper.takeItem(items, slot);
|
||||||
|
if (!removed.isEmpty()) setChanged();
|
||||||
|
return removed;
|
||||||
|
}
|
||||||
|
@Override public void setItem(int slot, ItemStack stack) {
|
||||||
|
items.set(slot, stack.copyWithCount(Math.min(1, stack.getCount())));
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
@Override public boolean canPlaceItem(int slot, ItemStack stack) {
|
||||||
|
return slot == 0 && (stack.is(Rivencraft.LINKING_BOOK.get())
|
||||||
|
|| stack.is(Rivencraft.DESCRIPTIVE_BOOK.get()));
|
||||||
|
}
|
||||||
|
@Override public boolean stillValid(Player player) {
|
||||||
|
return level != null && level.isLoaded(worldPosition) && level.getBlockEntity(worldPosition) == this
|
||||||
|
&& player.distanceToSqr(worldPosition.getX() + 0.5, worldPosition.getY() + 0.5,
|
||||||
|
worldPosition.getZ() + 0.5) <= 64.0;
|
||||||
|
}
|
||||||
|
@Override public void preRemoveSideEffects(BlockPos pos, BlockState oldState) {
|
||||||
|
if (level != null && !level.isClientSide()) {
|
||||||
|
net.minecraft.world.Containers.dropContents(level, pos, this);
|
||||||
|
clearContent();
|
||||||
|
}
|
||||||
|
super.preRemoveSideEffects(pos, oldState);
|
||||||
|
}
|
||||||
|
@Override public void clearContent() {
|
||||||
|
items = NonNullList.withSize(1, ItemStack.EMPTY);
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
@Override protected void loadAdditional(ValueInput input) {
|
||||||
|
super.loadAdditional(input);
|
||||||
|
items = NonNullList.withSize(1, ItemStack.EMPTY);
|
||||||
|
ContainerHelper.loadAllItems(input, items);
|
||||||
|
}
|
||||||
|
@Override protected void saveAdditional(ValueOutput output) {
|
||||||
|
super.saveAdditional(output);
|
||||||
|
ContainerHelper.saveAllItems(output, items);
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -116,13 +116,13 @@ public final class WritingDeskBlockEntity extends BlockEntity implements Contain
|
|||||||
public boolean canConsumeCopyMaterials() {
|
public boolean canConsumeCopyMaterials() {
|
||||||
ItemStack paper = items.get(PAPER);
|
ItemStack paper = items.get(PAPER);
|
||||||
if (!canPlaceItem(PAPER, paper) || paper.isEmpty()) return false;
|
if (!canPlaceItem(PAPER, paper) || paper.isEmpty()) return false;
|
||||||
int cost = net.dnorberg.rivencraft.PortConfig.SYMBOL_INK_COST.get();
|
int cost = net.dnorberg.rivencraft.writing.WritingInkService.symbolCopyCost();
|
||||||
return InkVialExchange.canPay(items, INK, RETURN, inkRemaining, cost);
|
return InkVialExchange.canPay(items, INK, RETURN, inkRemaining, cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean consumeCopyMaterials() {
|
public boolean consumeCopyMaterials() {
|
||||||
if (!canConsumeCopyMaterials()) return false;
|
if (!canConsumeCopyMaterials()) return false;
|
||||||
int cost = net.dnorberg.rivencraft.PortConfig.SYMBOL_INK_COST.get();
|
int cost = net.dnorberg.rivencraft.writing.WritingInkService.symbolCopyCost();
|
||||||
if (inkRemaining < cost) {
|
if (inkRemaining < cost) {
|
||||||
inkRemaining += InkVialExchange.exchange(items, INK, RETURN);
|
inkRemaining += InkVialExchange.exchange(items, INK, RETURN);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,17 +20,23 @@ public final class AgeCatalogClient {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void logout(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingOut event) {
|
public static void logout(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingOut event) {
|
||||||
|
PortBookPreview.logout();
|
||||||
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(java.util.Map.of());
|
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(java.util.Map.of());
|
||||||
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(java.util.Map.of());
|
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(java.util.Map.of());
|
||||||
|
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(java.util.Map.of());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void register(RegisterClientPayloadHandlersEvent event) {
|
public static void register(RegisterClientPayloadHandlersEvent event) {
|
||||||
|
event.register(net.dnorberg.rivencraft.network.BookPreviewPayload.TYPE, (payload, context) -> PortBookPreview.accept(payload));
|
||||||
event.register(net.dnorberg.rivencraft.network.WritingDeskCatalogPayload.TYPE, ClientWritingDeskCatalog::handle);
|
event.register(net.dnorberg.rivencraft.network.WritingDeskCatalogPayload.TYPE, ClientWritingDeskCatalog::handle);
|
||||||
|
event.register(net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload.TYPE, (payload, context) ->
|
||||||
|
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.acceptClient(payload.dimensionId(), payload.enabled()));
|
||||||
event.register(AgeCatalogPayload.TYPE, (payload, context) -> {
|
event.register(AgeCatalogPayload.TYPE, (payload, context) -> {
|
||||||
if (!(context.listener() instanceof ClientPacketListener listener)) return;
|
if (!(context.listener() instanceof ClientPacketListener listener)) return;
|
||||||
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(payload.colors());
|
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(payload.colors());
|
||||||
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(payload.dayCycles());
|
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(payload.dayCycles());
|
||||||
|
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(payload.descriptions());
|
||||||
if (listener.getLevel() != null) {
|
if (listener.getLevel() != null) {
|
||||||
listener.getLevel().environmentAttributes().invalidateTickCache();
|
listener.getLevel().environmentAttributes().invalidateTickCache();
|
||||||
listener.getLevel().updateSkyBrightness();
|
listener.getLevel().updateSkyBrightness();
|
||||||
|
|||||||
Loaded 100 of 228 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user