diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 0eb47fda7..fec99804d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -17,7 +17,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator; import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator; import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator; import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator; -import com.dfsek.terra.addons.biome.pipeline.source.RandomSource; +import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage; import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.TerraPlugin; @@ -52,7 +52,7 @@ public class BiomePipelineAddon extends TerraAddon implements EventListener { .applyLoader(Stage.class, new StageLoader()) .applyLoader(ExpanderStage.Type.class, (c, o, l) -> ExpanderStage.Type.valueOf((String) o)) .applyLoader(MutatorStage.Type.class, (c, o, l) -> MutatorStage.Type.valueOf((String) o)) - .applyLoader(RandomSource.class, NoiseSourceTemplate::new) + .applyLoader(NoiseSource.class, NoiseSourceTemplate::new) .applyLoader(ReplaceMutator.class, ReplaceMutatorTemplate::new) .applyLoader(BorderMutator.class, BorderMutatorTemplate::new) .applyLoader(BorderListMutator.class, BorderListMutatorTemplate::new) 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 c9ea1dd31..ab425be7b 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.source.RandomSource; +import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.biome.TerraBiome; @@ -16,6 +16,6 @@ public class NoiseSourceTemplate extends SourceTemplate { @Override public BiomeSource get() { - return new RandomSource(biomes, noise); + return new NoiseSource(biomes, noise); } } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceLoader.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceLoader.java index 83b40f880..792f5455b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceLoader.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceLoader.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.addons.biome.pipeline.source.RandomSource; +import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import java.lang.reflect.AnnotatedType; @@ -18,7 +18,7 @@ public class SourceLoader implements TypeLoader { BiomeSource.Type type = loader.loadType(BiomeSource.Type.class, source.get("type")); if(type == BiomeSource.Type.NOISE) { - return loader.loadType(RandomSource.class, source); + return loader.loadType(NoiseSource.class, source); } throw new LoadException("No such loader type: " + type); } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/RandomSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java similarity index 80% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/RandomSource.java rename to common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java index 41896d03f..9edc2859f 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/RandomSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java @@ -5,11 +5,11 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; -public class RandomSource implements BiomeSource { +public class NoiseSource implements BiomeSource { private final ProbabilityCollection biomes; private final NoiseSampler sampler; - public RandomSource(ProbabilityCollection biomes, NoiseSampler sampler) { + public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { this.biomes = biomes; this.sampler = sampler; }