diff --git a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java index 1c90b50b..a9e5c9e8 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java @@ -40,6 +40,7 @@ public class ChorusForestBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_PURPLE) .feature(EndFeatures.CHARNIA_RED_RARE) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EndEntities.END_SLIME, 5, 1, 2) .spawn(EntityType.ENDERMAN, 50, 1, 4); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java index 6cbf7183..967720c0 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DragonGraveyardsBiome.java @@ -2,10 +2,7 @@ package org.betterx.betterend.world.biome.land; import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.betterend.registry.EndBlocks; -import org.betterx.betterend.registry.EndFeatures; -import org.betterx.betterend.registry.EndParticles; -import org.betterx.betterend.registry.EndSounds; +import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; import net.minecraft.world.entity.EntityType; @@ -36,6 +33,7 @@ public class DragonGraveyardsBiome extends EndBiome.Config { .feature(EndFeatures.SMALL_AMARANITA) .feature(EndFeatures.GLOBULAGUS) .feature(EndFeatures.CLAWFERN) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java index 99f832a8..b672fc56 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DryShrublandBiome.java @@ -5,6 +5,7 @@ import org.betterx.bclib.interfaces.SurfaceMaterialProvider; import org.betterx.betterend.registry.EndBlocks; import org.betterx.betterend.registry.EndFeatures; import org.betterx.betterend.registry.EndSounds; +import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.world.biome.EndBiome; import net.minecraft.tags.BiomeTags; @@ -30,6 +31,7 @@ public class DryShrublandBiome extends EndBiome.Config { .feature(EndFeatures.LUTEBUS) .feature(EndFeatures.LAMELLARIUM) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java index 93884346..7ac9f417 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/DustWastelandsBiome.java @@ -9,7 +9,6 @@ import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.world.biome.EndBiome; import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.tags.BiomeTags; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; @@ -31,8 +30,8 @@ public class DustWastelandsBiome extends EndBiome.Config { .particles(ParticleTypes.WHITE_ASH, 0.01F) .loop(EndSounds.AMBIENT_DUST_WASTELANDS) .music(EndSounds.MUSIC_OPENSPACE) - .structure(BiomeTags.HAS_END_CITY) - .structure(EndStructures.END_VILLAGE.biomeTag) + .structure(EndStructures.END_VILLAGE) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java index 4fc40723..dec98827 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/FoggyMushroomlandBiome.java @@ -40,6 +40,7 @@ public class FoggyMushroomlandBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_RED_RARE) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EndEntities.DRAGONFLY, 80, 2, 5) .spawn(EndEntities.END_FISH, 20, 2, 5) .spawn(EndEntities.CUBOZOA, 10, 3, 8) diff --git a/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java index 5b45f319..f9d3768c 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/GlowingGrasslandsBiome.java @@ -38,6 +38,7 @@ public class GlowingGrasslandsBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_RED_RARE) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.END_VILLAGE) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java index 6ba2890d..cca10f0b 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/LanternWoodsBiome.java @@ -38,6 +38,7 @@ public class LanternWoodsBiome extends EndBiome.Config { .feature(EndFeatures.RUSCUS) .feature(EndFeatures.RUSCUS_WOOD) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java index 62aedb70..9a2bd61c 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/NeonOasisBiome.java @@ -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.rules.SwitchRuleSource; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.betterend.registry.EndBiomes; -import org.betterx.betterend.registry.EndBlocks; -import org.betterx.betterend.registry.EndFeatures; -import org.betterx.betterend.registry.EndSounds; +import org.betterx.betterend.registry.*; import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.surface.SplitNoiseCondition; @@ -45,6 +42,7 @@ public class NeonOasisBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_GREEN) .feature(EndFeatures.CHARNIA_RED) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java index a6eafaa3..7e295cc0 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/ShadowForestBiome.java @@ -40,6 +40,7 @@ public class ShadowForestBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_PURPLE) .feature(EndFeatures.CHARNIA_RED_RARE) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EndEntities.SHADOW_WALKER, 80, 2, 4) .spawn(EntityType.ENDERMAN, 40, 1, 4) .spawn(EntityType.PHANTOM, 1, 1, 2); diff --git a/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java index b2b10e9d..59d3e487 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/SulphurSpringsBiome.java @@ -47,6 +47,7 @@ public class SulphurSpringsBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_GREEN) .feature(EndFeatures.CHARNIA_ORANGE) .feature(EndFeatures.CHARNIA_RED_RARE) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EndEntities.END_FISH, 50, 3, 8) .spawn(EndEntities.CUBOZOA, 50, 3, 8) .spawn(EntityType.ENDERMAN, 50, 1, 4); diff --git a/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java index 6b0807f7..fdab66f9 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/UmbrellaJungleBiome.java @@ -42,6 +42,7 @@ public class UmbrellaJungleBiome extends EndBiome.Config { .feature(EndFeatures.CHARNIA_LIGHT_BLUE) .feature(EndFeatures.CHARNIA_RED_RARE) .structure(BiomeTags.HAS_END_CITY) + .structure(EndStructures.ETERNAL_PORTAL) .spawn(EntityType.ENDERMAN, 50, 1, 2); } diff --git a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java index 84bf4232..991f5d0a 100644 --- a/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java +++ b/src/main/java/org/betterx/datagen/betterend/worldgen/EndBiomesDataProvider.java @@ -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.BCLBiomeBuilder; 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.v3.datagen.TagDataProvider; import org.betterx.betterend.BetterEnd; +import org.betterx.betterend.registry.EndStructures; import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.air.BiomeIceStarfield; import org.betterx.betterend.world.biome.cave.*; @@ -87,6 +89,12 @@ public class EndBiomesDataProvider extends TagDataProvider { } public static void ensureStaticallyLoaded() { + TagManager.BIOMES.add( + EndStructures.ETERNAL_PORTAL.biomeTag, + BiomeAPI.END_BARRENS.getBiomeKey(), + BiomeAPI.END_MIDLANDS.getBiomeKey(), + BiomeAPI.END_HIGHLANDS.getBiomeKey() + ); } static {