diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java index 155822003..79882d70e 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java @@ -6,11 +6,11 @@ import com.dfsek.terra.api.math.noise.samplers.noise.fractal.BrownianMotionSampl public class BrownianMotionTemplate extends FractalTemplate { @Override public NoiseSampler apply(Long seed) { - BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.apply(seed)); - sampler.setGain(fractalGain); - sampler.setLacunarity(fractalLacunarity); - sampler.setOctaves(octaves); - sampler.setWeightedStrength(weightedStrength); + BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.get().apply(seed)); + sampler.setGain(fractalGain.get()); + sampler.setLacunarity(fractalLacunarity.get()); + sampler.setOctaves(octaves.get()); + sampler.setWeightedStrength(weightedStrength.get()); return sampler; } } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java index 5a1bb3602..c20594c3a 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java @@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.api.config.meta.MetaValue; import com.dfsek.terra.api.math.noise.samplers.noise.fractal.FractalNoiseFunction; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; @@ -9,20 +10,20 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; public abstract class FractalTemplate extends SamplerTemplate { @Value("octaves") @Default - protected int octaves = 3; + protected MetaValue octaves = MetaValue.of(3); @Value("gain") @Default - protected double fractalGain = 0.5D; + protected MetaValue fractalGain = MetaValue.of(0.5D); @Value("lacunarity") @Default - protected double fractalLacunarity = 2.0D; + protected MetaValue fractalLacunarity = MetaValue.of(2.0D); @Value("weighted-strength") @Default - protected double weightedStrength = 0.0D; + protected MetaValue weightedStrength = MetaValue.of(0.0D); @Value("function") - protected NoiseSeeded function; + protected MetaValue function; } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java index b0319155e..5ef4fbc08 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java @@ -12,11 +12,11 @@ public class PingPongTemplate extends FractalTemplate { @Override public NoiseSampler apply(Long seed) { - PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.apply(seed)); - sampler.setGain(fractalGain); - sampler.setLacunarity(fractalLacunarity); - sampler.setOctaves(octaves); - sampler.setWeightedStrength(weightedStrength); + PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.get().apply(seed)); + sampler.setGain(fractalGain.get()); + sampler.setLacunarity(fractalLacunarity.get()); + sampler.setOctaves(octaves.get()); + sampler.setWeightedStrength(weightedStrength.get()); sampler.setPingPongStrength(pingPong); return sampler; } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java index d74b34e91..02f143bd7 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java @@ -6,11 +6,11 @@ import com.dfsek.terra.api.math.noise.samplers.noise.fractal.RidgedFractalSample public class RidgedFractalTemplate extends FractalTemplate { @Override public NoiseSampler apply(Long seed) { - RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.apply(seed)); - sampler.setGain(fractalGain); - sampler.setLacunarity(fractalLacunarity); - sampler.setOctaves(octaves); - sampler.setWeightedStrength(weightedStrength); + RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.get().apply(seed)); + sampler.setGain(fractalGain.get()); + sampler.setLacunarity(fractalLacunarity.get()); + sampler.setOctaves(octaves.get()); + sampler.setWeightedStrength(weightedStrength.get()); return sampler; } }