Merge remote-tracking branch 'origin/ver/7.0.0' into dev/pure

# Conflicts:
#	common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
#	common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java
#	common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java

common/addons/chunk-generator-noise-3d/build.gradle.kts

@@ -2,11 +2,4 @@ version = version("1.1.0")
 
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.chunkgenerator.lib.jafama")
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
+import com.dfsek.terra.api.util.MathUtil;
+
+
 /**
  * Class for bilinear interpolation of values arranged on a unit square.
  */
@@ -28,19 +31,6 @@ public class Interpolator {
         this.v3 = v3;
     }
     
-    /**
-     * 1D Linear interpolation between 2 points 1 unit apart.
-     *
-     * @param t  - Distance from v0. Total distance between v0 and v1 is 1 unit.
-     * @param v0 - Value at v0.
-     * @param v1 - Value at v1.
-     *
-     * @return double - The interpolated value.
-     */
-    public static double lerp(double t, double v0, double v1) {
-        return v0 + t * (v1 - v0);
-    }
-    
     /**
      * 2D Bilinear interpolation between 4 points on a unit square.
      *
@@ -50,8 +40,8 @@ public class Interpolator {
      * @return double - The interpolated value.
      */
     public double bilerp(double s, double t) {
-        double v01 = lerp(s, v0, v1);
-        double v23 = lerp(s, v2, v3);
-        return lerp(t, v01, v23);
+        double v01 = MathUtil.lerp(s, v0, v1);
+        double v23 = MathUtil.lerp(s, v2, v3);
+        return MathUtil.lerp(t, v01, v23);
     }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator3.java

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
+import com.dfsek.terra.api.util.MathUtil;
+
+
 /**
  * Class for bilinear interpolation of values arranged on a unit square.
  */
@@ -34,6 +37,6 @@ public class Interpolator3 {
     }
     
     public double trilerp(double x, double y, double z) {
-        return Interpolator.lerp(x, top.bilerp(y, z), bottom.bilerp(y, z));
+        return MathUtil.lerp(x, top.bilerp(y, z), bottom.bilerp(y, z));
     }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
+import com.dfsek.terra.api.util.MathUtil;
+
 import net.jafama.FastMath;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
-import static com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Interpolator.lerp;
-
 
 public class LazilyEvaluatedInterpolator {
     private final Double[] samples; //
@@ -84,10 +84,10 @@ public class LazilyEvaluatedInterpolator {
         
         double xFrac = (double) (x % horizontalRes) / horizontalRes;
         double zFrac = (double) (z % horizontalRes) / horizontalRes;
-        double lerp_bottom_0 = lerp(zFrac, sample_0_0_0, sample_0_0_1);
-        double lerp_bottom_1 = lerp(zFrac, sample_1_0_0, sample_1_0_1);
+        double lerp_bottom_0 = MathUtil.lerp(zFrac, sample_0_0_0, sample_0_0_1);
+        double lerp_bottom_1 = MathUtil.lerp(zFrac, sample_1_0_0, sample_1_0_1);
         
-        double lerp_bottom = lerp(xFrac, lerp_bottom_0, lerp_bottom_1);
+        double lerp_bottom = MathUtil.lerp(xFrac, lerp_bottom_0, lerp_bottom_1);
         
         if(yRange) { // we can do bilerp
             return lerp_bottom;
@@ -103,11 +103,11 @@ public class LazilyEvaluatedInterpolator {
         double sample_1_1_0 = sample(xIndex + 1, yIndex + 1, zIndex, x + horizontalRes, y + verticalRes, z);
         double sample_1_1_1 = sample(xIndex + 1, yIndex + 1, zIndex + 1, x + horizontalRes, y + verticalRes, z + horizontalRes);
         
-        double lerp_top_0 = lerp(zFrac, sample_0_1_0, sample_0_1_1);
-        double lerp_top_1 = lerp(zFrac, sample_1_1_0, sample_1_1_1);
+        double lerp_top_0 = MathUtil.lerp(zFrac, sample_0_1_0, sample_0_1_1);
+        double lerp_top_1 = MathUtil.lerp(zFrac, sample_1_1_0, sample_1_1_1);
         
-        double lerp_top = lerp(xFrac, lerp_top_0, lerp_top_1);
+        double lerp_top = MathUtil.lerp(xFrac, lerp_top_0, lerp_top_1);
         
-        return lerp(yFrac, lerp_bottom, lerp_top);
+        return MathUtil.lerp(yFrac, lerp_bottom, lerp_top);
     }
 }