Make sure we have access to certain biome Keys

This commit is contained in:
Frank 2022-12-09 17:03:38 +01:00
parent f2c87a6eb2
commit 26cd2e6c19
18 changed files with 143 additions and 107 deletions

View file

@ -150,6 +150,10 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider {
this.ID = BetterEnd.makeID(name);
}
protected Config(ResourceLocation ID) {
this.ID = ID;
}
protected abstract void addCustomBuildData(BCLBiomeBuilder builder);
public BiomeSupplier<EndBiome> getSupplier() {

View file

@ -11,7 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class AmberLandBiome extends EndBiome.Config {
public AmberLandBiome() {
super("amber_land");
super(EndBiomes.AMBER_LAND.location());
}
@Override

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.interfaces.SurfaceMaterialProvider;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndEntities;
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 net.minecraft.core.particles.ParticleTypes;
@ -17,7 +14,7 @@ import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
public class ChorusForestBiome extends EndBiome.Config {
public ChorusForestBiome() {
super("chorus_forest");
super(EndBiomes.CHORUS_FOREST.location());
}
@Override

View file

@ -11,7 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class FoggyMushroomlandBiome extends EndBiome.Config {
public FoggyMushroomlandBiome() {
super("foggy_mushroomland");
super(EndBiomes.FOGGY_MUSHROOMLAND.location());
}
@Override

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.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.tags.BiomeTags;
@ -14,7 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class GlowingGrasslandsBiome extends EndBiome.Config {
public GlowingGrasslandsBiome() {
super("glowing_grasslands");
super(EndBiomes.GLOWING_GRASSLANDS.location());
}
@Override

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.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.tags.BiomeTags;
@ -14,7 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class LanternWoodsBiome extends EndBiome.Config {
public LanternWoodsBiome() {
super("lantern_woods");
super(EndBiomes.LANTERN_WOODS.location());
}
@Override

View file

@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class MegalakeBiome extends EndBiome.Config {
public MegalakeBiome() {
super("megalake");
super(EndBiomes.MEGALAKE.location());
}
@Override

View file

@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class MegalakeGroveBiome extends EndBiome.Config {
public MegalakeGroveBiome() {
super("megalake_grove");
super(EndBiomes.MEGALAKE_GROVE.location());
}
@Override

View file

@ -4,6 +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;
@ -23,7 +24,7 @@ import java.util.List;
public class NeonOasisBiome extends EndBiome.Config {
public NeonOasisBiome() {
super("neon_oasis");
super(EndBiomes.NEON_OASIS.location());
}
@Override

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.interfaces.SurfaceMaterialProvider;
import org.betterx.betterend.registry.EndBlocks;
import org.betterx.betterend.registry.EndEntities;
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 net.minecraft.core.particles.ParticleTypes;
@ -15,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class ShadowForestBiome extends EndBiome.Config {
public ShadowForestBiome() {
super("shadow_forest");
super(EndBiomes.SHADOW_FOREST.location());
}
@Override

View file

@ -18,8 +18,9 @@ import net.minecraft.world.level.levelgen.placement.CaveSurface;
import java.util.List;
public class SulphurSpringsBiome extends EndBiome.Config {
public SulphurSpringsBiome() {
super("sulphur_springs");
super(EndBiomes.SULPHUR_SPRINGS.location());
}
@Override

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.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.tags.BiomeTags;
@ -14,7 +11,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class UmbrellaJungleBiome extends EndBiome.Config {
public UmbrellaJungleBiome() {
super("umbrella_jungle");
super(EndBiomes.UMBRELLA_JUNGLE.location());
}
@Override

View file

@ -86,7 +86,7 @@ public class FloatingSpireFeature extends SpireFeature {
sdf.fillRecursive(world, center);
support.forEach((bpos) -> {
if (BiomeAPI.getBiome(world.getBiome(bpos)).equals(EndBiomes.BLOSSOMING_SPIRES)) {
if (BiomeAPI.getBiome(world.getBiome(bpos)).is(EndBiomes.BLOSSOMING_SPIRES)) {
EndFeatures.TENANEA_BUSH.getFeature()
.place(new FeaturePlaceContext<NoneFeatureConfiguration>(
Optional.empty(),