diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java index 57034c43d..feac62fc8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java @@ -9,6 +9,7 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.api.config.meta.Meta; @@ -22,7 +23,7 @@ public class NoiseSourceTemplate extends SourceTemplate { private @Meta NoiseSampler noise; @Value("biomes") - private @Meta ProbabilityCollection<@Meta Biome> biomes; + private @Meta ProbabilityCollection<@Meta BiomeDelegate> biomes; @Override public BiomeSource get() { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java index c966ea8b7..f6862ede3 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java @@ -7,11 +7,12 @@ package com.dfsek.terra.addons.biome.pipeline.source; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeDelegate; import com.dfsek.terra.api.world.biome.Biome; public interface BiomeSource { - Biome getBiome(double x, double z, long seed); + BiomeDelegate getBiome(double x, double z, long seed); - Iterable getBiomes(); + Iterable getBiomes(); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java index c11566023..9ed8f1ee1 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java @@ -7,27 +7,29 @@ package com.dfsek.terra.addons.biome.pipeline.source; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeDelegate; +import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.biome.Biome; public class NoiseSource implements BiomeSource { - private final ProbabilityCollection biomes; + private final ProbabilityCollection biomes; private final NoiseSampler sampler; - public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { + public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { this.biomes = biomes; this.sampler = sampler; } @Override - public Biome getBiome(double x, double z, long seed) { + public BiomeDelegate getBiome(double x, double z, long seed) { return biomes.get(sampler, x, z, seed); } @Override - public Iterable getBiomes() { + public Iterable getBiomes() { return biomes.getContents(); } }