From 7ccb12657178ec20889a91a16f8f721621f4e608 Mon Sep 17 00:00:00 2001 From: Astrash Date: Sat, 18 Dec 2021 10:05:59 +1100 Subject: [PATCH] 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; }