From 3aaedcf74f514aeeca49d8cbfc75fb4fcbbf729c Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Mon, 14 Jun 2021 13:33:57 -0700
Subject: [PATCH] normalizer meta

---
 .../templates/normalizer/ClampNormalizerTemplate.java    | 7 ++++---
 .../templates/normalizer/LinearNormalizerTemplate.java   | 7 ++++---
 .../templates/normalizer/NormalNormalizerTemplate.java   | 9 +++++----
 .../sampler/templates/normalizer/NormalizerTemplate.java | 3 ++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/ClampNormalizerTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/ClampNormalizerTemplate.java
index 1701e8223..7d3368404 100644
--- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/ClampNormalizerTemplate.java
+++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/ClampNormalizerTemplate.java
@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.ClampNormalizer;
 import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;
@@ -8,13 +9,13 @@ import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class ClampNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {
     @Value("max")
-    private double max;
+    private MetaValue<Double> max;
 
     @Value("min")
-    private double min;
+    private MetaValue<Double> min;
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new ClampNormalizer(function.apply(seed), min, max);
+        return new ClampNormalizer(function.get().apply(seed), min.get(), max.get());
     }
 }
diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/LinearNormalizerTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/LinearNormalizerTemplate.java
index 42b7cb2f8..b0607bb4a 100644
--- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/LinearNormalizerTemplate.java
+++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/LinearNormalizerTemplate.java
@@ -1,19 +1,20 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.LinearNormalizer;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class LinearNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {
     @Value("max")
-    private double max;
+    private MetaValue<Double> max;
 
     @Value("min")
-    private double min;
+    private MetaValue<Double> min;
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new LinearNormalizer(function.apply(seed), min, max);
+        return new LinearNormalizer(function.get().apply(seed), min.get(), max.get());
     }
 }
diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalNormalizerTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalNormalizerTemplate.java
index cdc9cc48f..abefa0b16 100644
--- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalNormalizerTemplate.java
+++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalNormalizerTemplate.java
@@ -2,23 +2,24 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
 
 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.NoiseSampler;
 import com.dfsek.terra.api.math.noise.normalizer.NormalNormalizer;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class NormalNormalizerTemplate extends NormalizerTemplate<NormalNormalizer> {
     @Value("mean")
-    private double mean;
+    private MetaValue<Double> mean;
 
     @Value("standard-deviation")
-    private double stdDev;
+    private MetaValue<Double> stdDev;
 
     @Value("groups")
     @Default
-    private int groups = 16384;
+    private MetaValue<Integer> groups = MetaValue.of(16384);
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new NormalNormalizer(function.apply(seed), groups, mean, stdDev);
+        return new NormalNormalizer(function.get().apply(seed), groups.get(), mean.get(), stdDev.get());
     }
 }
diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java
index 35ad8c7fe..e77daedcc 100644
--- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java
+++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java
@@ -1,11 +1,12 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.normalizer.Normalizer;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
 
 public abstract class NormalizerTemplate<T extends Normalizer> extends SamplerTemplate<T> {
     @Value("function")
-    protected NoiseSeeded function;
+    protected MetaValue<NoiseSeeded> function;
 }