Add Flooded pages across Minecraft versions and fix 1.21.1 workstations
Build and smoke / changes (push) Canceled after 0s
Build and smoke / build (push) Canceled after 0s

This commit is contained in:
dnorberg committed 2026-11-15 22:08:56 -05:00
1 parent 4a59fb5d02
commit 441f2896d7
40 files changed
+1018 -64

No files matched your search

@@ -28,6 +28,7 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
public static final int PAPER = 1;
public static final int BOTTLES = 2;
public static final int SIZE = 3;
private static final int LINK_PANEL_INK_COST = 1;
private NonNullList<ItemStack> items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
private int inkRemaining;
@@ -126,13 +127,13 @@ public final class InkMixerBlockEntity extends BlockEntity implements Container
public boolean canCreateLinkPanel() {
if (!items.get(PAPER).is(Items.PAPER)) return false;
return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, InkVialItem.CAPACITY);
return InkVialExchange.canPay(items, INK, BOTTLES, inkRemaining, LINK_PANEL_INK_COST);
}
/** Commit inputs only when a virtual output is actually taken. */
public boolean consumeLinkPanelMaterials() {
if (!canCreateLinkPanel()) return false;
int cost = InkVialItem.CAPACITY;
int cost = LINK_PANEL_INK_COST;
if (inkRemaining < cost) {
inkRemaining += InkVialExchange.exchange(items, INK, BOTTLES);
}
@@ -56,6 +56,8 @@ import net.minecraft.world.level.levelgen.FlatLevelSource;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraft.world.level.levelgen.SurfaceRules;
import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
import net.dnorberg.rivencraft.shared.FloodingRules;
import net.neoforged.fml.ModList;
/** Creates, reloads, and resolves Rivencraft's runtime Age dimensions. */
@@ -244,14 +246,18 @@ public final class AgeDimensionService {
if (age.caveTerrain()) {
// Cave Ages are enclosed. Searching from the world ceiling would
// select or expose their roof, so begin with the floor beneath a
// player standing at Y=64 and search downward from there.
floorCenter = highestFootedSurface(level, CAVE_SPAWN_SEARCH_Y - 1)
.orElseGet(() -> generatePlatform ? fallbackSpawnFloor(level) : null);
} else if (isNetherStyle(level)) {
// player standing at Y=64, or above an explicitly higher flood line.
int water = FloodingRules.surface(AgeFlooding.requested(age.plan()),
level.getMinBuildHeight(), level.getMaxBuildHeight());
int searchTop = water == FloodingRules.NONE ? CAVE_SPAWN_SEARCH_Y - 1
: Math.max(CAVE_SPAWN_SEARCH_Y - 1, water + 1);
floorCenter = highestFootedSurface(level, searchTop)
.orElseGet(() -> generatePlatform ? fallbackSpawnFloor(level, age) : null);
} else if (isNetherStyle(level) && AgeFlooding.requested(age.plan()) == FloodingRules.NONE) {
floorCenter = generatePlatform ? netherSpawnFloor(level)
: highestFootedSurface(level, CAVE_SPAWN_SEARCH_Y - 1).orElse(null);
} else {
floorCenter = highestFootedSurface(level).orElseGet(() -> generatePlatform ? fallbackSpawnFloor(level) : null);
floorCenter = highestFootedSurface(level).orElseGet(() -> generatePlatform ? fallbackSpawnFloor(level, age) : null);
}
if (floorCenter == null) return null;
@@ -260,7 +266,7 @@ public final class AgeDimensionService {
for (int z = -PLATFORM_RADIUS; z <= PLATFORM_RADIUS; z++) {
BlockPos floor = floorCenter.offset(x, 0, z);
level.setBlock(floor, ModBlocks.CLOUD_PLATFORM.get().defaultBlockState(), 2);
for (int y = 1; y <= 4; y++) {
for (int y = 1; y <= 4 && floor.getY() + y < level.getMaxBuildHeight(); y++) {
level.setBlock(floor.above(y), Blocks.AIR.defaultBlockState(), 2);
}
}
@@ -338,12 +344,27 @@ public final class AgeDimensionService {
return Optional.empty();
}
private static BlockPos fallbackSpawnFloor(ServerLevel level) {
int floorY = Math.clamp(FALLBACK_PLATFORM_Y,
level.getMinBuildHeight(), level.getMaxBuildHeight() - 5);
private static BlockPos fallbackSpawnFloor(ServerLevel level, AgeDefinition age) {
int floorY = Math.clamp(FloodingRules.platformFloor(AgeFlooding.requested(age.plan()),
level.getMinBuildHeight(), level.getMaxBuildHeight()),
level.getMinBuildHeight(), level.getMaxBuildHeight() - 4);
return new BlockPos(0, floorY, 0);
}
/** Keep the flat surface at Y=3 even when its dimension extends below zero. */
static FlatLevelGeneratorSettings flatSettings(MinecraftServer server, AgeRuntimeProfile profile) {
var settings = FlatLevelGeneratorSettings.getDefault(
server.registryAccess().lookupOrThrow(Registries.BIOME),
server.registryAccess().lookupOrThrow(Registries.STRUCTURE_SET),
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE));
int minY = server.registryAccess().lookupOrThrow(Registries.DIMENSION_TYPE)
.getOrThrow(ResourceKey.create(Registries.DIMENSION_TYPE, profile.dimensionType()))
.value().minY();
if (minY < 0) settings.getLayersInfo().addFirst(new FlatLayerInfo(-minY, Blocks.AIR));
settings.updateLayers();
return settings;
}
private static ChunkGenerator createGenerator(MinecraftServer server, AgeDefinition age) {
AgeRuntimeProfile profile = runtimeProfile(age);
BiomeSource biomeSource = createBiomeSource(server, age, profile);
@@ -351,13 +372,9 @@ public final class AgeDimensionService {
List<AgeFeatureSelection.Choice> features = age.plan() == null
? age.randomFeatures() : AgeFeatureSelection.resolved(age.plan());
if (profile.terrain() == AgeRuntimeProfile.Terrain.FLAT) {
var settings = FlatLevelGeneratorSettings.getDefault(
server.registryAccess().lookupOrThrow(Registries.BIOME),
server.registryAccess().lookupOrThrow(Registries.STRUCTURE_SET),
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
);
var settings = flatSettings(server, profile);
return age.generationVersion() < AgeDefinition.LEGACY_GENERATOR_CUTOFF
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed(), libraryAgeSymbols);
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed(), libraryAgeSymbols, AgeFlooding.requested(age.plan()));
}
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
FlatLevelGeneratorSettings settings = new FlatLevelGeneratorSettings(
@@ -367,7 +384,7 @@ public final class AgeDimensionService {
);
settings.updateLayers();
return age.generationVersion() < AgeDefinition.LEGACY_GENERATOR_CUTOFF
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed(), libraryAgeSymbols);
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed(), libraryAgeSymbols, AgeFlooding.requested(age.plan()));
}
var noiseSettings = server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS);
@@ -376,11 +393,12 @@ public final class AgeDimensionService {
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
Holder<NoiseGeneratorSettings> settings = Holder.direct(withBiomeMaterialRules(baseSettings));
boolean caveTerrain = AgeBiomeSelection.isCave(profile);
if (caveTerrain) settings = Holder.direct(dryCaveSettings(settings.value()));
return age.generationVersion() < AgeDefinition.LEGACY_GENERATOR_CUTOFF
? new NoiseBasedChunkGenerator(biomeSource, settings)
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed(),
caveTerrain, caveTerrain ? TerraBlenderBiomes.nether(server.registryAccess()) : List.of(),
libraryAgeSymbols);
libraryAgeSymbols, AgeFlooding.requested(age.plan()));
}
/** Freeze the Age's authoring/result pages into the generator; worldgen never reads SavedData. */
@@ -415,6 +433,13 @@ public final class AgeDimensionService {
return ids.stream().filter(id -> SymbolCatalog.isKnown(new SymbolReference(id))).toList();
}
static NoiseGeneratorSettings dryCaveSettings(NoiseGeneratorSettings base) {
return new NoiseGeneratorSettings(base.noiseSettings(), base.defaultBlock(),
Blocks.AIR.defaultBlockState(), base.noiseRouter(), base.surfaceRule(), base.spawnTarget(),
base.noiseSettings().minY() - 1, base.disableMobGeneration(), false,
base.oreVeinsEnabled(), base.useLegacyRandomSource());
}
private static NoiseGeneratorSettings withBiomeMaterialRules(NoiseGeneratorSettings base) {
SurfaceRules.RuleSource biomeMaterials = SurfaceRules.sequence(
SurfaceRules.ifTrue(
@@ -0,0 +1,43 @@
package net.dnorberg.rivencraft.book;
import net.dnorberg.rivencraft.shared.FloodingRules;
import net.dnorberg.rivencraft.writing.SymbolSemantics;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.FluidTags;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.chunk.ChunkAccess;
/** Frozen authored water surface applied after terrain, carvers and decorations. */
public final class AgeFlooding {
private AgeFlooding() {}
public static int requested(AgeGenerationPlan plan) {
if (plan == null) return FloodingRules.NONE;
return FloodingRules.requested(plan.symbols().stream()
.sorted(java.util.Comparator.comparingInt(AgeGenerationPlan.ResolvedSymbol::index))
.map(symbol -> symbol.semantics().role() == SymbolSemantics.Role.COLOR_NUMBER
? (int) ((SymbolSemantics.NumberValue) symbol.semantics().value()).amount()
: symbol.semantics().role() == SymbolSemantics.Role.FLOODING
? FloodingRules.FLOODED : FloodingRules.OTHER).toList());
}
public static void apply(ChunkAccess chunk, int requested) {
int surface = FloodingRules.surface(requested, chunk.getMinBuildHeight(), chunk.getMaxBuildHeight());
if (surface == FloodingRules.NONE) return;
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
int startX = chunk.getPos().getMinBlockX(), startZ = chunk.getPos().getMinBlockZ();
for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) {
for (int y = chunk.getMinBuildHeight(); y < chunk.getMaxBuildHeight(); y++) {
pos.set(startX + x, y, startZ + z);
var state = chunk.getBlockState(pos);
if (y <= surface && state.isAir())
chunk.setBlockState(pos, Blocks.WATER.defaultBlockState(), false);
else if (state.hasProperty(BlockStateProperties.WATERLOGGED))
chunk.setBlockState(pos, state.setValue(BlockStateProperties.WATERLOGGED, y <= surface), false);
else if (y > surface && state.getFluidState().is(FluidTags.WATER))
chunk.setBlockState(pos, Blocks.AIR.defaultBlockState(), false);
}
}
}
}
@@ -0,0 +1,85 @@
package net.dnorberg.rivencraft.book;
import com.google.gson.JsonElement;
import com.mojang.serialization.JsonOps;
import java.util.List;
import java.util.Optional;
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
import net.minecraft.core.registries.Registries;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.LevelHeightAccessor;
import net.minecraft.world.level.biome.Biomes;
import net.minecraft.world.level.biome.FixedBiomeSource;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
import net.neoforged.neoforge.gametest.GameTestHolder;
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
/** Focused, storage-free checks; real Flat Age travel/reload remains player validation. */
@GameTestHolder("rivencraft_archive_flat")
@PrefixGameTestTemplate(false)
public final class FlatOriginGameTests {
private FlatOriginGameTests() {}
@GameTest(template = "empty")
public static void flatLayersAndAuthoredBiomeSurviveCodecReload(GameTestHelper helper) {
var profile = AgeRuntimeProfiles.resolve(AgeGenerationProfiles.FLAT);
var settings = AgeDimensionService.flatSettings(helper.getLevel().getServer(), profile);
var desert = helper.getLevel().registryAccess().lookupOrThrow(Registries.BIOME)
.getOrThrow(Biomes.DESERT);
var generator = new AgeFlatChunkGenerator(new FixedBiomeSource(desert), settings);
var ops = helper.getLevel().registryAccess().createSerializationContext(JsonOps.INSTANCE);
JsonElement saved = AgeFlatChunkGenerator.CODEC.codec().encodeStart(ops, generator).getOrThrow();
var restored = AgeFlatChunkGenerator.CODEC.codec().parse(ops, saved).getOrThrow();
var height = LevelHeightAccessor.create(-64, 384);
assertSurface(helper, generator, height);
assertSurface(helper, restored, height);
helper.assertTrue(restored.getBiomeSource().possibleBiomes().stream().allMatch(b -> b.is(Biomes.DESERT)),
"Reload must retain the authored Desert biome");
helper.succeed();
}
@GameTest(template = "empty")
public static void zeroMinimumDoesNotReceiveAirPadding(GameTestHelper helper) {
var flat = AgeRuntimeProfiles.resolve(AgeGenerationProfiles.FLAT);
var profile = new AgeRuntimeProfile(flat.schemaVersion(), flat.terrain(), flat.noiseSettings(),
flat.biomePreset(), ResourceLocation.withDefaultNamespace("the_nether"));
var settings = AgeDimensionService.flatSettings(helper.getLevel().getServer(), profile);
var biome = helper.getLevel().registryAccess().lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.PLAINS);
assertSurface(helper, new AgeFlatChunkGenerator(new FixedBiomeSource(biome), settings),
LevelHeightAccessor.create(0, 256));
helper.succeed();
}
@GameTest(template = "empty")
public static void voidColumnAndSpawnHeightRemainEmpty(GameTestHelper helper) {
var biome = helper.getLevel().registryAccess().lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.THE_VOID);
var settings = new FlatLevelGeneratorSettings(Optional.empty(), biome, List.of());
settings.updateLayers();
var generator = new AgeFlatChunkGenerator(new FixedBiomeSource(biome), settings);
var height = LevelHeightAccessor.create(-64, 384);
helper.assertValueEqual(generator.getSpawnHeight(height), -64, "Void keeps its empty-column spawn metadata");
helper.assertValueEqual(generator.getBaseHeight(0, 0, Heightmap.Types.WORLD_SURFACE_WG, height, null),
-64, "Void must not acquire flat ground");
helper.assertTrue(generator.getBaseColumn(0, 0, height, null).getBlock(0).isAir(),
"Void must remain empty at Y=0");
helper.succeed();
}
private static void assertSurface(GameTestHelper helper, AgeFlatChunkGenerator generator,
LevelHeightAccessor height) {
var column = generator.getBaseColumn(0, 0, height, null);
helper.assertTrue(column.getBlock(-1).isAir(), "Flat ground must have air below Y=0");
helper.assertTrue(column.getBlock(0).is(Blocks.BEDROCK), "Bedrock must be at Y=0");
helper.assertTrue(column.getBlock(1).is(Blocks.DIRT) && column.getBlock(2).is(Blocks.DIRT),
"Dirt must occupy Y=1 and Y=2");
helper.assertTrue(column.getBlock(3).is(Blocks.GRASS_BLOCK), "Grass must be at Y=3");
helper.assertTrue(column.getBlock(4).isAir(), "Arrival at Y=4 must have headroom");
helper.assertValueEqual(generator.getSpawnHeight(height), 4, "Flat spawn metadata must be above the surface");
helper.assertValueEqual(generator.getBaseHeight(0, 0, Heightmap.Types.WORLD_SURFACE_WG, height, null),
4, "Surface height queries must agree with spawn metadata");
}
}
@@ -0,0 +1,132 @@
package net.dnorberg.rivencraft.book;
import java.util.List;
import java.util.ArrayList;
import net.dnorberg.rivencraft.shared.FloodingRules;
import net.dnorberg.rivencraft.item.PageItem;
import net.dnorberg.rivencraft.writing.*;
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.Registries;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.LevelHeightAccessor;
import net.minecraft.world.level.biome.Biomes;
import net.minecraft.world.level.biome.FixedBiomeSource;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.chunk.ProtoChunk;
import net.minecraft.world.level.chunk.UpgradeData;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import com.mojang.serialization.JsonOps;
import net.neoforged.neoforge.gametest.GameTestHolder;
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
@GameTestHolder("rivencraft_archive_flood")
@PrefixGameTestTemplate(false)
public final class FloodedGameTests {
private FloodedGameTests() {}
private static WritingEntry page(String id) {
return WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath("rivencraft", id)));
}
private static AgeGenerationPlan plan(GameTestHelper helper, String... pages) {
var entries = new ArrayList<WritingEntry>();
entries.add(WritingEntry.linkPanel());
entries.add(page("terrain/cave"));
entries.add(page("biome/lush_caves"));
entries.add(page("biome/single"));
for (String id : pages) entries.add(page(id));
var writing = new OrderedWriting(entries);
var parsed = WritingGrammar.parse(writing);
helper.assertTrue(parsed.diagnostics().stream().noneMatch(d ->
d.code() == WritingGrammar.Code.MISPLACED_MODIFIER
|| d.code() == WritingGrammar.Code.DANGLING_MODIFIER),
"A Flooded digit chain must be consumed without dangling-number penalties");
return AgeGenerationPlan.compile(writing, 107L, AgeGenerationProfiles.CAVE,
AgeTraits.LEGACY_DEFAULTS, helper.getLevel().registryAccess());
}
@GameTest(template = "empty")
public static void orderedDigitsAndPlanGeneratorPersistence(GameTestHelper helper) {
var authored = plan(helper, "number/2", "number/13", "environment/flooded");
helper.assertValueEqual(AgeFlooding.requested(authored), 63, "Base-25 digits 2,13 must mean absolute Y=63");
helper.assertValueEqual(AgeFlooding.requested(AgeGenerationPlan.load(authored.save())), 63,
"Saved writing must retain the water level");
helper.assertValueEqual(AgeFlooding.requested(plan(helper, "environment/flooded")), 63, "Default must be Y=63");
helper.assertValueEqual(AgeFlooding.requested(plan(helper, "number/2", "number/13",
"environment/flooded", "number/4", "environment/flooded")), 4,
"Last Flooded must use its own adjacent number");
helper.assertValueEqual(AgeFlooding.requested(plan(helper, "number/4", "environment/flooded",
"environment/flooded")), 63, "An unnumbered final Flooded must reset to the default");
helper.assertValueEqual(AgeFlooding.requested(plan(helper)), FloodingRules.NONE, "Flooding must be opt-in");
helper.assertValueEqual(FloodingRules.surface(Integer.MAX_VALUE, -64, 320), 315,
"Huge numbers must leave safe platform/headroom space");
helper.assertValueEqual(FloodingRules.platformFloor(24, -64, 320), 25,
"Low flooded fallback must sit just above the selected water level");
helper.assertValueEqual(FloodingRules.platformFloor(Integer.MAX_VALUE, -64, 320), 316,
"Fallback floor must be above the water and inside build height");
var registries = helper.getLevel().registryAccess();
var biome = registries.lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.DESERT);
var generator = new AgeFlatChunkGenerator(new FixedBiomeSource(biome),
AgeDimensionService.flatSettings(helper.getLevel().getServer(),
AgeRuntimeProfiles.resolve(AgeGenerationProfiles.FLAT)), List.of(), 107L, List.of(), 74);
var ops = registries.createSerializationContext(JsonOps.INSTANCE);
var encoded = AgeFlatChunkGenerator.CODEC.codec().encodeStart(ops, generator).getOrThrow();
var restored = AgeFlatChunkGenerator.CODEC.codec().parse(ops, encoded).getOrThrow();
helper.assertValueEqual(restored.floodSurface(), 74, "Generator codec must freeze the authored water level");
var caveSettings = registries.lookupOrThrow(Registries.NOISE_SETTINGS)
.getOrThrow(NoiseGeneratorSettings.CAVES).value();
var caveGenerator = new net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator(
new FixedBiomeSource(registries.lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.LUSH_CAVES)),
net.minecraft.core.Holder.direct(AgeDimensionService.dryCaveSettings(caveSettings)),
List.of(), 107L, true, List.of(), List.of(), 74);
var caveEncoded = net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator.CODEC.codec()
.encodeStart(ops, caveGenerator).getOrThrow();
var caveRestored = net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator.CODEC.codec()
.parse(ops, caveEncoded).getOrThrow();
helper.assertValueEqual(caveRestored.floodSurface(), 74, "Cave generator codec must retain its water level");
helper.succeed();
}
@GameTest(template = "empty")
public static void caveOpeningsFillAtTwoHeightsWithoutReplacingSolidFeatures(GameTestHelper helper) {
var chunk = new ProtoChunk(new ChunkPos(0, 0), UpgradeData.EMPTY,
LevelHeightAccessor.create(-64, 256),
helper.getLevel().registryAccess().registryOrThrow(Registries.BIOME), null);
chunk.setBlockState(new BlockPos(2, 10, 2), Blocks.DIAMOND_BLOCK.defaultBlockState(), false);
chunk.setBlockState(new BlockPos(2, 90, 2), Blocks.STONE.defaultBlockState(), false);
chunk.setBlockState(new BlockPos(3, 60, 3), Blocks.WATER.defaultBlockState(), false);
chunk.setBlockState(new BlockPos(4, 60, 4), Blocks.OAK_FENCE.defaultBlockState()
.setValue(BlockStateProperties.WATERLOGGED, true), false);
AgeFlooding.apply(chunk, FloodingRules.NONE);
helper.assertTrue(chunk.getBlockState(new BlockPos(1, 24, 1)).isAir(), "Dry Age must remain unchanged");
AgeFlooding.apply(chunk, 24);
helper.assertTrue(chunk.getBlockState(new BlockPos(1, 24, 1)).is(Blocks.WATER), "Low surface must be Y=24");
helper.assertTrue(chunk.getBlockState(new BlockPos(1, 25, 1)).isAir(), "Low surface must stop above Y=24");
helper.assertTrue(chunk.getBlockState(new BlockPos(3, 60, 3)).isAir(), "Water above requested level must drain");
helper.assertFalse(chunk.getBlockState(new BlockPos(4, 60, 4)).getValue(BlockStateProperties.WATERLOGGED),
"Draining must preserve and dry waterlogged solid blocks");
AgeFlooding.apply(chunk, 74);
helper.assertTrue(chunk.getBlockState(new BlockPos(1, 74, 1)).is(Blocks.WATER), "High surface must be Y=74");
helper.assertTrue(chunk.getBlockState(new BlockPos(1, 75, 1)).isAir(), "High surface must stop above Y=74");
helper.assertTrue(chunk.getBlockState(new BlockPos(2, 10, 2)).is(Blocks.DIAMOND_BLOCK)
&& chunk.getBlockState(new BlockPos(2, 90, 2)).is(Blocks.STONE),
"Flooding must preserve authored material features and cave roof");
helper.succeed();
}
@GameTest(template = "empty")
public static void dryCaveDefaultsAndPublicPageFeed(GameTestHelper helper) {
var base = helper.getLevel().registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS)
.getOrThrow(NoiseGeneratorSettings.CAVES).value();
var dry = AgeDimensionService.dryCaveSettings(base);
helper.assertTrue(dry.defaultFluid().isAir(), "Cave default fluid must be air");
helper.assertTrue(dry.seaLevel() < dry.noiseSettings().minY() && !dry.isAquifersEnabled(),
"Unwritten Cave terrain must not create water aquifers");
helper.assertTrue(PageItem.bundledCreativeSymbols().contains("environment/flooded"),
"Flooded must be in the generated public Creative/JEI feed");
helper.succeed();
}
}
@@ -110,9 +110,9 @@ public final class InkMixerGameTests {
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking result must give a Link Panel");
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
"Taking result must use exactly one paper");
helper.assertValueEqual(mixer.inkRemaining(), 0,
"Taking one panel must spend the entire Ink Vial");
helper.assertFalse(mixer.canCreateLinkPanel(), "A second panel needs another Ink Vial");
helper.assertValueEqual(mixer.inkRemaining(), 15,
"Taking one panel must spend exactly one ink");
helper.assertTrue(mixer.canCreateLinkPanel(), "Remaining ink must enable another panel");
var saved = mixer.saveWithoutMetadata(helper.getLevel().registryAccess());
var restored = new InkMixerBlockEntity(mixer.getBlockPos(), ModBlocks.INK_MIXER.get().defaultBlockState());
restored.loadWithComponents(saved, helper.getLevel().registryAccess());
@@ -123,20 +123,41 @@ public final class InkMixerGameTests {
}
@GameTest(template = "empty")
public static void eachLinkPanelConsumesOneInkVial(GameTestHelper helper) {
public static void oneVialProducesSixteenPanelsAndResetsEachMixture(GameTestHelper helper) {
InkMixerBlockEntity mixer = place(helper);
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 3));
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get(), 2));
helper.assertTrue(mixer.canCreateLinkPanel(), "First vial must enable the first panel");
helper.assertTrue(mixer.consumeLinkPanelMaterials(), "First panel must be produced");
helper.assertValueEqual(mixer.inkRemaining(), 16, "Second vial must refill after first panel");
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.BOTTLES).getCount(), 2,
"Both spent vials must return bottles");
helper.assertTrue(mixer.consumeLinkPanelMaterials(), "Second panel must be produced");
helper.assertValueEqual(mixer.inkRemaining(), 0, "Second panel must use the whole second vial");
helper.assertFalse(mixer.canCreateLinkPanel(), "Two vials must not make a third panel");
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 1,
"Each panel must also use one paper");
mixer.setItem(InkMixerBlockEntity.PAPER, new ItemStack(Items.PAPER, 16));
mixer.setItem(InkMixerBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
var player = helper.makeMockServerPlayerInLevel();
player.moveTo(mixer.getBlockPos().getX() + 0.5, mixer.getBlockPos().getY() + 0.5,
mixer.getBlockPos().getZ() + 0.5);
InkMixerMenu menu = new InkMixerMenu(1, player.getInventory(), mixer);
for (int taken = 1; taken <= 16; taken++) {
helper.assertTrue(mixer.addModifier(new ItemStack(Items.GUNPOWDER), 1),
"Each remaining ink unit must accept a fresh additive");
menu.broadcastChanges();
helper.assertValueEqual(mixer.modifierChancePermille(0), 200,
"Previewing the panel must preserve the mixture");
menu.setCarried(ItemStack.EMPTY);
menu.clicked(InkMixerMenu.RESULT, 0, ClickType.PICKUP, player);
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()),
"Every pickup must produce a panel");
helper.assertValueEqual(menu.getCarried().getCount(), 1,
"Each pickup must produce exactly one panel");
helper.assertValueEqual(mixer.inkRemaining(), 16 - taken,
"Every pickup must consume exactly one ink");
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.PAPER).getCount(), 16 - taken,
"Every pickup must consume exactly one paper");
for (int index = 0; index < 3; index++)
helper.assertValueEqual(mixer.modifierChancePermille(index), 0,
"Taking each panel must reset every modifier chance");
helper.assertTrue(menu.getSlot(InkMixerMenu.RESULT).hasItem() == (taken < 16),
"Output must refresh immediately and disappear when inputs run out");
}
helper.assertValueEqual(mixer.getItem(InkMixerBlockEntity.BOTTLES).getCount(), 1,
"One vial must return exactly one glass bottle");
helper.assertTrue(mixer.getItem(InkMixerBlockEntity.BOTTLES).is(Items.GLASS_BOTTLE),
"The vial exchange must use vanilla glass bottles");
helper.assertFalse(mixer.consumeLinkPanelMaterials(), "A seventeenth panel must fail");
helper.succeed();
}
@@ -2,6 +2,8 @@ package net.dnorberg.rivencraft.world;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import net.dnorberg.rivencraft.book.AgeFlooding;
import net.dnorberg.rivencraft.shared.FloodingRules;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.HashMap;
import java.util.List;
@@ -62,7 +64,9 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
ResourceLocation.CODEC.listOf().optionalFieldOf("nether_biomes", List.of())
.forGetter(generator -> generator.netherBiomeIds),
ResourceLocation.CODEC.listOf().optionalFieldOf("library_age_symbols", List.of())
.forGetter(generator -> generator.libraryAgeSymbols))
.forGetter(generator -> generator.libraryAgeSymbols),
Codec.INT.optionalFieldOf("flood_surface", FloodingRules.NONE)
.forGetter(generator -> generator.floodSurface))
.apply(instance, AgeFeatureChunkGenerator::new));
private final Holder<NoiseGeneratorSettings> settings;
@@ -71,6 +75,7 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
private final boolean netherCaveMaterials;
private final List<ResourceLocation> netherBiomeIds;
private final List<ResourceLocation> libraryAgeSymbols;
private final int floodSurface;
public AgeFeatureChunkGenerator(BiomeSource biomes, Holder<NoiseGeneratorSettings> settings,
List<AgeFeatureSelection.Choice> features, long ageSeed,
@@ -82,6 +87,14 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
List<AgeFeatureSelection.Choice> features, long ageSeed,
boolean netherCaveMaterials, List<ResourceLocation> netherBiomeIds,
List<ResourceLocation> libraryAgeSymbols) {
this(biomes, settings, features, ageSeed, netherCaveMaterials, netherBiomeIds,
libraryAgeSymbols, FloodingRules.NONE);
}
public AgeFeatureChunkGenerator(BiomeSource biomes, Holder<NoiseGeneratorSettings> settings,
List<AgeFeatureSelection.Choice> features, long ageSeed,
boolean netherCaveMaterials, List<ResourceLocation> netherBiomeIds,
List<ResourceLocation> libraryAgeSymbols, int floodSurface) {
super(biomes, settings);
this.settings = settings;
this.features = List.copyOf(features);
@@ -89,8 +102,10 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
this.netherCaveMaterials = netherCaveMaterials;
this.netherBiomeIds = List.copyOf(netherBiomeIds);
this.libraryAgeSymbols = List.copyOf(libraryAgeSymbols);
this.floodSurface = floodSurface;
}
public int floodSurface() { return floodSurface; }
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
@Override
@@ -267,5 +282,6 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
// Place after vanilla and authored decoration so later features cannot grow through
// the building; the library check preserves existing solid structures.
if (!netherCaveMaterials) MystcraftLibraryFeature.generate(level, chunk, ageSeed, libraryAgeSymbols);
AgeFlooding.apply(chunk, floodSurface);
}
}
@@ -2,6 +2,8 @@ package net.dnorberg.rivencraft.world;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import net.dnorberg.rivencraft.book.AgeFlooding;
import net.dnorberg.rivencraft.shared.FloodingRules;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.HashMap;
import java.util.List;
@@ -44,13 +46,16 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
.forGetter(generator -> generator.features),
Codec.LONG.optionalFieldOf("age_seed", 0L).forGetter(generator -> generator.ageSeed),
ResourceLocation.CODEC.listOf().optionalFieldOf("library_age_symbols", List.of())
.forGetter(generator -> generator.libraryAgeSymbols))
.forGetter(generator -> generator.libraryAgeSymbols),
Codec.INT.optionalFieldOf("flood_surface", FloodingRules.NONE)
.forGetter(generator -> generator.floodSurface))
.apply(instance, AgeFlatChunkGenerator::new));
private final FlatLevelGeneratorSettings settings;
private final List<AgeFeatureSelection.Choice> features;
private final long ageSeed;
private final List<ResourceLocation> libraryAgeSymbols;
private final int floodSurface;
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings) {
this(biomeSource, settings, List.of(), 0L);
@@ -64,14 +69,22 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings,
List<AgeFeatureSelection.Choice> features, long ageSeed,
List<ResourceLocation> libraryAgeSymbols) {
this(biomeSource, settings, features, ageSeed, libraryAgeSymbols, FloodingRules.NONE);
}
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings,
List<AgeFeatureSelection.Choice> features, long ageSeed,
List<ResourceLocation> libraryAgeSymbols, int floodSurface) {
super(biomeSource, Util.memoize(settings::adjustGenerationSettings));
this.settings = settings;
this.features = List.copyOf(features);
this.ageSeed = ageSeed;
this.libraryAgeSymbols = List.copyOf(libraryAgeSymbols);
this.floodSurface = floodSurface;
}
public FlatLevelGeneratorSettings settings() { return settings; }
public int floodSurface() { return floodSurface; }
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
@Override
@@ -144,6 +157,7 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
ObelisksFeature.generate(level, chunk, ageSeed, choice, obeliskOccurrence++);
}
MystcraftLibraryFeature.generate(level, chunk, ageSeed, libraryAgeSymbols);
AgeFlooding.apply(chunk, floodSurface);
}
@Override
@@ -97,6 +97,7 @@ public record SymbolSemantics(Role role, Value value) {
BLOCK("block", Kind.RESOURCE),
FEATURE("feature", Kind.RESOURCE),
ENVIRONMENT("environment", Kind.CHOICE, "accelerated"),
FLOODING("flooding", Kind.CHOICE, "flooded"),
CORRUPTED("corrupted", Kind.CHOICE, "large", "medium", "small");
private final String id;
@@ -76,12 +76,12 @@ public final class WritingGrammar {
symbols.add(parsed);
if (pendingNumber != null && !numberTarget(role) && role != Role.COLOR_NUMBER) {
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingNumber.index(),
"A number page must be immediately followed by a color or celestial modifier page"));
"A number page must be immediately followed by a color, celestial modifier or Flooded page"));
pendingNumber = null;
}
if (role == Role.COLOR_NUMBER) {
if (pendingNumber != null) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER,
pendingNumber.index(), "A number page must be immediately followed by a color or celestial modifier page"));
if (pendingNumber != null && !numberRunTargetsFlooded(writing, index, resolver)) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER,
pendingNumber.index(), "A number page must be immediately followed by a color, celestial modifier or Flooded page"));
pendingNumber = parsed;
} else if (numberTarget(role)) {
pendingNumber = null;
@@ -136,7 +136,7 @@ public final class WritingGrammar {
}
}
if (pendingNumber != null) diagnostics.add(new Diagnostic(Code.DANGLING_MODIFIER,
pendingNumber.index(), "A number page must be followed by a color or celestial modifier page"));
pendingNumber.index(), "A number page must be followed by a color, celestial modifier or Flooded page"));
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
"Add a Link Panel as the first page"));
for (ParsedSymbol dangling : pendingModifiers.values()) {
@@ -178,7 +178,7 @@ public final class WritingGrammar {
private static boolean singular(Role role) {
return switch (role) {
case TERRAIN, BIOME_CONTROLLER, WEATHER, SEASON, LIGHTING, SKY -> true;
case TERRAIN, BIOME_CONTROLLER, WEATHER, SEASON, LIGHTING, SKY, FLOODING -> true;
default -> false;
};
}
@@ -189,10 +189,23 @@ public final class WritingGrammar {
|| role == Role.CELESTIAL_COLOR || role == Role.DIRECTION_MODIFIER;
}
private static boolean numberRunTargetsFlooded(OrderedWriting writing, int index,
Function<SymbolReference, Optional<SymbolDefinition>> resolver) {
for (int next = index + 1; next < writing.entries().size(); next++) {
var reference = writing.entries().get(next).symbol();
if (reference.isEmpty()) return false;
var semantics = resolver.apply(reference.get()).flatMap(SymbolDefinition::semantics);
if (semantics.isEmpty()) return false;
Role role = semantics.get().role();
if (role != Role.COLOR_NUMBER) return role == Role.FLOODING;
}
return false;
}
private static boolean numberTarget(Role role) {
return role == Role.COLOR || role == Role.PERIOD_MODIFIER
|| role == Role.ANGLE_MODIFIER || role == Role.PHASE_MODIFIER
|| role == Role.SIZE_MODIFIER;
|| role == Role.SIZE_MODIFIER || role == Role.FLOODING;
}
private static int stage(Role role) {
@@ -208,7 +221,7 @@ public final class WritingGrammar {
case PERIOD_MODIFIER, ANGLE_MODIFIER, PHASE_MODIFIER, SIZE_MODIFIER,
CELESTIAL_COLOR, DIRECTION_MODIFIER -> 7;
case CELESTIAL -> 8;
case BLOCK, FEATURE, ENVIRONMENT, CORRUPTED -> 9;
case BLOCK, FEATURE, ENVIRONMENT, CORRUPTED, FLOODING -> 9;
};
}
@@ -419,7 +419,7 @@
"jei.rivencraft.writing": "Rivencraft Writing",
"jei.rivencraft.writing.link_panel_hand": "Hold paper and an Ink Vial in opposite hands; use the vial to make a Link Panel.",
"jei.rivencraft.ink_mixer": "Ink Mixer",
"jei.rivencraft.ink_mixer.usage": "Paper + ink makes a Link Panel. One vial fills 16 ink; each panel uses the configured ink cost. The empty vial returns as a glass bottle.",
"jei.rivencraft.ink_mixer.usage": "One paper + one ink makes a Link Panel. One vial fills 16 ink and makes 16 panels. The empty vial returns as a glass bottle.",
"jei.rivencraft.ink_mixer.additive": "Click this additive into the ink basin: %s. Effects roll when the panel is taken.",
"jei.rivencraft.ink_mixer.effect": "%s %s%%",
"jei.rivencraft.writing.copy": "At a Writing Desk, select a stored Page, add paper and ink, then take the copy. The source Page stays.",
@@ -473,5 +473,7 @@
"advancement.rivencraft.enter_age.title": "The Journey Begins",
"advancement.rivencraft.enter_age.description": "Safely link into an Age you have written.",
"advancement.rivencraft.open_portal.title": "A Window Between Ages",
"advancement.rivencraft.open_portal.description": "Activate a Crystal Portal with a bound book."
"advancement.rivencraft.open_portal.description": "Activate a Crystal Portal with a bound book.",
"symbol.rivencraft.environment.flooded": "Flooded",
"symbol.rivencraft.environment.flooded.description": "Fill open space with water up to Y=63, or the base-25 Number Pages immediately before this page. Works in Cave terrain. Last Flooded wins; heights are bounded for safe arrival."
}
@@ -0,0 +1,11 @@
{
"schema_version": 2,
"name": "symbol.rivencraft.environment.flooded",
"description": "symbol.rivencraft.environment.flooded.description",
"category": "rivencraft:environment",
"semantics": {
"role": "flooding",
"value": "flooded"
},
"poem": "Environment Flow Static Elevate"
}