remove SeededNoiseSampler from configs

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java

@@ -34,6 +34,6 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
         BiomePipelineImpl.BiomePipelineBuilder biomePipelineBuilder = new BiomePipelineImpl.BiomePipelineBuilder(initialSize);
         stages.forEach(biomePipelineBuilder::addStage);
         BiomePipelineImpl pipeline = biomePipelineBuilder.build(source.build(seed), seed);
-        return new StandardBiomeProvider(pipeline, main, resolution, blend.build(seed), blendAmp, (int) seed);
+        return new StandardBiomeProvider(pipeline, main, resolution, blend, blendAmp, (int) seed);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java

@@ -3,6 +3,7 @@ package com.dfsek.terra.addons.biome.pipeline.config;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
 import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -13,7 +14,7 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<SeededBuil
     protected int resolution = 1;
     @Value("blend.noise")
     @Default
-    protected SeededNoiseSampler blend = SeededNoiseSampler.zero(2);
+    protected NoiseSampler blend = NoiseSampler.zero();
     @Value("blend.amplitude")
     @Default
     protected double blendAmp = 0d;

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java

@@ -2,6 +2,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.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
 import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
@@ -9,13 +10,13 @@ import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 
 public class NoiseSourceTemplate extends SourceTemplate {
     @Value("noise")
-    private SeededNoiseSampler noise;
+    private NoiseSampler noise;
 
     @Value("biomes")
     private ProbabilityCollection<SeededTerraBiome> biomes;
 
     @Override
     public BiomeSource build(long seed) {
-        return new RandomSource(biomes.map((biome) -> biome.build(seed), false), noise.build(seed));
+        return new RandomSource(biomes.map((biome) -> biome.build(seed), false), noise);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java

@@ -4,12 +4,13 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
 
 public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {
     @Value("noise")
-    protected SeededNoiseSampler noise;
+    protected NoiseSampler noise;
 
     @Override
     public StageSeeded get() {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java

@@ -8,6 +8,6 @@ import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
 public class ExpanderStageTemplate extends StageTemplate {
     @Override
     public Stage build(long seed) {
-        return new ExpanderStage(new FractalExpander(noise.build(seed)));
+        return new ExpanderStage(new FractalExpander(noise));
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java

@@ -31,6 +31,6 @@ public class BorderListMutatorTemplate extends MutatorStageTemplate {
 
         replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.build(seed), replacements.map(replacement -> replacement.build(seed), true)));
 
-        return new BorderListMutator(replaceMap, from, defaultReplace, noise.build(seed), defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true));
+        return new BorderListMutator(replaceMap, from, defaultReplace, noise, defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true));
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java

@@ -19,6 +19,6 @@ public class BorderMutatorTemplate extends MutatorStageTemplate {
 
     @Override
     public BiomeMutator getMutator(long seed) {
-        return new BorderMutator(from, replace, noise.build(seed), to.map(biomeBuilder -> biomeBuilder.build(seed), true));
+        return new BorderMutator(from, replace, noise, to.map(biomeBuilder -> biomeBuilder.build(seed), true));
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java

@@ -27,6 +27,6 @@ public class ReplaceListMutatorTemplate extends MutatorStageTemplate {
 
         replace.forEach((biomeBuilder, biomeBuilders) -> replaceMap.put(biomeBuilder.build(seed), biomeBuilders.map(builder -> builder.build(seed), true)));
 
-        return new ReplaceListMutator(replaceMap, defaultFrom, defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true), noise.build(seed));
+        return new ReplaceListMutator(replaceMap, defaultFrom, defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true), noise);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java

@@ -16,6 +16,6 @@ public class ReplaceMutatorTemplate extends MutatorStageTemplate {
 
     @Override
     public BiomeMutator getMutator(long seed) {
-        return new ReplaceMutator(from, to.map(biomeBuilder -> biomeBuilder.build(seed), true), noise.build(seed));
+        return new ReplaceMutator(from, to.map(biomeBuilder -> biomeBuilder.build(seed), true), noise);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java

@@ -6,6 +6,6 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator;
 public class SmoothMutatorTemplate extends MutatorStageTemplate {
     @Override
     public BiomeMutator getMutator(long seed) {
-        return new SmoothMutator(noise.build(seed));
+        return new SmoothMutator(noise);
     }
 }