From 2a2db4bc52df88fdaa2219c8a0d4201d9324fc86 Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 8 Dec 2021 13:43:56 +1100 Subject: [PATCH 01/10] noise -> samplers in pack manifest --- .../com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java index 069bcbf49..dcf6c8ea8 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.config.meta.Meta; @SuppressWarnings("FieldMayBeFinal") public class NoiseConfigPackTemplate implements ConfigTemplate { - @Value("noise") + @Value("samplers") private @Meta Map noiseBuilderMap; @Value("functions") From df8489c1af6045d37bc739b8a546fb6a2cde830d Mon Sep 17 00:00:00 2001 From: Astrash Date: Wed, 8 Dec 2021 14:18:04 +1100 Subject: [PATCH 02/10] function -> sampler in various sampler templates --- .../terra/addons/noise/config/templates/DomainWarpTemplate.java | 2 +- .../terra/addons/noise/config/templates/KernelTemplate.java | 2 +- .../noise/config/templates/noise/fractal/FractalTemplate.java | 2 +- .../noise/config/templates/normalizer/NormalizerTemplate.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java index 0dfc080c2..375059cba 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java @@ -20,7 +20,7 @@ public class DomainWarpTemplate extends SamplerTemplate { @Value("warp") private @Meta NoiseSampler warp; - @Value("function") + @Value("sampler") private @Meta NoiseSampler function; @Value("amplitude") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java index b02b55cc6..2d5f8e4fe 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java @@ -28,7 +28,7 @@ public class KernelTemplate extends SamplerTemplate { @Default private @Meta double factor = 1; - @Value("function") + @Value("sampler") private @Meta NoiseSampler function; @Value("frequency") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java index 22db0d51e..f0534c098 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java @@ -33,6 +33,6 @@ public abstract class FractalTemplate extends Sa @Default protected @Meta double weightedStrength = 0.0D; - @Value("function") + @Value("sampler") protected @Meta NoiseSampler function; } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java index 1ec58dfd4..608377de0 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java @@ -16,6 +16,6 @@ import com.dfsek.terra.api.noise.NoiseSampler; public abstract class NormalizerTemplate extends SamplerTemplate { - @Value("function") + @Value("sampler") protected @Meta NoiseSampler function; } From 3225746940b649a8c738aa90e274c44a0a635401 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 17 Dec 2021 17:52:28 +1100 Subject: [PATCH 03/10] noise -> sampler in palette configs --- .../java/com/dfsek/terra/addons/palette/PaletteTemplate.java | 2 +- .../terra/addons/palette/palette/PaletteLayerLoader.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java index 65650281b..7147284d1 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.noise.NoiseSampler; @SuppressWarnings({ "FieldMayBeFinal", "unused" }) public class PaletteTemplate implements AbstractableTemplate { - @Value("noise") + @Value("sampler") @Default private @Meta NoiseSampler noise = NoiseSampler.zero(); diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java index fd2f68e1a..ed166429a 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java @@ -40,8 +40,8 @@ public class PaletteLayerLoader implements TypeLoader { BLOCK_DATA_PROBABILITY_COLLECTION_TYPE, map.get("materials")); NoiseSampler sampler = null; - if(map.containsKey("noise")) { - sampler = configLoader.loadType(NoiseSampler.class, map.get("noise")); + if(map.containsKey("sampler")) { + sampler = configLoader.loadType(NoiseSampler.class, map.get("sampler")); } if(collection == null) throw new LoadException("Collection is null: " + map.get("materials")); From a4764d315868cbe8f73cad54ad8cf83404fe76e7 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 17 Dec 2021 18:02:08 +1100 Subject: [PATCH 04/10] Biome provider blend.noise -> blend.sampler --- .../addons/biome/pipeline/config/BiomeProviderTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java index a0c453243..b169fbf24 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java @@ -26,9 +26,9 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate Date: Fri, 17 Dec 2021 18:05:26 +1100 Subject: [PATCH 05/10] StageTemplate noise -> sampler --- .../addons/biome/pipeline/config/stage/StageTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java index 7c489f6b3..ba4bee85d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.noise.NoiseSampler; public abstract class StageTemplate implements ObjectTemplate { - @Value("noise") - @Description("Noise sampler to use for stage distribution.") + @Value("sampler") + @Description("Sampler to use for stage distribution.") protected @Meta NoiseSampler noise; } From 58fcf0b8089e4fc822f319756dd9f4324d97f629 Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 17 Dec 2021 18:09:24 +1100 Subject: [PATCH 06/10] Pipeline NoiseSource -> SamplerSource --- .../addons/biome/pipeline/BiomePipelineAddon.java | 4 ++-- ...eSourceTemplate.java => SamplerSourceTemplate.java} | 10 +++++----- .../source/{NoiseSource.java => SamplerSource.java} | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) rename common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/{NoiseSourceTemplate.java => SamplerSourceTemplate.java} (78%) rename common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/{NoiseSource.java => SamplerSource.java} (85%) 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 fd78159d0..2bebdf8e0 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 @@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage; import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader; import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate; +import com.dfsek.terra.addons.biome.pipeline.config.SamplerSourceTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate; @@ -65,7 +65,7 @@ public class BiomePipelineAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> sourceRegistry = event.getPack().getOrCreateRegistry( SOURCE_REGISTRY_KEY); - sourceRegistry.register("NOISE", NoiseSourceTemplate::new); + sourceRegistry.register("SAMPLER", SamplerSourceTemplate::new); }) .then(event -> { CheckedRegistry>> stageRegistry = event.getPack().getOrCreateRegistry( 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/SamplerSourceTemplate.java similarity index 78% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java rename to common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java index 7a7179af4..2ba70b608 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/SamplerSourceTemplate.java @@ -12,15 +12,15 @@ import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; +import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -public class NoiseSourceTemplate extends SourceTemplate { - @Value("noise") - @Description("The noise function to distribute biomes.") +public class SamplerSourceTemplate extends SourceTemplate { + @Value("sampler") + @Description("The sampler used to distribute biomes.") private @Meta NoiseSampler noise; @Value("biomes") @@ -29,6 +29,6 @@ public class NoiseSourceTemplate extends SourceTemplate { @Override public BiomeSource get() { - return new NoiseSource(biomes, noise); + return new SamplerSource(biomes, noise); } } 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/SamplerSource.java similarity index 85% rename from common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java rename to common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java index 2967a3662..62656ac17 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/SamplerSource.java @@ -12,11 +12,11 @@ import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -public class NoiseSource implements BiomeSource { +public class SamplerSource implements BiomeSource { private final ProbabilityCollection biomes; private final NoiseSampler sampler; - public NoiseSource(ProbabilityCollection biomes, NoiseSampler sampler) { + public SamplerSource(ProbabilityCollection biomes, NoiseSampler sampler) { this.biomes = biomes; this.sampler = sampler; } From d3ea370b74f164451bd0fc22951c6c10edd045fe Mon Sep 17 00:00:00 2001 From: Astrash Date: Fri, 17 Dec 2021 18:59:47 +1100 Subject: [PATCH 07/10] BiomeNoiseConfigTemplate key name changes --- .../config/noise/BiomeNoiseConfigTemplate.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java index d3614be80..14d3c97d2 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java @@ -9,10 +9,10 @@ import com.dfsek.terra.api.noise.NoiseSampler; public class BiomeNoiseConfigTemplate implements ObjectTemplate { - @Value("noise") + @Value("terrain.sampler") private @Meta NoiseSampler baseSampler; - @Value("elevation.equation") + @Value("terrain.sampler-2d") @Default private @Meta NoiseSampler elevationSampler = NoiseSampler.zero(); @@ -20,19 +20,19 @@ public class BiomeNoiseConfigTemplate implements ObjectTemplate Date: Sat, 18 Dec 2021 10:05:59 +1100 Subject: [PATCH 08/10] NoiseDistributor -> SamplerDistributor --- .../addons/feature/distributor/DistributorAddon.java | 7 ++++--- ...butorTemplate.java => SamplerDistributorTemplate.java} | 8 ++++---- .../{NoiseDistributor.java => SamplerDistributor.java} | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) rename common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/{NoiseDistributorTemplate.java => SamplerDistributorTemplate.java} (77%) rename common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/{NoiseDistributor.java => SamplerDistributor.java} (84%) diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java index 899130546..eca7dd9df 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java @@ -12,7 +12,8 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.function.Supplier; import com.dfsek.terra.addons.feature.distributor.config.AndDistributorTemplate; -import com.dfsek.terra.addons.feature.distributor.config.NoiseDistributorTemplate; +import com.dfsek.terra.addons.feature.distributor.config.NoDistributorTemplate; +import com.dfsek.terra.addons.feature.distributor.config.SamplerDistributorTemplate; import com.dfsek.terra.addons.feature.distributor.config.OrDistributorTemplate; import com.dfsek.terra.addons.feature.distributor.config.PointSetDistributorTemplate; import com.dfsek.terra.addons.feature.distributor.config.YesDistributorTemplate; @@ -46,12 +47,12 @@ public class DistributorAddon implements AddonInitializer { .then(event -> { CheckedRegistry>> distributorRegistry = event.getPack().getOrCreateRegistry( DISTRIBUTOR_TOKEN); - distributorRegistry.register("NOISE", NoiseDistributorTemplate::new); + distributorRegistry.register("SAMPLER", SamplerDistributorTemplate::new); distributorRegistry.register("POINTS", PointSetDistributorTemplate::new); distributorRegistry.register("AND", AndDistributorTemplate::new); distributorRegistry.register("OR", OrDistributorTemplate::new); distributorRegistry.register("YES", YesDistributorTemplate::new); - distributorRegistry.register("NO", NoiseDistributorTemplate::new); + distributorRegistry.register("NO", NoDistributorTemplate::new); event.getPack() .applyLoader(Point.class, PointTemplate::new); diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java similarity index 77% rename from common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java rename to common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java index 92ef0aa41..53bc81751 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoiseDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java @@ -11,22 +11,22 @@ import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.distributor.distributors.NoiseDistributor; +import com.dfsek.terra.addons.feature.distributor.distributors.SamplerDistributor; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.structure.feature.Distributor; @SuppressWarnings("FieldMayBeFinal") -public class NoiseDistributorTemplate implements ObjectTemplate { +public class SamplerDistributorTemplate implements ObjectTemplate { @Value("threshold") @Default private @Meta double threshold = 0; - @Value("distribution") + @Value("sampler") private @Meta NoiseSampler noise; @Override public Distributor get() { - return new NoiseDistributor(noise, threshold); + return new SamplerDistributor(noise, threshold); } } diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java similarity index 84% rename from common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java rename to common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java index 3e1155440..ebe0dfdc4 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java @@ -11,12 +11,12 @@ import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.structure.feature.Distributor; -public class NoiseDistributor implements Distributor { +public class SamplerDistributor implements Distributor { private final NoiseSampler sampler; private final double threshold; - public NoiseDistributor(NoiseSampler sampler, double threshold) { + public SamplerDistributor(NoiseSampler sampler, double threshold) { this.sampler = sampler; this.threshold = threshold; } From ebba3472e2fdcdc7a24fadc31f182c616c3638b5 Mon Sep 17 00:00:00 2001 From: Astrash Date: Sat, 18 Dec 2021 10:09:52 +1100 Subject: [PATCH 09/10] NoiseLocator -> SamplerLocator --- .../dfsek/terra/addons/feature/locator/LocatorAddon.java | 4 ++-- ...oiseLocatorTemplate.java => SamplerLocatorTemplate.java} | 6 +++--- .../locators/{NoiseLocator.java => SamplerLocator.java} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/{NoiseLocatorTemplate.java => SamplerLocatorTemplate.java} (78%) rename common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/{NoiseLocator.java => SamplerLocator.java} (91%) diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 77d8e5625..6c834182e 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -14,7 +14,7 @@ import java.util.function.Supplier; import com.dfsek.terra.addons.feature.locator.config.AndLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.GaussianRandomLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.Noise3DLocatorTemplate; -import com.dfsek.terra.addons.feature.locator.config.NoiseLocatorTemplate; +import com.dfsek.terra.addons.feature.locator.config.SamplerLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.OrLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.PatternLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.RandomLocatorTemplate; @@ -64,7 +64,7 @@ public class LocatorAddon implements AddonInitializer { locatorRegistry.register("PATTERN", PatternLocatorTemplate::new); - locatorRegistry.register("NOISE", NoiseLocatorTemplate::new); + locatorRegistry.register("SAMPLER", SamplerLocatorTemplate::new); locatorRegistry.register("NOISE_3D", Noise3DLocatorTemplate::new); locatorRegistry.register("AND", AndLocatorTemplate::new); diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/NoiseLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java similarity index 78% rename from common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/NoiseLocatorTemplate.java rename to common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java index 5b4bc165d..6f27af76e 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/NoiseLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java @@ -12,18 +12,18 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.List; -import com.dfsek.terra.addons.feature.locator.locators.NoiseLocator; +import com.dfsek.terra.addons.feature.locator.locators.SamplerLocator; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.structure.feature.Locator; -public class NoiseLocatorTemplate implements ObjectTemplate { +public class SamplerLocatorTemplate implements ObjectTemplate { @Value("samplers") private @Meta List<@Meta NoiseSampler> samplers; @Override public Locator get() { - return new NoiseLocator(samplers); + return new SamplerLocator(samplers); } } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java similarity index 91% rename from common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java rename to common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java index 8dec61ec5..3c81d7371 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/NoiseLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java @@ -17,10 +17,10 @@ import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.world.chunk.generation.util.Column; -public class NoiseLocator implements Locator { +public class SamplerLocator implements Locator { private final List samplers; - public NoiseLocator(List samplers) { + public SamplerLocator(List samplers) { this.samplers = samplers; } From 68d262b6b6a142c9fef8d686d9796657d436b92e Mon Sep 17 00:00:00 2001 From: Astrash Date: Sat, 18 Dec 2021 10:11:40 +1100 Subject: [PATCH 10/10] Noise3DLocator -> Sampler3DLocator --- .../dfsek/terra/addons/feature/locator/LocatorAddon.java | 4 ++-- ...3DLocatorTemplate.java => Sampler3DLocatorTemplate.java} | 6 +++--- .../locators/{Noise3DLocator.java => Sampler3DLocator.java} | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/{Noise3DLocatorTemplate.java => Sampler3DLocatorTemplate.java} (77%) rename common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/{Noise3DLocator.java => Sampler3DLocator.java} (90%) diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 6c834182e..0d694f19e 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -13,7 +13,7 @@ import java.util.function.Supplier; import com.dfsek.terra.addons.feature.locator.config.AndLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.GaussianRandomLocatorTemplate; -import com.dfsek.terra.addons.feature.locator.config.Noise3DLocatorTemplate; +import com.dfsek.terra.addons.feature.locator.config.Sampler3DLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.SamplerLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.OrLocatorTemplate; import com.dfsek.terra.addons.feature.locator.config.PatternLocatorTemplate; @@ -65,7 +65,7 @@ public class LocatorAddon implements AddonInitializer { locatorRegistry.register("PATTERN", PatternLocatorTemplate::new); locatorRegistry.register("SAMPLER", SamplerLocatorTemplate::new); - locatorRegistry.register("NOISE_3D", Noise3DLocatorTemplate::new); + locatorRegistry.register("SAMPLER_3D", Sampler3DLocatorTemplate::new); locatorRegistry.register("AND", AndLocatorTemplate::new); locatorRegistry.register("OR", OrLocatorTemplate::new); diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Noise3DLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java similarity index 77% rename from common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Noise3DLocatorTemplate.java rename to common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java index 3cbd7b839..9a57fd14c 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Noise3DLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java @@ -10,18 +10,18 @@ package com.dfsek.terra.addons.feature.locator.config; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.locators.Noise3DLocator; +import com.dfsek.terra.addons.feature.locator.locators.Sampler3DLocator; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.structure.feature.Locator; -public class Noise3DLocatorTemplate implements ObjectTemplate { +public class Sampler3DLocatorTemplate implements ObjectTemplate { @Value("sampler") private @Meta NoiseSampler sampler; @Override public Locator get() { - return new Noise3DLocator(sampler); + return new Sampler3DLocator(sampler); } } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java similarity index 90% rename from common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java rename to common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java index d2829f10f..4449e9f8e 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Noise3DLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java @@ -13,10 +13,10 @@ import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.world.chunk.generation.util.Column; -public class Noise3DLocator implements Locator { +public class Sampler3DLocator implements Locator { private final NoiseSampler sampler; - public Noise3DLocator(NoiseSampler sampler) { + public Sampler3DLocator(NoiseSampler sampler) { this.sampler = sampler; }