Public Access
Add native biome families, desert vegetation, static sky controls and Seamless views
Build and smoke / changes (push) Waiting to run
Build and smoke / changes (push) Waiting to run
This commit is contained in:
1 parent
90e4a98a7a
commit
d199ac253e
92 files changed
+2520
-224
No files matched your search
@@ -0,0 +1,143 @@
|
||||
package net.dnorberg.rivencraft.book;
|
||||
import java.util.*;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.level.biome.*;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeBiomeProbe {
|
||||
static net.dnorberg.rivencraft.writing.WritingEntry page(String path) {
|
||||
return net.dnorberg.rivencraft.writing.WritingEntry.symbol(
|
||||
new net.dnorberg.rivencraft.writing.SymbolReference(id(path)));
|
||||
}
|
||||
static int checks;
|
||||
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("NATIVE111_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||
nether.remove(ResourceLocation.parse("terrablender:deferred_placeholder"));
|
||||
var caves=NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||
check(caves.size()>=3,"Multiple baseline caves");
|
||||
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);
|
||||
var old=lush.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||
"Nether wins over overlapping Cave tag");
|
||||
} finally { bind.invoke(lush,old); }
|
||||
if(!nether.isEmpty()) {
|
||||
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||
var original=biome.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(NativeBiomePools.CAVES);
|
||||
bind.invoke(biome,tags);
|
||||
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||
check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||
} finally { bind.invoke(biome,original); }
|
||||
}
|
||||
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||
try {
|
||||
registry.listElements().forEach(biome->{
|
||||
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||
var stripped=new ArrayList<>(tags);stripped.remove(NativeBiomePools.CAVES);
|
||||
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||
});
|
||||
check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()),
|
||||
"Empty cave tag has non-Nether vanilla fallback");
|
||||
} finally {
|
||||
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||
}
|
||||
var traits=AgeTraits.select(111L).withBiomeDistribution(AgeTraits.BiomeDistribution.NATIVE);
|
||||
var sourceMethod=AgeDimensionService.class.getDeclaredMethod("createBiomeSource",
|
||||
MinecraftServer.class,AgeDefinition.class,AgeRuntimeProfile.class);
|
||||
sourceMethod.setAccessible(true);
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||
var writing=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/"+terrain),
|
||||
page("biome/native_"+family.name().toLowerCase(Locale.ROOT))));
|
||||
var plan=AgeGenerationPlan.compile(writing,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess());
|
||||
check(plan.biomeSelection().nativeKind()==family,"Family on "+terrain);
|
||||
check(plan.biomeSelection().biomes().equals(NativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||
var loaded=AgeGenerationPlan.load(plan.save());
|
||||
check(loaded.biomeSelection().equals(plan.biomeSelection()),"Plan reload");
|
||||
var age=new AgeDefinition(UUID.randomUUID(),"probe",111L,AgeGenerationProfiles.STANDARD,
|
||||
AgeDefinition.CURRENT_GENERATION_VERSION,0L,id("age/probe"),null,traits,loaded);
|
||||
var source=(BiomeSource)sourceMethod.invoke(null,server,age,loaded.runtimeProfile());
|
||||
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().location()).collect(java.util.stream.Collectors.toSet())
|
||||
.equals(new HashSet<>(plan.biomeSelection().biomes())),"Generator consumes family on "+terrain);
|
||||
}
|
||||
var repeated=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/flat"),
|
||||
page("biome/native_nether"),page("biome/native_end")));
|
||||
check(AgeGenerationPlan.compile(repeated,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().nativeKind()==NativeBiomeKind.END,"Last family controller wins");
|
||||
var caveProfile=AgeRuntimeProfiles.resolve(AgeGenerationProfiles.CAVE);
|
||||
var empty=net.dnorberg.rivencraft.writing.WritingGrammar.parse(net.dnorberg.rivencraft.writing.OrderedWriting.EMPTY);
|
||||
var omitted=AgeBiomeSelection.compile(empty,traits,caveProfile,111L,server.registryAccess());
|
||||
check(omitted.nativeKind()==NativeBiomeKind.CAVES && omitted.biomes().equals(caves),"Seed-completed Cave Native");
|
||||
var nativeWriting=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),page("biome/native")));
|
||||
check(AgeGenerationPlan.compile(nativeWriting,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().biomes().equals(caves),"Explicit Cave Native");
|
||||
var authored=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of(
|
||||
net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),
|
||||
page("biome/crimson_forest"),page("biome/single")));
|
||||
check(AgeGenerationPlan.compile(authored,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess())
|
||||
.biomeSelection().biomes().equals(List.of(ResourceLocation.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||
var oldPool=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(
|
||||
ResourceLocation.withDefaultNamespace("lush_caves"),ResourceLocation.withDefaultNamespace("crimson_forest")));
|
||||
var tag=oldPool.save();tag.remove("NativeKind");
|
||||
check(AgeBiomeSelection.load(tag).equals(oldPool),"Old frozen mixed pool retained");
|
||||
var one=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(ResourceLocation.withDefaultNamespace("lush_caves")),NativeBiomeKind.CAVES);
|
||||
check(AgeBiomeSelection.load(one.save()).equals(one),"Single-cave pool is valid");
|
||||
var policy=new RandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Controller lists do not restrict individual biomes");
|
||||
String name=null;
|
||||
for(int i=0;i<10000;i++) {
|
||||
String candidate="native111_"+i;
|
||||
long seed=server.overworld().getSeed()+AgeDefinition.namedDimensionId(candidate).hashCode();
|
||||
if(AgeRuntimeProfiles.select(seed).equals(AgeGenerationProfiles.CAVE)
|
||||
&& AgeTraits.select(seed).biomeDistribution()==AgeTraits.BiomeDistribution.NATIVE) {name=candidate;break;}
|
||||
}
|
||||
check(name!=null,"Find random Native Cave seed");
|
||||
var age=AgeRegistrySavedData.resolveOrCreate(server.overworld(),new AgeReference(UUID.randomUUID(),name));
|
||||
check(age.randomBiomes()!=null && age.randomBiomes().nativeKind()==NativeBiomeKind.CAVES,"Random Native Cave frozen at creation");
|
||||
check(age.withSpawn(new net.minecraft.core.BlockPos(0,64,0)).randomBiomes().equals(age.randomBiomes()),"Spawn update preserves pool");
|
||||
var saved=AgeRegistrySavedData.get(server.overworld()).save(new net.minecraft.nbt.CompoundTag(),server.registryAccess());
|
||||
var restored=AgeRegistrySavedData.load(saved,server.registryAccess()).find(age.id()).orElseThrow();
|
||||
check(restored.randomBiomes().equals(age.randomBiomes()),"Random pool registry round trip");
|
||||
|
||||
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
package net.dnorberg.rivencraft.age;
|
||||
import java.util.*;
|
||||
import net.dnorberg.rivencraft.shared.NativeBiomeKind;
|
||||
import net.dnorberg.rivencraft.compat.TerraBlenderBiomes;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.level.biome.*;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.neoforge.event.server.ServerStartedEvent;
|
||||
|
||||
|
||||
@EventBusSubscriber(modid="rivencraft")
|
||||
public final class NativeBiomeProbe {
|
||||
static int checks;
|
||||
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("NATIVE111_PASS checks="+checks); }
|
||||
catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); }
|
||||
finally { event.getServer().halt(false); }
|
||||
});
|
||||
}
|
||||
static void run(MinecraftServer server) throws Exception {
|
||||
var registry=server.registryAccess().lookupOrThrow(Registries.BIOME);
|
||||
var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess()));
|
||||
nether.remove(Identifier.parse("terrablender:deferred_placeholder"));
|
||||
var caves=PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES);
|
||||
check(caves.size()>=3,"Multiple baseline caves");
|
||||
check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key))
|
||||
.is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources");
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion");
|
||||
var lush=registry.getOrThrow(Biomes.LUSH_CAVES);
|
||||
var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class);
|
||||
bind.setAccessible(true);
|
||||
var old=lush.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags);
|
||||
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||
"Nether wins over overlapping Cave tag");
|
||||
} finally { bind.invoke(lush,old); }
|
||||
if(!nether.isEmpty()) {
|
||||
var key=nether.stream().sorted().findFirst().orElseThrow();
|
||||
var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key));
|
||||
var original=biome.tags().toList();
|
||||
try {
|
||||
var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(PortNativeBiomePools.CAVES);
|
||||
bind.invoke(biome,tags);
|
||||
check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag");
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained");
|
||||
check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves");
|
||||
} finally { bind.invoke(biome,original); }
|
||||
}
|
||||
var allTags=new LinkedHashMap<Holder.Reference<Biome>,List<net.minecraft.tags.TagKey<Biome>>>();
|
||||
try {
|
||||
registry.listElements().forEach(biome->{
|
||||
var tags=biome.tags().toList();allTags.put(biome,tags);
|
||||
var stripped=new ArrayList<>(tags);stripped.remove(PortNativeBiomePools.CAVES);
|
||||
try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); }
|
||||
});
|
||||
check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()),
|
||||
"Empty cave tag has non-Nether vanilla fallback");
|
||||
} finally {
|
||||
for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue());
|
||||
}
|
||||
var sourceMethod=RuntimeAgeBackend.class.getDeclaredMethod("authoredBiomeSource",
|
||||
MinecraftServer.class,PortBiomePlan.class,long.class);sourceMethod.setAccessible(true);
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END))
|
||||
for(var terrain:List.of("standard","amplified","island","cave","flat","void")) {
|
||||
var selected=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||
id("terrain/"+terrain),id("biome/native_"+family.name().toLowerCase(Locale.ROOT))),111L);
|
||||
var plan=selected.biomes();
|
||||
check(plan.nativeKind()==family,"Family on "+terrain);
|
||||
check(plan.biomes().equals(PortNativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool");
|
||||
var saved=PortBiomePlan.CODEC.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,plan).getOrThrow();
|
||||
check(PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().equals(plan),"Plan codec reload");
|
||||
var source=(BiomeSource)sourceMethod.invoke(null,server,plan,111L);
|
||||
check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().identifier()).collect(java.util.stream.Collectors.toSet())
|
||||
.equals(new HashSet<>(plan.biomes())),"Source consumes family");
|
||||
}
|
||||
check(net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(List.of(id("terrain/flat"),
|
||||
id("biome/native_nether"),id("biome/native_end")),server,111L).nativeKind()==NativeBiomeKind.END,
|
||||
"Last family controller wins even for direct compiler calls");
|
||||
var explicit=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||
List.of(id("terrain/cave"),id("biome/native")),111L).biomes();
|
||||
check(explicit.nativeKind()==NativeBiomeKind.CAVES && explicit.biomes().equals(caves),"Explicit Cave Native");
|
||||
long nativeSeed=0;
|
||||
while(PortRandomAgeSelection.distribution(nativeSeed)!=PortBiomePlan.Distribution.NATIVE)nativeSeed++;
|
||||
var omitted=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,
|
||||
List.of(id("terrain/cave")),nativeSeed).biomes();
|
||||
check(omitted.nativeKind()==NativeBiomeKind.CAVES,"Seed-completed Native Cave");
|
||||
long randomSeed=0;
|
||||
while(PortRandomAgeSelection.terrain(randomSeed)!=PortAgeTerrain.CAVE
|
||||
|| PortRandomAgeSelection.distribution(randomSeed)!=PortBiomePlan.Distribution.NATIVE)randomSeed++;
|
||||
var random=PortRandomAgeSelection.select(server,randomSeed);
|
||||
check(random.biomes().nativeKind()==NativeBiomeKind.CAVES && random.biomes().biomes().equals(caves),"Random Native Cave");
|
||||
var authored=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of(
|
||||
id("terrain/cave"),id("biome/crimson_forest"),id("biome/single")),111L).biomes();
|
||||
check(authored.biomes().equals(List.of(Identifier.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained");
|
||||
var oldJson=com.google.gson.JsonParser.parseString(
|
||||
"{\"distribution\":\"NATIVE\",\"biomes\":[\"minecraft:lush_caves\",\"minecraft:crimson_forest\"]}");
|
||||
var oldPool=PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,oldJson).getOrThrow();
|
||||
check(oldPool.nativeKind()==NativeBiomeKind.TERRAIN && oldPool.biomes().size()==2,"Old frozen mixed pool retained");
|
||||
var policy=new PortRandomPagePolicy(Set.of(id("biome/native_nether")),Set.of());
|
||||
check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Policy category");
|
||||
int n=0;
|
||||
for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) {
|
||||
var terrain=family==NativeBiomeKind.CAVES?PortAgeTerrain.VOID:family==NativeBiomeKind.NETHER?PortAgeTerrain.STANDARD:PortAgeTerrain.CAVE;
|
||||
var plan=new PortBiomePlan(PortBiomePlan.Distribution.NATIVE,PortNativeBiomePools.pool(server.registryAccess(),family),family);
|
||||
var age=RuntimeAgeBackend.create(server,id("age/native111_"+n++),111L,plan,terrain);
|
||||
check(age.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().size()==plan.biomes().size(),"Runtime terrain override "+terrain);
|
||||
}
|
||||
check(registry.get(ResourceKey.create(Registries.BIOME,Identifier.withDefaultNamespace("sulfur_caves"))).isEmpty()
|
||||
|| caves.contains(Identifier.withDefaultNamespace("sulfur_caves")),"New vanilla Sulfur Caves included");
|
||||
|
||||
try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) {
|
||||
var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject();
|
||||
for(var family:List.of("native_caves","native_nether","native_end"))
|
||||
check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics")
|
||||
.get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user