test sharing remaper

build.gradle.kts

@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.4.0"))
-versionProjects(":common:implementation", version("6.4.0"))
-versionProjects(":platforms", version("6.4.0"))
+versionProjects(":common:api", version("6.3.1"))
+versionProjects(":common:implementation", version("6.3.1"))
+versionProjects(":platforms", version("6.3.1"))
 
 
 allprojects {
@@ -20,7 +20,7 @@ allprojects {
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
         
-        maxHeapSize = "2G"
+        maxHeapSize = "4G"
         ignoreFailures = false
         failFast = true
         maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1

common/addons/config-noise-function/build.gradle.kts

@@ -1,6 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = version("1.1.0")
+version = version("1.0.0")
 
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java

@@ -21,10 +21,8 @@ import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.ImageSamplerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.KernelTemplate;
 import com.dfsek.terra.addons.noise.config.templates.LinearHeightmapSamplerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.TranslateSamplerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.CellularNoiseTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.ConstantNoiseTemplate;
-import com.dfsek.terra.addons.noise.config.templates.noise.DistanceSamplerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.ExpressionFunctionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.GaborNoiseTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.SimpleNoiseTemplate;
@@ -32,7 +30,6 @@ import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotio
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
@@ -45,7 +42,6 @@ import com.dfsek.terra.addons.noise.samplers.arithmetic.MinSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.MultiplicationSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.SubtractionSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
-import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.PositiveWhiteNoiseSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.WhiteNoiseSampler;
@@ -87,8 +83,6 @@ public class NoiseAddon implements AddonInitializer {
                                     (type, o, loader, depthTracker) -> CellularSampler.DistanceFunction.valueOf((String) o))
                        .applyLoader(CellularSampler.ReturnType.class,
                                     (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o))
-                       .applyLoader(DistanceSampler.DistanceFunction.class,
-                                    (type, o, loader, depthTracker) -> DistanceSampler.DistanceFunction.valueOf((String) o))
                        .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new)
                        .applyLoader(FunctionTemplate.class, FunctionTemplate::new);
             
@@ -122,15 +116,12 @@ public class NoiseAddon implements AddonInitializer {
                   noiseRegistry.register(addon.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new));
                   noiseRegistry.register(addon.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new));
                   noiseRegistry.register(addon.key("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new));
-                  
-                  noiseRegistry.register(addon.key("DISTANCE"), DistanceSamplerTemplate::new);
             
                   noiseRegistry.register(addon.key("CONSTANT"), ConstantNoiseTemplate::new);
             
                   noiseRegistry.register(addon.key("KERNEL"), KernelTemplate::new);
             
                   noiseRegistry.register(addon.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new);
-                  noiseRegistry.register(addon.key("TRANSLATE"), TranslateSamplerTemplate::new);
             
                   noiseRegistry.register(addon.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new));
                   noiseRegistry.register(addon.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new));
@@ -143,7 +134,7 @@ public class NoiseAddon implements AddonInitializer {
                   Map<String, DimensionApplicableNoiseSampler> packSamplers = new LinkedHashMap<>();
                   Map<String, FunctionTemplate> packFunctions = new LinkedHashMap<>();
                   noiseRegistry.register(addon.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions));
-                  noiseRegistry.register(addon.key("EXPRESSION_NORMALIZER"), () -> new ExpressionNormalizerTemplate(packSamplers, packFunctions));
+            
             
                   NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate());
                   packSamplers.putAll(template.getSamplers());

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/LinearHeightmapSamplerTemplate.java

