Public Access
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9097967b9 | ||
|
|
32c52e635f | ||
|
|
d2904eaa8d | ||
|
|
35980338e1 | ||
|
|
be8440ddb5 |
No files matched your search
@@ -17,10 +17,17 @@ supports authored terrain/biomes, structure and vegetation pages, independent
|
|||||||
Age weather/lighting, seeded and colorable Overworld/Nether/End/Static skies,
|
Age weather/lighting, seeded and colorable Overworld/Nether/End/Static skies,
|
||||||
independent Sun/Moon controls, multiple bodies and eclipses, seeded biome and
|
independent Sun/Moon controls, multiple bodies and eclipses, seeded biome and
|
||||||
feature completion, and random structure selection. Nether/End noise-biome
|
feature completion, and random structure selection. Nether/End noise-biome
|
||||||
materials now follow their native rules. The beta does not yet provide full
|
materials now follow their native rules. Books now have Legacy-style spreads,
|
||||||
1.21.1 gameplay or optional-integration parity.
|
animated fallback panels and saved destination labels; lectern stands, open-book
|
||||||
|
drops, page collections, stations and basic progression are also ported. The latest
|
||||||
|
beta includes libraries, fallback crystal portals, live instability profiling and
|
||||||
|
hazards, ordered writing recovery, and the Link Modifier with property, seed and
|
||||||
|
operator retirement controls. JEI, TerraBlender/Biomes O' Plenty, Serene Seasons
|
||||||
|
and Ruins integrations are now available as optional additions. Live destination
|
||||||
|
renderers, remaining discovery/configuration parity and the final multiplayer
|
||||||
|
regression remain unfinished.
|
||||||
See the [26.3 beta guide](ports/mc263/README.md) and
|
See the [26.3 beta guide](ports/mc263/README.md) and
|
||||||
[latest beta release notes](ports/mc263/RELEASE_NOTES_1.0.1.98-beta.1.md).
|
[latest beta release notes](ports/mc263/RELEASE_NOTES_1.0.1.136-beta.1.md).
|
||||||
Keep the builds and their saves separate, and back up worlds before updating.
|
Keep the builds and their saves separate, and back up worlds before updating.
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 162 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 72 KiB |
@@ -8,8 +8,83 @@ 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.
|
||||||
|
|
||||||
|
## Published status — 2026-11-11
|
||||||
|
|
||||||
|
[1.0.1.136-beta.1](../ports/mc263/RELEASE_NOTES_1.0.1.136-beta.1.md) collects
|
||||||
|
player-validated .130–.136: Link Modifier seed editing and operator retirement,
|
||||||
|
creation rollback, and optional JEI, TerraBlender/BOP, Serene Seasons/GlitchCore
|
||||||
|
and Ruins. Both Minecraft builds pass. The latest production client log records
|
||||||
|
all these optional integrations loaded together. Issue #99's remaining creation
|
||||||
|
rollback requirement is complete. #100 still requires the current dedicated
|
||||||
|
two-client/normal-book matrix; #102 retains the live-renderer/alternative review;
|
||||||
|
#103/#104 and parent #96 remain open. Shared dual-version follow-ups remain open
|
||||||
|
where one or both implementations are pending. The versioning change requested
|
||||||
|
in #103's comment remains part of that next release-workflow task; this release
|
||||||
|
retains the version already built and player-tested. Entries below are historical
|
||||||
|
engineering records and may describe limitations addressed in later slices.
|
||||||
|
|
||||||
## Version boundary
|
## Version boundary
|
||||||
|
|
||||||
|
Local slice `1.0.1.106-beta.1` ports the Writing Desk's two-part block,
|
||||||
|
88-tab inventory, authoritative catalog sync, copying transactions and 1.21.1
|
||||||
|
GUI/model assets. Vial exchange reuses the existing shared helper; symbol copy
|
||||||
|
cost defaults to one. Modern Container removal handles content drops while
|
||||||
|
the block cleans up its partner. The renderer uses extracted item states.
|
||||||
|
Current input helpers also correct Notebook right-click/scrollbar behavior.
|
||||||
|
Page content is a derived view of the existing port components; no saved Page
|
||||||
|
schema is replaced. Progression awards and optional JEI integration remain
|
||||||
|
pending. Client appearance/input/catalog acceptance remains required.
|
||||||
|
|
||||||
|
Local slice `1.0.1.105-beta.1` ports category Symbol Portfolios and Sealed
|
||||||
|
Notebooks, reusing item textures/models and collection menu/import behavior.
|
||||||
|
Portfolio volumes split at 252 pages. Sealed items use 1.21.1's 16-page draw
|
||||||
|
and candidate exclusions, with Survival consumption, Creative retention and
|
||||||
|
full-inventory drop fallback. No recipes are invented; discovery/library loot
|
||||||
|
and JEI integration remain later work. Unported effects are still marked red.
|
||||||
|
|
||||||
|
Local slice `1.0.1.104-beta.1` ports 1.21.1's all-or-nothing collection import
|
||||||
|
to the current Binder menu: shift-click appends and cursor strip-click inserts
|
||||||
|
before a page. Occupied page order is preserved, gaps are compacted and the
|
||||||
|
empty collection is returned. Capacity/panel conflicts are checked before any
|
||||||
|
mutation. This connects the newly ported collections to actual book assembly;
|
||||||
|
the dedicated stored-collection input/UI remains later parity work.
|
||||||
|
|
||||||
|
Local follow-up `1.0.1.103-beta.1` corrects old GLFW key literals retained in
|
||||||
|
the Notebook screen. Escape always reaches the normal container close path,
|
||||||
|
including focused search, and page-movement arrows use 26.3 key helpers.
|
||||||
|
The player reported the search-focused GUI could not be escaped in .102;
|
||||||
|
client keyboard acceptance must be repeated with .103.
|
||||||
|
|
||||||
|
Local slice `1.0.1.102-beta.1` ports Notebook/Collation Folder storage, menu,
|
||||||
|
Creative entries, Notebook crafting and the existing sparse page editor.
|
||||||
|
The 1.21.1 capacities (252/27), Link Panel insertion rejection, held-item
|
||||||
|
locking and search keyboard handling are preserved. The GUI uses 26.3 input
|
||||||
|
events/extraction and the existing glyph-only item pipeline, while retaining
|
||||||
|
the original page atlas proportions. Discovery, sealed notebooks, portfolios,
|
||||||
|
Writing Desk and bulk Binder collection use remain unfinished.
|
||||||
|
|
||||||
|
Local slice `1.0.1.101-beta.1` ports dropped-book entities, their open-book
|
||||||
|
renderer/textures, decay/weather damage and persistent components. Handheld
|
||||||
|
travel detaches only the active book and leaves it at departure after success;
|
||||||
|
failed travel or a cancelled entity spawn restores it. Shared handling covers
|
||||||
|
both book types and hands and keeps Return Link issuance after departure-book
|
||||||
|
handling. The newer render-state-based pickup path replaces the old copy()
|
||||||
|
workaround. Client rendering/pickup remain part of in-game validation.
|
||||||
|
|
||||||
|
Local slice `1.0.1.100-beta.1` ports automatic Return Link policy from 1.21.1
|
||||||
|
for handheld Descriptive Books, default DISABLED. ON_CREATION uses a persistent
|
||||||
|
world-wide per-Age marker; ALWAYS issues on each successful arrival. Exact
|
||||||
|
departure position/facing is captured before teleportation and issuance occurs
|
||||||
|
after Disarm, with inventory-full fallback to a destination item drop. Ordinary
|
||||||
|
Linking Books, failures and operator travel do not issue books. Stand/portal
|
||||||
|
integration remains pending with those systems.
|
||||||
|
|
||||||
|
Local slice `1.0.1.99-beta.1` ports the dedicated non-collectible arrival
|
||||||
|
platform block from 1.21.1, reusing its opaque crystal model and strength 0.3.
|
||||||
|
Fallback landings use it instead of collectible Crystal Blocks. No item,
|
||||||
|
loot, pick-block result, or material Page is available. Existing platforms
|
||||||
|
and the port's landing-search/footprint policy are unchanged.
|
||||||
|
|
||||||
Local slice `1.0.1.98-beta.1` ports the 1.21.1 Accelerated environment page:
|
Local slice `1.0.1.98-beta.1` ports the 1.21.1 Accelerated environment page:
|
||||||
stacking extra random block ticks in already-loaded player-nearby chunks,
|
stacking extra random block ticks in already-loaded player-nearby chunks,
|
||||||
eight-chunk/16,384-attempt default budgets, fair rotating section allocation,
|
eight-chunk/16,384-attempt default budgets, fair rotating section allocation,
|
||||||
@@ -1961,3 +2036,838 @@ passed again after the 26.3 registry slice.
|
|||||||
On 2026-11-01, the default 1.21.1 GameTest server was rerun and all 93
|
On 2026-11-01, the default 1.21.1 GameTest server was rerun and all 93
|
||||||
required tests passed, including the desk test. Issue #97 was then closed;
|
required tests passed, including the desk test. Issue #97 was then closed;
|
||||||
remaining 26.3 parity work stays under #98–#104.
|
remaining 26.3 parity work stays under #98–#104.
|
||||||
|
|
||||||
|
## Progression advancement port
|
||||||
|
|
||||||
|
`1.0.1.107-beta.1` reuses seven root progression JSON files and existing
|
||||||
|
translations. The Open Portal node remains excluded because its Receptacle icon
|
||||||
|
and action are not yet ported. Added server-owned post-commit hooks for Mixer
|
||||||
|
normal/shift output, Desk normal/shift copies, Binder assembly and successful
|
||||||
|
handheld travel whose destination is a saved runtime Age. Inventory and root
|
||||||
|
criteria remain vanilla. Existing saves retain vanilla player advancement data;
|
||||||
|
no action history is reconstructed and no protocol/schema change is required.
|
||||||
|
|
||||||
|
The build and disposable-server fixtures passed loaded data, preview/empty Mixer
|
||||||
|
rejection, both Panel pickup paths, actual Desk copy and Binder assembly awards,
|
||||||
|
and registered-Age entry eligibility. NeoForge FakePlayer uses a no-op advancement
|
||||||
|
tracker; the fixture player overrides it with vanilla PlayerAdvancements rather
|
||||||
|
than changing production awards to accommodate a test double. No client joined;
|
||||||
|
GUI tree/toasts, inventory triggers, actual travel and reconnect persistence are
|
||||||
|
the user validation. The test server was stopped and its world removed.
|
||||||
|
|
||||||
|
## Recipe discovery and advancement background
|
||||||
|
|
||||||
|
`1.0.1.109-beta.1` uses the existing Crystal Block texture for the root
|
||||||
|
advancement background via the modern asset ID. The .108 stone-path correction
|
||||||
|
passed the player's in-game test. Added adapted 1.21.1 discovery advancements
|
||||||
|
for Ink Vial, Ink Mixer, Book Binder and Crystal Block, retaining all original
|
||||||
|
materials, OR requirements and recipe rewards. The 26.3 recipe-unlocked trigger
|
||||||
|
requires `conditions.recipes`, a list. Root 1.21.1 data remains unchanged.
|
||||||
|
|
||||||
|
The build and disposable-server `recipe_discovery_probe` passed loaded
|
||||||
|
recipe/advancement availability, wrong-material negatives, actual matching-material
|
||||||
|
inventory triggers, per-player isolation and direct recipe grants for all six
|
||||||
|
crafting unlocks (including Notebook and Writing Desk). No client joined this
|
||||||
|
fixture. The test server was stopped and its world removed; crystal background
|
||||||
|
and client recipe-book presentation remain manual checks.
|
||||||
|
|
||||||
|
## Lectern book stands
|
||||||
|
|
||||||
|
`1.0.1.110-beta.1` adapts the root stand block/entity/conversion and final
|
||||||
|
renderer transforms to 26.3 extraction/submission. It uses the shared lectern
|
||||||
|
blockstate and lectern-drop loot table; no new art or stand item. Storage sync
|
||||||
|
and persistence use ValueInput/ValueOutput. preRemoveSideEffects receives the
|
||||||
|
old state and handles one stored-item drop; emptying before conversion back to
|
||||||
|
vanilla prevents duplicate recovery.
|
||||||
|
|
||||||
|
The existing book screens accept a stand source. A separate validated packet
|
||||||
|
checks dimension, eight-block distance, loaded chunk, stand identity and exact
|
||||||
|
book components before travel. Descriptive travel now shares the same helper
|
||||||
|
for handheld/stand routes; only handheld books are detached/dropped. Linking
|
||||||
|
travel uses the existing item service. Stand travel retains effects, Return Link
|
||||||
|
configuration and Age-entry awards. Live views and exploration remain unported;
|
||||||
|
unbound books require removal for handheld binding in this slice.
|
||||||
|
|
||||||
|
Build and isolated server checks passed all facing/hand/book/page combinations,
|
||||||
|
occupied/unrelated-item rejection, ownership on retrieval/break, stale/distant/
|
||||||
|
wrong-dimension requests, serialization and full restart persistence. The test
|
||||||
|
server was stopped and world removed. GUI/rendering/actual stand travel and
|
||||||
|
modifier effects require the player's in-game check. Root 1.21.1 is unchanged.
|
||||||
|
|
||||||
|
## Descriptive Book authored-page GUI
|
||||||
|
|
||||||
|
`1.0.1.111-beta.1` adapts the root Legacy cover/front/full-right-page composition
|
||||||
|
and page-index rules to GuiGraphicsExtractor. Glyphs use the existing glyph-only
|
||||||
|
special item model in a later stratum at 128×128, avoiding the dynamic-blit and
|
||||||
|
nested item-outline issues previously fixed in the Binder. Navigation uses SDL
|
||||||
|
mouse constants and current KeyEvent helpers, corner hotspots and page-turn sound.
|
||||||
|
The destination packet remains confined to the front spread; stand source
|
||||||
|
validation is unchanged. Naming widgets stay hidden off the front spread even
|
||||||
|
after resize. Screens do not pause the world.
|
||||||
|
|
||||||
|
Added the root `book_author` component with persistent string and network codec.
|
||||||
|
Binder and handheld descriptive binding assign the authenticated player's profile
|
||||||
|
name; the client never supplies author text. Existing books without it use the
|
||||||
|
unknown-author translation. Existing book_symbols retain written order, duplicates
|
||||||
|
and omitted-controller choices exactly; no Age data or generation behavior changes.
|
||||||
|
Random-Age glyph descriptions/live destination rendering remain unported.
|
||||||
|
|
||||||
|
Build and disposable server checks passed real assembly, authorship, first/last
|
||||||
|
symbol mapping, repeated-symbol and legacy-empty fallbacks, navigation bounds and
|
||||||
|
full-restart book author/page persistence. Shared full-page texture was verified
|
||||||
|
in the JAR. The temporary server was stopped and world removed. Client visuals,
|
||||||
|
turning/input/sound, lectern opening and panel-click travel remain manual checks.
|
||||||
|
|
||||||
|
## Animated link-panel fallback
|
||||||
|
|
||||||
|
`1.0.1.112-beta.1` reuses the root LegacyDestinationPreviewRenderer spiral/noise
|
||||||
|
algorithm in a shared 26.3 GUI extractor helper, removing placeholder labels from
|
||||||
|
both book panels. Shared dimensions/hit-testing retain the existing 132×83 panel
|
||||||
|
and validated hand/stand travel routes. GUI strata enforce cover -> animation ->
|
||||||
|
Legacy frame ordering. Descriptive symbol pages do not expose an active panel.
|
||||||
|
No world/network changes, dependencies, remote audio or chunk loads are introduced.
|
||||||
|
Default teal is retained until destination metadata/tint is ported; this is a
|
||||||
|
fallback, not live destination rendering. Build passed; client visual/click,
|
||||||
|
lectern, scale and page-turn checks remain manual. No server run was required.
|
||||||
|
|
||||||
|
## Linking Book spreads and artwork consolidation
|
||||||
|
|
||||||
|
`1.0.1.113-beta.1` adapts LinkingBookScreen's two spreads, counter, wrapped
|
||||||
|
left-page details, Return Link title suppression and input/page-turn behavior.
|
||||||
|
The front retains validated hand/stand travel and the animated fallback; the
|
||||||
|
final spread has no active destination panel. Vanilla dimension names translate;
|
||||||
|
Age display-name metadata remains pending and other dimensions fall back to IDs.
|
||||||
|
Block coordinates use floor-based BlockPos conversion, including negative values.
|
||||||
|
|
||||||
|
Both screens use PortLegacyBookArtwork adapted directly from the root helper,
|
||||||
|
with shared text/counter/corner routines. The descriptive screen retains its
|
||||||
|
accepted glyph/author behavior. No networking, persistence or server changes.
|
||||||
|
Build and diff checks passed; GUI presentation, controls, long names, lecterns
|
||||||
|
and descriptive-page regression are manual checks. No server was started.
|
||||||
|
|
||||||
|
## Saved destination names
|
||||||
|
|
||||||
|
`1.0.1.114-beta.1` adds optional server-owned Age display metadata and the root
|
||||||
|
persistent/networked `link_destination_name` item component. Successful book-driven
|
||||||
|
Age creation saves the entered title; Linking Book binding snapshots its source
|
||||||
|
Age's title, and automatic Return Links snapshot the departure label. Item tooltip
|
||||||
|
and GUI use the same component/vanilla/ID fallback. Negative tooltip coordinates
|
||||||
|
now floor correctly rather than truncating toward zero.
|
||||||
|
|
||||||
|
The index name map defaults empty for old saves and does not participate in seed,
|
||||||
|
folder or dimension identity selection. Names are visible only for active IDs;
|
||||||
|
retirement retains metadata for identity/rollback without exposing it as an active
|
||||||
|
Age. No catalog packet change, remote chunk load, automatic old-label migration
|
||||||
|
or terrain change is introduced.
|
||||||
|
|
||||||
|
Build and isolated server checks passed actual Binder name assignment, metadata
|
||||||
|
with case/punctuation, named Linking/automatic Return Link components, legacy
|
||||||
|
vanilla fallback, unload/reload and full-restart index/book persistence. Temporary
|
||||||
|
config restored; server stopped and world removed. Client GUI/tooltip/lectern
|
||||||
|
presentation remains manual. New names require a newly created Age and newly
|
||||||
|
bound book; old Ages retain their existing fallback label.
|
||||||
|
|
||||||
|
## Ordinary dropped books
|
||||||
|
|
||||||
|
`1.0.1.115-beta.1` implements the 26.3 half of #114. A server-only queued join
|
||||||
|
conversion creates the custom entity before discarding an ordinary book drop,
|
||||||
|
preserving toss state and item data through native restoreFrom. It gives the
|
||||||
|
replacement a new UUID (the original is still registered), adopts open-book
|
||||||
|
lifetime/decay rules and skips already-custom entities. Canceled replacements
|
||||||
|
preserve the ordinary source. No force-loading, world scanning or per-tick retry.
|
||||||
|
Loaded ordinary book entities are also eligible.
|
||||||
|
|
||||||
|
Build and isolated source/state checks passed, including cancellation recovery.
|
||||||
|
The no-player fixture required one loaded entity chunk for inspection. The user
|
||||||
|
requested to perform further checks; no additional automated restart test was run.
|
||||||
|
Server stopped and temporary world removed. Manual checks: Q/inventory toss,
|
||||||
|
death/Disarm, broken stand, full-inventory delivery/retrieval, open-book visual
|
||||||
|
orientation, motion, ownership/pickup, component preservation and restart. Root
|
||||||
|
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.
|
||||||
+1371
-4
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,85 @@
|
|||||||
|
# Rivencraft 26.3 beta 1.0.1.106-beta.1
|
||||||
|
|
||||||
|
Collects the player-validated port slices .99–.106 since 1.0.1.98-beta.1.
|
||||||
|
This beta is not yet feature-complete with Minecraft 1.21.1.
|
||||||
|
|
||||||
|
## Books and travel
|
||||||
|
|
||||||
|
- Fallback Age platforms now use the dedicated non-collectible platform block
|
||||||
|
from 1.21.1: opaque crystal texture, glass-like breaking strength, no drops
|
||||||
|
or pick-block item. Existing ordinary Crystal Block platforms are unchanged.
|
||||||
|
- Ported automatic Return Links for successful handheld Descriptive Book
|
||||||
|
travel. `descriptive_books.return_link_mode` in `config/rivencraft-local.toml`
|
||||||
|
defaults to **DISABLED**. `ON_CREATION` issues one on the first arrival per
|
||||||
|
Age/world with that mode enabled; `ALWAYS` issues one on each arrival.
|
||||||
|
- Return Links preserve departure dimension, position and facing. They are
|
||||||
|
issued after Disarm and drop at the destination if inventory is full.
|
||||||
|
First-arrival records persist across reload, reseeding and restart.
|
||||||
|
- Successful handheld Linking and Descriptive Book travel now leaves the
|
||||||
|
active book at departure as a recoverable open-book entity. Both hands are
|
||||||
|
supported. Failed travel or canceled entity spawning restores the book.
|
||||||
|
- Dropped books reuse the existing textures and skyward-facing model. They
|
||||||
|
have a one-second pickup delay, no ordinary five-minute expiry, slow decay
|
||||||
|
and water/rain damage, matching 1.21.1. Their components and decay counter
|
||||||
|
persist through restart.
|
||||||
|
|
||||||
|
## Page collections and binding
|
||||||
|
|
||||||
|
- Ported Notebooks and Collation Folders with their existing editor and assets,
|
||||||
|
capacities of 252 and 27 positions, sparse page storage, search, scrolling,
|
||||||
|
page movement and inventory transfers. Link Panels are rejected by the editor.
|
||||||
|
- Notebook crafting uses the existing leather/string pattern. The held
|
||||||
|
collection is locked against ordinary menu movement. Escape closes the menu
|
||||||
|
with search focused; search still consumes inventory/hotbar shortcuts.
|
||||||
|
- Corrected the port's keyboard and mouse-button mappings, including arrow
|
||||||
|
movement, right-click handling and scrollbar dragging.
|
||||||
|
- The Book Binder accepts collection imports: shift-click to append pages or
|
||||||
|
click a carried collection on the strip to insert them. Empty positions are
|
||||||
|
skipped and occupied page order is retained. Imports validate all inputs and
|
||||||
|
capacity before committing; successful imports return the empty collection.
|
||||||
|
- Added category Symbol Portfolios to Creative, including registry-derived
|
||||||
|
biome, material and fluid pages. Large categories split into volumes of up
|
||||||
|
to 252 pages. Portfolios use the editor and Binder import flow.
|
||||||
|
- Sealed Notebooks open into Folders containing 16 random pages using the
|
||||||
|
1.21.1 pool/exclusions. Survival consumes one; Creative retains the item.
|
||||||
|
Full inventories receive a dropped Folder. No new recipes are invented for
|
||||||
|
Folders, Portfolios or Sealed Notebooks; discovery/library loot is pending.
|
||||||
|
|
||||||
|
## Writing Desk
|
||||||
|
|
||||||
|
- Ported the two-block Writing Desk, its existing model/textures, selected-page
|
||||||
|
and white paper-stack display, and Legacy GUI atlases.
|
||||||
|
- Ported 88 tabs cycled four at a time, category/search/sort/ALL views, collection
|
||||||
|
and loose-page storage, page movement/extraction, and server-owned catalog
|
||||||
|
synchronization. Link Panels cannot be stored or copied in the desk.
|
||||||
|
- Copy previews are virtual. Taking a copy consumes one paper and one ink by
|
||||||
|
default while retaining the original page. `writing.symbol_ink_cost` is
|
||||||
|
configurable in `rivencraft-local.toml`.
|
||||||
|
- Vials fill a 16-unit meter and return vanilla glass bottles. Refills are
|
||||||
|
event-driven and require bottle space. Full inventory prevents shift-copy
|
||||||
|
consumption. Unknown pages are retained but cannot be copied unresolved.
|
||||||
|
- Ported crafting and adapted its recipe-unlock advancement to 26.3.
|
||||||
|
Removing either desk half removes its partner and drops contents once.
|
||||||
|
- Further corrections to the desk model, focused on page/paper placement,
|
||||||
|
remain tracked for both versions in issue #113.
|
||||||
|
|
||||||
|
## Compatibility and validation
|
||||||
|
|
||||||
|
- Requires Minecraft **26.3**, NeoForge **26.3.0.99**, and **Java 25**. Dynamic
|
||||||
|
Dimensions and Bad Packets are not required. The 1.21.1 implementation is
|
||||||
|
unchanged. Use matching client/server builds; Age catalog protocol remains 10.
|
||||||
|
- Player in-game checks passed. Both build targets passed. Targeted disposable
|
||||||
|
server fixtures covered ownership recovery, collection/copy transactions,
|
||||||
|
save/network codecs, block removal, reload/reseed and restart persistence.
|
||||||
|
Servers were stopped and test worlds removed. This was not a full GameTest run.
|
||||||
|
- Full writing recovery, remaining discovery/stations, instability, crystal
|
||||||
|
portals, progression awards and optional integration parity remain unfinished.
|
||||||
|
JEI guides and discovery loot for the newly ported interactions are pending.
|
||||||
|
Unsupported effects remain marked red; Creative availability is not parity.
|
||||||
|
- Back up saves. New Native Cave profiles from .97 onward cannot be read by
|
||||||
|
earlier betas, and newly ported items/entities also require the newer build.
|
||||||
|
Keep 1.21.1 and 26.3 saves separate. Machine acceleration (#112) and Native
|
||||||
|
Cave default biome-pool policy (#111) remain separate planned work.
|
||||||
|
|
||||||
|
Report issues and help improve the wiki at
|
||||||
|
[BlackSheep Git](https://git.paddedcell.org/dnorberg/rivencraft).
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
# Rivencraft 26.3 beta 1.0.1.115-beta.1
|
||||||
|
|
||||||
|
Collects the player-validated port slices .107–.115 since 1.0.1.106-beta.1.
|
||||||
|
Minecraft 26.3, NeoForge 26.3.0.99 and Java 25. This remains a beta with
|
||||||
|
incomplete Minecraft 1.21.1 gameplay and optional-integration parity.
|
||||||
|
|
||||||
|
## Book stands and dropped books
|
||||||
|
|
||||||
|
- Place a Linking Book, Descriptive Book or Page on an empty vanilla lectern
|
||||||
|
to convert it into a Rivencraft book stand, preserving facing. Occupied
|
||||||
|
vanilla lecterns are left alone.
|
||||||
|
- Books use the existing open-book model and textures and show their name
|
||||||
|
above the stand. Pages use their item artwork without a hover label,
|
||||||
|
retaining the 1.21.1 orientation corrections.
|
||||||
|
- Open a bound book with an empty hand, then click its destination panel to
|
||||||
|
travel while leaving the book on its stand. Existing link modifiers,
|
||||||
|
same-dimension rules, Return Link configuration and Age-entry awards apply.
|
||||||
|
- Shift-right-click with an empty hand retrieves the stored item and restores
|
||||||
|
a vanilla lectern. Breaking returns one lectern and its contents. Unwritten
|
||||||
|
books can be displayed; retrieve them to bind in hand in this beta.
|
||||||
|
- Ordinary dropped Linking/Descriptive Books now become recoverable open-book
|
||||||
|
entities, including unwritten books, inventory/player drops, container and
|
||||||
|
stand drops, death/Disarm drops and ordinary book entities loaded from disk.
|
||||||
|
- Conversion preserves the stack and components, position, motion, facing,
|
||||||
|
pickup delay and ownership/thrower metadata. It uses the existing open-book
|
||||||
|
lifetime, slow decay and water/rain behavior. Already-custom books and
|
||||||
|
non-book items are skipped.
|
||||||
|
- Conversion runs after registration without world scans or force-loading.
|
||||||
|
The original is removed only after replacement succeeds; a canceled
|
||||||
|
replacement leaves the ordinary item intact and eligible on a later reload.
|
||||||
|
- Stand travel validates source dimension, distance, loaded chunk and the exact
|
||||||
|
currently stored book, rejecting stale screens after removal/replacement.
|
||||||
|
|
||||||
|
## Book GUIs and names
|
||||||
|
|
||||||
|
- Descriptive Books reuse the Legacy gilded cover, name/author front spread,
|
||||||
|
and one authored symbol at a time on following right-hand pages. Saved page
|
||||||
|
order and repetitions are retained, with runtime glyphs and no extra item outline.
|
||||||
|
- New Descriptive Books record their author server-side. Older books without
|
||||||
|
that metadata use the unknown-author label.
|
||||||
|
- Linking Books use the plain Legacy cover, wrapped title, destination name
|
||||||
|
and block coordinates, plus the blank final spread. Return Links suppress
|
||||||
|
the redundant title. Bottom corners or arrow keys turn pages with sound.
|
||||||
|
- Both GUIs share the Legacy artwork/text/counter/corner helpers. Naming
|
||||||
|
controls hide on later pages and remain correct after resizing. Escape closes
|
||||||
|
even with naming focused; normal text input does not trigger inventory keys.
|
||||||
|
- Ported the existing 1.21.1 fallback's animated teal spiral panel to both GUIs,
|
||||||
|
including lecterns. Removed placeholder labels. The Legacy frame draws over
|
||||||
|
the animation; travel is active only on the front panel.
|
||||||
|
- The animated fallback is not a live destination view. Destination tint,
|
||||||
|
snapshot renderer integrations and random-Age glyph descriptions remain pending.
|
||||||
|
- New Ages save their entered display name independently of their ID, folder
|
||||||
|
and seed. Newly bound Linking Books and automatic Return Links capture their
|
||||||
|
destination/departure label for both GUI and tooltip. Older Ages/books retain
|
||||||
|
vanilla-name or dimension-ID fallbacks; existing labels are not rewritten.
|
||||||
|
- Corrected negative tooltip coordinates to floor consistently with the GUI.
|
||||||
|
|
||||||
|
## Progression and recipe discovery
|
||||||
|
|
||||||
|
- Ported the Rivencraft advancement tree: root, obtaining a Page/Linking Book,
|
||||||
|
taking a Link Panel from the Ink Mixer, copying a Page, binding an Age and
|
||||||
|
successfully travelling into an Age. Action awards occur after committed
|
||||||
|
server actions, including normal and shift pickup; previews earn nothing.
|
||||||
|
- The advancement background uses the existing blue Crystal Block texture,
|
||||||
|
with the corrected 26.3 resource-path format. The portal node waits for the
|
||||||
|
Receptacle/portal port.
|
||||||
|
- Added recipe-book discovery for Ink Vials (Black Dye), Ink Mixers (Glass
|
||||||
|
Bottle), Book Binders (Iron Ingot) and Crystal Blocks (Crystal Shard), alongside
|
||||||
|
the Notebook and Writing Desk unlocks. Three-by-three recipes appear in a
|
||||||
|
Crafting Table's recipe book, not the inventory's two-by-two book.
|
||||||
|
- Ingredients and costs are unchanged. Blank Pages remain uncraftable.
|
||||||
|
|
||||||
|
## Validation and remaining work
|
||||||
|
|
||||||
|
- Player in-game checks passed each slice and the final dropped-book changes.
|
||||||
|
- The 26.3 and independent 1.21.1 builds passed. Gradle test tasks have no
|
||||||
|
standalone test sources; targeted disposable-server fixtures covered real
|
||||||
|
station actions, advancements/recipe unlocks, stand ownership/drops and
|
||||||
|
persistence, book author/page/name persistence, and drop conversion/state.
|
||||||
|
- Temporary test servers were stopped and their worlds deleted. A no-player
|
||||||
|
entity fixture required one loaded fixture chunk for inspection; further
|
||||||
|
visual/restart validation was handed to the player.
|
||||||
|
- 1.21.1 gameplay code is unchanged. Shared issue #114 remains open for its
|
||||||
|
matching universal dropped-book fix; Writing Desk model placement stays in #113.
|
||||||
|
- Instability, full writing recovery, discovery/library loot, crystal portals,
|
||||||
|
remaining stations/progression and optional integrations still need port work.
|
||||||
|
|
||||||
|
Keep 26.3 and 1.21.1 instances/saves separate and back up beta worlds before updating.
|
||||||
@@ -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.
|
||||||
@@ -3,6 +3,39 @@ 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' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
// 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}"
|
||||||
|
}
|
||||||
|
|
||||||
group = 'net.dnorberg.rivencraft'
|
group = 'net.dnorberg.rivencraft'
|
||||||
version = mod_version
|
version = mod_version
|
||||||
|
|
||||||
@@ -193,6 +226,10 @@ 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 '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'
|
||||||
@@ -203,6 +240,25 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'assets/rivencraft/textures/gui/symbolcomponents.png'
|
include 'assets/rivencraft/textures/gui/symbolcomponents.png'
|
||||||
include 'assets/rivencraft/models/item/page_link_panel.json'
|
include 'assets/rivencraft/models/item/page_link_panel.json'
|
||||||
include 'assets/rivencraft/textures/item/ink_vial.png'
|
include 'assets/rivencraft/textures/item/ink_vial.png'
|
||||||
|
include 'assets/rivencraft/textures/item/notebook.png'
|
||||||
|
include 'assets/rivencraft/textures/item/collation_folder.png'
|
||||||
|
include 'assets/rivencraft/models/item/notebook.json'
|
||||||
|
include 'assets/rivencraft/models/item/collation_folder.json'
|
||||||
|
include 'assets/rivencraft/textures/item/sealed_notebook.png'
|
||||||
|
include 'assets/rivencraft/textures/item/symbol_portfolio.png'
|
||||||
|
include 'assets/rivencraft/models/item/sealed_notebook.json'
|
||||||
|
include 'assets/rivencraft/models/item/symbol_portfolio.json'
|
||||||
|
include 'assets/rivencraft/textures/item/writing_desk.png'
|
||||||
|
include 'assets/rivencraft/textures/block/writing_desk.png'
|
||||||
|
include 'assets/rivencraft/textures/gui/writing_desk_legacy.png'
|
||||||
|
include 'assets/rivencraft/textures/gui/scrollbar.png'
|
||||||
|
include 'assets/rivencraft/models/item/writing_desk.json'
|
||||||
|
include 'assets/rivencraft/models/block/writing_desk.json'
|
||||||
|
include 'assets/rivencraft/models/block/writing_desk_extension.json'
|
||||||
|
include 'assets/rivencraft/blockstates/writing_desk.json'
|
||||||
|
include 'data/rivencraft/loot_table/blocks/writing_desk.json'
|
||||||
|
include 'data/rivencraft/advancement/progression/*.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'
|
||||||
include 'assets/rivencraft/models/item/crystal_shard.json'
|
include 'assets/rivencraft/models/item/crystal_shard.json'
|
||||||
@@ -214,10 +270,19 @@ tasks.named('processResources', ProcessResources).configure {
|
|||||||
include 'assets/rivencraft/textures/gui/bookui_cover.png'
|
include 'assets/rivencraft/textures/gui/bookui_cover.png'
|
||||||
include 'assets/rivencraft/textures/gui/notebook_pages.png'
|
include 'assets/rivencraft/textures/gui/notebook_pages.png'
|
||||||
include 'assets/rivencraft/textures/gui/bookui_pager.png'
|
include 'assets/rivencraft/textures/gui/bookui_pager.png'
|
||||||
|
include 'assets/rivencraft/textures/gui/bookui_rpage_full.png'
|
||||||
include 'assets/rivencraft/textures/block/crystal_block.png'
|
include 'assets/rivencraft/textures/block/crystal_block.png'
|
||||||
|
include 'assets/rivencraft/textures/entity/linking_book.png'
|
||||||
|
include 'assets/rivencraft/textures/entity/descriptive_book.png'
|
||||||
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'
|
||||||
@@ -230,9 +295,24 @@ 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 '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'
|
||||||
|
include 'assets/rivencraft/models/block/cloud_platform.json'
|
||||||
|
include 'assets/rivencraft/blockstates/cloud_platform.json'
|
||||||
include 'assets/rivencraft/blockstates/budding_crystal.json'
|
include 'assets/rivencraft/blockstates/budding_crystal.json'
|
||||||
include 'assets/rivencraft/blockstates/small_crystal_bud.json'
|
include 'assets/rivencraft/blockstates/small_crystal_bud.json'
|
||||||
include 'assets/rivencraft/blockstates/medium_crystal_bud.json'
|
include 'assets/rivencraft/blockstates/medium_crystal_bud.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.98-beta.1
|
mod_version=1.0.1.136-beta.1
|
||||||
|
|
||||||
|
jei_version=31.17.0.109
|
||||||
|
|
||||||
|
terrablender_version=26.3.0.0.9
|
||||||
|
|
||||||
|
serene_seasons_version_id=QnvW5HPm
|
||||||
|
glitchcore_version_id=pQgy3bfh
|
||||||
@@ -106,5 +106,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"
|
||||||
}
|
}
|
||||||
@@ -2,20 +2,48 @@ package net.dnorberg.rivencraft;
|
|||||||
|
|
||||||
import net.neoforged.neoforge.common.ModConfigSpec;
|
import net.neoforged.neoforge.common.ModConfigSpec;
|
||||||
|
|
||||||
/** Server-side limits shared with the 1.21.1 Accelerated implementation. */
|
/** 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 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 LINK_PANEL_INK_COST;
|
||||||
|
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("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");
|
||||||
|
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.")
|
||||||
|
.defineEnum("return_link_mode", ReturnLinkMode.DISABLED);
|
||||||
|
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");
|
||||||
|
SYMBOL_INK_COST = builder.comment("Ink units consumed for one Writing Desk symbol copy.")
|
||||||
|
.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.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.")
|
||||||
.defineInRange("max_loaded_chunks", 8, 1, 64);
|
.defineInRange("max_loaded_chunks", 8, 1, 64);
|
||||||
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables Accelerated.")
|
ACCELERATED_MAX_ATTEMPTS = builder.comment("Maximum extra random-tick positions sampled per Age tick, shared fairly across loaded sections; zero disables 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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -57,6 +57,15 @@ public final class Rivencraft {
|
|||||||
public static final Logger LOGGER = LogUtils.getLogger();
|
public static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MOD_ID);
|
private static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MOD_ID);
|
||||||
private static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MOD_ID);
|
private static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MOD_ID);
|
||||||
|
private static final DeferredRegister<net.minecraft.world.entity.EntityType<?>> ENTITIES =
|
||||||
|
DeferredRegister.create(Registries.ENTITY_TYPE, MOD_ID);
|
||||||
|
public static final Supplier<net.minecraft.world.entity.EntityType<net.dnorberg.rivencraft.entity.DroppedBookEntity>>
|
||||||
|
DROPPED_BOOK = ENTITIES.register("dropped_book", () -> net.minecraft.world.entity.EntityType.Builder
|
||||||
|
.<net.dnorberg.rivencraft.entity.DroppedBookEntity>of(
|
||||||
|
net.dnorberg.rivencraft.entity.DroppedBookEntity::new, net.minecraft.world.entity.MobCategory.MISC)
|
||||||
|
.sized(0.65F, 0.4F).clientTrackingRange(10).updateInterval(20)
|
||||||
|
.build(net.minecraft.resources.ResourceKey.create(Registries.ENTITY_TYPE,
|
||||||
|
Identifier.fromNamespaceAndPath(MOD_ID, "dropped_book"))));
|
||||||
private static final DeferredRegister<SoundEvent> SOUNDS =
|
private static final DeferredRegister<SoundEvent> SOUNDS =
|
||||||
DeferredRegister.create(Registries.SOUND_EVENT, MOD_ID);
|
DeferredRegister.create(Registries.SOUND_EVENT, MOD_ID);
|
||||||
public static final Supplier<SoundEvent> LINK = sound("linking.link");
|
public static final Supplier<SoundEvent> LINK = sound("linking.link");
|
||||||
@@ -82,6 +91,12 @@ public final class Rivencraft {
|
|||||||
public static final Supplier<DataComponentType<Identifier>> AGE_BOOK_ID = COMPONENTS.registerComponentType(
|
public static final Supplier<DataComponentType<Identifier>> AGE_BOOK_ID = COMPONENTS.registerComponentType(
|
||||||
"age_book_id", builder -> builder.persistent(Identifier.CODEC)
|
"age_book_id", builder -> builder.persistent(Identifier.CODEC)
|
||||||
.networkSynchronized(Identifier.STREAM_CODEC));
|
.networkSynchronized(Identifier.STREAM_CODEC));
|
||||||
|
public static final Supplier<DataComponentType<net.dnorberg.rivencraft.writing.NotebookContents>> NOTEBOOK_CONTENTS =
|
||||||
|
COMPONENTS.registerComponentType("notebook_contents", builder -> builder
|
||||||
|
.persistent(net.dnorberg.rivencraft.writing.NotebookContents.CODEC)
|
||||||
|
.networkSynchronized(net.dnorberg.rivencraft.writing.NotebookContents.STREAM_CODEC));
|
||||||
|
public static final Supplier<DataComponentType<String>> LINK_DESTINATION_NAME = COMPONENTS.registerComponentType(
|
||||||
|
"link_destination_name", builder -> builder.persistent(Codec.STRING).networkSynchronized(ByteBufCodecs.STRING_UTF8));
|
||||||
public static final Supplier<DataComponentType<LinkBookTarget>> LINK_BOOK_TARGET = COMPONENTS.registerComponentType(
|
public static final Supplier<DataComponentType<LinkBookTarget>> LINK_BOOK_TARGET = COMPONENTS.registerComponentType(
|
||||||
"link_book_target", builder -> builder.persistent(LinkBookTarget.CODEC)
|
"link_book_target", builder -> builder.persistent(LinkBookTarget.CODEC)
|
||||||
.networkSynchronized(LinkBookTarget.STREAM_CODEC));
|
.networkSynchronized(LinkBookTarget.STREAM_CODEC));
|
||||||
@@ -93,6 +108,8 @@ public final class Rivencraft {
|
|||||||
"symbol_page_id", builder -> builder.persistent(Identifier.CODEC)
|
"symbol_page_id", builder -> builder.persistent(Identifier.CODEC)
|
||||||
.networkSynchronized(Identifier.STREAM_CODEC));
|
.networkSynchronized(Identifier.STREAM_CODEC));
|
||||||
/** Ordered authored page IDs remain on the finished book for later port slices. */
|
/** Ordered authored page IDs remain on the finished book for later port slices. */
|
||||||
|
public static final Supplier<DataComponentType<String>> BOOK_AUTHOR = COMPONENTS.registerComponentType(
|
||||||
|
"book_author", builder -> builder.persistent(Codec.STRING).networkSynchronized(ByteBufCodecs.STRING_UTF8));
|
||||||
public static final Supplier<DataComponentType<java.util.List<Identifier>>> BOOK_SYMBOLS = COMPONENTS.registerComponentType(
|
public static final Supplier<DataComponentType<java.util.List<Identifier>>> BOOK_SYMBOLS = COMPONENTS.registerComponentType(
|
||||||
"book_symbols", builder -> builder.persistent(Identifier.CODEC.listOf())
|
"book_symbols", builder -> builder.persistent(Identifier.CODEC.listOf())
|
||||||
.networkSynchronized(ByteBufCodecs.<io.netty.buffer.ByteBuf, Identifier>list(252)
|
.networkSynchronized(ByteBufCodecs.<io.netty.buffer.ByteBuf, Identifier>list(252)
|
||||||
@@ -110,16 +127,52 @@ public final class Rivencraft {
|
|||||||
|
|
||||||
public static final DeferredBlock<Block> CRYSTAL_BLOCK = BLOCKS.registerBlock("crystal_block",
|
public static final DeferredBlock<Block> CRYSTAL_BLOCK = BLOCKS.registerBlock("crystal_block",
|
||||||
Block::new, () -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK));
|
Block::new, () -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK));
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.CloudPlatformBlock> CLOUD_PLATFORM =
|
||||||
|
BLOCKS.registerBlock("cloud_platform", net.dnorberg.rivencraft.block.CloudPlatformBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK)
|
||||||
|
.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));
|
||||||
public static final Supplier<BlockEntityType<StarFissureBlockEntity>>
|
public static final Supplier<BlockEntityType<StarFissureBlockEntity>>
|
||||||
STAR_FISSURE_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("star_fissure", () -> new BlockEntityType<>(
|
STAR_FISSURE_BLOCK_ENTITY = BLOCK_ENTITY_TYPES.register("star_fissure", () -> new BlockEntityType<>(
|
||||||
StarFissureBlockEntity::new, STAR_FISSURE.get()));
|
StarFissureBlockEntity::new, STAR_FISSURE.get()));
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.BookStandBlock> BOOK_STAND =
|
||||||
|
BLOCKS.registerBlock("book_stand", net.dnorberg.rivencraft.block.BookStandBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.LECTERN));
|
||||||
|
public static final Supplier<BlockEntityType<net.dnorberg.rivencraft.block.entity.BookStandBlockEntity>> BOOK_STAND_BLOCK_ENTITY =
|
||||||
|
BLOCK_ENTITY_TYPES.register("book_stand", () -> new BlockEntityType<>(
|
||||||
|
net.dnorberg.rivencraft.block.entity.BookStandBlockEntity::new, BOOK_STAND.get()));
|
||||||
public static final DeferredBlock<PortBookBinderBlock> BOOK_BINDER = BLOCKS.registerBlock(
|
public static final DeferredBlock<PortBookBinderBlock> BOOK_BINDER = BLOCKS.registerBlock(
|
||||||
"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());
|
||||||
@@ -134,6 +187,25 @@ public final class Rivencraft {
|
|||||||
new BlockEntityType<>(InkMixerBlockEntity::new, INK_MIXER.get()));
|
new BlockEntityType<>(InkMixerBlockEntity::new, INK_MIXER.get()));
|
||||||
public static final Supplier<MenuType<InkMixerMenu>> INK_MIXER_MENU =
|
public static final Supplier<MenuType<InkMixerMenu>> INK_MIXER_MENU =
|
||||||
MENUS.register("ink_mixer", () -> IMenuTypeExtension.create(InkMixerMenu::new));
|
MENUS.register("ink_mixer", () -> IMenuTypeExtension.create(InkMixerMenu::new));
|
||||||
|
public static final DeferredBlock<net.dnorberg.rivencraft.block.WritingDeskBlock> WRITING_DESK =
|
||||||
|
BLOCKS.registerBlock("writing_desk", net.dnorberg.rivencraft.block.WritingDeskBlock::new,
|
||||||
|
() -> BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion());
|
||||||
|
public static final DeferredItem<BlockItem> WRITING_DESK_ITEM = ITEMS.registerSimpleBlockItem(WRITING_DESK);
|
||||||
|
public static final Supplier<BlockEntityType<net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity>> WRITING_DESK_BLOCK_ENTITY =
|
||||||
|
BLOCK_ENTITY_TYPES.register("writing_desk", () -> new BlockEntityType<>(
|
||||||
|
net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity::new, WRITING_DESK.get()));
|
||||||
|
public static final Supplier<MenuType<net.dnorberg.rivencraft.menu.WritingDeskMenu>> WRITING_DESK_MENU =
|
||||||
|
MENUS.register("writing_desk", () -> IMenuTypeExtension.create(net.dnorberg.rivencraft.menu.WritingDeskMenu::new));
|
||||||
|
public static final Supplier<MenuType<net.dnorberg.rivencraft.menu.NotebookMenu>> NOTEBOOK_MENU =
|
||||||
|
MENUS.register("notebook", () -> IMenuTypeExtension.create(net.dnorberg.rivencraft.menu.NotebookMenu::new));
|
||||||
|
public static final DeferredItem<net.dnorberg.rivencraft.item.NotebookItem> NOTEBOOK =
|
||||||
|
ITEMS.registerItem("notebook", net.dnorberg.rivencraft.item.NotebookItem::new, properties -> properties.stacksTo(1));
|
||||||
|
public static final DeferredItem<net.dnorberg.rivencraft.item.CollationFolderItem> COLLATION_FOLDER =
|
||||||
|
ITEMS.registerItem("collation_folder", net.dnorberg.rivencraft.item.CollationFolderItem::new, properties -> properties.stacksTo(1));
|
||||||
|
public static final DeferredItem<net.dnorberg.rivencraft.item.SymbolPortfolioItem> SYMBOL_PORTFOLIO =
|
||||||
|
ITEMS.registerItem("symbol_portfolio", net.dnorberg.rivencraft.item.SymbolPortfolioItem::new, properties -> properties.stacksTo(1));
|
||||||
|
public static final DeferredItem<net.dnorberg.rivencraft.item.SealedNotebookItem> SEALED_NOTEBOOK =
|
||||||
|
ITEMS.registerItem("sealed_notebook", net.dnorberg.rivencraft.item.SealedNotebookItem::new, properties -> properties.stacksTo(16));
|
||||||
public static final DeferredItem<BlockItem> CRYSTAL_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(CRYSTAL_BLOCK);
|
public static final DeferredItem<BlockItem> CRYSTAL_BLOCK_ITEM = ITEMS.registerSimpleBlockItem(CRYSTAL_BLOCK);
|
||||||
public static final DeferredBlock<BuddingCrystalBlock> BUDDING_CRYSTAL = BLOCKS.registerBlock(
|
public static final DeferredBlock<BuddingCrystalBlock> BUDDING_CRYSTAL = BLOCKS.registerBlock(
|
||||||
"budding_crystal", BuddingCrystalBlock::new,
|
"budding_crystal", BuddingCrystalBlock::new,
|
||||||
@@ -171,10 +243,12 @@ public final class Rivencraft {
|
|||||||
BLOCKS.register(modEventBus);
|
BLOCKS.register(modEventBus);
|
||||||
SOUNDS.register(modEventBus);
|
SOUNDS.register(modEventBus);
|
||||||
ITEMS.register(modEventBus);
|
ITEMS.register(modEventBus);
|
||||||
|
ENTITIES.register(modEventBus);
|
||||||
BLOCK_ENTITY_TYPES.register(modEventBus);
|
BLOCK_ENTITY_TYPES.register(modEventBus);
|
||||||
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();
|
||||||
ModCreativeTabs.register(modEventBus);
|
ModCreativeTabs.register(modEventBus);
|
||||||
PortBiomeSources.register(modEventBus);
|
PortBiomeSources.register(modEventBus);
|
||||||
PortChunkGenerators.register(modEventBus);
|
PortChunkGenerators.register(modEventBus);
|
||||||
@@ -182,11 +256,23 @@ public final class Rivencraft {
|
|||||||
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(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)");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
package net.dnorberg.rivencraft.advancement;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.age.RuntimeAgeBackend;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
|
||||||
|
/** Awards action-only progression after the server has committed the action. */
|
||||||
|
public final class ProgressionAdvancements {
|
||||||
|
public static final String OPEN_PORTAL = "open_portal";
|
||||||
|
public static final String LINK_PANEL = "link_panel";
|
||||||
|
public static final String COPY_PAGE = "copy_page";
|
||||||
|
public static final String BIND_AGE = "bind_age";
|
||||||
|
public static final String ENTER_AGE = "enter_age";
|
||||||
|
|
||||||
|
private ProgressionAdvancements() {}
|
||||||
|
|
||||||
|
public static void award(ServerPlayer player, String path) {
|
||||||
|
var advancement = player.level().getServer().getAdvancements().get(
|
||||||
|
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "progression/" + path));
|
||||||
|
if (advancement != null) player.getAdvancements().award(advancement, "completed");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void awardAgeTravel(ServerPlayer player) {
|
||||||
|
if (RuntimeAgeBackend.savedAges(player.level().getServer()).containsKey(player.level().dimension().identifier()))
|
||||||
|
award(player, ENTER_AGE);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,7 +42,9 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
Codec.unboundedMap(Identifier.CODEC, PortAgeColors.CODEC)
|
Codec.unboundedMap(Identifier.CODEC, PortAgeColors.CODEC)
|
||||||
.optionalFieldOf("colors", Map.of()).forGetter(index -> index.colors),
|
.optionalFieldOf("colors", Map.of()).forGetter(index -> index.colors),
|
||||||
Codec.unboundedMap(Identifier.CODEC, PortDayCycle.CODEC)
|
Codec.unboundedMap(Identifier.CODEC, PortDayCycle.CODEC)
|
||||||
.optionalFieldOf("day_cycles", Map.of()).forGetter(index -> index.dayCycles)
|
.optionalFieldOf("day_cycles", Map.of()).forGetter(index -> index.dayCycles),
|
||||||
|
Codec.unboundedMap(Identifier.CODEC, Codec.STRING)
|
||||||
|
.optionalFieldOf("display_names", Map.of()).forGetter(index -> index.displayNames)
|
||||||
).apply(instance, AgeLevelIndex::new));
|
).apply(instance, AgeLevelIndex::new));
|
||||||
|
|
||||||
static final SavedDataType<AgeLevelIndex> TYPE = new SavedDataType<>(
|
static final SavedDataType<AgeLevelIndex> TYPE = new SavedDataType<>(
|
||||||
@@ -65,6 +67,7 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
private final Map<Identifier, PortSkyStyle> sky;
|
private final Map<Identifier, PortSkyStyle> sky;
|
||||||
private final Map<Identifier, PortAgeColors> colors;
|
private final Map<Identifier, PortAgeColors> colors;
|
||||||
private final Map<Identifier, PortDayCycle> dayCycles;
|
private final Map<Identifier, PortDayCycle> dayCycles;
|
||||||
|
private final Map<Identifier, String> displayNames;
|
||||||
|
|
||||||
private AgeLevelIndex() {
|
private AgeLevelIndex() {
|
||||||
this.ages = new LinkedHashMap<>();
|
this.ages = new LinkedHashMap<>();
|
||||||
@@ -81,6 +84,7 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
this.sky = new LinkedHashMap<>();
|
this.sky = new LinkedHashMap<>();
|
||||||
this.colors = new LinkedHashMap<>();
|
this.colors = new LinkedHashMap<>();
|
||||||
this.dayCycles = new LinkedHashMap<>();
|
this.dayCycles = new LinkedHashMap<>();
|
||||||
|
this.displayNames = new LinkedHashMap<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private AgeLevelIndex(Map<Identifier, Long> ages, List<Identifier> retired,
|
private AgeLevelIndex(Map<Identifier, Long> ages, List<Identifier> retired,
|
||||||
@@ -94,7 +98,7 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
Map<Identifier, PortTerrainFeaturePlan> terrainFeatures,
|
Map<Identifier, PortTerrainFeaturePlan> terrainFeatures,
|
||||||
Map<Identifier, PortLighting> lighting,
|
Map<Identifier, PortLighting> lighting,
|
||||||
Map<Identifier, PortSkyStyle> sky, Map<Identifier, PortAgeColors> colors,
|
Map<Identifier, PortSkyStyle> sky, Map<Identifier, PortAgeColors> colors,
|
||||||
Map<Identifier, PortDayCycle> dayCycles) {
|
Map<Identifier, PortDayCycle> dayCycles, Map<Identifier, String> displayNames) {
|
||||||
this.ages = new LinkedHashMap<>(ages);
|
this.ages = new LinkedHashMap<>(ages);
|
||||||
this.retired = new LinkedHashSet<>(retired);
|
this.retired = new LinkedHashSet<>(retired);
|
||||||
this.biomeOverrides = new LinkedHashMap<>(biomeOverrides);
|
this.biomeOverrides = new LinkedHashMap<>(biomeOverrides);
|
||||||
@@ -109,6 +113,16 @@ final class AgeLevelIndex extends SavedData {
|
|||||||
this.sky = new LinkedHashMap<>(sky);
|
this.sky = new LinkedHashMap<>(sky);
|
||||||
this.colors = new LinkedHashMap<>(colors);
|
this.colors = new LinkedHashMap<>(colors);
|
||||||
this.dayCycles = new LinkedHashMap<>(dayCycles);
|
this.dayCycles = new LinkedHashMap<>(dayCycles);
|
||||||
|
this.displayNames = new LinkedHashMap<>(displayNames);
|
||||||
|
}
|
||||||
|
|
||||||
|
String displayName(Identifier id) { return ages.containsKey(id) ? displayNames.get(id) : null; }
|
||||||
|
|
||||||
|
void setDisplayName(Identifier id, String name) {
|
||||||
|
if (!ages.containsKey(id)) throw new IllegalArgumentException("Age not indexed: " + id);
|
||||||
|
if (name == null || name.isBlank() || name.length() > 32) throw new IllegalArgumentException("Invalid Age display name");
|
||||||
|
displayNames.put(id, name.strip());
|
||||||
|
setDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<Identifier, Long> entries() {
|
Map<Identifier, Long> entries() {
|
||||||
@@ -168,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);
|
||||||
@@ -182,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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -69,7 +69,8 @@ public record PortAgeColors(int sky, int ambient, int celestial) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
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++) {
|
||||||
|
|||||||
@@ -35,6 +35,12 @@ public final class PortAgeCommands {
|
|||||||
public static void register(RegisterCommandsEvent event) {
|
public static void register(RegisterCommandsEvent event) {
|
||||||
event.getDispatcher().register(Commands.literal("rivencraft_port")
|
event.getDispatcher().register(Commands.literal("rivencraft_port")
|
||||||
.requires(Commands.hasPermission(Commands.LEVEL_ADMINS))
|
.requires(Commands.hasPermission(Commands.LEVEL_ADMINS))
|
||||||
|
.then(Commands.literal("recipe_discovery_probe")
|
||||||
|
.executes(context -> {
|
||||||
|
PortProgressionProbe.recipeDiscovery(context.getSource().getServer().overworld());
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Recipe discovery checks passed for all six crafting unlocks"), false);
|
||||||
|
return 1;
|
||||||
|
}))
|
||||||
.then(Commands.literal("compat")
|
.then(Commands.literal("compat")
|
||||||
.executes(context -> {
|
.executes(context -> {
|
||||||
StringBuilder mods = new StringBuilder("Optional mods: ");
|
StringBuilder mods = new StringBuilder("Optional mods: ");
|
||||||
@@ -69,6 +75,164 @@ public final class PortAgeCommands {
|
|||||||
return 1;
|
return 1;
|
||||||
})))
|
})))
|
||||||
.then(Commands.literal("age")
|
.then(Commands.literal("age")
|
||||||
|
.then(Commands.literal("create_drop_conversion_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortBookDropConversionProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Drop sources queued; run drop_conversion_probe after server tasks complete"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("drop_conversion_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortBookDropConversionProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Universal book drop conversion/ownership checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_book_stand_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortBookStandProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Book Stand conversion/ownership/source checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("book_stand_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortBookStandProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Book Stand persistence passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_writing_desk_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortWritingDeskProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Writing Desk transaction/removal checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("progression_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortProgressionProbe.run(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Progression data/action checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("writing_desk_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortWritingDeskProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Writing Desk persistence passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_collection_extras_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortCollectionExtrasProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Portfolio/Sealed Notebook checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("collection_extras_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortCollectionExtrasProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Portfolio/Sealed Notebook persistence passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_binder_collection_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortBinderCollectionProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Binder collection transaction/assembly checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("binder_collection_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortBinderCollectionProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Binder collection persistence passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_notebook_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortNotebookProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Notebook menu/codec checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("notebook_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
PortNotebookProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Notebook chest persistence passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_dropped_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
PortDroppedBookProbe.create(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Dropped book ownership/codec checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
}))))
|
||||||
|
.then(Commands.literal("dropped_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(context -> {
|
||||||
|
var level = context.getSource().getServer().getLevel(
|
||||||
|
ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) throw new IllegalArgumentException("Age not loaded");
|
||||||
|
level.getChunk(0, 0);
|
||||||
|
PortDroppedBookProbe.verify(level);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal("Dropped book persistence checks passed"), false);
|
||||||
|
return 1;
|
||||||
|
})))
|
||||||
|
.then(Commands.literal("create_return_fixture")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(PortAgeCommands::createReturnFixture))))
|
||||||
|
.then(Commands.literal("return_link_status")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(PortAgeCommands::returnLinkStatus)))
|
||||||
|
.then(Commands.literal("create_platform")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
|
.executes(PortAgeCommands::createPlatform))))
|
||||||
|
.then(Commands.literal("platform_probe")
|
||||||
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
|
.executes(PortAgeCommands::probePlatform)))
|
||||||
.then(Commands.literal("create_accelerated")
|
.then(Commands.literal("create_accelerated")
|
||||||
.then(Commands.argument("name", StringArgumentType.word())
|
.then(Commands.argument("name", StringArgumentType.word())
|
||||||
.then(Commands.argument("seed", LongArgumentType.longArg())
|
.then(Commands.argument("seed", LongArgumentType.longArg())
|
||||||
@@ -655,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());
|
||||||
@@ -1452,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,
|
||||||
@@ -2146,6 +2310,85 @@ public final class PortAgeCommands {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static int createReturnFixture(CommandContext<CommandSourceStack> context) {
|
||||||
|
Identifier id = ageId(context);
|
||||||
|
var local = new PortAgeVisits(java.util.List.of());
|
||||||
|
var disabled = net.dnorberg.rivencraft.PortConfig.ReturnLinkMode.DISABLED;
|
||||||
|
var always = net.dnorberg.rivencraft.PortConfig.ReturnLinkMode.ALWAYS;
|
||||||
|
var once = net.dnorberg.rivencraft.PortConfig.ReturnLinkMode.ON_CREATION;
|
||||||
|
if (PortReturnLinks.shouldIssue(disabled, local, id) || local.hasVisited(id)
|
||||||
|
|| !PortReturnLinks.shouldIssue(always, local, id)
|
||||||
|
|| !PortReturnLinks.shouldIssue(always, local, id) || local.hasVisited(id)
|
||||||
|
|| !PortReturnLinks.shouldIssue(once, local, id)
|
||||||
|
|| PortReturnLinks.shouldIssue(once, local, id))
|
||||||
|
throw new IllegalStateException("Return Link mode regression");
|
||||||
|
var encoded = PortAgeVisits.CODEC.encodeStart(com.mojang.serialization.JsonOps.INSTANCE, local).getOrThrow();
|
||||||
|
var decoded = PortAgeVisits.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE, encoded).getOrThrow();
|
||||||
|
if (!decoded.hasVisited(id) || PortReturnLinks.shouldIssue(once, decoded, id))
|
||||||
|
throw new IllegalStateException("Return Link visit codec regression");
|
||||||
|
var target = new LinkBookTarget(Identifier.fromNamespaceAndPath("minecraft", "overworld"),
|
||||||
|
12.25, 80.5, -42.75, 135.0F, -20.0F);
|
||||||
|
var book = PortReturnLinks.createBook(target);
|
||||||
|
if (!book.is(Rivencraft.LINKING_BOOK.get())
|
||||||
|
|| !target.equals(book.get(Rivencraft.LINK_BOOK_TARGET.get()))
|
||||||
|
|| !book.getHoverName().getString().equals("Return Link")
|
||||||
|
|| book.has(Rivencraft.LINK_PROPERTIES.get()))
|
||||||
|
throw new IllegalStateException("Return Link book component regression");
|
||||||
|
var server = context.getSource().getServer();
|
||||||
|
RuntimeAgeBackend.create(server, id, LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
var visits = server.overworld().getDataStorage().computeIfAbsent(PortAgeVisits.TYPE);
|
||||||
|
if (!PortReturnLinks.shouldIssue(once, visits, id) || PortReturnLinks.shouldIssue(once, visits, id))
|
||||||
|
throw new IllegalStateException("Return Link world marker regression");
|
||||||
|
server.overworld().getDataStorage().saveAndJoin();
|
||||||
|
return returnLinkStatus(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int returnLinkStatus(CommandContext<CommandSourceStack> context) {
|
||||||
|
var visits = context.getSource().getServer().overworld().getDataStorage().computeIfAbsent(PortAgeVisits.TYPE);
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal(ageId(context) + " Return Link mode="
|
||||||
|
+ net.dnorberg.rivencraft.PortConfig.RETURN_LINK_MODE.get()
|
||||||
|
+ "; ON_CREATION issued=" + visits.hasVisited(ageId(context))), false);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int createPlatform(CommandContext<CommandSourceStack> context) {
|
||||||
|
ServerLevel level = RuntimeAgeBackend.create(context.getSource().getServer(), ageId(context),
|
||||||
|
LongArgumentType.getLong(context, "seed"), null, PortAgeTerrain.VOID);
|
||||||
|
var landing = PortAgeTravel.findLanding(level);
|
||||||
|
if (!new net.minecraft.core.BlockPos(0, 64, 0).equals(landing))
|
||||||
|
throw new IllegalStateException("Unexpected Void landing: " + landing);
|
||||||
|
return probePlatform(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Inspect the disposable Void fixture without regenerating or repairing its platform. */
|
||||||
|
private static int probePlatform(CommandContext<CommandSourceStack> context) {
|
||||||
|
ServerLevel level = context.getSource().getServer().getLevel(
|
||||||
|
ResourceKey.create(Registries.DIMENSION, ageId(context)));
|
||||||
|
if (level == null) {
|
||||||
|
context.getSource().sendFailure(Component.literal("Age not loaded: " + ageId(context)));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
for (int x = -1; x <= 1; x++) for (int z = -1; z <= 1; z++) {
|
||||||
|
var pos = new net.minecraft.core.BlockPos(x, 63, z);
|
||||||
|
var state = level.getBlockState(pos);
|
||||||
|
if (!state.is(Rivencraft.CLOUD_PLATFORM.get())
|
||||||
|
|| state.getDestroySpeed(level, pos) != 0.3F
|
||||||
|
|| !state.isSolidRender() || !state.isCollisionShapeFullBlock(level, pos)
|
||||||
|
|| !state.getCloneItemStack(level, pos, false).isEmpty()
|
||||||
|
|| !net.minecraft.world.level.block.Block.getDrops(state, level, pos, null).isEmpty())
|
||||||
|
throw new IllegalStateException("Platform properties mismatch at " + pos);
|
||||||
|
}
|
||||||
|
Identifier id = Identifier.fromNamespaceAndPath("rivencraft", "cloud_platform");
|
||||||
|
if (net.dnorberg.rivencraft.writing.PortRegistryPages.solidMaterialIds().contains(id)
|
||||||
|
|| net.dnorberg.rivencraft.writing.PortRegistryPages.find(
|
||||||
|
net.dnorberg.rivencraft.writing.PortRegistryPages.blockPageId(id)) != null
|
||||||
|
|| !Rivencraft.CLOUD_PLATFORM.get().asItem().equals(net.minecraft.world.item.Items.AIR))
|
||||||
|
throw new IllegalStateException("Platform is obtainable as an item or material Page");
|
||||||
|
context.getSource().sendSuccess(() -> Component.literal(ageId(context)
|
||||||
|
+ " platform passed: solid/opaque, strength 0.3, no loot/pick item/material Page"), false);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
private static int createAccelerated(CommandContext<CommandSourceStack> context) {
|
private static int createAccelerated(CommandContext<CommandSourceStack> context) {
|
||||||
int count = IntegerArgumentType.getInteger(context, "pages");
|
int count = IntegerArgumentType.getInteger(context, "pages");
|
||||||
var pages = new java.util.ArrayList<Identifier>();
|
var pages = new java.util.ArrayList<Identifier>();
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -18,26 +18,45 @@ 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) {
|
||||||
|
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(
|
||||||
|
(ServerLevel) entity.level(), target, entity.blockPosition())).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";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private 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,7 +72,7 @@ public final class PortAgeTravel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return makePlatform(target, new BlockPos(0, 64, 0));
|
return generatePlatform ? makePlatform(target, new BlockPos(0, 64, 0)) : null;
|
||||||
}
|
}
|
||||||
BlockPos surface = findSurfaceLanding(target, 0, 0);
|
BlockPos surface = findSurfaceLanding(target, 0, 0);
|
||||||
if (surface != null) return surface;
|
if (surface != null) return surface;
|
||||||
@@ -61,7 +80,7 @@ public final class PortAgeTravel {
|
|||||||
// 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);
|
int y = obstruction == null ? 64 : Math.max(64, obstruction.getY() + 3);
|
||||||
return makePlatform(target, new BlockPos(0, y, 0));
|
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) {
|
||||||
@@ -112,7 +131,7 @@ public final class PortAgeTravel {
|
|||||||
}
|
}
|
||||||
for (int x = -1; x <= 1; x++) {
|
for (int x = -1; x <= 1; x++) {
|
||||||
for (int z = -1; z <= 1; z++) {
|
for (int z = -1; z <= 1; z++) {
|
||||||
target.setBlock(foot.offset(x, -1, z), Rivencraft.CRYSTAL_BLOCK.get().defaultBlockState(), 3);
|
target.setBlock(foot.offset(x, -1, z), Rivencraft.CLOUD_PLATFORM.get().defaultBlockState(), 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
target.setBlock(foot, Blocks.AIR.defaultBlockState(), 3);
|
target.setBlock(foot, Blocks.AIR.defaultBlockState(), 3);
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.minecraft.world.level.saveddata.SavedDataType;
|
||||||
|
|
||||||
|
/** World-wide record of Ages for which an ON_CREATION Return Link was issued. */
|
||||||
|
final class PortAgeVisits extends SavedData {
|
||||||
|
static final Codec<PortAgeVisits> CODEC = Identifier.CODEC.listOf().fieldOf("ages").codec()
|
||||||
|
.xmap(PortAgeVisits::new, visits -> visits.ages.stream().sorted().toList());
|
||||||
|
static final SavedDataType<PortAgeVisits> TYPE = new SavedDataType<>(
|
||||||
|
Identifier.fromNamespaceAndPath("rivencraft", "age_visits"),
|
||||||
|
() -> new PortAgeVisits(List.of()), CODEC);
|
||||||
|
private final Set<Identifier> ages;
|
||||||
|
|
||||||
|
PortAgeVisits(List<Identifier> ages) { this.ages = new HashSet<>(ages); }
|
||||||
|
boolean hasVisited(Identifier age) { return ages.contains(age); }
|
||||||
|
boolean markFirstVisit(Identifier age) {
|
||||||
|
if (!ages.add(age)) return false;
|
||||||
|
setDirty();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.PortBookBinderBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.menu.PortBookBinderMenu;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.Container;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
|
||||||
|
/** Disposable fixture for atomic collection imports and real Binder assembly. */
|
||||||
|
final class PortBinderCollectionProbe {
|
||||||
|
private static final BlockPos BINDER = new BlockPos(0, 64, 0);
|
||||||
|
private static final BlockPos CHEST = new BlockPos(1, 64, 0);
|
||||||
|
private static final List<Identifier> EXPECTED = List.of(id("weather/off"), id("lighting/bright"),
|
||||||
|
id("terrain/flat"), id("biome/single"));
|
||||||
|
private PortBinderCollectionProbe() {}
|
||||||
|
private static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft", path); }
|
||||||
|
private static ItemStack page(String path) { return PageItem.createSymbolPage(id(path)); }
|
||||||
|
private static ItemStack collection(boolean folder, List<ItemStack> pages) {
|
||||||
|
ItemStack result = new ItemStack(folder ? Rivencraft.COLLATION_FOLDER.get() : Rivencraft.NOTEBOOK.get());
|
||||||
|
result.set(Rivencraft.NOTEBOOK_CONTENTS.get(), new NotebookContents(pages));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
PortAgeTravel.findLanding(level);
|
||||||
|
level.setBlock(BINDER, Rivencraft.BOOK_BINDER.get().defaultBlockState(), 3);
|
||||||
|
level.setBlock(CHEST, Blocks.CHEST.defaultBlockState(), 3);
|
||||||
|
var binder = (PortBookBinderBlockEntity) level.getBlockEntity(BINDER);
|
||||||
|
var chest = (Container) level.getBlockEntity(CHEST);
|
||||||
|
ItemStack folder = collection(true, List.of(page("weather/off"), ItemStack.EMPTY, page("lighting/bright")));
|
||||||
|
ItemStack before = folder.copy();
|
||||||
|
for (int i = 0; i < PortBookBinderBlockEntity.PAGE_COUNT; i++)
|
||||||
|
binder.setItem(PortBookBinderBlockEntity.FIRST_PAGE + i, page("terrain/flat"));
|
||||||
|
if (!binder.importCollection(folder, 0).isEmpty() || binder.nextPageIndex() != 252
|
||||||
|
|| !ItemStack.isSameItemSameComponents(before, folder)
|
||||||
|
|| binder.symbolPages().stream().anyMatch(symbol -> !symbol.equals(id("terrain/flat"))))
|
||||||
|
throw new IllegalStateException("Full Binder import was not atomic");
|
||||||
|
binder.clearSymbolPages();
|
||||||
|
binder.setItem(PortBookBinderBlockEntity.PANEL, PageItem.createLinkPanelPage());
|
||||||
|
if (!binder.importCollection(collection(true, List.of(page("weather/off"), PageItem.createLinkPanelPage())), 0).isEmpty()
|
||||||
|
|| binder.hasSymbolPages() || binder.getItem(PortBookBinderBlockEntity.PANEL).isEmpty())
|
||||||
|
throw new IllegalStateException("Conflicting Link Panel import was not atomic");
|
||||||
|
binder.setItem(PortBookBinderBlockEntity.PANEL, ItemStack.EMPTY);
|
||||||
|
if (!binder.importCollection(folder, -1).isEmpty() || !binder.importCollection(folder, 1).isEmpty())
|
||||||
|
throw new IllegalStateException("Invalid collection insertion point accepted");
|
||||||
|
binder.insertPage(0, page("terrain/flat"));
|
||||||
|
var player = new PortProgressionPlayer(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("5225a1ed-5ead-44b5-a63c-c78e7dca86f5"), "RivenBinderProbe"));
|
||||||
|
player.setPos(0.5, 64, 2.5);
|
||||||
|
var menu = new PortBookBinderMenu(1, player.getInventory(), binder);
|
||||||
|
try {
|
||||||
|
menu.setCarried(folder);
|
||||||
|
if (!menu.clickMenuButton(player, PortBookBinderMenu.STRIP_CLICK_BASE + 1)
|
||||||
|
|| menu.getCarried().get(Rivencraft.NOTEBOOK_CONTENTS.get()).pageCount() != 0
|
||||||
|
|| !binder.symbolPages().equals(EXPECTED.subList(0, 3)))
|
||||||
|
throw new IllegalStateException("Cursor collection order/empty-cover regression");
|
||||||
|
chest.setItem(0, menu.getCarried().copy());
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
player.getInventory().setItem(9, collection(false, List.of(page("biome/single"))));
|
||||||
|
menu.quickMoveStack(player, PortBookBinderBlockEntity.SIZE);
|
||||||
|
ItemStack emptied = player.getInventory().getItem(9);
|
||||||
|
if (!emptied.is(Rivencraft.NOTEBOOK.get())
|
||||||
|
|| emptied.get(Rivencraft.NOTEBOOK_CONTENTS.get()).pageCount() != 0
|
||||||
|
|| !binder.symbolPages().equals(EXPECTED))
|
||||||
|
throw new IllegalStateException("Shift collection import regression");
|
||||||
|
chest.setItem(1, emptied.copy());
|
||||||
|
binder.setItem(PortBookBinderBlockEntity.COVER, new ItemStack(Items.LEATHER));
|
||||||
|
binder.setItem(PortBookBinderBlockEntity.PANEL, PageItem.createLinkPanelPage());
|
||||||
|
menu.assemble(player, "Collection Fixture104");
|
||||||
|
ItemStack book = menu.getCarried();
|
||||||
|
if (!book.is(Rivencraft.DESCRIPTIVE_BOOK.get()) || !EXPECTED.equals(book.get(Rivencraft.BOOK_SYMBOLS.get()))
|
||||||
|
|| !book.has(Rivencraft.AGE_BOOK_ID.get()) || binder.hasSymbolPages()
|
||||||
|
|| !binder.getItem(PortBookBinderBlockEntity.COVER).isEmpty()
|
||||||
|
|| !binder.getItem(PortBookBinderBlockEntity.PANEL).isEmpty())
|
||||||
|
throw new IllegalStateException("Collection-backed Binder assembly regression");
|
||||||
|
if (!PortProgressionProbe.isComplete(player, "bind_age"))
|
||||||
|
throw new IllegalStateException("Missing bind_age award");
|
||||||
|
if (!player.getGameProfile().name().equals(book.get(Rivencraft.BOOK_AUTHOR.get())))
|
||||||
|
throw new IllegalStateException("Binder author was not server assigned");
|
||||||
|
var pages = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(book);
|
||||||
|
if (pages.lastPage() != EXPECTED.size() || pages.symbolAt(0).isPresent()
|
||||||
|
|| !pages.symbolAt(1).orElseThrow().equals(EXPECTED.getFirst())
|
||||||
|
|| !pages.symbolAt(EXPECTED.size()).orElseThrow().equals(EXPECTED.getLast())
|
||||||
|
|| pages.symbolAt(EXPECTED.size() + 1).isPresent()
|
||||||
|
|| pages.turn(0, -1) != 0 || pages.turn(pages.lastPage(), 1) != pages.lastPage())
|
||||||
|
throw new IllegalStateException("Authored book page indexing failed");
|
||||||
|
var old = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(new ItemStack(Rivencraft.DESCRIPTIVE_BOOK.get()));
|
||||||
|
if (old.lastPage() != 1 || !old.author().isEmpty() || old.symbolAt(1).isPresent())
|
||||||
|
throw new IllegalStateException("Older panel-only book fallback failed");
|
||||||
|
var repeated = new net.dnorberg.rivencraft.writing.DescriptiveBookPages(
|
||||||
|
List.of(EXPECTED.getFirst(), EXPECTED.getFirst()), "Test");
|
||||||
|
if (repeated.lastPage() != 2 || !repeated.symbolAt(1).equals(repeated.symbolAt(2)))
|
||||||
|
throw new IllegalStateException("Repeated symbol display was collapsed");
|
||||||
|
var ageId = book.get(Rivencraft.AGE_BOOK_ID.get());
|
||||||
|
var server = level.getServer();
|
||||||
|
if (!RuntimeAgeBackend.savedAgeName(server, ageId).orElseThrow().equals("Collection Fixture104"))
|
||||||
|
throw new IllegalStateException("Created Age lost its display name");
|
||||||
|
var namedLevel = server.getLevel(net.minecraft.resources.ResourceKey.create(
|
||||||
|
net.minecraft.core.registries.Registries.DIMENSION, ageId));
|
||||||
|
if (!net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(namedLevel).equals("Collection Fixture104"))
|
||||||
|
throw new IllegalStateException("Link binding name lookup did not use Age title");
|
||||||
|
RuntimeAgeBackend.setAgeDisplayName(server, ageId, "Crystal Garden's Dawn");
|
||||||
|
var target = new net.dnorberg.rivencraft.item.LinkBookTarget(ageId, -0.5, 64, -1.25, 90, 0);
|
||||||
|
var link = new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
link.set(Rivencraft.LINK_BOOK_TARGET.get(), target);
|
||||||
|
link.set(Rivencraft.LINK_DESTINATION_NAME.get(), net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(namedLevel));
|
||||||
|
if (!net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(link, target).getString().equals("Crystal Garden's Dawn"))
|
||||||
|
throw new IllegalStateException("Link destination label ignored saved name");
|
||||||
|
var mode = net.dnorberg.rivencraft.PortConfig.RETURN_LINK_MODE.get();
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
try {
|
||||||
|
net.dnorberg.rivencraft.PortConfig.RETURN_LINK_MODE.set(net.dnorberg.rivencraft.PortConfig.ReturnLinkMode.ALWAYS);
|
||||||
|
PortReturnLinks.afterSuccessfulTravel(player, ageId, target);
|
||||||
|
var returned = java.util.stream.IntStream.range(0, player.getInventory().getContainerSize())
|
||||||
|
.mapToObj(i -> player.getInventory().getItem(i)).filter(i -> i.is(Rivencraft.LINKING_BOOK.get()))
|
||||||
|
.findFirst().orElseThrow();
|
||||||
|
if (!"Crystal Garden's Dawn".equals(returned.get(Rivencraft.LINK_DESTINATION_NAME.get())))
|
||||||
|
throw new IllegalStateException("Automatic Return Link lost departure name");
|
||||||
|
chest.setItem(4, returned.copy());
|
||||||
|
} finally { net.dnorberg.rivencraft.PortConfig.RETURN_LINK_MODE.set(mode); }
|
||||||
|
chest.setItem(3, link);
|
||||||
|
chest.setItem(2, book.copy());
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
} finally { player.getInventory().clearContent(); }
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
if (!(level.getBlockEntity(CHEST) instanceof Container chest)) throw new IllegalStateException("Fixture chest missing");
|
||||||
|
if (!chest.getItem(0).is(Rivencraft.COLLATION_FOLDER.get()) || !chest.getItem(1).is(Rivencraft.NOTEBOOK.get()))
|
||||||
|
throw new IllegalStateException("Empty collection covers were not preserved");
|
||||||
|
for (int i = 0; i < 2; i++) if (chest.getItem(i).get(Rivencraft.NOTEBOOK_CONTENTS.get()).pageCount() != 0)
|
||||||
|
throw new IllegalStateException("Imported pages remained in a collection");
|
||||||
|
if (!"RivenBinderProbe".equals(chest.getItem(2).get(Rivencraft.BOOK_AUTHOR.get())))
|
||||||
|
throw new IllegalStateException("Authored book lost its author");
|
||||||
|
var ageId = chest.getItem(2).get(Rivencraft.AGE_BOOK_ID.get());
|
||||||
|
if (!RuntimeAgeBackend.savedAgeName(level.getServer(), ageId).orElseThrow().equals("Crystal Garden's Dawn")
|
||||||
|
|| !"Crystal Garden's Dawn".equals(chest.getItem(3).get(Rivencraft.LINK_DESTINATION_NAME.get()))
|
||||||
|
|| !"Crystal Garden's Dawn".equals(chest.getItem(4).get(Rivencraft.LINK_DESTINATION_NAME.get())))
|
||||||
|
throw new IllegalStateException("Age/Linking/Return destination names did not survive persistence");
|
||||||
|
var old = new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
var overworld = new net.dnorberg.rivencraft.item.LinkBookTarget(net.minecraft.world.level.Level.OVERWORLD.identifier(), 0, 64, 0, 0, 0);
|
||||||
|
if (!net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(old, overworld).getString()
|
||||||
|
.equals(net.minecraft.network.chat.Component.translatable("dimension.minecraft.overworld").getString()))
|
||||||
|
throw new IllegalStateException("Older book vanilla name fallback changed");
|
||||||
|
if (!EXPECTED.equals(chest.getItem(2).get(Rivencraft.BOOK_SYMBOLS.get())))
|
||||||
|
throw new IllegalStateException("Authored book page order was not preserved");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(),
|
||||||
|
|||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
+110
@@ -0,0 +1,110 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.component.DataComponents;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.server.TickTask;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.ProblemReporter;
|
||||||
|
import net.minecraft.world.entity.item.ItemEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.storage.TagValueOutput;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** Join conversion runs on queued server tasks: create and inspect on separate commands. */
|
||||||
|
final class PortBookDropConversionProbe {
|
||||||
|
private static final UUID OWNER = UUID.fromString("cc5909e5-aafa-43d6-b841-a917ec9c0115");
|
||||||
|
private static final AABB AREA = new AABB(-16, -64, -16, 32, 320, 32);
|
||||||
|
private static ItemStack book(boolean descriptive, String label) {
|
||||||
|
var stack = new ItemStack(descriptive ? Rivencraft.DESCRIPTIVE_BOOK.get() : Rivencraft.LINKING_BOOK.get());
|
||||||
|
stack.set(DataComponents.CUSTOM_NAME, Component.literal(label));
|
||||||
|
return stack;
|
||||||
|
}
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) level.setBlock(new BlockPos(x, 63, z), Blocks.STONE.defaultBlockState(), 2);
|
||||||
|
var player = net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||||
|
new com.mojang.authlib.GameProfile(UUID.fromString("84f38604-48fe-48d3-a4fb-f858a7200115"), "RivenDropProbe"));
|
||||||
|
player.setPos(8.5, 64, 8.5);
|
||||||
|
// Test exact factory state before physics can advance position or pickup timers.
|
||||||
|
var sample = new ItemEntity(level, 8.5, 66, 8.5, book(false, "state_copy"));
|
||||||
|
sample.getItem().set(Rivencraft.LINK_BOOK_TARGET.get(), new net.dnorberg.rivencraft.item.LinkBookTarget(
|
||||||
|
level.dimension().identifier(), -0.5, 64, -1.25, 135, -20));
|
||||||
|
sample.getItem().set(Rivencraft.LINK_DESTINATION_NAME.get(), "Named destination");
|
||||||
|
sample.getItem().set(Rivencraft.LINK_PROPERTIES.get(), new net.dnorberg.rivencraft.item.LinkProperties(net.dnorberg.rivencraft.item.LinkProperties.DISARM
|
||||||
|
| net.dnorberg.rivencraft.item.LinkProperties.MAINTAIN_MOMENTUM));
|
||||||
|
sample.setTarget(OWNER);
|
||||||
|
sample.setThrower(player);
|
||||||
|
sample.setPickUpDelay(80);
|
||||||
|
sample.setDeltaMovement(new Vec3(0.2, 0.1, -0.3));
|
||||||
|
sample.setYRot(37);
|
||||||
|
sample.setXRot(12);
|
||||||
|
sample.setNoGravity(true);
|
||||||
|
var copy = DroppedBookEntity.fromDrop(sample);
|
||||||
|
if (!copy.position().equals(sample.position()) || !copy.getDeltaMovement().equals(sample.getDeltaMovement())
|
||||||
|
|| copy.getYRot() != 37 || copy.getXRot() != 12 || !copy.isNoGravity()
|
||||||
|
|| !ItemStack.matches(copy.getItem(), sample.getItem()) || !OWNER.equals(copy.getTarget())
|
||||||
|
|| copy.getUUID().equals(sample.getUUID()) || copy.getAge() != -32768)
|
||||||
|
throw new IllegalStateException("Drop conversion lost placement, ownership or item components");
|
||||||
|
var originalTag = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, level.registryAccess());
|
||||||
|
var copiedTag = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, level.registryAccess());
|
||||||
|
sample.saveWithoutId(originalTag); copy.saveWithoutId(copiedTag);
|
||||||
|
for (String key : List.of("PickupDelay", "Owner", "Thrower", "Item"))
|
||||||
|
if (!java.util.Objects.equals(originalTag.buildResult().get(key), copiedTag.buildResult().get(key)))
|
||||||
|
throw new IllegalStateException("Drop conversion lost metadata: " + key);
|
||||||
|
// Four ordinary book variants must all convert through the actual event route.
|
||||||
|
for (String name : List.of("manual_link", "manual_description", "unwritten_link", "unwritten_description")) {
|
||||||
|
var stack = book(name.endsWith("description"), name);
|
||||||
|
if (name.equals("manual_link")) {
|
||||||
|
stack.set(Rivencraft.LINK_BOOK_TARGET.get(), sample.getItem().get(Rivencraft.LINK_BOOK_TARGET.get()));
|
||||||
|
stack.set(Rivencraft.LINK_DESTINATION_NAME.get(), "Named destination");
|
||||||
|
}
|
||||||
|
if (name.equals("manual_description")) stack.set(Rivencraft.AGE_BOOK_ID.get(), level.dimension().identifier());
|
||||||
|
var item = new ItemEntity(level, 8.5, 66, 8.5, stack);
|
||||||
|
item.setNoGravity(true); item.setDeltaMovement(Vec3.ZERO); item.setTarget(OWNER);
|
||||||
|
level.addFreshEntity(item);
|
||||||
|
}
|
||||||
|
player.drop(book(false, "player_toss"), false, net.minecraft.util.Prediction.SERVER_ONLY);
|
||||||
|
net.minecraft.world.Containers.dropItemStack(level, 8.5, 65, 8.5, book(true, "container"));
|
||||||
|
var standPos = new BlockPos(10, 64, 8);
|
||||||
|
level.setBlock(standPos, Rivencraft.BOOK_STAND.get().defaultBlockState(), 3);
|
||||||
|
((net.dnorberg.rivencraft.block.entity.BookStandBlockEntity) level.getBlockEntity(standPos)).setBook(book(false, "stand"));
|
||||||
|
level.destroyBlock(standPos, true);
|
||||||
|
var custom = new DroppedBookEntity(level, new Vec3(8.5, 66, 8.5), book(false, "already_custom"));
|
||||||
|
custom.setNoGravity(true);
|
||||||
|
level.addFreshEntity(custom);
|
||||||
|
level.addFreshEntity(new ItemEntity(level, 8.5, 66, 8.5, net.dnorberg.rivencraft.item.PageItem.createLinkPanelPage()));
|
||||||
|
java.util.function.Consumer<net.neoforged.neoforge.event.entity.EntityJoinLevelEvent> cancel = event -> {
|
||||||
|
if (event.getLevel() == level && event.getEntity() instanceof DroppedBookEntity dropped
|
||||||
|
&& dropped.getItem().getHoverName().getString().equals("cancel_preserve")) event.setCanceled(true);
|
||||||
|
};
|
||||||
|
net.neoforged.neoforge.common.NeoForge.EVENT_BUS.addListener(cancel);
|
||||||
|
try {
|
||||||
|
var item = new ItemEntity(level, 8.5, 66, 8.5, book(false, "cancel_preserve"));
|
||||||
|
item.setNoGravity(true); item.setDeltaMovement(Vec3.ZERO);
|
||||||
|
level.addFreshEntity(item);
|
||||||
|
} finally {
|
||||||
|
// Queued after that source's conversion task; no fixture listener remains installed.
|
||||||
|
level.getServer().schedule(new TickTask(0, () -> net.neoforged.neoforge.common.NeoForge.EVENT_BUS.unregister(cancel)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
var drops = level.getEntitiesOfClass(ItemEntity.class, AREA);
|
||||||
|
for (String name : List.of("manual_link", "manual_description", "unwritten_link", "unwritten_description",
|
||||||
|
"player_toss", "container", "stand", "already_custom", "cancel_preserve")) {
|
||||||
|
var found = drops.stream().filter(e -> e.getItem().getHoverName().getString().equals(name)).toList();
|
||||||
|
if (found.size() != 1 || !name.equals("cancel_preserve") && !(found.getFirst() instanceof DroppedBookEntity))
|
||||||
|
throw new IllegalStateException("Expected one open book for " + name + ", found " + found.size());
|
||||||
|
}
|
||||||
|
var named = drops.stream().filter(e -> e.getItem().getHoverName().getString().equals("manual_link")).findFirst().orElseThrow();
|
||||||
|
if (!OWNER.equals(named.getTarget()) || !"Named destination".equals(named.getItem().get(Rivencraft.LINK_DESTINATION_NAME.get())))
|
||||||
|
throw new IllegalStateException("Converted book lost owner or destination");
|
||||||
|
if (drops.stream().filter(e -> e.getItem().is(Rivencraft.PAGE.get())).anyMatch(e -> e instanceof DroppedBookEntity))
|
||||||
|
throw new IllegalStateException("Non-book item was converted");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BookStandBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.event.BookStandConversionHandler;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.network.PortBookNetworking;
|
||||||
|
import net.dnorberg.rivencraft.network.UseBookStandPayload;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.LecternBlock;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** Isolated conversion, ownership, stale-screen and persistence checks. */
|
||||||
|
final class PortBookStandProbe {
|
||||||
|
private static final BlockPos POS = new BlockPos(0, 64, 0);
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
var player = net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("a5c323a1-3b58-4dd6-927f-e08000800110"), "RivenStandProbe"));
|
||||||
|
player.setPos(0.5, 64, 2.5);
|
||||||
|
try {
|
||||||
|
for (Direction facing : Direction.Plane.HORIZONTAL) for (InteractionHand hand : InteractionHand.values())
|
||||||
|
for (var sample : java.util.List.of(new ItemStack(Rivencraft.LINKING_BOOK.get()),
|
||||||
|
new ItemStack(Rivencraft.DESCRIPTIVE_BOOK.get()), PageItem.createLinkPanelPage().copyWithCount(3))) {
|
||||||
|
level.setBlock(POS, Blocks.LECTERN.defaultBlockState().setValue(LecternBlock.FACING, facing), 3);
|
||||||
|
player.setItemInHand(hand, sample.copy());
|
||||||
|
if (!BookStandConversionHandler.convert(player, hand, POS)) throw new IllegalStateException("Conversion failed");
|
||||||
|
var stand = (BookStandBlockEntity) level.getBlockEntity(POS);
|
||||||
|
var stored = sample.copyWithCount(1);
|
||||||
|
if (!ItemStack.matches(stand.getBook(), stored) || player.getItemInHand(hand).getCount() != sample.getCount() - 1
|
||||||
|
|| stand.getBlockState().getValue(BookStandBlock.FACING) != facing)
|
||||||
|
throw new IllegalStateException("Conversion lost ownership or facing");
|
||||||
|
var packet = new UseBookStandPayload(level.dimension().identifier(), POS, stored.copy());
|
||||||
|
if (PortBookNetworking.validatedStandBook(player, packet).isEmpty()) throw new IllegalStateException("Valid source rejected");
|
||||||
|
player.setPos(100, 64, 100);
|
||||||
|
if (!PortBookNetworking.validatedStandBook(player, packet).isEmpty()) throw new IllegalStateException("Distant source accepted");
|
||||||
|
player.setPos(0.5, 64, 2.5);
|
||||||
|
if (!PortBookNetworking.validatedStandBook(player, new UseBookStandPayload(
|
||||||
|
net.minecraft.resources.Identifier.fromNamespaceAndPath("minecraft", "overworld"), POS, stored)).isEmpty())
|
||||||
|
throw new IllegalStateException("Wrong dimension accepted");
|
||||||
|
if (!PortBookNetworking.validatedStandBook(player, new UseBookStandPayload(packet.dimension(), POS, new ItemStack(Items.DIRT))).isEmpty())
|
||||||
|
throw new IllegalStateException("Replaced book accepted");
|
||||||
|
var loaded = net.minecraft.world.level.block.entity.BlockEntity.loadStatic(POS, stand.getBlockState(),
|
||||||
|
stand.saveWithFullMetadata(level.registryAccess()), level.registryAccess());
|
||||||
|
if (!(loaded instanceof BookStandBlockEntity copy) || !ItemStack.matches(copy.getBook(), stored))
|
||||||
|
throw new IllegalStateException("Stand serialization lost content");
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.setShiftKeyDown(true);
|
||||||
|
stand.getBlockState().useWithoutItem(level, player, new BlockHitResult(Vec3.atCenterOf(POS), Direction.UP, POS, false));
|
||||||
|
player.setShiftKeyDown(false);
|
||||||
|
if (!level.getBlockState(POS).is(Blocks.LECTERN)
|
||||||
|
|| level.getBlockState(POS).getValue(LecternBlock.FACING) != facing
|
||||||
|
|| player.getInventory().countItem(stored.getItem()) != 1
|
||||||
|
|| !PortBookNetworking.validatedStandBook(player, packet).isEmpty())
|
||||||
|
throw new IllegalStateException("Retrieval did not restore lectern or recover item exactly once");
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.setItemInHand(hand, stored.copy());
|
||||||
|
BookStandConversionHandler.convert(player, hand, POS);
|
||||||
|
level.destroyBlock(POS, true);
|
||||||
|
var drops = level.getEntitiesOfClass(net.minecraft.world.entity.item.ItemEntity.class,
|
||||||
|
new net.minecraft.world.phys.AABB(-2, 62, -2, 3, 68, 3));
|
||||||
|
int items = drops.stream().filter(e -> e.getItem().is(stored.getItem())).mapToInt(e -> e.getItem().getCount()).sum();
|
||||||
|
int lecterns = drops.stream().filter(e -> e.getItem().is(Items.LECTERN)).mapToInt(e -> e.getItem().getCount()).sum();
|
||||||
|
if (items != 1 || lecterns != 1) throw new IllegalStateException("Break drops duplicated/lost: " + items + "/" + lecterns);
|
||||||
|
drops.forEach(net.minecraft.world.entity.Entity::discard);
|
||||||
|
}
|
||||||
|
level.setBlock(POS, Blocks.LECTERN.defaultBlockState().setValue(LecternBlock.HAS_BOOK, true), 3);
|
||||||
|
player.setItemInHand(InteractionHand.MAIN_HAND, PageItem.createLinkPanelPage());
|
||||||
|
if (BookStandConversionHandler.convert(player, InteractionHand.MAIN_HAND, POS)) throw new IllegalStateException("Occupied lectern converted");
|
||||||
|
level.setBlock(POS, Blocks.LECTERN.defaultBlockState(), 3);
|
||||||
|
player.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Items.DIRT));
|
||||||
|
if (BookStandConversionHandler.convert(player, InteractionHand.MAIN_HAND, POS)) throw new IllegalStateException("Unrelated item accepted");
|
||||||
|
var named = new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
named.set(net.minecraft.core.component.DataComponents.CUSTOM_NAME, net.minecraft.network.chat.Component.literal("Stand persistence"));
|
||||||
|
player.setItemInHand(InteractionHand.MAIN_HAND, named);
|
||||||
|
if (!BookStandConversionHandler.convert(player, InteractionHand.MAIN_HAND, POS)) throw new IllegalStateException("Final stand missing");
|
||||||
|
} finally { player.setShiftKeyDown(false); player.getInventory().clearContent(); }
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
if (!(level.getBlockEntity(POS) instanceof BookStandBlockEntity stand)
|
||||||
|
|| !stand.getBook().is(Rivencraft.LINKING_BOOK.get())
|
||||||
|
|| !stand.getBook().getHoverName().getString().equals("Stand persistence"))
|
||||||
|
throw new IllegalStateException("Stand restart persistence failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.item.SymbolPortfolioItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortSymbolPages;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.Container;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.entity.item.ItemEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
|
||||||
|
/** Disposable-world boundary, booster-use and persistence checks. */
|
||||||
|
final class PortCollectionExtrasProbe {
|
||||||
|
private static final BlockPos CHEST = new BlockPos(0, 64, 0);
|
||||||
|
private PortCollectionExtrasProbe() {}
|
||||||
|
private static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft", path); }
|
||||||
|
private static NotebookContents contents(ItemStack stack) { return stack.get(Rivencraft.NOTEBOOK_CONTENTS.get()); }
|
||||||
|
private static List<Identifier> symbols(ItemStack collection) {
|
||||||
|
return contents(collection).pages().stream().map(page -> page.get(Rivencraft.SYMBOL_PAGE_ID.get())).toList();
|
||||||
|
}
|
||||||
|
private static void folder(ItemStack stack) {
|
||||||
|
if (!stack.is(Rivencraft.COLLATION_FOLDER.get()) || contents(stack).pageCount() != 16
|
||||||
|
|| symbols(stack).stream().anyMatch(id -> !PortSymbolPages.sealedCandidateIds().contains(id)))
|
||||||
|
throw new IllegalStateException("Sealed Notebook page pool/count regression");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
PortAgeTravel.findLanding(level);
|
||||||
|
level.setBlock(CHEST, Blocks.CHEST.defaultBlockState(), 3);
|
||||||
|
var chest = (Container) level.getBlockEntity(CHEST);
|
||||||
|
var pages = new java.util.ArrayList<ItemStack>();
|
||||||
|
for (int i = 0; i < 253; i++) pages.add(PageItem.createSymbolPage(id(i % 2 == 0 ? "terrain/flat" : "weather/off")));
|
||||||
|
var volumes = SymbolPortfolioItem.createVolumes(id("feature"), pages);
|
||||||
|
if (volumes.size() != 2 || contents(volumes.get(0)).pageCount() != 252
|
||||||
|
|| contents(volumes.get(1)).pageCount() != 1
|
||||||
|
|| !volumes.stream().flatMap(volume -> symbols(volume).stream()).toList()
|
||||||
|
.equals(pages.stream().map(page -> page.get(Rivencraft.SYMBOL_PAGE_ID.get())).toList())
|
||||||
|
|| !SymbolPortfolioItem.createVolumes(id("feature"), List.of()).isEmpty())
|
||||||
|
throw new IllegalStateException("Portfolio volume boundary/order regression");
|
||||||
|
chest.setItem(0, volumes.get(0));
|
||||||
|
chest.setItem(1, volumes.get(1));
|
||||||
|
var actual = net.dnorberg.rivencraft.registry.ModCreativeTabs.creativeSymbolPortfolios(level.registryAccess());
|
||||||
|
var allPages = PortSymbolPages.categories().stream().flatMap(category -> PortSymbolPages.pages(category, level.registryAccess()).stream())
|
||||||
|
.map(page -> page.get(Rivencraft.SYMBOL_PAGE_ID.get())).toList();
|
||||||
|
if (!actual.stream().flatMap(volume -> symbols(volume).stream()).toList().equals(allPages))
|
||||||
|
throw new IllegalStateException("Creative portfolios omit/duplicate/reorder pages");
|
||||||
|
var player = net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("790b69dd-b62b-45be-9017-caf16515169a"), "RivenExtrasProbe"));
|
||||||
|
player.setPos(0.5, 64, 2.5);
|
||||||
|
try {
|
||||||
|
player.getAbilities().instabuild = false;
|
||||||
|
player.getRandom().setSeed(105);
|
||||||
|
var first = net.dnorberg.rivencraft.item.SealedNotebookItem.open(player);
|
||||||
|
player.getRandom().setSeed(105);
|
||||||
|
var repeat = net.dnorberg.rivencraft.item.SealedNotebookItem.open(player);
|
||||||
|
folder(first);
|
||||||
|
if (!symbols(first).equals(symbols(repeat))) throw new IllegalStateException("Booster seeded selection changed");
|
||||||
|
chest.setItem(2, first);
|
||||||
|
for (var hand : InteractionHand.values()) {
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
|
||||||
|
player.setItemInHand(hand, new ItemStack(Rivencraft.SEALED_NOTEBOOK.get()));
|
||||||
|
Rivencraft.SEALED_NOTEBOOK.get().use(level, player, hand);
|
||||||
|
folder(player.getItemInHand(hand));
|
||||||
|
}
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
|
||||||
|
player.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Rivencraft.SEALED_NOTEBOOK.get(), 2));
|
||||||
|
Rivencraft.SEALED_NOTEBOOK.get().use(level, player, InteractionHand.MAIN_HAND);
|
||||||
|
if (player.getMainHandItem().getCount() != 1) throw new IllegalStateException("Booster stack consumption regression");
|
||||||
|
player.getAbilities().instabuild = true;
|
||||||
|
Rivencraft.SEALED_NOTEBOOK.get().use(level, player, InteractionHand.MAIN_HAND);
|
||||||
|
if (!player.getMainHandItem().is(Rivencraft.SEALED_NOTEBOOK.get()) || player.getMainHandItem().getCount() != 1)
|
||||||
|
throw new IllegalStateException("Creative booster consumed its input");
|
||||||
|
player.getAbilities().instabuild = false;
|
||||||
|
for (int slot = 0; slot < player.getInventory().getContainerSize(); slot++)
|
||||||
|
player.getInventory().setItem(slot, new ItemStack(Items.COBBLESTONE, 64));
|
||||||
|
player.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(Rivencraft.SEALED_NOTEBOOK.get(), 2));
|
||||||
|
Rivencraft.SEALED_NOTEBOOK.get().use(level, player, InteractionHand.MAIN_HAND);
|
||||||
|
var dropped = level.getEntitiesOfClass(ItemEntity.class, new AABB(-3, 60, -3, 4, 70, 6),
|
||||||
|
entity -> entity.getItem().is(Rivencraft.COLLATION_FOLDER.get()));
|
||||||
|
if (dropped.size() != 1 || player.getMainHandItem().getCount() != 1)
|
||||||
|
throw new IllegalStateException("Full-inventory booster delivery regression");
|
||||||
|
folder(dropped.getFirst().getItem());
|
||||||
|
dropped.getFirst().discard();
|
||||||
|
} finally {
|
||||||
|
player.getAbilities().instabuild = false;
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
|
||||||
|
}
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
if (!(level.getBlockEntity(CHEST) instanceof Container chest)) throw new IllegalStateException("Fixture chest missing");
|
||||||
|
if (!chest.getItem(0).is(Rivencraft.SYMBOL_PORTFOLIO.get()) || contents(chest.getItem(0)).pageCount() != 252
|
||||||
|
|| !chest.getItem(1).is(Rivencraft.SYMBOL_PORTFOLIO.get()) || contents(chest.getItem(1)).pageCount() != 1)
|
||||||
|
throw new IllegalStateException("Portfolio persistence regression");
|
||||||
|
folder(chest.getItem(2));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,8 +144,8 @@ 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))
|
if (!validWriting(pages))
|
||||||
throw new IllegalArgumentException("Invalid celestial modifier order");
|
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.
|
||||||
@@ -167,7 +163,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 +186,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);
|
||||||
|
|||||||
@@ -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(); }
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkBookTarget;
|
||||||
|
import net.dnorberg.rivencraft.item.PortHandheldTravel;
|
||||||
|
import net.minecraft.core.component.DataComponents;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.storage.TagValueInput;
|
||||||
|
import net.minecraft.world.level.storage.TagValueOutput;
|
||||||
|
import net.minecraft.util.ProblemReporter;
|
||||||
|
import net.minecraft.world.phys.AABB;
|
||||||
|
import net.neoforged.neoforge.common.util.FakePlayerFactory;
|
||||||
|
|
||||||
|
/** Disposable-world checks for book ownership and the new entity save format. */
|
||||||
|
final class PortDroppedBookProbe {
|
||||||
|
private PortDroppedBookProbe() {}
|
||||||
|
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
PortAgeTravel.findLanding(level);
|
||||||
|
var player = FakePlayerFactory.get(level, new com.mojang.authlib.GameProfile(
|
||||||
|
UUID.fromString("4db5c544-0a0c-421d-a128-c520bda64642"), "RivenBookProbe"));
|
||||||
|
player.setPos(0.5, 64, 0.5);
|
||||||
|
try {
|
||||||
|
for (var hand : InteractionHand.values()) {
|
||||||
|
ItemStack book = new ItemStack(hand == InteractionHand.MAIN_HAND
|
||||||
|
? Rivencraft.LINKING_BOOK.get() : Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
book.set(DataComponents.CUSTOM_NAME, Component.literal("Dropped fixture " + hand));
|
||||||
|
book.set(Rivencraft.LINK_BOOK_TARGET.get(), new LinkBookTarget(
|
||||||
|
Identifier.fromNamespaceAndPath("minecraft", "overworld"), 12.25, 80.5, -42.75, 135, -20));
|
||||||
|
player.setItemInHand(hand, book);
|
||||||
|
String failure = PortHandheldTravel.travel(player, hand, book, () -> "expected failure");
|
||||||
|
if (!"expected failure".equals(failure) || player.getItemInHand(hand) != book)
|
||||||
|
throw new IllegalStateException("Failed travel consumed the book");
|
||||||
|
try {
|
||||||
|
PortHandheldTravel.travel(player, hand, book, () -> { throw new IllegalStateException("fixture"); });
|
||||||
|
throw new AssertionError("Fixture exception was swallowed");
|
||||||
|
} catch (IllegalStateException expected) {
|
||||||
|
if (!"fixture".equals(expected.getMessage()) || player.getItemInHand(hand) != book) throw expected;
|
||||||
|
}
|
||||||
|
java.util.function.Consumer<net.neoforged.neoforge.event.entity.EntityJoinLevelEvent> cancel = event -> {
|
||||||
|
if (event.getLevel() == level && event.getEntity() instanceof DroppedBookEntity) event.setCanceled(true);
|
||||||
|
};
|
||||||
|
net.neoforged.neoforge.common.NeoForge.EVENT_BUS.addListener(cancel);
|
||||||
|
try {
|
||||||
|
failure = PortHandheldTravel.travel(player, hand, book, () -> null);
|
||||||
|
if (failure != null || player.getItemInHand(hand) != book)
|
||||||
|
throw new IllegalStateException("Rejected dropped entity consumed the book");
|
||||||
|
} finally { net.neoforged.neoforge.common.NeoForge.EVENT_BUS.unregister(cancel); }
|
||||||
|
failure = PortHandheldTravel.travel(player, hand, book, () -> null);
|
||||||
|
if (failure != null || !player.getItemInHand(hand).isEmpty())
|
||||||
|
throw new IllegalStateException("Successful travel retained the active book");
|
||||||
|
}
|
||||||
|
} finally { player.getInventory().clearContent(); }
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
var books = level.getEntitiesOfClass(DroppedBookEntity.class, new AABB(-2, 60, -2, 3, 68, 3));
|
||||||
|
if (books.size() != 2) throw new IllegalStateException("Expected two dropped books, found " + books.size());
|
||||||
|
for (var entity : books) {
|
||||||
|
var output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, level.registryAccess());
|
||||||
|
entity.saveWithoutId(output);
|
||||||
|
var copy = new DroppedBookEntity(Rivencraft.DROPPED_BOOK.get(), level);
|
||||||
|
copy.load(TagValueInput.create(ProblemReporter.DISCARDING, level.registryAccess(), output.buildResult()));
|
||||||
|
if (!ItemStack.isSameItemSameComponents(copy.getItem(), entity.getItem())
|
||||||
|
|| copy.getAge() != -32768 || copy.getItem().getCount() != 1)
|
||||||
|
throw new IllegalStateException("Dropped book persistence regression");
|
||||||
|
var copied = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, level.registryAccess());
|
||||||
|
copy.saveWithoutId(copied);
|
||||||
|
if (copied.buildResult().getIntOr("BookDecayTicks", -1)
|
||||||
|
!= output.buildResult().getIntOr("BookDecayTicks", -2))
|
||||||
|
throw new IllegalStateException("Dropped book decay counter was not preserved");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+17
-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,19 @@ 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;
|
||||||
|
|
||||||
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,6 +105,8 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ChunkGenerator base() { return base; }
|
public ChunkGenerator base() { return base; }
|
||||||
@@ -286,5 +299,6 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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,358 @@
|
|||||||
|
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 mode == PortConfig.LibraryLootMode.AGE_ONLY
|
||||||
|
? ageSymbols.stream().filter(id -> PortSymbolPages.find(id) != null).distinct().toList()
|
||||||
|
: PortSymbolPages.sealedCandidateIds();
|
||||||
|
}
|
||||||
|
|
||||||
|
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,94 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.CollationFolderItem;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.menu.NotebookMenu;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.resources.RegistryOps;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.Container;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.inventory.ContainerInput;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
|
||||||
|
/** Disposable-world menu, ownership, codec and chest-persistence fixtures. */
|
||||||
|
final class PortNotebookProbe {
|
||||||
|
private static final BlockPos CHEST = new BlockPos(0, 64, 0);
|
||||||
|
private PortNotebookProbe() {}
|
||||||
|
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
PortAgeTravel.findLanding(level);
|
||||||
|
level.setBlock(CHEST, Blocks.CHEST.defaultBlockState(), 3);
|
||||||
|
Container chest = (Container) level.getBlockEntity(CHEST);
|
||||||
|
var player = net.neoforged.neoforge.common.util.FakePlayerFactory.get(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("1043b9f3-f348-4a73-b585-e0de13fd5c27"), "RivenNotebookProbe"));
|
||||||
|
int output = 0;
|
||||||
|
try {
|
||||||
|
for (boolean folder : List.of(false, true)) for (var hand : InteractionHand.values()) {
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
player.getInventory().setSelectedSlot(0);
|
||||||
|
ItemStack collection = new ItemStack(folder ? Rivencraft.COLLATION_FOLDER.get() : Rivencraft.NOTEBOOK.get());
|
||||||
|
player.setItemInHand(hand, collection);
|
||||||
|
var menu = new NotebookMenu(1, player.getInventory(), hand);
|
||||||
|
int capacity = CollationFolderItem.capacity(collection);
|
||||||
|
if (!menu.stillValid(player) || menu.pageCapacity() != capacity
|
||||||
|
|| menu.getSlot(0).mayPlace(PageItem.createLinkPanelPage())
|
||||||
|
|| menu.getSlot(0).mayPlace(new ItemStack(net.minecraft.world.item.Items.DIAMOND)))
|
||||||
|
throw new IllegalStateException("Notebook capacity/page acceptance regression");
|
||||||
|
ItemStack page = PageItem.createSymbolPage(Identifier.fromNamespaceAndPath("rivencraft", "terrain/flat"));
|
||||||
|
player.getInventory().setItem(9, page.copyWithCount(3));
|
||||||
|
menu.clicked(NotebookMenu.NOTEBOOK_SLOTS, 0, ContainerInput.QUICK_MOVE, player);
|
||||||
|
if (!player.getInventory().getItem(9).isEmpty() || contents(collection).pageCount() != 3)
|
||||||
|
throw new IllegalStateException("Notebook shift insertion regression");
|
||||||
|
for (int i = 0; i < 3; i++) menu.clicked(i, 0, ContainerInput.QUICK_MOVE, player);
|
||||||
|
if (contents(collection).pageCount() != 0) throw new IllegalStateException("Notebook shift extraction regression");
|
||||||
|
menu.getSlot(capacity - 1).set(page.copy());
|
||||||
|
if (contents(collection).pageCount() != 1 || !contents(collection).pages().get(0).isEmpty()
|
||||||
|
|| contents(collection).pages().get(capacity - 1).isEmpty())
|
||||||
|
throw new IllegalStateException("Notebook sparse position regression");
|
||||||
|
if (!menu.clickMenuButton(player, NotebookMenu.MOVE_PREVIOUS_BASE + capacity - 1)
|
||||||
|
|| !contents(collection).pages().get(capacity - 1).isEmpty())
|
||||||
|
throw new IllegalStateException("Notebook page movement regression");
|
||||||
|
if (folder && menu.getSlot(capacity).mayPlace(page))
|
||||||
|
throw new IllegalStateException("Folder exceeded 27 positions");
|
||||||
|
menu.clicked(NotebookMenu.NOTEBOOK_SLOTS + 27, 0, ContainerInput.PICKUP, player);
|
||||||
|
if (player.getItemInHand(hand) != collection || !menu.getCarried().isEmpty())
|
||||||
|
throw new IllegalStateException("Notebook active item was movable");
|
||||||
|
var ops = RegistryOps.create(com.mojang.serialization.JsonOps.INSTANCE, level.registryAccess());
|
||||||
|
var encoded = NotebookContents.CODEC.encodeStart(ops, contents(collection)).getOrThrow();
|
||||||
|
var decoded = NotebookContents.CODEC.parse(ops, encoded).getOrThrow();
|
||||||
|
var buffer = new RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(), level.registryAccess());
|
||||||
|
try {
|
||||||
|
NotebookContents.STREAM_CODEC.encode(buffer, decoded);
|
||||||
|
decoded = NotebookContents.STREAM_CODEC.decode(buffer);
|
||||||
|
if (decoded.pageCount() != 1 || decoded.pages().get(capacity - 2).isEmpty())
|
||||||
|
throw new IllegalStateException("Notebook save/network codec regression");
|
||||||
|
} finally { buffer.release(); }
|
||||||
|
chest.setItem(output++, collection.copy());
|
||||||
|
player.setItemInHand(hand, ItemStack.EMPTY);
|
||||||
|
}
|
||||||
|
} finally { player.getInventory().clearContent(); }
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static NotebookContents contents(ItemStack stack) {
|
||||||
|
return stack.getOrDefault(Rivencraft.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
if (!(level.getBlockEntity(CHEST) instanceof Container chest)) throw new IllegalStateException("Fixture chest missing");
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
var collection = chest.getItem(i);
|
||||||
|
int capacity = i < 2 ? 252 : 27;
|
||||||
|
if (CollationFolderItem.capacity(collection) != capacity || contents(collection).pageCount() != 1
|
||||||
|
|| contents(collection).pages().get(capacity - 2).isEmpty())
|
||||||
|
throw new IllegalStateException("Notebook chest persistence regression: " + i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import com.mojang.authlib.GameProfile;
|
||||||
|
import net.minecraft.server.PlayerAdvancements;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.datafix.DataFixers;
|
||||||
|
import net.minecraft.world.level.storage.LevelResource;
|
||||||
|
import net.neoforged.neoforge.common.util.FakePlayer;
|
||||||
|
|
||||||
|
/** FakePlayer normally discards all advancement progress; fixtures need vanilla tracking. */
|
||||||
|
final class PortProgressionPlayer extends FakePlayer {
|
||||||
|
private PlayerAdvancements progress;
|
||||||
|
|
||||||
|
PortProgressionPlayer(ServerLevel level, GameProfile profile) { super(level, profile); }
|
||||||
|
|
||||||
|
@Override public PlayerAdvancements getAdvancements() {
|
||||||
|
if (progress == null) {
|
||||||
|
var server = level().getServer();
|
||||||
|
progress = new PlayerAdvancements(DataFixers.getDataFixer(), server.getPlayerList(),
|
||||||
|
server.getAdvancements(), server.getWorldPath(LevelResource.PLAYER_ADVANCEMENTS_DIR)
|
||||||
|
.resolve(getUUID() + ".json"), this);
|
||||||
|
}
|
||||||
|
return progress;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.advancement.ProgressionAdvancements;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.InkMixerBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.menu.InkMixerMenu;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.inventory.ContainerInput;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
|
||||||
|
/** Disposable operator fixture for loaded advancement data and committed action awards. */
|
||||||
|
final class PortProgressionProbe {
|
||||||
|
/** Operator-fixture assertion; deliberately requires the real loaded advancement. */
|
||||||
|
static boolean isComplete(net.minecraft.server.level.ServerPlayer player, String path) {
|
||||||
|
var advancement = player.level().getServer().getAdvancements().get(
|
||||||
|
net.minecraft.resources.Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "progression/" + path));
|
||||||
|
if (advancement == null) throw new IllegalStateException("Missing progression advancement: " + path);
|
||||||
|
return player.getAdvancements().getOrStartProgress(advancement).isDone();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void recipeDiscovery(ServerLevel level) {
|
||||||
|
var materials = java.util.Map.of(
|
||||||
|
"ink_vial", Items.DYE.black(),
|
||||||
|
"ink_mixer", Items.GLASS_BOTTLE,
|
||||||
|
"book_binder", Items.IRON_INGOT,
|
||||||
|
"crystal_block", Rivencraft.CRYSTAL_SHARD.get(),
|
||||||
|
"notebook", Items.LEATHER,
|
||||||
|
"writing_desk", Items.FEATHER);
|
||||||
|
for (var entry : materials.entrySet()) {
|
||||||
|
var id = net.minecraft.resources.Identifier.fromNamespaceAndPath("rivencraft", entry.getKey());
|
||||||
|
var key = net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.RECIPE, id);
|
||||||
|
var player = new PortProgressionPlayer(level, new com.mojang.authlib.GameProfile(
|
||||||
|
java.util.UUID.nameUUIDFromBytes(id.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8)),
|
||||||
|
"RivenRecipe"));
|
||||||
|
var advancement = level.getServer().getAdvancements().get(
|
||||||
|
net.minecraft.resources.Identifier.fromNamespaceAndPath("rivencraft", "recipes/misc/" + entry.getKey()));
|
||||||
|
if (advancement == null || level.getServer().getRecipeManager().byKey(key).isEmpty())
|
||||||
|
throw new IllegalStateException("Missing recipe/discovery data: " + id);
|
||||||
|
var progress = player.getAdvancements();
|
||||||
|
net.minecraft.advancements.triggers.CriteriaTriggers.INVENTORY_CHANGED.trigger(player,
|
||||||
|
player.getInventory(), new ItemStack(Items.COBBLESTONE));
|
||||||
|
if (player.getRecipeBook().contains(key))
|
||||||
|
throw new IllegalStateException("Wrong material unlocked " + id);
|
||||||
|
var material = new ItemStack(entry.getValue());
|
||||||
|
player.getInventory().setItem(0, material);
|
||||||
|
net.minecraft.advancements.triggers.CriteriaTriggers.INVENTORY_CHANGED.trigger(player, player.getInventory(), material);
|
||||||
|
if (!player.getRecipeBook().contains(key) || !progress.getOrStartProgress(advancement).isDone())
|
||||||
|
throw new IllegalStateException("Material did not unlock " + id);
|
||||||
|
// The second criterion supports /recipe give without first obtaining its material.
|
||||||
|
var other = new PortProgressionPlayer(level, new com.mojang.authlib.GameProfile(
|
||||||
|
java.util.UUID.randomUUID(), "RivenRecipeGive"));
|
||||||
|
if (other.getRecipeBook().contains(key)) throw new IllegalStateException("Recipe leaked between players");
|
||||||
|
other.awardRecipes(java.util.List.of(level.getServer().getRecipeManager().byKey(key).orElseThrow()));
|
||||||
|
if (!other.getAdvancements().getOrStartProgress(advancement).isDone())
|
||||||
|
throw new IllegalStateException("Recipe unlock criterion did not complete " + id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void run(ServerLevel level) {
|
||||||
|
var player = new PortProgressionPlayer(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("b428c3ef-57a6-43dc-95e8-441b6a171107"), "RivenProgression"));
|
||||||
|
var pos = new BlockPos(4, 64, 0);
|
||||||
|
player.setPos(4.5, 64, 2.5);
|
||||||
|
level.setBlock(pos, Rivencraft.INK_MIXER.get().defaultBlockState(), 3);
|
||||||
|
var mixer = (InkMixerBlockEntity) level.getBlockEntity(pos);
|
||||||
|
try {
|
||||||
|
// Every tree node must decode; portal advancement waits for its missing item/feature port.
|
||||||
|
for (String path : new String[]{"root", "page", "linking_book", "link_panel", "copy_page", "bind_age", "enter_age"})
|
||||||
|
if (isComplete(player, path))
|
||||||
|
throw new IllegalStateException("Fixture requires fresh player advancement data");
|
||||||
|
var menu = new InkMixerMenu(1, player.getInventory(), mixer);
|
||||||
|
menu.clicked(InkMixerMenu.RESULT, 0, ContainerInput.PICKUP, player);
|
||||||
|
if (isComplete(player, "link_panel"))
|
||||||
|
throw new IllegalStateException("Empty Mixer awarded progression");
|
||||||
|
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
|
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(Rivencraft.INK_VIAL.get()));
|
||||||
|
menu.broadcastChanges();
|
||||||
|
if (isComplete(player, "link_panel"))
|
||||||
|
throw new IllegalStateException("Mixer preview awarded progression");
|
||||||
|
menu.clicked(InkMixerMenu.RESULT, 0, ContainerInput.PICKUP, player);
|
||||||
|
if (!isComplete(player, "link_panel"))
|
||||||
|
throw new IllegalStateException("Mixer pickup did not award progression");
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
var advancement = level.getServer().getAdvancements().get(
|
||||||
|
net.minecraft.resources.Identifier.fromNamespaceAndPath("rivencraft", "progression/link_panel"));
|
||||||
|
player.getAdvancements().revoke(advancement, "completed");
|
||||||
|
menu.quickMoveStack(player, InkMixerMenu.RESULT);
|
||||||
|
if (!isComplete(player, "link_panel"))
|
||||||
|
throw new IllegalStateException("Mixer shift pickup did not award progression");
|
||||||
|
ProgressionAdvancements.awardAgeTravel(player);
|
||||||
|
if (!isComplete(player, "enter_age"))
|
||||||
|
throw new IllegalStateException("Registered Age did not award entry");
|
||||||
|
} finally {
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
level.removeBlock(pos, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -69,11 +69,16 @@ 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;
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ public final class PortRandomFeatureSelection {
|
|||||||
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());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkBookTarget;
|
||||||
|
import net.minecraft.core.component.DataComponents;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.util.Prediction;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
|
/** Called only after successful Descriptive Book travel and its Disarm effect. */
|
||||||
|
public final class PortReturnLinks {
|
||||||
|
private PortReturnLinks() {}
|
||||||
|
|
||||||
|
public static void afterSuccessfulTravel(ServerPlayer player, Identifier age, LinkBookTarget departure) {
|
||||||
|
var mode = PortConfig.RETURN_LINK_MODE.get();
|
||||||
|
if (mode == PortConfig.ReturnLinkMode.DISABLED) return;
|
||||||
|
var storage = player.level().getServer().overworld().getDataStorage();
|
||||||
|
boolean issue = shouldIssue(mode, storage.computeIfAbsent(PortAgeVisits.TYPE), age);
|
||||||
|
if (!issue) return;
|
||||||
|
ItemStack book = createBook(departure);
|
||||||
|
var source = player.level().getServer().getLevel(net.minecraft.resources.ResourceKey.create(
|
||||||
|
net.minecraft.core.registries.Registries.DIMENSION, departure.dimension()));
|
||||||
|
if (source != null) book.set(Rivencraft.LINK_DESTINATION_NAME.get(),
|
||||||
|
net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(source));
|
||||||
|
if (!player.getInventory().add(book)) player.drop(book, false, Prediction.SERVER_ONLY);
|
||||||
|
// Persist the once-per-Age marker before the next arrival can issue another.
|
||||||
|
if (mode == PortConfig.ReturnLinkMode.ON_CREATION)
|
||||||
|
storage.saveAndJoin();
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean shouldIssue(PortConfig.ReturnLinkMode mode, PortAgeVisits visits, Identifier age) {
|
||||||
|
return switch (mode) {
|
||||||
|
case DISABLED -> false;
|
||||||
|
case ALWAYS -> true;
|
||||||
|
case ON_CREATION -> visits.markFirstVisit(age);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static ItemStack createBook(LinkBookTarget departure) {
|
||||||
|
ItemStack book = new ItemStack(Rivencraft.LINKING_BOOK.get());
|
||||||
|
book.set(Rivencraft.LINK_BOOK_TARGET.get(), departure);
|
||||||
|
book.set(DataComponents.CUSTOM_NAME, Component.translatable("item.rivencraft.linking_book.return"));
|
||||||
|
return book;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
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) {
|
||||||
|
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.
|
||||||
|
int ticket = new Random(seed ^ 0x5E450A5E5EED21L).nextInt(15);
|
||||||
|
Mode mode = ticket < 6 ? Mode.SEASONS : ticket < 11 ? Mode.NO_SEASONS
|
||||||
|
: List.of(Mode.ETERNAL_WINTER, Mode.ETERNAL_SUMMER, Mode.ETERNAL_FALL, Mode.ETERNAL_SPRING).get(ticket - 11);
|
||||||
|
return new Policy(mode, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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);
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package net.dnorberg.rivencraft.age;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.WritingDeskBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.inventory.ContainerInput;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
|
||||||
|
/** Disposable server fixture for copying transactions, page moves and two-part removal. */
|
||||||
|
final class PortWritingDeskProbe {
|
||||||
|
private static final BlockPos POS = new BlockPos(0, 64, 0);
|
||||||
|
private PortWritingDeskProbe() {}
|
||||||
|
private static ItemStack page(String path) { return PageItem.createSymbolPage(Identifier.fromNamespaceAndPath("rivencraft", path)); }
|
||||||
|
|
||||||
|
static void create(ServerLevel level) {
|
||||||
|
PortAgeTravel.findLanding(level);
|
||||||
|
var player = new PortProgressionPlayer(level,
|
||||||
|
new com.mojang.authlib.GameProfile(java.util.UUID.fromString("f92ad9ee-1ff0-4fe2-bcd3-994d4c035933"), "RivenDeskProbe"));
|
||||||
|
player.setPos(0.5, 64, 2.5);
|
||||||
|
// New Minecraft drops Container block-entity contents during removal.
|
||||||
|
// Removing either half must remove its partner and drop contents once.
|
||||||
|
for (Direction facing : Direction.Plane.HORIZONTAL) for (boolean extension : List.of(false, true)) {
|
||||||
|
var state = Rivencraft.WRITING_DESK.get().defaultBlockState().setValue(WritingDeskBlock.FACING, facing);
|
||||||
|
level.setBlock(POS, state, 3);
|
||||||
|
Rivencraft.WRITING_DESK.get().setPlacedBy(level, POS, state, player, new ItemStack(Rivencraft.WRITING_DESK_ITEM.get()));
|
||||||
|
BlockPos other = POS.relative(facing.getClockWise());
|
||||||
|
if (!level.getBlockState(other).getValue(WritingDeskBlock.EXTENSION))
|
||||||
|
throw new IllegalStateException("Desk extension not placed");
|
||||||
|
var desk = (WritingDeskBlockEntity) level.getBlockEntity(POS);
|
||||||
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 3));
|
||||||
|
level.destroyBlock(extension ? other : POS, true);
|
||||||
|
if (level.getBlockState(POS).is(Rivencraft.WRITING_DESK.get()) || level.getBlockState(other).is(Rivencraft.WRITING_DESK.get()))
|
||||||
|
throw new IllegalStateException("Desk partner survived removal");
|
||||||
|
var drops = level.getEntitiesOfClass(net.minecraft.world.entity.item.ItemEntity.class,
|
||||||
|
new net.minecraft.world.phys.AABB(-3, 60, -3, 4, 69, 4));
|
||||||
|
int paper = drops.stream().filter(e -> e.getItem().is(Items.PAPER)).mapToInt(e -> e.getItem().getCount()).sum();
|
||||||
|
int desks = drops.stream().filter(e -> e.getItem().is(Rivencraft.WRITING_DESK_ITEM.get())).mapToInt(e -> e.getItem().getCount()).sum();
|
||||||
|
if (paper != 3 || desks != 1) throw new IllegalStateException("Desk removal duplicated/lost drops: " + paper + "/" + desks);
|
||||||
|
drops.forEach(net.minecraft.world.entity.Entity::discard);
|
||||||
|
}
|
||||||
|
var state = Rivencraft.WRITING_DESK.get().defaultBlockState();
|
||||||
|
level.setBlock(POS, state, 3);
|
||||||
|
Rivencraft.WRITING_DESK.get().setPlacedBy(level, POS, state, player, new ItemStack(Rivencraft.WRITING_DESK_ITEM.get()));
|
||||||
|
var desk = (WritingDeskBlockEntity) level.getBlockEntity(POS);
|
||||||
|
try {
|
||||||
|
if (desk.canPlaceItem(0, PageItem.createLinkPanelPage())) throw new IllegalStateException("Desk accepted Link Panel");
|
||||||
|
desk.setItem(0, page("terrain/flat"));
|
||||||
|
var folder = new ItemStack(Rivencraft.COLLATION_FOLDER.get());
|
||||||
|
folder.set(Rivencraft.NOTEBOOK_CONTENTS.get(), new NotebookContents(List.of(page("weather/off"))));
|
||||||
|
desk.setItem(1, folder);
|
||||||
|
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||||
|
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(Rivencraft.INK_VIAL.get()));
|
||||||
|
if (desk.inkRemaining() != 16 || !desk.getItem(WritingDeskBlockEntity.RETURN).is(Items.GLASS_BOTTLE))
|
||||||
|
throw new IllegalStateException("Desk ink exchange regression");
|
||||||
|
var menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||||
|
menu.broadcastChanges();
|
||||||
|
if (menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().isEmpty() || desk.inkRemaining() != 16)
|
||||||
|
throw new IllegalStateException("Desk virtual result consumed inputs");
|
||||||
|
menu.clicked(WritingDeskMenu.COPY_RESULT, 0, ContainerInput.PICKUP, player);
|
||||||
|
if (menu.getCarried().isEmpty() || desk.inkRemaining() != 15
|
||||||
|
|| desk.getItem(WritingDeskBlockEntity.PAPER).getCount() != 1 || desk.getItem(0).isEmpty())
|
||||||
|
throw new IllegalStateException("Desk copy did not consume exactly one paper/ink");
|
||||||
|
if (!PortProgressionProbe.isComplete(player, "copy_page"))
|
||||||
|
throw new IllegalStateException("Missing copy_page award");
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
for (int slot = 0; slot < player.getInventory().getContainerSize(); slot++)
|
||||||
|
player.getInventory().setItem(slot, new ItemStack(Items.COBBLESTONE, 64));
|
||||||
|
if (!menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT).isEmpty() || desk.inkRemaining() != 15)
|
||||||
|
throw new IllegalStateException("Full inventory consumed copy inputs");
|
||||||
|
player.getInventory().clearContent();
|
||||||
|
if (!menu.clickMenuButton(player, WritingDeskMenu.movePageButtonId(1, 0, 1, 26)))
|
||||||
|
throw new IllegalStateException("Desk sparse page movement failed");
|
||||||
|
if (!menu.clickMenuButton(player, WritingDeskMenu.extractPageButtonId(1, 26, -1)) || menu.getCarried().isEmpty())
|
||||||
|
throw new IllegalStateException("Desk page extraction failed");
|
||||||
|
menu.setCarried(ItemStack.EMPTY);
|
||||||
|
for (int i = 0; i < 21; i++) menu.clickMenuButton(player, WritingDeskMenu.NEXT_TABS);
|
||||||
|
if (menu.firstVisibleTab() != 84 || !menu.clickMenuButton(player, 87)) throw new IllegalStateException("88 desk tabs not reachable");
|
||||||
|
desk.setItem(87, page("lighting/bright"));
|
||||||
|
menu.clickMenuButton(player, WritingDeskMenu.PAGE_BUTTON_BASE);
|
||||||
|
menu.broadcastChanges();
|
||||||
|
} finally { player.getInventory().clearContent(); }
|
||||||
|
verify(level);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void verify(ServerLevel level) {
|
||||||
|
if (!(level.getBlockEntity(POS) instanceof WritingDeskBlockEntity desk)
|
||||||
|
|| desk.activeCollection() != 87 || desk.inkRemaining() != 15
|
||||||
|
|| desk.getItem(WritingDeskBlockEntity.PAPER).getCount() != 1 || desk.getItem(87).isEmpty()
|
||||||
|
|| desk.displayPage().isEmpty()) throw new IllegalStateException("Desk persistence regression");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -149,22 +149,120 @@ 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) {
|
||||||
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()));
|
||||||
|
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,10 +364,23 @@ 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());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Display metadata never changes the dimension identity, seed or filesystem path. */
|
||||||
|
public static java.util.Optional<String> savedAgeName(MinecraftServer server, Identifier id) {
|
||||||
|
checkServerThread(server);
|
||||||
|
return java.util.Optional.ofNullable(index(server).displayName(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setAgeDisplayName(MinecraftServer server, Identifier id, String name) {
|
||||||
|
checkServerThread(server);
|
||||||
|
index(server).setDisplayName(id, name);
|
||||||
|
server.overworld().getDataStorage().saveAndJoin();
|
||||||
|
}
|
||||||
|
|
||||||
public static Map<Identifier, Long> savedAges(MinecraftServer server) {
|
public static Map<Identifier, Long> savedAges(MinecraftServer server) {
|
||||||
checkServerThread(server);
|
checkServerThread(server);
|
||||||
return index(server).entries();
|
return index(server).entries();
|
||||||
@@ -396,6 +507,7 @@ 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
|
||||||
@@ -470,8 +582,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());
|
||||||
@@ -482,6 +594,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);
|
||||||
@@ -494,11 +607,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,33 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.sounds.SoundEvents;
|
||||||
|
import net.minecraft.sounds.SoundSource;
|
||||||
|
import net.minecraft.util.Prediction;
|
||||||
|
import net.minecraft.world.InteractionResult;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.LecternBlock;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
|
||||||
|
/** Vanilla lectern geometry with Rivencraft storage instead of a vanilla book menu. */
|
||||||
|
public final class BookStandBlock extends LecternBlock {
|
||||||
|
public BookStandBlock(Properties properties) { super(properties); }
|
||||||
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new BookStandBlockEntity(pos, state); }
|
||||||
|
@Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hit) {
|
||||||
|
if (!(level.getBlockEntity(pos) instanceof BookStandBlockEntity stand)) return InteractionResult.PASS;
|
||||||
|
if (player.isShiftKeyDown() && !level.isClientSide()) {
|
||||||
|
var book = stand.takeBook();
|
||||||
|
level.setBlock(pos, Blocks.LECTERN.defaultBlockState().setValue(FACING, state.getValue(FACING)), 3);
|
||||||
|
if (!player.getInventory().add(book)) player.drop(book, false, Prediction.SERVER_ONLY);
|
||||||
|
level.playSound(null, pos, SoundEvents.BOOK_PAGE_TURN, SoundSource.BLOCKS, 1, 1);
|
||||||
|
}
|
||||||
|
return InteractionResult.SUCCESS;
|
||||||
|
}
|
||||||
|
@Override protected net.minecraft.world.MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) { return null; }
|
||||||
|
@Override protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, net.minecraft.core.Direction direction) { return 0; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.LevelReader;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
|
/** Solid crystal-textured arrival footing that cannot be collected. */
|
||||||
|
public final class CloudPlatformBlock extends Block {
|
||||||
|
public CloudPlatformBlock(Properties properties) { super(properties); }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state, boolean includeData) {
|
||||||
|
return ItemStack.EMPTY;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
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 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import com.mojang.serialization.MapCodec;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingDeskCatalog;
|
||||||
|
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.Containers;
|
||||||
|
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.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.item.ItemStack;
|
||||||
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.phys.BlockHitResult;
|
||||||
|
|
||||||
|
public final class WritingDeskBlock extends BaseEntityBlock {
|
||||||
|
public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
|
||||||
|
public static final BooleanProperty EXTENSION = BooleanProperty.create("extension");
|
||||||
|
|
||||||
|
public WritingDeskBlock(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
registerDefaultState(stateDefinition.any().setValue(FACING, Direction.NORTH).setValue(EXTENSION, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void createBlockStateDefinition(StateDefinition.Builder<net.minecraft.world.level.block.Block, BlockState> builder) {
|
||||||
|
builder.add(FACING, EXTENSION);
|
||||||
|
}
|
||||||
|
@Override public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||||
|
Direction facing = context.getHorizontalDirection().getOpposite();
|
||||||
|
BlockPos extension = context.getClickedPos().relative(facing.getClockWise());
|
||||||
|
return context.getLevel().getBlockState(extension).canBeReplaced(context)
|
||||||
|
? defaultBlockState().setValue(FACING, facing) : null;
|
||||||
|
}
|
||||||
|
@Override public void setPlacedBy(Level level, BlockPos pos, BlockState state,
|
||||||
|
@Nullable LivingEntity placer, ItemStack stack) {
|
||||||
|
super.setPlacedBy(level, pos, state, placer, stack);
|
||||||
|
level.setBlock(pos.relative(state.getValue(FACING).getClockWise()),
|
||||||
|
state.setValue(EXTENSION, true), 3);
|
||||||
|
}
|
||||||
|
@Override protected RenderShape getRenderShape(BlockState state) { return RenderShape.MODEL; }
|
||||||
|
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
return state.getValue(EXTENSION) ? null : new WritingDeskBlockEntity(pos, state);
|
||||||
|
}
|
||||||
|
@Override protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos,
|
||||||
|
Player player, BlockHitResult hit) {
|
||||||
|
BlockPos controller = state.getValue(EXTENSION)
|
||||||
|
? pos.relative(state.getValue(FACING).getCounterClockWise()) : pos;
|
||||||
|
if (!level.isClientSide() && player instanceof ServerPlayer serverPlayer
|
||||||
|
&& level.getBlockEntity(controller) instanceof WritingDeskBlockEntity desk) {
|
||||||
|
serverPlayer.openMenu(new SimpleMenuProvider(
|
||||||
|
(id, inventory, ignored) -> new WritingDeskMenu(id, inventory, desk),
|
||||||
|
Component.translatable("container.rivencraft.writing_desk")),
|
||||||
|
buffer -> {
|
||||||
|
buffer.writeBlockPos(controller);
|
||||||
|
WritingDeskCatalog.write(buffer, WritingDeskCatalog.available(desk));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return InteractionResult.SUCCESS;
|
||||||
|
}
|
||||||
|
@Override protected void affectNeighborsAfterRemoval(BlockState state, net.minecraft.server.level.ServerLevel level,
|
||||||
|
BlockPos pos, boolean movedByPiston) {
|
||||||
|
BlockPos other = pos.relative(state.getValue(FACING).getClockWise(), state.getValue(EXTENSION) ? -1 : 1);
|
||||||
|
BlockState otherState = level.getBlockState(other);
|
||||||
|
if (otherState.is(this) && otherState.getValue(EXTENSION) != state.getValue(EXTENSION)
|
||||||
|
&& otherState.getValue(FACING) == state.getValue(FACING))
|
||||||
|
level.setBlock(other, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(), 35);
|
||||||
|
Containers.updateNeighboursAfterDestroy(state, level, pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
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) {
|
||||||
|
book = value.copyWithCount(1);
|
||||||
|
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() { 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);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+40
@@ -0,0 +1,40 @@
|
|||||||
|
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.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 stored book or page, synchronized independently of the player's inventory. */
|
||||||
|
public final class BookStandBlockEntity extends BlockEntity {
|
||||||
|
private ItemStack book = ItemStack.EMPTY;
|
||||||
|
public BookStandBlockEntity(BlockPos pos, BlockState state) { super(Rivencraft.BOOK_STAND_BLOCK_ENTITY.get(), pos, state); }
|
||||||
|
public ItemStack getBook() { return book; }
|
||||||
|
public void setBook(ItemStack stack) { book = stack; sync(); }
|
||||||
|
public ItemStack takeBook() { ItemStack result = book; book = ItemStack.EMPTY; sync(); return result; }
|
||||||
|
private void sync() {
|
||||||
|
setChanged();
|
||||||
|
if (level != null && !level.isClientSide()) level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), 2);
|
||||||
|
}
|
||||||
|
@Override protected void loadAdditional(ValueInput input) {
|
||||||
|
super.loadAdditional(input);
|
||||||
|
book = input.read("Book", ItemStack.CODEC).orElse(ItemStack.EMPTY);
|
||||||
|
}
|
||||||
|
@Override protected void saveAdditional(ValueOutput output) {
|
||||||
|
super.saveAdditional(output);
|
||||||
|
if (!book.isEmpty()) output.store("Book", ItemStack.CODEC, book);
|
||||||
|
}
|
||||||
|
@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 != null && !level.isClientSide())
|
||||||
|
net.minecraft.world.Containers.dropItemStack(level, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, takeBook());
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+30
@@ -112,6 +112,36 @@ public final class PortBookBinderBlockEntity extends BlockEntity implements Cont
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Validate the complete collection before moving any page, as in 1.21.1. */
|
||||||
|
public ItemStack importCollection(ItemStack collection, int index) {
|
||||||
|
if (!net.dnorberg.rivencraft.item.CollationFolderItem.isCollection(collection)
|
||||||
|
|| collection.getCount() != 1) return ItemStack.EMPTY;
|
||||||
|
var contents = collection.getOrDefault(Rivencraft.NOTEBOOK_CONTENTS.get(),
|
||||||
|
net.dnorberg.rivencraft.writing.NotebookContents.EMPTY);
|
||||||
|
int end = nextPageIndex();
|
||||||
|
if (index < 0 || index > end) return ItemStack.EMPTY;
|
||||||
|
ItemStack panel = ItemStack.EMPTY;
|
||||||
|
List<ItemStack> writing = new ArrayList<>();
|
||||||
|
for (ItemStack page : contents.pages()) {
|
||||||
|
if (page.isEmpty()) continue;
|
||||||
|
if (!page.is(Rivencraft.PAGE.get()) || page.getCount() != 1) return ItemStack.EMPTY;
|
||||||
|
if (PageItem.isLinkPanel(page)) {
|
||||||
|
if (!panel.isEmpty() || !items.get(PANEL).isEmpty()) return ItemStack.EMPTY;
|
||||||
|
panel = page;
|
||||||
|
} else if (validSymbolPage(page)) writing.add(page);
|
||||||
|
else return ItemStack.EMPTY;
|
||||||
|
}
|
||||||
|
if (end + writing.size() > PAGE_COUNT || writing.isEmpty() && panel.isEmpty()) return ItemStack.EMPTY;
|
||||||
|
if (!panel.isEmpty()) items.set(PANEL, panel.copy());
|
||||||
|
for (int current = end - 1; current >= index; current--)
|
||||||
|
items.set(FIRST_PAGE + current + writing.size(), items.get(FIRST_PAGE + current));
|
||||||
|
for (ItemStack page : writing) items.set(FIRST_PAGE + index++, page.copy());
|
||||||
|
ItemStack emptied = collection.copy();
|
||||||
|
emptied.set(Rivencraft.NOTEBOOK_CONTENTS.get(), net.dnorberg.rivencraft.writing.NotebookContents.EMPTY);
|
||||||
|
setChanged();
|
||||||
|
return emptied;
|
||||||
|
}
|
||||||
|
|
||||||
public ItemStack takePage(int index) {
|
public ItemStack takePage(int index) {
|
||||||
int end = nextPageIndex();
|
int end = nextPageIndex();
|
||||||
if (index < 0 || index >= end) return ItemStack.EMPTY;
|
if (index < 0 || index >= end) return ItemStack.EMPTY;
|
||||||
|
|||||||
+173
@@ -0,0 +1,173 @@
|
|||||||
|
package net.dnorberg.rivencraft.block.entity;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.InkVialItem;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.item.CollationFolderItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.InkVialExchange;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.world.level.storage.ValueInput;
|
||||||
|
import net.minecraft.world.level.storage.ValueOutput;
|
||||||
|
import net.minecraft.core.NonNullList;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.network.protocol.Packet;
|
||||||
|
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
|
||||||
|
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.item.Items;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
|
||||||
|
/** Collection tabs, paper, ink vials and empty-vial return are owned by the block. */
|
||||||
|
public final class WritingDeskBlockEntity extends BlockEntity implements Container {
|
||||||
|
public static final int COLLECTIONS = 88;
|
||||||
|
public static final int INK = COLLECTIONS;
|
||||||
|
public static final int RETURN = INK + 1;
|
||||||
|
public static final int PAPER = INK + 2;
|
||||||
|
/** Unused by new desks; retained so old saves cannot silently lose slot contents. */
|
||||||
|
public static final int LEGACY_OUTPUT = INK + 3;
|
||||||
|
public static final int SIZE = INK + 4;
|
||||||
|
private NonNullList<ItemStack> items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
|
private int activeCollection;
|
||||||
|
private int inkRemaining;
|
||||||
|
private ItemStack displayPage = ItemStack.EMPTY;
|
||||||
|
|
||||||
|
public WritingDeskBlockEntity(BlockPos pos, BlockState state) {
|
||||||
|
super(Rivencraft.WRITING_DESK_BLOCK_ENTITY.get(), pos, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int activeCollection() { return activeCollection; }
|
||||||
|
public int inkRemaining() { return inkRemaining; }
|
||||||
|
public ItemStack displayPage() { return displayPage; }
|
||||||
|
public void setDisplayPage(ItemStack page) {
|
||||||
|
ItemStack next = page.isEmpty() ? ItemStack.EMPTY : page.copyWithCount(1);
|
||||||
|
if (!ItemStack.matches(displayPage, next)) {
|
||||||
|
displayPage = next;
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public void setActiveCollection(int index) {
|
||||||
|
if (index >= 0 && index < COLLECTIONS && activeCollection != index) {
|
||||||
|
activeCollection = index;
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public int getContainerSize() { return SIZE; }
|
||||||
|
@Override public boolean isEmpty() { return items.stream().allMatch(ItemStack::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()) {
|
||||||
|
if (slot < COLLECTIONS) displayPage = ItemStack.EMPTY;
|
||||||
|
setChanged();
|
||||||
|
if (slot == RETURN) refillEmptyInkBar();
|
||||||
|
}
|
||||||
|
return removed;
|
||||||
|
}
|
||||||
|
@Override public ItemStack removeItemNoUpdate(int slot) { return ContainerHelper.takeItem(items, slot); }
|
||||||
|
@Override public void setItem(int slot, ItemStack stack) {
|
||||||
|
items.set(slot, stack);
|
||||||
|
if (stack.getCount() > getMaxStackSize()) stack.setCount(getMaxStackSize());
|
||||||
|
if (slot < COLLECTIONS) displayPage = ItemStack.EMPTY;
|
||||||
|
setChanged();
|
||||||
|
if (slot == INK || slot == RETURN) refillEmptyInkBar();
|
||||||
|
}
|
||||||
|
@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 boolean canPlaceItem(int slot, ItemStack stack) {
|
||||||
|
if (slot < COLLECTIONS) return CollationFolderItem.isCollection(stack)
|
||||||
|
&& stack.getOrDefault(Rivencraft.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY)
|
||||||
|
.pages().stream().noneMatch(page -> PageItem.content(page).kind() == PageContent.Kind.LINK_PANEL)
|
||||||
|
|| stack.is(Rivencraft.PAGE.get())
|
||||||
|
&& PageItem.content(stack).kind() != PageContent.Kind.LINK_PANEL;
|
||||||
|
return switch (slot) {
|
||||||
|
case INK -> stack.is(Rivencraft.INK_VIAL.get());
|
||||||
|
case RETURN -> false;
|
||||||
|
case PAPER -> stack.is(Items.PAPER);
|
||||||
|
case LEGACY_OUTPUT -> false;
|
||||||
|
default -> false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Consume one vial only when the empty meter can return its glass bottle. */
|
||||||
|
private void refillEmptyInkBar() {
|
||||||
|
if (level != null && !level.isClientSide() && inkRemaining == 0) {
|
||||||
|
int addedInk = InkVialExchange.exchange(items, INK, RETURN);
|
||||||
|
if (addedInk > 0) {
|
||||||
|
inkRemaining = addedInk;
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The output is virtual; inputs are committed only after a result can be given to a player. */
|
||||||
|
public boolean canConsumeCopyMaterials() {
|
||||||
|
ItemStack paper = items.get(PAPER);
|
||||||
|
if (!canPlaceItem(PAPER, paper) || paper.isEmpty()) return false;
|
||||||
|
int cost = net.dnorberg.rivencraft.writing.WritingInkService.symbolCopyCost();
|
||||||
|
return InkVialExchange.canPay(items, INK, RETURN, inkRemaining, cost);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean consumeCopyMaterials() {
|
||||||
|
if (!canConsumeCopyMaterials()) return false;
|
||||||
|
int cost = net.dnorberg.rivencraft.writing.WritingInkService.symbolCopyCost();
|
||||||
|
if (inkRemaining < cost) {
|
||||||
|
inkRemaining += InkVialExchange.exchange(items, INK, RETURN);
|
||||||
|
}
|
||||||
|
inkRemaining -= cost;
|
||||||
|
removeItem(PAPER, 1);
|
||||||
|
setChanged();
|
||||||
|
if (inkRemaining == 0) refillEmptyInkBar();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@Override public void setLevel(Level level) {
|
||||||
|
super.setLevel(level);
|
||||||
|
refillEmptyInkBar();
|
||||||
|
}
|
||||||
|
@Override public void clearContent() {
|
||||||
|
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
|
inkRemaining = 0;
|
||||||
|
displayPage = ItemStack.EMPTY;
|
||||||
|
setChanged();
|
||||||
|
}
|
||||||
|
@Override protected void loadAdditional(ValueInput input) {
|
||||||
|
super.loadAdditional(input);
|
||||||
|
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||||
|
ContainerHelper.loadAllItems(input, items);
|
||||||
|
activeCollection = Math.clamp(input.getIntOr("ActiveCollection", 0), 0, COLLECTIONS - 1);
|
||||||
|
inkRemaining = Math.clamp(input.getIntOr("InkRemaining", 0), 0, InkVialItem.CAPACITY);
|
||||||
|
displayPage = input.read("DisplayPage", ItemStack.CODEC).orElse(ItemStack.EMPTY);
|
||||||
|
refillEmptyInkBar();
|
||||||
|
}
|
||||||
|
@Override protected void saveAdditional(ValueOutput output) {
|
||||||
|
super.saveAdditional(output);
|
||||||
|
ContainerHelper.saveAllItems(output, items);
|
||||||
|
output.putInt("ActiveCollection", activeCollection);
|
||||||
|
output.putInt("InkRemaining", inkRemaining);
|
||||||
|
if (!displayPage.isEmpty()) output.store("DisplayPage", ItemStack.CODEC, displayPage);
|
||||||
|
}
|
||||||
|
@Override public Packet<ClientGamePacketListener> getUpdatePacket() {
|
||||||
|
return ClientboundBlockEntityDataPacket.create(this);
|
||||||
|
}
|
||||||
|
@Override public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
|
||||||
|
return saveWithoutMetadata(registries);
|
||||||
|
}
|
||||||
|
@Override public void setChanged() {
|
||||||
|
super.setChanged();
|
||||||
|
if (level != null && !level.isClientSide()) {
|
||||||
|
level.sendBlockUpdated(worldPosition, getBlockState(), getBlockState(), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,9 @@ public final class AgeCatalogClient {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void register(RegisterClientPayloadHandlersEvent event) {
|
public static void register(RegisterClientPayloadHandlersEvent event) {
|
||||||
|
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());
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BookReceptacleBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity;
|
||||||
|
import net.minecraft.client.model.geom.ModelLayers;
|
||||||
|
import net.minecraft.client.model.object.book.BookModel;
|
||||||
|
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
|
||||||
|
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
|
||||||
|
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||||
|
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** The 1.21.1 receptacle book orientation in the 26.3 extracted renderer. */
|
||||||
|
public final class BookReceptacleRenderer implements BlockEntityRenderer<BookReceptacleBlockEntity, BookReceptacleRenderer.State> {
|
||||||
|
private static final Identifier LINKING = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/linking_book.png");
|
||||||
|
private static final Identifier DESCRIPTIVE = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/descriptive_book.png");
|
||||||
|
private final BookModel model;
|
||||||
|
public BookReceptacleRenderer(BlockEntityRendererProvider.Context context) {
|
||||||
|
model = new BookModel(context.bakeLayer(ModelLayers.BOOK));
|
||||||
|
}
|
||||||
|
public static final class State extends BlockEntityRenderState {
|
||||||
|
boolean present, descriptive;
|
||||||
|
Direction facing = Direction.NORTH;
|
||||||
|
}
|
||||||
|
@Override public State createRenderState() { return new State(); }
|
||||||
|
@Override public void extractRenderState(BookReceptacleBlockEntity holder, State state, float partialTick,
|
||||||
|
Vec3 camera, ModelFeatureRenderer.CrumblingOverlay overlay) {
|
||||||
|
BlockEntityRenderer.super.extractRenderState(holder, state, partialTick, camera, overlay);
|
||||||
|
state.present = !holder.getBook().isEmpty() && holder.getBlockState().getValue(BookReceptacleBlock.HAS_BOOK);
|
||||||
|
state.descriptive = holder.getBook().is(Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
state.facing = holder.getBlockState().getValue(BookReceptacleBlock.FACING);
|
||||||
|
}
|
||||||
|
@Override public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
|
||||||
|
if (!state.present) return;
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(0.5F, 0.5F, 0.5F);
|
||||||
|
switch (state.facing) {
|
||||||
|
case UP -> {
|
||||||
|
pose.rotateDegrees(Axis.ZP, 180);
|
||||||
|
pose.rotateDegrees(Axis.XP, -90);
|
||||||
|
pose.rotateDegrees(Axis.YP, 90);
|
||||||
|
pose.rotateDegrees(Axis.ZP, 180);
|
||||||
|
}
|
||||||
|
case DOWN -> {
|
||||||
|
pose.rotateDegrees(Axis.XP, -90);
|
||||||
|
pose.rotateDegrees(Axis.YP, 90);
|
||||||
|
pose.rotateDegrees(Axis.ZP, 180);
|
||||||
|
}
|
||||||
|
case NORTH -> pose.rotateDegrees(Axis.YP, -90);
|
||||||
|
case SOUTH -> pose.rotateDegrees(Axis.YP, 90);
|
||||||
|
case EAST -> pose.rotateDegrees(Axis.YP, 180);
|
||||||
|
case WEST -> { }
|
||||||
|
}
|
||||||
|
pose.scale(0.8F, 0.8F, 0.8F);
|
||||||
|
collector.submitModel(model, BookModel.State.forAnimation(0, 0.1F, 0.1F, 0.005F), pose,
|
||||||
|
state.descriptive ? DESCRIPTIVE : LINKING, state.lightCoords, OverlayTexture.NO_OVERLAY, 0);
|
||||||
|
pose.popPose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BookStandBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
|
import net.minecraft.client.gui.Font;
|
||||||
|
import net.minecraft.client.model.geom.ModelLayers;
|
||||||
|
import net.minecraft.client.model.object.book.BookModel;
|
||||||
|
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
|
||||||
|
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
|
||||||
|
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||||
|
import net.minecraft.client.renderer.item.ItemModelResolver;
|
||||||
|
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||||
|
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.item.ItemDisplayContext;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** Extracted version of the 1.21.1 lectern display, retaining its final page orientation. */
|
||||||
|
public final class BookStandRenderer implements BlockEntityRenderer<BookStandBlockEntity, BookStandRenderer.State> {
|
||||||
|
private static final Identifier LINKING = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/linking_book.png");
|
||||||
|
private static final Identifier DESCRIPTIVE = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/descriptive_book.png");
|
||||||
|
private final BookModel model;
|
||||||
|
private final ItemModelResolver resolver;
|
||||||
|
private final Font font;
|
||||||
|
public BookStandRenderer(BlockEntityRendererProvider.Context context) {
|
||||||
|
model = new BookModel(context.bakeLayer(ModelLayers.BOOK));
|
||||||
|
resolver = context.itemModelResolver();
|
||||||
|
font = context.font();
|
||||||
|
}
|
||||||
|
public static final class State extends BlockEntityRenderState {
|
||||||
|
final ItemStackRenderState page = new ItemStackRenderState();
|
||||||
|
boolean present, isPage, descriptive;
|
||||||
|
float rotation;
|
||||||
|
Component name;
|
||||||
|
}
|
||||||
|
@Override public State createRenderState() { return new State(); }
|
||||||
|
@Override public void extractRenderState(BookStandBlockEntity stand, State state, float partialTick,
|
||||||
|
Vec3 camera, ModelFeatureRenderer.CrumblingOverlay overlay) {
|
||||||
|
BlockEntityRenderer.super.extractRenderState(stand, state, partialTick, camera, overlay);
|
||||||
|
var book = stand.getBook();
|
||||||
|
state.present = !book.isEmpty();
|
||||||
|
state.isPage = book.is(Rivencraft.PAGE.get());
|
||||||
|
state.descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
state.name = state.present && !state.isPage ? book.getHoverName().copy() : null;
|
||||||
|
Direction facing = stand.getBlockState().getValue(BookStandBlock.FACING);
|
||||||
|
state.rotation = state.isPage ? facing.toYRot() - 180 + (facing.getAxis() == Direction.Axis.X ? 180 : 0)
|
||||||
|
: -facing.getClockWise().toYRot();
|
||||||
|
resolver.updateForTopItem(state.page, state.isPage ? book : net.minecraft.world.item.ItemStack.EMPTY,
|
||||||
|
ItemDisplayContext.FIXED, stand.getLevel(), null, 0);
|
||||||
|
}
|
||||||
|
@Override public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
|
||||||
|
if (!state.present) return;
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(0.5F, 1.0625F, 0.5F);
|
||||||
|
pose.rotateDegrees(Axis.YP, state.rotation);
|
||||||
|
if (state.isPage) {
|
||||||
|
pose.rotateDegrees(Axis.XP, 67.5F);
|
||||||
|
pose.scale(0.7F, 0.7F, 0.7F);
|
||||||
|
state.page.submit(pose, collector, state.lightCoords, OverlayTexture.NO_OVERLAY, 0);
|
||||||
|
} else {
|
||||||
|
pose.rotateDegrees(Axis.ZP, 67.5F);
|
||||||
|
pose.translate(0, -0.125F, 0);
|
||||||
|
collector.submitModel(model, BookModel.State.forAnimation(0, 0.1F, 0.9F, 1.2F), pose,
|
||||||
|
state.descriptive ? DESCRIPTIVE : LINKING, state.lightCoords, OverlayTexture.NO_OVERLAY, 0);
|
||||||
|
}
|
||||||
|
pose.popPose();
|
||||||
|
if (state.name != null) {
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(0.5F, 1.6F, 0.5F);
|
||||||
|
pose.rotate(camera.orientation);
|
||||||
|
pose.scale(0.025F, -0.025F, 0.025F);
|
||||||
|
collector.submitText(pose, -font.width(state.name) / 2.0F, 0, state.name.getVisualOrderText(),
|
||||||
|
false, Font.DisplayMode.NORMAL, state.lightCoords, 0xFFFFFFFF, 0, 0);
|
||||||
|
pose.popPose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+20
@@ -0,0 +1,20 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||||
|
import net.dnorberg.rivencraft.network.WritingDeskCatalogPayload;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||||
|
|
||||||
|
public final class ClientWritingDeskCatalog {
|
||||||
|
private ClientWritingDeskCatalog() {}
|
||||||
|
|
||||||
|
public static void handle(WritingDeskCatalogPayload payload, IPayloadContext context) {
|
||||||
|
context.enqueueWork(() -> {
|
||||||
|
var player = Minecraft.getInstance().player;
|
||||||
|
if (player != null && player.containerMenu instanceof WritingDeskMenu menu
|
||||||
|
&& menu.containerId == payload.containerId()) {
|
||||||
|
menu.setCatalog(payload.symbols());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||||
|
import net.minecraft.client.model.geom.ModelLayers;
|
||||||
|
import net.minecraft.client.model.object.book.BookModel;
|
||||||
|
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||||
|
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||||
|
import net.minecraft.client.renderer.entity.EntityRendererProvider;
|
||||||
|
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||||
|
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Uses the same skyward-facing open book and textures as the 1.21.1 renderer. */
|
||||||
|
public final class DroppedBookRenderer extends EntityRenderer<DroppedBookEntity, DroppedBookRenderer.State> {
|
||||||
|
private static final Identifier LINKING = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/linking_book.png");
|
||||||
|
private static final Identifier DESCRIPTIVE = Identifier.fromNamespaceAndPath("rivencraft", "textures/entity/descriptive_book.png");
|
||||||
|
private final BookModel model;
|
||||||
|
|
||||||
|
public DroppedBookRenderer(EntityRendererProvider.Context context) {
|
||||||
|
super(context);
|
||||||
|
model = new BookModel(context.bakeLayer(ModelLayers.BOOK));
|
||||||
|
shadowRadius = 0.25F;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final class State extends EntityRenderState {
|
||||||
|
float yaw;
|
||||||
|
boolean descriptive;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public State createRenderState() { return new State(); }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void extractRenderState(DroppedBookEntity entity, State state, float partialTick) {
|
||||||
|
super.extractRenderState(entity, state, partialTick);
|
||||||
|
state.yaw = entity.getYRot();
|
||||||
|
state.descriptive = entity.getItem().is(Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(0.0F, 0.0625F, 0.0F);
|
||||||
|
pose.rotateDegrees(Axis.YP, state.yaw + 90.0F);
|
||||||
|
pose.rotateDegrees(Axis.ZP, 90.0F);
|
||||||
|
pose.scale(0.8F, 0.8F, 0.8F);
|
||||||
|
collector.submitModel(model, BookModel.State.forAnimation(0, 0, 0, 1.2F), pose,
|
||||||
|
state.descriptive ? DESCRIPTIVE : LINKING, state.lightCoords, OverlayTexture.NO_OVERLAY,
|
||||||
|
state.outlineColor);
|
||||||
|
pose.popPose();
|
||||||
|
super.submit(state, pose, collector, camera);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,198 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkProperties;
|
||||||
|
import net.dnorberg.rivencraft.menu.LinkModifierMenu;
|
||||||
|
import net.dnorberg.rivencraft.network.SetLinkModifierTitlePayload;
|
||||||
|
import net.dnorberg.rivencraft.network.SetLinkModifierSeedPayload;
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import net.minecraft.client.input.MouseButtonEvent;
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||||
|
import net.minecraft.client.input.KeyEvent;
|
||||||
|
import net.minecraft.client.gui.components.Button;
|
||||||
|
import net.minecraft.client.gui.components.Tooltip;
|
||||||
|
import net.minecraft.client.renderer.RenderPipelines;
|
||||||
|
import net.minecraft.core.component.DataComponents;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
||||||
|
|
||||||
|
/** Existing Legacy single-slot layout, using the 26.3 extraction/input APIs. */
|
||||||
|
public final class LinkModifierScreen extends AbstractContainerScreen<LinkModifierMenu> {
|
||||||
|
private static final Identifier BACKGROUND = Identifier.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "textures/gui/link_modifier_legacy.png");
|
||||||
|
private static final int[] FLAGS = {LinkProperties.DISARM, LinkProperties.INTRA_LINKING,
|
||||||
|
LinkProperties.INTRA_LINKING_ONLY, LinkProperties.MAINTAIN_MOMENTUM, LinkProperties.RELATIVE_LINK, LinkProperties.DISABLE_PLATFORM};
|
||||||
|
private static final int[] IDS = {LinkModifierMenu.TOGGLE_DISARM, LinkModifierMenu.TOGGLE_INTRA,
|
||||||
|
LinkModifierMenu.TOGGLE_INTRA_ONLY, LinkModifierMenu.TOGGLE_MOMENTUM, LinkModifierMenu.TOGGLE_RELATIVE, LinkModifierMenu.TOGGLE_PLATFORM};
|
||||||
|
private static final String[] NAMES = {"disarm", "intra_linking", "intra_linking_only", "maintain_momentum", "relative_link", "generate_platform"};
|
||||||
|
private EditBox titleInput;
|
||||||
|
private EditBox seedInput;
|
||||||
|
private Identifier seedAge;
|
||||||
|
private long lastSeed = Long.MIN_VALUE;
|
||||||
|
private ItemStack lastBook = ItemStack.EMPTY;
|
||||||
|
private boolean refreshing;
|
||||||
|
private Button retireButton;
|
||||||
|
private Button confirmRetireButton;
|
||||||
|
private final Button[] options = new Button[6];
|
||||||
|
|
||||||
|
public LinkModifierScreen(LinkModifierMenu menu, Inventory inventory, Component title) {
|
||||||
|
super(menu, inventory, title, 176, 166);
|
||||||
|
inventoryLabelY = 72;
|
||||||
|
}
|
||||||
|
@Override public boolean isPauseScreen() { return false; }
|
||||||
|
@Override protected void init() {
|
||||||
|
super.init();
|
||||||
|
titleInput = new EditBox(font, leftPos + 80, topPos + 56, 87, 14,
|
||||||
|
Component.translatable("screen.rivencraft.link_modifier.title"));
|
||||||
|
titleInput.setMaxLength(32);
|
||||||
|
titleInput.setResponder(value -> {
|
||||||
|
if (!refreshing) ClientPacketDistributor.sendToServer(new SetLinkModifierTitlePayload(menu.containerId, value));
|
||||||
|
});
|
||||||
|
addRenderableWidget(titleInput);
|
||||||
|
seedInput = new EditBox(font, leftPos + 80, topPos + 15, 87, 14,
|
||||||
|
Component.translatable("screen.rivencraft.link_modifier.seed"));
|
||||||
|
seedInput.setMaxLength(21);
|
||||||
|
seedInput.setTooltip(Tooltip.create(Component.translatable("screen.rivencraft.link_modifier.seed_warning")));
|
||||||
|
addRenderableWidget(seedInput);
|
||||||
|
for (int index = 0; index < options.length; index++) {
|
||||||
|
final int option = index;
|
||||||
|
options[index] = addRenderableWidget(new Button(leftPos + 5 + (index / 3) * 20,
|
||||||
|
topPos + 10 + (index % 3) * 20, 18, 18, label(index), button -> {
|
||||||
|
if (minecraft != null && minecraft.gameMode != null)
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, IDS[option]);
|
||||||
|
}, java.util.function.Supplier::get) {
|
||||||
|
@Override protected void extractContents(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
int x = getX(), y = getY();
|
||||||
|
graphics.fill(x, y, x + 18, y + 18, isHoveredOrFocused() ? 0xFFFFFFFF : 0xFFAAAAAA);
|
||||||
|
graphics.fill(x + 2, y + 2, x + 17, y + 17, !active ? 0xFF555555
|
||||||
|
: selected(option, menu.book().getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE))
|
||||||
|
? 0xFFBBBBBB : 0xFF777777);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
options[index].setTooltip(Tooltip.create(label(index)));
|
||||||
|
}
|
||||||
|
retireButton = addRenderableWidget(new RetirementButton(120, LinkModifierMenu.RETIRE_AGE, "retire", false));
|
||||||
|
confirmRetireButton = addRenderableWidget(new RetirementButton(140, LinkModifierMenu.CONFIRM_RETIRE_AGE, "confirm", true));
|
||||||
|
refreshControls();
|
||||||
|
}
|
||||||
|
private final class RetirementButton extends Button {
|
||||||
|
private final boolean danger;
|
||||||
|
RetirementButton(int x, int action, String name, boolean danger) {
|
||||||
|
super(leftPos + x, topPos + 32, 18, 18,
|
||||||
|
Component.translatable("screen.rivencraft.link_modifier." + name), button -> {
|
||||||
|
if (minecraft != null && minecraft.gameMode != null)
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, action);
|
||||||
|
}, DEFAULT_NARRATION);
|
||||||
|
this.danger = danger;
|
||||||
|
setTooltip(Tooltip.create(getMessage()));
|
||||||
|
}
|
||||||
|
@Override protected void extractContents(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
int x = getX(), y = getY();
|
||||||
|
graphics.fill(x, y, x + 18, y + 18, isHoveredOrFocused() ? 0xFFFFFFFF : 0xFFAAAAAA);
|
||||||
|
graphics.fill(x + 2, y + 2, x + 17, y + 17, danger ? 0xFFAA5555
|
||||||
|
: menu.awaitingRetirementConfirmation() ? 0xFFBBBBBB : 0xFF777777);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override protected void containerTick() { refreshControls(); }
|
||||||
|
private void refreshControls() {
|
||||||
|
ItemStack book = menu.book();
|
||||||
|
// Changing book kinds refreshes immediately; otherwise avoid replacing
|
||||||
|
// focused text with an earlier server echo while the player is typing.
|
||||||
|
if (!ItemStack.isSameItem(book, lastBook) || !titleInput.isFocused()) {
|
||||||
|
if (!ItemStack.isSameItemSameComponents(book, lastBook)) {
|
||||||
|
Component name = book.get(DataComponents.CUSTOM_NAME);
|
||||||
|
refreshing = true;
|
||||||
|
titleInput.setValue(name == null ? "" : name.getString());
|
||||||
|
refreshing = false;
|
||||||
|
lastBook = book.copy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
titleInput.setEditable(!book.isEmpty());
|
||||||
|
boolean canRetire = minecraft != null && minecraft.player != null && menu.canRetire(minecraft.player);
|
||||||
|
if (retireButton != null) {
|
||||||
|
retireButton.visible = canRetire;
|
||||||
|
retireButton.active = canRetire && !menu.awaitingRetirementConfirmation();
|
||||||
|
confirmRetireButton.visible = canRetire && menu.awaitingRetirementConfirmation();
|
||||||
|
confirmRetireButton.active = confirmRetireButton.visible;
|
||||||
|
}
|
||||||
|
Identifier age = book.get(Rivencraft.AGE_BOOK_ID.get());
|
||||||
|
if (!java.util.Objects.equals(seedAge, age)) {
|
||||||
|
seedInput.setFocused(false);
|
||||||
|
seedAge = age;
|
||||||
|
seedInput.setValue(Long.toString(menu.seed()));
|
||||||
|
lastSeed = menu.seed();
|
||||||
|
}
|
||||||
|
seedInput.visible = menu.hasSeed();
|
||||||
|
seedInput.setEditable(seedInput.visible);
|
||||||
|
if (!seedInput.visible) seedInput.setFocused(false);
|
||||||
|
else if (!seedInput.isFocused() && (lastSeed != menu.seed()
|
||||||
|
|| !seedInput.getValue().equals(Long.toString(menu.seed())))) {
|
||||||
|
lastSeed = menu.seed();
|
||||||
|
seedInput.setValue(Long.toString(lastSeed));
|
||||||
|
}
|
||||||
|
for (int i = 0; i < options.length; i++) if (options[i] != null) {
|
||||||
|
options[i].active = available(i);
|
||||||
|
Component label = label(i);
|
||||||
|
if (!options[i].getMessage().equals(label)) {
|
||||||
|
options[i].setMessage(label);
|
||||||
|
options[i].setTooltip(Tooltip.create(label));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
private boolean available(int index) {
|
||||||
|
return !menu.book().isEmpty() && ((index != 1 && index != 2) || menu.book().is(Rivencraft.LINKING_BOOK.get()));
|
||||||
|
}
|
||||||
|
private Component label(int index) {
|
||||||
|
Component name = Component.translatable("item.rivencraft.link_property." + NAMES[index]);
|
||||||
|
return name.copy().append(selected(index,
|
||||||
|
menu.book().getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE)) ? ": On" : ": Off");
|
||||||
|
}
|
||||||
|
private void submitSeed() {
|
||||||
|
if (seedInput.visible && seedAge != null && !seedInput.getValue().equals(Long.toString(menu.seed())))
|
||||||
|
ClientPacketDistributor.sendToServer(new SetLinkModifierSeedPayload(menu.containerId, seedAge, seedInput.getValue()));
|
||||||
|
}
|
||||||
|
@Override public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
||||||
|
if (seedInput.isFocused() && !seedInput.isMouseOver(event.x(), event.y())) {
|
||||||
|
submitSeed();
|
||||||
|
seedInput.setFocused(false);
|
||||||
|
}
|
||||||
|
return super.mouseClicked(event, doubleClick);
|
||||||
|
}
|
||||||
|
@Override public boolean keyPressed(KeyEvent event) {
|
||||||
|
if (seedInput != null && seedInput.isFocused()) {
|
||||||
|
if (event.key() == InputConstants.KEY_RETURN || event.key() == InputConstants.KEY_NUMPADENTER) {
|
||||||
|
submitSeed();
|
||||||
|
seedInput.setFocused(false);
|
||||||
|
setFocused(null);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (!event.isEscape()) {
|
||||||
|
seedInput.keyPressed(event);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (titleInput != null && titleInput.isFocused() && !event.isEscape()) {
|
||||||
|
titleInput.keyPressed(event);
|
||||||
|
return true; // Character input must never activate inventory/hotbar shortcuts.
|
||||||
|
}
|
||||||
|
return super.keyPressed(event);
|
||||||
|
}
|
||||||
|
@Override public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
super.extractBackground(graphics, mouseX, mouseY, partialTick);
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean selected(int index, LinkProperties properties) {
|
||||||
|
if (index != 5) return properties.has(FLAGS[index]);
|
||||||
|
return menu.book().is(Rivencraft.LINKING_BOOK.get()) ? properties.has(LinkProperties.GENERATE_PLATFORM)
|
||||||
|
: !properties.has(LinkProperties.DISABLE_PLATFORM);
|
||||||
|
}
|
||||||
|
@Override protected void extractLabels(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
graphics.text(font, playerInventoryTitle, inventoryLabelX, inventoryLabelY, 0xFF404040, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,317 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import java.util.Locale;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.menu.NotebookMenu;
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
import net.minecraft.client.input.MouseButtonEvent;
|
||||||
|
import net.minecraft.client.input.KeyEvent;
|
||||||
|
import net.minecraft.client.renderer.RenderPipelines;
|
||||||
|
import net.minecraft.client.gui.components.Button;
|
||||||
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.inventory.ContainerInput;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
|
/** A page surface modelled on Legacy's folder GUI, backed by the Notebook menu. */
|
||||||
|
public final class NotebookScreen extends AbstractContainerScreen<NotebookMenu> {
|
||||||
|
private static final int SURFACE_TOP = 20;
|
||||||
|
private static final int SURFACE_BOTTOM = 132;
|
||||||
|
private static final int SURFACE_RIGHT = 156;
|
||||||
|
private static final int PAGE_WIDTH = 30;
|
||||||
|
private static final int PAGE_HEIGHT = 40;
|
||||||
|
private static final int PAGE_STEP_X = 31;
|
||||||
|
private static final int PAGE_STEP_Y = 41;
|
||||||
|
private static final int PAGE_COLUMNS = 5;
|
||||||
|
private static final Identifier PAGE_ATLAS = texture("gui/notebook_pages");
|
||||||
|
private EditBox textInput;
|
||||||
|
private boolean draggingScrollbar;
|
||||||
|
private boolean surfaceClickPendingRelease;
|
||||||
|
private int selectedSlot = -1;
|
||||||
|
private int scroll;
|
||||||
|
|
||||||
|
public NotebookScreen(NotebookMenu menu, Inventory inventory, Component title) {
|
||||||
|
super(menu, inventory, title, 176, 213);
|
||||||
|
inventoryLabelY = 123;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean isPauseScreen() { return false; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
super.init();
|
||||||
|
Button sortButton = Button.builder(Component.literal("AZ"), button -> {})
|
||||||
|
.bounds(leftPos, topPos, 18, 18).build();
|
||||||
|
Button allButton = Button.builder(Component.literal("ALL"), button -> {})
|
||||||
|
.bounds(leftPos + 20, topPos, 26, 18).build();
|
||||||
|
sortButton.active = false;
|
||||||
|
allButton.active = false;
|
||||||
|
addRenderableWidget(sortButton);
|
||||||
|
addRenderableWidget(allButton);
|
||||||
|
textInput = new EditBox(font, leftPos + 48, topPos, 128, 18,
|
||||||
|
Component.translatable("screen.rivencraft.notebook.search"));
|
||||||
|
textInput.setMaxLength(32);
|
||||||
|
textInput.setHint(Component.translatable("screen.rivencraft.notebook.search"));
|
||||||
|
textInput.setResponder(value -> scroll = 0);
|
||||||
|
addRenderableWidget(textInput);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
super.extractBackground(graphics, mouseX, mouseY, partialTick);
|
||||||
|
graphics.fill(leftPos, topPos + SURFACE_TOP, leftPos + SURFACE_RIGHT,
|
||||||
|
topPos + SURFACE_BOTTOM, 0xB0000000);
|
||||||
|
drawBeveledPanel(graphics, leftPos, topPos + 132, imageWidth, 81);
|
||||||
|
for (int row = 0; row < 3; row++) {
|
||||||
|
for (int column = 0; column < 9; column++) drawSlot(graphics, 7 + column * 18, 134 + row * 18);
|
||||||
|
}
|
||||||
|
for (int column = 0; column < 9; column++) drawSlot(graphics, 7 + column * 18, 192);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void extractContents(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
super.extractContents(graphics, mouseX, mouseY, partialTick);
|
||||||
|
int pageSlots = displayedPageSlots();
|
||||||
|
scroll = Math.min(scroll, maxScroll(pageSlots));
|
||||||
|
graphics.nextStratum();
|
||||||
|
graphics.enableScissor(leftPos, topPos + SURFACE_TOP, leftPos + SURFACE_RIGHT, topPos + SURFACE_BOTTOM);
|
||||||
|
for (int index = 0; index < pageSlots; index++) {
|
||||||
|
int x = leftPos + (index % PAGE_COLUMNS) * PAGE_STEP_X;
|
||||||
|
int y = topPos + SURFACE_TOP + (index / PAGE_COLUMNS) * PAGE_STEP_Y - scroll;
|
||||||
|
if (y + PAGE_HEIGHT > topPos + SURFACE_TOP && y < topPos + SURFACE_BOTTOM) drawPage(graphics, index, x, y);
|
||||||
|
}
|
||||||
|
graphics.disableScissor();
|
||||||
|
drawScrollbar(graphics, pageSlots);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void extractTooltip(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
int hovered = pageAt(mouseX, mouseY);
|
||||||
|
if (hovered >= 0 && menu.getCarried().isEmpty() && !menu.getSlot(hovered).getItem().isEmpty()) {
|
||||||
|
ItemStack page = menu.getSlot(hovered).getItem();
|
||||||
|
if (matchesSearch(page)) graphics.setTooltipForNextFrame(font, page, mouseX, mouseY);
|
||||||
|
} else super.extractTooltip(graphics, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void extractSlots(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
// Collection slots are drawn above as large pages. Do not submit up to
|
||||||
|
// 252 additional item models at their off-screen server-slot positions.
|
||||||
|
for (int index = NotebookMenu.NOTEBOOK_SLOTS; index < menu.slots.size(); index++) {
|
||||||
|
var slot = menu.getSlot(index);
|
||||||
|
if (slot.isActive()) extractSlot(graphics, slot, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void extractLabels(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
graphics.text(font, playerInventoryTitle, inventoryLabelX, inventoryLabelY, 0xFF404040, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
||||||
|
double mouseX = event.x(), mouseY = event.y();
|
||||||
|
int button = event.button();
|
||||||
|
if (inScrollbar(mouseX, mouseY) && button == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
|
draggingScrollbar = true;
|
||||||
|
setScrollFromMouse(mouseY, displayedPageSlots());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
int index = pageAt(mouseX, mouseY);
|
||||||
|
if (index >= 0 && (button == InputConstants.MOUSE_BUTTON_LEFT || button == InputConstants.MOUSE_BUTTON_RIGHT)) {
|
||||||
|
ItemStack page = menu.getSlot(index).getItem();
|
||||||
|
if ((!page.isEmpty() && !matchesSearch(page))
|
||||||
|
|| (page.isEmpty() && (!menu.getCarried().is(Rivencraft.PAGE.get())
|
||||||
|
|| PageItem.isLinkPanel(menu.getCarried())))) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
setFocused(null);
|
||||||
|
textInput.setFocused(false);
|
||||||
|
selectedSlot = index;
|
||||||
|
slotClicked(menu.getSlot(index), index, button == InputConstants.MOUSE_BUTTON_RIGHT ? 1 : 0, ContainerInput.PICKUP);
|
||||||
|
surfaceClickPendingRelease = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseClicked(event, doubleClick);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseDragged(MouseButtonEvent event, double dragX, double dragY) {
|
||||||
|
double mouseY = event.y();
|
||||||
|
int button = event.button();
|
||||||
|
if (draggingScrollbar && button == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
|
setScrollFromMouse(mouseY, displayedPageSlots());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseDragged(event, dragX, dragY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseReleased(MouseButtonEvent event) {
|
||||||
|
if (draggingScrollbar || surfaceClickPendingRelease) {
|
||||||
|
draggingScrollbar = false;
|
||||||
|
surfaceClickPendingRelease = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
draggingScrollbar = false;
|
||||||
|
return super.mouseReleased(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
|
||||||
|
if (inSurface(mouseX, mouseY) || inScrollbar(mouseX, mouseY)) {
|
||||||
|
scroll = Math.clamp(scroll - (int)Math.signum(scrollY) * 20,
|
||||||
|
0, maxScroll(displayedPageSlots()));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyPressed(KeyEvent event) {
|
||||||
|
// Let the container close normally, including returning its carried
|
||||||
|
// stack, even while the search field owns keyboard focus.
|
||||||
|
if (event.isEscape()) return super.keyPressed(event);
|
||||||
|
if (textInput != null && textInput.isFocused()) {
|
||||||
|
textInput.keyPressed(event);
|
||||||
|
// EditBox does not consume ordinary letter key presses; the matching charTyped
|
||||||
|
// event handles text input. Do not pass them to the container's inventory keys.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (selectedSlot >= 0 && (event.isLeft() || event.isRight())) {
|
||||||
|
moveSelected(event.isRight());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.keyPressed(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int displayedPageSlots() {
|
||||||
|
if (menu.getCarried().is(Rivencraft.PAGE.get())) {
|
||||||
|
return menu.pageCapacity();
|
||||||
|
}
|
||||||
|
for (int index = menu.pageCapacity() - 1; index >= 0; index--) {
|
||||||
|
if (!menu.getSlot(index).getItem().isEmpty()) {
|
||||||
|
return index + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean matchesSearch(ItemStack page) {
|
||||||
|
return textInput.getValue().isBlank()
|
||||||
|
|| page.getHoverName().getString().toLowerCase(Locale.ROOT)
|
||||||
|
.contains(textInput.getValue().toLowerCase(Locale.ROOT));
|
||||||
|
}
|
||||||
|
|
||||||
|
private int pageAt(double mouseX, double mouseY) {
|
||||||
|
if (!inSurface(mouseX, mouseY)) return -1;
|
||||||
|
int localX = (int)mouseX - leftPos;
|
||||||
|
int localY = (int)mouseY - topPos - SURFACE_TOP + scroll;
|
||||||
|
int column = localX / PAGE_STEP_X;
|
||||||
|
int index = (localY / PAGE_STEP_Y) * PAGE_COLUMNS + column;
|
||||||
|
return column < PAGE_COLUMNS && localX % PAGE_STEP_X < PAGE_WIDTH
|
||||||
|
&& localY % PAGE_STEP_Y < PAGE_HEIGHT && index < displayedPageSlots()
|
||||||
|
? index : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean inSurface(double mouseX, double mouseY) {
|
||||||
|
return mouseX >= leftPos && mouseX < leftPos + SURFACE_RIGHT
|
||||||
|
&& mouseY >= topPos + SURFACE_TOP && mouseY < topPos + SURFACE_BOTTOM;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean inScrollbar(double mouseX, double mouseY) {
|
||||||
|
return mouseX >= leftPos + SURFACE_RIGHT && mouseX < leftPos + imageWidth
|
||||||
|
&& mouseY >= topPos + SURFACE_TOP && mouseY < topPos + SURFACE_BOTTOM;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int maxScroll(int pageCount) {
|
||||||
|
int rows = (pageCount + PAGE_COLUMNS - 1) / PAGE_COLUMNS;
|
||||||
|
return Math.max(0, rows * PAGE_STEP_Y - (SURFACE_BOTTOM - SURFACE_TOP));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setScrollFromMouse(double mouseY, int pageCount) {
|
||||||
|
int maximum = maxScroll(pageCount);
|
||||||
|
double fraction = (mouseY - topPos - SURFACE_TOP - 10.0)
|
||||||
|
/ (SURFACE_BOTTOM - SURFACE_TOP - 20.0);
|
||||||
|
scroll = Math.clamp((int)(Math.clamp(fraction, 0.0, 1.0) * maximum), 0, maximum);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawScrollbar(GuiGraphicsExtractor graphics, int pageCount) {
|
||||||
|
int x = leftPos + SURFACE_RIGHT;
|
||||||
|
int y = topPos + SURFACE_TOP;
|
||||||
|
int height = SURFACE_BOTTOM - SURFACE_TOP;
|
||||||
|
graphics.fill(x, y, x + 20, y + height, 0xFF858585);
|
||||||
|
graphics.outline(x, y, 20, height, 0xFF262626);
|
||||||
|
for (int line = y + 5; line < y + height - 4; line += 5) {
|
||||||
|
graphics.fill(x + 4, line, x + 16, line + 1, 0xFFB7B7B7);
|
||||||
|
}
|
||||||
|
int maximum = maxScroll(pageCount);
|
||||||
|
int thumbY = y + 4 + (maximum == 0 ? 0 : scroll * (height - 23) / maximum);
|
||||||
|
graphics.fill(x + 4, thumbY, x + 16, thumbY + 15, 0xFFC9C9C9);
|
||||||
|
graphics.outline(x + 4, thumbY, 12, 15, 0xFF414141);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawPage(GuiGraphicsExtractor graphics, int index, int x, int y) {
|
||||||
|
ItemStack page = menu.getSlot(index).getItem();
|
||||||
|
boolean dimmed = page.isEmpty() || !matchesSearch(page);
|
||||||
|
// Legacy's Notebook draws the atlas' native 30x40 page, not a stretched item icon.
|
||||||
|
graphics.nextStratum();
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, PAGE_ATLAS, x, y, 156, 0, PAGE_WIDTH, PAGE_HEIGHT, 256, 256);
|
||||||
|
if (!page.isEmpty() && page.has(Rivencraft.SYMBOL_PAGE_ID.get())) {
|
||||||
|
graphics.nextStratum();
|
||||||
|
ItemStack glyph = page.copy();
|
||||||
|
glyph.set(Rivencraft.PAGE_GLYPH_ONLY.get(), true);
|
||||||
|
graphics.pose().pushMatrix();
|
||||||
|
graphics.pose().translate(x + 1, y + 6);
|
||||||
|
graphics.pose().scale(1.75F, 1.75F);
|
||||||
|
graphics.fakeItem(glyph, 0, 0);
|
||||||
|
graphics.pose().popMatrix();
|
||||||
|
graphics.nextStratum();
|
||||||
|
}
|
||||||
|
if (dimmed) {
|
||||||
|
graphics.fill(x, y, x + PAGE_WIDTH, y + PAGE_HEIGHT, 0xB8000000);
|
||||||
|
} else if (!net.dnorberg.rivencraft.writing.PortAuthoredWriting.isPageImplemented(
|
||||||
|
page.get(Rivencraft.SYMBOL_PAGE_ID.get()))) {
|
||||||
|
graphics.fill(x, y, x + PAGE_WIDTH, y + PAGE_HEIGHT, 0x55FF3333);
|
||||||
|
}
|
||||||
|
if (index == selectedSlot && !page.isEmpty()) {
|
||||||
|
graphics.outline(x, y, PAGE_WIDTH, PAGE_HEIGHT, 0xFFFFD061);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Identifier texture(String path) {
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/" + path + ".png");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void moveSelected(boolean next) {
|
||||||
|
int target = selectedSlot + (next ? 1 : -1);
|
||||||
|
if (selectedSlot < 0 || target < 0 || target >= NotebookMenu.NOTEBOOK_SLOTS
|
||||||
|
|| menu.getSlot(selectedSlot).getItem().isEmpty()) return;
|
||||||
|
int buttonId = (next ? NotebookMenu.MOVE_NEXT_BASE : NotebookMenu.MOVE_PREVIOUS_BASE) + selectedSlot;
|
||||||
|
if (menu.clickMenuButton(minecraft.player, buttonId)) {
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, buttonId);
|
||||||
|
selectedSlot = target;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void drawBeveledPanel(GuiGraphicsExtractor graphics, int x, int y, int width, int height) {
|
||||||
|
graphics.fill(x, y, x + width, y + height, 0xFFC6C6C6);
|
||||||
|
graphics.fill(x, y, x + width, y + 2, 0xFFFFFFFF);
|
||||||
|
graphics.fill(x, y, x + 2, y + height, 0xFFFFFFFF);
|
||||||
|
graphics.fill(x, y + height - 2, x + width, y + height, 0xFF555555);
|
||||||
|
graphics.fill(x + width - 2, y, x + width, y + height, 0xFF555555);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawSlot(GuiGraphicsExtractor graphics, int x, int y) {
|
||||||
|
graphics.fill(leftPos + x, topPos + y, leftPos + x + 18, topPos + y + 18, 0xFF8B8B8B);
|
||||||
|
graphics.fill(leftPos + x, topPos + y, leftPos + x + 18, topPos + y + 1, 0xFF373737);
|
||||||
|
graphics.fill(leftPos + x, topPos + y, leftPos + x + 1, topPos + y + 18, 0xFF373737);
|
||||||
|
graphics.fill(leftPos + x + 17, topPos + y, leftPos + x + 18, topPos + y + 18, 0xFFFFFFFF);
|
||||||
|
graphics.fill(leftPos + x, topPos + y + 17, leftPos + x + 18, topPos + y + 18, 0xFFFFFFFF);
|
||||||
|
}
|
||||||
|
}
|
||||||
+22
@@ -18,12 +18,34 @@ public final class PortBookBinderClientEvents {
|
|||||||
public static void registerBlockEntityRenderers(
|
public static void registerBlockEntityRenderers(
|
||||||
net.neoforged.neoforge.client.event.EntityRenderersEvent.RegisterRenderers event) {
|
net.neoforged.neoforge.client.event.EntityRenderersEvent.RegisterRenderers event) {
|
||||||
event.registerBlockEntityRenderer(Rivencraft.STAR_FISSURE_BLOCK_ENTITY.get(), context -> new StarFissureRenderer());
|
event.registerBlockEntityRenderer(Rivencraft.STAR_FISSURE_BLOCK_ENTITY.get(), context -> new StarFissureRenderer());
|
||||||
|
event.registerEntityRenderer(Rivencraft.DROPPED_BOOK.get(), DroppedBookRenderer::new);
|
||||||
|
event.registerBlockEntityRenderer(Rivencraft.WRITING_DESK_BLOCK_ENTITY.get(), WritingDeskRenderer::new);
|
||||||
|
event.registerBlockEntityRenderer(Rivencraft.BOOK_STAND_BLOCK_ENTITY.get(), BookStandRenderer::new);
|
||||||
|
event.registerBlockEntityRenderer(Rivencraft.BOOK_RECEPTACLE_BLOCK_ENTITY.get(), BookReceptacleRenderer::new);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void portalTint(net.neoforged.neoforge.client.event.RegisterColorHandlersEvent.BlockTintSources event) {
|
||||||
|
event.register(java.util.List.of(new net.minecraft.client.color.block.BlockTintSource() {
|
||||||
|
@Override public int color(net.minecraft.world.level.block.state.BlockState state) { return 0xffffffff; }
|
||||||
|
@Override public int colorInWorld(net.minecraft.world.level.block.state.BlockState state,
|
||||||
|
net.minecraft.client.renderer.block.BlockAndTintGetter level, net.minecraft.core.BlockPos pos) {
|
||||||
|
if (level.getBlockEntity(pos) instanceof net.dnorberg.rivencraft.block.entity.CrystalPortalBlockEntity portal
|
||||||
|
&& portal.receptacle() != null
|
||||||
|
&& level.getBlockEntity(portal.receptacle()) instanceof net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity holder)
|
||||||
|
return 0xff000000 | holder.skyColor();
|
||||||
|
return 0xffffffff;
|
||||||
|
}
|
||||||
|
}), Rivencraft.CRYSTAL_PORTAL.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void registerScreens(RegisterMenuScreensEvent event) {
|
public static void registerScreens(RegisterMenuScreensEvent event) {
|
||||||
event.register(Rivencraft.BOOK_BINDER_MENU.get(), PortBookBinderScreen::new);
|
event.register(Rivencraft.BOOK_BINDER_MENU.get(), PortBookBinderScreen::new);
|
||||||
event.register(Rivencraft.INK_MIXER_MENU.get(), InkMixerScreen::new);
|
event.register(Rivencraft.INK_MIXER_MENU.get(), InkMixerScreen::new);
|
||||||
|
event.register(Rivencraft.LINK_MODIFIER_MENU.get(), LinkModifierScreen::new);
|
||||||
|
event.register(Rivencraft.NOTEBOOK_MENU.get(), NotebookScreen::new);
|
||||||
|
event.register(Rivencraft.WRITING_DESK_MENU.get(), WritingDeskScreen::new);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
|
|||||||
+15
@@ -26,4 +26,19 @@ public final class PortBookInteractionHandler {
|
|||||||
? new PortLinkingBookScreen(event.getHand(), event.getItemStack().copy())
|
? new PortLinkingBookScreen(event.getHand(), event.getItemStack().copy())
|
||||||
: new PortDescriptiveBookScreen(event.getHand(), event.getItemStack().copy()));
|
: new PortDescriptiveBookScreen(event.getHand(), event.getItemStack().copy()));
|
||||||
}
|
}
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
|
||||||
|
if (!event.getLevel().isClientSide() || event.getEntity().isShiftKeyDown()
|
||||||
|
|| !event.getItemStack().isEmpty()
|
||||||
|
|| !(event.getLevel().getBlockEntity(event.getPos()) instanceof net.dnorberg.rivencraft.block.entity.BookStandBlockEntity stand)) return;
|
||||||
|
var book = stand.getBook();
|
||||||
|
if (!book.is(Rivencraft.LINKING_BOOK.get()) && !book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) return;
|
||||||
|
event.setCanceled(true);
|
||||||
|
event.setCancellationResult(InteractionResult.SUCCESS);
|
||||||
|
var source = new net.dnorberg.rivencraft.network.UseBookStandPayload(
|
||||||
|
event.getLevel().dimension().identifier(), event.getPos(), book.copy());
|
||||||
|
Minecraft.getInstance().setScreenAndShow(book.is(Rivencraft.LINKING_BOOK.get())
|
||||||
|
? new PortLinkingBookScreen(source) : new PortDescriptiveBookScreen(source));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+88
-36
@@ -10,81 +10,111 @@ import net.minecraft.client.gui.components.Button;
|
|||||||
import net.minecraft.client.gui.components.EditBox;
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
import net.minecraft.client.input.MouseButtonEvent;
|
import net.minecraft.client.input.MouseButtonEvent;
|
||||||
import net.minecraft.client.renderer.RenderPipelines;
|
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.resources.Identifier;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
import net.minecraft.world.InteractionHand;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
||||||
|
|
||||||
/** Temporary 26.3 descriptive-book interaction; authored pages and live previews remain unported. */
|
/** Legacy book layout and authored glyph pages; destination rendering remains a port placeholder. */
|
||||||
public final class PortDescriptiveBookScreen extends Screen {
|
public final class PortDescriptiveBookScreen extends Screen {
|
||||||
private static final int WIDTH = 327;
|
private static final int WIDTH = 327;
|
||||||
private static final int HEIGHT = 199;
|
private static final int HEIGHT = 199;
|
||||||
private static final int TEXT_COLOR = 0xFF3B281B;
|
private static final int TEXT_COLOR = 0xFF3B281B;
|
||||||
private static final Identifier COVER = texture("bookui_cover.png");
|
|
||||||
private static final Identifier LEFT_PAGE = texture("notebook_pages.png");
|
|
||||||
private static final Identifier RIGHT_PANEL = texture("bookui_pager.png");
|
|
||||||
|
|
||||||
private final InteractionHand hand;
|
private final InteractionHand hand;
|
||||||
private final boolean bound;
|
private final boolean bound;
|
||||||
|
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel();
|
||||||
|
private final net.dnorberg.rivencraft.writing.DescriptiveBookPages pages;
|
||||||
|
private int pageIndex;
|
||||||
|
private net.dnorberg.rivencraft.network.UseBookStandPayload standSource;
|
||||||
private EditBox titleInput;
|
private EditBox titleInput;
|
||||||
|
|
||||||
public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) {
|
public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) {
|
||||||
super(book.getHoverName());
|
super(book.getHoverName());
|
||||||
this.hand = hand;
|
this.hand = hand;
|
||||||
|
pages = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(book);
|
||||||
bound = book.has(Rivencraft.AGE_BOOK_ID.get());
|
bound = book.has(Rivencraft.AGE_BOOK_ID.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public PortDescriptiveBookScreen(net.dnorberg.rivencraft.network.UseBookStandPayload source) {
|
||||||
|
this(InteractionHand.MAIN_HAND, source.book());
|
||||||
|
standSource = source;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
if (bound) return;
|
if (bound || standSource != null) return;
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
|
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
|
||||||
Component.literal("Age name"));
|
Component.literal("Age name"));
|
||||||
titleInput.setMaxLength(PortBookNetworking.MAX_BOOK_TITLE_LENGTH);
|
titleInput.setMaxLength(PortBookNetworking.MAX_BOOK_TITLE_LENGTH);
|
||||||
titleInput.setHint(Component.literal("Name this Age"));
|
titleInput.setHint(Component.literal(standSource == null ? "Name this Age" : "Remove book to bind"));
|
||||||
addRenderableWidget(titleInput);
|
addRenderableWidget(titleInput);
|
||||||
setInitialFocus(titleInput);
|
setInitialFocus(titleInput);
|
||||||
addRenderableWidget(Button.builder(Component.literal("Bind"), button -> bind())
|
addRenderableWidget(Button.builder(Component.literal("Bind"), button -> bind())
|
||||||
.bounds(left + 40, top + 100, 53, 20).build());
|
.bounds(left + 40, top + 100, 53, 20).build());
|
||||||
addRenderableWidget(Button.builder(Component.literal("Cancel"), button -> onClose())
|
addRenderableWidget(Button.builder(Component.literal("Cancel"), button -> onClose())
|
||||||
.bounds(left + 97, top + 100, 53, 20).build());
|
.bounds(left + 97, top + 100, 53, 20).build());
|
||||||
|
updatePageControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
blit(graphics, COVER, left, top + 7, 34, 192, 152, 0);
|
PortLegacyBookArtwork.drawCover(graphics, left, top, true);
|
||||||
blit(graphics, COVER, left + 34, top + 7, 103, 192, 49, 0);
|
if (pageIndex > 0) PortLegacyBookArtwork.drawLeftPage(graphics, left, top);
|
||||||
blit(graphics, COVER, left + 137, top + 7, 4, 192, 45, 0);
|
if (pageIndex == 0) {
|
||||||
blit(graphics, COVER, left + 141, top + 7, 186, 192, 0, 0);
|
if (bound) {
|
||||||
blit(graphics, LEFT_PAGE, left + 7, top, 156, 195, 0, 0);
|
graphics.nextStratum();
|
||||||
blit(graphics, RIGHT_PANEL, left + 163, top, 156, 195, 0, 0);
|
linkPanel.render(graphics, left, top, partialTick);
|
||||||
graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false);
|
graphics.nextStratum();
|
||||||
if (bound) {
|
}
|
||||||
graphics.fill(left + 173, top + 20, left + 305, top + 103, 0xFF15141D);
|
PortLegacyBookArtwork.drawPanelPage(graphics, left, top);
|
||||||
graphics.text(font, Component.literal("Age preview unavailable"), left + 181, top + 47,
|
if (bound) {
|
||||||
0xFFE9DFCB, false);
|
graphics.enableScissor(left + 38, top + 38, left + 154, top + 174);
|
||||||
graphics.text(font, Component.literal("Click to enter"), left + 205, top + 65,
|
int textY = PortLegacyBookArtwork.drawText(graphics, font, title, left + 40, top + 40, 110, TEXT_COLOR);
|
||||||
0xFFE9DFCB, false);
|
Component author = pages.author().isBlank()
|
||||||
} else {
|
? Component.translatable("screen.rivencraft.age.unknown_author") : Component.literal(pages.author());
|
||||||
graphics.text(font, Component.literal("Bind a prototype Age"), left + 183, top + 39,
|
PortLegacyBookArtwork.drawText(graphics, font, author, left + 50, textY + 2, 100, TEXT_COLOR);
|
||||||
TEXT_COLOR, false);
|
graphics.disableScissor();
|
||||||
|
} else {
|
||||||
|
graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false);
|
||||||
|
graphics.text(font, Component.literal(standSource == null ? "Bind a prototype Age" : "Remove book to bind"),
|
||||||
|
left + 183, top + 39, TEXT_COLOR, false);
|
||||||
|
}
|
||||||
|
} else if (pages.symbolAt(pageIndex).isPresent()) {
|
||||||
|
PortLegacyBookArtwork.drawFullPage(graphics, left, top);
|
||||||
|
graphics.nextStratum();
|
||||||
|
var symbol = pages.symbolAt(pageIndex).orElseThrow();
|
||||||
|
ItemStack glyph = new ItemStack(Rivencraft.PAGE.get());
|
||||||
|
glyph.set(Rivencraft.SYMBOL_PAGE_ID.get(), symbol);
|
||||||
|
glyph.set(Rivencraft.PAGE_GLYPH_ONLY.get(), true);
|
||||||
|
graphics.enableScissor(left + 174, top + 26, left + 306, top + 172);
|
||||||
|
graphics.pose().pushMatrix();
|
||||||
|
graphics.pose().translate(left + 177, top + 29);
|
||||||
|
graphics.pose().scale(8.0F, 8.0F);
|
||||||
|
graphics.fakeItem(glyph, 0, 0);
|
||||||
|
graphics.pose().popMatrix();
|
||||||
|
graphics.disableScissor();
|
||||||
}
|
}
|
||||||
|
graphics.nextStratum();
|
||||||
|
PortLegacyBookArtwork.drawCounter(graphics, font, left, top, pageIndex, pages.lastPage());
|
||||||
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
|
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
||||||
if (bound && event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
|
if (event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
if (event.x() >= left + 173 && event.x() < left + 305
|
int direction = PortLegacyBookArtwork.turnDirection(event.x() - left, event.y() - top, pageIndex, pages.lastPage());
|
||||||
&& event.y() >= top + 20 && event.y() < top + 103) {
|
if (direction != 0) { turnPage(direction); return true; }
|
||||||
ClientPacketDistributor.sendToServer(new UseDescriptiveBookPayload(hand == InteractionHand.OFF_HAND));
|
if (bound && pageIndex == 0 && PortLegacyLinkPanel.contains(event.x() - left, event.y() - top)) {
|
||||||
|
if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||||
|
else ClientPacketDistributor.sendToServer(new UseDescriptiveBookPayload(hand == InteractionHand.OFF_HAND));
|
||||||
onClose();
|
onClose();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -92,6 +122,36 @@ public final class PortDescriptiveBookScreen extends Screen {
|
|||||||
return super.mouseClicked(event, doubleClick);
|
return super.mouseClicked(event, doubleClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void turnPage(int direction) {
|
||||||
|
int next = pages.turn(pageIndex, direction);
|
||||||
|
if (next == pageIndex) return;
|
||||||
|
pageIndex = next;
|
||||||
|
minecraft.getSoundManager().play(net.minecraft.client.resources.sounds.SimpleSoundInstance.forUI(
|
||||||
|
net.minecraft.sounds.SoundEvents.BOOK_PAGE_TURN, 1.0F, 0.65F));
|
||||||
|
updatePageControls();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePageControls() {
|
||||||
|
for (var widget : renderables) if (widget instanceof net.minecraft.client.gui.components.AbstractWidget control)
|
||||||
|
control.visible = pageIndex == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean keyPressed(net.minecraft.client.input.KeyEvent event) {
|
||||||
|
if (event.isEscape()) return super.keyPressed(event);
|
||||||
|
if (titleInput == null || !titleInput.isFocused() || !titleInput.visible) {
|
||||||
|
if (event.isLeft()) { turnPage(-1); return true; }
|
||||||
|
if (event.isRight()) { turnPage(1); return true; }
|
||||||
|
} else {
|
||||||
|
// Keep inventory/hotbar actions out of a focused name field.
|
||||||
|
return titleInput.keyPressed(event);
|
||||||
|
}
|
||||||
|
return super.keyPressed(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void tick() {
|
||||||
|
if (bound) linkPanel.tick();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPauseScreen() {
|
public boolean isPauseScreen() {
|
||||||
return false;
|
return false;
|
||||||
@@ -105,12 +165,4 @@ public final class PortDescriptiveBookScreen extends Screen {
|
|||||||
onClose();
|
onClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Identifier texture(String filename) {
|
|
||||||
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/gui/" + filename);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void blit(GuiGraphicsExtractor graphics, Identifier texture, int x, int y,
|
|
||||||
int width, int height, int u, int v) {
|
|
||||||
graphics.blit(RenderPipelines.GUI_TEXTURED, texture, x, y, u, v, width, height, 256, 256);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
import net.minecraft.client.renderer.RenderPipelines;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
|
||||||
|
/** Original Mystcraft Legacy book atlases and page composition (LGPL-3.0,
|
||||||
|
* copyright XCompWiz, revision 9bc8ddc061845df0cd5ea47f4fdef773cff786ae). */
|
||||||
|
final class PortLegacyBookArtwork {
|
||||||
|
private static final int ATLAS_SIZE = 256;
|
||||||
|
private static final Identifier COVER = texture("bookui_cover.png");
|
||||||
|
private static final Identifier LEFT_PAGE = texture("notebook_pages.png");
|
||||||
|
private static final Identifier RIGHT_PANEL = texture("bookui_pager.png");
|
||||||
|
private static final Identifier RIGHT_FULL = texture("bookui_rpage_full.png");
|
||||||
|
|
||||||
|
private PortLegacyBookArtwork() {}
|
||||||
|
|
||||||
|
static void drawCover(GuiGraphicsExtractor graphics, int left, int top, boolean gilded) {
|
||||||
|
blit(graphics, COVER, left, top + 7, 34, 192, 152, 0);
|
||||||
|
blit(graphics, COVER, left + 34, top + 7, 103, 192, 49, 0);
|
||||||
|
blit(graphics, COVER, left + 137, top + 7, 4, 192, 45, 0);
|
||||||
|
blit(graphics, COVER, left + 141, top + 7, 186, 192, 0, 0);
|
||||||
|
if (gilded) {
|
||||||
|
blit(graphics, COVER, left, top + 7, 34, 192, 186, 0);
|
||||||
|
blit(graphics, COVER, left + 293, top + 7, 34, 192, 186, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawLeftPage(GuiGraphicsExtractor graphics, int left, int top) {
|
||||||
|
blit(graphics, LEFT_PAGE, left + 7, top, 156, 195, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawPanelPage(GuiGraphicsExtractor graphics, int left, int top) {
|
||||||
|
blit(graphics, RIGHT_PANEL, left + 163, top, 156, 195, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawFullPage(GuiGraphicsExtractor graphics, int left, int top) {
|
||||||
|
blit(graphics, RIGHT_FULL, left + 163, top, 156, 195, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int drawText(GuiGraphicsExtractor graphics, net.minecraft.client.gui.Font font,
|
||||||
|
net.minecraft.network.chat.Component text, int x, int y, int width, int color) {
|
||||||
|
for (var line : font.split(text, width)) {
|
||||||
|
graphics.text(font, line, x, y, color, false);
|
||||||
|
y += font.lineHeight;
|
||||||
|
}
|
||||||
|
return y;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void drawCounter(GuiGraphicsExtractor graphics, net.minecraft.client.gui.Font font,
|
||||||
|
int left, int top, int page, int last) {
|
||||||
|
String counter = page + "/" + last;
|
||||||
|
graphics.text(font, counter, left + 165 - font.width(counter) / 2, top + 185, 0xFF000000, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int turnDirection(double x, double y, int page, int last) {
|
||||||
|
if (y < 164 || y >= 195) return 0;
|
||||||
|
if (page > 0 && x >= 7 && x < 35) return -1;
|
||||||
|
return page < last && x >= 293 && x < 320 ? 1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Identifier texture(String filename) {
|
||||||
|
return Identifier.fromNamespaceAndPath("rivencraft", "textures/gui/" + filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void blit(GuiGraphicsExtractor graphics, Identifier texture, int x, int y,
|
||||||
|
int width, int height, int u, int v) {
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, texture, x, y, u, v, width, height, ATLAS_SIZE, ATLAS_SIZE);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Built-in linking-panel animation inspired by Mystcraft Legacy's portal bloom.
|
||||||
|
*
|
||||||
|
* <p>The original effect used a GLSL noise shader over an optional live world
|
||||||
|
* view. This port retains the 1.21.1 fallback's two noisy spirals and default teal
|
||||||
|
* tint, using the normal GUI API without a renderer mod.</p>
|
||||||
|
*/
|
||||||
|
final class PortLegacyLinkPanel {
|
||||||
|
static final int X = 173, Y = 20, WIDTH = 132, HEIGHT = 83;
|
||||||
|
private static final int CELL_SIZE = 3;
|
||||||
|
private static final int BORDER_COLOR = 0xFF7B6AA8;
|
||||||
|
private int ticks;
|
||||||
|
private static final int LINK_COLOR = 0xFF006666;
|
||||||
|
|
||||||
|
static boolean contains(double x, double y) {
|
||||||
|
return x >= X && x < X + WIDTH && y >= Y && y < Y + HEIGHT;
|
||||||
|
}
|
||||||
|
|
||||||
|
void render(GuiGraphicsExtractor graphics, int bookLeft, int bookTop, float partialTick) {
|
||||||
|
render(graphics, bookLeft + X, bookTop + Y, WIDTH, HEIGHT, partialTick);
|
||||||
|
}
|
||||||
|
|
||||||
|
void tick() {
|
||||||
|
ticks++;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void render(GuiGraphicsExtractor graphics, int left, int top, int width, int height, float partialTick) {
|
||||||
|
graphics.fill(left, top, left + width, top + height, 0xFF000011);
|
||||||
|
|
||||||
|
float time = (ticks + partialTick) * 0.035F;
|
||||||
|
float reveal = Math.min(1.0F, time / 1.8F);
|
||||||
|
for (int y = 1; y < height - 1; y += CELL_SIZE) {
|
||||||
|
for (int x = 1; x < width - 1; x += CELL_SIZE) {
|
||||||
|
float normalizedX = (x - width * 0.5F) / height;
|
||||||
|
float normalizedY = (y - height * 0.5F) / height;
|
||||||
|
float first = spiral(normalizedX, normalizedY, time, 0.0F);
|
||||||
|
float second = spiral(normalizedX, normalizedY, time, 2.35F);
|
||||||
|
float intensity = Math.max(first, second) * reveal;
|
||||||
|
if (intensity <= 0.035F) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int color = scaledColor(LINK_COLOR, Math.min(1.0F, 0.12F + intensity));
|
||||||
|
graphics.fill(left + x, top + y,
|
||||||
|
left + Math.min(width - 1, x + CELL_SIZE),
|
||||||
|
top + Math.min(height - 1, y + CELL_SIZE), color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
graphics.outline(left, top, width, height, BORDER_COLOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float spiral(float x, float y, float time, float phase) {
|
||||||
|
float distance = (float)Math.sqrt(x * x + y * y);
|
||||||
|
float angle = (float)Math.atan2(y, x);
|
||||||
|
float arm = 0.5F + 0.5F * (float)Math.cos(angle * 3.0F - distance * 25.0F + time * 4.0F + phase);
|
||||||
|
float pulse = 0.72F + 0.28F * noise(x * 31.0F, y * 31.0F, time + phase);
|
||||||
|
float core = Math.max(0.0F, 1.0F - distance * 2.15F);
|
||||||
|
return core * (0.28F + arm * 0.72F) * pulse;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float noise(float x, float y, float time) {
|
||||||
|
double value = Math.sin(x * 12.9898D + y * 78.233D + time * 19.19D) * 43758.5453D;
|
||||||
|
return (float)(value - Math.floor(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int scaledColor(int color, float scale) {
|
||||||
|
int red = Math.min(255, Math.round(((color >> 16) & 0xFF) * scale + 18.0F * scale));
|
||||||
|
int green = Math.min(255, Math.round(((color >> 8) & 0xFF) * scale + 24.0F * scale));
|
||||||
|
int blue = Math.min(255, Math.round((color & 0xFF) * scale + 42.0F * scale));
|
||||||
|
return 0xFF000000 | red << 16 | green << 8 | blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
+82
-33
@@ -10,35 +10,48 @@ import net.minecraft.client.gui.components.Button;
|
|||||||
import net.minecraft.client.gui.components.EditBox;
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
import net.minecraft.client.gui.screens.Screen;
|
import net.minecraft.client.gui.screens.Screen;
|
||||||
import net.minecraft.client.input.MouseButtonEvent;
|
import net.minecraft.client.input.MouseButtonEvent;
|
||||||
import net.minecraft.client.renderer.RenderPipelines;
|
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.resources.Identifier;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
import net.minecraft.world.InteractionHand;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
|
||||||
|
|
||||||
/** Minimal 26.3 book interaction using the Legacy artwork; live preview is not ported yet. */
|
/** Legacy Linking Book front and final spreads with the shared fallback panel. */
|
||||||
public final class PortLinkingBookScreen extends Screen {
|
public final class PortLinkingBookScreen extends Screen {
|
||||||
private static final int WIDTH = 327;
|
private static final int WIDTH = 327;
|
||||||
private static final int HEIGHT = 199;
|
private static final int HEIGHT = 199;
|
||||||
private static final int TEXT_COLOR = 0xFF3B281B;
|
private static final int TEXT_COLOR = 0xFF3B281B;
|
||||||
private static final Identifier COVER = texture("bookui_cover.png");
|
|
||||||
private static final Identifier LEFT_PAGE = texture("notebook_pages.png");
|
|
||||||
private static final Identifier RIGHT_PANEL = texture("bookui_pager.png");
|
|
||||||
|
|
||||||
private final InteractionHand hand;
|
private final InteractionHand hand;
|
||||||
private final boolean bound;
|
private final boolean bound;
|
||||||
|
private final net.dnorberg.rivencraft.item.LinkBookTarget target;
|
||||||
|
private final boolean returnLink;
|
||||||
|
private final Component destination;
|
||||||
|
private int pageIndex;
|
||||||
|
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel();
|
||||||
|
private net.dnorberg.rivencraft.network.UseBookStandPayload standSource;
|
||||||
private EditBox titleInput;
|
private EditBox titleInput;
|
||||||
|
|
||||||
public PortLinkingBookScreen(InteractionHand hand, ItemStack book) {
|
public PortLinkingBookScreen(InteractionHand hand, ItemStack book) {
|
||||||
super(book.getHoverName());
|
super(book.getHoverName());
|
||||||
this.hand = hand;
|
this.hand = hand;
|
||||||
bound = book.has(Rivencraft.LINK_BOOK_TARGET.get());
|
target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
|
||||||
|
bound = target != null;
|
||||||
|
destination = bound ? net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(book, target) : Component.empty();
|
||||||
|
Component customName = book.get(net.minecraft.core.component.DataComponents.CUSTOM_NAME);
|
||||||
|
returnLink = customName != null
|
||||||
|
&& customName.getContents() instanceof net.minecraft.network.chat.contents.TranslatableContents translated
|
||||||
|
&& translated.getKey().equals("item.rivencraft.linking_book.return");
|
||||||
|
}
|
||||||
|
|
||||||
|
public PortLinkingBookScreen(net.dnorberg.rivencraft.network.UseBookStandPayload source) {
|
||||||
|
this(InteractionHand.MAIN_HAND, source.book());
|
||||||
|
standSource = source;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
if (bound) return;
|
if (bound || standSource != null) return;
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
|
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
|
||||||
@@ -51,38 +64,55 @@ public final class PortLinkingBookScreen extends Screen {
|
|||||||
.bounds(left + 40, top + 100, 53, 20).build());
|
.bounds(left + 40, top + 100, 53, 20).build());
|
||||||
addRenderableWidget(Button.builder(Component.literal("Cancel"), button -> onClose())
|
addRenderableWidget(Button.builder(Component.literal("Cancel"), button -> onClose())
|
||||||
.bounds(left + 97, top + 100, 53, 20).build());
|
.bounds(left + 97, top + 100, 53, 20).build());
|
||||||
|
updatePageControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
blit(graphics, COVER, left, top + 7, 34, 192, 152, 0);
|
PortLegacyBookArtwork.drawCover(graphics, left, top, false);
|
||||||
blit(graphics, COVER, left + 34, top + 7, 103, 192, 49, 0);
|
if (pageIndex > 0) {
|
||||||
blit(graphics, COVER, left + 137, top + 7, 4, 192, 45, 0);
|
PortLegacyBookArtwork.drawLeftPage(graphics, left, top);
|
||||||
blit(graphics, COVER, left + 141, top + 7, 186, 192, 0, 0);
|
|
||||||
if (bound) blit(graphics, LEFT_PAGE, left + 7, top, 156, 195, 0, 0);
|
|
||||||
blit(graphics, RIGHT_PANEL, left + 163, top, 156, 195, 0, 0);
|
|
||||||
graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false);
|
|
||||||
if (bound) {
|
|
||||||
graphics.fill(left + 173, top + 20, left + 305, top + 103, 0xFF15141D);
|
|
||||||
graphics.text(font, Component.literal("Destination preview"), left + 185, top + 47, 0xFFE9DFCB, false);
|
|
||||||
graphics.text(font, Component.literal("Click to link"), left + 205, top + 65, 0xFFE9DFCB, false);
|
|
||||||
} else {
|
} else {
|
||||||
graphics.text(font, Component.literal("Name this Linking Book"), left + 183, top + 39,
|
if (bound) {
|
||||||
TEXT_COLOR, false);
|
graphics.nextStratum();
|
||||||
|
linkPanel.render(graphics, left, top, partialTick);
|
||||||
|
graphics.nextStratum();
|
||||||
|
}
|
||||||
|
PortLegacyBookArtwork.drawPanelPage(graphics, left, top);
|
||||||
|
graphics.enableScissor(left + 38, top + 38, left + 154, top + 174);
|
||||||
|
if (bound) {
|
||||||
|
int y = top + 40;
|
||||||
|
if (!returnLink) y = PortLegacyBookArtwork.drawText(graphics, font, title,
|
||||||
|
left + 40, y, 110, TEXT_COLOR) + 4;
|
||||||
|
y = PortLegacyBookArtwork.drawText(graphics, font, destination, left + 50, y, 100, TEXT_COLOR) + 10;
|
||||||
|
var pos = net.minecraft.core.BlockPos.containing(target.x(), target.y(), target.z());
|
||||||
|
PortLegacyBookArtwork.drawText(graphics, font,
|
||||||
|
Component.literal(pos.getX() + ", " + pos.getY() + ", " + pos.getZ()),
|
||||||
|
left + 40, y, 110, TEXT_COLOR);
|
||||||
|
} else {
|
||||||
|
PortLegacyBookArtwork.drawText(graphics, font, Component.literal(
|
||||||
|
standSource == null ? "Name this Linking Book" : "Remove book to bind"),
|
||||||
|
left + 40, top + 43, 110, TEXT_COLOR);
|
||||||
|
}
|
||||||
|
graphics.disableScissor();
|
||||||
}
|
}
|
||||||
|
graphics.nextStratum();
|
||||||
|
PortLegacyBookArtwork.drawCounter(graphics, font, left, top, pageIndex, 1);
|
||||||
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
|
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
||||||
if (bound && event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
|
if (event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
int left = (width - WIDTH) / 2;
|
int left = (width - WIDTH) / 2;
|
||||||
int top = (height - HEIGHT) / 2;
|
int top = (height - HEIGHT) / 2;
|
||||||
if (event.x() >= left + 173 && event.x() < left + 305
|
int direction = PortLegacyBookArtwork.turnDirection(event.x() - left, event.y() - top, pageIndex, 1);
|
||||||
&& event.y() >= top + 20 && event.y() < top + 103) {
|
if (direction != 0) { turnPage(direction); return true; }
|
||||||
ClientPacketDistributor.sendToServer(new UseLinkingBookPayload(hand == InteractionHand.OFF_HAND));
|
if (bound && pageIndex == 0 && PortLegacyLinkPanel.contains(event.x() - left, event.y() - top)) {
|
||||||
|
if (standSource != null) ClientPacketDistributor.sendToServer(standSource);
|
||||||
|
else ClientPacketDistributor.sendToServer(new UseLinkingBookPayload(hand == InteractionHand.OFF_HAND));
|
||||||
onClose();
|
onClose();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -90,6 +120,33 @@ public final class PortLinkingBookScreen extends Screen {
|
|||||||
return super.mouseClicked(event, doubleClick);
|
return super.mouseClicked(event, doubleClick);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void turnPage(int direction) {
|
||||||
|
int next = Math.clamp(pageIndex + direction, 0, 1);
|
||||||
|
if (next == pageIndex) return;
|
||||||
|
pageIndex = next;
|
||||||
|
minecraft.getSoundManager().play(net.minecraft.client.resources.sounds.SimpleSoundInstance.forUI(
|
||||||
|
net.minecraft.sounds.SoundEvents.BOOK_PAGE_TURN, 1.0F, 0.65F));
|
||||||
|
updatePageControls();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updatePageControls() {
|
||||||
|
for (var widget : renderables) if (widget instanceof net.minecraft.client.gui.components.AbstractWidget control)
|
||||||
|
control.visible = pageIndex == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean keyPressed(net.minecraft.client.input.KeyEvent event) {
|
||||||
|
if (event.isEscape()) return super.keyPressed(event);
|
||||||
|
if (titleInput == null || !titleInput.isFocused() || !titleInput.visible) {
|
||||||
|
if (event.isLeft()) { turnPage(-1); return true; }
|
||||||
|
if (event.isRight()) { turnPage(1); return true; }
|
||||||
|
} else return titleInput.keyPressed(event);
|
||||||
|
return super.keyPressed(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void tick() {
|
||||||
|
if (bound) linkPanel.tick();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isPauseScreen() {
|
public boolean isPauseScreen() {
|
||||||
return false;
|
return false;
|
||||||
@@ -103,12 +160,4 @@ public final class PortLinkingBookScreen extends Screen {
|
|||||||
onClose();
|
onClose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Identifier texture(String filename) {
|
|
||||||
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/gui/" + filename);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void blit(GuiGraphicsExtractor graphics, Identifier texture, int x, int y,
|
|
||||||
int width, int height, int u, int v) {
|
|
||||||
graphics.blit(RenderPipelines.GUI_TEXTURED, texture, x, y, u, v, width, height, 256, 256);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.vertex.PoseStack;
|
||||||
|
import com.mojang.math.Axis;
|
||||||
|
import net.dnorberg.rivencraft.block.WritingDeskBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||||
|
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
|
||||||
|
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
|
||||||
|
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
|
||||||
|
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
|
||||||
|
import net.minecraft.client.renderer.item.ItemModelResolver;
|
||||||
|
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||||
|
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||||
|
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||||
|
import net.minecraft.world.item.ItemDisplayContext;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** The existing selected-page and white-paper display, extracted for 26.3. */
|
||||||
|
public final class WritingDeskRenderer implements BlockEntityRenderer<WritingDeskBlockEntity, WritingDeskRenderer.State> {
|
||||||
|
private final ItemModelResolver resolver;
|
||||||
|
public WritingDeskRenderer(BlockEntityRendererProvider.Context context) { resolver = context.itemModelResolver(); }
|
||||||
|
public static final class State extends BlockEntityRenderState {
|
||||||
|
final ItemStackRenderState paper = new ItemStackRenderState();
|
||||||
|
final ItemStackRenderState page = new ItemStackRenderState();
|
||||||
|
int layers;
|
||||||
|
float rotation;
|
||||||
|
}
|
||||||
|
@Override public State createRenderState() { return new State(); }
|
||||||
|
@Override public void extractRenderState(WritingDeskBlockEntity desk, State state, float partialTick,
|
||||||
|
Vec3 camera, ModelFeatureRenderer.CrumblingOverlay overlay) {
|
||||||
|
BlockEntityRenderer.super.extractRenderState(desk, state, partialTick, camera, overlay);
|
||||||
|
int count = desk.getItem(WritingDeskBlockEntity.PAPER).getCount();
|
||||||
|
state.layers = count == 0 ? 0 : Math.min(4, 1 + count / 16);
|
||||||
|
state.rotation = 180 - desk.getBlockState().getValue(WritingDeskBlock.FACING).toYRot();
|
||||||
|
resolver.updateForTopItem(state.paper, new ItemStack(Items.PAPER), ItemDisplayContext.FIXED, desk.getLevel(), null, 0);
|
||||||
|
resolver.updateForTopItem(state.page, desk.displayPage(), ItemDisplayContext.FIXED, desk.getLevel(), null, 0);
|
||||||
|
}
|
||||||
|
@Override public void submit(State state, PoseStack pose, SubmitNodeCollector collector, CameraRenderState camera) {
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(0.5, 0, 0.5);
|
||||||
|
pose.rotateDegrees(Axis.YP, state.rotation);
|
||||||
|
for (int i = 0; i < state.layers; i++) draw(state.paper, pose, collector, state.lightCoords,
|
||||||
|
1.22, 0.27 + i * 0.008, -0.14, 0.55F);
|
||||||
|
if (!state.page.isEmpty()) draw(state.page, pose, collector, state.lightCoords, 1.0, 0.572, 0, 0.8F);
|
||||||
|
pose.popPose();
|
||||||
|
}
|
||||||
|
private static void draw(ItemStackRenderState item, PoseStack pose, SubmitNodeCollector collector,
|
||||||
|
int light, double x, double y, double z, float scale) {
|
||||||
|
pose.pushPose();
|
||||||
|
pose.translate(x, y, z);
|
||||||
|
pose.rotateDegrees(Axis.XP, 90);
|
||||||
|
pose.scale(scale, scale, scale);
|
||||||
|
item.submit(pose, collector, light, OverlayTexture.NO_OVERLAY, 0);
|
||||||
|
pose.popPose();
|
||||||
|
}
|
||||||
|
@Override public boolean shouldRenderOffScreen() { return true; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,510 @@
|
|||||||
|
package net.dnorberg.rivencraft.client;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||||
|
import net.dnorberg.rivencraft.item.CollationFolderItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
import net.minecraft.client.gui.components.Button;
|
||||||
|
import net.minecraft.client.gui.components.EditBox;
|
||||||
|
import net.minecraft.client.gui.components.Tooltip;
|
||||||
|
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.entity.player.Inventory;
|
||||||
|
import net.minecraft.world.inventory.Slot;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.client.input.MouseButtonEvent;
|
||||||
|
import net.minecraft.client.input.KeyEvent;
|
||||||
|
import com.mojang.blaze3d.platform.InputConstants;
|
||||||
|
import net.minecraft.client.renderer.RenderPipelines;
|
||||||
|
|
||||||
|
/** Legacy desk atlas layout, with four visible tabs out of the desk's 88 collections. */
|
||||||
|
public final class WritingDeskScreen extends AbstractContainerScreen<WritingDeskMenu> {
|
||||||
|
private static final Identifier PAGE_ATLAS = Identifier.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "textures/gui/notebook_pages.png");
|
||||||
|
private static final Identifier LEGACY_DESK = Identifier.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "textures/gui/writing_desk_legacy.png");
|
||||||
|
private static final Identifier SCROLLBAR = Identifier.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "textures/gui/scrollbar.png");
|
||||||
|
private int lastCollection = -1;
|
||||||
|
private int selectedPage;
|
||||||
|
private int scrollRows;
|
||||||
|
private boolean allMode;
|
||||||
|
private boolean sortAlphabetically;
|
||||||
|
private int selectedCollection = -1;
|
||||||
|
private Identifier selectedCategory;
|
||||||
|
private EditBox search;
|
||||||
|
private Button categoryButton;
|
||||||
|
private Button allButton;
|
||||||
|
private Button sortButton;
|
||||||
|
private boolean draggingScrollbar;
|
||||||
|
private record DisplayPage(int collection, int index, ItemStack stack) {}
|
||||||
|
private DisplayPage pageDragSource;
|
||||||
|
private double pageDragStartX;
|
||||||
|
private double pageDragStartY;
|
||||||
|
private boolean draggingPage;
|
||||||
|
|
||||||
|
private boolean isPhysicalPageView() {
|
||||||
|
return !allMode && !sortAlphabetically && selectedCategory == null
|
||||||
|
&& (search == null || search.getValue().isBlank());
|
||||||
|
}
|
||||||
|
|
||||||
|
public WritingDeskScreen(WritingDeskMenu menu, Inventory inventory, Component title) {
|
||||||
|
super(menu, inventory, title, 409, 186);
|
||||||
|
titleLabelX = 222;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean isPauseScreen() { return false; }
|
||||||
|
|
||||||
|
@Override protected void init() {
|
||||||
|
super.init();
|
||||||
|
sortButton = addRenderableWidget(Button.builder(Component.literal("AZ"), button -> {
|
||||||
|
sortAlphabetically = !sortAlphabetically;
|
||||||
|
scrollRows = 0;
|
||||||
|
}).bounds(leftPos + 58, topPos, 20, 18)
|
||||||
|
.tooltip(Tooltip.create(Component.translatable("screen.rivencraft.writing_desk.sort"))).build());
|
||||||
|
allButton = addRenderableWidget(Button.builder(Component.literal("ALL"), button -> {
|
||||||
|
allMode = !allMode;
|
||||||
|
scrollRows = 0;
|
||||||
|
if (!allMode) {
|
||||||
|
selectedCollection = -1;
|
||||||
|
selectedPage = 0;
|
||||||
|
if (minecraft != null && minecraft.gameMode != null)
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, WritingDeskMenu.PAGE_BUTTON_BASE);
|
||||||
|
}
|
||||||
|
}).bounds(leftPos + 80, topPos, 28, 18)
|
||||||
|
.tooltip(Tooltip.create(Component.translatable("screen.rivencraft.writing_desk.all"))).build());
|
||||||
|
search = new EditBox(font, leftPos + 110, topPos, 101, 18,
|
||||||
|
Component.translatable("screen.rivencraft.writing_desk.search"));
|
||||||
|
search.setMaxLength(64);
|
||||||
|
search.setHint(Component.translatable("screen.rivencraft.writing_desk.search"));
|
||||||
|
search.setResponder(value -> scrollRows = 0);
|
||||||
|
addRenderableWidget(search);
|
||||||
|
categoryButton = addRenderableWidget(Button.builder(Component.literal("C"), button -> {
|
||||||
|
List<Identifier> categories = menu.catalog().stream()
|
||||||
|
.map(SymbolDisplayMetadata::category).distinct().sorted().toList();
|
||||||
|
int next = selectedCategory == null ? 0 : categories.indexOf(selectedCategory) + 1;
|
||||||
|
selectedCategory = next >= categories.size() ? null : categories.get(next);
|
||||||
|
categoryButton.setMessage(Component.literal(selectedCategory == null ? "C" : "C*"));
|
||||||
|
scrollRows = 0;
|
||||||
|
}).bounds(leftPos + 213, topPos, 18, 18).build());
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<DisplayPage> filteredPages() {
|
||||||
|
String query = search == null ? "" : search.getValue().trim().toLowerCase(Locale.ROOT);
|
||||||
|
List<DisplayPage> entries = new ArrayList<>();
|
||||||
|
int from = allMode ? 0 : menu.activeCollection();
|
||||||
|
int until = allMode ? WritingDeskBlockEntity.COLLECTIONS : from + 1;
|
||||||
|
for (int collection = from; collection < until; collection++) {
|
||||||
|
List<ItemStack> pages = pages(collection);
|
||||||
|
int last = -1;
|
||||||
|
for (int i = 0; i < pages.size(); i++) if (!pages.get(i).isEmpty()) last = i;
|
||||||
|
// A notebook has exactly its normal GUI capacity; a loose page has one position.
|
||||||
|
if (isPhysicalPageView()) last = menu.pageCapacity(collection) - 1;
|
||||||
|
for (int i = 0; i <= last; i++) {
|
||||||
|
ItemStack page = i < pages.size() ? pages.get(i) : ItemStack.EMPTY;
|
||||||
|
if (page.isEmpty() && (allMode || sortAlphabetically || !query.isEmpty() || selectedCategory != null)) continue;
|
||||||
|
if (!page.isEmpty() && !query.isEmpty()
|
||||||
|
&& !page.getHoverName().getString().toLowerCase(Locale.ROOT).contains(query)
|
||||||
|
&& !PageItem.content(page).symbol().map(symbol -> symbol.id().toString()
|
||||||
|
.toLowerCase(Locale.ROOT).contains(query)).orElse(false)) continue;
|
||||||
|
if (!page.isEmpty() && selectedCategory != null) {
|
||||||
|
Identifier id = PageItem.content(page).symbol().map(symbol -> symbol.id()).orElse(null);
|
||||||
|
if (menu.catalog().stream().noneMatch(metadata -> metadata.id().equals(id)
|
||||||
|
&& metadata.category().equals(selectedCategory))) continue;
|
||||||
|
}
|
||||||
|
entries.add(new DisplayPage(collection, i, page));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (sortAlphabetically) entries.sort(Comparator
|
||||||
|
.comparing((DisplayPage entry) -> entry.stack().getHoverName().getString(), String.CASE_INSENSITIVE_ORDER)
|
||||||
|
.thenComparingInt(DisplayPage::collection).thenComparingInt(DisplayPage::index));
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
int x = leftPos;
|
||||||
|
int y = topPos;
|
||||||
|
// Legacy GuiWritingDesk draws the entire 176x166 panel, not a stretched swatch.
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, LEGACY_DESK, x + 233, y + 20, 0, 0, 176, 166, 256, 256);
|
||||||
|
drawTabControl(graphics, 20, 203, menu.firstVisibleTab() > 0);
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
int tab = menu.firstVisibleTab() + i;
|
||||||
|
int tabY = y + 29 + i * 37;
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, LEGACY_DESK, x, tabY, 0, 166, 58, 37, 256, 256,
|
||||||
|
tab == menu.activeCollection() && !allMode ? 0xFF8080FF : -1);
|
||||||
|
// Legacy numbers its Writing Desk collections from zero.
|
||||||
|
drawNumeral(graphics, tab, x + (tab < 25 ? 8 : 4), tabY + 3, 19);
|
||||||
|
ItemStack collection = menu.getSlot(tab).getItem();
|
||||||
|
if (!collection.isEmpty()) {
|
||||||
|
String name = collection.getHoverName().getString();
|
||||||
|
float scale = Math.min(1F, 50F / Math.max(1, font.width(name)));
|
||||||
|
graphics.pose().pushMatrix();
|
||||||
|
graphics.pose().translate(x + 4, tabY + 25);
|
||||||
|
graphics.pose().scale(scale, scale);
|
||||||
|
graphics.text(font, name, 0, 0, 0xFF404040, false);
|
||||||
|
graphics.pose().popMatrix();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drawTabControl(graphics, 177, 212, menu.firstVisibleTab() < WritingDeskBlockEntity.COLLECTIONS - 4);
|
||||||
|
// GuiElementVSlider: 4-pixel caps, repeated 22-pixel track, 12x15 thumb.
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, SCROLLBAR, x + 213, y + 20, 0, 0, 20, 4, 32, 32);
|
||||||
|
for (int offset = 4; offset < 162; offset += 22)
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, SCROLLBAR, x + 213, y + 20 + offset, 0, 4, 20, Math.min(22, 162 - offset), 32, 32);
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, SCROLLBAR, x + 213, y + 182, 0, 26, 20, 4, 32, 32);
|
||||||
|
int totalRows = (filteredPages().size() + 4) / 5;
|
||||||
|
int maxScroll = Math.max(0, totalRows - 4);
|
||||||
|
scrollRows = Math.clamp(scrollRows, 0, maxScroll);
|
||||||
|
int thumbY = y + 24 + (maxScroll == 0 ? 0 : scrollRows * 143 / maxScroll);
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, SCROLLBAR, x + 217, thumbY, 20, draggingScrollbar ? 15 : 0, 12, 15, 32, 32);
|
||||||
|
graphics.fill(x + 365, y + 27, x + 381, y + 97, 0xFF303035);
|
||||||
|
graphics.fill(x + 366, y + 28, x + 380, y + 96, 0xFF6666AA);
|
||||||
|
int filled = 68 * menu.inkRemaining() / 16;
|
||||||
|
if (filled > 0) graphics.fill(x + 366, y + 96 - filled, x + 380, y + 96, 0xFF15151B);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawTabControl(GuiGraphicsExtractor graphics, int y, int textureY, boolean enabled) {
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, LEGACY_DESK, leftPos, topPos + y, 0, textureY, 58, 9, 256, 256,
|
||||||
|
enabled ? -1 : 0xFF666666);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void extractLabels(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
// Legacy leaves the inventory grid unlabeled.
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public void extractContents(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||||
|
super.extractContents(graphics, mouseX, mouseY, partialTick);
|
||||||
|
if (sortAlphabetically) graphics.outline(leftPos + 58, topPos, 20, 18, 0xFFFFD061);
|
||||||
|
if (allMode) graphics.outline(leftPos + 80, topPos, 28, 18, 0xFFFFD061);
|
||||||
|
renderCollection(graphics);
|
||||||
|
if (draggingPage && pageDragSource != null) {
|
||||||
|
DisplayPage target = pageAtMouse(mouseX, mouseY);
|
||||||
|
if (target != null && canMovePage(pageDragSource, target)) {
|
||||||
|
int x = leftPos + 58 + ((int) mouseX - leftPos - 58) / 31 * 31;
|
||||||
|
int y = topPos + 20 + ((int) mouseY - topPos - 20) / 41 * 41;
|
||||||
|
graphics.outline(x, y, 30, 40, 0xFF57D478);
|
||||||
|
}
|
||||||
|
graphics.fakeItem(pageDragSource.stack(), mouseX - 8, mouseY - 8);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override protected void extractTooltip(GuiGraphicsExtractor graphics, int mouseX, int mouseY) {
|
||||||
|
super.extractTooltip(graphics, mouseX, mouseY);
|
||||||
|
if (mouseX >= leftPos + 365 && mouseX < leftPos + 381
|
||||||
|
&& mouseY >= topPos + 27 && mouseY < topPos + 97) {
|
||||||
|
graphics.setTooltipForNextFrame(font, Component.translatable("screen.rivencraft.writing_desk.ink",
|
||||||
|
menu.inkRemaining(), 16), mouseX, mouseY);
|
||||||
|
}
|
||||||
|
if (mouseX >= leftPos + 213 && mouseX < leftPos + 231
|
||||||
|
&& mouseY >= topPos && mouseY < topPos + 18) {
|
||||||
|
graphics.setTooltipForNextFrame(font, Component.translatable("screen.rivencraft.writing_desk.category",
|
||||||
|
selectedCategory == null
|
||||||
|
? Component.translatable("screen.rivencraft.writing_desk.all_categories")
|
||||||
|
: Component.literal(selectedCategory.toString())), mouseX, mouseY);
|
||||||
|
}
|
||||||
|
if (mouseX >= leftPos && mouseX < leftPos + 58) {
|
||||||
|
int localY = mouseY - topPos;
|
||||||
|
if (localY >= 20 && localY < 29)
|
||||||
|
graphics.setTooltipForNextFrame(font, Component.translatable("screen.rivencraft.writing_desk.previous_tabs"), mouseX, mouseY);
|
||||||
|
else if (localY >= 177 && localY < 186)
|
||||||
|
graphics.setTooltipForNextFrame(font, Component.translatable("screen.rivencraft.writing_desk.next_tabs"), mouseX, mouseY);
|
||||||
|
else if (mouseX < leftPos + 34 && localY >= 29 && localY < 177) {
|
||||||
|
int tab = menu.firstVisibleTab() + (localY - 29) / 37;
|
||||||
|
graphics.setTooltipForNextFrame(font, Component.translatable("screen.rivencraft.writing_desk.tab_symbol",
|
||||||
|
tab), mouseX, mouseY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<ItemStack> pages(int collectionIndex) {
|
||||||
|
ItemStack collection = menu.getSlot(collectionIndex).getItem();
|
||||||
|
if (collection.is(Rivencraft.PAGE.get())) return List.of(collection);
|
||||||
|
if (CollationFolderItem.isCollection(collection)) {
|
||||||
|
return collection.getOrDefault(Rivencraft.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages();
|
||||||
|
}
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void renderCollection(GuiGraphicsExtractor graphics) {
|
||||||
|
if (lastCollection != menu.activeCollection()) {
|
||||||
|
lastCollection = menu.activeCollection();
|
||||||
|
scrollRows = 0;
|
||||||
|
selectedPage = 0;
|
||||||
|
selectedCollection = -1;
|
||||||
|
}
|
||||||
|
List<DisplayPage> entries = filteredPages();
|
||||||
|
for (int i = scrollRows * 5; i < entries.size() && i < scrollRows * 5 + 20; i++) {
|
||||||
|
int column = i % 5;
|
||||||
|
int row = i / 5 - scrollRows;
|
||||||
|
DisplayPage entry = entries.get(i);
|
||||||
|
ItemStack page = entry.stack();
|
||||||
|
int x = leftPos + 58 + column * 31;
|
||||||
|
int y = topPos + 20 + row * 41;
|
||||||
|
drawPage(graphics, page, x, y);
|
||||||
|
if (page.isEmpty()) graphics.fill(x, y, x + 30, y + 40, 0xB8000000);
|
||||||
|
int active = selectedCollection >= 0 ? selectedCollection : menu.activeCollection();
|
||||||
|
if (entry.collection() == active && entry.index() == selectedPage && !page.isEmpty())
|
||||||
|
graphics.outline(x, y, 30, 40, 0xFFFFD061);
|
||||||
|
}
|
||||||
|
int active = selectedCollection >= 0 ? selectedCollection : menu.activeCollection();
|
||||||
|
List<ItemStack> source = pages(active);
|
||||||
|
if (selectedPage >= source.size() || source.get(selectedPage).isEmpty()) return;
|
||||||
|
ItemStack selected = source.get(selectedPage);
|
||||||
|
drawPage(graphics, selected, leftPos + 265, topPos + 26);
|
||||||
|
graphics.fill(leftPos + 261, topPos + 81, leftPos + 360, topPos + 95, 0xFF202020);
|
||||||
|
var symbol = PageItem.content(selected).symbol();
|
||||||
|
if (symbol.isPresent() && PageItem.isCorrupted(symbol.orElseThrow())) {
|
||||||
|
graphics.enableScissor(leftPos + 263, topPos + 82, leftPos + 358, topPos + 94);
|
||||||
|
graphics.text(font, selected.getHoverName(), leftPos + 263, topPos + 84,
|
||||||
|
0xFFE0E0E0, false);
|
||||||
|
graphics.disableScissor();
|
||||||
|
} else {
|
||||||
|
String title = font.plainSubstrByWidth(selected.getHoverName().getString(), 95);
|
||||||
|
graphics.text(font, title, leftPos + 263, topPos + 84, 0xFFE0E0E0, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawPage(GuiGraphicsExtractor graphics, ItemStack page, int x, int y) {
|
||||||
|
graphics.nextStratum();
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, PAGE_ATLAS, x, y, 156, 0, 30, 40, 256, 256);
|
||||||
|
if (page.isEmpty()) return;
|
||||||
|
if (page.has(Rivencraft.SYMBOL_PAGE_ID.get())) {
|
||||||
|
graphics.nextStratum();
|
||||||
|
ItemStack glyph = page.copy();
|
||||||
|
glyph.set(Rivencraft.PAGE_GLYPH_ONLY.get(), true);
|
||||||
|
graphics.pose().pushMatrix();
|
||||||
|
graphics.pose().translate(x + 1, y + 6);
|
||||||
|
graphics.pose().scale(1.75F, 1.75F);
|
||||||
|
graphics.fakeItem(glyph, 0, 0);
|
||||||
|
graphics.pose().popMatrix();
|
||||||
|
graphics.nextStratum();
|
||||||
|
if (!net.dnorberg.rivencraft.writing.PortAuthoredWriting.isPageImplemented(page.get(Rivencraft.SYMBOL_PAGE_ID.get())))
|
||||||
|
graphics.fill(x, y, x + 30, y + 40, 0x55FF3333);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void drawNumeral(GuiGraphicsExtractor graphics, int number, int x, int y, int size) {
|
||||||
|
int[] digits = net.dnorberg.rivencraft.writing.PortSymbolNumerals.digitsFor(number);
|
||||||
|
int digitSize = digits.length == 1 ? size : Math.max(8, size * 3 / 4);
|
||||||
|
Identifier components = Identifier.fromNamespaceAndPath("rivencraft", "textures/gui/symbolcomponents.png");
|
||||||
|
for (int digit : digits) {
|
||||||
|
for (int component : net.dnorberg.rivencraft.writing.PortSymbolNumerals.componentsForDigit(digit))
|
||||||
|
graphics.blit(RenderPipelines.GUI_TEXTURED, components, x, y + (size - digitSize) / 2,
|
||||||
|
(component % 8) * 64, (component / 8) * 64, digitSize, digitSize, 64, 64, 512, 512, 0xFF211A14);
|
||||||
|
x += digitSize + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private DisplayPage pageAtMouse(double mouseX, double mouseY) {
|
||||||
|
int x = (int) Math.floor(mouseX - leftPos - 58);
|
||||||
|
int y = (int) Math.floor(mouseY - topPos - 20);
|
||||||
|
if (x < 0 || x >= 155 || y < 0 || y >= 164 || x % 31 >= 30 || y % 41 >= 40) return null;
|
||||||
|
int index = (y / 41 + scrollRows) * 5 + x / 31;
|
||||||
|
List<DisplayPage> entries = filteredPages();
|
||||||
|
return index < entries.size() ? entries.get(index) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean canMovePage(DisplayPage source, DisplayPage target) {
|
||||||
|
return !source.stack().isEmpty()
|
||||||
|
&& (CollationFolderItem.isCollection(menu.getSlot(source.collection()).getItem())
|
||||||
|
|| menu.getSlot(source.collection()).getItem().is(Rivencraft.PAGE.get()))
|
||||||
|
&& (CollationFolderItem.isCollection(menu.getSlot(target.collection()).getItem())
|
||||||
|
|| menu.getSlot(target.collection()).getItem().is(Rivencraft.PAGE.get()))
|
||||||
|
&& (source.collection() != target.collection() || source.index() != target.index());
|
||||||
|
}
|
||||||
|
|
||||||
|
private int extractTargetSlot(double mouseX, double mouseY) {
|
||||||
|
for (Slot slot : menu.slots) {
|
||||||
|
int index = slot.index;
|
||||||
|
if (index >= WritingDeskBlockEntity.COLLECTIONS && index <= WritingDeskMenu.COPY_RESULT) continue;
|
||||||
|
if (!slot.isActive() || !isHovering(slot.x, slot.y, 16, 16, mouseX, mouseY)) continue;
|
||||||
|
ItemStack held = pageDragSource.stack();
|
||||||
|
if (!slot.mayPlace(held)) return -1;
|
||||||
|
ItemStack current = slot.getItem();
|
||||||
|
if (current.isEmpty()) return index;
|
||||||
|
if (index < WritingDeskBlockEntity.COLLECTIONS && CollationFolderItem.isCollection(current)) {
|
||||||
|
List<ItemStack> pages = current.getOrDefault(
|
||||||
|
Rivencraft.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages();
|
||||||
|
if (pages.size() < CollationFolderItem.capacity(current) || pages.stream().anyMatch(ItemStack::isEmpty))
|
||||||
|
return index;
|
||||||
|
} else if (index > WritingDeskMenu.COPY_RESULT && ItemStack.isSameItemSameComponents(current, held)
|
||||||
|
&& current.getCount() < slot.getMaxStackSize(held)) return index;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
|
||||||
|
double mouseX = event.x(), mouseY = event.y();
|
||||||
|
int button = event.button();
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
|
pageDragSource = null;
|
||||||
|
draggingPage = false;
|
||||||
|
}
|
||||||
|
int surfaceX = (int) Math.floor(mouseX - leftPos - 58);
|
||||||
|
int surfaceY = (int) Math.floor(mouseY - topPos - 20);
|
||||||
|
if ((button == InputConstants.MOUSE_BUTTON_LEFT || button == InputConstants.MOUSE_BUTTON_RIGHT) && !menu.getCarried().isEmpty()
|
||||||
|
&& surfaceX >= 0 && surfaceX < 155 && surfaceY >= 0 && surfaceY < 164) {
|
||||||
|
if (menu.getCarried().is(Rivencraft.PAGE.get())
|
||||||
|
&& PageItem.content(menu.getCarried()).kind() != PageContent.Kind.LINK_PANEL
|
||||||
|
&& surfaceX % 31 < 30 && surfaceY % 41 < 40) {
|
||||||
|
int index = (surfaceY / 41 + scrollRows) * 5 + surfaceX / 31;
|
||||||
|
List<DisplayPage> entries = filteredPages();
|
||||||
|
// Only displayed positions are addressable. Filtering never turns
|
||||||
|
// empty screen space into additional storage for a loose-page tab.
|
||||||
|
int collection = index < entries.size() ? entries.get(index).collection() : menu.activeCollection();
|
||||||
|
int page = index < entries.size() ? entries.get(index).index() : index;
|
||||||
|
if (index < entries.size() && page < menu.pageCapacity(collection)
|
||||||
|
&& minecraft != null && minecraft.gameMode != null) {
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId,
|
||||||
|
WritingDeskMenu.PLACE_PAGE_BUTTON_BASE + collection * NotebookContents.MAX_PAGES + page);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT) {
|
||||||
|
if (mouseX >= leftPos && mouseX < leftPos + 58) {
|
||||||
|
int y = (int) mouseY - topPos;
|
||||||
|
if (y >= 20 && y < 29 || y >= 177 && y < 186) {
|
||||||
|
if (minecraft != null && minecraft.gameMode != null)
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId,
|
||||||
|
y < 29 ? WritingDeskMenu.PREVIOUS_TABS : WritingDeskMenu.NEXT_TABS);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (mouseX >= leftPos + 213 && mouseX < leftPos + 233
|
||||||
|
&& mouseY >= topPos + 20 && mouseY < topPos + 186) {
|
||||||
|
draggingScrollbar = true;
|
||||||
|
setScrollFromMouse(mouseY);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
int x = (int) Math.floor(mouseX - leftPos - 58);
|
||||||
|
int y = (int) Math.floor(mouseY - topPos - 20);
|
||||||
|
if (x >= 0 && x < 155 && y >= 0 && y < 164) {
|
||||||
|
DisplayPage entry = pageAtMouse(mouseX, mouseY);
|
||||||
|
if (entry != null && !entry.stack().isEmpty()) {
|
||||||
|
selectedCollection = entry.collection();
|
||||||
|
selectedPage = entry.index();
|
||||||
|
if (menu.getCarried().isEmpty()) {
|
||||||
|
pageDragSource = entry;
|
||||||
|
pageDragStartX = mouseX;
|
||||||
|
pageDragStartY = mouseY;
|
||||||
|
}
|
||||||
|
if (minecraft != null && minecraft.gameMode != null) {
|
||||||
|
int id = WritingDeskMenu.ALL_PAGE_BUTTON_BASE
|
||||||
|
+ entry.collection() * NotebookContents.MAX_PAGES + entry.index();
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT && mouseX >= leftPos && mouseX < leftPos + 58) {
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
int top = topPos + 29 + i * 37;
|
||||||
|
boolean overSlot = mouseX >= leftPos + 36 && mouseX < leftPos + 54
|
||||||
|
&& mouseY >= top + 4 && mouseY < top + 22;
|
||||||
|
if (mouseY >= top && mouseY < top + 37 && !overSlot) {
|
||||||
|
allMode = false;
|
||||||
|
selectedCollection = -1;
|
||||||
|
if (minecraft != null && minecraft.gameMode != null) {
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, menu.firstVisibleTab() + i);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return super.mouseClicked(event, doubleClick);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
|
||||||
|
if (mouseX >= leftPos + 58 && mouseX < leftPos + 233
|
||||||
|
&& mouseY >= topPos + 20 && mouseY < topPos + 186) {
|
||||||
|
int rows = (filteredPages().size() + 4) / 5;
|
||||||
|
scrollRows = Math.clamp(scrollRows - (int) Math.signum(scrollY), 0, Math.max(0, rows - 4));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setScrollFromMouse(double mouseY) {
|
||||||
|
int rows = (filteredPages().size() + 4) / 5;
|
||||||
|
int max = Math.max(0, rows - 4);
|
||||||
|
scrollRows = Math.clamp((int) Math.round((mouseY - topPos - 31.5) * max / 143.0), 0, max);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseDragged(MouseButtonEvent event, double dragX, double dragY) {
|
||||||
|
double mouseX = event.x(), mouseY = event.y();
|
||||||
|
int button = event.button();
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT && pageDragSource != null) {
|
||||||
|
if (Math.abs(mouseX - pageDragStartX) >= 4 || Math.abs(mouseY - pageDragStartY) >= 4)
|
||||||
|
draggingPage = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT && draggingScrollbar) {
|
||||||
|
setScrollFromMouse(mouseY);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseDragged(event, dragX, dragY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean mouseReleased(MouseButtonEvent event) {
|
||||||
|
double mouseX = event.x(), mouseY = event.y();
|
||||||
|
int button = event.button();
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT && pageDragSource != null) {
|
||||||
|
if (draggingPage) {
|
||||||
|
DisplayPage target = pageAtMouse(mouseX, mouseY);
|
||||||
|
if (target != null && canMovePage(pageDragSource, target)
|
||||||
|
&& minecraft != null && minecraft.gameMode != null) {
|
||||||
|
selectedCollection = target.collection();
|
||||||
|
selectedPage = target.index();
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId,
|
||||||
|
WritingDeskMenu.movePageButtonId(pageDragSource.collection(), pageDragSource.index(),
|
||||||
|
target.collection(), target.index()));
|
||||||
|
} else if (target == null && minecraft != null && minecraft.gameMode != null) {
|
||||||
|
int targetSlot = extractTargetSlot(mouseX, mouseY);
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId,
|
||||||
|
WritingDeskMenu.extractPageButtonId(pageDragSource.collection(), pageDragSource.index(),
|
||||||
|
targetSlot));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pageDragSource = null;
|
||||||
|
draggingPage = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (button == InputConstants.MOUSE_BUTTON_LEFT && draggingScrollbar) {
|
||||||
|
draggingScrollbar = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return super.mouseReleased(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override public boolean keyPressed(KeyEvent event) {
|
||||||
|
if (event.isEscape()) return super.keyPressed(event);
|
||||||
|
if (search != null && search.isFocused()) {
|
||||||
|
search.keyPressed(event);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (minecraft != null && minecraft.gameMode != null) {
|
||||||
|
if (event.key() == InputConstants.KEY_PAGEUP) {
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, WritingDeskMenu.PREVIOUS_TABS);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (event.key() == InputConstants.KEY_PAGEDOWN) {
|
||||||
|
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, WritingDeskMenu.NEXT_TABS);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return super.keyPressed(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import net.dnorberg.rivencraft.age.PortTerrainFeaturePlan;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
|
||||||
|
/** Small optional bridge between frozen Age pages and Ruins' dimension gate. */
|
||||||
|
public final class RuinsCompatibility {
|
||||||
|
private static final Set<Identifier> KNOWN_AGES = ConcurrentHashMap.newKeySet();
|
||||||
|
private static final Map<Identifier, Map<Identifier, Integer>> AUTHORED_TEMPLATES =
|
||||||
|
new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
private RuinsCompatibility() {}
|
||||||
|
|
||||||
|
public static void register() {
|
||||||
|
if (ModList.get().isLoaded("ruins")) RuinsEventAdapter.register();
|
||||||
|
net.neoforged.neoforge.common.NeoForge.EVENT_BUS.addListener(RuinsCompatibility::onLevelUnload);
|
||||||
|
net.neoforged.neoforge.common.NeoForge.EVENT_BUS.addListener(
|
||||||
|
(net.neoforged.neoforge.event.server.ServerAboutToStartEvent event) -> RuinsTemplatePages.refresh());
|
||||||
|
net.neoforged.neoforge.common.NeoForge.EVENT_BUS.addListener(
|
||||||
|
(net.neoforged.neoforge.event.server.ServerStoppedEvent event) -> onServerStopping());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void registerAge(Identifier id, PortTerrainFeaturePlan plan) {
|
||||||
|
if (!ModList.get().isLoaded("ruins")) return;
|
||||||
|
Map<Identifier, Integer> selected = templateCounts(plan == null ? List.of() : plan.ruins());
|
||||||
|
if (selected.isEmpty()) AUTHORED_TEMPLATES.remove(id);
|
||||||
|
else AUTHORED_TEMPLATES.put(id, selected);
|
||||||
|
KNOWN_AGES.add(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void onLevelUnload(net.neoforged.neoforge.event.level.LevelEvent.Unload event) {
|
||||||
|
if (event.getLevel() instanceof net.minecraft.server.level.ServerLevel level) {
|
||||||
|
var id = level.dimension().identifier();
|
||||||
|
KNOWN_AGES.remove(id);
|
||||||
|
AUTHORED_TEMPLATES.remove(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Called only by the optional Ruins FileHandler mixin. */
|
||||||
|
public static boolean allowsAge(Identifier dimension) {
|
||||||
|
return AUTHORED_TEMPLATES.containsKey(dimension);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isKnownAge(Identifier dimension) {
|
||||||
|
return KNOWN_AGES.contains(dimension);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean permits(Identifier dimension, Identifier template) {
|
||||||
|
return templateCount(dimension, template) > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int templateCount(Identifier dimension, Identifier template) {
|
||||||
|
return AUTHORED_TEMPLATES.getOrDefault(dimension, Map.of()).getOrDefault(template, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Extra pages increase attempts, without making distinct template choices denser. */
|
||||||
|
public static int attemptsPerChunk(Identifier dimension, int configuredAttempts) {
|
||||||
|
return attemptsPerChunk(configuredAttempts, AUTHORED_TEMPLATES.get(dimension));
|
||||||
|
}
|
||||||
|
|
||||||
|
static int attemptsPerChunk(int configuredAttempts, Map<Identifier, Integer> counts) {
|
||||||
|
if (counts == null || counts.isEmpty()) return configuredAttempts;
|
||||||
|
int duplicates = counts.values().stream().mapToInt(count -> count - 1).sum();
|
||||||
|
return (int) Math.min(Math.max(configuredAttempts, 32L), (long) configuredAttempts + duplicates);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Map<Identifier, Integer> templateCounts(List<Identifier> choices) {
|
||||||
|
Map<Identifier, Integer> counts = new java.util.HashMap<>();
|
||||||
|
for (Identifier choice : choices) {
|
||||||
|
if (RuinsTemplatePages.contains(choice)) counts.merge(choice, 1, Integer::sum);
|
||||||
|
}
|
||||||
|
return Map.copyOf(counts);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void onServerStopping() {
|
||||||
|
KNOWN_AGES.clear();
|
||||||
|
AUTHORED_TEMPLATES.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import atomicstryker.ruins.common.EventRuinTemplateSpawn;
|
||||||
|
import atomicstryker.ruins.common.RuinTemplate;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.neoforged.neoforge.common.NeoForge;
|
||||||
|
|
||||||
|
/** Loaded only when Ruins is present. Its pre-spawn event can veto exact templates. */
|
||||||
|
public final class RuinsEventAdapter {
|
||||||
|
private RuinsEventAdapter() {}
|
||||||
|
|
||||||
|
static void register() {
|
||||||
|
NeoForge.EVENT_BUS.addListener(RuinsEventAdapter::onTemplateSpawn);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void onTemplateSpawn(EventRuinTemplateSpawn event) {
|
||||||
|
if (!event.isPrePhase || event.testingRuin
|
||||||
|
|| !(event.getLevel() instanceof ServerLevel level)
|
||||||
|
|| !RuinsCompatibility.isKnownAge(level.dimension().identifier())) return;
|
||||||
|
|
||||||
|
var template = RuinsTemplatePages.featureId(event.template.getName());
|
||||||
|
if (!RuinsTemplatePages.contains(template)
|
||||||
|
|| !RuinsCompatibility.permits(level.dimension().identifier(), template)) event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Preserve Ruins' weights and multiply each by its authored page count. */
|
||||||
|
public static Object chooseTemplate(net.minecraft.resources.Identifier dimension,
|
||||||
|
Collection<?> pool, RandomSource random) {
|
||||||
|
if (pool == null || pool.isEmpty()) return null;
|
||||||
|
var candidates = pool.stream().filter(RuinTemplate.class::isInstance)
|
||||||
|
.map(RuinTemplate.class::cast)
|
||||||
|
.filter(template -> RuinsCompatibility.permits(dimension,
|
||||||
|
RuinsTemplatePages.featureId(template.getName())))
|
||||||
|
.sorted(Comparator.comparing(RuinTemplate::getName)).toList();
|
||||||
|
double total = candidates.stream().mapToDouble(template -> authoredWeight(dimension, template)).sum();
|
||||||
|
if (total <= 0.0) return null;
|
||||||
|
double roll = random.nextDouble() * total;
|
||||||
|
for (RuinTemplate candidate : candidates) {
|
||||||
|
roll -= authoredWeight(dimension, candidate);
|
||||||
|
if (roll < 0.0) return candidate;
|
||||||
|
}
|
||||||
|
return candidates.getLast();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double authoredWeight(net.minecraft.resources.Identifier dimension,
|
||||||
|
RuinTemplate template) {
|
||||||
|
return Math.max(0.0, template.getWeight()) * RuinsCompatibility.templateCount(dimension,
|
||||||
|
RuinsTemplatePages.featureId(template.getName()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.HexFormat;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.zip.ZipEntry;
|
||||||
|
import java.util.zip.ZipInputStream;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortSymbolPages;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
import net.neoforged.fml.loading.FMLPaths;
|
||||||
|
|
||||||
|
/** Discovers Ruins' template filenames without making its jar mandatory. */
|
||||||
|
public final class RuinsTemplatePages {
|
||||||
|
public static final Identifier CATEGORY = Identifier.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "ruins");
|
||||||
|
private static final String PREFIX = "ruins/";
|
||||||
|
private static volatile Map<Identifier, String> names = Map.of();
|
||||||
|
private static volatile boolean initialized;
|
||||||
|
|
||||||
|
private RuinsTemplatePages() {}
|
||||||
|
|
||||||
|
public static void refresh() {
|
||||||
|
if (!ModList.get().isLoaded("ruins")) {
|
||||||
|
names = Map.of();
|
||||||
|
initialized = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Map<Identifier, String> discovered = new HashMap<>();
|
||||||
|
Map<String, String> sources = new HashMap<>();
|
||||||
|
Set<String> duplicateNames = new HashSet<>();
|
||||||
|
// Ruins itself reads <gameDir>/config/ruins_config, not NeoForge's
|
||||||
|
// overrideable CONFIGDIR; mirror its active folder exactly.
|
||||||
|
Path configured = FMLPaths.GAMEDIR.get().resolve("config/ruins_config");
|
||||||
|
if (Files.isDirectory(configured)) {
|
||||||
|
try (var paths = Files.walk(configured)) {
|
||||||
|
paths.filter(Files::isRegularFile)
|
||||||
|
.filter(path -> configured.relativize(path).getNameCount() == 2)
|
||||||
|
.filter(path -> isTemplate(path.getFileName().toString()))
|
||||||
|
.sorted().forEach(path -> add(discovered, sources, duplicateNames,
|
||||||
|
path.getFileName().toString(), configured.relativize(path).toString()));
|
||||||
|
} catch (IOException exception) {
|
||||||
|
Rivencraft.LOGGER.warn("Could not read Ruins templates from {}", configured, exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Ruins extracts this archive on first launch. It also supplies the creative
|
||||||
|
// pages before extraction has completed on a fresh installation.
|
||||||
|
if (discovered.isEmpty() && !Files.isDirectory(configured)) {
|
||||||
|
try (InputStream stream = RuinsTemplatePages.class.getClassLoader()
|
||||||
|
.getResourceAsStream("assets/ruins_config.zip")) {
|
||||||
|
if (stream != null) {
|
||||||
|
try (ZipInputStream zip = new ZipInputStream(stream)) {
|
||||||
|
ZipEntry entry;
|
||||||
|
while ((entry = zip.getNextEntry()) != null) {
|
||||||
|
if (!entry.isDirectory()) {
|
||||||
|
String name = entry.getName();
|
||||||
|
name = name.substring(name.lastIndexOf('/') + 1);
|
||||||
|
if (isTemplate(name)) add(discovered, sources, duplicateNames,
|
||||||
|
name, entry.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (IOException exception) {
|
||||||
|
Rivencraft.LOGGER.warn("Could not read bundled Ruins templates", exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Ruins' spawn event exposes only the basename. If two directories use
|
||||||
|
// that basename, Rivencraft cannot identify which structure was chosen.
|
||||||
|
// Disable the bridge instead of advertising pages with ambiguous effects.
|
||||||
|
if (!duplicateNames.isEmpty()) {
|
||||||
|
Rivencraft.LOGGER.error("Ruins compatibility disabled: duplicate template names {}. "
|
||||||
|
+ "Give every .tml file a unique basename.", duplicateNames);
|
||||||
|
names = Map.of();
|
||||||
|
initialized = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
names = Map.copyOf(discovered);
|
||||||
|
initialized = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<String> templates() {
|
||||||
|
if (!initialized) refresh();
|
||||||
|
List<String> templates = new ArrayList<>(names.values());
|
||||||
|
templates.sort(Comparator.comparing(name -> name.toLowerCase(Locale.ROOT)));
|
||||||
|
return List.copyOf(templates);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isSymbol(Identifier id) {
|
||||||
|
return id.getNamespace().equals(Rivencraft.MOD_ID) && id.getPath().startsWith(PREFIX);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean contains(Identifier id) {
|
||||||
|
if (!initialized) refresh();
|
||||||
|
return isSymbol(id) && names.containsKey(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Identifier symbolId(String templateName) {
|
||||||
|
if (templateName.isBlank()) throw new IllegalArgumentException("Ruins template has no usable name");
|
||||||
|
// Hex is reversible and collision-free even for case-sensitive or Unicode
|
||||||
|
// filenames; normalizing to lowercase would merge distinct templates.
|
||||||
|
String key = HexFormat.of().formatHex(templateName.getBytes(StandardCharsets.UTF_8));
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, PREFIX + "t_" + key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Identifier featureId(String templateName) {
|
||||||
|
return symbolId(templateName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String fallbackName(Identifier symbolId) {
|
||||||
|
String encoded = symbolId.getPath().substring(PREFIX.length());
|
||||||
|
if (!encoded.startsWith("t_")) return encoded + " Ruin";
|
||||||
|
String name;
|
||||||
|
try {
|
||||||
|
name = new String(HexFormat.of().parseHex(encoded.substring(2)), StandardCharsets.UTF_8);
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
name = encoded;
|
||||||
|
}
|
||||||
|
return stripExtension(name).replace('_', ' ') + " Ruin";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortSymbolPages.Entry definition(String templateName) {
|
||||||
|
Identifier id = featureId(templateName);
|
||||||
|
return new PortSymbolPages.Entry(id, CATEGORY.toString(),
|
||||||
|
"symbol.rivencraft.ruins.template." + id.getPath().substring(PREFIX.length()),
|
||||||
|
"symbol.rivencraft.ruins.description", "", "feature");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PortSymbolPages.Entry find(Identifier id) {
|
||||||
|
if (!initialized) refresh();
|
||||||
|
String name = names.get(id);
|
||||||
|
return name == null ? null : definition(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isTemplate(String name) {
|
||||||
|
return name.toLowerCase(Locale.ROOT).endsWith(".tml");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String stripExtension(String name) {
|
||||||
|
return isTemplate(name) ? name.substring(0, name.length() - 4) : name;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void add(Map<Identifier, String> templates, Map<String, String> sources,
|
||||||
|
Set<String> duplicateNames, String name, String source) {
|
||||||
|
String previousSource = sources.putIfAbsent(name, source);
|
||||||
|
if (previousSource != null && !previousSource.equals(source)) duplicateNames.add(name);
|
||||||
|
Identifier id = symbolId(name);
|
||||||
|
String previous = templates.putIfAbsent(id, name);
|
||||||
|
if (previous != null && !previous.equals(name)) {
|
||||||
|
Rivencraft.LOGGER.warn("Ruins templates {} and {} share page ID {}; using {}",
|
||||||
|
previous, name, id, previous);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.age.PortSeasonPolicies.Mode;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import sereneseasons.api.season.Season;
|
||||||
|
import sereneseasons.config.SeasonsConfig;
|
||||||
|
import sereneseasons.init.ModConfig;
|
||||||
|
import sereneseasons.season.SeasonHandler;
|
||||||
|
import sereneseasons.season.SeasonSavedData;
|
||||||
|
import sereneseasons.season.SeasonTime;
|
||||||
|
|
||||||
|
/** Isolates references to optional Serene Seasons and GlitchCore classes. */
|
||||||
|
final class SereneSeasonsAdapter {
|
||||||
|
private static final String WHITELIST_KEY = "dimension_settings.whitelisted_dimensions";
|
||||||
|
|
||||||
|
private SereneSeasonsAdapter() {
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean setServerWhitelist(Identifier dimensionId, boolean enabled) {
|
||||||
|
SeasonsConfig config = ModConfig.seasons;
|
||||||
|
if (config == null || config.whitelistedDimensions.contains(dimensionId.toString()) == enabled) return false;
|
||||||
|
List<String> dimensions = new ArrayList<>(config.whitelistedDimensions);
|
||||||
|
if (enabled) dimensions.add(dimensionId.toString());
|
||||||
|
else dimensions.removeIf(dimensionId.toString()::equals);
|
||||||
|
// GlitchCore rereads this config from disk before synchronizing new clients.
|
||||||
|
config.set(WHITELIST_KEY, dimensions);
|
||||||
|
config.write();
|
||||||
|
config.whitelistedDimensions = dimensions;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void setClientWhitelist(Identifier dimensionId, boolean enabled) {
|
||||||
|
SeasonsConfig config = ModConfig.seasons;
|
||||||
|
if (config == null || config.whitelistedDimensions.contains(dimensionId.toString()) == enabled) return;
|
||||||
|
List<String> dimensions = new ArrayList<>(config.whitelistedDimensions);
|
||||||
|
if (enabled) dimensions.add(dimensionId.toString());
|
||||||
|
else dimensions.removeIf(dimensionId.toString()::equals);
|
||||||
|
config.whitelistedDimensions = dimensions;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void holdSeason(ServerLevel level, Mode mode) {
|
||||||
|
SeasonSavedData data = SeasonHandler.getSeasonSavedData(level);
|
||||||
|
Season.SubSeason target = switch (mode) {
|
||||||
|
case ETERNAL_SPRING -> Season.SubSeason.MID_SPRING;
|
||||||
|
case ETERNAL_SUMMER -> Season.SubSeason.MID_SUMMER;
|
||||||
|
case ETERNAL_FALL -> Season.SubSeason.MID_AUTUMN;
|
||||||
|
case ETERNAL_WINTER -> Season.SubSeason.MID_WINTER;
|
||||||
|
default -> throw new IllegalArgumentException("Not an eternal season: " + mode);
|
||||||
|
};
|
||||||
|
int duration = SeasonTime.ZERO.getSubSeasonDuration();
|
||||||
|
int midpoint = target.ordinal() * duration + duration / 2;
|
||||||
|
// Reset well before the end of MID_* so the client never observes a
|
||||||
|
// different sub-season; avoid marking saved data dirty every tick.
|
||||||
|
int current = data.seasonCycleTicks;
|
||||||
|
if (current >= midpoint && current < midpoint + duration / 4) return;
|
||||||
|
data.seasonCycleTicks = midpoint;
|
||||||
|
data.setDirty();
|
||||||
|
SeasonHandler.sendSeasonUpdate(level);
|
||||||
|
}
|
||||||
|
}
|
||||||
+80
@@ -0,0 +1,80 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.PortConfig;
|
||||||
|
import net.dnorberg.rivencraft.age.PortSeasonPolicies;
|
||||||
|
import net.dnorberg.rivencraft.age.PortSeasonPolicies.Mode;
|
||||||
|
import net.dnorberg.rivencraft.age.RuntimeAgeBackend;
|
||||||
|
import net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
import net.neoforged.neoforge.network.PacketDistributor;
|
||||||
|
import net.neoforged.neoforge.event.level.LevelEvent;
|
||||||
|
import net.neoforged.neoforge.event.entity.player.PlayerEvent;
|
||||||
|
import net.neoforged.neoforge.event.tick.LevelTickEvent;
|
||||||
|
|
||||||
|
/** Common optional boundary: only its guarded adapter loads Serene/GlitchCore APIs. */
|
||||||
|
public final class SereneSeasonsCompatibility {
|
||||||
|
private static final java.util.concurrent.atomic.AtomicBoolean WARNED = new java.util.concurrent.atomic.AtomicBoolean();
|
||||||
|
private SereneSeasonsCompatibility() {}
|
||||||
|
public static boolean available() { return ModList.get().isLoaded("sereneseasons"); }
|
||||||
|
private static boolean isAge(Identifier id) { return id.getNamespace().equals("rivencraft") && id.getPath().startsWith("age/"); }
|
||||||
|
private static Boolean enabled(ServerLevel level) {
|
||||||
|
var policy = PortSeasonPolicies.get(level.getServer()).forLevel(level);
|
||||||
|
if (policy.mode() != Mode.NO_SEASONS && !policy.authored() && !PortConfig.AUTO_WHITELIST_SERENE_AGES.get()) return null;
|
||||||
|
return policy.mode() != Mode.NO_SEASONS;
|
||||||
|
}
|
||||||
|
public static void apply(ServerLevel level) {
|
||||||
|
if (!available() || !isAge(level.dimension().identifier())) return;
|
||||||
|
try {
|
||||||
|
Boolean enabled = enabled(level);
|
||||||
|
if (enabled == null) return;
|
||||||
|
var id = level.dimension().identifier();
|
||||||
|
SereneSeasonsAdapter.setServerWhitelist(id, enabled);
|
||||||
|
if (enabled) {
|
||||||
|
var mode = PortSeasonPolicies.get(level.getServer()).forLevel(level).mode();
|
||||||
|
if (mode.eternal()) SereneSeasonsAdapter.holdSeason(level, mode);
|
||||||
|
}
|
||||||
|
for (var player : level.getServer().getPlayerList().getPlayers()) send(player, id, enabled);
|
||||||
|
} catch (RuntimeException | LinkageError e) { warn(e); }
|
||||||
|
}
|
||||||
|
public static void onLevelLoad(LevelEvent.Load event) {
|
||||||
|
if (event.getLevel() instanceof ServerLevel level && isAge(level.dimension().identifier())
|
||||||
|
&& RuntimeAgeBackend.savedAges(level.getServer()).containsKey(level.dimension().identifier())) apply(level);
|
||||||
|
}
|
||||||
|
public static void onLogin(PlayerEvent.PlayerLoggedInEvent event) {
|
||||||
|
if (!available() || !(event.getEntity() instanceof ServerPlayer player)) return;
|
||||||
|
for (var level : player.level().getServer().getAllLevels()) if (isAge(level.dimension().identifier())) {
|
||||||
|
Boolean enabled = enabled(level);
|
||||||
|
if (enabled != null) send(player, level.dimension().identifier(), enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static void onLevelTickPost(LevelTickEvent.Post event) {
|
||||||
|
if (!available() || !(event.getLevel() instanceof ServerLevel level) || !isAge(level.dimension().identifier())) return;
|
||||||
|
var policy = PortSeasonPolicies.get(level.getServer()).forLevel(level);
|
||||||
|
if (!policy.mode().eternal() || !policy.authored() && !PortConfig.AUTO_WHITELIST_SERENE_AGES.get()) return;
|
||||||
|
try { SereneSeasonsAdapter.holdSeason(level, policy.mode()); }
|
||||||
|
catch (RuntimeException | LinkageError e) { warn(e); }
|
||||||
|
}
|
||||||
|
public static void retired(MinecraftServer server, Identifier id) {
|
||||||
|
if (!available()) return;
|
||||||
|
try {
|
||||||
|
SereneSeasonsAdapter.setServerWhitelist(id, false);
|
||||||
|
for (var player : server.getPlayerList().getPlayers()) send(player, id, false);
|
||||||
|
} catch (RuntimeException | LinkageError e) { warn(e); }
|
||||||
|
}
|
||||||
|
private static void send(ServerPlayer player, Identifier id, boolean enabled) {
|
||||||
|
PacketDistributor.sendToPlayer(player, new SereneAgeWhitelistPayload(id, enabled));
|
||||||
|
}
|
||||||
|
public static void acceptClient(Identifier id, boolean enabled) {
|
||||||
|
if (!available() || !isAge(id)) return;
|
||||||
|
try { SereneSeasonsAdapter.setClientWhitelist(id, enabled); }
|
||||||
|
catch (RuntimeException | LinkageError e) { warn(e); }
|
||||||
|
}
|
||||||
|
private static void warn(Throwable e) {
|
||||||
|
if (WARNED.compareAndSet(false, true)) Rivencraft.LOGGER.warn("Could not apply optional Serene Seasons policy", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.WeakHashMap;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
import net.neoforged.neoforge.event.TagsUpdatedEvent;
|
||||||
|
|
||||||
|
/** Optional API boundary with registry-scoped pools and cheap worldgen membership queries. */
|
||||||
|
public final class TerraBlenderBiomes {
|
||||||
|
private record Pools(List<Identifier> overworld, List<Identifier> nether) {}
|
||||||
|
private static final Pools EMPTY = new Pools(List.of(), List.of());
|
||||||
|
private static final Map<RegistryAccess, Pools> POOLS = new WeakHashMap<>();
|
||||||
|
private static final Map<Holder<Biome>, Boolean> NETHER_MEMBERSHIP = new WeakHashMap<>();
|
||||||
|
private static final AtomicBoolean WARNED = new AtomicBoolean();
|
||||||
|
private TerraBlenderBiomes() {}
|
||||||
|
public static List<Identifier> overworld(HolderLookup.Provider registries) { return prepare(registries).overworld(); }
|
||||||
|
public static List<Identifier> nether(HolderLookup.Provider registries) { return prepare(registries).nether(); }
|
||||||
|
public static synchronized boolean isNether(Holder<Biome> biome) {
|
||||||
|
return Boolean.TRUE.equals(NETHER_MEMBERSHIP.get(biome));
|
||||||
|
}
|
||||||
|
public static void onServerAboutToStart(net.neoforged.neoforge.event.server.ServerAboutToStartEvent event) {
|
||||||
|
// TerraBlender loads data-driven regions at normal priority in this event.
|
||||||
|
// Refresh after that, even if tags were seen before those regions existed.
|
||||||
|
synchronized (TerraBlenderBiomes.class) { POOLS.remove(event.getServer().registryAccess()); }
|
||||||
|
prepare(event.getServer().registryAccess());
|
||||||
|
}
|
||||||
|
public static void onTagsUpdated(TagsUpdatedEvent event) {
|
||||||
|
// Server/client registry objects have independent cache entries.
|
||||||
|
synchronized (TerraBlenderBiomes.class) { POOLS.remove(event.getRegistries()); }
|
||||||
|
prepare(event.getRegistries());
|
||||||
|
}
|
||||||
|
private static synchronized Pools prepare(HolderLookup.Provider provider) {
|
||||||
|
if (!ModList.get().isLoaded("terrablender") || !(provider instanceof RegistryAccess registries)) return EMPTY;
|
||||||
|
Pools cached = POOLS.get(registries);
|
||||||
|
if (cached != null) return cached;
|
||||||
|
Pools pools = EMPTY;
|
||||||
|
try {
|
||||||
|
pools = new Pools(TerraBlenderRegionAdapter.collect(registries, false),
|
||||||
|
TerraBlenderRegionAdapter.collect(registries, true));
|
||||||
|
} catch (RuntimeException | LinkageError exception) {
|
||||||
|
if (WARNED.compareAndSet(false, true)) Rivencraft.LOGGER.warn(
|
||||||
|
"TerraBlender biome regions could not be read; using registry tags and native biome pools", exception);
|
||||||
|
}
|
||||||
|
POOLS.put(registries, pools);
|
||||||
|
var nether = java.util.Set.copyOf(pools.nether());
|
||||||
|
registries.lookupOrThrow(Registries.BIOME).listElements().forEach(holder ->
|
||||||
|
NETHER_MEMBERSHIP.put(holder, nether.contains(holder.key().identifier())));
|
||||||
|
return pools;
|
||||||
|
}
|
||||||
|
}
|
||||||
+35
@@ -0,0 +1,35 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat;
|
||||||
|
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import terrablender.api.Region;
|
||||||
|
import terrablender.api.RegionType;
|
||||||
|
import terrablender.api.Regions;
|
||||||
|
|
||||||
|
/** Loaded only after the optional TerraBlender mod is confirmed present. */
|
||||||
|
final class TerraBlenderRegionAdapter {
|
||||||
|
private TerraBlenderRegionAdapter() {}
|
||||||
|
|
||||||
|
static List<Identifier> collect(RegistryAccess registries, boolean nether) {
|
||||||
|
var biomes = registries.lookupOrThrow(Registries.BIOME);
|
||||||
|
RegionType type = nether ? RegionType.NETHER : RegionType.OVERWORLD;
|
||||||
|
Set<Identifier> ids = new LinkedHashSet<>();
|
||||||
|
for (Region region : Regions.get(type)) {
|
||||||
|
region.addBiomes(biomes, mapping -> {
|
||||||
|
ResourceKey<Biome> key = mapping.getSecond();
|
||||||
|
Identifier id = key.identifier();
|
||||||
|
// Vanilla's default region is always present. Only additions from
|
||||||
|
// other mods extend an Age's existing deterministic biome pool.
|
||||||
|
if (!id.getNamespace().equals("minecraft") && !id.equals(
|
||||||
|
net.dnorberg.rivencraft.writing.PortRegistryPages.DEFERRED_PLACEHOLDER) && biomes.containsKey(id)) ids.add(id);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return ids.stream().sorted().toList();
|
||||||
|
}
|
||||||
|
}
|
||||||
+234
@@ -0,0 +1,234 @@
|
|||||||
|
package net.dnorberg.rivencraft.compat.jei;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import mezz.jei.api.IModPlugin;
|
||||||
|
import mezz.jei.api.JeiPlugin;
|
||||||
|
import mezz.jei.api.constants.VanillaTypes;
|
||||||
|
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
|
||||||
|
import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
|
||||||
|
import mezz.jei.api.helpers.IGuiHelper;
|
||||||
|
import mezz.jei.api.recipe.IFocusGroup;
|
||||||
|
import mezz.jei.api.recipe.types.IRecipeType;
|
||||||
|
import mezz.jei.api.recipe.category.AbstractRecipeCategory;
|
||||||
|
import mezz.jei.api.registration.IRecipeCatalystRegistration;
|
||||||
|
import mezz.jei.api.registration.IRecipeCategoryRegistration;
|
||||||
|
import mezz.jei.api.registration.IRecipeRegistration;
|
||||||
|
import mezz.jei.api.registration.ISubtypeRegistration;
|
||||||
|
import mezz.jei.api.registration.IExtraIngredientRegistration;
|
||||||
|
import mezz.jei.api.ingredients.subtypes.ISubtypeInterpreter;
|
||||||
|
import mezz.jei.api.runtime.IJeiRuntime;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.item.LinkProperties;
|
||||||
|
import net.dnorberg.rivencraft.writing.PortSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModCreativeTabs;
|
||||||
|
import net.dnorberg.rivencraft.writing.InkModifierIngredients;
|
||||||
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||||
|
import net.minecraft.core.component.DataComponents;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.MutableComponent;
|
||||||
|
import net.minecraft.resources.Identifier;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.Items;
|
||||||
|
|
||||||
|
/** Loaded by JEI's plugin scanner only when JEI is installed. No common mod class references this type. */
|
||||||
|
@JeiPlugin
|
||||||
|
public final class RivencraftJeiPlugin implements IModPlugin {
|
||||||
|
private static final IRecipeType<WritingGuide> WRITING =
|
||||||
|
IRecipeType.create(Rivencraft.MOD_ID, "writing", WritingGuide.class);
|
||||||
|
private static final IRecipeType<InkMixerGuide> INK_MIXER =
|
||||||
|
IRecipeType.create(Rivencraft.MOD_ID, "ink_mixer", InkMixerGuide.class);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Identifier getPluginUid() {
|
||||||
|
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "jei_writing");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerItemSubtypes(ISubtypeRegistration registration) {
|
||||||
|
registration.registerSubtypeInterpreter(Rivencraft.PAGE.get(),
|
||||||
|
(ISubtypeInterpreter<ItemStack>) (stack, context) -> {
|
||||||
|
PageContent content = PageItem.content(stack);
|
||||||
|
return switch (content.kind()) {
|
||||||
|
case BLANK -> "blank";
|
||||||
|
case LINK_PANEL -> "link_panel:" + stack.getOrDefault(
|
||||||
|
Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE).flags();
|
||||||
|
case SYMBOL -> "symbol:" + content.symbol().orElseThrow().id();
|
||||||
|
case UNRESOLVED_SYMBOL -> "unresolved:" + content.symbol().orElseThrow().id();
|
||||||
|
};
|
||||||
|
});
|
||||||
|
registration.registerSubtypeInterpreter(Rivencraft.SYMBOL_PORTFOLIO.get(),
|
||||||
|
(ISubtypeInterpreter<ItemStack>) (stack, context) -> {
|
||||||
|
Component name = stack.get(DataComponents.CUSTOM_NAME);
|
||||||
|
return name == null ? "empty" : name.getString();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerExtraIngredients(IExtraIngredientRegistration registration) {
|
||||||
|
List<ItemStack> pages = new ArrayList<>();
|
||||||
|
pages.addAll(PageItem.creativeLinkPanelPages());
|
||||||
|
var connection = Minecraft.getInstance().getConnection();
|
||||||
|
if (connection != null) {
|
||||||
|
pages.addAll(symbolPages(connection.registryAccess()));
|
||||||
|
pages.addAll(ModCreativeTabs.creativeSymbolPortfolios(connection.registryAccess()));
|
||||||
|
} else {
|
||||||
|
PortSymbolPages.sealedCandidateIds().stream().map(PageItem::createSymbolPage).forEach(pages::add);
|
||||||
|
}
|
||||||
|
registration.addExtraItemStacks(pages);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRuntimeAvailable(IJeiRuntime runtime) {
|
||||||
|
// JEI discovers the base Page item as a blank stack; only authored pages belong in its list.
|
||||||
|
runtime.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK,
|
||||||
|
List.of(new ItemStack(Rivencraft.PAGE.get()), new ItemStack(Rivencraft.SYMBOL_PORTFOLIO.get())));
|
||||||
|
var connection = Minecraft.getInstance().getConnection();
|
||||||
|
if (connection == null) return;
|
||||||
|
Set<Identifier> known = runtime.getIngredientManager().getAllItemStacks().stream()
|
||||||
|
.filter(stack -> stack.is(Rivencraft.PAGE.get()))
|
||||||
|
.map(PageItem::content)
|
||||||
|
.filter(content -> content.kind() == PageContent.Kind.SYMBOL)
|
||||||
|
.map(content -> content.symbol().orElseThrow().id())
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
List<ItemStack> missing = symbolPages(connection.registryAccess()).stream()
|
||||||
|
.filter(stack -> !known.contains(PageItem.content(stack).symbol().orElseThrow().id()))
|
||||||
|
.toList();
|
||||||
|
if (!missing.isEmpty()) {
|
||||||
|
runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, missing);
|
||||||
|
}
|
||||||
|
Set<String> knownPortfolios = runtime.getIngredientManager().getAllItemStacks().stream()
|
||||||
|
.filter(stack -> stack.is(Rivencraft.SYMBOL_PORTFOLIO.get()))
|
||||||
|
.map(stack -> stack.get(DataComponents.CUSTOM_NAME))
|
||||||
|
.filter(java.util.Objects::nonNull)
|
||||||
|
.map(Component::getString)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
List<ItemStack> missingPortfolios = ModCreativeTabs.creativeSymbolPortfolios(connection.registryAccess())
|
||||||
|
.stream()
|
||||||
|
.filter(stack -> !knownPortfolios.contains(stack.getHoverName().getString()))
|
||||||
|
.toList();
|
||||||
|
if (!missingPortfolios.isEmpty()) {
|
||||||
|
runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, missingPortfolios);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ItemStack> symbolPages(net.minecraft.core.HolderLookup.Provider registries) {
|
||||||
|
return PortSymbolPages.categories().stream().flatMap(category -> PortSymbolPages.pages(category, registries).stream()).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerCategories(IRecipeCategoryRegistration registration) {
|
||||||
|
IGuiHelper guiHelper = registration.getJeiHelpers().getGuiHelper();
|
||||||
|
registration.addRecipeCategories(new WritingCategory(guiHelper), new InkMixerCategory(guiHelper));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerRecipes(IRecipeRegistration registration) {
|
||||||
|
registration.addItemStackInfo(new ItemStack(Rivencraft.LINK_MODIFIER_ITEM.get()),
|
||||||
|
Component.translatable("jei.rivencraft.link_modifier"));
|
||||||
|
ItemStack panel = PageItem.createLinkPanelPage();
|
||||||
|
ItemStack symbolPage = PageItem.createSymbolPage(new SymbolReference(
|
||||||
|
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "terrain/standard")));
|
||||||
|
registration.addRecipes(WRITING, List.of(
|
||||||
|
new WritingGuide(List.of(new ItemStack(Items.PAPER), new ItemStack(Rivencraft.INK_VIAL.get())),
|
||||||
|
panel, "jei.rivencraft.writing.link_panel_hand"),
|
||||||
|
new WritingGuide(List.of(symbolPage, new ItemStack(Items.PAPER), new ItemStack(Rivencraft.INK_VIAL.get())),
|
||||||
|
symbolPage, "jei.rivencraft.writing.copy"),
|
||||||
|
new WritingGuide(List.of(new ItemStack(Items.LEATHER), panel),
|
||||||
|
new ItemStack(Rivencraft.DESCRIPTIVE_BOOK.get()), "jei.rivencraft.writing.bind"),
|
||||||
|
new WritingGuide(List.of(panel, new ItemStack(Items.LEATHER)),
|
||||||
|
new ItemStack(Rivencraft.LINKING_BOOK.get()), "jei.rivencraft.writing.linking_book")
|
||||||
|
));
|
||||||
|
List<InkMixerGuide> mixerGuides = new ArrayList<>();
|
||||||
|
mixerGuides.add(new InkMixerGuide(panel, null));
|
||||||
|
InkModifierIngredients.builtIn().forEach(ingredient ->
|
||||||
|
mixerGuides.add(new InkMixerGuide(panel, ingredient)));
|
||||||
|
registration.addRecipes(INK_MIXER, mixerGuides);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
|
||||||
|
registration.addCraftingStation(WRITING, Rivencraft.INK_VIAL.get(),
|
||||||
|
Rivencraft.WRITING_DESK_ITEM.get(), Rivencraft.BOOK_BINDER_ITEM.get());
|
||||||
|
registration.addCraftingStation(INK_MIXER, Rivencraft.INK_MIXER_ITEM.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
private record WritingGuide(List<ItemStack> inputs, ItemStack output, String instructionKey) {}
|
||||||
|
private record InkMixerGuide(ItemStack panel, InkModifierIngredients.Ingredient additive) {}
|
||||||
|
|
||||||
|
private static final class InkMixerCategory extends AbstractRecipeCategory<InkMixerGuide> {
|
||||||
|
InkMixerCategory(IGuiHelper guiHelper) {
|
||||||
|
super(INK_MIXER, Component.translatable("jei.rivencraft.ink_mixer"),
|
||||||
|
guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK,
|
||||||
|
new ItemStack(Rivencraft.INK_MIXER_ITEM.get())), 138, 110);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setRecipe(IRecipeLayoutBuilder builder, InkMixerGuide recipe, IFocusGroup focuses) {
|
||||||
|
builder.addInputSlot(2, 3).setStandardSlotBackground().add(new ItemStack(Items.PAPER));
|
||||||
|
builder.addInputSlot(23, 3).setStandardSlotBackground()
|
||||||
|
.add(new ItemStack(Rivencraft.INK_VIAL.get()));
|
||||||
|
if (recipe.additive() != null)
|
||||||
|
builder.addInputSlot(44, 3).setStandardSlotBackground()
|
||||||
|
.add(recipe.additive().item());
|
||||||
|
builder.addOutputSlot(112, 3).setOutputSlotBackground().add(recipe.panel());
|
||||||
|
builder.addOutputSlot(112, 46).setStandardSlotBackground()
|
||||||
|
.add(new ItemStack(Items.GLASS_BOTTLE));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(InkMixerGuide recipe, IRecipeSlotsView slots, GuiGraphicsExtractor graphics,
|
||||||
|
double mouseX, double mouseY) {
|
||||||
|
Component instructions = recipe.additive() == null
|
||||||
|
? Component.translatable("jei.rivencraft.ink_mixer.usage")
|
||||||
|
: additiveInstructions(recipe.additive());
|
||||||
|
graphics.textWithWordWrap(Minecraft.getInstance().font, instructions, 2, 27, 104, 0xFF404040, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Component additiveInstructions(InkModifierIngredients.Ingredient additive) {
|
||||||
|
MutableComponent effects = Component.empty();
|
||||||
|
for (InkModifierIngredients.Effect effect : additive.effects()) {
|
||||||
|
if (!effects.getSiblings().isEmpty()) effects.append(", ");
|
||||||
|
effects.append(Component.translatable("jei.rivencraft.ink_mixer.effect",
|
||||||
|
Component.translatable("item.rivencraft.link_property." + switch (effect.flag()) {
|
||||||
|
case LinkProperties.DISARM -> "disarm";
|
||||||
|
case LinkProperties.MAINTAIN_MOMENTUM -> "maintain_momentum";
|
||||||
|
case LinkProperties.INTRA_LINKING -> "intra_linking";
|
||||||
|
default -> throw new IllegalArgumentException("Unknown mixer modifier");
|
||||||
|
}), Math.round(effect.chance() * 100)));
|
||||||
|
}
|
||||||
|
return Component.translatable("jei.rivencraft.ink_mixer.additive", effects);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class WritingCategory extends AbstractRecipeCategory<WritingGuide> {
|
||||||
|
WritingCategory(IGuiHelper guiHelper) {
|
||||||
|
super(WRITING, Component.translatable("jei.rivencraft.writing"),
|
||||||
|
guiHelper.createDrawableIngredient(VanillaTypes.ITEM_STACK,
|
||||||
|
new ItemStack(Rivencraft.WRITING_DESK_ITEM.get())), 138, 80);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setRecipe(IRecipeLayoutBuilder builder, WritingGuide recipe, IFocusGroup focuses) {
|
||||||
|
for (int index = 0; index < recipe.inputs().size(); index++) {
|
||||||
|
builder.addInputSlot(2 + index * 21, 3).setStandardSlotBackground()
|
||||||
|
.add(recipe.inputs().get(index));
|
||||||
|
}
|
||||||
|
builder.addOutputSlot(112, 3).setOutputSlotBackground().add(recipe.output());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(WritingGuide recipe, IRecipeSlotsView slots, GuiGraphicsExtractor graphics,
|
||||||
|
double mouseX, double mouseY) {
|
||||||
|
graphics.textWithWordWrap(Minecraft.getInstance().font,
|
||||||
|
Component.translatable(recipe.instructionKey()), 2, 27, 134, 0xFF404040, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package net.dnorberg.rivencraft.entity;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.entity.EntityType;
|
||||||
|
import net.minecraft.world.entity.item.ItemEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.storage.ValueInput;
|
||||||
|
import net.minecraft.world.level.storage.ValueOutput;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
|
||||||
|
/** Recoverable open-book entity, with the 1.21.1 decay and weather behavior. */
|
||||||
|
public final class DroppedBookEntity extends ItemEntity {
|
||||||
|
private static final int SLOW_DECAY_INTERVAL = 10_000;
|
||||||
|
private int decayTicks;
|
||||||
|
|
||||||
|
public DroppedBookEntity(EntityType<? extends DroppedBookEntity> type, Level level) { super(type, level); }
|
||||||
|
|
||||||
|
public DroppedBookEntity(Level level, Vec3 position, ItemStack book) {
|
||||||
|
this(Rivencraft.DROPPED_BOOK.get(), level);
|
||||||
|
setPos(position.x, position.y + 0.25, position.z);
|
||||||
|
setDeltaMovement(Vec3.ZERO);
|
||||||
|
setItem(book);
|
||||||
|
setUnlimitedLifetime();
|
||||||
|
setPickUpDelay(20);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Conversion preserves ordinary toss/drop state; the travel constructor has different placement rules. */
|
||||||
|
public static DroppedBookEntity fromDrop(ItemEntity source) {
|
||||||
|
var book = new DroppedBookEntity(Rivencraft.DROPPED_BOOK.get(), source.level());
|
||||||
|
book.restoreFrom(source);
|
||||||
|
// The original remains registered until replacement succeeds, so this needs a new identity.
|
||||||
|
book.setUUID(java.util.UUID.randomUUID());
|
||||||
|
book.setItem(source.getItem().copy());
|
||||||
|
book.setUnlimitedLifetime();
|
||||||
|
return book;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
if (!(level() instanceof ServerLevel serverLevel) || isRemoved()) return;
|
||||||
|
if (++decayTicks >= SLOW_DECAY_INTERVAL) {
|
||||||
|
decayTicks = 0;
|
||||||
|
hurtServer(serverLevel, damageSources().starve(), 1.0F);
|
||||||
|
}
|
||||||
|
if (!isRemoved() && isInWaterOrRain()) hurtServer(serverLevel, damageSources().drown(), 1.0F);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void addAdditionalSaveData(ValueOutput output) {
|
||||||
|
super.addAdditionalSaveData(output);
|
||||||
|
output.putInt("BookDecayTicks", decayTicks);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void readAdditionalSaveData(ValueInput input) {
|
||||||
|
super.readAdditionalSaveData(input);
|
||||||
|
decayTicks = Math.clamp(input.getIntOr("BookDecayTicks", 0), 0, SLOW_DECAY_INTERVAL - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
+40
@@ -0,0 +1,40 @@
|
|||||||
|
package net.dnorberg.rivencraft.event;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BookStandBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.sounds.SoundEvents;
|
||||||
|
import net.minecraft.sounds.SoundSource;
|
||||||
|
import net.minecraft.world.InteractionHand;
|
||||||
|
import net.minecraft.world.InteractionResult;
|
||||||
|
import net.minecraft.world.entity.player.Player;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.LecternBlock;
|
||||||
|
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
|
||||||
|
|
||||||
|
public final class BookStandConversionHandler {
|
||||||
|
private BookStandConversionHandler() {}
|
||||||
|
public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
|
||||||
|
var book = event.getItemStack();
|
||||||
|
if (!book.is(Rivencraft.LINKING_BOOK.get()) && !book.is(Rivencraft.DESCRIPTIVE_BOOK.get()) && !book.is(Rivencraft.PAGE.get())) return;
|
||||||
|
var state = event.getLevel().getBlockState(event.getPos());
|
||||||
|
if (!state.is(Blocks.LECTERN) || state.getValue(LecternBlock.HAS_BOOK)) return;
|
||||||
|
event.setCanceled(true);
|
||||||
|
event.setCancellationResult(InteractionResult.SUCCESS);
|
||||||
|
if (!event.getLevel().isClientSide()) convert(event.getEntity(), event.getHand(), event.getPos());
|
||||||
|
}
|
||||||
|
public static boolean convert(Player player, InteractionHand hand, BlockPos pos) {
|
||||||
|
var level = player.level();
|
||||||
|
var state = level.getBlockState(pos);
|
||||||
|
var book = player.getItemInHand(hand);
|
||||||
|
if (level.isClientSide() || !state.is(Blocks.LECTERN) || state.getValue(LecternBlock.HAS_BOOK)
|
||||||
|
|| (!book.is(Rivencraft.LINKING_BOOK.get()) && !book.is(Rivencraft.DESCRIPTIVE_BOOK.get()) && !book.is(Rivencraft.PAGE.get()))) return false;
|
||||||
|
if (!level.setBlock(pos, Rivencraft.BOOK_STAND.get().defaultBlockState()
|
||||||
|
.setValue(BookStandBlock.FACING, state.getValue(LecternBlock.FACING)).setValue(BookStandBlock.HAS_BOOK, true), 3)) return false;
|
||||||
|
if (!(level.getBlockEntity(pos) instanceof BookStandBlockEntity stand)) return false;
|
||||||
|
stand.setBook(book.consumeAndReturn(1, player));
|
||||||
|
level.playSound(null, pos, SoundEvents.BOOK_PUT, SoundSource.BLOCKS, 1, 1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
package net.dnorberg.rivencraft.event;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.entity.DroppedBookEntity;
|
||||||
|
import net.minecraft.server.TickTask;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.entity.item.ItemEntity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.neoforged.bus.api.EventPriority;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
|
||||||
|
|
||||||
|
/** Converts ordinary book drops from every source, including entities restored from disk. */
|
||||||
|
@EventBusSubscriber(modid = Rivencraft.MOD_ID)
|
||||||
|
public final class DroppedBookConversionHandler {
|
||||||
|
private DroppedBookConversionHandler() {}
|
||||||
|
|
||||||
|
@SubscribeEvent(priority = EventPriority.LOWEST)
|
||||||
|
public static void onJoin(EntityJoinLevelEvent event) {
|
||||||
|
if (!(event.getLevel() instanceof ServerLevel level)
|
||||||
|
|| !(event.getEntity() instanceof ItemEntity item) || item instanceof DroppedBookEntity
|
||||||
|
|| !isBook(item.getItem())) return;
|
||||||
|
// Join events can run before chunk promotion. Do not add another entity inside that callback.
|
||||||
|
// Keep the original until the queued replacement has actually been accepted.
|
||||||
|
level.getServer().schedule(new TickTask(0, () -> {
|
||||||
|
if (level.getServer().getLevel(level.dimension()) != level || item.isRemoved()
|
||||||
|
|| !item.isAddedToLevel() || item.level() != level || !isBook(item.getItem())) return;
|
||||||
|
var replacement = DroppedBookEntity.fromDrop(item);
|
||||||
|
if (level.addFreshEntity(replacement)) item.discard();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isBook(ItemStack stack) {
|
||||||
|
return stack.is(Rivencraft.LINKING_BOOK.get()) || stack.is(Rivencraft.DESCRIPTIVE_BOOK.get());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package net.dnorberg.rivencraft.item;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
|
/** Legacy's compact page collection, using the existing Notebook page editor. */
|
||||||
|
public final class CollationFolderItem extends NotebookItem {
|
||||||
|
public static final int MAX_PAGES = 27;
|
||||||
|
|
||||||
|
public CollationFolderItem(Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isCollection(ItemStack stack) {
|
||||||
|
return stack.is(Rivencraft.NOTEBOOK.get()) || stack.is(Rivencraft.COLLATION_FOLDER.get())
|
||||||
|
|| stack.is(Rivencraft.SYMBOL_PORTFOLIO.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int capacity(ItemStack stack) {
|
||||||
|
return stack.is(Rivencraft.COLLATION_FOLDER.get()) ? MAX_PAGES
|
||||||
|
: stack.is(Rivencraft.NOTEBOOK.get()) || stack.is(Rivencraft.SYMBOL_PORTFOLIO.get())
|
||||||
|
? NotebookContents.MAX_PAGES : 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,5 +36,6 @@ public final class DescriptiveBookItem extends Item {
|
|||||||
Consumer<Component> tooltip, TooltipFlag flag) {
|
Consumer<Component> tooltip, TooltipFlag flag) {
|
||||||
Identifier id = stack.get(Rivencraft.AGE_BOOK_ID.get());
|
Identifier id = stack.get(Rivencraft.AGE_BOOK_ID.get());
|
||||||
tooltip.accept(Component.literal(id == null ? "Unbound (26.3 port preview)" : "Age: " + id));
|
tooltip.accept(Component.literal(id == null ? "Unbound (26.3 port preview)" : "Age: " + id));
|
||||||
|
stack.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE).forDescriptiveBook().appendTooltip(tooltip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,13 +3,13 @@ package net.dnorberg.rivencraft.item;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.util.Prediction;
|
|
||||||
import net.minecraft.world.InteractionHand;
|
import net.minecraft.world.InteractionHand;
|
||||||
import net.minecraft.world.InteractionResult;
|
import net.minecraft.world.InteractionResult;
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.Items;
|
import net.minecraft.world.item.Items;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||||
import net.minecraft.world.item.TooltipFlag;
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
import net.minecraft.world.item.component.TooltipDisplay;
|
import net.minecraft.world.item.component.TooltipDisplay;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
@@ -17,8 +17,6 @@ import net.minecraft.world.level.Level;
|
|||||||
/** A stackable 16-use vial; using it with paper in the other hand prepares a Link Panel. */
|
/** A stackable 16-use vial; using it with paper in the other hand prepares a Link Panel. */
|
||||||
public final class InkVialItem extends Item {
|
public final class InkVialItem extends Item {
|
||||||
public static final int CAPACITY = 16;
|
public static final int CAPACITY = 16;
|
||||||
// Match the 1.21.1 default; port the configurable cost with the full configuration system.
|
|
||||||
public static final int LINK_PANEL_COST = 2;
|
|
||||||
|
|
||||||
public InkVialItem(Properties properties) {
|
public InkVialItem(Properties properties) {
|
||||||
super(properties);
|
super(properties);
|
||||||
@@ -30,37 +28,16 @@ public final class InkVialItem extends Item {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public InteractionResult use(Level level, Player player, InteractionHand hand) {
|
public InteractionResult use(Level level, Player player, InteractionHand hand) {
|
||||||
InteractionHand paperHand = hand == InteractionHand.MAIN_HAND
|
if (level.isClientSide()) {
|
||||||
? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
|
// LOCAL gameplay config is not synchronized. Predict only item eligibility;
|
||||||
ItemStack vial = player.getItemInHand(hand);
|
// the server decides affordability using its own configured cost.
|
||||||
ItemStack paper = player.getItemInHand(paperHand);
|
var paperHand = hand == InteractionHand.MAIN_HAND ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
|
||||||
int ink = remaining(vial);
|
int ink = remaining(player.getItemInHand(hand));
|
||||||
if (!vial.is(Rivencraft.INK_VIAL.get()) || !paper.is(Items.PAPER)
|
return player.getItemInHand(hand).is(Rivencraft.INK_VIAL.get())
|
||||||
|| ink < LINK_PANEL_COST || ink > CAPACITY) {
|
&& player.getItemInHand(paperHand).is(Items.PAPER) && ink > 0 && ink <= CAPACITY
|
||||||
return InteractionResult.PASS;
|
? InteractionResult.SUCCESS : InteractionResult.PASS;
|
||||||
}
|
}
|
||||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
return WritingInkService.prepareLinkPanel(player, hand) ? InteractionResult.SUCCESS : InteractionResult.PASS;
|
||||||
|
|
||||||
ItemStack panel = PageItem.createLinkPanelPage();
|
|
||||||
int newInk = ink - LINK_PANEL_COST;
|
|
||||||
ItemStack spentVial = newInk == 0
|
|
||||||
? new ItemStack(Items.GLASS_BOTTLE)
|
|
||||||
: new ItemStack(Rivencraft.INK_VIAL.get());
|
|
||||||
if (newInk > 0) spentVial.set(Rivencraft.INK_REMAINING.get(), newInk);
|
|
||||||
|
|
||||||
if (paper.getCount() == 1) {
|
|
||||||
player.setItemInHand(paperHand, panel);
|
|
||||||
} else {
|
|
||||||
paper.shrink(1);
|
|
||||||
giveOrDrop(player, panel);
|
|
||||||
}
|
|
||||||
if (vial.getCount() == 1) {
|
|
||||||
player.setItemInHand(hand, spentVial);
|
|
||||||
} else {
|
|
||||||
vial.shrink(1);
|
|
||||||
giveOrDrop(player, spentVial);
|
|
||||||
}
|
|
||||||
return InteractionResult.SUCCESS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -70,7 +47,4 @@ public final class InkVialItem extends Item {
|
|||||||
tooltip.accept(Component.translatable("item.rivencraft.ink_vial.usage"));
|
tooltip.accept(Component.translatable("item.rivencraft.ink_vial.usage"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void giveOrDrop(Player player, ItemStack stack) {
|
|
||||||
if (!player.getInventory().add(stack)) player.drop(stack, false, Prediction.SERVER_ONLY);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Loaded 100 of 162 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user