Manage EternalPortal in DataGen

This commit is contained in:
Frank 2023-06-08 02:17:19 +02:00
parent 0c05ebc3a1
commit dc1d3b1a51
12 changed files with 23 additions and 11 deletions

View file

@ -40,6 +40,7 @@ public class ChorusForestBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_PURPLE) .feature(EndFeatures.CHARNIA_PURPLE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EndEntities.END_SLIME, 5, 1, 2) .spawn(EndEntities.END_SLIME, 5, 1, 2)
.spawn(EntityType.ENDERMAN, 50, 1, 4); .spawn(EntityType.ENDERMAN, 50, 1, 4);
} }

View file

@ -2,10 +2,7 @@ package org.betterx.betterend.world.biome.land;
import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder;
import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.bclib.interfaces.SurfaceMaterialProvider;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.*;
import org.betterx.betterend.registry.EndFeatures;
import org.betterx.betterend.registry.EndParticles;
import org.betterx.betterend.registry.EndSounds;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
@ -36,6 +33,7 @@ public class DragonGraveyardsBiome extends EndBiome.Config {
.feature(EndFeatures.SMALL_AMARANITA) .feature(EndFeatures.SMALL_AMARANITA)
.feature(EndFeatures.GLOBULAGUS) .feature(EndFeatures.GLOBULAGUS)
.feature(EndFeatures.CLAWFERN) .feature(EndFeatures.CLAWFERN)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -5,6 +5,7 @@ import org.betterx.bclib.interfaces.SurfaceMaterialProvider;
import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndFeatures;
import org.betterx.betterend.registry.EndSounds; import org.betterx.betterend.registry.EndSounds;
import org.betterx.betterend.registry.EndStructures;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import net.minecraft.tags.BiomeTags; import net.minecraft.tags.BiomeTags;
@ -30,6 +31,7 @@ public class DryShrublandBiome extends EndBiome.Config {
.feature(EndFeatures.LUTEBUS) .feature(EndFeatures.LUTEBUS)
.feature(EndFeatures.LAMELLARIUM) .feature(EndFeatures.LAMELLARIUM)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -9,7 +9,6 @@ import org.betterx.betterend.registry.EndStructures;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.tags.BiomeTags;
import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
@ -31,8 +30,8 @@ public class DustWastelandsBiome extends EndBiome.Config {
.particles(ParticleTypes.WHITE_ASH, 0.01F) .particles(ParticleTypes.WHITE_ASH, 0.01F)
.loop(EndSounds.AMBIENT_DUST_WASTELANDS) .loop(EndSounds.AMBIENT_DUST_WASTELANDS)
.music(EndSounds.MUSIC_OPENSPACE) .music(EndSounds.MUSIC_OPENSPACE)
.structure(BiomeTags.HAS_END_CITY) .structure(EndStructures.END_VILLAGE)
.structure(EndStructures.END_VILLAGE.biomeTag) .structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -40,6 +40,7 @@ public class FoggyMushroomlandBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_LIGHT_BLUE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EndEntities.DRAGONFLY, 80, 2, 5) .spawn(EndEntities.DRAGONFLY, 80, 2, 5)
.spawn(EndEntities.END_FISH, 20, 2, 5) .spawn(EndEntities.END_FISH, 20, 2, 5)
.spawn(EndEntities.CUBOZOA, 10, 3, 8) .spawn(EndEntities.CUBOZOA, 10, 3, 8)

View file

@ -38,6 +38,7 @@ public class GlowingGrasslandsBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_LIGHT_BLUE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.END_VILLAGE)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -38,6 +38,7 @@ public class LanternWoodsBiome extends EndBiome.Config {
.feature(EndFeatures.RUSCUS) .feature(EndFeatures.RUSCUS)
.feature(EndFeatures.RUSCUS_WOOD) .feature(EndFeatures.RUSCUS_WOOD)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -4,10 +4,7 @@ import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder;
import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder;
import org.betterx.bclib.api.v2.levelgen.surface.rules.SwitchRuleSource; import org.betterx.bclib.api.v2.levelgen.surface.rules.SwitchRuleSource;
import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.bclib.interfaces.SurfaceMaterialProvider;
import org.betterx.betterend.registry.EndBiomes; import org.betterx.betterend.registry.*;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndFeatures;
import org.betterx.betterend.registry.EndSounds;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import org.betterx.betterend.world.surface.SplitNoiseCondition; import org.betterx.betterend.world.surface.SplitNoiseCondition;
@ -45,6 +42,7 @@ public class NeonOasisBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_GREEN) .feature(EndFeatures.CHARNIA_GREEN)
.feature(EndFeatures.CHARNIA_RED) .feature(EndFeatures.CHARNIA_RED)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -40,6 +40,7 @@ public class ShadowForestBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_PURPLE) .feature(EndFeatures.CHARNIA_PURPLE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EndEntities.SHADOW_WALKER, 80, 2, 4) .spawn(EndEntities.SHADOW_WALKER, 80, 2, 4)
.spawn(EntityType.ENDERMAN, 40, 1, 4) .spawn(EntityType.ENDERMAN, 40, 1, 4)
.spawn(EntityType.PHANTOM, 1, 1, 2); .spawn(EntityType.PHANTOM, 1, 1, 2);

View file

@ -47,6 +47,7 @@ public class SulphurSpringsBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_GREEN) .feature(EndFeatures.CHARNIA_GREEN)
.feature(EndFeatures.CHARNIA_ORANGE) .feature(EndFeatures.CHARNIA_ORANGE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EndEntities.END_FISH, 50, 3, 8) .spawn(EndEntities.END_FISH, 50, 3, 8)
.spawn(EndEntities.CUBOZOA, 50, 3, 8) .spawn(EndEntities.CUBOZOA, 50, 3, 8)
.spawn(EntityType.ENDERMAN, 50, 1, 4); .spawn(EntityType.ENDERMAN, 50, 1, 4);

View file

@ -42,6 +42,7 @@ public class UmbrellaJungleBiome extends EndBiome.Config {
.feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_LIGHT_BLUE)
.feature(EndFeatures.CHARNIA_RED_RARE) .feature(EndFeatures.CHARNIA_RED_RARE)
.structure(BiomeTags.HAS_END_CITY) .structure(BiomeTags.HAS_END_CITY)
.structure(EndStructures.ETERNAL_PORTAL)
.spawn(EntityType.ENDERMAN, 50, 1, 2); .spawn(EntityType.ENDERMAN, 50, 1, 2);
} }

View file

@ -3,9 +3,11 @@ package org.betterx.datagen.betterend.worldgen;
import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome;
import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder;
import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeRegistry;
import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI;
import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI.BiomeType; import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI.BiomeType;
import org.betterx.bclib.api.v3.datagen.TagDataProvider; import org.betterx.bclib.api.v3.datagen.TagDataProvider;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.registry.EndStructures;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import org.betterx.betterend.world.biome.air.BiomeIceStarfield; import org.betterx.betterend.world.biome.air.BiomeIceStarfield;
import org.betterx.betterend.world.biome.cave.*; import org.betterx.betterend.world.biome.cave.*;
@ -87,6 +89,12 @@ public class EndBiomesDataProvider extends TagDataProvider<Biome> {
} }
public static void ensureStaticallyLoaded() { public static void ensureStaticallyLoaded() {
TagManager.BIOMES.add(
EndStructures.ETERNAL_PORTAL.biomeTag,
BiomeAPI.END_BARRENS.getBiomeKey(),
BiomeAPI.END_MIDLANDS.getBiomeKey(),
BiomeAPI.END_HIGHLANDS.getBiomeKey()
);
} }
static { static {