@@ -4,7 +4,6 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.addons.noise.samplers.LinearHeightmapSampler;
-import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
@@ -12,14 +11,14 @@ import com.dfsek.terra.api.noise.NoiseSampler;
 public class LinearHeightmapSamplerTemplate extends SamplerTemplate<LinearHeightmapSampler> {
     @Value("sampler")
     @Default
-    private @Meta NoiseSampler sampler = NoiseSampler.zero();
+    private NoiseSampler sampler = NoiseSampler.zero();
     
     @Value("base")
-    private @Meta double base;
+    private double base;
     
     @Value("scale")
     @Default
-    private @Meta double scale = 1;
+    private double scale = 1;
     
     @Override
     public NoiseSampler get() {

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/TranslateSamplerTemplate.java

@@ -1,32 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.samplers.TranslateSampler;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class TranslateSamplerTemplate extends SamplerTemplate<TranslateSampler> {
-    
-    @Value("sampler")
-    private NoiseSampler sampler;
-    
-    @Value("x")
-    @Default
-    private @Meta double x = 0;
-    
-    @Value("y")
-    @Default
-    private @Meta double y = 0;
-    
-    @Value("z")
-    @Default
-    private @Meta double z = 0;
-    
-    @Override
-    public NoiseSampler get() {
-        return new TranslateSampler(sampler, x, y ,z);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DistanceSamplerTemplate.java

@@ -1,42 +0,0 @@
-package com.dfsek.terra.addons.noise.config.templates.noise;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
-import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
-import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler.DistanceFunction;
-import com.dfsek.terra.api.config.meta.Meta;
-
-
-public class DistanceSamplerTemplate extends SamplerTemplate<DistanceSampler> {
-    
-    @Value("distance-function")
-    @Default
-    private DistanceSampler.@Meta DistanceFunction distanceFunction = DistanceFunction.Euclidean;
-    
-    @Value("point.x")
-    @Default
-    private @Meta double x = 0;
-    
-    @Value("point.y")
-    @Default
-    private @Meta double y = 0;
-    
-    @Value("point.z")
-    @Default
-    private @Meta double z = 0;
-    
-    @Value("normalize")
-    @Default
-    private @Meta boolean normalize = false;
-    
-    @Value("radius")
-    @Default
-    private @Meta double normalizeRadius = 100;
-    
-    @Override
-    public DistanceSampler get() {
-        return new DistanceSampler(distanceFunction, x, y, z, normalize, normalizeRadius);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.noise.config.templates.noise;
 
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
+import com.dfsek.paralithic.functions.Function;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
@@ -18,16 +19,17 @@ import java.util.Map;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
+import com.dfsek.terra.addons.noise.paralithic.defined.UserDefinedFunction;
+import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction2;
+import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction3;
 import com.dfsek.terra.addons.noise.samplers.noise.ExpressionFunction;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
-import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers;
-
 
 @SuppressWarnings({ "FieldMayBeFinal", "unused" })
 public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFunction> {
-    private final Map<String, DimensionApplicableNoiseSampler> globalSamplers;
+    private final Map<String, DimensionApplicableNoiseSampler> otherFunctions;
     private final Map<String, FunctionTemplate> globalFunctions;
     @Value("variables")
     @Default
@@ -41,19 +43,44 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
     @Default
     private @Meta LinkedHashMap<String, @Meta FunctionTemplate> functions = new LinkedHashMap<>();
     
-    public ExpressionFunctionTemplate(Map<String, DimensionApplicableNoiseSampler> globalSamplers, Map<String, FunctionTemplate> globalFunctions) {
-        this.globalSamplers = globalSamplers;
-        this.globalFunctions = globalFunctions;
+    public ExpressionFunctionTemplate(Map<String, DimensionApplicableNoiseSampler> otherFunctions, Map<String, FunctionTemplate> samplers) {
+        this.otherFunctions = otherFunctions;
+        this.globalFunctions = samplers;
     }
     
     @Override
     public NoiseSampler get() {
-        var mergedFunctions = new HashMap<>(globalFunctions); mergedFunctions.putAll(functions);
-        var mergedSamplers = new HashMap<>(globalSamplers); mergedSamplers.putAll(samplers);
         try {
-            return new ExpressionFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars);
+            Map<String, Function> noiseFunctionMap = generateFunctions();
+            return new ExpressionFunction(noiseFunctionMap, expression, vars);
         } catch(ParseException e) {
             throw new RuntimeException("Failed to parse expression.", e);
         }
     }
+    
+    private Map<String, Function> generateFunctions() throws ParseException {
+        Map<String, Function> noiseFunctionMap = new HashMap<>();
+        
+        for(Map.Entry<String, FunctionTemplate> entry : globalFunctions.entrySet()) {
+            noiseFunctionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue()));
+        }
+        
+        for(Map.Entry<String, FunctionTemplate> entry : functions.entrySet()) {
+            noiseFunctionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue()));
+        }
+        
+        otherFunctions.forEach((id, function) -> {
+            if(function.getDimensions() == 2) {
+                noiseFunctionMap.put(id, new NoiseFunction2(function.getSampler()));
+            } else noiseFunctionMap.put(id, new NoiseFunction3(function.getSampler()));
+        });
+        
+        samplers.forEach((id, function) -> {
+            if(function.getDimensions() == 2) {
+                noiseFunctionMap.put(id, new NoiseFunction2(function.getSampler()));
+            } else noiseFunctionMap.put(id, new NoiseFunction3(function.getSampler()));
+        });
+        
+        return noiseFunctionMap;
+    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.config.templates.normalizer;
-
-import com.dfsek.paralithic.eval.tokenizer.ParseException;
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
-import com.dfsek.terra.addons.noise.normalizer.ExpressionNormalizer;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers;
-
-
-@SuppressWarnings({ "unused", "FieldMayBeFinal" })
-public class ExpressionNormalizerTemplate extends NormalizerTemplate<ExpressionNormalizer> {
-    
-    private final Map<String, DimensionApplicableNoiseSampler> globalSamplers;
-    private final Map<String, FunctionTemplate> globalFunctions;
-    
-    @Value("expression")
-    private @Meta String expression;
-    
-    @Value("variables")
-    @Default
-    private @Meta Map<String, @Meta Double> vars = new HashMap<>();
-    
-    @Value("samplers")
-    @Default
-    private @Meta LinkedHashMap<String, @Meta DimensionApplicableNoiseSampler> samplers = new LinkedHashMap<>();
-    
-    @Value("functions")
-    @Default
-    private @Meta LinkedHashMap<String, @Meta FunctionTemplate> functions = new LinkedHashMap<>();
-    
-    public ExpressionNormalizerTemplate(Map<String, DimensionApplicableNoiseSampler> globalSamplers, Map<String, FunctionTemplate> globalFunctions) {
-        this.globalSamplers = globalSamplers;
-        this.globalFunctions = globalFunctions;
-    }
-    
-    @Override
-    public NoiseSampler get() {
-        var mergedFunctions = new HashMap<>(globalFunctions); mergedFunctions.putAll(functions);
-        var mergedSamplers = new HashMap<>(globalSamplers); mergedSamplers.putAll(samplers);
-        try {
-            return new ExpressionNormalizer(function, convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars);
-        } catch(ParseException e) {
-            throw new RuntimeException("Failed to parse expression.", e);
-        }
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/ExpressionNormalizer.java

@@ -1,33 +0,0 @@
-package com.dfsek.terra.addons.noise.normalizer;
-
-import com.dfsek.paralithic.Expression;
-import com.dfsek.paralithic.eval.parser.Parser;
-import com.dfsek.paralithic.eval.parser.Scope;
-import com.dfsek.paralithic.eval.tokenizer.ParseException;
-import com.dfsek.paralithic.functions.Function;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-import java.util.Map;
-
-
-public class ExpressionNormalizer extends Normalizer {
-    
-    private final Expression expression;
-    
-    public ExpressionNormalizer(NoiseSampler sampler, Map<String, Function> functions, String eq, Map<String, Double> vars)
-    throws ParseException {
-        super(sampler);
-        Parser p = new Parser();
-        Scope scope = new Scope();
-        scope.addInvocationVariable("in");
-        vars.forEach(scope::create);
-        functions.forEach(p::registerFunction);
-        expression = p.parse(eq, scope);
-    }
-    
-    @Override
-    public double normalize(double in) {
-        return expression.evaluate(in);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/FunctionUtil.java

@@ -1,31 +0,0 @@
-package com.dfsek.terra.addons.noise.paralithic;
-
-import com.dfsek.paralithic.eval.tokenizer.ParseException;
-import com.dfsek.paralithic.functions.Function;
-
-import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
-import com.dfsek.terra.addons.noise.paralithic.defined.UserDefinedFunction;
-import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction2;
-import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction3;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class FunctionUtil {
-    private FunctionUtil() {}
-    
-    public static Map<String, Function> convertFunctionsAndSamplers(Map<String, FunctionTemplate> functions,
-                                                                    Map<String, DimensionApplicableNoiseSampler> samplers) throws ParseException {
-        Map<String, Function> functionMap = new HashMap<>();
-        for(Map.Entry<String, FunctionTemplate> entry : functions.entrySet()) {
-            functionMap.put(entry.getKey(), UserDefinedFunction.newInstance(entry.getValue()));
-        }
-        samplers.forEach((id, sampler) -> functionMap.put(id,
-                                                          sampler.getDimensions() == 2 ?
-                                                          new NoiseFunction2(sampler.getSampler()) :
-                                                          new NoiseFunction3(sampler.getSampler())));
-        return functionMap;
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/TranslateSampler.java

@@ -1,27 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-public class TranslateSampler implements NoiseSampler {
-    
-    private final NoiseSampler sampler;
-    private final double dx, dy, dz;
-    
-    public TranslateSampler(NoiseSampler sampler, double dx, double dy, double dz) {
-        this.sampler = sampler;
-        this.dx = dx;
-        this.dy = dy;
-        this.dz = dz;
-    }
-    
-    @Override
-    public double noise(long seed, double x, double y) {
-        return sampler.noise(seed, x - dx, y - dz);
-    }
-    
-    @Override
-    public double noise(long seed, double x, double y, double z) {
-        return sampler.noise(seed, x - dx, y - dy, z - dz);
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/DistanceSampler.java

@@ -1,66 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers.noise;
-
-
-public class DistanceSampler extends NoiseFunction {
-    
-    private final DistanceFunction distanceFunction;
-    private final double ox, oy, oz;
-    private final boolean normalize;
-    private final double radius;
-    
-    private final double distanceAtRadius;
-    
-    public DistanceSampler(DistanceFunction distanceFunction, double ox, double oy, double oz, boolean normalize, double radius) {
-        frequency = 1;
-        this.distanceFunction = distanceFunction;
-        this.ox = ox;
-        this.oy = oy;
-        this.oz = oz;
-        this.normalize = normalize;
-        this.radius = radius;
-        this.distanceAtRadius = distance2d(distanceFunction, radius, 0); // distance2d and distance3d should return the same value
-    }
-   
-    @Override
-    public double getNoiseRaw(long seed, double x, double y) {
-        double dx = x - ox;
-        double dy = y - oz;
-        if (normalize && (fastAbs(dx) > radius || fastAbs(dy) > radius)) return 1;
-        double dist = distance2d(distanceFunction, dx, dy);
-        if (normalize) return fastMin(((2*dist)/distanceAtRadius)-1, 1);
-        return dist;
-    }
-    
-    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
-        double dx = x - ox;
-        double dy = y - oy;
-        double dz = z - oz;
-        if(normalize && (fastAbs(dx) > radius || fastAbs(dy) > radius || fastAbs(dz) > radius)) return 1;
-        double dist = distance3d(distanceFunction, dx, dy, dz);
-        if (normalize) return fastMin(((2*dist)/distanceAtRadius)-1, 1);
-        return dist;
-    }
-    
-    private static double distance2d(DistanceFunction distanceFunction, double x, double z) {
-        return switch(distanceFunction) {
-            case Euclidean -> fastSqrt(x*x + z*z);
-            case EuclideanSq -> x*x + z*z;
-            case Manhattan -> fastAbs(x) + fastAbs(z);
-        };
-    }
-    
-    private static double distance3d(DistanceFunction distanceFunction, double x, double y, double z) {
-        return switch(distanceFunction) {
-            case Euclidean -> fastSqrt(x*x + y*y + z*z);
-            case EuclideanSq -> x*x + y*y + z*z;
-            case Manhattan -> fastAbs(x) + fastAbs(y) + fastAbs(z);
-        };
-    }
-    
-    public enum DistanceFunction {
-        Euclidean,
-        EuclideanSq,
-        Manhattan
-    }
-}

common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java

@@ -17,17 +17,10 @@
 
 package com.dfsek.terra.config.loaders;
 
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
-
-import com.dfsek.tectonic.impl.MapConfiguration;
-
-import com.dfsek.terra.api.config.meta.Meta;
-
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
@@ -43,26 +36,11 @@ public class RangeLoader implements TypeLoader<Range> {
     public Range load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
     throws LoadException {
         if(o instanceof Map) {
-            return configLoader.load(new RangeMapTemplate(), new MapConfiguration((Map<String, Object>) o), depthTracker).get();
+            Map<String, Integer> map = (Map<String, Integer>) o;
+            return new ConstantRange(map.get("min"), map.get("max"));
         } else {
             int h = configLoader.loadType(Integer.class, o, depthTracker);
             return new ConstantRange(h, h + 1);
         }
     }
-    
-    /*
-     * Template needed so keys can be meta annotated, otherwise the loader could just grab keys directly from the object
-     */
-    public static class RangeMapTemplate implements ObjectTemplate<Range> {
-        @Value("min")
-        private @Meta int min;
-        
-        @Value("max")
-        private @Meta int max;
-        
-        @Override
-        public Range get() {
-            return new ConstantRange(min, max);
-        }
-    }
 }

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java

@@ -68,7 +68,7 @@ public class MetaListLikePreprocessor extends MetaPreprocessor<Meta> {
                         
                         if(!(metaValue instanceof List)) {
                             throw new LoadException(
-                                    "Meta list / set injection (via <<) must point to a list. '" + meta + "' points to type " + metaValue.getClass().getCanonicalName(),
+                                    "MetaList/Set injection candidate must be list, is type " + metaValue.getClass().getCanonicalName(),
                                     depthTracker);
                         }
                         

gradle.properties

@@ -8,4 +8,5 @@ terra.license=MIT
 # Gradle options
 org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
 org.gradle.warning.mode=all
+#org.gradle.parallel=true
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-org.gradle.jvmargs=-Xmx4096m
+org.gradle.jvmargs=-Xmx4096m
+fabric.loom.multiProjectOptimisation=true

platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java

@@ -17,16 +17,35 @@
 
 package com.dfsek.terra.fabric;
 
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+import cloud.commandframework.fabric.FabricServerCommandManager;
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.server.command.ServerCommandSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 
 
-public class FabricEntryPoint extends LifecycleEntryPoint implements ModInitializer {
+public class FabricEntryPoint implements ModInitializer {
+    private static final Logger logger = LoggerFactory.getLogger(FabricEntryPoint.class);
+    
     private static final FabricPlatform TERRA_PLUGIN = new FabricPlatform();
     
     @Override
     public void onInitialize() {
-        initialize("Fabric", TERRA_PLUGIN);
+        logger.info("Initializing Terra Fabric mod...");
+        
+        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+                CommandExecutionCoordinator.simpleCoordinator(),
+                serverCommandSource -> (CommandSender) serverCommandSource,
+                commandSender -> (ServerCommandSource) commandSender
+        );
+        
+        
+        manager.brigadierManager().setNativeNumberSuggestions(false);
+        
+        TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager));
     }
 }

platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricPlatform.java

@@ -17,24 +17,43 @@
 
 package com.dfsek.terra.fabric;
 
+import ca.solostudios.strata.Versions;
+import ca.solostudios.strata.parser.tokenizer.ParseException;
+import ca.solostudios.strata.version.Version;
 import net.fabricmc.loader.api.FabricLoader;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 
 public class FabricPlatform extends LifecyclePlatform {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FabricPlatform.class);
     
     @Override
     protected Collection<BaseAddon> getPlatformMods() {
-        return FabricLoader.getInstance().getAllMods().stream().flatMap(
-                mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect(
-                Collectors.toList());
+        return FabricLoader.getInstance().getAllMods().stream().flatMap(mod -> {
+            String id = mod.getMetadata().getId();
+            if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
+            try {
+                Version version = Versions.parseVersion(mod.getMetadata().getVersion().getFriendlyString());
+                return Stream.<BaseAddon>of(new EphemeralAddon(version, "fabric:" + id));
+            } catch(ParseException e) {
+                LOGGER.warn(
+                        "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
+                        "it.",
+                        id, mod.getMetadata().getVersion().getFriendlyString());
+            }
+            return Stream.empty();
+        }).collect(Collectors.toList());
     }
     
     @Override

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java

@@ -50,6 +50,7 @@ import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.SoundEventTemplate;
 import com.dfsek.terra.mod.config.SpawnCostConfig;
 import com.dfsek.terra.mod.config.SpawnEntryTemplate;
+import com.dfsek.terra.mod.config.SpawnGroupTemplate;
 import com.dfsek.terra.mod.config.SpawnSettingsTemplate;
 import com.dfsek.terra.mod.config.SpawnTypeConfig;
 import com.dfsek.terra.mod.config.VillagerTypeTemplate;
@@ -87,7 +88,6 @@ public abstract class ModPlatform extends AbstractPlatform {
                 .registerLoader(GrassColorModifier.class,
                                 (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase(
                                         Locale.ROOT)))
-                .registerLoader(SpawnGroup.class,(type, o, loader, depthTracker) ->  SpawnGroup.valueOf((String) o))
                 .registerLoader(BiomeParticleConfig.class, BiomeParticleConfigTemplate::new)
                 .registerLoader(SoundEvent.class, SoundEventTemplate::new)
                 .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new)
@@ -96,6 +96,7 @@ public abstract class ModPlatform extends AbstractPlatform {
                 .registerLoader(EntityType.class, EntityTypeTemplate::new)
                 .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new)
                 .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
+                .registerLoader(SpawnGroup.class, SpawnGroupTemplate::new)
                 .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
                 .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
                 .registerLoader(VillagerType.class, VillagerTypeTemplate::new);

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/MusicSoundTemplate.java

@@ -3,9 +3,6 @@ package com.dfsek.terra.mod.config;
 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.api.util.Range;
-
 import net.minecraft.registry.Registries;
 import net.minecraft.sound.MusicSound;
 import net.minecraft.sound.SoundEvent;
@@ -16,9 +13,13 @@ public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
     @Default
     private SoundEvent sound = null;
     
-    @Value("delay")
+    @Value("min-delay")
     @Default
-    private Range delay = null;
+    private Integer minDelay = null;
+    
+    @Value("max-delay")
+    @Default
+    private Integer maxDelay = null;
     
     @Value("replace-current-music")
     @Default
@@ -26,10 +27,10 @@ public class MusicSoundTemplate implements ObjectTemplate<MusicSound> {
     
     @Override
     public MusicSound get() {
-        if(sound == null || delay == null || replaceCurrentMusic == null) {
+        if(sound == null || minDelay == null || maxDelay == null || replaceCurrentMusic == null) {
             return null;
         } else {
-            return new MusicSound(Registries.SOUND_EVENT.getEntry(sound), delay.getMin(), delay.getMax(), replaceCurrentMusic);
+            return new MusicSound(Registries.SOUND_EVENT.getEntry(sound), minDelay, maxDelay, replaceCurrentMusic);
         }
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryTemplate.java

@@ -3,9 +3,6 @@ package com.dfsek.terra.mod.config;
 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.api.util.Range;
-
 import net.minecraft.entity.EntityType;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
@@ -19,12 +16,16 @@ public class SpawnEntryTemplate implements ObjectTemplate<SpawnEntry> {
     @Default
     private Integer weight = null;
     
-    @Value("group-size")
+    @Value("min-group-size")
     @Default
-    private Range groupSize = null;
+    private Integer minGroupSize = null;
+    
+    @Value("max-group-size")
+    @Default
+    private Integer maxGroupSize = null;
     
     @Override
     public SpawnEntry get() {
-        return new SpawnEntry(type, weight, groupSize.getMin(), groupSize.getMax());
+        return new SpawnEntry(type, weight, minGroupSize, maxGroupSize);
     }
 }

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnGroupTemplate.java

@@ -0,0 +1,18 @@
+package com.dfsek.terra.mod.config;
+
+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 net.minecraft.entity.SpawnGroup;
+
+
+public class SpawnGroupTemplate implements ObjectTemplate<SpawnGroup> {
+    @Value("group")
+    @Default
+    private String group = null;
+    
+    @Override
+    public SpawnGroup get() {
+        return SpawnGroup.valueOf(group);
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java

@@ -3,9 +3,7 @@ package com.dfsek.terra.mod.config;
 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 net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings;
-import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
 import java.util.List;
 
@@ -27,10 +25,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate<SpawnSettings> {
     public SpawnSettings get() {
         SpawnSettings.Builder builder = new SpawnSettings.Builder();
         for(SpawnTypeConfig spawn : spawns) {
-            SpawnGroup group = spawn.getGroup();
-            for (SpawnEntry entry : spawn.getEntry()) {
-                builder.spawn(group, entry);
-            }
+            builder.spawn(spawn.getGroup(), spawn.getEntry());
         }
         for(SpawnCostConfig cost : costs) {
             builder.spawnCost(cost.getType(), cost.getMass(), cost.getGravity());

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java

@@ -6,23 +6,21 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.world.biome.SpawnSettings.SpawnEntry;
 
-import java.util.List;
-
 
 public class SpawnTypeConfig implements ObjectTemplate<SpawnTypeConfig> {
     @Value("group")
     @Default
     private SpawnGroup group = null;
     
-    @Value("entries")
+    @Value("entry")
     @Default
-    private List<SpawnEntry> entry = null;
+    private SpawnEntry entry = null;
     
     public SpawnGroup getGroup() {
         return group;
     }
     
-    public List<SpawnEntry> getEntry() {
+    public SpawnEntry getEntry() {
         return entry;
     }
     

platforms/mixin-lifecycle/build.gradle.kts

@@ -15,11 +15,6 @@ dependencies {
     
     minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
     mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
-        exclude("net.fabricmc")
-        exclude("net.fabricmc.fabric-api")
-    }
 }
 
 loom {

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java

@@ -1,34 +0,0 @@
-package com.dfsek.terra.lifecycle;
-
-import cloud.commandframework.execution.CommandExecutionCoordinator;
-
-import cloud.commandframework.fabric.FabricServerCommandManager;
-
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
-
-import com.dfsek.terra.mod.MinecraftAddon;
-
-import net.minecraft.server.command.ServerCommandSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class LifecycleEntryPoint {
-    private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class);
-    
-    protected static void initialize(String modName, LifecyclePlatform platform) {
-        logger.info("Initializing Terra {} mod...", modName);
-    
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-                CommandExecutionCoordinator.simpleCoordinator(),
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender
-        );
-    
-    
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-    
-        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
-    }
-}

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -2,7 +2,6 @@ package com.dfsek.terra.lifecycle;
 
 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.parser.tokenizer.ParseException;
-import ca.solostudios.strata.version.Version;
 
 import com.dfsek.terra.lifecycle.util.BiomeUtil;
 
@@ -21,7 +20,6 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Stream;
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.dfsek.terra.addon.EphemeralAddon;
@@ -105,26 +103,12 @@ public abstract class LifecyclePlatform extends ModPlatform {
                 LOGGER.warn("Failed to parse Minecraft version", e);
             }
         }
-    
+        
         addons.addAll(getPlatformMods());
-    
+        
         return addons;
     }
     
-    protected Stream<EphemeralAddon> parseModData(String id, String modVersion) {
-        if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
-        try {
-            Version version = Versions.parseVersion(modVersion);
-            return Stream.of(new EphemeralAddon(version, "quilt:" + id));
-        } catch(ParseException e) {
-            LOGGER.warn(
-                    "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
-                    "it.",
-                    id, modVersion);
-        }
-        return Stream.empty();
-    }
-    
     @Override
     public Registry<DimensionType> dimensionTypeRegistry() {
         return DIMENSIONS.get();

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java

@@ -17,17 +17,36 @@
 
 package com.dfsek.terra.quilt;
 
+import cloud.commandframework.execution.CommandExecutionCoordinator;
+import cloud.commandframework.fabric.FabricServerCommandManager;
+import net.minecraft.server.command.ServerCommandSource;
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 
 
-public class QuiltEntryPoint extends LifecycleEntryPoint implements ModInitializer {
-    private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform();
+public class QuiltEntryPoint implements ModInitializer {
+    private static final Logger logger = LoggerFactory.getLogger(QuiltEntryPoint.class);
     
+    private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform();
+
     @Override
     public void onInitialize(ModContainer container) {
-        initialize("Quilt", TERRA_PLUGIN);
+        logger.info("Initializing Terra Quilt mod...");
+        
+        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+                CommandExecutionCoordinator.simpleCoordinator(),
+                serverCommandSource -> (CommandSender) serverCommandSource,
+                commandSender -> (ServerCommandSource) commandSender
+        );
+        
+        
+        manager.brigadierManager().setNativeNumberSuggestions(false);
+        
+        TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager));
     }
 }

platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java

@@ -17,23 +17,43 @@
 
 package com.dfsek.terra.quilt;
 
+import ca.solostudios.strata.Versions;
+import ca.solostudios.strata.parser.tokenizer.ParseException;
+import ca.solostudios.strata.version.Version;
 import org.jetbrains.annotations.NotNull;
 import org.quiltmc.loader.api.QuiltLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import com.dfsek.terra.addon.EphemeralAddon;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 
 public class QuiltPlatform extends LifecyclePlatform {
+    private static final Logger LOGGER = LoggerFactory.getLogger(QuiltPlatform.class);
     
     @Override
     protected Collection<BaseAddon> getPlatformMods() {
-        return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect(
-                Collectors.toList());
+        return QuiltLoader.getAllMods().stream().flatMap(mod -> {
+            String id = mod.metadata().id();
+            if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
+            try {
+                Version version = Versions.parseVersion(mod.metadata().version().raw());
+                return Stream.of(new EphemeralAddon(version, "quilt:" + id));
+            } catch(ParseException e) {
+                LOGGER.warn(
+                        "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
+                        "it.",
+                        id, mod.metadata().version().raw());
+            }
+            return Stream.empty();
+        }).collect(Collectors.toList());
     }
     
     @Override