Noise context api

hotspot has intrinsics for almost everything we use it for

build.gradle.kts

@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.2.1"))
-versionProjects(":common:implementation", version("6.2.1"))
-versionProjects(":platforms", version("6.2.1"))
+versionProjects(":common:api", version("6.4.0"))
+versionProjects(":common:implementation", version("6.4.0"))
+versionProjects(":platforms", version("6.4.0"))
 
 
 allprojects {

buildSrc/src/main/kotlin/Versions.kt

@@ -4,55 +4,53 @@ object Versions {
         const val paralithic = "0.7.0"
         const val strata = "1.1.1"
         
-        const val cloud = "1.7.0"
+        const val cloud = "1.8.0"
         
         const val slf4j = "1.7.36"
         const val log4j_slf4j_impl = "2.14.1"
         
         object Internal {
             const val apacheText = "1.9"
-            const val jafama = "2.3.2"
             const val apacheIO = "2.6"
             const val fastutil = "8.5.6"
+            const val cpuFeaturesJava = "1.0.1"
         }
     }
     
     object Fabric {
         const val fabricLoader = "0.14.8"
-        const val fabricAPI = "0.57.0+1.19"
+        const val fabricAPI = "0.83.1+1.20.1"
     }
     
     object Quilt {
         const val quiltLoader = "0.17.0"
-        const val fabricApi = "2.0.0-beta.4+0.57.0-1.19"
+        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
     }
     
     object Mod {
         const val mixin = "0.11.2+mixin.0.8.5"
         
-        const val minecraft = "1.19"
-        const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.14.2"
+        const val minecraft = "1.20.1"
+        const val yarn = "$minecraft+build.2"
+        const val fabricLoader = "0.14.21"
         
         const val architecuryLoom = "0.12.0.290"
         const val architecturyPlugin = "3.4-SNAPSHOT"
         
         const val loomQuiltflower = "1.7.1"
-        
-        const val lazyDfu = "0.1.2"
     }
     
     object Forge {
-        const val forge = "${Mod.minecraft}-41.0.63"
+        const val forge = "${Mod.minecraft}-47.0.3"
         const val burningwave = "12.53.0"
     }
     
     object Bukkit {
         const val paper = "1.18.2-R0.1-SNAPSHOT"
         const val paperLib = "1.0.5"
-        const val minecraft = "1.19.2"
+        const val minecraft = "1.20.1"
         const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.19.2-R0.1-SNAPSHOT"
+        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
     }
     
     object Sponge {

common/addons/biome-provider-image-v2/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2021 Polyhedral Development
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

common/addons/biome-provider-image-v2/README.md

@@ -0,0 +1,5 @@
+# biome-provider-image-v2
+
+Implements and registers the `IMAGE` biome provider, which
+utilizes various config types provided by the `library-image` addon to
+distribute biomes based on images.

common/addons/biome-provider-image-v2/build.gradle.kts

@@ -0,0 +1,8 @@
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:library-image"))
+
+
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java

@@ -0,0 +1,51 @@
+/*
+ * 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.biome.image.v2;
+
+import java.util.Optional;
+
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class ImageBiomeProvider implements BiomeProvider {
+    private final int resolution;
+    
+    private final ColorConverter<Biome> colorConverter;
+    
+    private final ColorSampler colorSampler;
+    
+    public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
+        this.resolution = resolution;
+        this.colorConverter = colorConverter;
+        this.colorSampler = colorSampler;
+    }
+    
+    @Override
+    public Biome getBiome(int x, int y, int z, long seed) {
+        return getBiome(x, z);
+    }
+    
+    public Biome getBiome(int x, int z) {
+        x /= resolution;
+        z /= resolution;
+        return colorConverter.apply(colorSampler.apply(x, z));
+    }
+    
+    @Override
+    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
+        return Optional.of(getBiome(x, z));
+    }
+    
+    @Override
+    public Iterable<Biome> getBiomes() {
+        return colorConverter.getEntries();
+    }
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java

@@ -0,0 +1,74 @@
+/*
+ * 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.biome.image.v2;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.function.Supplier;
+
+import com.dfsek.terra.addons.biome.image.v2.config.ImageProviderTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.ClosestBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.ExactBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.mapping.DefinedBiomeColorMappingTemplate;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class ImageBiomeProviderAddon implements AddonInitializer {
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .priority(501)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                            PROVIDER_REGISTRY_KEY);
+                    providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry = event.getPack().getOrCreateRegistry(
+                            BIOME_COLOR_CONVERTER_REGISTRY_KEY);
+                    biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
+                    biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry = event.getPack().getOrCreateRegistry(
+                            BIOME_COLOR_MAPPING_REGISTRY_KEY);
+                    biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"), () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class), b -> b));
+                    biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
+                })
+                .failThrough();
+    }
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java

@@ -0,0 +1,40 @@
+/*
+ * 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.biome.image.v2.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider;
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+@SuppressWarnings("FieldMayBeFinal")
+public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
+    
+    @Value("resolution")
+    @Default
+    @Description("Sets the resolution at which to sample the image.")
+    private int resolution = 1;
+    
+    @Value("color-sampler")
+    private ColorSampler colorSampler;
+    
+    @Value("color-conversion")
+    private ColorConverter<Biome> colorConverter;
+    
+    @Override
+    public BiomeProvider get() {
+        return new ImageBiomeProvider(colorConverter, colorSampler, resolution);
+    }
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/converter/ClosestBiomeColorConverterTemplate.java

@@ -0,0 +1,19 @@
+package com.dfsek.terra.addons.biome.image.v2.config.converter;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.addons.image.config.converter.ClosestColorConverterTemplate;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
+import com.dfsek.terra.api.world.biome.Biome;
+
+
+public class ClosestBiomeColorConverterTemplate extends ClosestColorConverterTemplate<Biome> {
+
+    @Value("match")
+    private ColorMapping<Biome> match;
+    
+    @Override
+    protected ColorMapping<Biome> getMapping() {
+        return match;
+    }
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/converter/ExactBiomeColorConverterTemplate.java

@@ -0,0 +1,37 @@
+package com.dfsek.terra.addons.biome.image.v2.config.converter;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.addons.image.config.converter.ExactColorConverterTemplate;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
+import com.dfsek.terra.api.world.biome.Biome;
+
+
+public class ExactBiomeColorConverterTemplate extends ExactColorConverterTemplate<Biome> {
+    
+    @Value("match")
+    private ColorMapping<Biome> match;
+
+    @Value("else")
+    private Biome fallback;
+    
+    @Value("ignore-alpha")
+    @Default
+    private boolean ignoreAlpha = true;
+
+    @Override
+    protected ColorMapping<Biome> getMapping() {
+        return match;
+    }
+
+    @Override
+    protected Biome getFallback() {
+        return fallback;
+    }
+    
+    @Override
+    protected boolean ignoreAlpha() {
+        return ignoreAlpha;
+    }
+}

common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/converter/mapping/DefinedBiomeColorMappingTemplate.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.addons.biome.image.v2.config.converter.mapping;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.Map;
+
+import com.dfsek.terra.addons.image.config.ColorLoader.ColorString;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
+import com.dfsek.terra.addons.image.util.MapUtil;
+import com.dfsek.terra.api.world.biome.Biome;
+
+
+public class DefinedBiomeColorMappingTemplate implements ObjectTemplate<ColorMapping<Biome>> {
+    
+    @Value("map")
+    Map<ColorString, Biome> map;
+    
+    @Override
+    public ColorMapping<Biome> get() {
+        var map = MapUtil.mapKeys(this.map, ColorString::getColor);
+        return () -> map;
+    }
+}

common/addons/biome-provider-image-v2/src/main/resources/terra.addon.yml

@@ -0,0 +1,14 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: biome-provider-image-v2
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addons.biome.image.v2.ImageBiomeProviderAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
+depends:
+  library-image: "1.+"

common/addons/biome-provider-image/build.gradle.kts

@@ -2,10 +2,6 @@ version = version("1.0.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.biome.image.lib.jafama")
-}
+
+}

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.biome.image;
 
-import net.jafama.FastMath;
-
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
@@ -34,7 +32,7 @@ public class ImageBiomeProvider implements BiomeProvider {
     }
     
     private static int distance(Color a, Color b) {
-        return FastMath.abs(a.getRed() - b.getRed()) + FastMath.abs(a.getGreen() - b.getGreen()) + FastMath.abs(a.getBlue() - b.getBlue());
+        return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.abs(a.getBlue() - b.getBlue());
     }
     
     @Override
@@ -70,14 +68,14 @@ public class ImageBiomeProvider implements BiomeProvider {
         CENTER {
             @Override
             public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(FastMath.floorMod(x - image.getWidth() / 2, image.getWidth()),
-                                              FastMath.floorMod(z - image.getHeight() / 2, image.getHeight())));
+                return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
+                                              Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
             }
         },
         NONE {
             @Override
             public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(FastMath.floorMod(x, image.getWidth()), FastMath.floorMod(z, image.getHeight())));
+                return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.floorMod(z, image.getHeight())));
             }
         };
         

common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java

@@ -8,6 +8,8 @@
 package com.dfsek.terra.addons.biome.image;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.function.Supplier;
 
@@ -24,6 +26,9 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class ImageBiomeProviderAddon implements AddonInitializer {
+    
+    private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
+    
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
@@ -45,5 +50,6 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
                                               () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
                 })
                 .failThrough();
+        logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
     }
 }

common/addons/biome-provider-pipeline-v2/build.gradle.kts

@@ -2,11 +2,4 @@ version = version("1.0.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.biome.pipeline.lib.jafama")
 }

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java

@@ -11,6 +11,9 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.function.Supplier;
 
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate;
@@ -20,9 +23,6 @@ import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStage
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java

@@ -1,19 +1,19 @@
 package com.dfsek.terra.addons.biome.pipeline.v2;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.StreamSupport;
+
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-import net.jafama.FastMath;
-
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.StreamSupport;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
@@ -36,7 +36,7 @@ public class PipelineBiomeProvider implements BiomeProvider {
         this.noiseAmp = noiseAmp;
         this.chunkSize = pipeline.getChunkSize();
         this.biomeChunkCache = Caffeine.newBuilder()
-                                       .maximumSize(1024)
+                                       .maximumSize(64)
                                        .build(pipeline::generateChunk);
     
         Set<PipelineBiome> biomeSet = new HashSet<>();
@@ -80,8 +80,8 @@ public class PipelineBiomeProvider implements BiomeProvider {
         x /= resolution;
         z /= resolution;
         
-        int chunkX = FastMath.floorDiv(x, chunkSize);
-        int chunkZ = FastMath.floorDiv(z, chunkSize);
+        int chunkX = Math.floorDiv(x, chunkSize);
+        int chunkZ = Math.floorDiv(z, chunkSize);
         
         int chunkWorldX = chunkX * chunkSize;
         int chunkWorldZ = chunkZ * chunkSize;
@@ -97,6 +97,11 @@ public class PipelineBiomeProvider implements BiomeProvider {
         return biomes;
     }
     
+    @Override
+    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
+        return Optional.of(getBiome(x, z, seed));
+    }
+    
     @Override
     public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
         return new BiomePipelineColumn(this, min, max, x, z, seed);

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Expander.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 
 
 /**

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Stage.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 
 
 public interface Stage {

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java

@@ -15,9 +15,9 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.List;
 
 import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider;
-import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -54,6 +54,6 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
     
     @Override
     public BiomeProvider get() {
-        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 500), resolution, blendSampler, blendAmplitude);
+        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
     }
 }

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java

@@ -7,8 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
 
 

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java

@@ -11,9 +11,9 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java

@@ -9,9 +9,9 @@ package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java

@@ -11,9 +11,9 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java

@@ -9,9 +9,9 @@ package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java

@@ -7,8 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
 
 

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java

@@ -1,13 +1,12 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
 
+import java.util.List;
+
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
-import net.jafama.FastMath;
-
-import java.util.List;
 
 
 public class BiomeChunkImpl implements BiomeChunk {
@@ -111,7 +110,7 @@ public class BiomeChunkImpl implements BiomeChunk {
         // chunk samples points on the same overall grid.
         // Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
         // because points would be sampled on grids at different offsets, resulting in artifacts at borders.
-        return FastMath.ceilToInt((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+        return (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
     }
     
     private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {

common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/source/SingleSource.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.addons.biome.pipeline.v2.source;
 import java.util.Collections;
 import java.util.Set;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 public class SingleSource implements Source {

common/addons/biome-provider-pipeline/build.gradle.kts

@@ -2,11 +2,4 @@ version = version("1.0.1")
 
 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.biome.pipeline.lib.jafama")
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java

@@ -9,7 +9,6 @@ package com.dfsek.terra.addons.biome.pipeline;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-import net.jafama.FastMath;
 
 import java.util.Comparator;
 import java.util.HashSet;
@@ -86,8 +85,8 @@ public class BiomePipelineProvider implements BiomeProvider {
         x /= resolution;
         z /= resolution;
 
-        int fdX = FastMath.floorDiv(x, pipeline.getSize());
-        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
+        int fdX = Math.floorDiv(x, pipeline.getSize());
+        int fdZ = Math.floorDiv(z, pipeline.getSize());
         return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
                                                                           z - fdZ * pipeline.getSize()).getBiome();
     }

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

@@ -1,12 +1,5 @@
-version = version("1.1.0")
+version = version("1.2.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/NoiseChunkGenerator3DAddon.java

@@ -11,9 +11,10 @@ import com.dfsek.terra.addons.chunkgenerator.config.NoiseChunkGeneratorPackConfi
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseConfigTemplate;
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.BiomePaletteTemplate;
-import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.config.palette.SlantLayer;
+import com.dfsek.terra.addons.chunkgenerator.config.palette.slant.SlantLayerTemplate;
 import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -36,15 +37,20 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
     
     @Override
     public void initialize() {
-        PropertyKey<PaletteInfo> paletteInfoPropertyKey = Context.create(PaletteInfo.class);
+        PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey = Context.create(BiomePaletteInfo.class);
         PropertyKey<BiomeNoiseProperties> noisePropertiesPropertyKey = Context.create(BiomeNoiseProperties.class);
         platform.getEventManager()
                 .getHandler(FunctionalEventHandler.class)
                 .register(addon, ConfigPackPreLoadEvent.class)
                 .priority(1000)
                 .then(event -> {
+                    
+                    event.getPack().applyLoader(SlantHolder.CalculationMethod.class,
+                                                (type, o, loader, depthTracker) -> SlantHolder.CalculationMethod.valueOf((String) o));
+
                     NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
-            
+                    event.getPack().getContext().put(config);
+                    
                     event.getPack()
                          .getOrCreateRegistry(ChunkGeneratorProvider.class)
                          .register(addon.key("NOISE_3D"),
@@ -53,7 +59,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                                                                      config.getVerticalRes(), noisePropertiesPropertyKey,
                                                                      paletteInfoPropertyKey));
                     event.getPack()
-                         .applyLoader(SlantLayer.class, SlantLayer::new);
+                         .applyLoader(SlantHolder.Layer.class, SlantLayerTemplate::new);
                 })
                 .failThrough();
         
@@ -62,8 +68,10 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                 .register(addon, ConfigurationLoadEvent.class)
                 .then(event -> {
                     if(event.is(Biome.class)) {
+                        NoiseChunkGeneratorPackConfigTemplate config = event.getPack().getContext().get(NoiseChunkGeneratorPackConfigTemplate.class);
+                        
                         event.getLoadedObject(Biome.class).getContext().put(paletteInfoPropertyKey,
-                                                                            event.load(new BiomePaletteTemplate(platform)).get());
+                                                                            event.load(new BiomePaletteTemplate(platform, config.getSlantCalculationMethod())).get());
                         event.getLoadedObject(Biome.class).getContext().put(noisePropertiesPropertyKey,
                                                                             event.load(new BiomeNoiseConfigTemplate()).get());
                     }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java

@@ -4,10 +4,12 @@ import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.properties.Properties;
 
 
-public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate {
+public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Properties {
     @Value("blend.terrain.elevation")
     @Default
     private @Meta int elevationBlend = 4;
@@ -20,6 +22,10 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate {
     @Default
     private @Meta int verticalRes = 2;
     
+    @Value("slant.calculation-method")
+    @Default
+    private SlantHolder.@Meta CalculationMethod slantCalculationMethod = SlantHolder.CalculationMethod.Derivative;
+    
     public int getElevationBlend() {
         return elevationBlend;
     }
@@ -31,4 +37,8 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate {
     public int getVerticalRes() {
         return verticalRes;
     }
+    
+    public SlantHolder.CalculationMethod getSlantCalculationMethod() {
+        return slantCalculationMethod;
+    }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java

@@ -15,25 +15,23 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
 
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 
-public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
+public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
     private final Platform platform;
     
     @Value("slant")
     @Default
     @Description("The slant palettes to use in this biome.")
-    private @Meta List<@Meta SlantLayer> slant = Collections.emptyList();
+    private @Meta List<SlantHolder.@Meta Layer> slantLayers = Collections.emptyList();
     
     @Value("slant-depth")
     @Default
@@ -63,27 +61,16 @@ public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
     @Default
     private @Meta boolean updatePalette = false;
     
-    public BiomePaletteTemplate(Platform platform) { this.platform = platform; }
+    private final SlantHolder.CalculationMethod slantCalculationMethod;
+    
+    public BiomePaletteTemplate(Platform platform, SlantHolder.CalculationMethod slantCalculationMethod) {
+        this.platform = platform;
+        this.slantCalculationMethod = slantCalculationMethod;
+    }
     
     @Override
-    public PaletteInfo get() {
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<Palette, Integer> layer : palettes) {
-            for(Entry<Palette, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), entry.getKey());
-            }
-        }
-        
-        TreeMap<Double, PaletteHolder> slantLayers = new TreeMap<>();
-        double minThreshold = Double.MAX_VALUE;
-        
-        for(SlantLayer layer : slant) {
-            double threshold = layer.getThreshold();
-            if(threshold < minThreshold) minThreshold = threshold;
-            slantLayers.put(threshold, layer.getPalette());
-        }
-        
-        return new PaletteInfo(builder.build(), SlantHolder.of(slantLayers, minThreshold), oceanPalette, seaLevel, slantDepth,
-                               updatePalette);
+    public BiomePaletteInfo get() {
+        return new BiomePaletteInfo(PaletteHolder.of(palettes), SlantHolder.of(slantLayers, slantDepth, slantCalculationMethod),
+                                    oceanPalette, seaLevel, updatePalette);
     }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/PaletteInfo.java

@@ -1,22 +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.chunkgenerator.config.palette;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public record PaletteInfo(PaletteHolder paletteHolder,
-                          SlantHolder slantHolder,
-                          Palette ocean,
-                          int seaLevel,
-                          int maxSlantDepth,
-                          boolean updatePaletteWhenCarving) implements Properties {
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java

@@ -1,42 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.config.palette;
-
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public class SlantLayer implements ObjectTemplate<SlantLayer> {
-    @Value("threshold")
-    private @Meta double threshold;
-    
-    @Value("palette")
-    private @Meta List<@Meta Map<@Meta Palette, @Meta Integer>> palettes;
-    
-    @Override
-    public SlantLayer get() {
-        return this;
-    }
-    
-    public double getThreshold() {
-        return threshold;
-    }
-    
-    public PaletteHolder getPalette() {
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<Palette, Integer> layer : palettes) {
-            for(Entry<Palette, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), entry.getKey());
-            }
-        }
-        
-        return builder.build();
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/slant/SlantLayerTemplate.java

@@ -0,0 +1,27 @@
+package com.dfsek.terra.addons.chunkgenerator.config.palette.slant;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.List;
+import java.util.Map;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;
+
+
+public class SlantLayerTemplate implements ObjectTemplate<SlantHolder.Layer> {
+    
+    @Value("threshold")
+    private @Meta double threshold;
+    
+    @Value("palette")
+    private @Meta List<@Meta Map<@Meta Palette, @Meta Integer>> palettes;
+    
+    @Override
+    public SlantHolder.Layer get() {
+        return new SlantHolder.Layer(PaletteHolder.of(palettes), threshold);
+    }
+}

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

@@ -8,15 +8,14 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;
 
 
-import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
-import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.PaletteUtil;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -40,13 +39,13 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
     private final int carverHorizontalResolution;
     private final int carverVerticalResolution;
     
-    private final PropertyKey<PaletteInfo> paletteInfoPropertyKey;
+    private final PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey;
     private final PropertyKey<BiomeNoiseProperties> noisePropertiesKey;
     
     public NoiseChunkGenerator3D(ConfigPack pack, Platform platform, int elevationBlend, int carverHorizontalResolution,
                                  int carverVerticalResolution,
                                  PropertyKey<BiomeNoiseProperties> noisePropertiesKey,
-                                 PropertyKey<PaletteInfo> paletteInfoPropertyKey) {
+                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey) {
         this.platform = platform;
         this.air = platform.getWorldHandle().air();
         this.carverHorizontalResolution = carverHorizontalResolution;
@@ -97,7 +96,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
                 for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
                     Biome biome = biomeColumn.get(y);
                     
-                    PaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
+                    BiomePaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
                     
                     int sea = paletteInfo.seaLevel();
                     Palette seaPalette = paletteInfo.ocean();
@@ -131,10 +130,10 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         Biome biome = biomeProvider.getBiome(x, y, z, world.getSeed());
         Sampler3D sampler = samplerCache.get(x, z, world, biomeProvider);
         
-        PaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
+        BiomePaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
         
-        int fdX = FastMath.floorMod(x, 16);
-        int fdZ = FastMath.floorMod(z, 16);
+        int fdX = Math.floorMod(x, 16);
+        int fdZ = Math.floorMod(z, 16);
         
         Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
         double noise = sampler.sample(fdX, y, fdZ);
@@ -155,6 +154,16 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         return biomeProvider.getBiome(x, y, z, world.getSeed()).getContext().get(paletteInfoPropertyKey).paletteHolder().getPalette(y);
     }
     
+    public double getSlant(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) {
+        int fdX = Math.floorMod(x, 16);
+        int fdZ = Math.floorMod(z, 16);
+        return biomeProvider.getBiome(x, y, z, world.getSeed())
+                            .getContext()
+                            .get(paletteInfoPropertyKey)
+                            .slantHolder()
+                            .calculateSlant(samplerCache.get(x, z, world, biomeProvider), fdX, y, fdZ);
+    }
+    
     public SamplerProvider samplerProvider() {
         return samplerCache;
     }

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

@@ -7,40 +7,23 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math;
 
-import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 
 public final class PaletteUtil {
-    /**
-     * Derivative constant.
-     */
-    private static final double DERIVATIVE_DIST = 0.55;
     
-    public static Palette getPalette(int x, int y, int z, Sampler3D sampler, PaletteInfo paletteInfo, int depth) {
-        SlantHolder slant = paletteInfo.slantHolder();
-        if(!slant.isEmpty() && depth <= paletteInfo.maxSlantDepth()) {
-            double slope = derivative(sampler, x, y, z);
-            if(slope > slant.getMinSlope()) {
-                return slant.getPalette(slope).getPalette(y);
+    public static Palette getPalette(int x, int y, int z, Sampler3D sampler, BiomePaletteInfo paletteInfo, int depth) {
+        SlantHolder slantHolder = paletteInfo.slantHolder();
+        if(slantHolder.isAboveDepth(depth)) {
+            double slant = slantHolder.calculateSlant(sampler, x, y, z);
+            if(slantHolder.isInSlantThreshold(slant)) {
+                return slantHolder.getPalette(slant).getPalette(y);
             }
         }
         
         return paletteInfo.paletteHolder().getPalette(y);
     }
-    
-    public static double derivative(Sampler3D sampler, double x, double y, double z) {
-        double baseSample = sampler.sample(x, y, z);
-        
-        double xVal1 = (sampler.sample(x + DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double xVal2 = (sampler.sample(x - DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double zVal1 = (sampler.sample(x, y, z + DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double zVal2 = (sampler.sample(x, y, z - DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double yVal1 = (sampler.sample(x, y + DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        double yVal2 = (sampler.sample(x, y - DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        
-        return Math.sqrt(((xVal2 - xVal1) * (xVal2 - xVal1)) + ((zVal2 - zVal1) * (zVal2 - zVal1)) + ((yVal2 - yVal1) * (yVal2 - yVal1)));
-    }
 }

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

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
-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.util.Column;
@@ -134,7 +132,7 @@ public class ChunkInterpolator {
     }
     
     private static int reRange(int value, int high) {
-        return FastMath.max(FastMath.min(value, high), 0);
+        return Math.max(Math.min(value, high), 0);
     }
     
     /**
@@ -146,7 +144,7 @@ public class ChunkInterpolator {
      * @return double - The interpolated noise at the coordinates.
      */
     public double getNoise(double x, double y, double z) {
-        return interpGrid[reRange(((int) x) / 4, 3)][(FastMath.max(FastMath.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
+        return interpGrid[reRange(((int) x) / 4, 3)][(Math.max(Math.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
                                                                                                                           3)].trilerp(
                 (x % 4) / 4, (y % 4) / 4, (z % 4) / 4);
     }

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
-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;
@@ -30,8 +28,8 @@ public class LazilyEvaluatedInterpolator {
                                        PropertyKey<BiomeNoiseProperties> noisePropertiesKey, int min, int horizontalRes, int verticalRes,
                                        long seed) {
         this.noisePropertiesKey = noisePropertiesKey;
-        int hSamples = FastMath.ceilToInt(16.0 / horizontalRes);
-        int vSamples = FastMath.ceilToInt((double) (max - min) / verticalRes);
+        int hSamples = (int) Math.ceil(16.0 / horizontalRes);
+        int vSamples = (int) Math.ceil((double) (max - min) / verticalRes);
         this.zMul = (hSamples + 1);
         this.yMul = zMul * zMul;
         samples = new Double[yMul * (vSamples + 1)];
@@ -52,7 +50,7 @@ public class LazilyEvaluatedInterpolator {
             int xi = ox + chunkX;
             int zi = oz + chunkZ;
             
-            int y = FastMath.min(max, oy);
+            int y = Math.min(max, oy);
             
             sample = biomeProvider
                     .getBiome(xi, y, zi, seed)
@@ -93,7 +91,7 @@ public class LazilyEvaluatedInterpolator {
             return lerp_bottom;
         }
         
-        double yFrac = (double) FastMath.floorMod(y, verticalRes) / verticalRes;
+        double yFrac = (double) Math.floorMod(y, verticalRes) / verticalRes;
         
         
         double sample_0_1_0 = sample(xIndex, yIndex + 1, zIndex, x, y + verticalRes, z);

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

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator;
@@ -28,10 +26,10 @@ public class Sampler3D {
     }
     
     public double sample(double x, double y, double z) {
-        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(FastMath.roundToInt(x), FastMath.roundToInt(z));
+        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation((int) Math.round(x), (int) Math.round(z));
     }
     
     public double sample(int x, int y, int z) {
-        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(FastMath.roundToInt(x), FastMath.roundToInt(z));
+        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(x, z);
     }
 }

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

@@ -19,7 +19,6 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import net.jafama.FastMath;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.api.Platform;
@@ -45,8 +44,8 @@ public class SamplerProvider {
     }
     
     public Sampler3D get(int x, int z, WorldProperties world, BiomeProvider provider) {
-        int cx = FastMath.floorDiv(x, 16);
-        int cz = FastMath.floorDiv(z, 16);
+        int cx = Math.floorDiv(x, 16);
+        int cz = Math.floorDiv(z, 16);
         return getChunk(cx, cz, world, provider);
     }
     

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/BiomePaletteInfo.java

@@ -0,0 +1,20 @@
+/*
+ * 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.chunkgenerator.palette;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
+import com.dfsek.terra.api.properties.Properties;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;
+
+
+public record BiomePaletteInfo(PaletteHolder paletteHolder,
+                               SlantHolder slantHolder,
+                               Palette ocean,
+                               int seaLevel,
+                               boolean updatePaletteWhenCarving) implements Properties {
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java

@@ -7,6 +7,11 @@
 
 package com.dfsek.terra.addons.chunkgenerator.palette;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 
@@ -27,4 +32,43 @@ public class PaletteHolder {
                  : palettes[palettes.length - 1]
                : palettes[0];
     }
+    
+    public static PaletteHolder of(List<Map<Palette, Integer>> palettes) {
+        PaletteHolderBuilder builder = new PaletteHolderBuilder();
+        for(Map<Palette, Integer> layer : palettes) {
+            for(Entry<Palette, Integer> entry : layer.entrySet()) {
+                builder.add(entry.getValue(), entry.getKey());
+            }
+        }
+        return builder.build();
+    }
+    
+    private static class PaletteHolderBuilder {
+        private final TreeMap<Integer, Palette> paletteMap = new TreeMap<>();
+        
+        public PaletteHolderBuilder add(int y, Palette palette) {
+            paletteMap.put(y, palette);
+            return this;
+        }
+        
+        public PaletteHolder build() {
+            
+            int min = Math.min(paletteMap.keySet().stream().min(Integer::compareTo).orElse(0), 0);
+            int max = Math.max(paletteMap.keySet().stream().max(Integer::compareTo).orElse(255), 255);
+            
+            Palette[] palettes = new Palette[paletteMap.lastKey() + 1 - min];
+            for(int y = min; y <= Math.max(paletteMap.lastKey(), max); y++) {
+                Palette d = null;
+                for(Entry<Integer, Palette> e : paletteMap.entrySet()) {
+                    if(e.getKey() >= y) {
+                        d = e.getValue();
+                        break;
+                    }
+                }
+                if(d == null) throw new IllegalArgumentException("No palette for Y=" + y);
+                palettes[y - min] = d;
+            }
+            return new PaletteHolder(palettes, -min);
+        }
+    }
 }

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolderBuilder.java

@@ -1,45 +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.chunkgenerator.palette;
-
-import net.jafama.FastMath;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
-
-public class PaletteHolderBuilder {
-    private final TreeMap<Integer, Palette> paletteMap = new TreeMap<>();
-    
-    public PaletteHolderBuilder add(int y, Palette palette) {
-        paletteMap.put(y, palette);
-        return this;
-    }
-    
-    public PaletteHolder build() {
-        
-        int min = FastMath.min(paletteMap.keySet().stream().min(Integer::compareTo).orElse(0), 0);
-        int max = FastMath.max(paletteMap.keySet().stream().max(Integer::compareTo).orElse(255), 255);
-        
-        Palette[] palettes = new Palette[paletteMap.lastKey() + 1 - min];
-        for(int y = min; y <= FastMath.max(paletteMap.lastKey(), max); y++) {
-            Palette d = null;
-            for(Map.Entry<Integer, Palette> e : paletteMap.entrySet()) {
-                if(e.getKey() >= y) {
-                    d = e.getValue();
-                    break;
-                }
-            }
-            if(d == null) throw new IllegalArgumentException("No palette for Y=" + y);
-            palettes[y - min] = d;
-        }
-        return new PaletteHolder(palettes, -min);
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/SlantHolder.java

@@ -1,64 +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.chunkgenerator.palette;
-
-
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-
-public class SlantHolder {
-    private final TreeMap<Double, PaletteHolder> layers;
-    private final double minSlope;
-    
-    private SlantHolder(TreeMap<Double, PaletteHolder> layers, double minSlope) {
-        this.layers = layers;
-        this.minSlope = minSlope;
-    }
-    
-    public static SlantHolder of(TreeMap<Double, PaletteHolder> layers, double minSlope) {
-        if(layers.size() == 1) {
-            Entry<Double, PaletteHolder> firstEntry = layers.firstEntry();
-            return new Single(firstEntry.getValue(), minSlope);
-        }
-        return new SlantHolder(layers, minSlope);
-    }
-    
-    public boolean isEmpty() {
-        return layers.isEmpty();
-    }
-    
-    public PaletteHolder getPalette(double slope) {
-        return layers.floorEntry(slope).getValue();
-    }
-    
-    public double getMinSlope() {
-        return minSlope;
-    }
-    
-    private static final class Single extends SlantHolder {
-        
-        private final PaletteHolder layers;
-        
-        public Single(PaletteHolder layers, double minSlope) {
-            super(of(minSlope, layers), minSlope);
-            this.layers = layers;
-        }
-        
-        private static TreeMap<Double, PaletteHolder> of(double v, PaletteHolder layer) {
-            TreeMap<Double, PaletteHolder> map = new TreeMap<>();
-            map.put(v, layer);
-            return map;
-        }
-        
-        @Override
-        public PaletteHolder getPalette(double slope) {
-            return layers;
-        }
-    }
-}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/MultipleSlantHolder.java

@@ -0,0 +1,47 @@
+/*
+ * 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.chunkgenerator.palette.slant;
+
+
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+
+
+public class MultipleSlantHolder extends SlantHolderImpl {
+    private final NavigableMap<Double, PaletteHolder> layers;
+    private final double slantThreshold;
+    
+    MultipleSlantHolder(List<SlantHolder.Layer> slant, int slantDepth, CalculationMethod calculationMethod) {
+        super(slantDepth, calculationMethod);
+        NavigableMap<Double, PaletteHolder> layers = new TreeMap<>(slant.stream().collect(Collectors.toMap(SlantHolder.Layer::threshold, SlantHolder.Layer::palette)));
+        Stream<Double> thresholds = layers.keySet().stream();
+        double slantThreshold = floorToThreshold ?
+                                thresholds.min(Double::compare).orElseThrow() :
+                                thresholds.max(Double::compare).orElseThrow();
+        this.layers = layers;
+        this.slantThreshold = slantThreshold;
+    }
+    
+    @Override
+    protected double getSlantThreshold() {
+        return slantThreshold;
+    }
+    
+    @Override
+    public PaletteHolder getPalette(double slant) {
+        return (floorToThreshold ?
+                layers.floorEntry(slant) :
+                layers.ceilingEntry(slant)
+        ).getValue();
+    }
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/SingleSlantHolder.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.addons.chunkgenerator.palette.slant;
+
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+
+
+final class SingleSlantHolder extends SlantHolderImpl {
+    
+    private final SlantHolder.Layer layer;
+    
+    public SingleSlantHolder(SlantHolder.Layer layer, int slantDepth, CalculationMethod calculationMethod) {
+        super(slantDepth, calculationMethod);
+        this.layer = layer;
+    }
+    
+    @Override
+    public PaletteHolder getPalette(double slant) {
+        return layer.palette();
+    }
+    
+    @Override
+    protected double getSlantThreshold() {
+        return layer.threshold();
+    }
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/SlantHolder.java

@@ -0,0 +1,116 @@
+package com.dfsek.terra.addons.chunkgenerator.palette.slant;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.api.util.vector.Vector3;
+
+
+public interface SlantHolder {
+    
+    static SlantHolder of(List<SlantHolder.Layer> layers, int slantDepth, CalculationMethod calculationMethod) {
+        if(layers.isEmpty()) {
+            return EMPTY;
+        } else if(layers.size() == 1) {
+            return new SingleSlantHolder(layers.get(0), slantDepth, calculationMethod);
+        }
+        return new MultipleSlantHolder(layers, slantDepth, calculationMethod);
+    }
+    
+    double calculateSlant(Sampler3D sampler, double x, double y, double z);
+    
+    boolean isAboveDepth(int depth);
+    
+    boolean isInSlantThreshold(double slant);
+    
+    PaletteHolder getPalette(double slant);
+    
+    record Layer(PaletteHolder palette, double threshold)  {
+    }
+    
+    enum CalculationMethod {
+        DotProduct {
+            private static final Vector3 DOT_PRODUCT_DIRECTION = Vector3.of(0, 1, 0);
+        
+            private static final Vector3[] DOT_PRODUCT_SAMPLE_POINTS = {
+                    Vector3.of(0, 0, -DERIVATIVE_DIST),
+                    Vector3.of(0, 0, DERIVATIVE_DIST),
+                    Vector3.of(0, -DERIVATIVE_DIST, 0),
+                    Vector3.of(0, DERIVATIVE_DIST, 0),
+                    Vector3.of(-DERIVATIVE_DIST, 0, 0),
+                    Vector3.of(DERIVATIVE_DIST, 0, 0)
+            };
+            
+            @Override
+            public double slant(Sampler3D sampler, double x, double y, double z) {
+                Vector3.Mutable normalApproximation = Vector3.Mutable.of(0, 0, 0);
+                for(Vector3 point : DOT_PRODUCT_SAMPLE_POINTS) {
+                    var scalar = -sampler.sample(x+point.getX(), y+point.getY(), z+point.getZ());
+                    normalApproximation.add(point.mutable().multiply(scalar));
+                }
+                return DOT_PRODUCT_DIRECTION.dot(normalApproximation.normalize());
+            }
+        
+            @Override
+            public boolean floorToThreshold() {
+                return false;
+            }
+        },
+        
+        Derivative {
+            @Override
+            public double slant(Sampler3D sampler, double x, double y, double z) {
+                double baseSample = sampler.sample(x, y, z);
+        
+                double xVal1 = (sampler.sample(x + DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
+                double xVal2 = (sampler.sample(x - DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
+                double zVal1 = (sampler.sample(x, y, z + DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
+                double zVal2 = (sampler.sample(x, y, z - DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
+                double yVal1 = (sampler.sample(x, y + DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
+                double yVal2 = (sampler.sample(x, y - DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
+        
+                return Math.sqrt(((xVal2 - xVal1) * (xVal2 - xVal1)) + ((zVal2 - zVal1) * (zVal2 - zVal1)) + ((yVal2 - yVal1) * (yVal2 - yVal1)));
+            }
+        
+            @Override
+            public boolean floorToThreshold() {
+                return true;
+            }
+        };
+        
+        private static final double DERIVATIVE_DIST = 0.55;
+        
+        public abstract double slant(Sampler3D sampler, double x, double y, double z);
+        
+        /*
+         * Controls whether palettes should be applied before or after their respective thresholds.
+         *
+         * If true, slant values will map to the palette of the next floor threshold, otherwise they
+         * will map to the ceiling.
+         */
+        public abstract boolean floorToThreshold();
+    }
+    
+    SlantHolder EMPTY = new SlantHolder() {
+        @Override
+        public double calculateSlant(Sampler3D sampler, double x, double y, double z) {
+            throw new UnsupportedOperationException("Empty holder should not calculate slant");
+        }
+        
+        @Override
+        public boolean isAboveDepth(int depth) {
+            return false;
+        }
+        
+        @Override
+        public boolean isInSlantThreshold(double slant) {
+            return false;
+        }
+        
+        @Override
+        public PaletteHolder getPalette(double slant) {
+            throw new UnsupportedOperationException("Empty holder cannot return a palette");
+        }
+    };
+}

common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/SlantHolderImpl.java

@@ -0,0 +1,38 @@
+package com.dfsek.terra.addons.chunkgenerator.palette.slant;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
+
+
+public abstract class SlantHolderImpl implements SlantHolder {
+    private final SlantHolder.CalculationMethod calculationMethod;
+    
+    private final int slantDepth;
+    
+    protected final boolean floorToThreshold;
+    
+    protected SlantHolderImpl(int slantDepth, CalculationMethod calculationMethod) {
+        this.floorToThreshold = calculationMethod.floorToThreshold();
+        this.calculationMethod = calculationMethod;
+        this.slantDepth = slantDepth;
+    }
+    
+    protected abstract double getSlantThreshold();
+    
+    @Override
+    public final double calculateSlant(Sampler3D sampler, double x, double y, double z) {
+        return calculationMethod.slant(sampler, x, y, z);
+    }
+    
+    @Override
+    public final boolean isAboveDepth(int depth) {
+        return depth <= slantDepth;
+    }
+    
+    @Override
+    public final boolean isInSlantThreshold(double slant) {
+        return (floorToThreshold ?
+                slant > getSlantThreshold() :
+                slant < getSlantThreshold()
+        );
+    }
+}

common/addons/config-distributors/build.gradle.kts

@@ -2,11 +2,4 @@ version = version("1.0.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.feature.distributor.lib.jafama")
-}

common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
-import net.jafama.FastMath;
-
 import java.util.Random;
 
 import com.dfsek.terra.api.structure.feature.Distributor;
@@ -21,21 +19,12 @@ public class PaddedGridDistributor implements Distributor {
         this.cellWidth = width + padding;
     }
     
-    private static long murmur64(long h) {
-        h ^= h >>> 33;
-        h *= 0xff51afd7ed558ccdL;
-        h ^= h >>> 33;
-        h *= 0xc4ceb9fe1a85ec53L;
-        h ^= h >>> 33;
-        return h;
-    }
-    
     @Override
     public boolean matches(int x, int z, long seed) {
-        int cellX = FastMath.floorDiv(x, cellWidth);
-        int cellZ = FastMath.floorDiv(z, cellWidth);
+        int cellX = Math.floorDiv(x, cellWidth);
+        int cellZ = Math.floorDiv(z, cellWidth);
         
-        Random random = new Random((murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt);
+        Random random = new Random((MathUtil.murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt);
         
         int pointX = random.nextInt(width) + cellX * cellWidth;
         int pointZ = random.nextInt(width) + cellZ * cellWidth;

common/addons/config-flora/build.gradle.kts

@@ -2,10 +2,4 @@ version = version("1.0.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.flora.lib.jafama")
 }

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.flora.flora.gen;
 
-import net.jafama.FastMath;
-
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -60,7 +58,7 @@ public class TerraFlora implements Structure {
     }
     
     private ProbabilityCollection<BlockState> getStateCollection(int layer) {
-        return layers.get(FastMath.max(FastMath.min(layer, layers.size() - 1), 0));
+        return layers.get(Math.max(Math.min(layer, layers.size() - 1), 0));
     }
     
     private EnumSet<Direction> getFaces(Vector3Int b, WritableWorld world) {
@@ -82,8 +80,8 @@ public class TerraFlora implements Structure {
                 Direction.class);
         if(doRotation && faces.size() == 0) return false; // Don't plant if no faces are valid.
         
-        for(int i = 0; FastMath.abs(i) < size; i += c) { // Down if ceiling, up if floor
-            int lvl = (FastMath.abs(i));
+        for(int i = 0; Math.abs(i) < size; i += c) { // Down if ceiling, up if floor
+            int lvl = (Math.abs(i));
             BlockState data = getStateCollection((ceiling ? lvl : size - lvl - 1)).get(distribution, location.getX(), location.getY(),
                                                                                        location.getZ(), world.getSeed());
             if(doRotation) {

common/addons/config-locators/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.feature.locator.lib.jafama")
-}
+}

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
@@ -27,8 +25,8 @@ public class PatternLocator implements Locator {
     
     @Override
     public BinaryColumn getSuitableCoordinates(Column<?> column) {
-        int min = FastMath.max(column.getMinY(), search.getMin());
-        int max = FastMath.min(column.getMaxY(), search.getMax());
+        int min = Math.max(column.getMinY(), search.getMin());
+        int max = Math.min(column.getMaxY(), search.getMax());
         if(min >= max) return BinaryColumn.getNull();
         return new BinaryColumn(min, max, y -> pattern.matches(y, column));
     }

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.util.Range;
@@ -26,8 +24,8 @@ public class SurfaceLocator implements Locator {
     @Override
     public BinaryColumn getSuitableCoordinates(Column<?> column) {
         BinaryColumnBuilder builder = column.newBinaryColumn();
-        int max = FastMath.min(search.getMax(), column.getMaxY());
-        int min = FastMath.max(search.getMin(), column.getMinY());
+        int max = Math.min(search.getMax(), column.getMaxY());
+        int min = Math.max(search.getMin(), column.getMinY());
         if(min >= max) return builder.build();
         for(int y = min; y < max; y++) {
             if(column.getBlock(y).isAir() && !column.getBlock(y - 1).isAir()) {

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.feature.locator.patterns;
 
-import net.jafama.FastMath;
-
 import java.util.function.Predicate;
 
 import com.dfsek.terra.api.block.state.BlockState;
@@ -28,8 +26,8 @@ public class MatchPattern implements Pattern {
     
     @Override
     public boolean matches(int y, Column<?> column) {
-        int min = FastMath.max(column.getMinY(), range.getMin() + y);
-        int max = FastMath.min(column.getMaxY(), range.getMax() + y);
+        int min = Math.max(column.getMinY(), range.getMin() + y);
+        int max = Math.min(column.getMaxY(), range.getMax() + y);
         if(max <= min) return false;
         for(int i = min; i < max; i++) {
             if(!matches.test(column.getBlock(i))) return false;
@@ -39,8 +37,8 @@ public class MatchPattern implements Pattern {
     
     @Override
     public boolean matches(WritableWorld world, int x, int y, int z) {
-        int min = FastMath.max(world.getMinHeight(), range.getMin() + y);
-        int max = FastMath.min(world.getMaxHeight(), range.getMax() + y);
+        int min = Math.max(world.getMinHeight(), range.getMin() + y);
+        int max = Math.min(world.getMaxHeight(), range.getMax() + y);
         if(max <= min) return false;
         for(int i = min; i < max; i++) {
             if(!matches.test(world.getBlockState(x, i, z))) return false;

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

@@ -1,16 +1,8 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = version("1.0.0")
+version = version("1.1.0")
 
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
     api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
-
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.noise.lib.paralithic")
-    relocate("net.jafama", "com.dfsek.terra.addons.noise.lib.jafama")
-}

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

@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
 import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
 import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
@@ -21,20 +22,26 @@ 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.PseudoErosionSamplerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.SimpleNoiseTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotionTemplate;
 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.CubicSplineNormalizerTemplate;
+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;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate;
+import com.dfsek.terra.addons.noise.math.CubicSpline;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.DivisionSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler;
@@ -42,6 +49,7 @@ 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;
@@ -83,8 +91,11 @@ 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);
+                       .applyLoader(FunctionTemplate.class, FunctionTemplate::new)
+                       .applyLoader(CubicSpline.Point.class, CubicSplinePointTemplate::new);
             
                   noiseRegistry.register(addon.key("LINEAR"), LinearNormalizerTemplate::new);
                   noiseRegistry.register(addon.key("NORMAL"), NormalNormalizerTemplate::new);
@@ -92,9 +103,10 @@ public class NoiseAddon implements AddonInitializer {
                   noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new);
                   noiseRegistry.register(addon.key("SCALE"), ScaleNormalizerTemplate::new);
                   noiseRegistry.register(addon.key("POSTERIZATION"), PosterizationNormalizerTemplate::new);
-            
+                  noiseRegistry.register(addon.key("CUBIC_SPLINE"), CubicSplineNormalizerTemplate::new);
+    
                   noiseRegistry.register(addon.key("IMAGE"), ImageSamplerTemplate::new);
-            
+    
                   noiseRegistry.register(addon.key("DOMAIN_WARP"), DomainWarpTemplate::new);
             
                   noiseRegistry.register(addon.key("FBM"), BrownianMotionTemplate::new);
@@ -112,16 +124,20 @@ public class NoiseAddon implements AddonInitializer {
                   noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new));
             
                   noiseRegistry.register(addon.key("CELLULAR"), CellularNoiseTemplate::new);
+                  noiseRegistry.register(addon.key("PSEUDOEROSION"), PseudoErosionSamplerTemplate::new);
             
                   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));
@@ -134,7 +150,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/CubicSplinePointTemplate.java

@@ -0,0 +1,25 @@
+package com.dfsek.terra.addons.noise.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.addons.noise.math.CubicSpline.Point;
+import com.dfsek.terra.api.config.meta.Meta;
+
+
+public class CubicSplinePointTemplate implements ObjectTemplate<Point> {
+    
+    @Value("from")
+    private @Meta double from;
+    
+    @Value("to")
+    private @Meta double to;
+    
+    @Value("gradient")
+    private @Meta double gradient;
+    
+    @Override
+    public Point get() {
+        return new Point(from, to, gradient);
+    }
+}

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

@@ -8,6 +8,8 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.awt.image.BufferedImage;
 
@@ -19,6 +21,10 @@ import com.dfsek.terra.api.noise.NoiseSampler;
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {
     
+    private static final Logger logger = LoggerFactory.getLogger(ImageSamplerTemplate.class);
+    
+    private static boolean used = false;
+    
     @Value("image")
     private @Meta BufferedImage image;
     
@@ -30,6 +36,12 @@ public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {
     
     @Override
     public NoiseSampler get() {
+        if(!used) {
+            logger.warn("The IMAGE NoiseSampler implemented by the config-noise-function addon is deprecated. " +
+                        "It is recommended to use the IMAGE NoiseSampler implemented by the config-noise-image " +
+                        "addon instead.");
+            used = true;
+        }
         return new ImageSampler(image, channel, frequency);
     }
 }

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

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

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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,42 @@
+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,7 +8,6 @@
 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;
 
@@ -19,17 +18,16 @@ 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> otherFunctions;
+    private final Map<String, DimensionApplicableNoiseSampler> globalSamplers;
     private final Map<String, FunctionTemplate> globalFunctions;
     @Value("variables")
     @Default
@@ -43,44 +41,19 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFuncti
     @Default
     private @Meta LinkedHashMap<String, @Meta FunctionTemplate> functions = new LinkedHashMap<>();
     
-    public ExpressionFunctionTemplate(Map<String, DimensionApplicableNoiseSampler> otherFunctions, Map<String, FunctionTemplate> samplers) {
-        this.otherFunctions = otherFunctions;
-        this.globalFunctions = samplers;
+    public ExpressionFunctionTemplate(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 {
-            Map<String, Function> noiseFunctionMap = generateFunctions();
-            return new ExpressionFunction(noiseFunctionMap, expression, vars);
+            return new ExpressionFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), 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/noise/PseudoErosionSamplerTemplate.java

@@ -0,0 +1,49 @@
+/*
+ * 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.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.PseudoErosionSampler;
+import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+@SuppressWarnings("FieldMayBeFinal")
+public class PseudoErosionSamplerTemplate extends SamplerTemplate<PseudoErosionSampler> {
+    
+    @Value("frequency")
+    @Default
+    protected @Meta double frequency = 0.01d;
+//    protected @Meta double frequency = 0.02d;
+    
+    @Value("salt")
+    @Default
+    protected @Meta long salt = 0;
+    
+    @Value("jitter")
+    @Default
+    private @Meta double jitter = 1.0D;
+    
+    @Value("lookup")
+    @Default
+    private @Meta NoiseSampler lookup = null;
+    
+    @Override
+    public NoiseSampler get() {
+        if(lookup == null) {
+            OpenSimplex2Sampler lookup = new OpenSimplex2Sampler();
+            lookup.setFrequency(0.0005);
+            this.lookup = lookup;
+        }
+        return new PseudoErosionSampler(salt, frequency, lookup, jitter);
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.dfsek.terra.addons.noise.config.templates.normalizer;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.noise.math.CubicSpline;
+import com.dfsek.terra.addons.noise.math.CubicSpline.Point;
+import com.dfsek.terra.addons.noise.normalizer.CubicSplineNoiseSampler;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+public class CubicSplineNormalizerTemplate extends NormalizerTemplate<CubicSplineNoiseSampler> {
+    
+    @Value("points")
+    private @Meta List<@Meta Point> points;
+    
+    @Override
+    public NoiseSampler get() {
+        return new CubicSplineNoiseSampler(function, new CubicSpline(points));
+    }
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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 java.util.HashMap;
+import java.util.LinkedHashMap;
+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.normalizer.ExpressionNormalizer;
+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({ "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/math/CubicSpline.java

@@ -0,0 +1,87 @@
+package com.dfsek.terra.addons.noise.math;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+
+import static com.dfsek.terra.api.util.MathUtil.lerp;
+
+
+public class CubicSpline {
+    
+    private final double[] fromValues;
+    private final double[] toValues;
+    private final double[] gradients;
+    
+    public CubicSpline(List<Point> points) {
+        Collections.sort(points);
+        
+        this.fromValues = new double[points.size()];
+        this.toValues = new double[points.size()];
+        this.gradients = new double[points.size()];
+        
+        for(int i = 0; i < points.size(); i++) {
+            fromValues[i] = points.get(i).from;
+            toValues[i] = points.get(i).to;
+            gradients[i] = points.get(i).gradient;
+        }
+    }
+    
+    public double apply(double in) {
+        return calculate(in, fromValues, toValues, gradients);
+    }
+    
+    public static double calculate(double in, double[] fromValues, double[] toValues, double[] gradients) {
+        int pointIdx = floorBinarySearch(in, fromValues) - 1;
+        
+        int pointIdxLast = fromValues.length - 1;
+        
+        if (pointIdx < 0) { // If to left of first point return linear function intersecting said point using point's gradient
+            return gradients[0] * (in - fromValues[0]) + toValues[0];
+        } else if (pointIdx == pointIdxLast) { // Do same if to right of last point
+            return gradients[pointIdxLast] * (in - fromValues[pointIdxLast]) + toValues[pointIdxLast];
+        } else {
+            double fromLeft = fromValues[pointIdx];
+            double fromRight = fromValues[pointIdx + 1];
+            
+            double toLeft = toValues[pointIdx];
+            double toRight = toValues[pointIdx + 1];
+            
+            double gradientLeft =  gradients[pointIdx];
+            double gradientRight = gradients[pointIdx + 1];
+            
+            double fromDelta = fromRight - fromLeft;
+            double toDelta = toRight - toLeft;
+            
+            double t = (in - fromLeft) / fromDelta;
+            
+            return lerp(t, toLeft, toRight) + t * (1.0F - t) * lerp(t, gradientLeft * fromDelta - toDelta, -gradientRight * fromDelta + toDelta);
+        }
+    }
+    
+    private static int floorBinarySearch(double targetValue, double[] values) {
+        int left = 0;
+        int right = values.length;
+        int idx = right - left;
+        while (idx > 0) {
+            int halfDelta = idx / 2;
+            int mid = left + halfDelta;
+            if (targetValue < values[mid]) {
+                idx = halfDelta;
+            } else {
+                left = mid + 1;
+                idx -= halfDelta + 1;
+            }
+        }
+        return left;
+    }
+
+    public record Point(double from, double to, double gradient) implements Comparable<Point> {
+        
+        @Override
+        public int compareTo(@NotNull CubicSpline.Point o) {
+            return Double.compare(from, o.from);
+        }
+    }
+}

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

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.noise.normalizer;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
@@ -24,6 +22,6 @@ public class ClampNormalizer extends Normalizer {
     
     @Override
     public double normalize(double in) {
-        return FastMath.max(FastMath.min(in, max), min);
+        return Math.max(Math.min(in, max), min);
     }
 }

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

@@ -0,0 +1,20 @@
+package com.dfsek.terra.addons.noise.normalizer;
+
+import com.dfsek.terra.addons.noise.math.CubicSpline;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+public class CubicSplineNoiseSampler extends Normalizer {
+    
+    private final CubicSpline spline;
+    
+    public CubicSplineNoiseSampler(NoiseSampler sampler, CubicSpline spline) {
+        super(sampler);
+        this.spline = spline;
+    }
+    
+    @Override
+    public double normalize(double in) {
+        return spline.apply(in);
+    }
+}

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

@@ -0,0 +1,33 @@
+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 java.util.Map;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+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/normalizer/NormalNormalizer.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.noise.normalizer;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
 
@@ -41,8 +39,8 @@ public class NormalNormalizer extends Normalizer {
                 end = mid;
             }
         }
-        double left = FastMath.abs(lookup[start] - in);
-        double right = FastMath.abs(lookup[end] - in);
+        double left = Math.abs(lookup[start] - in);
+        double right = Math.abs(lookup[end] - in);
         
         double fin;
         if(left <= right) {

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

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.normalizer;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 public abstract class Normalizer implements NoiseSampler {
     private final NoiseSampler sampler;
@@ -20,12 +22,12 @@ public abstract class Normalizer implements NoiseSampler {
     public abstract double normalize(double in);
     
     @Override
-    public double noise(long seed, double x, double y) {
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return normalize(sampler.noise(seed, x, y));
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return normalize(sampler.noise(seed, x, y, z));
     }
 }

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

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.noise.normalizer;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
@@ -22,6 +20,6 @@ public class PosterizationNormalizer extends Normalizer {
     
     @Override
     public double normalize(double in) {
-        return FastMath.roundToInt((in + 1) / stepSize) * stepSize - 1;
+        return (int) Math.round((in + 1) / stepSize) * stepSize - 1;
     }
 }

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

@@ -0,0 +1,31 @@
+package com.dfsek.terra.addons.noise.paralithic;
+
+import com.dfsek.paralithic.eval.tokenizer.ParseException;
+import com.dfsek.paralithic.functions.Function;
+
+import java.util.HashMap;
+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.paralithic.defined.UserDefinedFunction;
+import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction2;
+import com.dfsek.terra.addons.noise.paralithic.noise.NoiseFunction3;
+
+
+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/DomainWarpedSampler.java

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.samplers;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 public class DomainWarpedSampler implements NoiseSampler {
     private final NoiseSampler function;
@@ -22,7 +24,7 @@ public class DomainWarpedSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y) {
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return function.noise(seed++,
                               x + warp.noise(seed++, x, y) * amplitude,
                               y + warp.noise(seed, x, y) * amplitude
@@ -30,7 +32,7 @@ public class DomainWarpedSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return function.noise(seed++,
                               x + warp.noise(seed++, x, y, z) * amplitude,
                               y + warp.noise(seed++, x, y, z) * amplitude,

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

@@ -7,9 +7,8 @@
 
 package com.dfsek.terra.addons.noise.samplers;
 
-import net.jafama.FastMath;
-
 import java.awt.image.BufferedImage;
+import java.util.List;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
@@ -27,14 +26,14 @@ public class ImageSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y) {
-        return ((channel.getChannel(image.getRGB(FastMath.floorMod(FastMath.floorToInt(x * frequency), image.getWidth()),
-                                                 FastMath.floorMod(FastMath.floorToInt(y * frequency), image.getHeight()))) / 255D) - 0.5) *
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        return ((channel.getChannel(image.getRGB(Math.floorMod((int) Math.floor(x * frequency), image.getWidth()),
+                                                 Math.floorMod((int) Math.floor(y * frequency), image.getHeight()))) / 255D) - 0.5) *
                2;
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return noise(seed, x, y);
     }
     

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

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.samplers;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 public class KernelSampler implements NoiseSampler {
     private final double[][] kernel;
@@ -25,7 +27,7 @@ public class KernelSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y) {
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         x *= frequency;
         y *= frequency;
         double accumulator = 0;
@@ -43,7 +45,7 @@ public class KernelSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         x *= frequency;
         y *= frequency;
         z *= frequency;

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

@@ -2,6 +2,8 @@ package com.dfsek.terra.addons.noise.samplers;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 public class LinearHeightmapSampler implements NoiseSampler {
     private final NoiseSampler sampler;
@@ -16,12 +18,12 @@ public class LinearHeightmapSampler implements NoiseSampler {
     
     
     @Override
-    public double noise(long seed, double x, double y) {
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return noise(seed, x, 0, y);
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return -y + base + sampler.noise(seed, x, y, z) * scale;
     }
 }

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

@@ -0,0 +1,29 @@
+package com.dfsek.terra.addons.noise.samplers;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+import java.util.List;
+
+
+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, List<double[]> context, int contextLayer, int contextRadius) {
+        return sampler.noise(seed, x - dx, y - dz);
+    }
+    
+    @Override
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        return sampler.noise(seed, x - dx, y - dy, z - dz);
+    }
+}

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

@@ -2,6 +2,8 @@ package com.dfsek.terra.addons.noise.samplers.arithmetic;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 public abstract class BinaryArithmeticSampler implements NoiseSampler {
     private final NoiseSampler left;
@@ -13,12 +15,12 @@ public abstract class BinaryArithmeticSampler implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y) {
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return operate(left.noise(seed, x, y), right.noise(seed, x, y));
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return operate(left.noise(seed, x, y, z), right.noise(seed, x, y, z));
     }
     

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.noise.samplers.arithmetic;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
@@ -12,6 +10,6 @@ public class MaxSampler extends BinaryArithmeticSampler {
     
     @Override
     public double operate(double left, double right) {
-        return FastMath.max(left, right);
+        return Math.max(left, right);
     }
 }

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.noise.samplers.arithmetic;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
@@ -12,6 +10,6 @@ public class MinSampler extends BinaryArithmeticSampler {
     
     @Override
     public double operate(double left, double right) {
-        return FastMath.min(left, right);
+        return Math.min(left, right);
     }
 }

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

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.List;
+
 
 /**
  * NoiseSampler implementation for Cellular (Voronoi/Worley) Noise.
@@ -221,10 +221,10 @@ public class CellularSampler extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long sl, double x, double y) {
+    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         int seed = (int) sl;
-        int xr = fastRound(x);
-        int yr = fastRound(y);
+        int xr = (int) Math.round(x);
+        int yr = (int) Math.round(y);
         
         double distance0 = Double.MAX_VALUE;
         double distance1 = Double.MAX_VALUE;
@@ -240,106 +240,42 @@ public class CellularSampler extends NoiseFunction {
         double centerX = x;
         double centerY = y;
         
-        switch(distanceFunction) {
-            default:
-            case Euclidean:
-            case EuclideanSq:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
-                    
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int hash = hash(seed, xPrimed, yPrimed);
-                        int idx = hash & (255 << 1);
-                        
-                        double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter;
-                        double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter;
-                        
-                        double newDistance = vecX * vecX + vecY * vecY;
-                        
-                        distance1 = fastMax(fastMin(distance1, newDistance), distance0);
-                        if(newDistance < distance0) {
-                            distance0 = newDistance;
-                            closestHash = hash;
-                            centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency);
-                            centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency);
-                        } else if(newDistance < distance1) {
-                            distance2 = distance1;
-                            distance1 = newDistance;
-                        } else if(newDistance < distance2) {
-                            distance2 = newDistance;
-                        }
-                        yPrimed += PRIME_Y;
-                    }
-                    xPrimed += PRIME_X;
+        for(int xi = xr - 1; xi <= xr + 1; xi++) {
+            int yPrimed = yPrimedBase;
+            
+            for(int yi = yr - 1; yi <= yr + 1; yi++) {
+                int hash = hash(seed, xPrimed, yPrimed);
+                int idx = hash & (255 << 1);
+                
+                double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter;
+                double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter;
+                
+                double newDistance = switch(distanceFunction) {
+                    case Manhattan -> Math.abs(vecX) + Math.abs(vecY);
+                    case Hybrid -> (Math.abs(vecX) + Math.abs(vecY)) + (vecX * vecX + vecY * vecY);
+                    default -> vecX * vecX + vecY * vecY;
+                };
+                
+                distance1 = Math.max(Math.min(distance1, newDistance), distance0);
+                if(newDistance < distance0) {
+                    distance0 = newDistance;
+                    closestHash = hash;
+                    centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency);
+                    centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency);
+                } else if(newDistance < distance1) {
+                    distance2 = distance1;
+                    distance1 = newDistance;
+                } else if(newDistance < distance2) {
+                    distance2 = newDistance;
                 }
-                break;
-            case Manhattan:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
-                    
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int hash = hash(seed, xPrimed, yPrimed);
-                        int idx = hash & (255 << 1);
-                        
-                        double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter;
-                        double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter;
-                        
-                        double newDistance = fastAbs(vecX) + fastAbs(vecY);
-                        
-                        distance1 = fastMax(fastMin(distance1, newDistance), distance0);
-                        if(newDistance < distance0) {
-                            distance0 = newDistance;
-                            closestHash = hash;
-                            centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency);
-                            centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency);
-                        } else if(newDistance < distance1) {
-                            distance2 = distance1;
-                            distance1 = newDistance;
-                        } else if(newDistance < distance2) {
-                            distance2 = newDistance;
-                        }
-                        yPrimed += PRIME_Y;
-                    }
-                    xPrimed += PRIME_X;
-                }
-                break;
-            case Hybrid:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
-                    
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int hash = hash(seed, xPrimed, yPrimed);
-                        int idx = hash & (255 << 1);
-                        
-                        double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter;
-                        double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter;
-                        
-                        double newDistance = (fastAbs(vecX) + fastAbs(vecY)) + (vecX * vecX + vecY * vecY);
-                        
-                        distance1 = fastMax(fastMin(distance1, newDistance), distance0);
-                        if(newDistance < distance0) {
-                            distance0 = newDistance;
-                            closestHash = hash;
-                            centerX = ((xi + RAND_VECS_2D[idx] * cellularJitter) / frequency);
-                            centerY = ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / frequency);
-                        } else if(newDistance < distance1) {
-                            distance2 = distance1;
-                            distance1 = newDistance;
-                        } else if(newDistance < distance2) {
-                            distance2 = newDistance;
-                        }
-                        yPrimed += PRIME_Y;
-                    }
-                    xPrimed += PRIME_X;
-                }
-                break;
+                yPrimed += PRIME_Y;
+            }
+            xPrimed += PRIME_X;
         }
         
         if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) {
-            distance0 = fastSqrt(distance0);
-            if(returnType != ReturnType.CellValue) {
-                distance1 = fastSqrt(distance1);
-            }
+            distance0 = Math.sqrt(distance0);
+            distance1 = Math.sqrt(distance1);
         }
         
         return switch(returnType) {
@@ -351,21 +287,22 @@ public class CellularSampler extends NoiseFunction {
             case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
             case Distance2Div -> distance0 / distance1 - 1;
             case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY);
+            case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY);
             case Distance3 -> distance2 - 1;
             case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
             case Distance3Sub -> distance2 - distance0 - 1;
             case Distance3Mul -> distance2 * distance0 - 1;
             case Distance3Div -> distance0 / distance2 - 1;
-            case Angle -> FastMath.atan2(y / frequency - centerY, x / frequency - centerX);
+            case Angle -> Math.atan2(y / frequency - centerY, x / frequency - centerX);
         };
     }
     
     @Override
-    public double getNoiseRaw(long sl, double x, double y, double z) {
+    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         int seed = (int) sl;
-        int xr = fastRound(x);
-        int yr = fastRound(y);
-        int zr = fastRound(z);
+        int xr = (int) Math.round(x);
+        int yr = (int) Math.round(y);
+        int zr = (int) Math.round(z);
         
         double distance0 = Double.MAX_VALUE;
         double distance1 = Double.MAX_VALUE;
@@ -382,126 +319,53 @@ public class CellularSampler extends NoiseFunction {
         double centerY = y;
         double centerZ = z;
         
-        switch(distanceFunction) {
-            case Euclidean:
-            case EuclideanSq:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
+        for(int xi = xr - 1; xi <= xr + 1; xi++) {
+            int yPrimed = yPrimedBase;
+            
+            for(int yi = yr - 1; yi <= yr + 1; yi++) {
+                int zPrimed = zPrimedBase;
+                
+                for(int zi = zr - 1; zi <= zr + 1; zi++) {
+                    int hash = hash(seed, xPrimed, yPrimed, zPrimed);
+                    int idx = hash & (255 << 2);
                     
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int zPrimed = zPrimedBase;
-                        
-                        for(int zi = zr - 1; zi <= zr + 1; zi++) {
-                            int hash = hash(seed, xPrimed, yPrimed, zPrimed);
-                            int idx = hash & (255 << 2);
-                            
-                            double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter;
-                            double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter;
-                            double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter;
-                            
-                            double newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ;
-                            
-                            if(newDistance < distance0) {
-                                distance0 = newDistance;
-                                closestHash = hash;
-                                centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency);
-                                centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency);
-                                centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency);
-                            } else if(newDistance < distance1) {
-                                distance2 = distance1;
-                                distance1 = newDistance;
-                            } else if(newDistance < distance2) {
-                                distance2 = newDistance;
-                            }
-                            zPrimed += PRIME_Z;
-                        }
-                        yPrimed += PRIME_Y;
-                    }
-                    xPrimed += PRIME_X;
-                }
-                break;
-            case Manhattan:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
+                    double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter;
+                    double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter;
+                    double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter;
                     
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int zPrimed = zPrimedBase;
-                        
-                        for(int zi = zr - 1; zi <= zr + 1; zi++) {
-                            int hash = hash(seed, xPrimed, yPrimed, zPrimed);
-                            int idx = hash & (255 << 2);
-                            
-                            double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter;
-                            double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter;
-                            double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter;
-                            
-                            double newDistance = fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ);
-                            
-                            if(newDistance < distance0) {
-                                distance0 = newDistance;
-                                closestHash = hash;
-                                centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency);
-                                centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency);
-                                centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency);
-                            } else if(newDistance < distance1) {
-                                distance2 = distance1;
-                                distance1 = newDistance;
-                            } else if(newDistance < distance2) {
-                                distance2 = newDistance;
-                            }
-                            zPrimed += PRIME_Z;
+                    double newDistance = 0;
+                    switch(distanceFunction) {
+                        case Euclidean, EuclideanSq -> newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ;
+                        case Manhattan -> newDistance = Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ);
+                        case Hybrid -> {
+                            newDistance = (Math.abs(vecX) + Math.abs(vecY) + Math.abs(vecZ)) + (vecX * vecX + vecY * vecY + vecZ * vecZ);
+                            distance1 = Math.max(Math.min(distance1, newDistance), distance0);
                         }
-                        yPrimed += PRIME_Y;
                     }
-                    xPrimed += PRIME_X;
-                }
-                break;
-            case Hybrid:
-                for(int xi = xr - 1; xi <= xr + 1; xi++) {
-                    int yPrimed = yPrimedBase;
                     
-                    for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                        int zPrimed = zPrimedBase;
-                        
-                        for(int zi = zr - 1; zi <= zr + 1; zi++) {
-                            int hash = hash(seed, xPrimed, yPrimed, zPrimed);
-                            int idx = hash & (255 << 2);
-                            
-                            double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter;
-                            double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter;
-                            double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter;
-                            
-                            double newDistance = (fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ)) +
-                                                 (vecX * vecX + vecY * vecY + vecZ * vecZ);
-                            
-                            distance1 = fastMax(fastMin(distance1, newDistance), distance0);
-                            if(newDistance < distance0) {
-                                distance0 = newDistance;
-                                closestHash = hash;
-                                centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency);
-                                centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency);
-                                centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency);
-                            } else if(newDistance < distance1) {
-                                distance2 = distance1;
-                                distance1 = newDistance;
-                            } else if(newDistance < distance2) {
-                                distance2 = newDistance;
-                            }
-                            zPrimed += PRIME_Z;
-                        }
-                        yPrimed += PRIME_Y;
+                    if(newDistance < distance0) {
+                        distance0 = newDistance;
+                        closestHash = hash;
+                        centerX = ((xi + RAND_VECS_3D[idx] * cellularJitter) / frequency);
+                        centerY = ((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / frequency);
+                        centerZ = ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / frequency);
+                    } else if(newDistance < distance1) {
+                        distance2 = distance1;
+                        distance1 = newDistance;
+                    } else if(newDistance < distance2) {
+                        distance2 = newDistance;
                     }
-                    xPrimed += PRIME_X;
+                    zPrimed += PRIME_Z;
                 }
-                break;
-            default:
-                break;
+                yPrimed += PRIME_Y;
+            }
+            xPrimed += PRIME_X;
         }
         
         if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) {
-            distance0 = fastSqrt(distance0);
+            distance0 = Math.sqrt(distance0);
             if(returnType != ReturnType.CellValue) {
-                distance1 = fastSqrt(distance1);
+                distance1 = Math.sqrt(distance1);
             }
         }
         
@@ -514,12 +378,13 @@ public class CellularSampler extends NoiseFunction {
             case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
             case Distance2Div -> distance0 / distance1 - 1;
             case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY, centerZ);
+            case LocalNoiseLookup -> noiseLookup.noise(sl, x / frequency - centerX, y / frequency - centerY, z / frequency - centerZ);
             case Distance3 -> distance2 - 1;
             case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
             case Distance3Sub -> distance2 - distance0 - 1;
             case Distance3Mul -> distance2 * distance0 - 1;
             case Distance3Div -> distance0 / distance2 - 1;
-            case Angle -> FastMath.atan2(y / frequency - centerY, x / frequency - centerX);
+            case Angle -> Math.atan2(y / frequency - centerY, x / frequency - centerX);
         };
     }
     
@@ -540,6 +405,7 @@ public class CellularSampler extends NoiseFunction {
         Distance2Mul,
         Distance2Div,
         NoiseLookup,
+        LocalNoiseLookup,
         Distance3,
         Distance3Add,
         Distance3Sub,

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

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise;
 
+import java.util.List;
+
+
 /**
  * Sampler3D implementation that returns a constant.
  */
@@ -18,12 +21,12 @@ public class ConstantSampler extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return constant;
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return constant;
     }
 }

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

@@ -0,0 +1,69 @@
+package com.dfsek.terra.addons.noise.samplers.noise;
+
+
+import java.util.List;
+
+
+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, List<double[]> context, int contextLayer, int contextRadius) {
+        double dx = x - ox;
+        double dy = y - oz;
+        if (normalize && (Math.abs(dx) > radius || Math.abs(dy) > radius)) return 1;
+        double dist = distance2d(distanceFunction, dx, dy);
+        if (normalize) return Math.min(((2*dist)/distanceAtRadius)-1, 1);
+        return dist;
+    }
+    
+    @Override
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        double dx = x - ox;
+        double dy = y - oy;
+        double dz = z - oz;
+        if(normalize && (Math.abs(dx) > radius || Math.abs(dy) > radius || Math.abs(dz) > radius)) return 1;
+        double dist = distance3d(distanceFunction, dx, dy, dz);
+        if (normalize) return Math.min(((2*dist)/distanceAtRadius)-1, 1);
+        return dist;
+    }
+    
+    private static double distance2d(DistanceFunction distanceFunction, double x, double z) {
+        return switch(distanceFunction) {
+            case Euclidean -> Math.sqrt(x*x + z*z);
+            case EuclideanSq -> x*x + z*z;
+            case Manhattan -> Math.abs(x) + Math.abs(z);
+        };
+    }
+    
+    private static double distance3d(DistanceFunction distanceFunction, double x, double y, double z) {
+        return switch(distanceFunction) {
+            case Euclidean -> Math.sqrt(x*x + y*y + z*z);
+            case EuclideanSq -> x*x + y*y + z*z;
+            case Manhattan -> Math.abs(x) + Math.abs(y) + Math.abs(z);
+        };
+    }
+    
+    public enum DistanceFunction {
+        Euclidean,
+        EuclideanSq,
+        Manhattan
+    }
+}

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

@@ -13,6 +13,7 @@ import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.paralithic.functions.Function;
 
+import java.util.List;
 import java.util.Map;
 
 import com.dfsek.terra.addons.noise.paralithic.noise.SeedContext;
@@ -41,12 +42,12 @@ public class ExpressionFunction extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         return expression.evaluate(new SeedContext(seed), x, 0, y);
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return expression.evaluate(new SeedContext(seed), x, y, z);
     }
 }

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

@@ -7,9 +7,10 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.addons.noise.samplers.noise.random.WhiteNoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
+
+import java.util.List;
 
 
 public class GaborNoiseSampler extends NoiseFunction {
@@ -17,11 +18,11 @@ public class GaborNoiseSampler extends NoiseFunction {
     private double k = 1.0;
     private double a = 0.1;
     private double f0 = 0.625;
-    private double kernelRadius = (FastMath.sqrt(-FastMath.log(0.05) / Math.PI) / a);
+    private double kernelRadius = (Math.sqrt(-Math.log(0.05) / Math.PI) / a);
     private double impulsesPerKernel = 64d;
     private double impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius));
     private double impulsesPerCell = impulseDensity * kernelRadius * kernelRadius;
-    private double g = FastMath.exp(-impulsesPerCell);
+    private double g = Math.exp(-impulsesPerCell);
     
     private double omega0 = Math.PI * 0.25;
     private boolean isotropic = true;
@@ -32,17 +33,17 @@ public class GaborNoiseSampler extends NoiseFunction {
     }
     
     private void recalculateRadiusAndDensity() {
-        kernelRadius = (FastMath.sqrt(-FastMath.log(0.05) / Math.PI) / this.a);
+        kernelRadius = (Math.sqrt(-Math.log(0.05) / Math.PI) / this.a);
         impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius));
         impulsesPerCell = impulseDensity * kernelRadius * kernelRadius;
-        g = FastMath.exp(-impulsesPerCell);
+        g = Math.exp(-impulsesPerCell);
     }
     
     private double gaborNoise(long seed, double x, double y) {
         x /= kernelRadius;
         y /= kernelRadius;
-        int xi = fastFloor(x);
-        int yi = fastFloor(y);
+        int xi = (int) Math.floor(x);
+        int yi = (int) Math.floor(y);
         double xf = x - xi;
         double yf = y - yi;
         double noise = 0;
@@ -55,7 +56,7 @@ public class GaborNoiseSampler extends NoiseFunction {
     }
     
     private double calculateCell(long seed, int xi, int yi, double x, double y) {
-        long mashedSeed = murmur64(31L * xi + yi) + seed;
+        long mashedSeed = MathUtil.murmur64(31L * xi + yi) + seed;
         
         double gaussianSource = (rand.getNoiseRaw(mashedSeed++) + 1) / 2;
         int impulses = 0;
@@ -73,7 +74,7 @@ public class GaborNoiseSampler extends NoiseFunction {
     }
     
     private double gabor(double omega_0, double x, double y) {
-        return k * (FastMath.exp(-Math.PI * (a * a) * (x * x + y * y)) * fastCos(2 * Math.PI * f0 * (x * fastCos(omega_0) + y * fastSin(
+        return k * (Math.exp(-Math.PI * (a * a) * (x * x + y * y)) * MathUtil.cos(2 * Math.PI * f0 * (x * MathUtil.cos(omega_0) + y * MathUtil.sin(
                 omega_0))));
     }
     
@@ -104,12 +105,12 @@ public class GaborNoiseSampler extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double z) {
+    public double getNoiseRaw(long seed, double x, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return gaborNoise(seed, x, z);
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         return gaborNoise(seed, x, z);
     }
 }

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

@@ -7,25 +7,18 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise;
 
-import net.jafama.FastMath;
-
 import com.dfsek.terra.api.noise.NoiseSampler;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
-@SuppressWarnings("ManualMinMaxCalculation")
 public abstract class NoiseFunction implements NoiseSampler {
     // Hashing
     protected static final int PRIME_X = 501125321;
     protected static final int PRIME_Y = 1136930381;
     protected static final int PRIME_Z = 1720413743;
-    static final int precision = 100;
-    static final int modulus = 360 * precision;
-    static final double[] sin = new double[360 * 100]; // lookup table
-    static {
-        for(int i = 0; i < sin.length; i++) {
-            sin[i] = (float) Math.sin((double) (i) / (precision));
-        }
-    }
+
     protected double frequency = 0.02d;
     protected long salt;
     
@@ -33,10 +26,6 @@ public abstract class NoiseFunction implements NoiseSampler {
         this.salt = 0;
     }
     
-    protected static int fastFloor(double f) {
-        return f >= 0 ? (int) f : (int) f - 1;
-    }
-    
     protected static int hash(int seed, int xPrimed, int yPrimed, int zPrimed) {
         int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed;
         
@@ -51,77 +40,6 @@ public abstract class NoiseFunction implements NoiseSampler {
         return hash;
     }
     
-    protected static int fastRound(double f) {
-        return f >= 0 ? (int) (f + 0.5f) : (int) (f - 0.5);
-    }
-    
-    protected static double lerp(double a, double b, double t) {
-        return a + t * (b - a);
-    }
-    
-    protected static double interpHermite(double t) {
-        return t * t * (3 - 2 * t);
-    }
-    
-    protected static double interpQuintic(double t) {
-        return t * t * t * (t * (t * 6 - 15) + 10);
-    }
-    
-    protected static double cubicLerp(double a, double b, double c, double d, double t) {
-        double p = (d - c) - (a - b);
-        return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b;
-    }
-    
-    protected static double fastMin(double a, double b) {
-        return a < b ? a : b;
-    }
-    
-    protected static double fastMax(double a, double b) {
-        return a > b ? a : b;
-    }
-    
-    protected static double fastAbs(double f) {
-        return f < 0 ? -f : f;
-    }
-    
-    protected static double fastSqrt(double f) {
-        return FastMath.sqrt(f);
-    }
-    
-    protected static int fastCeil(double f) {
-        int i = (int) f;
-        if(i < f) i++;
-        return i;
-    }
-    
-    /**
-     * Murmur64 hashing function
-     *
-     * @param h Input value
-     *
-     * @return Hashed value
-     */
-    protected static long murmur64(long h) {
-        h ^= h >>> 33;
-        h *= 0xff51afd7ed558ccdL;
-        h ^= h >>> 33;
-        h *= 0xc4ceb9fe1a85ec53L;
-        h ^= h >>> 33;
-        return h;
-    }
-    
-    protected static double fastSin(double a) {
-        return sinLookup((int) (a * precision + 0.5f));
-    }
-    
-    protected static double fastCos(double a) {
-        return sinLookup((int) ((a + Math.PI / 2) * precision + 0.5f));
-    }
-    
-    private static double sinLookup(int a) {
-        return a >= 0 ? sin[a % (modulus)] : -sin[-a % (modulus)];
-    }
-    
     public void setSalt(long salt) {
         this.salt = salt;
     }
@@ -135,16 +53,32 @@ public abstract class NoiseFunction implements NoiseSampler {
     }
     
     @Override
-    public double noise(long seed, double x, double y) {
-        return getNoiseRaw(seed + salt, x * frequency, y * frequency);
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius);
     }
     
     @Override
-    public double noise(long seed, double x, double y, double z) {
-        return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency);
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextLayer, contextRadius);
     }
     
-    public abstract double getNoiseRaw(long seed, double x, double y);
+    public double getNoiseRaw(long seed, double x, double y) {
+        int contextRadius = getContextRadius();
+        
+        ArrayList<double[]> list = new ArrayList<>();
+        generateContext(seed, x, y, list, 0, contextRadius);
+        return getNoiseRaw(seed, x, y, list, 0, getContextRadius());
+    }
     
-    public abstract double getNoiseRaw(long seed, double x, double y, double z);
+    public double getNoiseRaw(long seed, double x, double y, double z) {
+        int contextRadius = getContextRadius();
+        
+        ArrayList<double[]> list = new ArrayList<>();
+        generateContext(seed, x, y, z, list, 0, contextRadius);
+        return getNoiseRaw(seed, x, y, z, list, 0, getContextRadius());
+    }
+    
+    public abstract double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius);
+    
+    public abstract double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius);
 }

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

@@ -0,0 +1,404 @@
+/*
+ * 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.samplers.noise;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
+
+import com.google.errorprone.annotations.InlineMe;
+
+import java.util.List;
+
+import static com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction.PRIME_X;
+import static com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction.PRIME_Y;
+import static com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction.hash;
+
+
+/**
+ * Pseudo-erosion algorithm based on <a href="https://www.reddit.com/r/proceduralgeneration/comments/797fgw/iterative_pseudoerosion/">a reddit post</a>
+ * by user /u/YankeeMinstrel.
+ * <br>
+ * The algorithm works similarly to cellular/worley/voronoi noise. A grid of cells is established, where each cell contains a position with
+ * a random offset. Each cell connects to an adjacent candidate cell in its moore neighbourhood or itself, called the 'connected' cell.
+ * The connected cell is chosen by determining which candidate cell has the lowest value provided by passing the candidate coordinates into
+ * another 'lookup' noise function.
+ * The algorithm iterates through the cells near the sample point, calculates the distance between the position and the line segment
+ * between the cell and its connected cell, and returns the minimum of these distances.
+ */
+public class PseudoErosionSampler extends NoiseFunction {
+    private static final double[] RAND_VECS_3D = {
+            -0.7292736885d, -0.6618439697d, 0.1735581948d, 0, 0.790292081d, -0.5480887466d, -0.2739291014d, 0, 0.7217578935d, 0.6226212466d,
+            -0.3023380997d, 0, 0.565683137d, -0.8208298145d, -0.0790000257d, 0, 0.760049034d, -0.5555979497d, -0.3370999617d, 0,
+            0.3713945616d, 0.5011264475d, 0.7816254623d, 0, -0.1277062463d, -0.4254438999d, -0.8959289049d, 0, -0.2881560924d,
+            -0.5815838982d, 0.7607405838d, 0, 0.5849561111d, -0.662820239d, -0.4674352136d, 0, 0.3307171178d, 0.0391653737d, 0.94291689d, 0,
+            0.8712121778d, -0.4113374369d, -0.2679381538d, 0, 0.580981015d, 0.7021915846d, 0.4115677815d, 0, 0.503756873d, 0.6330056931d,
+            -0.5878203852d, 0, 0.4493712205d, 0.601390195d, 0.6606022552d, 0, -0.6878403724d, 0.09018890807d, -0.7202371714d, 0,
+            -0.5958956522d, -0.6469350577d, 0.475797649d, 0, -0.5127052122d, 0.1946921978d, -0.8361987284d, 0, -0.9911507142d,
+            -0.05410276466d, -0.1212153153d, 0, -0.2149721042d, 0.9720882117d, -0.09397607749d, 0, -0.7518650936d, -0.5428057603d,
+            0.3742469607d, 0, 0.5237068895d, 0.8516377189d, -0.02107817834d, 0, 0.6333504779d, 0.1926167129d, -0.7495104896d, 0,
+            -0.06788241606d, 0.3998305789d, 0.9140719259d, 0, -0.5538628599d, -0.4729896695d, -0.6852128902d, 0, -0.7261455366d,
+            -0.5911990757d, 0.3509933228d, 0, -0.9229274737d, -0.1782808786d, 0.3412049336d, 0, -0.6968815002d, 0.6511274338d,
+            0.3006480328d, 0, 0.9608044783d, -0.2098363234d, -0.1811724921d, 0, 0.06817146062d, -0.9743405129d, 0.2145069156d, 0,
+            -0.3577285196d, -0.6697087264d, -0.6507845481d, 0, -0.1868621131d, 0.7648617052d, -0.6164974636d, 0, -0.6541697588d,
+            0.3967914832d, 0.6439087246d, 0, 0.6993340405d, -0.6164538506d, 0.3618239211d, 0, -0.1546665739d, 0.6291283928d, 0.7617583057d,
+            0, -0.6841612949d, -0.2580482182d, -0.6821542638d, 0, 0.5383980957d, 0.4258654885d, 0.7271630328d, 0, -0.5026987823d,
+            -0.7939832935d, -0.3418836993d, 0, 0.3202971715d, 0.2834415347d, 0.9039195862d, 0, 0.8683227101d, -0.0003762656404d,
+            -0.4959995258d, 0, 0.791120031d, -0.08511045745d, 0.6057105799d, 0, -0.04011016052d, -0.4397248749d, 0.8972364289d, 0,
+            0.9145119872d, 0.3579346169d, -0.1885487608d, 0, -0.9612039066d, -0.2756484276d, 0.01024666929d, 0, 0.6510361721d,
+            -0.2877799159d, -0.7023778346d, 0, -0.2041786351d, 0.7365237271d, 0.644859585d, 0, -0.7718263711d, 0.3790626912d, 0.5104855816d,
+            0, -0.3060082741d, -0.7692987727d, 0.5608371729d, 0, 0.454007341d, -0.5024843065d, 0.7357899537d, 0, 0.4816795475d,
+            0.6021208291d, -0.6367380315d, 0, 0.6961980369d, -0.3222197429d, 0.641469197d, 0, -0.6532160499d, -0.6781148932d, 0.3368515753d,
+            0, 0.5089301236d, -0.6154662304d, -0.6018234363d, 0, -0.1635919754d, -0.9133604627d, -0.372840892d, 0, 0.52408019d,
+            -0.8437664109d, 0.1157505864d, 0, 0.5902587356d, 0.4983817807d, -0.6349883666d, 0, 0.5863227872d, 0.494764745d, 0.6414307729d,
+            0, 0.6779335087d, 0.2341345225d, 0.6968408593d, 0, 0.7177054546d, -0.6858979348d, 0.120178631d, 0, -0.5328819713d,
+            -0.5205125012d, 0.6671608058d, 0, -0.8654874251d, -0.0700727088d, -0.4960053754d, 0, -0.2861810166d, 0.7952089234d,
+            0.5345495242d, 0, -0.04849529634d, 0.9810836427d, -0.1874115585d, 0, -0.6358521667d, 0.6058348682d, 0.4781800233d, 0,
+            0.6254794696d, -0.2861619734d, 0.7258696564d, 0, -0.2585259868d, 0.5061949264d, -0.8227581726d, 0, 0.02136306781d,
+            0.5064016808d, -0.8620330371d, 0, 0.200111773d, 0.8599263484d, 0.4695550591d, 0, 0.4743561372d, 0.6014985084d, -0.6427953014d,
+            0, 0.6622993731d, -0.5202474575d, -0.5391679918d, 0, 0.08084972818d, -0.6532720452d, 0.7527940996d, 0, -0.6893687501d,
+            0.0592860349d, 0.7219805347d, 0, -0.1121887082d, -0.9673185067d, 0.2273952515d, 0, 0.7344116094d, 0.5979668656d, -0.3210532909d,
+            0, 0.5789393465d, -0.2488849713d, 0.7764570201d, 0, 0.6988182827d, 0.3557169806d, -0.6205791146d, 0, -0.8636845529d,
+            -0.2748771249d, -0.4224826141d, 0, -0.4247027957d, -0.4640880967d, 0.777335046d, 0, 0.5257722489d, -0.8427017621d,
+            0.1158329937d, 0, 0.9343830603d, 0.316302472d, -0.1639543925d, 0, -0.1016836419d, -0.8057303073d, -0.5834887393d, 0,
+            -0.6529238969d, 0.50602126d, -0.5635892736d, 0, -0.2465286165d, -0.9668205684d, -0.06694497494d, 0, -0.9776897119d,
+            -0.2099250524d, -0.007368825344d, 0, 0.7736893337d, 0.5734244712d, 0.2694238123d, 0, -0.6095087895d, 0.4995678998d,
+            0.6155736747d, 0, 0.5794535482d, 0.7434546771d, 0.3339292269d, 0, -0.8226211154d, 0.08142581855d, 0.5627293636d, 0,
+            -0.510385483d, 0.4703667658d, 0.7199039967d, 0, -0.5764971849d, -0.07231656274d, -0.8138926898d, 0, 0.7250628871d,
+            0.3949971505d, -0.5641463116d, 0, -0.1525424005d, 0.4860840828d, -0.8604958341d, 0, -0.5550976208d, -0.4957820792d,
+            0.667882296d, 0, -0.1883614327d, 0.9145869398d, 0.357841725d, 0, 0.7625556724d, -0.5414408243d, -0.3540489801d, 0,
+            -0.5870231946d, -0.3226498013d, -0.7424963803d, 0, 0.3051124198d, 0.2262544068d, -0.9250488391d, 0, 0.6379576059d, 0.577242424d,
+            -0.5097070502d, 0, -0.5966775796d, 0.1454852398d, -0.7891830656d, 0, -0.658330573d, 0.6555487542d, -0.3699414651d, 0,
+            0.7434892426d, 0.2351084581d, 0.6260573129d, 0, 0.5562114096d, 0.8264360377d, -0.0873632843d, 0, -0.3028940016d, -0.8251527185d,
+            0.4768419182d, 0, 0.1129343818d, -0.985888439d, -0.1235710781d, 0, 0.5937652891d, -0.5896813806d, 0.5474656618d, 0,
+            0.6757964092d, -0.5835758614d, -0.4502648413d, 0, 0.7242302609d, -0.1152719764d, 0.6798550586d, 0, -0.9511914166d,
+            0.0753623979d, -0.2992580792d, 0, 0.2539470961d, -0.1886339355d, 0.9486454084d, 0, 0.571433621d, -0.1679450851d, -0.8032795685d,
+            0, -0.06778234979d, 0.3978269256d, 0.9149531629d, 0, 0.6074972649d, 0.733060024d, -0.3058922593d, 0, -0.5435478392d,
+            0.1675822484d, 0.8224791405d, 0, -0.5876678086d, -0.3380045064d, -0.7351186982d, 0, -0.7967562402d, 0.04097822706d,
+            -0.6029098428d, 0, -0.1996350917d, 0.8706294745d, 0.4496111079d, 0, -0.02787660336d, -0.9106232682d, -0.4122962022d, 0,
+            -0.7797625996d, -0.6257634692d, 0.01975775581d, 0, -0.5211232846d, 0.7401644346d, -0.4249554471d, 0, 0.8575424857d,
+            0.4053272873d, -0.3167501783d, 0, 0.1045223322d, 0.8390195772d, -0.5339674439d, 0, 0.3501822831d, 0.9242524096d, -0.1520850155d,
+            0, 0.1987849858d, 0.07647613266d, 0.9770547224d, 0, 0.7845996363d, 0.6066256811d, -0.1280964233d, 0, 0.09006737436d,
+            -0.9750989929d, -0.2026569073d, 0, -0.8274343547d, -0.542299559d, 0.1458203587d, 0, -0.3485797732d, -0.415802277d, 0.840000362d,
+            0, -0.2471778936d, -0.7304819962d, -0.6366310879d, 0, -0.3700154943d, 0.8577948156d, 0.3567584454d, 0, 0.5913394901d,
+            -0.548311967d, -0.5913303597d, 0, 0.1204873514d, -0.7626472379d, -0.6354935001d, 0, 0.616959265d, 0.03079647928d, 0.7863922953d,
+            0, 0.1258156836d, -0.6640829889d, -0.7369967419d, 0, -0.6477565124d, -0.1740147258d, -0.7417077429d, 0, 0.6217889313d,
+            -0.7804430448d, -0.06547655076d, 0, 0.6589943422d, -0.6096987708d, 0.4404473475d, 0, -0.2689837504d, -0.6732403169d,
+            -0.6887635427d, 0, -0.3849775103d, 0.5676542638d, 0.7277093879d, 0, 0.5754444408d, 0.8110471154d, -0.1051963504d, 0,
+            0.9141593684d, 0.3832947817d, 0.131900567d, 0, -0.107925319d, 0.9245493968d, 0.3654593525d, 0, 0.377977089d, 0.3043148782d,
+            0.8743716458d, 0, -0.2142885215d, -0.8259286236d, 0.5214617324d, 0, 0.5802544474d, 0.4148098596d, -0.7008834116d, 0,
+            -0.1982660881d, 0.8567161266d, -0.4761596756d, 0, -0.03381553704d, 0.3773180787d, -0.9254661404d, 0, -0.6867922841d,
+            -0.6656597827d, 0.2919133642d, 0, 0.7731742607d, -0.2875793547d, -0.5652430251d, 0, -0.09655941928d, 0.9193708367d,
+            -0.3813575004d, 0, 0.2715702457d, -0.9577909544d, -0.09426605581d, 0, 0.2451015704d, -0.6917998565d, -0.6792188003d, 0,
+            0.977700782d, -0.1753855374d, 0.1155036542d, 0, -0.5224739938d, 0.8521606816d, 0.02903615945d, 0, -0.7734880599d,
+            -0.5261292347d, 0.3534179531d, 0, -0.7134492443d, -0.269547243d, 0.6467878011d, 0, 0.1644037271d, 0.5105846203d, -0.8439637196d,
+            0, 0.6494635788d, 0.05585611296d, 0.7583384168d, 0, -0.4711970882d, 0.5017280509d, -0.7254255765d, 0, -0.6335764307d,
+            -0.2381686273d, -0.7361091029d, 0, -0.9021533097d, -0.270947803d, -0.3357181763d, 0, -0.3793711033d, 0.872258117d,
+            0.3086152025d, 0, -0.6855598966d, -0.3250143309d, 0.6514394162d, 0, 0.2900942212d, -0.7799057743d, -0.5546100667d, 0,
+            -0.2098319339d, 0.85037073d, 0.4825351604d, 0, -0.4592603758d, 0.6598504336d, -0.5947077538d, 0, 0.8715945488d, 0.09616365406d,
+            -0.4807031248d, 0, -0.6776666319d, 0.7118504878d, -0.1844907016d, 0, 0.7044377633d, 0.312427597d, 0.637304036d, 0,
+            -0.7052318886d, -0.2401093292d, -0.6670798253d, 0, 0.081921007d, -0.7207336136d, -0.6883545647d, 0, -0.6993680906d,
+            -0.5875763221d, -0.4069869034d, 0, -0.1281454481d, 0.6419895885d, 0.7559286424d, 0, -0.6337388239d, -0.6785471501d,
+            -0.3714146849d, 0, 0.5565051903d, -0.2168887573d, -0.8020356851d, 0, -0.5791554484d, 0.7244372011d, -0.3738578718d, 0,
+            0.1175779076d, -0.7096451073d, 0.6946792478d, 0, -0.6134619607d, 0.1323631078d, 0.7785527795d, 0, 0.6984635305d,
+            -0.02980516237d, -0.715024719d, 0, 0.8318082963d, -0.3930171956d, 0.3919597455d, 0, 0.1469576422d, 0.05541651717d,
+            -0.9875892167d, 0, 0.708868575d, -0.2690503865d, 0.6520101478d, 0, 0.2726053183d, 0.67369766d, -0.68688995d, 0, -0.6591295371d,
+            0.3035458599d, -0.6880466294d, 0, 0.4815131379d, -0.7528270071d, 0.4487723203d, 0, 0.9430009463d, 0.1675647412d, -0.2875261255d,
+            0, 0.434802957d, 0.7695304522d, -0.4677277752d, 0, 0.3931996188d, 0.594473625d, 0.7014236729d, 0, 0.7254336655d, -0.603925654d,
+            0.3301814672d, 0, 0.7590235227d, -0.6506083235d, 0.02433313207d, 0, -0.8552768592d, -0.3430042733d, 0.3883935666d, 0,
+            -0.6139746835d, 0.6981725247d, 0.3682257648d, 0, -0.7465905486d, -0.5752009504d, 0.3342849376d, 0, 0.5730065677d, 0.810555537d,
+            -0.1210916791d, 0, -0.9225877367d, -0.3475211012d, -0.167514036d, 0, -0.7105816789d, -0.4719692027d, -0.5218416899d, 0,
+            -0.08564609717d, 0.3583001386d, 0.929669703d, 0, -0.8279697606d, -0.2043157126d, 0.5222271202d, 0, 0.427944023d, 0.278165994d,
+            0.8599346446d, 0, 0.5399079671d, -0.7857120652d, -0.3019204161d, 0, 0.5678404253d, -0.5495413974d, -0.6128307303d, 0,
+            -0.9896071041d, 0.1365639107d, -0.04503418428d, 0, -0.6154342638d, -0.6440875597d, 0.4543037336d, 0, 0.1074204368d,
+            -0.7946340692d, 0.5975094525d, 0, -0.3595449969d, -0.8885529948d, 0.28495784d, 0, -0.2180405296d, 0.1529888965d, 0.9638738118d,
+            0, -0.7277432317d, -0.6164050508d, -0.3007234646d, 0, 0.7249729114d, -0.00669719484d, 0.6887448187d, 0, -0.5553659455d,
+            -0.5336586252d, 0.6377908264d, 0, 0.5137558015d, 0.7976208196d, -0.3160000073d, 0, -0.3794024848d, 0.9245608561d,
+            -0.03522751494d, 0, 0.8229248658d, 0.2745365933d, -0.4974176556d, 0, -0.5404114394d, 0.6091141441d, 0.5804613989d, 0,
+            0.8036581901d, -0.2703029469d, 0.5301601931d, 0, 0.6044318879d, 0.6832968393d, 0.4095943388d, 0, 0.06389988817d, 0.9658208605d,
+            -0.2512108074d, 0, 0.1087113286d, 0.7402471173d, -0.6634877936d, 0, -0.713427712d, -0.6926784018d, 0.1059128479d, 0,
+            0.6458897819d, -0.5724548511d, -0.5050958653d, 0, -0.6553931414d, 0.7381471625d, 0.159995615d, 0, 0.3910961323d, 0.9188871375d,
+            -0.05186755998d, 0, -0.4879022471d, -0.5904376907d, 0.6429111375d, 0, 0.6014790094d, 0.7707441366d, -0.2101820095d, 0,
+            -0.5677173047d, 0.7511360995d, 0.3368851762d, 0, 0.7858573506d, 0.226674665d, 0.5753666838d, 0, -0.4520345543d, -0.604222686d,
+            -0.6561857263d, 0, 0.002272116345d, 0.4132844051d, -0.9105991643d, 0, -0.5815751419d, -0.5162925989d, 0.6286591339d, 0,
+            -0.03703704785d, 0.8273785755d, 0.5604221175d, 0, -0.5119692504d, 0.7953543429d, -0.3244980058d, 0, -0.2682417366d,
+            -0.9572290247d, -0.1084387619d, 0, -0.2322482736d, -0.9679131102d, -0.09594243324d, 0, 0.3554328906d, -0.8881505545d,
+            0.2913006227d, 0, 0.7346520519d, -0.4371373164d, 0.5188422971d, 0, 0.9985120116d, 0.04659011161d, -0.02833944577d, 0,
+            -0.3727687496d, -0.9082481361d, 0.1900757285d, 0, 0.91737377d, -0.3483642108d, 0.1925298489d, 0, 0.2714911074d, 0.4147529736d,
+            -0.8684886582d, 0, 0.5131763485d, -0.7116334161d, 0.4798207128d, 0, -0.8737353606d, 0.18886992d, -0.4482350644d, 0,
+            0.8460043821d, -0.3725217914d, 0.3814499973d, 0, 0.8978727456d, -0.1780209141d, -0.4026575304d, 0, 0.2178065647d,
+            -0.9698322841d, -0.1094789531d, 0, -0.1518031304d, -0.7788918132d, -0.6085091231d, 0, -0.2600384876d, -0.4755398075d,
+            -0.8403819825d, 0, 0.572313509d, -0.7474340931d, -0.3373418503d, 0, -0.7174141009d, 0.1699017182d, -0.6756111411d, 0,
+            -0.684180784d, 0.02145707593d, -0.7289967412d, 0, -0.2007447902d, 0.06555605789d, -0.9774476623d, 0, -0.1148803697d,
+            -0.8044887315d, 0.5827524187d, 0, -0.7870349638d, 0.03447489231d, 0.6159443543d, 0, -0.2015596421d, 0.6859872284d,
+            0.6991389226d, 0, -0.08581082512d, -0.10920836d, -0.9903080513d, 0, 0.5532693395d, 0.7325250401d, -0.396610771d, 0,
+            -0.1842489331d, -0.9777375055d, -0.1004076743d, 0, 0.0775473789d, -0.9111505856d, 0.4047110257d, 0, 0.1399838409d,
+            0.7601631212d, -0.6344734459d, 0, 0.4484419361d, -0.845289248d, 0.2904925424d, 0
+    };
+    
+    private static final double[] RAND_VECS_2D = {
+            -0.2700222198d, -0.9628540911d, 0.3863092627d, -0.9223693152d, 0.04444859006d, -0.999011673d, -0.5992523158d, -0.8005602176d,
+            -0.7819280288d, 0.6233687174d, 0.9464672271d, 0.3227999196d, -0.6514146797d, -0.7587218957d, 0.9378472289d, 0.347048376d,
+            -0.8497875957d, -0.5271252623d, -0.879042592d, 0.4767432447d, -0.892300288d, -0.4514423508d, -0.379844434d, -0.9250503802d,
+            -0.9951650832d, 0.0982163789d, 0.7724397808d, -0.6350880136d, 0.7573283322d, -0.6530343002d, -0.9928004525d, -0.119780055d,
+            -0.0532665713d, 0.9985803285d, 0.9754253726d, -0.2203300762d, -0.7665018163d, 0.6422421394d, 0.991636706d, 0.1290606184d,
+            -0.994696838d, 0.1028503788d, -0.5379205513d, -0.84299554d, 0.5022815471d, -0.8647041387d, 0.4559821461d, -0.8899889226d,
+            -0.8659131224d, -0.5001944266d, 0.0879458407d, -0.9961252577d, -0.5051684983d, 0.8630207346d, 0.7753185226d, -0.6315704146d,
+            -0.6921944612d, 0.7217110418d, -0.5191659449d, -0.8546734591d, 0.8978622882d, -0.4402764035d, -0.1706774107d, 0.9853269617d,
+            -0.9353430106d, -0.3537420705d, -0.9992404798d, 0.03896746794d, -0.2882064021d, -0.9575683108d, -0.9663811329d, 0.2571137995d,
+            -0.8759714238d, -0.4823630009d, -0.8303123018d, -0.5572983775d, 0.05110133755d, -0.9986934731d, -0.8558373281d, -0.5172450752d,
+            0.09887025282d, 0.9951003332d, 0.9189016087d, 0.3944867976d, -0.2439375892d, -0.9697909324d, -0.8121409387d, -0.5834613061d,
+            -0.9910431363d, 0.1335421355d, 0.8492423985d, -0.5280031709d, -0.9717838994d, -0.2358729591d, 0.9949457207d, 0.1004142068d,
+            0.6241065508d, -0.7813392434d, 0.662910307d, 0.7486988212d, -0.7197418176d, 0.6942418282d, -0.8143370775d, -0.5803922158d,
+            0.104521054d, -0.9945226741d, -0.1065926113d, -0.9943027784d, 0.445799684d, -0.8951327509d, 0.105547406d, 0.9944142724d,
+            -0.992790267d, 0.1198644477d, -0.8334366408d, 0.552615025d, 0.9115561563d, -0.4111755999d, 0.8285544909d, -0.5599084351d,
+            0.7217097654d, -0.6921957921d, 0.4940492677d, -0.8694339084d, -0.3652321272d, -0.9309164803d, -0.9696606758d, 0.2444548501d,
+            0.08925509731d, -0.996008799d, 0.5354071276d, -0.8445941083d, -0.1053576186d, 0.9944343981d, -0.9890284586d, 0.1477251101d,
+            0.004856104961d, 0.9999882091d, 0.9885598478d, 0.1508291331d, 0.9286129562d, -0.3710498316d, -0.5832393863d, -0.8123003252d,
+            0.3015207509d, 0.9534596146d, -0.9575110528d, 0.2883965738d, 0.9715802154d, -0.2367105511d, 0.229981792d, 0.9731949318d,
+            0.955763816d, -0.2941352207d, 0.740956116d, 0.6715534485d, -0.9971513787d, -0.07542630764d, 0.6905710663d, -0.7232645452d,
+            -0.290713703d, -0.9568100872d, 0.5912777791d, -0.8064679708d, -0.9454592212d, -0.325740481d, 0.6664455681d, 0.74555369d,
+            0.6236134912d, 0.7817328275d, 0.9126993851d, -0.4086316587d, -0.8191762011d, 0.5735419353d, -0.8812745759d, -0.4726046147d,
+            0.9953313627d, 0.09651672651d, 0.9855650846d, -0.1692969699d, -0.8495980887d, 0.5274306472d, 0.6174853946d, -0.7865823463d,
+            0.8508156371d, 0.52546432d, 0.9985032451d, -0.05469249926d, 0.1971371563d, -0.9803759185d, 0.6607855748d, -0.7505747292d,
+            -0.03097494063d, 0.9995201614d, -0.6731660801d, 0.739491331d, -0.7195018362d, -0.6944905383d, 0.9727511689d, 0.2318515979d,
+            0.9997059088d, -0.0242506907d, 0.4421787429d, -0.8969269532d, 0.9981350961d, -0.061043673d, -0.9173660799d, -0.3980445648d,
+            -0.8150056635d, -0.5794529907d, -0.8789331304d, 0.4769450202d, 0.0158605829d, 0.999874213d, -0.8095464474d, 0.5870558317d,
+            -0.9165898907d, -0.3998286786d, -0.8023542565d, 0.5968480938d, -0.5176737917d, 0.8555780767d, -0.8154407307d, -0.5788405779d,
+            0.4022010347d, -0.9155513791d, -0.9052556868d, -0.4248672045d, 0.7317445619d, 0.6815789728d, -0.5647632201d, -0.8252529947d,
+            -0.8403276335d, -0.5420788397d, -0.9314281527d, 0.363925262d, 0.5238198472d, 0.8518290719d, 0.7432803869d, -0.6689800195d,
+            -0.985371561d, -0.1704197369d, 0.4601468731d, 0.88784281d, 0.825855404d, 0.5638819483d, 0.6182366099d, 0.7859920446d,
+            0.8331502863d, -0.553046653d, 0.1500307506d, 0.9886813308d, -0.662330369d, -0.7492119075d, -0.668598664d, 0.743623444d,
+            0.7025606278d, 0.7116238924d, -0.5419389763d, -0.8404178401d, -0.3388616456d, 0.9408362159d, 0.8331530315d, 0.5530425174d,
+            -0.2989720662d, -0.9542618632d, 0.2638522993d, 0.9645630949d, 0.124108739d, -0.9922686234d, -0.7282649308d, -0.6852956957d,
+            0.6962500149d, 0.7177993569d, -0.9183535368d, 0.3957610156d, -0.6326102274d, -0.7744703352d, -0.9331891859d, -0.359385508d,
+            -0.1153779357d, -0.9933216659d, 0.9514974788d, -0.3076565421d, -0.08987977445d, -0.9959526224d, 0.6678496916d, 0.7442961705d,
+            0.7952400393d, -0.6062947138d, -0.6462007402d, -0.7631674805d, -0.2733598753d, 0.9619118351d, 0.9669590226d, -0.254931851d,
+            -0.9792894595d, 0.2024651934d, -0.5369502995d, -0.8436138784d, -0.270036471d, -0.9628500944d, -0.6400277131d, 0.7683518247d,
+            -0.7854537493d, -0.6189203566d, 0.06005905383d, -0.9981948257d, -0.02455770378d, 0.9996984141d, -0.65983623d, 0.751409442d,
+            -0.6253894466d, -0.7803127835d, -0.6210408851d, -0.7837781695d, 0.8348888491d, 0.5504185768d, -0.1592275245d, 0.9872419133d,
+            0.8367622488d, 0.5475663786d, -0.8675753916d, -0.4973056806d, -0.2022662628d, -0.9793305667d, 0.9399189937d, 0.3413975472d,
+            0.9877404807d, -0.1561049093d, -0.9034455656d, 0.4287028224d, 0.1269804218d, -0.9919052235d, -0.3819600854d, 0.924178821d,
+            0.9754625894d, 0.2201652486d, -0.3204015856d, -0.9472818081d, -0.9874760884d, 0.1577687387d, 0.02535348474d, -0.9996785487d,
+            0.4835130794d, -0.8753371362d, -0.2850799925d, -0.9585037287d, -0.06805516006d, -0.99768156d, -0.7885244045d, -0.6150034663d,
+            0.3185392127d, -0.9479096845d, 0.8880043089d, 0.4598351306d, 0.6476921488d, -0.7619021462d, 0.9820241299d, 0.1887554194d,
+            0.9357275128d, -0.3527237187d, -0.8894895414d, 0.4569555293d, 0.7922791302d, 0.6101588153d, 0.7483818261d, 0.6632681526d,
+            -0.7288929755d, -0.6846276581d, 0.8729032783d, -0.4878932944d, 0.8288345784d, 0.5594937369d, 0.08074567077d, 0.9967347374d,
+            0.9799148216d, -0.1994165048d, -0.580730673d, -0.8140957471d, -0.4700049791d, -0.8826637636d, 0.2409492979d, 0.9705377045d,
+            0.9437816757d, -0.3305694308d, -0.8927998638d, -0.4504535528d, -0.8069622304d, 0.5906030467d, 0.06258973166d, 0.9980393407d,
+            -0.9312597469d, 0.3643559849d, 0.5777449785d, 0.8162173362d, -0.3360095855d, -0.941858566d, 0.697932075d, -0.7161639607d,
+            -0.002008157227d, -0.9999979837d, -0.1827294312d, -0.9831632392d, -0.6523911722d, 0.7578824173d, -0.4302626911d, -0.9027037258d,
+            -0.9985126289d, -0.05452091251d, -0.01028102172d, -0.9999471489d, -0.4946071129d, 0.8691166802d, -0.2999350194d, 0.9539596344d,
+            0.8165471961d, 0.5772786819d, 0.2697460475d, 0.962931498d, -0.7306287391d, -0.6827749597d, -0.7590952064d, -0.6509796216d,
+            -0.907053853d, 0.4210146171d, -0.5104861064d, -0.8598860013d, 0.8613350597d, 0.5080373165d, 0.5007881595d, -0.8655698812d,
+            -0.654158152d, 0.7563577938d, -0.8382755311d, -0.545246856d, 0.6940070834d, 0.7199681717d, 0.06950936031d, 0.9975812994d,
+            0.1702942185d, -0.9853932612d, 0.2695973274d, 0.9629731466d, 0.5519612192d, -0.8338697815d, 0.225657487d, -0.9742067022d,
+            0.4215262855d, -0.9068161835d, 0.4881873305d, -0.8727388672d, -0.3683854996d, -0.9296731273d, -0.9825390578d, 0.1860564427d,
+            0.81256471d, 0.5828709909d, 0.3196460933d, -0.9475370046d, 0.9570913859d, 0.2897862643d, -0.6876655497d, -0.7260276109d,
+            -0.9988770922d, -0.047376731d, -0.1250179027d, 0.992154486d, -0.8280133617d, 0.560708367d, 0.9324863769d, -0.3612051451d,
+            0.6394653183d, 0.7688199442d, -0.01623847064d, -0.9998681473d, -0.9955014666d, -0.09474613458d, -0.81453315d, 0.580117012d,
+            0.4037327978d, -0.9148769469d, 0.9944263371d, 0.1054336766d, -0.1624711654d, 0.9867132919d, -0.9949487814d, -0.100383875d,
+            -0.6995302564d, 0.7146029809d, 0.5263414922d, -0.85027327d, -0.5395221479d, 0.841971408d, 0.6579370318d, 0.7530729462d,
+            0.01426758847d, -0.9998982128d, -0.6734383991d, 0.7392433447d, 0.639412098d, -0.7688642071d, 0.9211571421d, 0.3891908523d,
+            -0.146637214d, -0.9891903394d, -0.782318098d, 0.6228791163d, -0.5039610839d, -0.8637263605d, -0.7743120191d, -0.6328039957d,
+            };
+    
+    private static final int PRECOMPUTE_RADIUS = 3;
+    
+    private static final int PRECOMPUTE_SIZE = 1 + 2 * PRECOMPUTE_RADIUS;
+    
+    private static final int NEARBY_CELLS_RADIUS = 2;
+    
+    private static final int MAX_CONNECTION_RADIUS = 1;
+    
+    private final long salt;
+    
+    private final double frequency;
+    
+    private final double inverseFrequency;
+    
+    private final double cellularJitter;
+    
+    private final NoiseSampler lookup;
+    
+    public PseudoErosionSampler(long salt, double frequency, NoiseSampler lookup, double jitterModifier) {
+        this.salt = salt;
+        this.frequency = frequency;
+        this.inverseFrequency = 1 / frequency;
+        this.lookup = lookup;
+        this.cellularJitter = 0.43701595 * jitterModifier;
+    }
+    
+    
+    public void generateContextRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        int seed = (int) sl;
+        
+        // Round sampled position to integers to derive grid coordinates
+        int gridX = (int) Math.round(x);
+        int gridY = (int) Math.round(y);
+        
+        int nextContextLayer = contextLayer + 1;
+        int nextContextRadius = contextRadius + getContextRadius();
+        
+        context.add(contextLayer, new double[0]);
+        this.lookup.generateContext(seed, x, y, context, nextContextLayer, nextContextRadius);
+        
+        int contextCircumference = (contextRadius * 2 + 1);
+        int contextSizeArraySize = contextCircumference * contextCircumference * 3;
+        // Precompute cell positions and lookup values
+        double[] cellData = new double[contextSizeArraySize];
+        int cellDataIndex = 0;
+        for(int xi = -contextRadius; xi <= contextRadius; xi++) {
+            int gridXi = gridX + xi;
+            int gridXiPrimed = gridXi * PRIME_X;
+            
+            for(int yi = -contextRadius; yi <= contextRadius; yi++) {
+                int gridYi = gridY + yi;
+                
+                int jitterIdx = hash(seed, gridXiPrimed, gridYi * PRIME_Y) & (255 << 1);
+                double cellX = MathUtil.fma(RAND_VECS_2D[jitterIdx], cellularJitter, gridXi);
+                double cellY = MathUtil.fma(RAND_VECS_2D[jitterIdx | 1], cellularJitter, gridYi);
+                
+                // Transform to actual coordinates for lookup
+                double actualCellX = cellX * inverseFrequency;
+                double actualCellY = cellY * inverseFrequency;
+                
+                double lookup = this.lookup.noise(seed, actualCellX, actualCellY, context, nextContextLayer, nextContextRadius);
+                
+                cellData[cellDataIndex++] = cellX;
+                cellData[cellDataIndex++] = cellY;
+                cellData[cellDataIndex++] = lookup;
+            }
+        }
+        
+        context.add(contextLayer, cellData);
+    }
+    
+    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        double finalDistance = Double.MAX_VALUE;
+        
+        double[] cellData = context.get(contextLayer);
+        
+        int xIndexSize = (contextRadius * 6) + 3;
+
+        int deltaRadius = (contextRadius - NEARBY_CELLS_RADIUS);
+        
+        int xIndex = xIndexSize * deltaRadius;
+        int yIndex = 3 * deltaRadius;
+        
+        // Iterate over nearby cells
+        int cellDataIndex = xIndex;
+        //int cellDataIndex = 21;
+        for(int xi = -NEARBY_CELLS_RADIUS; xi <= NEARBY_CELLS_RADIUS; xi++) {
+            cellDataIndex += yIndex;
+            //cellDataIndex += 3;
+            for(int yi = -NEARBY_CELLS_RADIUS; yi <= NEARBY_CELLS_RADIUS; yi++) {
+                
+                // Find cell position with the lowest lookup value within moore neighborhood of neighbor
+                double lowestLookup = Double.MAX_VALUE;
+                double connectedCellX = 0;
+                double connectedCellY = 0;
+                //int cellDataIndexN = cellDataIndex - xIndex - 1;
+                int cellDataIndexN = cellDataIndex - 22;
+                int yniMin = yi - MAX_CONNECTION_RADIUS;
+                int yniMax = yi + MAX_CONNECTION_RADIUS;
+                
+                for(int xni = xi - MAX_CONNECTION_RADIUS; xni <= xi + MAX_CONNECTION_RADIUS; xni++) {
+                    for(int yni = yniMin; yni <= yniMax; yni++) {
+                        double lookup = cellData[cellDataIndexN];
+                        if(lookup < lowestLookup) {
+                            lowestLookup = lookup;
+                            connectedCellX = cellData[cellDataIndexN - 2];
+                            connectedCellY = cellData[cellDataIndexN - 1];
+                        }
+                        cellDataIndexN += 3;
+                    }
+                    cellDataIndexN += 12;
+                }
+                
+                double cellX = cellData[cellDataIndex];
+                double cellY = cellData[cellDataIndex + 1];
+                
+                // Calculate SDF for line between the current cell position and the surrounding cell with the lowest lookup
+                double distance = lineSdf2D(x, y, cellX, cellY, connectedCellX, connectedCellY);
+                
+                // Set final return to the lowest computed distance
+                finalDistance = Math.min(finalDistance, distance);
+                
+                cellDataIndex += 3;
+            }
+            cellDataIndex += yIndex;
+            //cellDataIndex += 3;
+        }
+        
+        return finalDistance;
+    }
+    
+    /**
+     * Signed distance function of a line segment determined by two points
+     */
+    private static double lineSdf2D(double x, double y, double x1, double y1, double x2, double y2) {
+        double x1dx = x - x1;
+        double y1dx = y - y1;
+
+        if (x1 == x2 && y1 == y2) {
+            // If positions are the same, just return the distance from the point
+            return MathUtil.hypot(x1dx, y1dx);
+        }
+        
+        double ldx = x1 - x2;
+        double ldy = y1 - y2;
+        
+        double invLineLengthSquared = Math.pow((Math.pow(ldx, 2) + Math.pow(ldy, 2)), -1);
+        
+        double x2dx = x - x2;
+        double y2dx = y - y2;
+        
+        double dotProduct = MathUtil.fma(ldy, y1dx, (ldx * x1dx));
+        double lt = dotProduct * invLineLengthSquared; // Position along the line
+        
+        if (lt > 0) {
+            return MathUtil.hypot(x1dx, y1dx); // Distance between point 1 and position
+        } else if (lt < -1) {
+            return MathUtil.hypot(x2dx, y2dx); // Distance between point 2 and position
+        } else {
+            double distance = MathUtil.fma(ldy, x1dx, (-(ldx * y1dx))) * Math.sqrt(invLineLengthSquared);
+            return Math.abs(distance); // Distance from the line
+        }
+    }
+ 
+    
+    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        // TODO
+        return 0;
+    }
+    
+    @Override
+    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius);
+    }
+    
+    @Override
+    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency, context, contextLayer, contextRadius);
+    }
+    
+    @Override
+    public void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+        generateContextRaw(seed + salt, x * frequency, y * frequency, context, contextLayer, contextRadius);
+    }
+    
+    @Override
+    public void generateContext(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+        //no-op
+    }
+    
+    @Override
+    public int getContextRadius() {
+        return PRECOMPUTE_RADIUS;
+    }
+}

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

@@ -8,6 +8,9 @@
 package com.dfsek.terra.addons.noise.samplers.noise.fractal;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
+
+import java.util.List;
 
 
 public class BrownianMotionSampler extends FractalNoiseFunction {
@@ -16,14 +19,14 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
             double noise = input.noise(seed++, x, y);
             sum += noise * amp;
-            amp *= lerp(1.0, fastMin(noise + 1, 2) * 0.5, weightedStrength);
+            amp *= MathUtil.lerp(1.0, Math.min(noise + 1, 2) * 0.5, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;
@@ -34,14 +37,14 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
             double noise = input.noise(seed++, x, y, z);
             sum += noise * amp;
-            amp *= lerp(1.0, (noise + 1) * 0.5, weightedStrength);
+            amp *= MathUtil.lerp(1.0, (noise + 1) * 0.5, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;

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

@@ -25,7 +25,7 @@ public abstract class FractalNoiseFunction extends NoiseFunction {
     }
     
     protected void calculateFractalBounding() {
-        double gain = fastAbs(this.gain);
+        double gain = Math.abs(this.gain);
         double amp = gain;
         double ampFractal = 1.0;
         for(int i = 1; i < octaves; i++) {

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

@@ -8,6 +8,9 @@
 package com.dfsek.terra.addons.noise.samplers.noise.fractal;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
+
+import java.util.List;
 
 
 public class PingPongSampler extends FractalNoiseFunction {
@@ -28,14 +31,14 @@ public class PingPongSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
             double noise = pingPong((input.noise(seed++, x, y) + 1) * pingPongStrength);
             sum += (noise - 0.5) * 2 * amp;
-            amp *= lerp(1.0, noise, weightedStrength);
+            amp *= MathUtil.lerp(1.0, noise, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;
@@ -46,14 +49,14 @@ public class PingPongSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
             double noise = pingPong((input.noise(seed++, x, y, z) + 1) * pingPongStrength);
             sum += (noise - 0.5) * 2 * amp;
-            amp *= lerp(1.0, noise, weightedStrength);
+            amp *= MathUtil.lerp(1.0, noise, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;

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

@@ -8,6 +8,9 @@
 package com.dfsek.terra.addons.noise.samplers.noise.fractal;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.MathUtil;
+
+import java.util.List;
 
 
 public class RidgedFractalSampler extends FractalNoiseFunction {
@@ -17,14 +20,14 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
-            double noise = fastAbs(input.noise(seed++, x, y));
+            double noise = Math.abs(input.noise(seed++, x, y));
             sum += (noise * -2 + 1) * amp;
-            amp *= lerp(1.0, 1 - noise, weightedStrength);
+            amp *= MathUtil.lerp(1.0, 1 - noise, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;
@@ -35,14 +38,14 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         double sum = 0;
         double amp = fractalBounding;
         
         for(int i = 0; i < octaves; i++) {
-            double noise = fastAbs(input.noise(seed++, x, y, z));
+            double noise = Math.abs(input.noise(seed++, x, y, z));
             sum += (noise * -2 + 1) * amp;
-            amp *= lerp(1.0, 1 - noise, weightedStrength);
+            amp *= MathUtil.lerp(1.0, 1 - noise, weightedStrength);
             
             x *= lacunarity;
             y *= lacunarity;

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

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.samplers.noise.random;
 
 import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 
+import java.util.List;
+
 
 /**
  * NoiseSampler implementation to provide random, normally distributed (Gaussian) noise.
@@ -21,7 +23,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y) {
+    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
         double v1, v2, s;
         do {
             v1 = whiteNoiseSampler.noise(seed++, x, y);
@@ -33,7 +35,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
     }
     
     @Override
-    public double getNoiseRaw(long seed, double x, double y, double z) {
+    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
         double v1, v2, s;
         do {
             v1 = whiteNoiseSampler.noise(seed++, x, y, z);

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

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.noise.samplers.noise.random;
 
+import com.dfsek.terra.api.util.MathUtil;
+
+
 /**
  * NoiseSampler implementation to produce random, uniformly distributed (white) noise.
  */
@@ -15,7 +18,7 @@ public class PositiveWhiteNoiseSampler extends WhiteNoiseSampler {
     // Bits that when applied to the exponent/sign section of a double, produce a positive number with a power of 1.
     
     public double getNoiseRaw(long seed) {
-        return (Double.longBitsToDouble((murmur64(seed) & 0x000fffffffffffffL) | POSITIVE_POW1) - 1.5) * 2;
+        return (Double.longBitsToDouble((MathUtil.murmur64(seed) & 0x000fffffffffffffL) | POSITIVE_POW1) - 1.5) * 2;
     }
     
     @Override