fix funny ProbabilityCollection bug

We aren't sure what to do with Java versions yet, so I'm setting
source compatibility to Java 8 until we figure it out.

buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt

@@ -14,7 +14,7 @@ fun Project.configureCompilation() {
     apply(plugin = "idea")
 
     configure<JavaPluginConvention> {
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_16
     }
 

common/src/main/java/com/dfsek/terra/api/config/meta/MetaContext.java

@@ -0,0 +1,16 @@
+package com.dfsek.terra.api.config.meta;
+
+import com.dfsek.tectonic.exception.LoadException;
+
+import java.lang.reflect.Type;
+
+/**
+ * Context from which to pull {@link MetaValue}s
+ */
+public interface MetaContext {
+    default <T> T load(String meta, Class<T> clazz) throws LoadException {
+        return load(meta, (Type) clazz);
+    }
+
+    <T> T load(String meta, Type type) throws LoadException;
+}

common/src/main/java/com/dfsek/terra/api/config/meta/MetaValue.java

@@ -0,0 +1,9 @@
+package com.dfsek.terra.api.config.meta;
+
+import java.util.function.Supplier;
+
+public interface MetaValue<T> extends Supplier<T> {
+    static <T1> MetaValue<T1> of(T1 value) {
+        return () -> value;
+    }
+}

common/src/main/java/com/dfsek/terra/api/config/meta/type/MetaList.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.api.config.meta.type;
+
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+import java.util.List;
+
+public interface MetaList<T> extends MetaValue<List<T>> {
+}

common/src/main/java/com/dfsek/terra/api/config/meta/type/MetaMap.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.api.config.meta.type;
+
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+import java.util.Map;
+
+public interface MetaMap<K, V> extends MetaValue<Map<K, V>> {
+}

common/src/main/java/com/dfsek/terra/api/config/meta/type/MetaSet.java

@@ -0,0 +1,8 @@
+package com.dfsek.terra.api.config.meta.type;
+
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+import java.util.Set;
+
+public interface MetaSet<T> extends MetaValue<Set<T>> {
+}

common/src/main/java/com/dfsek/terra/api/config/meta/type/number/MetaNumber.java

@@ -0,0 +1,6 @@
+package com.dfsek.terra.api.config.meta.type.number;
+
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+public interface MetaNumber<T extends Number> extends MetaValue<T> {
+}

common/src/main/java/com/dfsek/terra/api/util/MapUtil.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.api.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public final class MapUtil {
+    public static <K1, V1, K2, V2, M extends Map<K2, V2>> M remap(Function<K1, K2> keys, Function<V1, V2> values, Map<K1, V1> in, Supplier<M> newMap) {
+        M map = newMap.get();
+        in.forEach((k, v) -> map.put(keys.apply(k), values.apply(v)));
+        return map;
+    }
+
+    public static <K1, V1, K2, V2> Map<K2, V2> remap(Function<K1, K2> keys, Function<V1, V2> values, Map<K1, V1> in) {
+        return remap(keys, values, in, HashMap::new);
+    }
+
+    public static <K, V1, V2> Map<K, V2> remapValues(Function<V1, V2> values, Map<K, V1> in) {
+        return remap(Function.identity(), values, in);
+    }
+}

common/src/main/java/com/dfsek/terra/api/util/MetaTokenizer.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.api.util;
+
+import java.io.Reader;
+import java.util.regex.Pattern;
+
+public class MetaTokenizer {
+    public MetaTokenizer(Reader in) {
+
+    }
+}

common/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollection.java

@@ -23,7 +23,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
 
     public ProbabilityCollection<E> add(E item, int probability) {
         if(!cont.containsKey(item)) size++;
-        cont.computeIfAbsent(item, i -> new MutableInteger(0)).increment();
+        cont.computeIfAbsent(item, i -> new MutableInteger(0)).add(probability);
         int oldLength = array.length;
         Object[] newArray = new Object[array.length + probability];
         System.arraycopy(array, 0, newArray, 0, array.length); // Expand array.
@@ -51,13 +51,19 @@ public class ProbabilityCollection<E> implements Collection<E> {
         ProbabilityCollection<T> newCollection = new ProbabilityCollection<>();
         newCollection.array = new Object[array.length];
 
+        Map<E, T> cache = new HashMap<>();
+
         for(int i = 0; i < array.length; i++) {
             if(carryNull && array[i] == null) continue;
-            newCollection.array[i] = mapper.apply((E) array[i]);
+            newCollection.array[i] = cache.computeIfAbsent((E) array[i], mapper);
         }
         return newCollection;
     }
 
+    public <T> ProbabilityCollection<T> map(Function<E, T> mapper) {
+        return map(mapper, true);
+    }
+
     public int getTotalProbability() {
         return array.length;
     }

common/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java

@@ -0,0 +1,23 @@
+package com.dfsek.terra.api.util.generic;
+
+import java.util.function.Supplier;
+
+public final class Lazy<T> {
+    private final Supplier<T> fetch;
+
+    private T value;
+
+    private boolean needsInit = true;
+
+    public Lazy(Supplier<T> fetch) {
+        this.fetch = fetch;
+    }
+
+    public T get() {
+        if(needsInit) {
+            value = fetch.get();
+            needsInit = false;
+        }
+        return value;
+    }
+}

common/src/main/java/com/dfsek/terra/config/GenericLoaders.java

@@ -25,11 +25,11 @@ import com.dfsek.terra.config.loaders.LinkedHashMapLoader;
 import com.dfsek.terra.config.loaders.MaterialSetLoader;
 import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader;
 import com.dfsek.terra.config.loaders.RangeLoader;
-import com.dfsek.terra.config.loaders.config.FloraLayerLoader;
-import com.dfsek.terra.config.loaders.config.GridSpawnLoader;
-import com.dfsek.terra.config.loaders.config.OreConfigLoader;
+import com.dfsek.terra.config.loaders.config.FloraLayerTemplate;
+import com.dfsek.terra.config.loaders.config.GridSpawnTemplate;
+import com.dfsek.terra.config.loaders.config.OreConfigTemplate;
 import com.dfsek.terra.config.loaders.config.OreHolderLoader;
-import com.dfsek.terra.config.loaders.config.TreeLayerLoader;
+import com.dfsek.terra.config.loaders.config.TreeLayerTemplate;
 import com.dfsek.terra.config.loaders.config.biome.BiomeProviderBuilderLoader;
 import com.dfsek.terra.config.loaders.config.biome.SourceBuilderLoader;
 import com.dfsek.terra.config.loaders.config.biome.StageBuilderLoader;
@@ -69,13 +69,13 @@ public class GenericLoaders implements LoaderRegistrar {
     public void register(TypeRegistry registry) {
         registry.registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader())
                 .registerLoader(Range.class, new RangeLoader())
-                .registerLoader(GridSpawn.class, new GridSpawnLoader())
+                .registerLoader(GridSpawn.class, GridSpawnTemplate::new)
                 .registerLoader(PaletteHolder.class, new PaletteHolderLoader())
                 .registerLoader(PaletteLayerHolder.class, new PaletteLayerLoader())
-                .registerLoader(FloraLayer.class, new FloraLayerLoader())
+                .registerLoader(FloraLayer.class, FloraLayerTemplate::new)
                 .registerLoader(Ore.Type.class, (t, o, l) -> Ore.Type.valueOf(o.toString()))
-                .registerLoader(OreConfig.class, new OreConfigLoader())
-                .registerLoader(TreeLayer.class, new TreeLayerLoader())
+                .registerLoader(OreConfig.class, OreConfigTemplate::new)
+                .registerLoader(TreeLayer.class, TreeLayerTemplate::new)
                 .registerLoader(MaterialSet.class, new MaterialSetLoader())
                 .registerLoader(OreHolder.class, new OreHolderLoader())
                 .registerLoader(ImageSamplerTemplate.class, ImageSamplerTemplate::new)

common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java

@@ -1,40 +0,0 @@
-package com.dfsek.terra.config.loaders.config;
-
-import com.dfsek.tectonic.exception.ConfigException;
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
-import com.dfsek.terra.api.util.collections.ProbabilityCollection;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.api.world.flora.Flora;
-import com.dfsek.terra.config.loaders.Types;
-import com.dfsek.terra.world.population.items.flora.FloraLayer;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-public class FloraLayerLoader implements TypeLoader<FloraLayer> {
-    @Override
-    public FloraLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
-        Map<String, Object> map = (Map<String, Object>) o;
-        double density = ((Number) map.get("density")).doubleValue();
-        Range range = configLoader.loadClass(Range.class, map.get("y"));
-        if(range == null) throw new LoadException("Flora range unspecified");
-        ProbabilityCollection<Flora> items = (ProbabilityCollection<Flora>) configLoader.loadType(Types.FLORA_PROBABILITY_COLLECTION_TYPE, map.get("items"));
-
-        NoiseSeeded sampler;
-        if(map.containsKey("distribution")) {
-            try {
-                sampler = configLoader.loadClass(NoiseSeeded.class, map.get("distribution"));
-            } catch(ConfigException e) {
-                throw new LoadException("Unable to load noise", e);
-            }
-            return new FloraLayer(density, range, items, sampler.apply(2403L));
-        }
-
-        return new FloraLayer(density, range, items, new WhiteNoiseSampler(2403));
-    }
-}

common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerTemplate.java

@@ -0,0 +1,44 @@
+package com.dfsek.terra.config.loaders.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.config.meta.MetaValue;
+import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
+import com.dfsek.terra.api.util.seeded.NoiseSeeded;
+import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.world.population.items.flora.FloraLayer;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class FloraLayerTemplate implements ObjectTemplate<FloraLayer> {
+    @Value("density")
+    private MetaValue<Double> density;
+
+    @Value("y")
+    private MetaValue<Range> range;
+
+    @Value("items")
+    private ProbabilityCollection<Flora> items;
+
+    @Value("distribution")
+    @Default
+    private MetaValue<NoiseSeeded> sampler = MetaValue.of(new NoiseSeeded() {
+        @Override
+        public NoiseSampler apply(Long seed) {
+            return new WhiteNoiseSampler(seed.intValue());
+        }
+
+        @Override
+        public int getDimensions() {
+            return 2;
+        }
+    });
+
+    @Override
+    public FloraLayer get() {
+        return new FloraLayer(density.get(), range.get(), items, sampler.get().apply(2403L));
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java

@@ -1,17 +0,0 @@
-package com.dfsek.terra.config.loaders.config;
-
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.math.GridSpawn;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-public class GridSpawnLoader implements TypeLoader<GridSpawn> {
-    @Override
-    public GridSpawn load(Type type, Object o, ConfigLoader configLoader) {
-        Map<String, Integer> map = (Map<String, Integer>) o;
-        return new GridSpawn(map.get("width"), map.get("padding"), map.getOrDefault("salt", 0));
-    }
-}

common/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnTemplate.java

@@ -0,0 +1,25 @@
+package com.dfsek.terra.config.loaders.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.config.meta.MetaValue;
+import com.dfsek.terra.api.math.GridSpawn;
+
+@SuppressWarnings("FieldMayBeFinal")
+public class GridSpawnTemplate implements ObjectTemplate<GridSpawn> {
+    @Value("width")
+    private MetaValue<Integer> width;
+
+    @Value("padding")
+    private MetaValue<Integer> padding;
+
+    @Value("salt")
+    @Default
+    private MetaValue<Integer> salt = MetaValue.of(0);
+
+    @Override
+    public GridSpawn get() {
+        return new GridSpawn(width.get(), padding.get(), salt.get());
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java

@@ -1,20 +0,0 @@
-package com.dfsek.terra.config.loaders.config;
-
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.world.population.items.ores.OreConfig;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-public class OreConfigLoader implements TypeLoader<OreConfig> {
-    @Override
-    public OreConfig load(Type type, Object o, ConfigLoader configLoader) {
-        Map<String, Integer> map = (Map<String, Integer>) o;
-        Range amount = new Range(map.get("min"), map.get("max"));
-        Range height = new Range(map.get("min-height"), map.get("max-height"));
-        return new OreConfig(amount, height);
-    }
-}

common/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigTemplate.java

@@ -0,0 +1,27 @@
+package com.dfsek.terra.config.loaders.config;
+
+import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
+import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.world.population.items.ores.OreConfig;
+
+@SuppressWarnings("unused")
+public class OreConfigTemplate implements ObjectTemplate<OreConfig> {
+    @Value("min")
+    private MetaValue<Integer> min;
+
+    @Value("max")
+    private MetaValue<Integer> max;
+
+    @Value("min-height")
+    private MetaValue<Integer> minHeight;
+
+    @Value("max-height")
+    private MetaValue<Integer> maxHeight;
+
+    @Override
+    public OreConfig get() {
+        return new OreConfig(new Range(min.get(), max.get()), new Range(minHeight.get(), maxHeight.get()));
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java

@@ -1,34 +0,0 @@
-package com.dfsek.terra.config.loaders.config;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
-import com.dfsek.terra.api.platform.world.Tree;
-import com.dfsek.terra.api.util.collections.ProbabilityCollection;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.config.loaders.Types;
-import com.dfsek.terra.world.population.items.tree.TreeLayer;
-
-import java.lang.reflect.Type;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-public class TreeLayerLoader implements TypeLoader<TreeLayer> {
-    @Override
-    public TreeLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
-        Map<String, Object> map = (Map<String, Object>) o;
-        double density = ((Number) map.get("density")).doubleValue();
-        Range range = configLoader.loadClass(Range.class, map.get("y"));
-        if(range == null) throw new LoadException("Tree range unspecified");
-        ProbabilityCollection<Tree> items = (ProbabilityCollection<Tree>) configLoader.loadType(Types.TREE_PROBABILITY_COLLECTION_TYPE, map.get("items"));
-
-        if(map.containsKey("distribution")) {
-            NoiseSeeded noise = configLoader.loadClass(NoiseSeeded.class, map.get("distribution"));
-            return new TreeLayer(density, range, items, noise.apply(2403L));
-        }
-
-        return new TreeLayer(density, range, items, new WhiteNoiseSampler(2403));
-    }
-}

common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerTemplate.java

@@ -0,0 +1,44 @@
+package com.dfsek.terra.config.loaders.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.config.meta.MetaValue;
+import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
+import com.dfsek.terra.api.platform.world.Tree;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
+import com.dfsek.terra.api.util.seeded.NoiseSeeded;
+import com.dfsek.terra.world.population.items.tree.TreeLayer;
+
+@SuppressWarnings({"FieldMayBeFinal", "unused"})
+public class TreeLayerTemplate implements ObjectTemplate<TreeLayer> {
+    @Value("density")
+    private MetaValue<Double> density;
+
+    @Value("y")
+    private MetaValue<Range> range;
+
+    @Value("items")
+    private ProbabilityCollection<Tree> items;
+
+    @Value("distribution")
+    @Default
+    private MetaValue<NoiseSeeded> sampler = MetaValue.of(new NoiseSeeded() {
+        @Override
+        public NoiseSampler apply(Long seed) {
+            return new WhiteNoiseSampler(seed.intValue());
+        }
+
+        @Override
+        public int getDimensions() {
+            return 2;
+        }
+    });
+
+    @Override
+    public TreeLayer get() {
+        return new TreeLayer(density.get(), range.get(), items, sampler.get().apply(2403L));
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomePipelineTemplate.java

@@ -3,6 +3,7 @@ package com.dfsek.terra.config.loaders.config.biome.templates.provider;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.seeded.SourceSeeded;
 import com.dfsek.terra.api.util.seeded.StageSeeded;
 import com.dfsek.terra.api.world.biome.pipeline.BiomePipeline;
@@ -16,13 +17,13 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
     private final TerraPlugin main;
     @Value("pipeline.initial-size")
     @Default
-    private int initialSize = 2;
+    private MetaValue<Integer> initialSize = MetaValue.of(2);
 
     @Value("pipeline.stages")
-    private List<StageSeeded> stages;
+    private List<MetaValue<StageSeeded>> stages;
 
     @Value("pipeline.source")
-    private SourceSeeded source;
+    private MetaValue<SourceSeeded> source;
 
     public BiomePipelineTemplate(TerraPlugin main) {
         this.main = main;
@@ -30,9 +31,9 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
 
     @Override
     public BiomeProvider build(long seed) {
-        BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);
-        stages.forEach(biomePipelineBuilder::addStage);
-        BiomePipeline pipeline = biomePipelineBuilder.build(source.apply(seed), seed);
-        return new StandardBiomeProvider(pipeline, main, resolution, blend.apply(seed), blendAmp, (int) seed);
+        BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize.get());
+        stages.stream().map(MetaValue::get).forEach(biomePipelineBuilder::addStage);
+        BiomePipeline pipeline = biomePipelineBuilder.build(source.get().apply(seed), seed);
+        return new StandardBiomeProvider(pipeline, main, resolution.get(), blend.get().apply(seed), blendAmp.get(), (int) seed);
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java

@@ -3,6 +3,7 @@ package com.dfsek.terra.config.loaders.config.biome.templates.provider;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@@ -11,10 +12,11 @@ import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvider.BiomeProviderBuilder>, BiomeProvider.BiomeProviderBuilder {
     @Value("resolution")
     @Default
-    protected int resolution = 1;
+    protected MetaValue<Integer> resolution = MetaValue.of(1);
+
     @Value("blend.noise")
     @Default
-    protected NoiseSeeded blend = new NoiseSeeded() {
+    protected MetaValue<NoiseSeeded> blend = MetaValue.of(new NoiseSeeded() {
         @Override
         public NoiseSampler apply(Long seed) {
             return new ConstantSampler(0);
@@ -24,12 +26,14 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
         public int getDimensions() {
             return 2;
         }
-    };
+    });
+
     @Value("blend.amplitude")
     @Default
-    protected double blendAmp = 0d;
+    protected MetaValue<Double> blendAmp = MetaValue.of(0d);
+
     @Value("type")
-    BiomeProvider.Type type;
+    protected MetaValue<BiomeProvider.Type> type;
 
     @Override
     public BiomeProvider.BiomeProviderBuilder get() {

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/ImageProviderTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.provider;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.biome.provider.ImageBiomeProvider;
@@ -9,13 +10,14 @@ import com.dfsek.terra.config.builder.BiomeBuilder;
 import java.awt.image.BufferedImage;
 import java.util.stream.Collectors;
 
+@SuppressWarnings("unused")
 public class ImageProviderTemplate extends BiomeProviderTemplate {
     private final Registry<BiomeBuilder> biomes;
     @Value("image.name")
-    private BufferedImage image;
+    private MetaValue<BufferedImage> image;
 
     @Value("image.align")
-    private ImageBiomeProvider.Align align;
+    private MetaValue<ImageBiomeProvider.Align> align;
 
     public ImageProviderTemplate(Registry<BiomeBuilder> set) {
         this.biomes = set;
@@ -23,6 +25,6 @@ public class ImageProviderTemplate extends BiomeProviderTemplate {
 
     @Override
     public BiomeProvider build(long seed) {
-        return new ImageBiomeProvider(biomes.entries().stream().map(biomeBuilder -> biomeBuilder.apply(seed)).collect(Collectors.toSet()), image, resolution, align);
+        return new ImageBiomeProvider(biomes.entries().stream().map(biomeBuilder -> biomeBuilder.apply(seed)).collect(Collectors.toSet()), image.get(), resolution.get(), align.get());
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/SingleBiomeProviderTemplate.java

@@ -1,19 +1,21 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.provider;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 import com.dfsek.terra.api.world.biome.provider.SingleBiomeProvider;
 import com.dfsek.terra.config.builder.BiomeBuilder;
 
+@SuppressWarnings("unused")
 public class SingleBiomeProviderTemplate extends BiomeProviderTemplate {
     @Value("biome")
-    private BiomeBuilder biome;
+    private MetaValue<BiomeBuilder> biome;
 
     public SingleBiomeProviderTemplate() {
     }
 
     @Override
     public BiomeProvider build(long seed) {
-        return new SingleBiomeProvider(biome.apply(seed));
+        return new SingleBiomeProvider(biome.get().apply(seed));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/NoiseSourceTemplate.java

@@ -1,21 +1,23 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.source;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.biome.pipeline.source.BiomeSource;
 import com.dfsek.terra.api.world.biome.pipeline.source.RandomSource;
 import com.dfsek.terra.config.builder.BiomeBuilder;
 
+@SuppressWarnings("unused")
 public class NoiseSourceTemplate extends SourceTemplate {
     @Value("noise")
-    private NoiseSeeded noise;
+    private MetaValue<NoiseSeeded> noise;
 
     @Value("biomes")
-    private ProbabilityCollection<BiomeBuilder> biomes;
+    private ProbabilityCollection<MetaValue<BiomeBuilder>> biomes;
 
     @Override
     public BiomeSource apply(Long seed) {
-        return new RandomSource(biomes.map((biome) -> biome.apply(seed), false), noise.apply(seed));
+        return new RandomSource(biomes.map((biome) -> biome.get().apply(seed), false), noise.get().apply(seed));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/StageTemplate.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.util.seeded.SeededBuilder;
 import com.dfsek.terra.api.util.seeded.StageSeeded;
@@ -9,7 +10,7 @@ import com.dfsek.terra.api.world.biome.pipeline.stages.Stage;
 
 public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {
     @Value("noise")
-    protected NoiseSeeded noise;
+    protected MetaValue<NoiseSeeded> noise;
 
     @Override
     public StageSeeded get() {

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java

@@ -8,6 +8,6 @@ import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate
 public class ExpanderStageTemplate extends StageTemplate {
     @Override
     public Stage apply(Long seed) {
-        return new ExpanderStage(new FractalExpander(noise.apply(seed)));
+        return new ExpanderStage(new FractalExpander(noise.get().apply(seed)));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
@@ -13,24 +14,24 @@ import java.util.Map;
 @SuppressWarnings("unused")
 public class BorderListMutatorTemplate extends MutatorStageTemplate {
     @Value("from")
-    private String from;
+    private MetaValue<String> from;
 
     @Value("default-replace")
-    private String defaultReplace;
+    private MetaValue<String> defaultReplace;
 
     @Value("default-to")
-    private ProbabilityCollection<BiomeBuilder> defaultTo;
+    private ProbabilityCollection<MetaValue<BiomeBuilder>> defaultTo;
 
     @Value("replace")
-    private Map<BiomeBuilder, ProbabilityCollection<BiomeBuilder>> replace;
+    private Map<BiomeBuilder, ProbabilityCollection<MetaValue<BiomeBuilder>>> replace;
 
 
     @Override
     public BiomeMutator build(long seed) {
         Map<TerraBiome, ProbabilityCollection<TerraBiome>> replaceMap = new HashMap<>();
 
-        replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.apply(seed), replacements.map(replacement -> replacement.apply(seed), true)));
+        replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.apply(seed), replacements.map(MetaValue::get).map(replacement -> replacement.apply(seed))));
 
-        return new BorderListMutator(replaceMap, from, defaultReplace, noise.apply(seed), defaultTo.map(biomeBuilder -> biomeBuilder.apply(seed), true));
+        return new BorderListMutator(replaceMap, from.get(), defaultReplace.get(), noise.get().apply(seed), defaultTo.map(MetaValue::get).map(biomeBuilder -> biomeBuilder.apply(seed)));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BorderMutator;
@@ -9,16 +10,16 @@ import com.dfsek.terra.config.builder.BiomeBuilder;
 @SuppressWarnings("unused")
 public class BorderMutatorTemplate extends MutatorStageTemplate {
     @Value("from")
-    private String from;
+    private MetaValue<String> from;
 
     @Value("replace")
-    private String replace;
+    private MetaValue<String> replace;
 
     @Value("to")
-    private ProbabilityCollection<BiomeBuilder> to;
+    private ProbabilityCollection<MetaValue<BiomeBuilder>> to;
 
     @Override
     public BiomeMutator build(long seed) {
-        return new BorderMutator(from, replace, noise.apply(seed), to.map(biomeBuilder -> biomeBuilder.apply(seed), true));
+        return new BorderMutator(from.get(), replace.get(), noise.get().apply(seed), to.map(MetaValue::get).map(biomeBuilder -> biomeBuilder.apply(seed)));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
@@ -13,20 +14,20 @@ import java.util.Map;
 @SuppressWarnings("unused")
 public class ReplaceListMutatorTemplate extends MutatorStageTemplate {
     @Value("default-from")
-    private String defaultFrom;
+    private MetaValue<String> defaultFrom;
 
     @Value("default-to")
-    private ProbabilityCollection<BiomeBuilder> defaultTo;
+    private ProbabilityCollection<MetaValue<BiomeBuilder>> defaultTo;
 
     @Value("to")
-    private Map<BiomeBuilder, ProbabilityCollection<BiomeBuilder>> replace;
+    private Map<BiomeBuilder, ProbabilityCollection<MetaValue<BiomeBuilder>>> replace;
 
     @Override
     public BiomeMutator build(long seed) {
         Map<TerraBiome, ProbabilityCollection<TerraBiome>> replaceMap = new HashMap<>();
 
-        replace.forEach((biomeBuilder, biomeBuilders) -> replaceMap.put(biomeBuilder.apply(seed), biomeBuilders.map(builder -> builder.apply(seed), true)));
+        replace.forEach((biomeBuilder, biomeBuilders) -> replaceMap.put(biomeBuilder.apply(seed), biomeBuilders.map(MetaValue::get).map(builder -> builder.apply(seed))));
 
-        return new ReplaceListMutator(replaceMap, defaultFrom, defaultTo.map(biomeBuilder -> biomeBuilder.apply(seed), true), noise.apply(seed));
+        return new ReplaceListMutator(replaceMap, defaultFrom.get(), defaultTo.map(MetaValue::get).map(biomeBuilder -> biomeBuilder.apply(seed)), noise.get().apply(seed));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.api.world.biome.pipeline.mutator.ReplaceMutator;
@@ -9,13 +10,13 @@ import com.dfsek.terra.config.builder.BiomeBuilder;
 @SuppressWarnings("unused")
 public class ReplaceMutatorTemplate extends MutatorStageTemplate {
     @Value("from")
-    private String from;
+    private MetaValue<String> from;
 
     @Value("to")
-    private ProbabilityCollection<BiomeBuilder> to;
+    private ProbabilityCollection<MetaValue<BiomeBuilder>> to;
 
     @Override
     public BiomeMutator build(long seed) {
-        return new ReplaceMutator(from, to.map(biomeBuilder -> biomeBuilder.apply(seed), true), noise.apply(seed));
+        return new ReplaceMutator(from.get(), to.map(MetaValue::get).map(biomeBuilder -> biomeBuilder.apply(seed)), noise.get().apply(seed));
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/SmoothMutatorTemplate.java

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

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java

@@ -1,17 +1,20 @@
 package com.dfsek.terra.config.loaders.config.sampler;
 
+import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.registry.config.NoiseRegistry;
 
 import java.lang.reflect.Type;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Supplier;
 
 @SuppressWarnings("unchecked")
 public class NoiseSamplerBuilderLoader implements TypeLoader<NoiseSeeded> {
@@ -25,11 +28,26 @@ public class NoiseSamplerBuilderLoader implements TypeLoader<NoiseSeeded> {
     public NoiseSeeded load(Type t, Object c, ConfigLoader loader) throws LoadException {
         Map<String, Object> map = (Map<String, Object>) c;
         try {
-            ObjectTemplate<NoiseSeeded> normalizerTemplate = noiseRegistry.get(((String) map.get("type")).toUpperCase(Locale.ROOT)).get();
-            loader.load(normalizerTemplate, new Configuration(map));
+            Template typeTemplate = new Template();
+            Configuration configuration = new Configuration(map);
+            loader.load(typeTemplate, configuration);
+            ObjectTemplate<NoiseSeeded> normalizerTemplate = typeTemplate.get().get();
+            loader.load(normalizerTemplate, configuration);
             return normalizerTemplate.get();
         } catch(ConfigException e) {
             throw new LoadException("Unable to load noise function: ", e);
         }
     }
+
+    @SuppressWarnings("unused")
+    private class Template implements ObjectTemplate<Supplier<ObjectTemplate<NoiseSeeded>>> {
+        @Value("type")
+        private MetaValue<String> type;
+
+
+        @Override
+        public Supplier<ObjectTemplate<NoiseSeeded>> get() {
+            return noiseRegistry.get(type.get().toUpperCase(Locale.ROOT));
+        }
+    }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates;
 
 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.samplers.DomainWarpedSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@@ -9,21 +10,21 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class DomainWarpTemplate extends SamplerTemplate<DomainWarpedSampler> {
     @Value("warp")
-    private NoiseSeeded warp;
+    private MetaValue<NoiseSeeded> warp;
 
     @Value("function")
-    private NoiseSeeded function;
+    private MetaValue<NoiseSeeded> function;
 
     @Value("salt")
     @Default
-    private int salt = 0;
+    private MetaValue<Integer> salt = MetaValue.of(0);
 
     @Value("amplitude")
     @Default
-    private double amplitude = 1;
+    private MetaValue<Double> amplitude = MetaValue.of(1d);
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new DomainWarpedSampler(function.apply(seed), warp.apply(seed), (int) (seed + salt), amplitude);
+        return new DomainWarpedSampler(function.get().apply(seed), warp.get().apply(seed), (int) (seed + salt.get()), amplitude.get());
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/ImageSamplerTemplate.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.config.loaders.config.sampler.templates;
 
 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.samplers.ImageSampler;
 
@@ -10,16 +11,16 @@ import java.awt.image.BufferedImage;
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {
 
     @Value("image")
-    private BufferedImage image;
+    private MetaValue<BufferedImage> image;
 
     @Value("frequency")
-    private double frequency;
+    private MetaValue<Double> frequency;
 
     @Value("channel")
-    private ImageSampler.Channel channel;
+    private MetaValue<ImageSampler.Channel> channel;
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new ImageSampler(image, channel, frequency);
+        return new ImageSampler(image.get(), channel.get(), frequency.get());
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java

@@ -4,6 +4,7 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.KernelSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@@ -14,18 +15,18 @@ import java.util.List;
 public class KernelTemplate extends SamplerTemplate<KernelSampler> implements ValidatedConfigTemplate {
 
     @Value("kernel")
-    private List<List<Double>> kernel;
+    private List<List<MetaValue<Double>>> kernel;
 
     @Value("factor")
     @Default
-    private double factor = 1;
+    private MetaValue<Double> factor = MetaValue.of(1d);
 
     @Value("function")
-    private NoiseSeeded function;
+    private MetaValue<NoiseSeeded> function;
 
     @Value("frequency")
     @Default
-    private double frequency = 1;
+    private MetaValue<Double> frequency = MetaValue.of(1d);
 
     @Override
     public NoiseSampler apply(Long seed) {
@@ -33,12 +34,12 @@ public class KernelTemplate extends SamplerTemplate<KernelSampler> implements Va
 
         for(int x = 0; x < kernel.size(); x++) {
             for(int y = 0; y < kernel.get(x).size(); y++) {
-                k[x][y] = kernel.get(x).get(y) * factor;
+                k[x][y] = kernel.get(x).get(y).get() * factor.get();
             }
         }
 
-        KernelSampler sampler = new KernelSampler(k, function.apply(seed));
-        sampler.setFrequency(frequency);
+        KernelSampler sampler = new KernelSampler(k, function.get().apply(seed));
+        sampler.setFrequency(frequency.get());
         return sampler;
     }
 

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/SamplerTemplate.java

@@ -5,6 +5,7 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 
@@ -12,15 +13,15 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 public abstract class SamplerTemplate<T extends NoiseSampler> implements ValidatedConfigTemplate, ObjectTemplate<NoiseSeeded>, NoiseSeeded {
     @Value("dimensions")
     @Default
-    private int dimensions = 2;
+    private MetaValue<Integer> dimensions = MetaValue.of(2);
 
     public int getDimensions() {
-        return dimensions;
+        return dimensions.get();
     }
 
     @Override
     public boolean validate() throws ValidationException {
-        if(dimensions != 2 && dimensions != 3) throw new ValidationException("Illegal amount of dimensions: " + dimensions);
+        if(dimensions.get() != 2 && dimensions.get() != 3) throw new ValidationException("Illegal amount of dimensions: " + dimensions);
         return true;
     }
 

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
 
 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.samplers.noise.CellularSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler;
@@ -11,20 +12,20 @@ import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
     @Value("distance")
     @Default
-    private CellularSampler.DistanceFunction cellularDistanceFunction = CellularSampler.DistanceFunction.EuclideanSq;
+    private MetaValue<CellularSampler.DistanceFunction> cellularDistanceFunction = MetaValue.of(CellularSampler.DistanceFunction.EuclideanSq);
 
     @Value("return")
     @Default
-    private CellularSampler.ReturnType cellularReturnType = CellularSampler.ReturnType.Distance;
+    private MetaValue<CellularSampler.ReturnType> cellularReturnType = MetaValue.of(CellularSampler.ReturnType.Distance);
 
     @Value("jitter")
     @Default
-    private double cellularJitter = 1.0D;
+    private MetaValue<Double> cellularJitter = MetaValue.of(1.0D);
 
 
     @Value("lookup")
     @Default
-    private NoiseSeeded lookup = new NoiseSeeded() {
+    private MetaValue<NoiseSeeded> lookup = MetaValue.of(new NoiseSeeded() {
         @Override
         public NoiseSampler apply(Long seed) {
 
@@ -35,16 +36,16 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
         public int getDimensions() {
             return 2;
         }
-    };
+    });
 
     @Override
     public NoiseSampler apply(Long seed) {
-        CellularSampler sampler = new CellularSampler((int) (long) seed + salt);
-        sampler.setNoiseLookup(lookup.apply(seed));
-        sampler.setFrequency(frequency);
-        sampler.setJitterModifier(cellularJitter);
-        sampler.setReturnType(cellularReturnType);
-        sampler.setDistanceFunction(cellularDistanceFunction);
+        CellularSampler sampler = new CellularSampler((int) (long) seed + salt.get());
+        sampler.setNoiseLookup(lookup.get().apply(seed));
+        sampler.setFrequency(frequency.get());
+        sampler.setJitterModifier(cellularJitter.get());
+        sampler.setReturnType(cellularReturnType.get());
+        sampler.setDistanceFunction(cellularDistanceFunction.get());
         return sampler;
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
 
 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.samplers.noise.ConstantSampler;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
@@ -10,10 +11,10 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
 public class ConstantNoiseTemplate extends SamplerTemplate<ConstantSampler> {
     @Value("value")
     @Default
-    private double value = 0d;
+    private MetaValue<Double> value = MetaValue.of(0d);
 
     @Override
     public NoiseSampler apply(Long seed) {
-        return new ConstantSampler(value);
+        return new ConstantSampler(value.get());
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java

@@ -8,12 +8,13 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.ExpressionFunction;
-import com.dfsek.terra.api.math.paralithic.BlankFunction;
 import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
+import com.dfsek.terra.api.util.MapUtil;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
@@ -27,24 +28,24 @@ import java.util.Map;
 public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFunction> implements ValidatedConfigTemplate {
     @Value("variables")
     @Default
-    private Map<String, Double> vars = new HashMap<>();
+    private Map<String, MetaValue<Double>> vars = new HashMap<>();
 
     @Value("equation")
-    private String equation;
+    private MetaValue<String> equation;
 
     @Value("functions")
     @Default
-    private LinkedHashMap<String, NoiseSeeded> functions = new LinkedHashMap<>();
+    private LinkedHashMap<String, MetaValue<NoiseSeeded>> functions = new LinkedHashMap<>();
 
     @Value("expressions")
     @Default
-    private LinkedHashMap<String, FunctionTemplate> expressions = new LinkedHashMap<>();
+    private LinkedHashMap<String, MetaValue<FunctionTemplate>> expressions = new LinkedHashMap<>();
 
     @Override
     public NoiseSampler apply(Long seed) {
         try {
             Map<String, Function> noiseFunctionMap = generateFunctions(seed);
-            return new ExpressionFunction(noiseFunctionMap, equation, vars);
+            return new ExpressionFunction(noiseFunctionMap, equation.get(), MapUtil.remapValues(MetaValue::get, vars));
         } catch(ParseException e) {
             throw new IllegalStateException(e);
         }
@@ -54,7 +55,7 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
     public boolean validate() throws ValidationException {
         try {
             Map<String, Function> noiseFunctionMap = generateFunctions(0L);
-            new ExpressionFunction(noiseFunctionMap, equation, vars);
+            new ExpressionFunction(noiseFunctionMap, equation.get(), MapUtil.remapValues(MetaValue::get, vars));
         } catch(ParseException e) {
             throw new ValidationException("Errors occurred while parsing noise equation: ", e);
         }
@@ -64,14 +65,14 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
     private Map<String, Function> generateFunctions(Long seed) throws ParseException {
         Map<String, Function> noiseFunctionMap = new HashMap<>();
 
-        for(Map.Entry<String, FunctionTemplate> entry : expressions.entrySet()) {
+        for(Map.Entry<String, FunctionTemplate> entry : MapUtil.remapValues(MetaValue::get, expressions).entrySet()) {
             noiseFunctionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue(), new Parser(), new Scope()));
         }
 
         functions.forEach((id, function) -> {
-            if(function.getDimensions() == 2) {
-                noiseFunctionMap.put(id, new NoiseFunction2(function.apply(seed)));
-            } else noiseFunctionMap.put(id, new NoiseFunction3(function.apply(seed)));
+            if(function.get().getDimensions() == 2) {
+                noiseFunctionMap.put(id, new NoiseFunction2(function.get().apply(seed)));
+            } else noiseFunctionMap.put(id, new NoiseFunction3(function.get().apply(seed)));
         });
 
         return noiseFunctionMap;

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/GaborNoiseTemplate.java

@@ -2,39 +2,41 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
 
 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.samplers.noise.GaborNoiseSampler;
 
+@SuppressWarnings("FieldMayBeFinal")
 public class GaborNoiseTemplate extends NoiseTemplate<GaborNoiseSampler> {
     @Value("rotation")
     @Default
-    private double rotation = 0.25;
+    private MetaValue<Double> rotation = MetaValue.of(0.25);
 
     @Value("isotropic")
     @Default
-    private boolean isotropic = true;
+    private MetaValue<Boolean> isotropic = MetaValue.of(true);
 
     @Value("deviation")
     @Default
-    private double deviation = 1.0;
+    private MetaValue<Double> deviation = MetaValue.of(1.0);
 
     @Value("impulses")
     @Default
-    private double impulses = 64d;
+    private MetaValue<Double> impulses = MetaValue.of(64d);
 
     @Value("frequency_0")
     @Default
-    private double f0 = 0.625;
+    private MetaValue<Double> f0 = MetaValue.of(0.625);
 
     @Override
     public NoiseSampler apply(Long seed) {
-        GaborNoiseSampler gaborNoiseSampler = new GaborNoiseSampler((int) (long) seed + salt);
-        gaborNoiseSampler.setFrequency(frequency);
-        gaborNoiseSampler.setRotation(rotation);
-        gaborNoiseSampler.setIsotropic(isotropic);
-        gaborNoiseSampler.setDeviation(deviation);
-        gaborNoiseSampler.setImpulsesPerKernel(impulses);
-        gaborNoiseSampler.setFrequency0(f0);
+        GaborNoiseSampler gaborNoiseSampler = new GaborNoiseSampler((int) (long) seed + salt.get());
+        gaborNoiseSampler.setFrequency(frequency.get());
+        gaborNoiseSampler.setRotation(rotation.get());
+        gaborNoiseSampler.setIsotropic(isotropic.get());
+        gaborNoiseSampler.setDeviation(deviation.get());
+        gaborNoiseSampler.setImpulsesPerKernel(impulses.get());
+        gaborNoiseSampler.setFrequency0(f0.get());
         return gaborNoiseSampler;
     }
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
 
 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.NoiseFunction;
 import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
 
@@ -9,9 +10,9 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
 public abstract class NoiseTemplate<T extends NoiseFunction> extends SamplerTemplate<T> {
     @Value("frequency")
     @Default
-    protected double frequency = 0.02d;
+    protected MetaValue<Double> frequency = MetaValue.of(0.02d);
 
     @Value("salt")
     @Default
-    protected int salt = 0;
+    protected MetaValue<Integer> salt = MetaValue.of(0);
 }

common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/SimpleNoiseTemplate.java

@@ -14,8 +14,8 @@ public class SimpleNoiseTemplate extends NoiseTemplate<NoiseFunction> {
 
     @Override
     public NoiseSampler apply(Long seed) {
-        NoiseFunction sampler = samplerSupplier.apply((int) (long) seed + salt);
-        sampler.setFrequency(frequency);
+        NoiseFunction sampler = samplerSupplier.apply((int) (long) seed + salt.get());
+        sampler.setFrequency(frequency.get());
         return sampler;
     }
 }

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<BrownianMotionSampler> {
     @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;
     }
 }

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<T extends FractalNoiseFunction> extends SamplerTemplate<T> {
     @Value("octaves")
     @Default
-    protected int octaves = 3;
+    protected MetaValue<Integer> octaves = MetaValue.of(3);
 
     @Value("gain")
     @Default
-    protected double fractalGain = 0.5D;
+    protected MetaValue<Double> fractalGain = MetaValue.of(0.5D);
 
     @Value("lacunarity")
     @Default
-    protected double fractalLacunarity = 2.0D;
+    protected MetaValue<Double> fractalLacunarity = MetaValue.of(2.0D);
 
     @Value("weighted-strength")
     @Default
-    protected double weightedStrength = 0.0D;
+    protected MetaValue<Double> weightedStrength = MetaValue.of(0.0D);
 
     @Value("function")
-    protected NoiseSeeded function;
+    protected MetaValue<NoiseSeeded> function;
 }

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<PingPongSampler> {
 
     @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;
     }

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<RidgedFractalSampler> {
     @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;
     }
 }

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());
     }
 }

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());
     }
 }

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());
     }
 }

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;
 }

common/src/main/java/com/dfsek/terra/config/loaders/meta/GenericMetaValueLoader.java

@@ -0,0 +1,37 @@
+package com.dfsek.terra.config.loaders.meta;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.api.config.meta.MetaContext;
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+public class GenericMetaValueLoader extends MetaValueLoader<MetaValue<Object>, Object> {
+    public GenericMetaValueLoader(MetaContext context) {
+        super(context);
+    }
+
+    @Override
+    public MetaValue<Object> load(Type type, Object c, ConfigLoader loader) throws LoadException {
+        if(type instanceof ParameterizedType) {
+            ParameterizedType pType = (ParameterizedType) type;
+            Type generic = pType.getActualTypeArguments()[0];
+            if(c instanceof String) {
+                String possibleMeta = (String) c;
+                if(possibleMeta.startsWith("$")) {
+                    String meta = possibleMeta.substring(1);
+                    return MetaValue.of(context.load(meta, generic));
+                }
+            }
+
+            return MetaValue.of(loader.loadType(generic, c));
+        } else throw new LoadException("Unable to load config! Could not retrieve parameterized type: " + type);
+    }
+
+    @Override
+    public Object get() {
+        return null;
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/meta/MetaListLoader.java

@@ -0,0 +1,26 @@
+package com.dfsek.terra.config.loaders.meta;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.api.config.meta.MetaContext;
+import com.dfsek.terra.api.config.meta.type.MetaList;
+import com.dfsek.terra.api.util.GlueList;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class MetaListLoader extends MetaValueLoader<MetaList<Object>, List<Object>> {
+    protected MetaListLoader(MetaContext context) {
+        super(context);
+    }
+
+    @Override
+    public MetaList<Object> load(Type t, Object c, ConfigLoader loader) throws LoadException {
+        return null;
+    }
+
+    @Override
+    public List<Object> get() {
+        return new GlueList<>();
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/meta/MetaMapLoader.java

@@ -0,0 +1,26 @@
+package com.dfsek.terra.config.loaders.meta;
+
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.api.config.meta.MetaContext;
+import com.dfsek.terra.api.config.meta.type.MetaMap;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MetaMapLoader extends MetaValueLoader<MetaMap<Object, Object>, Map<Object, Object>> {
+    public MetaMapLoader(MetaContext context) {
+        super(context);
+    }
+
+    @Override
+    public MetaMap<Object, Object> load(Type t, Object c, ConfigLoader loader) throws LoadException {
+        return null;
+    }
+
+    @Override
+    public Map<Object, Object> get() {
+        return new HashMap<>();
+    }
+}

common/src/main/java/com/dfsek/terra/config/loaders/meta/MetaValueLoader.java

@@ -0,0 +1,15 @@
+package com.dfsek.terra.config.loaders.meta;
+
+import com.dfsek.tectonic.loading.TypeLoader;
+import com.dfsek.terra.api.config.meta.MetaContext;
+import com.dfsek.terra.api.config.meta.MetaValue;
+
+import java.util.function.Supplier;
+
+public abstract class MetaValueLoader<M extends MetaValue<T>, T> implements TypeLoader<M>, Supplier<T> {
+    protected final MetaContext context;
+
+    protected MetaValueLoader(MetaContext context) {
+        this.context = context;
+    }
+}

common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java

@@ -10,6 +10,7 @@ import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 import com.dfsek.terra.api.LoaderRegistrar;
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.platform.block.BlockData;
@@ -42,6 +43,8 @@ import com.dfsek.terra.config.loaders.config.biome.templates.provider.ImageProvi
 import com.dfsek.terra.config.loaders.config.biome.templates.provider.SingleBiomeProviderTemplate;
 import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader;
 import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate;
+import com.dfsek.terra.config.loaders.meta.GenericMetaValueLoader;
+import com.dfsek.terra.config.pack.meta.PackMetaContext;
 import com.dfsek.terra.config.templates.AbstractableTemplate;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.config.templates.CarverTemplate;
@@ -115,6 +118,8 @@ public class ConfigPack implements LoaderRegistrar {
 
     private final BiomeProvider.BiomeProviderBuilder biomeProviderBuilder;
 
+    private final PackMetaContext context;
+
 
     public ConfigPack(File folder, TerraPlugin main) throws ConfigException {
         try {
@@ -124,6 +129,9 @@ public class ConfigPack implements LoaderRegistrar {
             floraRegistry = new FloraRegistry(main);
             paletteRegistry = new PaletteRegistry(main);
             treeRegistry = new TreeRegistry();
+
+            context = new PackMetaContext(loader, selfLoader);
+
             register(abstractConfigLoader);
             register(selfLoader);
 
@@ -165,6 +173,9 @@ public class ConfigPack implements LoaderRegistrar {
             floraRegistry = new FloraRegistry(main);
             paletteRegistry = new PaletteRegistry(main);
             treeRegistry = new TreeRegistry();
+
+            context = new PackMetaContext(loader, selfLoader);
+
             register(abstractConfigLoader);
             register(selfLoader);
 
@@ -295,7 +306,8 @@ public class ConfigPack implements LoaderRegistrar {
                 .registerLoader(SingleBiomeProviderTemplate.class, SingleBiomeProviderTemplate::new)
                 .registerLoader(BiomePipelineTemplate.class, () -> new BiomePipelineTemplate(main))
                 .registerLoader(ImageProviderTemplate.class, () -> new ImageProviderTemplate(biomeRegistry))
-                .registerLoader(ImageSamplerTemplate.class, () -> new ImageProviderTemplate(biomeRegistry));
+                .registerLoader(ImageSamplerTemplate.class, () -> new ImageProviderTemplate(biomeRegistry))
+                .registerLoader(MetaValue.class, new GenericMetaValueLoader(context));
     }
 
     public Set<UserDefinedCarver> getCarvers() {

common/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java

@@ -2,13 +2,14 @@ package com.dfsek.terra.config.pack;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
+import com.dfsek.terra.api.config.meta.MetaValue;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
 
 public class ConfigPackPostTemplate implements ConfigTemplate {
     @Value("biomes")
-    private BiomeProvider.BiomeProviderBuilder providerBuilder;
+    private MetaValue<BiomeProvider.BiomeProviderBuilder> providerBuilder;
 
     public BiomeProvider.BiomeProviderBuilder getProviderBuilder() {
-        return providerBuilder;
+        return providerBuilder.get();
     }
 }

common/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java

@@ -4,6 +4,9 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.config.meta.MetaValue;
+import com.dfsek.terra.api.util.MapUtil;
+import com.dfsek.terra.api.util.generic.Lazy;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
 
@@ -12,14 +15,24 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})
 public class ConfigPackTemplate implements ConfigTemplate {
     @Value("id")
     private String id;
 
+    @Value("version")
+    @Default
+    private String version = "0.1.0";
+
+    @Value("author")
+    @Default
+    private String author = "Anon Y. Mous";
+
     @Value("noise")
-    private Map<String, NoiseSeeded> noiseBuilderMap;
+    private Map<String, MetaValue<NoiseSeeded>> noiseBuilderMap;
+    private final Lazy<Map<String, NoiseSeeded>> lazyNoiseBuilderMap = new Lazy<>(() -> MapUtil.remapValues(MetaValue::get, noiseBuilderMap));
 
     @Value("addons")
     @Default
@@ -27,94 +40,89 @@ public class ConfigPackTemplate implements ConfigTemplate {
 
     @Value("variables")
     @Default
-    private Map<String, Double> variables = new HashMap<>();
+    private Map<String, MetaValue<Double>> variables = new HashMap<>();
+    private final Lazy<Map<String, Double>> lazyVariables = new Lazy<>(() -> MapUtil.remapValues(MetaValue::get, variables));
 
     @Value("beta.carving")
     @Default
-    private boolean betaCarvers = false;
+    private MetaValue<Boolean> betaCarvers = MetaValue.of(false);
 
     @Value("functions")
     @Default
-    private LinkedHashMap<String, FunctionTemplate> functions = new LinkedHashMap<>();
+    private LinkedHashMap<String, MetaValue<FunctionTemplate>> functions = new LinkedHashMap<>();
+    private final Lazy<LinkedHashMap<String, FunctionTemplate>> lazyFunctions = new Lazy<>(() -> MapUtil.remap(Function.identity(), MetaValue::get, functions, LinkedHashMap::new));
 
     @Value("structures.locatable")
     @Default
-    private Map<String, String> locatable = new HashMap<>();
+    private Map<String, MetaValue<String>> locatable = new HashMap<>();
+    private final Lazy<Map<String, String>> lazyLocatable = new Lazy<>(() -> MapUtil.remapValues(MetaValue::get, locatable));
 
     @Value("blend.terrain.elevation")
     @Default
-    private int elevationBlend = 4;
+    private MetaValue<Integer> elevationBlend = MetaValue.of(4);
 
     @Value("vanilla.mobs")
     @Default
-    private boolean vanillaMobs = true;
+    private MetaValue<Boolean> vanillaMobs = MetaValue.of(true);
 
     @Value("vanilla.caves")
     @Default
-    private boolean vanillaCaves = false;
+    private MetaValue<Boolean> vanillaCaves = MetaValue.of(false);
 
     @Value("vanilla.decorations")
     @Default
-    private boolean vanillaDecorations = false;
+    private MetaValue<Boolean> vanillaDecorations = MetaValue.of(false);
 
     @Value("vanilla.structures")
     @Default
-    private boolean vanillaStructures = false;
-
-    @Value("author")
-    @Default
-    private String author = "Anon Y. Mous";
+    private MetaValue<Boolean> vanillaStructures = MetaValue.of(false);
 
     @Value("disable.sapling")
     @Default
-    private boolean disableSaplings = false;
-
-    @Value("version")
-    @Default
-    private String version = "0.1.0";
+    private MetaValue<Boolean> disableSaplings = MetaValue.of(false);
 
     @Value("disable.carvers")
     @Default
-    private boolean disableCarvers = false;
+    private MetaValue<Boolean> disableCarvers = MetaValue.of(false);
 
     @Value("disable.structures")
     @Default
-    private boolean disableStructures = false;
+    private MetaValue<Boolean> disableStructures = MetaValue.of(false);
 
     @Value("disable.ores")
     @Default
-    private boolean disableOres = false;
+    private MetaValue<Boolean> disableOres = MetaValue.of(false);
 
     @Value("disable.trees")
     @Default
-    private boolean disableTrees = false;
+    private MetaValue<Boolean> disableTrees = MetaValue.of(false);
 
     @Value("disable.flora")
     @Default
-    private boolean disableFlora = false;
+    private MetaValue<Boolean> disableFlora = MetaValue.of(false);
 
     public boolean disableCarvers() {
-        return disableCarvers;
+        return disableCarvers.get();
     }
 
     public boolean disableFlora() {
-        return disableFlora;
+        return disableFlora.get();
     }
 
     public boolean disableOres() {
-        return disableOres;
+        return disableOres.get();
     }
 
     public boolean disableStructures() {
-        return disableStructures;
+        return disableStructures.get();
     }
 
     public boolean disableTrees() {
-        return disableTrees;
+        return disableTrees.get();
     }
 
     public LinkedHashMap<String, FunctionTemplate> getFunctions() {
-        return functions;
+        return lazyFunctions.get();
     }
 
     public String getVersion() {
@@ -122,7 +130,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
     }
 
     public boolean isDisableSaplings() {
-        return disableSaplings;
+        return disableSaplings.get();
     }
 
     public String getID() {
@@ -134,39 +142,39 @@ public class ConfigPackTemplate implements ConfigTemplate {
     }
 
     public boolean vanillaMobs() {
-        return vanillaMobs;
+        return vanillaMobs.get();
     }
 
     public boolean vanillaCaves() {
-        return vanillaCaves;
+        return vanillaCaves.get();
     }
 
     public boolean vanillaDecorations() {
-        return vanillaDecorations;
+        return vanillaDecorations.get();
     }
 
     public boolean vanillaStructures() {
-        return vanillaStructures;
+        return vanillaStructures.get();
     }
 
     public Map<String, NoiseSeeded> getNoiseBuilderMap() {
-        return noiseBuilderMap;
+        return lazyNoiseBuilderMap.get();
     }
 
     public Map<String, Double> getVariables() {
-        return variables;
+        return lazyVariables.get();
     }
 
     public int getElevationBlend() {
-        return elevationBlend;
+        return elevationBlend.get();
     }
 
     public Map<String, String> getLocatable() {
-        return locatable;
+        return lazyLocatable.get();
     }
 
     public boolean doBetaCarvers() {
-        return betaCarvers;
+        return betaCarvers.get();
     }
 
     public Set<TerraAddon> getAddons() {

common/src/main/java/com/dfsek/terra/config/pack/meta/PackMetaContext.java

@@ -0,0 +1,48 @@
+package com.dfsek.terra.config.pack.meta;
+
+import com.dfsek.tectonic.config.Configuration;
+import com.dfsek.tectonic.exception.LoadException;
+import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.api.config.meta.MetaContext;
+import com.dfsek.terra.config.fileloaders.Loader;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PackMetaContext implements MetaContext {
+    private final Map<String, Configuration> configs = new HashMap<>(); // Lazy init configs
+    private final Loader fileAccess;
+    private final ConfigLoader loader;
+
+    public PackMetaContext(Loader fileAccess, ConfigLoader loader) {
+        this.fileAccess = fileAccess;
+        this.loader = loader;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T load(String meta, Type clazz) throws LoadException {
+        if(meta.indexOf(":") != meta.lastIndexOf(":")) { // We just need to know if there are >1.
+            throw new LoadException("Malformed metavalue string: " + meta);
+        }
+
+        String file = "/pack.yml";
+        String key;
+        if(meta.contains(":")) {
+            file = meta.substring(0, meta.indexOf(":"));
+            key = meta.substring(meta.indexOf(":") + 1);
+        } else {
+            key = meta;
+        }
+        Configuration configuration;
+        try {
+            configuration = new Configuration(fileAccess.get(file), file);
+        } catch(IOException e) {
+            throw new LoadException("Failed to load config file \"" + file + "\":", e);
+        }
+
+        return (T) loader.loadType(clazz, configuration.get(key));
+    }
+}