Release 26.3.0.1 with live Reborn views and random page policies
Build / build (push) Canceled after 0s

This commit is contained in:
dnorberg committed 2026-11-11 17:15:46 -05:00
1 parent f9097967b9
commit 41daff1e61
59 files changed
+1997 -148

No files matched your search

@@ -7,6 +7,10 @@ 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.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_ALLOWLIST;
public static final ModConfigSpec.ConfigValue<java.util.List<? extends String>> RANDOM_PAGE_BLOCKLIST;
public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS;
public static final ModConfigSpec.BooleanValue CRYSTAL_LIVE_VIEWS;
public static final ModConfigSpec SPEC;
public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES;
public static final ModConfigSpec.IntValue SYMBOL_INK_COST;
@@ -17,6 +21,26 @@ public final class PortConfig {
static {
var builder = new ModConfigSpec.Builder();
builder.push("book_previews");
LIVE_BOOK_PREVIEWS = builder.comment("Show live rotating destination views when Immersive Portals Reborn is installed on client and server.",
"Disable locally to retain the animated Legacy link panels.")
.define("reborn_live_views", true);
CRYSTAL_LIVE_VIEWS = builder.comment("Server option: create native live crystal portal surfaces when Reborn is installed.",
"Disabling keeps crystal portal travel with the animated surface.")
.define("reborn_crystal_live_views", true);
builder.pop();
builder.push("random_pages");
RANDOM_PAGE_ALLOWLIST = builder.comment(
"Page paths allowed in new random Ages and newly generated library pages.",
"Restricts only categories it mentions; other categories remain unrestricted.",
"Example: [\"sky/static\"]; full namespaced IDs are accepted too.")
.defineList("allowlist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
RANDOM_PAGE_BLOCKLIST = builder.comment(
"Page paths excluded from new random Ages and newly generated library pages.",
"Blocklist wins. Existing Ages, Creative/JEI pages and manually authored books remain usable.",
"Required empty categories use safe defaults; Native biomes come from the preset, not biome pages.")
.defineList("blocklist", java.util.List.<String>of(), () -> "sky/static", PortConfig::validPageId);
builder.pop();
builder.push("serene_seasons");
AUTO_WHITELIST_SERENE_AGES = builder.comment("Automatically whitelist Ages with seed-selected/legacy cycling seasons. Explicit pages still apply; existing entries are preserved when disabled.")
.define("auto_whitelist_ages", true);
@@ -47,5 +71,10 @@ public final class PortConfig {
SPEC = builder.build();
}
private static boolean validPageId(Object value) {
if (!(value instanceof String id)) return false;
try { net.dnorberg.rivencraft.age.PortRandomPagePolicy.parsePageId(id); return true; }
catch (IllegalArgumentException exception) { return false; }
}
private PortConfig() {}
}
@@ -249,10 +249,13 @@ public final class Rivencraft {
COMPONENTS.register(modEventBus);
RECIPE_SERIALIZERS.register(modEventBus);
net.dnorberg.rivencraft.compat.RuinsCompatibility.register();
net.dnorberg.rivencraft.compat.RebornBookPreviews.register();
ModCreativeTabs.register(modEventBus);
PortBiomeSources.register(modEventBus);
PortChunkGenerators.register(modEventBus);
NeoForge.EVENT_BUS.addListener(RuntimeAgeBackend::onLevelLoad);
NeoForge.EVENT_BUS.addListener(net.neoforged.bus.api.EventPriority.LOWEST,
net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility::onServerStarted);
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAgeWeather::onLevelTickPre);
NeoForge.EVENT_BUS.addListener(net.dnorberg.rivencraft.age.PortAcceleratedTicks::onLevelTickPost);
NeoForge.EVENT_BUS.addListener(PortAgeCommands::register);
@@ -13,7 +13,8 @@ import net.minecraft.resources.Identifier;
/** Full server level catalog, sent on login and after a runtime Age is added. */
public record AgeCatalogPayload(int version, List<Identifier> dimensions,
Map<Identifier, PortAgeColors> colors,
Map<Identifier, PortDayCycle> dayCycles) implements CustomPacketPayload {
Map<Identifier, PortDayCycle> dayCycles,
Map<Identifier, PortAgeDescription> descriptions) implements CustomPacketPayload {
public static final Type<AgeCatalogPayload> TYPE = new Type<>(
Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age_catalog"));
public static final StreamCodec<RegistryFriendlyByteBuf, AgeCatalogPayload> STREAM_CODEC = StreamCodec.composite(
@@ -21,6 +22,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
Identifier.STREAM_CODEC.apply(ByteBufCodecs.list()), AgeCatalogPayload::dimensions,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeColors.STREAM_CODEC), AgeCatalogPayload::colors,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortDayCycle.STREAM_CODEC), AgeCatalogPayload::dayCycles,
ByteBufCodecs.map(HashMap::new, Identifier.STREAM_CODEC, PortAgeDescription.STREAM_CODEC), AgeCatalogPayload::descriptions,
AgeCatalogPayload::new
);
@@ -28,6 +30,7 @@ public record AgeCatalogPayload(int version, List<Identifier> dimensions,
dimensions = List.copyOf(dimensions);
colors = Map.copyOf(colors);
dayCycles = Map.copyOf(dayCycles);
descriptions = Map.copyOf(descriptions);
}
@Override
@@ -21,7 +21,7 @@ public final class AgeCatalogSync {
}
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
var registrar = event.registrar("10");
var registrar = event.registrar("11");
registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC);
registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC,
(payload, context) -> {
@@ -55,6 +55,9 @@ public final class AgeCatalogSync {
State state = state(server);
state.version++;
state.acknowledged.clear();
// Optional synchronization failures must not turn a committed Age into a
// reported binding failure. Withhold acknowledgements, so travel stays safe.
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.synchronize(server)) return;
for (ServerPlayer player : server.getPlayerList().getPlayers()) {
try {
send(player);
@@ -76,9 +79,11 @@ public final class AgeCatalogSync {
MinecraftServer server = player.level().getServer();
State state = state(server);
state.acknowledged.remove(player.getUUID());
if (!net.dnorberg.rivencraft.compat.ImmersivePortalsCompatibility.beforeCatalog(player))
throw new IllegalStateException("Optional portal dimension catalog is unavailable");
var dimensions = server.levelKeys().stream().map(key -> key.identifier()).sorted().toList();
PacketDistributor.sendToPlayer(player, new AgeCatalogPayload(state.version, dimensions,
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server)));
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server)));
}
private static void acknowledge(ServerPlayer player, int version) {
@@ -46,7 +46,7 @@ public final class PortAgeCommands {
StringBuilder mods = new StringBuilder("Optional mods: ");
for (String id : new String[]{"jei", "terrablender", "biomesoplenty",
"sereneseasons", "glitchcore", "ruins", "create",
"ponder", "immersive_portals_core"}) {
"ponder", "immersive_portals_core", "seamlessportals", "immersive_portals_reborn"}) {
if (mods.length() > "Optional mods: ".length()) mods.append(", ");
mods.append(id).append('=').append(ModList.get().isLoaded(id));
}
@@ -1777,7 +1777,7 @@ public final class PortAgeCommands {
private static void verifyCatalogRoundTrip(net.minecraft.server.MinecraftServer server) {
var payload = new AgeCatalogPayload(1, server.levelKeys().stream().map(key -> key.identifier()).toList(),
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server));
RuntimeAgeBackend.savedColors(server), RuntimeAgeBackend.savedDayCycles(server), RuntimeAgeBackend.loadedDescriptions(server));
var buffer = new net.minecraft.network.RegistryFriendlyByteBuf(io.netty.buffer.Unpooled.buffer(),
server.registryAccess(), net.neoforged.neoforge.network.connection.ConnectionType.NEOFORGE);
try {
@@ -0,0 +1,24 @@
package net.dnorberg.rivencraft.age;
import java.util.Map;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.resources.Identifier;
/** Public presentation only: no seed, instability score or provider information. */
public record PortAgeDescription(PortAgeTerrain terrain, PortBiomePlan.Distribution distribution,
PortLighting lighting, PortWeatherMode weather) {
public static final StreamCodec<RegistryFriendlyByteBuf, PortAgeDescription> STREAM_CODEC = StreamCodec.composite(
ByteBufCodecs.STRING_UTF8.map(PortAgeTerrain::valueOf, PortAgeTerrain::name), PortAgeDescription::terrain,
ByteBufCodecs.STRING_UTF8.map(PortBiomePlan.Distribution::valueOf, PortBiomePlan.Distribution::name), PortAgeDescription::distribution,
ByteBufCodecs.STRING_UTF8.map(PortLighting::valueOf, PortLighting::name), PortAgeDescription::lighting,
ByteBufCodecs.STRING_UTF8.map(PortWeatherMode::valueOf, PortWeatherMode::name), PortAgeDescription::weather,
PortAgeDescription::new);
private static volatile Map<Identifier, PortAgeDescription> clientDescriptions = Map.of();
public static void updateClient(Map<Identifier, PortAgeDescription> descriptions) {
clientDescriptions = Map.copyOf(descriptions);
}
public static PortAgeDescription forClient(Identifier id) { return clientDescriptions.get(id); }
}
@@ -36,10 +36,14 @@ public final class PortAgeTravel {
public static BlockPos resolveLanding(ServerLevel target) { return resolveLanding(target, true); }
public static BlockPos resolveLanding(ServerLevel target, net.minecraft.world.entity.Entity entity,
net.dnorberg.rivencraft.item.LinkProperties properties) {
return resolveLanding(target, (ServerLevel) entity.level(), entity.blockPosition(), properties);
}
public static BlockPos resolveLanding(ServerLevel target, ServerLevel source, BlockPos departure,
net.dnorberg.rivencraft.item.LinkProperties properties) {
BlockPos landing = resolveLanding(target, !properties.has(net.dnorberg.rivencraft.item.LinkProperties.DISABLE_PLATFORM));
if (landing == null || !properties.has(net.dnorberg.rivencraft.item.LinkProperties.RELATIVE_LINK)) return landing;
return findFootedDestination(target, net.dnorberg.rivencraft.item.PortLinkDestinations.relativeOrigin(
(ServerLevel) entity.level(), target, entity.blockPosition())).orElse(null);
source, target, departure)).orElse(null);
}
public static BlockPos resolveLanding(ServerLevel target, boolean generatePlatform) {
boolean fissure = target.getChunkSource().getGenerator() instanceof PortFeatureChunkGenerator features
@@ -144,6 +144,10 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
/** Creation-only completion. Exact diagnostic fixtures can still use compile. */
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks) {
return resolve(pages, seed, nativeTicks, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortDayCycle resolve(List<Identifier> pages, long seed, long nativeTicks, PortRandomPagePolicy policy) {
if (!validWriting(pages))
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);
@@ -152,7 +156,8 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
var random = new Random(seed ^ 0x534B5950524F464CL);
random.nextInt(5);
randomColor(random);
int suns = random.nextInt(4), moons = random.nextInt(4);
int suns = policy.allows(Identifier.parse("rivencraft:celestial/sun")) ? random.nextInt(4) : 0;
int moons = policy.allows(Identifier.parse("rivencraft:celestial/moon")) ? random.nextInt(4) : 0;
var bodies = new java.util.ArrayList<PortCelestialBody>();
for (int i = 0; i < suns + moons; i++)
bodies.addAll(randomUnmodified(seed, i, nativeTicks, i < suns ? SUN : MOON).bodies);
@@ -309,6 +314,8 @@ public record PortDayCycle(boolean authored, double period, int stoppedTime,
net.minecraft.core.registries.Registries.WORLD_CLOCK).getOrThrow(WorldClocks.OVERWORLD)).totalTicks();
}
public static PortDayCycle forClient(Identifier id) { return clientCycles.getOrDefault(id, NATIVE); }
public static void updateClient(Map<Identifier, PortDayCycle> cycles) { clientCycles = Map.copyOf(cycles); }
public static PortDayCycle forLevel(Level level) {
if (level instanceof PortAgeLevel age) return age.dayCycle();
@@ -1,6 +1,5 @@
package net.dnorberg.rivencraft.age;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import net.minecraft.resources.Identifier;
@@ -8,21 +7,28 @@ import net.minecraft.resources.Identifier;
/** Seed-completes missing environment controllers once, before an Age is saved. */
public record PortEnvironmentSelection(PortWeatherMode weather, PortLighting lighting, PortSkyStyle sky) {
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain) {
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values()));
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values()));
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed));
return resolve(pages, seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
}
private static <T> T rankedDefault(Random random, T[] choices) {
public static PortEnvironmentSelection resolve(List<Identifier> pages, long seed, PortAgeTerrain terrain,
PortRandomPagePolicy policy) {
PortLighting lighting = pages.stream().map(PortLighting::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x4C49474854494E47L), PortLighting.values(), "lighting", policy));
PortWeatherMode weather = terrain == PortAgeTerrain.CAVE ? PortWeatherMode.OFF
: pages.stream().map(PortWeatherMode::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> rankedDefault(new Random(seed ^ 0x574541544845525FL), PortWeatherMode.values(), "weather", policy));
return new PortEnvironmentSelection(weather, lighting, PortSkyStyle.resolve(pages, seed, policy));
}
private static <T extends Enum<T>> T rankedDefault(Random random, T[] choices, String category, PortRandomPagePolicy policy) {
// LegacyRankChoice: the first (Normal) option is rank 1, the rest rank 2.
// Its rank-1 weight is the complete rare group plus one. Derive this
// from the supported pool, rather than selecting unported weather.
int[] weights = new int[choices.length];
Arrays.fill(weights, 1);
weights[0] = choices.length;
return PortRandomAgeSelection.weighted(random, List.of(choices), weights);
var options = new java.util.ArrayList<PortRankedChoice.Option<T>>();
for (int i = 0; i < choices.length; i++)
options.add(new PortRankedChoice.Option<>(choices[i], i == 0 ? 1 : 2));
return PortRankedChoice.choose(random, policy.required(options,
option -> PortRandomPagePolicy.page(category, option.value()),
new PortRankedChoice.Option<>(choices[0], 1)));
}
}
@@ -333,9 +333,14 @@ public final class PortLibraryFeature {
}
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode) {
return symbolsForLoot(ageSymbols, mode, PortRandomPagePolicy.configured());
}
static List<Identifier> symbolsForLoot(List<Identifier> ageSymbols, PortConfig.LibraryLootMode mode,
PortRandomPagePolicy policy) {
return mode == PortConfig.LibraryLootMode.AGE_ONLY
? ageSymbols.stream().filter(id -> PortSymbolPages.find(id) != null).distinct().toList()
: PortSymbolPages.sealedCandidateIds();
? ageSymbols.stream().filter(policy::allows).filter(id -> PortSymbolPages.find(id) != null).distinct().toList()
: PortSymbolPages.libraryCandidateIds().stream().filter(policy::allows).toList();
}
private static ItemStack page(List<Identifier> symbols, RandomSource random) {
@@ -17,17 +17,32 @@ public final class PortRandomAgeSelection {
public record Selection(PortAgeTerrain terrain, PortBiomePlan biomes) {}
public static Selection select(MinecraftServer server, long seed) {
return select(server, seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(MinecraftServer server, long seed, PortRandomPagePolicy policy) {
// Match the 1.21.1 Legacy-rank choices: Standard and Flat are common;
// the other terrain families are rarer. The sorted order is deliberate.
PortAgeTerrain terrain = terrain(seed);
PortAgeTerrain terrain = terrain(seed, policy);
if (terrain == PortAgeTerrain.VOID)
return new Selection(terrain, new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,
List.of(Identifier.withDefaultNamespace("the_void"))));
PortBiomePlan.Distribution distribution = distribution(seed);
PortBiomePlan.Distribution distribution = distribution(seed, policy);
List<Identifier> eligible = eligibleBiomes(server, terrain);
if (eligible.size() < 2 && distribution != PortBiomePlan.Distribution.NATIVE)
distribution = PortBiomePlan.Distribution.SINGLE;
if (distribution != PortBiomePlan.Distribution.NATIVE) {
var filtered = new ArrayList<>(policy.eligible(eligible, PortRegistryPages::biomePageId));
// Native presets are not Page-selected. Other controllers retain their minimum,
// with the same preferred-biome/registry fallback as 1.21.1.
int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2;
Identifier preferred = Identifier.withDefaultNamespace(terrain == PortAgeTerrain.CAVE ? "deep_dark" : "plains");
if (filtered.size() < minimum && eligible.contains(preferred) && !filtered.contains(preferred))
filtered.add(preferred);
for (var candidate : eligible)
if (filtered.size() < minimum && !filtered.contains(candidate)) filtered.add(candidate);
eligible = List.copyOf(filtered);
if (eligible.size() < 2) distribution = PortBiomePlan.Distribution.SINGLE;
}
if (distribution == PortBiomePlan.Distribution.NATIVE)
return new Selection(terrain, new PortBiomePlan(distribution,
terrain == PortAgeTerrain.CAVE ? eligible : List.of()));
@@ -48,18 +63,28 @@ public final class PortRandomAgeSelection {
}
public static PortAgeTerrain terrain(long seed) {
return weighted(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{1, 1, 5, 1, 6, 1});
return terrain(seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortAgeTerrain terrain(long seed, PortRandomPagePolicy policy) {
return ranked(new Random(seed ^ 0x5445525241494E4CL), terrains(), new int[]{3, 3, 2, 3, 1, 3},
policy, value -> PortRandomPagePolicy.page("terrain", value), PortAgeTerrain.STANDARD);
}
/** First AgeTraits draw in 1.21.1; shared by random and partly authored Ages. */
public static PortBiomePlan.Distribution distribution(long seed) {
return weighted(new Random(seed ^ 0x524956454E435241L),
return distribution(seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortBiomePlan.Distribution distribution(long seed, PortRandomPagePolicy policy) {
return ranked(new Random(seed ^ 0x524956454E435241L),
List.of(PortBiomePlan.Distribution.NATIVE, PortBiomePlan.Distribution.SINGLE,
PortBiomePlan.Distribution.MEDIUM, PortBiomePlan.Distribution.TILED,
PortBiomePlan.Distribution.GRID, PortBiomePlan.Distribution.TINY,
PortBiomePlan.Distribution.SMALL, PortBiomePlan.Distribution.LARGE,
PortBiomePlan.Distribution.HUGE),
new int[]{3, 3, 3, 1, 1, 1, 1, 1, 1});
new int[]{1, 1, 1, 2, 2, 2, 2, 2, 2}, policy,
value -> PortRandomPagePolicy.page("biome", value), PortBiomePlan.Distribution.NATIVE);
}
public static List<Identifier> eligibleBiomes(MinecraftServer server, PortAgeTerrain terrain) {
@@ -84,14 +109,13 @@ public final class PortRandomAgeSelection {
return caves.isEmpty() ? List.of(Identifier.withDefaultNamespace("lush_caves")) : caves;
}
static <T> T weighted(Random random, List<T> choices, int[] weights) {
int total = 0;
for (int weight : weights) total += weight;
int ticket = random.nextInt(total);
for (int index = 0; index < choices.size(); index++) {
ticket -= weights[index];
if (ticket < 0) return choices.get(index);
}
throw new IllegalStateException("Random Age ticket was not consumed");
private static <T> T ranked(Random random, List<T> choices, int[] ranks, PortRandomPagePolicy policy,
java.util.function.Function<T, Identifier> page, T fallback) {
var options = new ArrayList<PortRankedChoice.Option<T>>();
for (int i = 0; i < choices.size(); i++)
options.add(new PortRankedChoice.Option<>(choices.get(i), ranks[i]));
var eligible = policy.eligible(options, option -> page.apply(option.value()));
return eligible.isEmpty() ? fallback : PortRankedChoice.choose(random, eligible);
}
}
@@ -14,8 +14,13 @@ public final class PortRandomFeatureSelection {
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
PortAgeTerrain terrain, PortBiomePlan biomes) {
var base = select(seed, terrain);
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes);
return select(server, seed, terrain, biomes, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(net.minecraft.server.MinecraftServer server, long seed,
PortAgeTerrain terrain, PortBiomePlan biomes, PortRandomPagePolicy policy) {
var base = select(seed, terrain, policy);
var structures = PortRandomStructureSelection.select(server, seed, terrain, biomes, policy);
var plan = base.terrain();
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(),
@@ -24,6 +29,10 @@ public final class PortRandomFeatureSelection {
}
public static Selection select(long seed, PortAgeTerrain terrain) {
return select(seed, terrain, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(long seed, PortAgeTerrain terrain, PortRandomPagePolicy policy) {
var random = new Random(seed ^ 0x4D4154455249414CL);
int count = random.nextInt(3);
var terrainPage = id("terrain/" + terrain.name().toLowerCase(java.util.Locale.ROOT));
@@ -31,12 +40,13 @@ public final class PortRandomFeatureSelection {
for (String name : List.of("rocks", "floating_islands", "tendrils", "spheres", "spikes", "obelisks",
"surface_lakes", "deep_lakes", "lava_lakes")) {
var page = id("feature/" + name);
if (PortAuthoredWriting.supports(List.of(terrainPage, page)))
if (policy.allows(page) && PortAuthoredWriting.supports(List.of(terrainPage, page)))
candidates.add(new PortRankedChoice.Option<>(page, rank(name)));
}
var pages = new ArrayList<Identifier>();
pages.add(terrainPage);
List<Identifier> solids = PortRegistryPages.solidMaterialIds(), fluids = PortRegistryPages.fluidMaterialIds();
List<Identifier> solids = policy.eligible(PortRegistryPages.solidMaterialIds(), PortRegistryPages::blockPageId);
List<Identifier> fluids = policy.eligible(PortRegistryPages.fluidMaterialIds(), PortRegistryPages::blockPageId);
for (int selected = 0; selected < count && !candidates.isEmpty();) {
Identifier feature = PortRankedChoice.choose(random, candidates);
candidates.removeIf(option -> option.value().equals(feature));
@@ -46,12 +56,12 @@ public final class PortRandomFeatureSelection {
pages.add(feature);
selected++;
}
if (terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID
if (policy.allows(PortTerrainFeaturePlan.SKYLANDS) && terrain != PortAgeTerrain.FLAT && terrain != PortAgeTerrain.VOID
&& Math.floorMod(mix(seed ^ 0x534B594C414E4453L), 8) == 0)
pages.add(PortTerrainFeaturePlan.SKYLANDS);
if (terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0)
if (policy.allows(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS) && terrain != PortAgeTerrain.CAVE && terrain != PortAgeTerrain.VOID && random.nextInt(10) == 0)
pages.add(PortTerrainFeaturePlan.CRYSTAL_FORMATIONS);
if (randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES);
if (policy.allows(PortTerrainFeaturePlan.STAR_FISSURES) && randomStarFissure(seed)) pages.add(PortTerrainFeaturePlan.STAR_FISSURES);
return new Selection(PortAuthoredWriting.rockPlan(pages, seed), PortAuthoredWriting.lakePlan(pages, seed),
PortAuthoredWriting.terrainFeaturePlan(pages, seed), 0);
}
@@ -0,0 +1,66 @@
package net.dnorberg.rivencraft.age;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import net.dnorberg.rivencraft.PortConfig;
import net.minecraft.resources.Identifier;
/** Creation-time eligibility; the resolved Age settings are saved, never reselected on reload. */
public record PortRandomPagePolicy(Set<Identifier> allowlist, Set<Identifier> blocklist) {
public static final PortRandomPagePolicy UNRESTRICTED = new PortRandomPagePolicy(Set.of(), Set.of());
public PortRandomPagePolicy {
allowlist = Set.copyOf(allowlist);
blocklist = Set.copyOf(blocklist);
}
public static PortRandomPagePolicy configured() {
return new PortRandomPagePolicy(parse(PortConfig.RANDOM_PAGE_ALLOWLIST.get()),
parse(PortConfig.RANDOM_PAGE_BLOCKLIST.get()));
}
private static Set<Identifier> parse(List<? extends String> ids) {
return ids.stream().map(PortRandomPagePolicy::parsePageId).collect(Collectors.toUnmodifiableSet());
}
/** Server config IDs may omit the built-in Rivencraft namespace. */
public static Identifier parsePageId(String value) {
Identifier id = Identifier.tryParse(value.contains(":") ? value : "rivencraft:" + value);
if (id == null) throw new IllegalArgumentException("Invalid Page ID " + value);
return id;
}
public boolean allows(Identifier id) {
if (blocklist.contains(id)) return false;
String category = category(id);
return !restricts(category) || allowlist.contains(id);
}
public boolean restricts(String category) {
return allowlist.stream().anyMatch(entry -> category(entry).equals(category));
}
public <T> List<T> eligible(List<T> candidates, java.util.function.Function<T, Identifier> pageId) {
return candidates.stream().filter(candidate -> allows(pageId.apply(candidate))).toList();
}
public <T> List<T> required(List<T> candidates, java.util.function.Function<T, Identifier> pageId,
T fallback) {
List<T> eligible = eligible(candidates, pageId);
return eligible.isEmpty() ? List.of(fallback) : eligible;
}
private static String category(Identifier id) {
String path = id.getPath();
if (path.startsWith("biome/") && java.util.Set.of("native", "single", "tiled", "grid",
"tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length())))
return "biome_distribution";
return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/'));
}
public static Identifier page(String category, Enum<?> value) {
return Identifier.fromNamespaceAndPath("rivencraft", category + "/"
+ value.name().toLowerCase(java.util.Locale.ROOT));
}
}
@@ -19,6 +19,11 @@ public final class PortRandomStructureSelection {
}
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan) {
return select(server, seed, terrain, plan, PortRandomPagePolicy.UNRESTRICTED);
}
public static Selection select(MinecraftServer server, long seed, PortAgeTerrain terrain, PortBiomePlan plan,
PortRandomPagePolicy policy) {
Set<Identifier> biomes = actualBiomes(server, terrain, plan);
var eligible = new ArrayList<PortRankedChoice.Option<Identifier>>();
for (String name : List.of("dungeons", "mineshafts", "nether_fortresses", "strongholds", "villages",
@@ -32,7 +37,7 @@ public final class PortRandomStructureSelection {
.get(ResourceKey.create(Registries.PLACED_FEATURE,
Identifier.fromNamespaceAndPath("rivencraft", "dungeons"))).isPresent()
: PortStructurePages.randomEligible(feature, terrain, biomes, server.registryAccess());
if (allowed) eligible.add(new PortRankedChoice.Option<>(feature, rank(name)));
if (allowed && policy.allows(feature)) eligible.add(new PortRankedChoice.Option<>(feature, rank(name)));
}
var random = new Random(seed ^ 0x5354525543545552L);
int count = random.nextInt(3), dungeons = 0;
@@ -40,6 +40,9 @@ public final class PortSeasonPolicies extends SavedData {
catch (IllegalArgumentException e) { return null; }
}
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed) {
return select(pages, seed, terrain, installed, PortRandomPagePolicy.UNRESTRICTED);
}
static Policy select(List<Identifier> pages, long seed, PortAgeTerrain terrain, boolean installed, PortRandomPagePolicy policy) {
if (terrain == PortAgeTerrain.CAVE) return new Policy(Mode.NO_SEASONS, true);
Mode written = null;
for (var page : pages) if (forPage(page) != null) written = forPage(page);
@@ -49,9 +52,15 @@ public final class PortSeasonPolicies extends SavedData {
}
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);
var modes = List.of(new PortRankedChoice.Option<>(Mode.SEASONS, 1),
new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2),
new PortRankedChoice.Option<>(Mode.ETERNAL_WINTER, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_SUMMER, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_FALL, 3),
new PortRankedChoice.Option<>(Mode.ETERNAL_SPRING, 3));
Mode mode = PortRankedChoice.choose(new Random(seed ^ 0x5E450A5E5EED21L),
policy.required(modes, option -> PortRandomPagePolicy.page("season", option.value()),
new PortRankedChoice.Option<>(Mode.NO_SEASONS, 2)));
return new Policy(mode, false);
}
}
@@ -26,9 +26,13 @@ public enum PortSkyStyle {
}
public static PortSkyStyle resolve(List<Identifier> pages, long seed) {
return resolve(pages, seed, PortRandomPagePolicy.UNRESTRICTED);
}
public static PortSkyStyle resolve(List<Identifier> pages, long seed, PortRandomPagePolicy policy) {
return pages.stream().map(PortSkyStyle::forPage).filter(java.util.Objects::nonNull)
.findFirst().orElseGet(() -> pages.stream().anyMatch(PortSkyStyle::isCelestial)
? OVERWORLD : random(seed));
? OVERWORLD : random(seed, policy));
}
/** Nether-style Ages use their fog clear color as the visible backdrop. */
@@ -50,11 +54,17 @@ public enum PortSkyStyle {
};
}
private static PortSkyStyle random(long seed) {
private static PortSkyStyle random(long seed, PortRandomPagePolicy policy) {
// Match the first draw in 1.21.1 AgeSkyProfile.random: its equally
// likely INHERITED and OVERWORLD slots currently share the native
// Overworld presentation here. Do not add unported colors/bodies.
int choice = new Random(seed ^ 0x534B5950524F464CL).nextInt(5);
var styles = policy.required(java.util.stream.IntStream.range(0, 5).boxed()
.filter(slot -> slot != 0 || !policy.restricts("sky")).toList(),
slot -> Identifier.fromNamespaceAndPath("rivencraft", "sky/" + switch (slot) {
case 0 -> "inherited"; case 1 -> "overworld"; case 2 -> "nether";
case 3 -> "end"; default -> "static";
}), 0);
int choice = styles.get(new Random(seed ^ 0x534B5950524F464CL).nextInt(styles.size()));
return switch (choice) {
case 0, 1 -> OVERWORLD;
case 2 -> NETHER;
@@ -169,6 +169,16 @@ public final class RuntimeAgeBackend {
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
List<Identifier> librarySymbols, String displayName) {
return create(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes, terrainFeatures,
weather, lighting, sky, colors, dayCycle, librarySymbols, displayName, PortRandomPagePolicy.UNRESTRICTED);
}
public static ServerLevel create(MinecraftServer server, Identifier id, long seed,
PortBiomePlan biomePlan, PortAgeTerrain terrain, PortRockPlan rocks,
PortVegetationPlan vegetation, int dungeons, PortLakePlan lakes,
PortTerrainFeaturePlan terrainFeatures, PortWeatherMode weather,
PortLighting lighting, PortSkyStyle sky, PortAgeColors colors, PortDayCycle dayCycle,
List<Identifier> librarySymbols, String displayName, PortRandomPagePolicy policy) {
checkServerThread(server);
String name = ageName(id);
AgeLevelIndex index = index(server);
@@ -186,7 +196,7 @@ public final class RuntimeAgeBackend {
ServerLevel level = null;
try {
seasons.put(id, PortSeasonPolicies.select(librarySymbols, seed, terrain,
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available()));
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.available(), policy));
writing.put(id, librarySymbols);
level = load(server, id, seed, biomePlan, terrain, rocks, vegetation, dungeons, lakes,
terrainFeatures, lighting, sky, colors, dayCycle);
@@ -396,6 +406,23 @@ public final class RuntimeAgeBackend {
return index(server).dayCycles();
}
/** Snapshot only loaded Age settings; viewing a book never loads its destination. */
public static Map<Identifier, PortAgeDescription> loadedDescriptions(MinecraftServer server) {
checkServerThread(server);
AgeLevelIndex index = index(server);
var descriptions = new java.util.HashMap<Identifier, PortAgeDescription>();
var knownAges = index.entries().keySet();
for (var level : server.getAllLevels()) {
Identifier id = level.dimension().identifier();
if (!(level instanceof PortAgeLevel age) || !knownAges.contains(id)) continue;
PortBiomePlan biomes = index.biomePlan(id);
descriptions.put(id, new PortAgeDescription(index.terrain(id),
biomes == null ? PortBiomePlan.Distribution.NATIVE : biomes.distribution(),
index.lighting(id), age.weatherMode()));
}
return Map.copyOf(descriptions);
}
/** Includes retired IDs, which must never be silently reused by a new book. */
public static boolean isNameTaken(MinecraftServer server, Identifier id) {
checkServerThread(server);
@@ -40,7 +40,8 @@ public final class CrystalPortalBlock extends BaseEntityBlock {
@Override protected RenderShape getRenderShape(BlockState state) {
// Keep the animated fallback until the optional destination view has
// actually been established, including after a world restart.
return RenderShape.MODEL;
return net.dnorberg.rivencraft.compat.RebornBookPreviews.available() && state.getValue(LIVE_VIEW)
? RenderShape.INVISIBLE : RenderShape.MODEL;
}
@Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CrystalPortalBlockEntity(pos, state);
@@ -25,7 +25,10 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
public ItemStack getBook() { return book; }
public int skyColor() { return skyColor; }
public void setBook(ItemStack value) {
if (level instanceof ServerLevel server)
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
book = value.copyWithCount(1);
restore = true;
skyColor = 0xffffff;
if (level instanceof ServerLevel source) {
var destination = book.get(Rivencraft.LINK_BOOK_TARGET.get());
@@ -53,7 +56,11 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
}
sync();
}
public ItemStack takeBook() { ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result; }
public ItemStack takeBook() {
if (level instanceof ServerLevel server)
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition);
ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result;
}
private void sync() {
setChanged();
if (level != null && !level.isClientSide()) {
@@ -73,6 +80,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity {
boolean restoring = holder.restore;
if (restoring && !plan.valid() && CrystalPortalNetwork.recoverSavedOwners(level, pos))
plan = CrystalPortalNetwork.plan(level, pos);
if (restoring && plan.valid()) CrystalPortalNetwork.setLiveView(level, plan, false);
CrystalPortalNetwork.reconcile(level, pos, plan);
holder.restore = false;
if (restoring) holder.sync();
@@ -20,12 +20,15 @@ public final class AgeCatalogClient {
@SubscribeEvent
public static void logout(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingOut event) {
PortBookPreview.logout();
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(java.util.Map.of());
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(java.util.Map.of());
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(java.util.Map.of());
}
@SubscribeEvent
public static void register(RegisterClientPayloadHandlersEvent event) {
event.register(net.dnorberg.rivencraft.network.BookPreviewPayload.TYPE, (payload, context) -> PortBookPreview.accept(payload));
event.register(net.dnorberg.rivencraft.network.WritingDeskCatalogPayload.TYPE, ClientWritingDeskCatalog::handle);
event.register(net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload.TYPE, (payload, context) ->
net.dnorberg.rivencraft.compat.SereneSeasonsCompatibility.acceptClient(payload.dimensionId(), payload.enabled()));
@@ -33,6 +36,7 @@ public final class AgeCatalogClient {
if (!(context.listener() instanceof ClientPacketListener listener)) return;
net.dnorberg.rivencraft.age.PortAgeColors.updateClient(payload.colors());
net.dnorberg.rivencraft.age.PortDayCycle.updateClient(payload.dayCycles());
net.dnorberg.rivencraft.age.PortAgeDescription.updateClient(payload.descriptions());
if (listener.getLevel() != null) {
listener.getLevel().environmentAttributes().invalidateTickCache();
listener.getLevel().updateSkyBrightness();
@@ -0,0 +1,79 @@
package net.dnorberg.rivencraft.client;
import java.util.UUID;
import net.dnorberg.rivencraft.PortConfig;
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
import net.dnorberg.rivencraft.network.*;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
/** One session per open book; stale replies cannot replace another book's preview. */
public final class PortBookPreview {
interface LivePanel {
void accept(net.dnorberg.rivencraft.item.LinkBookTarget destination);
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time);
void close();
}
private static PortBookPreview active;
private final UUID session = UUID.randomUUID();
private final RequestBookPreviewPayload request;
private final LivePanel live;
private int ticks;
private boolean received;
private boolean closed;
private net.minecraft.resources.Identifier destination;
PortBookPreview(InteractionHand hand, ItemStack book, UseBookStandPayload stand) {
var minecraft = Minecraft.getInstance();
request = minecraft.level == null ? null : new RequestBookPreviewPayload(session,
hand == InteractionHand.OFF_HAND, stand != null, minecraft.level.dimension().identifier(),
stand == null ? BlockPos.ZERO : stand.pos(), book.copy());
boolean enabled = RebornBookPreviews.available() && PortConfig.LIVE_BOOK_PREVIEWS.get();
live = enabled ? new RebornLiveBookPanel() : null;
if (active != null) active.close();
active = this;
sendRequest();
}
private void sendRequest() {
if (!closed && live != null && request != null && Minecraft.getInstance().getConnection() != null)
ClientPacketDistributor.sendToServer(request);
}
void tick() {
ticks++;
if (ticks % (received ? 200 : 40) == 0) sendRequest();
}
boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float partialTick) {
if (closed || !received || live == null) return false;
return live.render(graphics, x, y, width, height, ticks + partialTick);
}
public static void accept(BookPreviewPayload payload) {
if (active == null || active.closed || active.live == null || !active.session.equals(payload.session())
|| !payload.destination().valid()) return;
active.destination = payload.destination().dimension();
active.received = true;
active.live.accept(payload.destination());
}
void close() {
if (closed) return;
closed = true;
if (live != null) {
live.close();
if (Minecraft.getInstance().getConnection() != null)
ClientPacketDistributor.sendToServer(new ReleaseBookPreviewPayload(session));
}
if (active == this) active = null;
}
public static void logout() { if (active != null) active.close(); }
public static boolean shouldMute(ClientLevel level) {
var player = Minecraft.getInstance().player;
return active != null && !active.closed && active.destination != null
&& level.dimension().identifier().equals(active.destination)
&& (player == null || level != player.level());
}
}
@@ -15,7 +15,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.client.network.ClientPacketDistributor;
/** Legacy book layout and authored glyph pages; destination rendering remains a port placeholder. */
/** Legacy book spreads, authored symbol pages and random-Age glyph descriptions. */
public final class PortDescriptiveBookScreen extends Screen {
private static final int WIDTH = 327;
private static final int HEIGHT = 199;
@@ -23,7 +23,9 @@ public final class PortDescriptiveBookScreen extends Screen {
private final InteractionHand hand;
private final ItemStack book;
private final boolean bound;
private final net.minecraft.resources.Identifier ageId;
private final PortLegacyLinkPanel linkPanel = new PortLegacyLinkPanel();
private final net.dnorberg.rivencraft.writing.DescriptiveBookPages pages;
private int pageIndex;
@@ -33,8 +35,10 @@ public final class PortDescriptiveBookScreen extends Screen {
public PortDescriptiveBookScreen(InteractionHand hand, ItemStack book) {
super(book.getHoverName());
this.hand = hand;
this.book = book.copy();
pages = net.dnorberg.rivencraft.writing.DescriptiveBookPages.from(book);
bound = book.has(Rivencraft.AGE_BOOK_ID.get());
ageId = book.get(Rivencraft.AGE_BOOK_ID.get());
bound = ageId != null;
}
public PortDescriptiveBookScreen(net.dnorberg.rivencraft.network.UseBookStandPayload source) {
@@ -44,7 +48,8 @@ public final class PortDescriptiveBookScreen extends Screen {
@Override
protected void init() {
if (bound || standSource != null) return;
if (bound) { linkPanel.open(hand, book, standSource); return; }
if (standSource != null) return;
int left = (width - WIDTH) / 2;
int top = (height - HEIGHT) / 2;
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
@@ -78,7 +83,9 @@ public final class PortDescriptiveBookScreen extends Screen {
int textY = PortLegacyBookArtwork.drawText(graphics, font, title, left + 40, top + 40, 110, TEXT_COLOR);
Component author = pages.author().isBlank()
? Component.translatable("screen.rivencraft.age.unknown_author") : Component.literal(pages.author());
PortLegacyBookArtwork.drawText(graphics, font, author, left + 50, textY + 2, 100, TEXT_COLOR);
int detailsY = PortLegacyBookArtwork.drawText(graphics, font, author,
left + 50, textY + 2, 100, TEXT_COLOR) + 4;
if (pages.symbols().isEmpty()) drawRandomDescription(graphics, left + 40, detailsY);
graphics.disableScissor();
} else {
graphics.text(font, title, left + 42, top + 29, TEXT_COLOR, false);
@@ -105,6 +112,32 @@ public final class PortDescriptiveBookScreen extends Screen {
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
}
private void drawRandomDescription(GuiGraphicsExtractor graphics, int x, int y) {
var description = net.dnorberg.rivencraft.age.PortAgeDescription.forClient(ageId);
if (description == null) return;
var cycle = net.dnorberg.rivencraft.age.PortDayCycle.forClient(ageId);
var lines = java.util.List.of(
Component.translatable("screen.rivencraft.age.generator",
Component.translatable("generator.rivencraft." + description.terrain().name().toLowerCase(java.util.Locale.ROOT))),
Component.translatable("screen.rivencraft.age.trait.biomes", trait("biome_distribution", description.distribution())),
Component.translatable("screen.rivencraft.age.trait.lighting", trait("lighting", description.lighting())),
Component.translatable("screen.rivencraft.age.trait.weather", trait("weather", description.weather())),
Component.translatable("screen.rivencraft.age.trait.day_length", cycle.period() == 0
? Component.translatable("trait.rivencraft.day_length.stopped")
: Component.literal(String.format(java.util.Locale.ROOT, "%.2fx", cycle.period()))),
Component.translatable("screen.rivencraft.age.trait.celestial_angle",
Component.literal(String.format(java.util.Locale.ROOT, "%.0f°", (float) cycle.bearing()))),
Component.translatable("screen.rivencraft.age.trait.celestial_phase",
Component.literal(String.format(java.util.Locale.ROOT, "%.0f%%", cycle.phaseTick() * 100F / 24000F))));
for (var line : lines)
y = PortSymbolPageTextures.drawGlyphText(graphics, line.getString(), x, y, 110) + 2;
}
private static Component trait(String group, Enum<?> value) {
return Component.translatable("trait.rivencraft." + group + "."
+ value.name().toLowerCase(java.util.Locale.ROOT));
}
@Override
public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) {
if (event.button() == InputConstants.MOUSE_BUTTON_LEFT) {
@@ -152,6 +185,8 @@ public final class PortDescriptiveBookScreen extends Screen {
if (bound) linkPanel.tick();
}
@Override public void removed() { linkPanel.close(); super.removed(); }
@Override
public boolean isPauseScreen() {
return false;
@@ -14,6 +14,13 @@ final class PortLegacyLinkPanel {
private static final int CELL_SIZE = 3;
private static final int BORDER_COLOR = 0xFF7B6AA8;
private int ticks;
private PortBookPreview preview;
void open(net.minecraft.world.InteractionHand hand, net.minecraft.world.item.ItemStack book,
net.dnorberg.rivencraft.network.UseBookStandPayload stand) {
if (preview == null) preview = new PortBookPreview(hand, book, stand);
}
void close() { if (preview != null) preview.close(); }
private static final int LINK_COLOR = 0xFF006666;
static boolean contains(double x, double y) {
@@ -26,9 +33,11 @@ final class PortLegacyLinkPanel {
void tick() {
ticks++;
if (preview != null) preview.tick();
}
private void render(GuiGraphicsExtractor graphics, int left, int top, int width, int height, float partialTick) {
if (preview != null && preview.render(graphics, left, top, width, height, partialTick)) return;
graphics.fill(left, top, left + width, top + height, 0xFF000011);
float time = (ticks + partialTick) * 0.035F;
@@ -23,6 +23,7 @@ public final class PortLinkingBookScreen extends Screen {
private final InteractionHand hand;
private final ItemStack book;
private final boolean bound;
private final net.dnorberg.rivencraft.item.LinkBookTarget target;
private final boolean returnLink;
@@ -35,6 +36,7 @@ public final class PortLinkingBookScreen extends Screen {
public PortLinkingBookScreen(InteractionHand hand, ItemStack book) {
super(book.getHoverName());
this.hand = hand;
this.book = book.copy();
target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
bound = target != null;
destination = bound ? net.dnorberg.rivencraft.item.LinkingBookItem.destinationName(book, target) : Component.empty();
@@ -51,7 +53,8 @@ public final class PortLinkingBookScreen extends Screen {
@Override
protected void init() {
if (bound || standSource != null) return;
if (bound) { linkPanel.open(hand, book, standSource); return; }
if (standSource != null) return;
int left = (width - WIDTH) / 2;
int top = (height - HEIGHT) / 2;
titleInput = new EditBox(font, left + 40, top + 69, 110, 20,
@@ -147,6 +150,8 @@ public final class PortLinkingBookScreen extends Screen {
if (bound) linkPanel.tick();
}
@Override public void removed() { linkPanel.close(); super.removed(); }
@Override
public boolean isPauseScreen() {
return false;
@@ -183,6 +183,36 @@ public final class PortSymbolPageTextures {
return result;
}
/** Translated prose becomes Legacy word glyphs, with genuine base-25 numerals. */
public static int drawGlyphText(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
String text, int x, int y, int maxWidth) {
var layout = net.dnorberg.rivencraft.writing.PortGlyphTextLayout.layout(text, maxWidth, 12);
for (var glyph : layout.glyphs()) {
int number = net.dnorberg.rivencraft.writing.PortGlyphTextLayout.number(glyph.word());
if (number >= 0) drawNumeral(graphics, number, x + glyph.x(), y + glyph.y(), 12);
else for (int component : glyphs(glyph.word()))
drawComponent(graphics, component, x + glyph.x(), y + glyph.y(), 12);
}
return y + layout.height();
}
public static void drawNumeral(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
int number, int x, int y, int size) {
int[] digits = PortSymbolNumerals.digitsFor(number);
int digitSize = digits.length == 1 ? size : Math.max(8, size * 3 / 4);
for (int digit : digits) {
for (int component : PortSymbolNumerals.componentsForDigit(digit))
drawComponent(graphics, component, x, y + (size - digitSize) / 2, digitSize);
x += digitSize + 1;
}
}
private static void drawComponent(net.minecraft.client.gui.GuiGraphicsExtractor graphics,
int component, int x, int y, int size) {
graphics.blit(net.minecraft.client.renderer.RenderPipelines.GUI_TEXTURED, COMPONENTS, x, y,
(component % 8) * 64, (component / 8) * 64, size, size, 64, 64, 512, 512, 0xFF211A14);
}
private static Identifier texture(String path) {
return Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "textures/" + path + ".png");
}
@@ -0,0 +1,79 @@
package net.dnorberg.rivencraft.client;
import com.mojang.blaze3d.pipeline.RenderTarget;
import com.mojang.blaze3d.pipeline.TextureTarget;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.renderpearl.api.GpuFormat;
import com.mojang.renderpearl.api.textures.FilterMode;
import net.dnorberg.rivencraft.item.LinkBookTarget;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.phys.Vec3;
import org.joml.Matrix4f;
import org.joml.Vector4f;
import qouteall.imm_ptl.core.ClientWorldLoader;
import qouteall.imm_ptl.core.render.GuiPortalRendering;
import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo;
/** Reborn renders before GUI drawing; the deferred GUI samples its target normally. */
public final class RebornLiveBookPanel implements PortBookPreview.LivePanel {
// The engine retains queued tasks. Keep one reusable target alive across screen
// removal instead of deleting textures still referenced by a queued GUI frame.
private static RenderTarget target;
private static RebornLiveBookPanel queued;
private LinkBookTarget destination;
private boolean closed;
@Override public void accept(LinkBookTarget value) { destination = value; }
@Override public boolean render(GuiGraphicsExtractor graphics, int x, int y, int width, int height, float time) {
if (closed || destination == null || !ClientWorldLoader.getIsInitialized()) return false;
var key = ResourceKey.create(Registries.DIMENSION, destination.dimension());
var world = ClientWorldLoader.getWorld(key);
if (world == null || !world.hasChunkAt(BlockPos.containing(destination.x(), destination.y(), destination.z()))) return false;
var minecraft = Minecraft.getInstance();
var main = minecraft.gameRenderer.mainRenderTarget();
if (target == null) target = new TextureTarget("Rivencraft live book", main.width, main.height,
GpuFormat.RGBA8_UNORM, main.getDepthTexture().getFormat());
Vec3 center = new Vec3(destination.x(), destination.y() + 2.5, destination.z());
double angle = time * 0.012;
Vec3 camera = center.add(Math.sin(angle) * 11, 5, Math.cos(angle) * 11);
Matrix4f transform = new Matrix4f().rotateX((float) Math.toRadians(20))
.rotateY((float) angle);
var info = new WorldRenderInfo.Builder().setWorld(world).setCameraPos(camera)
.setCameraTransformation(transform).setOverwriteCameraTransformation(true)
.setRenderDistance(Math.min(8, minecraft.options.getEffectiveRenderDistance()))
.setDoRenderHand(false).setEnableViewBobbing(false).setDoRenderSky(true).setHasFog(true).build();
// Submit first: Reborn may resize the target, invalidating its old texture view.
// GPU clearing happens in beginRender(), after extraction but before remote rendering.
GuiPortalRendering.submitNextFrameRendering(info, target);
queued = this;
graphics.blit(target.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.LINEAR),
x, y, x + width, y + height, 0, 1, 1, 0);
graphics.outline(x, y, width, height, 0xFF7B6AA8);
return true;
}
/** Called by the optional engine mixin on the render thread, never during GUI drawing. */
public static void beginRender() {
if (queued == null || target == null) return;
RenderSystem.getDevice().createCommandEncoder().clearColorAndDepthTextures(
target.getColorTexture(), new Vector4f(0, 0, 0, 1), target.getDepthTexture(), 0.0);
}
/** Remote render changes the shared camera; restore it before rain/audio use it. */
public static void endRender() {
if (queued == null) return;
queued = null;
var minecraft = Minecraft.getInstance();
if (minecraft.level != null && minecraft.getCameraEntity() != null) {
var camera = minecraft.gameRenderer.mainCamera();
camera.setLevel(minecraft.level);
camera.setEntity(minecraft.getCameraEntity());
camera.update(minecraft.getDeltaTracker());
}
}
@Override public void close() { closed = true; destination = null; }
}
@@ -294,15 +294,7 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
}
private static void drawNumeral(GuiGraphicsExtractor graphics, int number, int x, int y, int size) {
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;
}
PortSymbolPageTextures.drawNumeral(graphics, number, x, y, size);
}
private DisplayPage pageAtMouse(double mouseX, double mouseY) {
@@ -0,0 +1,38 @@
package net.dnorberg.rivencraft.compat;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.server.MinecraftServer;
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.event.server.ServerStartedEvent;
/** Optional 26.3 Immersive Portals forks; only the guarded adapter links their API classes. */
public final class ImmersivePortalsCompatibility {
private ImmersivePortalsCompatibility() {}
public static boolean available() { return ModList.get().isLoaded("seamlessportals") || ModList.get().isLoaded("immersive_portals_reborn"); }
public static boolean synchronize(MinecraftServer server) { return synchronize(server, null); }
/** Login/catalog packets must precede Rivencraft's acknowledgement round trip. */
public static boolean beforeCatalog(net.minecraft.server.level.ServerPlayer player) {
return synchronize(player.level().getServer(), player);
}
private static boolean synchronize(MinecraftServer server, net.minecraft.server.level.ServerPlayer player) {
if (!available()) return true;
if (!server.isSameThread()) throw new IllegalStateException("Portal catalog update outside server thread");
try {
ImmersivePortalsDimensionAdapter.synchronize(server);
if (player != null) ImmersivePortalsDimensionAdapter.sendTo(player);
return true;
} catch (RuntimeException | LinkageError failure) {
Rivencraft.LOGGER.error("Could not synchronize the optional Immersive Portals dimension IDs; "
+ "Rivencraft catalog acknowledgement/travel remains blocked until synchronization succeeds", failure);
return false;
}
}
public static void onServerStarted(ServerStartedEvent event) {
synchronize(event.getServer());
}
}
@@ -0,0 +1,32 @@
package net.dnorberg.rivencraft.compat;
import java.util.Set;
import net.minecraft.server.MinecraftServer;
import qouteall.q_misc_util.dimension.DimensionIntId;
/** Updates the shared 26.3 dimension catalog without delegating Age construction. */
final class ImmersivePortalsDimensionAdapter {
private ImmersivePortalsDimensionAdapter() {}
static void sendTo(net.minecraft.server.level.ServerPlayer player) {
// Seamless's createPacket returns a vanilla Packet; Reborn's returns
// a CustomPacketPayload. Their createFromServer factory is shared and
// retains each fork's native (two- or three-tag) wire format.
player.connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(
qouteall.q_misc_util.MiscNetworking.DimIdSyncPacket.createFromServer(
player.level().getServer())));
}
static void synchronize(MinecraftServer server) {
var live = Set.copyOf(server.levelKeys());
var record = DimensionIntId.getServerMap(server);
if (record.getDimIdSet().equals(live)) return;
// This is the same public synchronization entry point called by its
// dynamic-update listener. The two supported forks have
// different event wrappers, but share this method. It updates IDs and
// sends native type/sea-level metadata before Rivencraft's catalog.
DimensionIntId.onServerDimensionChanged(server);
if (!DimensionIntId.getServerMap(server).getDimIdSet().equals(live))
throw new IllegalStateException("The portal mod did not accept the current server dimensions");
}
}
@@ -0,0 +1,35 @@
package net.dnorberg.rivencraft.compat;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
import net.minecraft.server.level.ServerPlayer;
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.common.NeoForge;
/** No optional API appears in common class signatures. */
public final class RebornBookPreviews {
public static boolean available() { return ModList.get().isLoaded("immersive_portals_reborn"); }
public static void open(ServerPlayer player, RequestBookPreviewPayload payload) {
if (!available()) return;
try { RebornPreviewChunks.open(player, payload); }
catch (RuntimeException | LinkageError error) {
Rivencraft.LOGGER.warn("Reborn book preview unavailable; retaining animated panel", error);
RebornPreviewChunks.close(player);
}
}
public static void release(ServerPlayer player, java.util.UUID session) {
if (available()) RebornPreviewChunks.release(player, session);
}
public static void register() {
if (!available()) return;
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> RebornPreviewChunks.tick(event.getServer()));
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> {
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.logout(player);
});
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> {
if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.close(player);
});
NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> RebornPreviewChunks.stop());
}
private RebornBookPreviews() {}
}
@@ -0,0 +1,30 @@
package net.dnorberg.rivencraft.compat;
import net.dnorberg.rivencraft.PortConfig;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.item.ItemStack;
/** Render-only optional integration. Crystal portal blocks retain all travel rules. */
public final class RebornCrystalPortals {
public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
boolean live = false;
if (RebornBookPreviews.available()) {
try {
if (!book.isEmpty() && PortConfig.CRYSTAL_LIVE_VIEWS.get())
live = RebornCrystalView.refresh(source, owner, plan, book);
else RebornCrystalView.remove(source, owner);
} catch (RuntimeException | LinkageError failure) {
Rivencraft.LOGGER.warn("Could not establish Reborn crystal view at {}; retaining portal travel and fallback", owner, failure);
RebornCrystalView.remove(source, owner);
}
}
CrystalPortalNetwork.setLiveView(source, plan, live);
}
public static void remove(ServerLevel source, BlockPos owner) {
if (RebornBookPreviews.available()) RebornCrystalView.remove(source, owner);
}
private RebornCrystalPortals() {}
}
@@ -0,0 +1,131 @@
package net.dnorberg.rivencraft.compat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.item.LinkBookTarget;
import net.dnorberg.rivencraft.item.LinkProperties;
import net.dnorberg.rivencraft.portal.CrystalPortalNetwork;
import net.dnorberg.rivencraft.portal.CrystalPortalSurfaces;
import net.dnorberg.rivencraft.portal.PortalBookTravel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import qouteall.imm_ptl.core.api.PortalAPI;
import qouteall.imm_ptl.core.portal.Portal;
import qouteall.imm_ptl.core.portal.shape.SpecialFlatPortalShape;
import qouteall.q_misc_util.my_util.DQuaternion;
import qouteall.q_misc_util.my_util.Mesh2D;
/** One native mesh per coplanar opening/side, not one repeated image per block. */
final class RebornCrystalView {
private static final String PREFIX = "rivencraft:crystal:mc263:v1:";
private record View(CrystalPortalSurfaces.Surface surface, Direction normal,
LinkBookTarget target, boolean preserveFacing, boolean relative, String tag) {}
static boolean refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
List<View> wanted = views(source, owner, plan, book);
if (wanted.isEmpty()) { remove(source, owner); return false; }
if (!complete(source, owner, wanted)) {
remove(source, owner);
for (View view : wanted) spawn(source, view);
}
return complete(source, owner, wanted);
}
private static List<View> views(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) {
List<View> views = new ArrayList<>();
boolean descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get());
boolean relative = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE).has(LinkProperties.RELATIVE_LINK);
// Ordinary descriptive arrival searches once, not for each side of each opening.
LinkBookTarget shared = relative ? null : PortalBookTravel.destination(source, book, owner, 0, 0);
if (!relative && (shared == null || !shared.valid())) return List.of();
for (var surface : CrystalPortalSurfaces.group(source, plan)) {
LinkBookTarget target = relative
? PortalBookTravel.destination(source, book, BlockPos.containing(surface.bounds().getCenter()), 0, 0) : shared;
if (target == null || !target.valid()) return List.of();
int shape = surface.cells().stream().mapToLong(BlockPos::asLong).sorted().boxed().toList().hashCode();
for (Direction normal : List.of(surface.normal(), surface.normal().getOpposite())) {
String tag = ownerTag(owner) + normal.getSerializedName() + ":" + shape + ":" + target + ":" + descriptive + ":" + relative;
views.add(new View(surface, normal, target, descriptive, relative, tag));
}
}
return List.copyOf(views);
}
static void remove(ServerLevel source, BlockPos owner) {
for (Portal portal : existing(source, owner)) portal.discard();
}
private static List<Portal> existing(ServerLevel source, BlockPos owner) {
String prefix = ownerTag(owner);
return source.getEntitiesOfClass(Portal.class,
new AABB(owner).inflate(CrystalPortalNetwork.MAX_RADIUS + 2),
entity -> entity.portalTag != null && entity.portalTag.startsWith(prefix));
}
private static boolean complete(ServerLevel source, BlockPos owner, List<View> wanted) {
List<Portal> existing = existing(source, owner);
if (existing.size() != wanted.size()) return false;
var tags = new HashSet<String>();
for (Portal view : existing) {
if (view.getTeleportable() || view.isInteractable() || !view.isPortalValid()
|| !tags.add(view.portalTag)) return false;
}
return tags.equals(wanted.stream().map(View::tag).collect(java.util.stream.Collectors.toSet()));
}
private static void spawn(ServerLevel source, View view) {
Portal portal = Portal.ENTITY_TYPE.create(source, EntitySpawnReason.TRIGGERED);
if (portal == null) return;
var surface = view.surface();
var normal = view.normal();
var target = view.target();
PortalAPI.setPortalOrthodoxShape(portal, normal, surface.bounds());
// Inside the opening's block thickness, so crystal frame edges stay in front.
portal.setOriginPos(portal.getOriginPos().add(normal.getUnitVec3().scale(-0.125)));
Mesh2D mesh = new Mesh2D();
double halfU = 1 / portal.getWidth(), halfV = 1 / portal.getHeight();
for (BlockPos cell : surface.cells()) {
Vec3 face = Vec3.atCenterOf(cell).add(normal.getUnitVec3().scale(0.5));
Vec3 offset = face.subtract(portal.getOriginPos());
double u = 2 * offset.dot(portal.getAxisW()) / portal.getWidth();
double v = 2 * offset.dot(portal.getAxisH()) / portal.getHeight();
mesh.addQuad(u - halfU, v - halfV, u + halfU, v + halfV);
}
portal.setPortalShape(new SpecialFlatPortalShape(mesh));
// Descriptive Book travel retains the approaching entity's yaw/pitch.
// Linking Books rotate the approach normal onto their written facing.
DQuaternion rotation = view.preserveFacing() ? DQuaternion.identity : cameraRotation(normal, target);
Vec3 eye = new Vec3(target.x(), target.y() + 1.62, target.z());
// Anchor a standing player's eyes above the opening's floor rather than
// above the mesh center (which changes when the frame is made taller).
Vec3 anchor = surface.bounds().getCenter();
if (normal.getAxis().isHorizontal()) anchor = new Vec3(anchor.x, surface.bounds().minY + 1.62, anchor.z);
else anchor = anchor.add(0, 1.62, 0);
Vec3 destination = eye.subtract(rotation.rotate(anchor.subtract(portal.getOriginPos())));
PortalAPI.setPortalTransformation(portal,
net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.DIMENSION, target.dimension()),
destination, rotation, 1);
portal.setTeleportable(false);
portal.setInteractable(false);
portal.setCrossPortalCollisionEnabled(false);
portal.portalTag = view.tag();
PortalAPI.spawnServerEntity(portal);
}
private static DQuaternion cameraRotation(Direction normal, LinkBookTarget target) {
Vec3 sourceLook = normal.getOpposite().getUnitVec3();
Vec3 sourceUp = normal.getAxis() == Direction.Axis.Y ? new Vec3(0, 0, -1) : new Vec3(0, 1, 0);
Vec3 destinationLook = Vec3.directionFromRotation(target.pitch(), target.yaw());
Vec3 destinationUp = Vec3.directionFromRotation(target.pitch() - 90, target.yaw());
DQuaternion from = DQuaternion.fromFacingVecs(sourceLook.cross(sourceUp), sourceUp);
DQuaternion to = DQuaternion.fromFacingVecs(destinationLook.cross(destinationUp), destinationUp);
return to.hamiltonProduct(from.getConjugated()).getNormalized();
}
private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; }
private RebornCrystalView() {}
}
@@ -0,0 +1,112 @@
package net.dnorberg.rivencraft.compat;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.UUID;
import net.dnorberg.rivencraft.network.RequestBookPreviewPayload;
import net.dnorberg.rivencraft.network.BookPreviewPayload;
import net.dnorberg.rivencraft.network.PortBookNetworking;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.age.AgeCatalogSync;
import net.dnorberg.rivencraft.age.PortAgeTravel;
import net.dnorberg.rivencraft.item.*;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.network.PacketDistributor;
import qouteall.imm_ptl.core.api.PortalAPI;
import qouteall.imm_ptl.core.chunk_loading.ChunkLoader;
import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking;
/** Optional API class: one expiring stream per player, validated before any chunk load. */
final class RebornPreviewChunks {
private static final Map<ServerPlayer, Lease> LEASES = new IdentityHashMap<>();
private static final Map<ServerPlayer, Long> REQUESTS = new IdentityHashMap<>();
private static final int LIFETIME = 600;
private record Lease(UUID session, ChunkLoader loader, LinkBookTarget destination,
RequestBookPreviewPayload source, long expires) {}
static void open(ServerPlayer player, RequestBookPreviewPayload request) {
long now = player.level().getServer().getTickCount();
if (now - REQUESTS.getOrDefault(player, -100L) < 10) return;
REQUESTS.put(player, now);
ItemStack book = validated(player, request);
if (book.isEmpty()) { close(player); return; }
Lease previous = LEASES.get(player);
if (previous != null && previous.session().equals(request.session())
&& previous.source().offhand() == request.offhand()
&& previous.source().fromStand() == request.fromStand()
&& previous.source().sourceDimension().equals(request.sourceDimension())
&& previous.source().standPos().equals(request.standPos())
&& ItemStack.matches(previous.source().book(), request.book())) {
LEASES.put(player, new Lease(previous.session(), previous.loader(), previous.destination(), request, now + LIFETIME));
PacketDistributor.sendToPlayer(player, new BookPreviewPayload(request.session(), previous.destination()));
return;
}
close(player);
LinkBookTarget target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
var properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
var server = player.level().getServer();
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
var level = id == null ? null : server.getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null || !AgeCatalogSync.ready(player, id)) return;
BlockPos landing = PortAgeTravel.resolveLanding(level, player, properties.forDescriptiveBook());
if (landing == null) return;
target = new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
player.getYRot(), player.getXRot());
} else if (book.is(Rivencraft.LINKING_BOOK.get()) && target != null) {
var level = server.getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
if (level == null || !AgeCatalogSync.ready(player, target.dimension())) return;
target = PortLinkDestinations.resolve(player.level(), level, player.blockPosition(), target, properties);
} else return;
if (!target.valid()) return;
var level = server.getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
var center = BlockPos.containing(target.x(), target.y(), target.z());
if (level == null || !level.isInWorldBounds(center) || !level.getWorldBorder().isWithinBounds(center)) return;
close(player);
// Match the root live renderer's eight-chunk orbit view. Reborn schedules
// generation/streaming; no synchronous square of getChunk() calls here.
var loader = new ChunkLoader(level.dimension(), center.getX() >> 4, center.getZ() >> 4, 8);
PortalAPI.addChunkLoaderForPlayer(player, loader);
LEASES.put(player, new Lease(request.session(), loader, target, request, now + LIFETIME));
ImmPtlChunkTracking.immediatelyUpdateForPlayer(player);
PacketDistributor.sendToPlayer(player, new BookPreviewPayload(request.session(), target));
}
private static ItemStack validated(ServerPlayer player, RequestBookPreviewPayload request) {
if (!player.level().dimension().identifier().equals(request.sourceDimension()) || !player.isAlive()) return ItemStack.EMPTY;
if (request.fromStand()) return PortBookNetworking.validatedStandBook(player,
new net.dnorberg.rivencraft.network.UseBookStandPayload(request.sourceDimension(), request.standPos(), request.book()));
ItemStack held = player.getItemInHand(request.offhand() ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND);
return ItemStack.matches(held, request.book()) ? held : ItemStack.EMPTY;
}
static void release(ServerPlayer player, UUID session) {
Lease lease = LEASES.get(player);
if (lease != null && lease.session().equals(session)) close(player);
}
static void close(ServerPlayer player) {
Lease lease = LEASES.remove(player);
if (lease != null) PortalAPI.removeChunkLoaderForPlayer(player, lease.loader());
}
static void tick(MinecraftServer server) {
if (server.getTickCount() % 20 != 0) return;
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) {
Lease lease = LEASES.get(player);
if (server.getTickCount() >= lease.expires()
|| server.getLevel(lease.loader().dimension()) == null
|| validated(player, lease.source()).isEmpty()) close(player);
}
}
static void logout(ServerPlayer player) { close(player); REQUESTS.remove(player); }
static void stop() {
for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player);
REQUESTS.clear();
}
private RebornPreviewChunks() {}
}
@@ -0,0 +1,59 @@
package net.dnorberg.rivencraft.mixin;
import net.dnorberg.rivencraft.client.PortBookPreview;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.Holder;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/** Mutes only the remote client world displayed by a Rivencraft book preview. */
@Mixin(value = ClientLevel.class, priority = 2000)
public abstract class ClientLevelSoundMixin {
@Inject(
method = "playSound(DDDLnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FFZJ)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewPositionSound(
double x, double y, double z, SoundEvent sound, SoundSource source,
float volume, float pitch, boolean distanceDelay, long seed, CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
@Inject(
method = "playLocalSound(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FF)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewLocalEntitySound(
Entity entity, SoundEvent sound, SoundSource source, float volume, float pitch,
CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
@Inject(
method = "playSeededSound(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/Holder;Lnet/minecraft/sounds/SoundSource;FFJ)V",
at = @At("HEAD"),
cancellable = true
)
private void rivencraft$mutePreviewSeededEntitySound(
Entity player, Entity entity, Holder<SoundEvent> sound, SoundSource source,
float volume, float pitch, long seed, CallbackInfo callback
) {
rivencraft$cancelPreviewSound(callback);
}
private void rivencraft$cancelPreviewSound(CallbackInfo callback) {
if (PortBookPreview.shouldMute((ClientLevel)(Object)this)) {
callback.cancel();
}
}
}
@@ -0,0 +1,22 @@
package net.dnorberg.rivencraft.mixin;
import net.dnorberg.rivencraft.client.RebornLiveBookPanel;
import net.dnorberg.rivencraft.compat.RebornBookPreviews;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Pseudo
@Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false)
public abstract class RebornGuiRenderingMixin {
@Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false)
private static void rivencraft$clearLiveTarget(CallbackInfo ci) {
if (RebornBookPreviews.available()) RebornLiveBookPanel.beginRender();
}
@Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false)
private static void rivencraft$restoreCamera(CallbackInfo ci) {
if (RebornBookPreviews.available()) RebornLiveBookPanel.endRender();
}
}
@@ -0,0 +1,17 @@
package net.dnorberg.rivencraft.network;
import java.util.UUID;
import net.dnorberg.rivencraft.Rivencraft;
import net.dnorberg.rivencraft.item.LinkBookTarget;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
public record BookPreviewPayload(UUID session, LinkBookTarget destination) implements CustomPacketPayload {
public static final Type<BookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "book_preview"));
public static final StreamCodec<RegistryFriendlyByteBuf, BookPreviewPayload> STREAM_CODEC = StreamCodec.of(
(buf, value) -> { buf.writeUUID(value.session()); LinkBookTarget.STREAM_CODEC.encode(buf, value.destination()); },
buf -> new BookPreviewPayload(buf.readUUID(), LinkBookTarget.STREAM_CODEC.decode(buf)));
@Override public Type<BookPreviewPayload> type() { return TYPE; }
}
@@ -33,6 +33,17 @@ public final class PortBookNetworking {
public static void registerPayloads(RegisterPayloadHandlersEvent event) {
var registrar = event.registrar("1");
registrar.playToClient(BookPreviewPayload.TYPE, BookPreviewPayload.STREAM_CODEC);
registrar.playToServer(RequestBookPreviewPayload.TYPE, RequestBookPreviewPayload.STREAM_CODEC,
(payload, context) -> {
if (context.player() instanceof ServerPlayer player)
net.dnorberg.rivencraft.compat.RebornBookPreviews.open(player, payload);
});
registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC,
(payload, context) -> {
if (context.player() instanceof ServerPlayer player)
net.dnorberg.rivencraft.compat.RebornBookPreviews.release(player, payload.session());
});
registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC,
(payload, context) -> {
if (context.player() instanceof ServerPlayer player
@@ -130,6 +141,8 @@ public final class PortBookNetworking {
public static Identifier createAge(ServerPlayer player, String title, List<Identifier> pages) {
if (title == null || title.isBlank() || title.length() > MAX_BOOK_TITLE_LENGTH) return null;
long seed = player.getRandom().nextLong();
var policy = pages.isEmpty() ? net.dnorberg.rivencraft.age.PortRandomPagePolicy.configured()
: net.dnorberg.rivencraft.age.PortRandomPagePolicy.UNRESTRICTED;
var recovery = net.dnorberg.rivencraft.writing.PortWritingRecovery.recover(pages);
List<Identifier> activePages = recovery.activePages();
net.dnorberg.rivencraft.age.PortBiomePlan biomePlan;
@@ -137,7 +150,7 @@ public final class PortBookNetworking {
List<Identifier> generationPages;
try {
if (pages.isEmpty()) {
var random = PortRandomAgeSelection.select(player.level().getServer(), seed);
var random = PortRandomAgeSelection.select(player.level().getServer(), seed, policy);
terrain = random.terrain();
biomePlan = random.biomes();
generationPages = pages;
@@ -163,9 +176,9 @@ public final class PortBookNetworking {
id = Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "age/" + name);
}
try {
var environment = net.dnorberg.rivencraft.age.PortEnvironmentSelection.resolve(activePages, seed, terrain);
var environment = net.dnorberg.rivencraft.age.PortEnvironmentSelection.resolve(activePages, seed, terrain, policy);
var randomFeatures = pages.isEmpty()
? net.dnorberg.rivencraft.age.PortRandomFeatureSelection.select(server, seed, terrain, biomePlan) : null;
? net.dnorberg.rivencraft.age.PortRandomFeatureSelection.select(server, seed, terrain, biomePlan, policy) : null;
RuntimeAgeBackend.create(server, id, seed, biomePlan, terrain,
randomFeatures == null ? PortAuthoredWriting.rockPlan(generationPages, seed) : randomFeatures.rocks(),
PortAuthoredWriting.vegetationPlan(generationPages),
@@ -175,7 +188,7 @@ public final class PortBookNetworking {
environment.weather(), environment.lighting(), environment.sky(),
net.dnorberg.rivencraft.age.PortAgeColors.resolve(pages, seed),
net.dnorberg.rivencraft.age.PortDayCycle.resolve(pages, seed,
net.dnorberg.rivencraft.age.PortDayCycle.nativeTicks(server.overworld())), pages, title);
net.dnorberg.rivencraft.age.PortDayCycle.nativeTicks(server.overworld()), policy), pages, title, policy);
} catch (RuntimeException exception) {
Rivencraft.LOGGER.warn("Age creation failed for {}", id, exception);
player.sendOverlayMessage(Component.literal("Age creation failed: "
@@ -0,0 +1,15 @@
package net.dnorberg.rivencraft.network;
import java.util.UUID;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
public record ReleaseBookPreviewPayload(UUID session) implements CustomPacketPayload {
public static final Type<ReleaseBookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "release_book_preview"));
public static final StreamCodec<RegistryFriendlyByteBuf, ReleaseBookPreviewPayload> STREAM_CODEC = StreamCodec.of(
(buf, value) -> buf.writeUUID(value.session()), buf -> new ReleaseBookPreviewPayload(buf.readUUID()));
@Override public Type<ReleaseBookPreviewPayload> type() { return TYPE; }
}
@@ -0,0 +1,24 @@
package net.dnorberg.rivencraft.network;
import java.util.UUID;
import net.dnorberg.rivencraft.Rivencraft;
import net.minecraft.core.BlockPos;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.ItemStack;
/** The server verifies the actual held/stand book, never a client-supplied destination. */
public record RequestBookPreviewPayload(UUID session, boolean offhand, boolean fromStand,
Identifier sourceDimension, BlockPos standPos, ItemStack book) implements CustomPacketPayload {
public static final Type<RequestBookPreviewPayload> TYPE = new Type<>(Identifier.fromNamespaceAndPath(Rivencraft.MOD_ID, "request_book_preview"));
public static final StreamCodec<RegistryFriendlyByteBuf, RequestBookPreviewPayload> STREAM_CODEC = StreamCodec.of(
(buf, value) -> {
buf.writeUUID(value.session()); buf.writeBoolean(value.offhand()); buf.writeBoolean(value.fromStand());
Identifier.STREAM_CODEC.encode(buf, value.sourceDimension());
BlockPos.STREAM_CODEC.encode(buf, value.standPos()); ItemStack.STREAM_CODEC.encode(buf, value.book());
}, buf -> new RequestBookPreviewPayload(buf.readUUID(), buf.readBoolean(), buf.readBoolean(),
Identifier.STREAM_CODEC.decode(buf), BlockPos.STREAM_CODEC.decode(buf), ItemStack.STREAM_CODEC.decode(buf)));
@Override public Type<RequestBookPreviewPayload> type() { return TYPE; }
}
@@ -176,10 +176,12 @@ public final class CrystalPortalNetwork {
return false;
}
}
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
return true;
}
public static void shutdown(ServerLevel level, BlockPos receptacle) {
net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(level, receptacle);
// A broken support can disconnect the graph. Scan a bounded volume rather
// than trusting a path through blocks that no longer exist.
for (BlockPos pos : BlockPos.betweenClosed(receptacle.offset(-CLEANUP_RADIUS, -CLEANUP_RADIUS, -CLEANUP_RADIUS),
@@ -221,6 +223,8 @@ public final class CrystalPortalNetwork {
level.setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
}
orientSurfaces(level, plan);
var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle);
net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook());
return true;
}
@@ -24,6 +24,26 @@ public final class PortalBookTravel {
: book.has(Rivencraft.LINK_BOOK_TARGET.get()) ? book.get(Rivencraft.LINK_BOOK_TARGET.get()).dimension() : null;
return id != null && source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id)) != null;
}
/** The same destination rules serve native rendering and actual portal arrivals. */
public static LinkBookTarget destination(ServerLevel source, ItemStack book,
net.minecraft.core.BlockPos departure, float yaw, float pitch) {
var properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
var level = id == null ? null : source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null) return null;
var landing = PortAgeTravel.resolveLanding(level, source, departure, properties.forDescriptiveBook());
return landing == null ? null : new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(),
landing.getZ() + 0.5, yaw, pitch);
}
if (!book.is(Rivencraft.LINKING_BOOK.get())) return null;
var target = book.get(Rivencraft.LINK_BOOK_TARGET.get());
if (target == null || !target.valid()) return null;
var level = source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, target.dimension()));
return level == null ? null : net.dnorberg.rivencraft.item.PortLinkDestinations.resolve(
source, level, departure, target, properties);
}
public static void travel(Entity entity, ServerLevel source, ItemStack book) {
if (entity instanceof ServerPlayer player) {
if (book.is(Rivencraft.DESCRIPTIVE_BOOK.get())) {
@@ -38,22 +58,10 @@ public final class PortalBookTravel {
LinkProperties properties = book.getOrDefault(Rivencraft.LINK_PROPERTIES.get(), LinkProperties.NONE);
if (properties.has(LinkProperties.DISARM) && !LinkDisarmService.mayTravel(entity)) return;
boolean descriptive = book.is(Rivencraft.DESCRIPTIVE_BOOK.get());
LinkBookTarget destination = book.get(Rivencraft.LINK_BOOK_TARGET.get());
if (descriptive) {
var id = book.get(Rivencraft.AGE_BOOK_ID.get());
ServerLevel level = id == null ? null : source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, id));
if (level == null) return;
var landing = PortAgeTravel.resolveLanding(level, entity, properties.forDescriptiveBook());
if (landing == null) return;
destination = new LinkBookTarget(id, landing.getX() + 0.5, landing.getY(), landing.getZ() + 0.5,
entity.getYRot(), entity.getXRot());
}
LinkBookTarget destination = destination(source, book, entity.blockPosition(), entity.getYRot(), entity.getXRot());
if (destination == null || !destination.valid()) return;
ServerLevel target = source.getServer().getLevel(ResourceKey.create(Registries.DIMENSION, destination.dimension()));
if (target == null || !entity.canTeleport(source, target) || !descriptive && !properties.allowsTravel(target == source)) return;
if (!descriptive) destination = net.dnorberg.rivencraft.item.PortLinkDestinations.resolve(source, target,
entity.blockPosition(), destination, properties);
if (!destination.valid()) return;
var feet = net.minecraft.core.BlockPos.containing(destination.x(), destination.y(), destination.z());
if (feet.getY() < target.getMinY() || entity.getBbHeight() + feet.getY() >= target.getMaxY()
|| !target.getWorldBorder().isWithinBounds(feet)) return;
@@ -0,0 +1,40 @@
package net.dnorberg.rivencraft.writing;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
/** Legacy prose word splitting and base-25 width, independent of the client renderer. */
public final class PortGlyphTextLayout {
private static final Pattern WORD_BREAK = Pattern.compile("[^\\p{L}\\p{N}]+");
private static final Pattern NUMERAL = Pattern.compile("[0-9]+");
public record Glyph(String word, int x, int y, int width) {}
public record Layout(List<Glyph> glyphs, int height) {
public Layout { glyphs = List.copyOf(glyphs); }
}
private PortGlyphTextLayout() {}
public static int number(String word) {
if (!NUMERAL.matcher(word).matches()) return -1;
try { return Integer.parseInt(word); }
catch (NumberFormatException exception) { return -1; }
}
public static Layout layout(String text, int maxWidth, int size) {
if (size < 1 || maxWidth < size) throw new IllegalArgumentException("Invalid glyph text dimensions");
var glyphs = new ArrayList<Glyph>();
int x = 0, y = 0;
for (String word : WORD_BREAK.split(text)) {
if (word.isEmpty()) continue;
int value = number(word), width = size;
if (value >= 0) {
int digits = PortSymbolNumerals.digitsFor(value).length;
if (digits > 1) width = digits * (Math.max(8, size * 3 / 4) + 1) - 1;
}
if (x != 0 && x + width > maxWidth) { x = 0; y += size + 1; }
glyphs.add(new Glyph(word, x, y, width));
x += width + 3;
}
return new Layout(glyphs, glyphs.isEmpty() ? 0 : y + size + 1);
}
}
@@ -55,6 +55,18 @@ public final class PortSymbolPages {
.map(Entry::id).sorted().toList();
}
/** Library loot includes exact Ruins templates; Sealed Notebooks keep their own pool. */
public static List<Identifier> libraryCandidateIds() {
return java.util.stream.Stream.concat(ENTRIES.values().stream()
.filter(entry -> entry.id().getNamespace().equals(Rivencraft.MOD_ID)
&& !entry.id().getPath().startsWith("block/")
&& !entry.id().getPath().startsWith("biome/")
&& !entry.role().equals("unknown")).map(Entry::id),
net.dnorberg.rivencraft.compat.RuinsTemplatePages.templates().stream()
.map(net.dnorberg.rivencraft.compat.RuinsTemplatePages::symbolId))
.distinct().sorted().toList();
}
public static List<ItemStack> pages(String category, HolderLookup.Provider registries) {
List<ItemStack> pages = new ArrayList<>();
ENTRIES.values().stream().filter(entry -> entry.category().equals(category))
@@ -16,7 +16,9 @@
],
"client": [
"StaticSkyStateMixin",
"StaticSkyRendererMixin"
"StaticSkyRendererMixin",
"RebornGuiRenderingMixin",
"ClientLevelSoundMixin"
],
"injectors": {
"defaultRequire": 1