Public Access
Complete X.1.0 milestone for Minecraft 1.21.1 and 26.3
Build and smoke / changes (push) Waiting to run
Build and smoke / changes (push) Waiting to run
This commit is contained in:
1 parent
6630ed7ab1
commit
10a70e3b6a
39 files changed
+1308
-65
No files matched your search
@@ -0,0 +1,191 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
|
||||
import java.util.*;
|
||||
import com.mojang.serialization.JsonOps;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||
import net.minecraft.world.level.levelgen.Aquifer;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
/** Disposable fixture: exercises real generator settings, fluid picker and codecs. */
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeFluidProbe {
|
||||
private static int checks;
|
||||
private static void check(boolean value, String label) {
|
||||
if (!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
static ResourceLocation id(String path) { return ResourceLocation.fromNamespaceAndPath("rivencraft", path); }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try { run(event.getServer()); System.out.println("NATIVE119_PASS checks=" + checks); }
|
||||
catch (Throwable error) { System.out.println("NATIVE119_FAIL " + error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
testFlatGround(server);
|
||||
int index = 0;
|
||||
for (var family : List.of(NativeBiomeKind.NETHER, NativeBiomeKind.END, NativeBiomeKind.CAVES)) {
|
||||
for (String terrain : List.of("standard", "amplified", "island", "cave", "flat", "void")) {
|
||||
var entries = new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.symbol(new net.dnorberg.rivencraft.writing.SymbolReference(id("terrain/" + terrain))),
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.symbol(new net.dnorberg.rivencraft.writing.SymbolReference(id("biome/native_" + family.name().toLowerCase(Locale.ROOT))))));
|
||||
var traits = AgeTraits.select(119L).withBiomeDistribution(AgeTraits.BiomeDistribution.NATIVE);
|
||||
var plan = AgeGenerationPlan.compile(entries,119L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||
check(plan.biomeSelection().nativeKind() == family, "Frozen family");
|
||||
var expectedSky = family == NativeBiomeKind.NETHER ? AgeSkyProfile.Style.NETHER
|
||||
: family == NativeBiomeKind.END ? AgeSkyProfile.Style.END : AgeSkyProfile.Style.INHERITED;
|
||||
check(AgeSkyProfile.compile(plan,traits).style() == expectedSky, "Native sky default " + family + terrain);
|
||||
check(AgeSkyProfile.compile(AgeGenerationPlan.load(plan.save()),traits).style() == expectedSky, "Sky plan reload");
|
||||
if (family != NativeBiomeKind.CAVES) {
|
||||
var expectedEffect = family == NativeBiomeKind.NETHER
|
||||
? net.minecraft.world.level.dimension.BuiltinDimensionTypes.NETHER_EFFECTS
|
||||
: net.minecraft.world.level.dimension.BuiltinDimensionTypes.END_EFFECTS;
|
||||
check(AgeEnvironmentCompiler.skyEffects(plan,
|
||||
net.minecraft.world.level.dimension.BuiltinDimensionTypes.OVERWORLD_EFFECTS).equals(expectedEffect),
|
||||
"Native dimension sky effect");
|
||||
if (terrain.equals("standard")) {
|
||||
for (String sky : List.of("overworld", "nether", "end", "static")) {
|
||||
var written = new ArrayList<>(entries.entries());
|
||||
written.add(net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||
new net.dnorberg.rivencraft.writing.SymbolReference(id("sky/" + sky))));
|
||||
written.add(net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||
new net.dnorberg.rivencraft.writing.SymbolReference(id("celestial/sun"))));
|
||||
var override = AgeGenerationPlan.compile(new net.dnorberg.rivencraft.writing.OrderedWriting(written),
|
||||
119L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||
check(AgeSkyProfile.compile(override,traits).style() == AgeSkyProfile.Style.valueOf(sky.toUpperCase(Locale.ROOT)),
|
||||
"Explicit sky wins with celestial");
|
||||
}
|
||||
var written = new ArrayList<>(entries.entries());
|
||||
written.add(net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||
new net.dnorberg.rivencraft.writing.SymbolReference(id("celestial/sun"))));
|
||||
var celestial = AgeGenerationPlan.compile(new net.dnorberg.rivencraft.writing.OrderedWriting(written),
|
||||
119L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||
check(AgeSkyProfile.compile(celestial,traits).style() == expectedSky, "Celestial does not override Native default");
|
||||
}
|
||||
}
|
||||
var age = new AgeDefinition(UUID.randomUUID(),"probe",119L,AgeGenerationProfiles.STANDARD,
|
||||
AgeDefinition.CURRENT_GENERATION_VERSION,0L,id("age/fluid119_" + index++),null,traits,plan);
|
||||
var factory = AgeDimensionService.class.getDeclaredMethod("createGenerator",MinecraftServer.class,AgeDefinition.class);
|
||||
factory.setAccessible(true);
|
||||
var generator = (ChunkGenerator) factory.invoke(null,server,age);
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var encoded = ChunkGenerator.CODEC.encodeStart(ops, generator).getOrThrow();
|
||||
var restored = ChunkGenerator.CODEC.parse(ops, encoded).getOrThrow();
|
||||
NoiseBasedChunkGenerator noise = generator instanceof NoiseBasedChunkGenerator n ? n : null;
|
||||
NoiseBasedChunkGenerator restoredNoise = restored instanceof NoiseBasedChunkGenerator n ? n : null;
|
||||
if (noise == null) {
|
||||
check(restoredNoise == null, "Flat/Void remains flat: " + terrain);
|
||||
continue;
|
||||
}
|
||||
var settings = noise.generatorSettings().value();
|
||||
var reloaded = restoredNoise.generatorSettings().value();
|
||||
check(reloaded.defaultFluid().equals(settings.defaultFluid())
|
||||
&& reloaded.seaLevel() == settings.seaLevel(), "Fluid codec " + family + terrain);
|
||||
if (family == NativeBiomeKind.NETHER) {
|
||||
check(settings.defaultFluid().is(Blocks.LAVA), "Nether natural lava " + terrain);
|
||||
check(!settings.isAquifersEnabled(), "Nether disables water aquifers " + terrain);
|
||||
} else if (family == NativeBiomeKind.END) {
|
||||
check(settings.defaultFluid().isAir(), "End dry " + terrain);
|
||||
check(settings.seaLevel() < settings.noiseSettings().minY(), "End fluid below dimension " + terrain);
|
||||
check(!settings.isAquifersEnabled(), "End disables aquifers " + terrain);
|
||||
} else {
|
||||
check(terrain.equals("cave") ? settings.defaultFluid().isAir()
|
||||
: settings.defaultFluid().is(Blocks.WATER), "Other Native family unchanged " + terrain);
|
||||
continue;
|
||||
}
|
||||
var method = NoiseBasedChunkGenerator.class.getDeclaredMethod("createFluidPicker", NoiseGeneratorSettings.class);
|
||||
method.setAccessible(true);
|
||||
var picker = (Aquifer.FluidPicker) method.invoke(null, settings);
|
||||
boolean water = false, lava = false, anyFluid = false;
|
||||
for (int y = settings.noiseSettings().minY(); y < settings.noiseSettings().minY() + settings.noiseSettings().height(); y++) {
|
||||
var block = picker.computeFluid(0, y, 0).at(y);
|
||||
water |= block.is(Blocks.WATER); lava |= block.is(Blocks.LAVA);
|
||||
anyFluid |= !block.getFluidState().isEmpty();
|
||||
}
|
||||
check(!water, "No natural water anywhere in column " + family + terrain);
|
||||
check(family == NativeBiomeKind.NETHER ? lava == (settings.seaLevel() > settings.noiseSettings().minY()) : !anyFluid, "Nether lava / End dry picker " + terrain);
|
||||
}
|
||||
}
|
||||
}
|
||||
static void testFlatGround(MinecraftServer server) throws Exception {
|
||||
var registry = server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var random = server.overworld().getChunkSource().randomState();
|
||||
var settings = AgeDimensionService.flatSettings(server,AgeRuntimeProfiles.resolve(AgeGenerationProfiles.FLAT));
|
||||
var keys = List.of(net.minecraft.world.level.biome.Biomes.THE_END, net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST,
|
||||
net.minecraft.world.level.biome.Biomes.WARPED_FOREST, net.minecraft.world.level.biome.Biomes.SOUL_SAND_VALLEY,
|
||||
net.minecraft.world.level.biome.Biomes.BASALT_DELTAS, net.minecraft.world.level.biome.Biomes.NETHER_WASTES,
|
||||
net.minecraft.world.level.biome.Biomes.PLAINS);
|
||||
var tops = List.of(Blocks.END_STONE,Blocks.CRIMSON_NYLIUM,Blocks.WARPED_NYLIUM,Blocks.SOUL_SAND,Blocks.BASALT,Blocks.NETHERRACK,Blocks.GRASS_BLOCK);
|
||||
var soils = List.of(Blocks.END_STONE,Blocks.NETHERRACK,Blocks.NETHERRACK,Blocks.SOUL_SOIL,Blocks.BLACKSTONE,Blocks.NETHERRACK,Blocks.DIRT);
|
||||
for (int i=0;i<keys.size();i++) {
|
||||
ChunkGenerator original = new net.dnorberg.rivencraft.world.AgeFlatChunkGenerator(
|
||||
new net.minecraft.world.level.biome.FixedBiomeSource(registry.getOrThrow(keys.get(i))),settings);
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var saved = ChunkGenerator.CODEC.encodeStart(ops,original).getOrThrow();
|
||||
for (var generator : List.of(original,ChunkGenerator.CODEC.parse(ops,saved).getOrThrow())) {
|
||||
var height = net.minecraft.world.level.LevelHeightAccessor.create(-64,384);
|
||||
var chunk = new net.minecraft.world.level.chunk.ProtoChunk(new net.minecraft.world.level.ChunkPos(-1,2),
|
||||
net.minecraft.world.level.chunk.UpgradeData.EMPTY,height,
|
||||
server.registryAccess().registryOrThrow(Registries.BIOME),null);
|
||||
generator.fillFromNoise(null,random,null,chunk).join();
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,3,33)).is(tops.get(i)), "Actual flat top " + keys.get(i));
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,1,33)).is(soils.get(i)), "Actual flat soil");
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,0,33)).is(Blocks.BEDROCK), "Bedrock retained");
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,-1,33)).isAir()
|
||||
&& chunk.getBlockState(new net.minecraft.core.BlockPos(-15,4,33)).isAir(), "Flat bounds unchanged");
|
||||
check(generator.getBaseColumn(-15,33,height,random).getBlock(3).is(tops.get(i)), "Column agrees with placed blocks");
|
||||
}
|
||||
}
|
||||
var plains = registry.getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
|
||||
var region = new net.dnorberg.rivencraft.world.AgeFlatChunkGenerator(
|
||||
new net.minecraft.world.level.biome.FixedBiomeSource(plains),settings,List.of(),119L,List.of(),
|
||||
net.dnorberg.rivencraft.shared.FloodingRules.NONE,List.of(plains.key().location()));
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var loaded = ChunkGenerator.CODEC.parse(ops,ChunkGenerator.CODEC.encodeStart(ops,region).getOrThrow()).getOrThrow();
|
||||
check(loaded.getBaseColumn(0,0,net.minecraft.world.level.LevelHeightAccessor.create(-64,384),random)
|
||||
.getBlock(3).is(Blocks.NETHERRACK), "Region-only Nether classification persists without a tag");
|
||||
var end = registry.getOrThrow(net.minecraft.world.level.biome.Biomes.THE_END);
|
||||
check(net.dnorberg.rivencraft.shared.FlatBiomeMaterials.layer(Blocks.DIAMOND_BLOCK.defaultBlockState(),end,false)
|
||||
.is(Blocks.DIAMOND_BLOCK), "Explicit non-soil material retained");
|
||||
check(net.dnorberg.rivencraft.shared.FlatBiomeMaterials.layer(Blocks.WATER.defaultBlockState(),end,false)
|
||||
.is(Blocks.WATER), "Authored fluid retained");
|
||||
var bind = net.minecraft.core.Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);var old = plains.tags().toList();
|
||||
try {
|
||||
var tags = new ArrayList<>(old);tags.add(net.minecraft.tags.BiomeTags.IS_END);bind.invoke(plains,tags);
|
||||
var tagged = new net.dnorberg.rivencraft.world.AgeFlatChunkGenerator(
|
||||
new net.minecraft.world.level.biome.FixedBiomeSource(plains),settings);
|
||||
check(tagged.getBaseColumn(0,0,net.minecraft.world.level.LevelHeightAccessor.create(-64,384),random)
|
||||
.getBlock(3).is(Blocks.END_STONE), "Tag-classified modded-style End biome");
|
||||
} finally { bind.invoke(plains,old); }
|
||||
var mixedSource = new net.minecraft.world.level.biome.CheckerboardColumnBiomeSource(
|
||||
net.minecraft.core.HolderSet.direct(List.<net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome>>of(
|
||||
end,plains,registry.getOrThrow(net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST))),0);
|
||||
var mixed = new net.dnorberg.rivencraft.world.AgeFlatChunkGenerator(mixedSource,settings);
|
||||
var seen = new HashSet<net.minecraft.world.level.block.Block>();
|
||||
for (int cx=-2;cx<=2;cx++) {
|
||||
int x=cx*16+1;
|
||||
var biome = mixedSource.getNoiseBiome(net.minecraft.core.QuartPos.fromBlock(x),0,0,random.sampler());
|
||||
var expected = biome.is(net.minecraft.world.level.biome.Biomes.THE_END) ? Blocks.END_STONE
|
||||
: biome.is(net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST) ? Blocks.CRIMSON_NYLIUM : Blocks.GRASS_BLOCK;
|
||||
seen.add(expected);
|
||||
var height = net.minecraft.world.level.LevelHeightAccessor.create(-64,384);
|
||||
var chunk = new net.minecraft.world.level.chunk.ProtoChunk(new net.minecraft.world.level.ChunkPos(cx,0),net.minecraft.world.level.chunk.UpgradeData.EMPTY,height,server.registryAccess().registryOrThrow(Registries.BIOME),null);
|
||||
mixed.fillFromNoise(null,random,null,chunk).join();
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(x,3,1)).is(expected), "Mixed biome actual surface");
|
||||
check(mixed.getBaseColumn(x,1,height,random).getBlock(3).is(expected), "Mixed biome spawn column");
|
||||
}
|
||||
check(seen.size()==3, "Mixed test visits End, Nether and Overworld");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
|
||||
import java.util.*;
|
||||
import com.mojang.serialization.JsonOps;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||
import net.minecraft.world.level.levelgen.Aquifer;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
/** Disposable fixture: exercises real generator settings, fluid picker and codecs. */
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeFluidProbe {
|
||||
private static int checks;
|
||||
private static void check(boolean value, String label) {
|
||||
if (!value) throw new AssertionError(label);
|
||||
checks++;
|
||||
}
|
||||
static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft", path); }
|
||||
@SubscribeEvent public static void start(ServerStartedEvent event) {
|
||||
event.getServer().execute(() -> {
|
||||
try { run(event.getServer()); System.out.println("NATIVE119_PASS checks=" + checks); }
|
||||
catch (Throwable error) { System.out.println("NATIVE119_FAIL " + error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
testFlatGround(server);
|
||||
int index = 0;
|
||||
for (var family : List.of(NativeBiomeKind.NETHER, NativeBiomeKind.END, NativeBiomeKind.CAVES)) {
|
||||
for (String terrain : List.of("standard", "amplified", "island", "cave", "flat", "void")) {
|
||||
var selection = net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||
List.of(id("terrain/" + terrain), id("biome/native_" + family.name().toLowerCase(Locale.ROOT))),119L);
|
||||
check(selection.biomes().nativeKind() == family, "Frozen family");
|
||||
var pages = List.of(id("terrain/" + terrain), id("biome/native_" + family.name().toLowerCase(Locale.ROOT)));
|
||||
var sky = PortEnvironmentSelection.resolve(pages,119L,selection.terrain()).sky();
|
||||
if (family != NativeBiomeKind.CAVES) {
|
||||
var expectedSky = family == NativeBiomeKind.NETHER ? PortSkyStyle.NETHER : PortSkyStyle.END;
|
||||
check(sky == expectedSky, "Native sky default " + family + terrain);
|
||||
check(PortSkyStyle.CODEC.parse(JsonOps.INSTANCE,PortSkyStyle.CODEC.encodeStart(JsonOps.INSTANCE,sky)
|
||||
.getOrThrow()).getOrThrow() == expectedSky, "Sky codec reload");
|
||||
if (terrain.equals("standard")) {
|
||||
for (String choice : List.of("overworld", "nether", "end", "static")) {
|
||||
var authored = new ArrayList<>(pages);
|
||||
authored.add(id("sky/" + choice)); authored.add(id("celestial/sun"));
|
||||
check(PortEnvironmentSelection.resolve(authored,119L,selection.terrain()).sky()
|
||||
== PortSkyStyle.valueOf(choice.toUpperCase(Locale.ROOT)), "Explicit sky wins with celestial");
|
||||
}
|
||||
var celestial = new ArrayList<>(pages); celestial.add(id("celestial/sun"));
|
||||
check(PortSkyStyle.resolve(celestial,119L) == expectedSky, "Celestial does not override Native default");
|
||||
}
|
||||
}
|
||||
var level = RuntimeAgeBackend.create(server,id("age/fluid119_" + index++),119L,selection.biomes(),selection.terrain());
|
||||
var generator = level.getChunkSource().getGenerator();
|
||||
if (family != NativeBiomeKind.CAVES) check(level.dimensionTypeRegistration().unwrapKey().orElseThrow()
|
||||
.identifier().getPath().endsWith("_sky_" + family.name().toLowerCase(Locale.ROOT)), "Runtime dimension sky");
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var encoded = ChunkGenerator.CODEC.encodeStart(ops, generator).getOrThrow();
|
||||
var restored = ChunkGenerator.CODEC.parse(ops, encoded).getOrThrow();
|
||||
NoiseBasedChunkGenerator noise = ((PortFeatureChunkGenerator) generator).base() instanceof NoiseBasedChunkGenerator n ? n : null;
|
||||
NoiseBasedChunkGenerator restoredNoise = ((PortFeatureChunkGenerator) restored).base() instanceof NoiseBasedChunkGenerator n ? n : null;
|
||||
if (noise == null) {
|
||||
check(restoredNoise == null, "Flat/Void remains flat: " + terrain);
|
||||
continue;
|
||||
}
|
||||
var settings = noise.generatorSettings().value();
|
||||
var reloaded = restoredNoise.generatorSettings().value();
|
||||
check(reloaded.defaultFluid().equals(settings.defaultFluid())
|
||||
&& reloaded.seaLevel() == settings.seaLevel(), "Fluid codec " + family + terrain);
|
||||
if (family == NativeBiomeKind.NETHER) {
|
||||
check(settings.defaultFluid().is(Blocks.LAVA), "Nether natural lava " + terrain);
|
||||
check(!settings.aquifers().isPresent(), "Nether disables water aquifers " + terrain);
|
||||
} else if (family == NativeBiomeKind.END) {
|
||||
check(settings.defaultFluid().isAir(), "End dry " + terrain);
|
||||
check(settings.seaLevel() < settings.noiseSettings().minY(), "End fluid below dimension " + terrain);
|
||||
check(!settings.aquifers().isPresent(), "End disables aquifers " + terrain);
|
||||
} else {
|
||||
check(terrain.equals("cave") ? settings.defaultFluid().isAir()
|
||||
: settings.defaultFluid().is(Blocks.WATER), "Other Native family unchanged " + terrain);
|
||||
continue;
|
||||
}
|
||||
var method = NoiseBasedChunkGenerator.class.getDeclaredMethod("createFluidPicker", NoiseGeneratorSettings.class);
|
||||
method.setAccessible(true);
|
||||
var picker = (Aquifer.FluidPicker) method.invoke(null, settings);
|
||||
boolean water = false, lava = false, anyFluid = false;
|
||||
for (int y = settings.noiseSettings().minY(); y < settings.noiseSettings().minY() + settings.noiseSettings().height(); y++) {
|
||||
var block = picker.computeFluid(0, y, 0).at(y);
|
||||
water |= block.is(Blocks.WATER); lava |= block.is(Blocks.LAVA);
|
||||
anyFluid |= !block.getFluidState().isEmpty();
|
||||
}
|
||||
check(!water, "No natural water anywhere in column " + family + terrain);
|
||||
check(family == NativeBiomeKind.NETHER ? lava == (settings.seaLevel() > settings.noiseSettings().minY()) : !anyFluid, "Nether lava / End dry picker " + terrain);
|
||||
}
|
||||
}
|
||||
}
|
||||
static void testFlatGround(MinecraftServer server) throws Exception {
|
||||
var registry = server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var random = server.overworld().getChunkSource().randomState();
|
||||
var keys = List.of(net.minecraft.world.level.biome.Biomes.THE_END, net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST,
|
||||
net.minecraft.world.level.biome.Biomes.WARPED_FOREST, net.minecraft.world.level.biome.Biomes.SOUL_SAND_VALLEY,
|
||||
net.minecraft.world.level.biome.Biomes.BASALT_DELTAS, net.minecraft.world.level.biome.Biomes.NETHER_WASTES,
|
||||
net.minecraft.world.level.biome.Biomes.PLAINS);
|
||||
var tops = List.of(Blocks.END_STONE,Blocks.CRIMSON_NYLIUM,Blocks.WARPED_NYLIUM,Blocks.SOUL_SAND,Blocks.BASALT,Blocks.NETHERRACK,Blocks.GRASS_BLOCK);
|
||||
var soils = List.of(Blocks.END_STONE,Blocks.NETHERRACK,Blocks.NETHERRACK,Blocks.SOUL_SOIL,Blocks.BLACKSTONE,Blocks.NETHERRACK,Blocks.DIRT);
|
||||
net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings settings = null;
|
||||
for (int i=0;i<keys.size();i++) {
|
||||
var plan = new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,List.of(keys.get(i).identifier()));
|
||||
var level = RuntimeAgeBackend.create(server,id("age/flat_ground_" + i),119L,plan,PortAgeTerrain.FLAT);
|
||||
ChunkGenerator original = ((PortFeatureChunkGenerator)level.getChunkSource().getGenerator()).base();
|
||||
if (i<6) check(original instanceof PortFlatChunkGenerator, "Single End/Nether bypass fixed");
|
||||
if (original instanceof PortFlatChunkGenerator flat) settings = flat.settings();
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var saved = ChunkGenerator.CODEC.encodeStart(ops,original).getOrThrow();
|
||||
for (var generator : List.of(original,ChunkGenerator.CODEC.parse(ops,saved).getOrThrow())) {
|
||||
var height = net.minecraft.world.level.LevelHeightAccessor.create(-64,384);
|
||||
var chunk = new net.minecraft.world.level.chunk.ProtoChunk(new net.minecraft.world.level.ChunkPos(-1,2),
|
||||
net.minecraft.world.level.chunk.UpgradeData.EMPTY,height,
|
||||
net.minecraft.world.level.chunk.PalettedContainerFactory.create(server.registryAccess()),null);
|
||||
generator.buildTerrain(chunk,null,random,null,server.overworld().getBiomeManager(),null,generator.getBiomeSource().possibleBiomes()).join();
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,3,33)).is(tops.get(i)), "Actual flat top " + keys.get(i));
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,1,33)).is(soils.get(i)), "Actual flat soil");
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,0,33)).is(Blocks.BEDROCK), "Bedrock retained");
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(-15,-1,33)).isAir()
|
||||
&& chunk.getBlockState(new net.minecraft.core.BlockPos(-15,4,33)).isAir(), "Flat bounds unchanged");
|
||||
check(generator.getBaseColumn(-15,33,height,random).getBlock(3).is(tops.get(i)), "Column agrees with placed blocks");
|
||||
}
|
||||
}
|
||||
var plains = registry.getOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
|
||||
var region = new PortFlatChunkGenerator(new net.minecraft.world.level.biome.FixedBiomeSource(plains),settings,
|
||||
List.of(plains.key().identifier()));
|
||||
var ops = server.registryAccess().createSerializationContext(JsonOps.INSTANCE);
|
||||
var loaded = ChunkGenerator.CODEC.parse(ops,ChunkGenerator.CODEC.encodeStart(ops,region).getOrThrow()).getOrThrow();
|
||||
check(loaded.getBaseColumn(0,0,net.minecraft.world.level.LevelHeightAccessor.create(-64,384),random)
|
||||
.getBlock(3).is(Blocks.NETHERRACK), "Region-only Nether classification persists without a tag");
|
||||
var end = registry.getOrThrow(net.minecraft.world.level.biome.Biomes.THE_END);
|
||||
check(net.dnorberg.rivencraft.shared.FlatBiomeMaterials.layer(Blocks.DIAMOND_BLOCK.defaultBlockState(),end,false)
|
||||
.is(Blocks.DIAMOND_BLOCK), "Explicit non-soil material retained");
|
||||
check(net.dnorberg.rivencraft.shared.FlatBiomeMaterials.layer(Blocks.WATER.defaultBlockState(),end,false)
|
||||
.is(Blocks.WATER), "Authored fluid retained");
|
||||
var bind = net.minecraft.core.Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);var old = plains.tags().toList();
|
||||
try {
|
||||
var tags = new ArrayList<>(old);tags.add(net.minecraft.tags.BiomeTags.IS_END);bind.invoke(plains,tags);
|
||||
var tagged = new PortFlatChunkGenerator(new net.minecraft.world.level.biome.FixedBiomeSource(plains),settings);
|
||||
check(tagged.getBaseColumn(0,0,net.minecraft.world.level.LevelHeightAccessor.create(-64,384),random)
|
||||
.getBlock(3).is(Blocks.END_STONE), "Tag-classified modded-style End biome");
|
||||
} finally { bind.invoke(plains,old); }
|
||||
var mixedSource = new net.minecraft.world.level.biome.CheckerboardColumnBiomeSource(
|
||||
net.minecraft.core.HolderSet.direct(List.<net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome>>of(
|
||||
end,plains,registry.getOrThrow(net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST))),0);
|
||||
var mixed = new PortFlatChunkGenerator(mixedSource,settings);
|
||||
var seen = new HashSet<net.minecraft.world.level.block.Block>();
|
||||
for (int cx=-2;cx<=2;cx++) {
|
||||
int x=cx*16+1;
|
||||
var biome = mixedSource.getNoiseBiome(net.minecraft.core.QuartPos.fromBlock(x),0,0);
|
||||
var expected = biome.is(net.minecraft.world.level.biome.Biomes.THE_END) ? Blocks.END_STONE
|
||||
: biome.is(net.minecraft.world.level.biome.Biomes.CRIMSON_FOREST) ? Blocks.CRIMSON_NYLIUM : Blocks.GRASS_BLOCK;
|
||||
seen.add(expected);
|
||||
var height = net.minecraft.world.level.LevelHeightAccessor.create(-64,384);
|
||||
var chunk = new net.minecraft.world.level.chunk.ProtoChunk(new net.minecraft.world.level.ChunkPos(cx,0),net.minecraft.world.level.chunk.UpgradeData.EMPTY,height,net.minecraft.world.level.chunk.PalettedContainerFactory.create(server.registryAccess()),null);
|
||||
mixed.buildTerrain(chunk,null,random,null,server.overworld().getBiomeManager(),null,mixed.getBiomeSource().possibleBiomes()).join();
|
||||
check(chunk.getBlockState(new net.minecraft.core.BlockPos(x,3,1)).is(expected), "Mixed biome actual surface");
|
||||
check(mixed.getBaseColumn(x,1,height,random).getBlock(3).is(expected), "Mixed biome spawn column");
|
||||
}
|
||||
check(seen.size()==3, "Mixed test visits End, Nether and Overworld");
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user