Merge branch 'ver/6.4.0' into dev/image-caching

implement missing methods from last comit
add zero and unit vectors
2026-05-20 16:50:28 +00:00 · 2023-10-26 12:56:17 -06:00 · 2023-10-26 12:53:55 -06:00 · 2023-10-26 11:08:36 -06:00 · 2023-10-26 10:43:13 -06:00 · 2023-10-26 10:37:25 -06:00
101 changed files with 1484 additions and 1043 deletions
@@ -47,14 +47,7 @@ JARs are produced in `platforms/<platform>/build/libs`.
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:

 * Bukkit
-    * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test
-      server. (Only needs to be run once).
-    * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur)
-      test server. (Only needs to be run once).
-    * `runPaper` - Run the Paper test server with Terra (`installPaper` must
-      have been run previously).
-    * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must
-      have been run previously).
+    * `runServer` - Run the Paper test server with Terra installed.
 * Fabric
    * `runClient` - Run a Minecraft Fabric client with Terra installed.
    * `runServer` - Run a Minecraft Fabric server with Terra installed.
@@ -3,15 +3,6 @@ plugins {
    kotlin("jvm") version embeddedKotlinVersion
 }

-buildscript {
-    configurations.all {
-        resolutionStrategy {
-            force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version
-            force("org.ow2.asm:asm-commons:9.3")
-        }
-    }
-}
-
 repositories {
    mavenCentral()
    gradlePluginPortal()
@@ -24,11 +15,12 @@ repositories {
 }

 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    //TODO Allow pulling from Versions.kt
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin","1.5.6")
    
-    implementation("org.ow2.asm:asm:9.3")
-    implementation("org.ow2.asm:asm-tree:9.3")
-    implementation("com.dfsek.tectonic:common:4.2.0")
-    implementation("org.yaml:snakeyaml:1.27")
+    implementation("org.ow2.asm", "asm", "9.5")
+    implementation("org.ow2.asm", "asm-tree", "9.5")
+    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("org.yaml", "snakeyaml", "2.2")
 }
@@ -48,6 +48,9 @@ fun Project.configureDependencies() {
        maven("https://jitpack.io") {
            name = "JitPack"
        }
+        maven("https://nexuslite.gcnt.net/repos/other/") {
+            name = "GCNT"
+        }
    }
    
    dependencies {
@@ -58,4 +61,4 @@ fun Project.configureDependencies() {
        compileOnly("com.google.guava:guava:30.0-jre")
        testImplementation("com.google.guava:guava:30.0-jre")
    }
-}
+}
@@ -1,68 +1,70 @@
 object Versions {
    object Libraries {
-        const val tectonic = "4.2.0"
-        const val paralithic = "0.7.0"
-        const val strata = "1.1.1"
+        const val tectonic = "4.2.1"
+        const val paralithic = "0.7.1"
+        const val strata = "1.3.2"
        
-        const val cloud = "1.8.0"
+        const val cloud = "1.8.4"
        
-        const val slf4j = "1.7.36"
-        const val log4j_slf4j_impl = "2.14.1"
+        const val slf4j = "2.0.9"
+        const val log4j_slf4j_impl = "2.20.0"
        
        object Internal {
-            const val apacheText = "1.9"
-            const val apacheIO = "2.6"
-            const val fastutil = "8.5.6"
-            const val cpuFeaturesJava = "1.0.1"
+            const val shadow = "8.1.1"
+            const val apacheText = "1.10.0"
+            const val apacheIO = "2.14.0"
+            const val guava = "32.1.3-jre"
+            const val asm = "9.5"
+            const val snakeYml = "2.2"
        }
    }
    
    object Fabric {
-        const val fabricLoader = "0.14.8"
-        const val fabricAPI = "0.83.1+1.20.1"
-    }
-    
-    object Quilt {
-        const val quiltLoader = "0.17.0"
-        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
+        const val fabricAPI = "0.90.0+${Mod.minecraft}"
    }
+//
+//    object Quilt {
+//        const val quiltLoader = "0.20.2"
+//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
+//    }
    
    object Mod {
-        const val mixin = "0.11.2+mixin.0.8.5"
+        const val mixin = "0.12.5+mixin.0.8.5"
        
-        const val minecraft = "1.20.1"
-        const val yarn = "$minecraft+build.2"
-        const val fabricLoader = "0.14.21"
+        const val minecraft = "1.20.2"
+        const val yarn = "$minecraft+build.4"
+        const val fabricLoader = "0.14.23"
        
-        const val architecuryLoom = "0.12.0.290"
-        const val architecturyPlugin = "3.4-SNAPSHOT"
+        const val architecuryLoom = "1.3.357"
+        const val architecturyPlugin = "3.4.146"
        
-        const val loomQuiltflower = "1.7.1"
+        const val loomVineflower = "1.11.0"
    }
    
    object Forge {
-        const val forge = "${Mod.minecraft}-47.0.3"
-        const val burningwave = "12.53.0"
+        const val forge = "${Mod.minecraft}-48.0.13"
+        const val burningwave = "12.63.0"
    }
    
    object Bukkit {
        const val paper = "1.18.2-R0.1-SNAPSHOT"
        const val paperLib = "1.0.5"
-        const val minecraft = "1.20.1"
+        const val foliaLib = "0.2.5"
+        const val minecraft = "1.20.2"
        const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
+        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
+        const val runPaper = "2.2.0"
+        const val paperWeight = "1.5.6"
    }
-    
-    object Sponge {
-        const val sponge = "9.0.0-SNAPSHOT"
-        const val mixin = "0.8.2"
-        const val minecraft = "1.17.1"
-    }
-    
+//
+//    object Sponge {
+//        const val sponge = "9.0.0-SNAPSHOT"
+//        const val mixin = "0.8.2"
+//        const val minecraft = "1.17.1"
+//    }
+//
    object CLI {
        const val nbt = "6.1"
-        const val logback = "1.2.9"
-        const val commonsIO = "2.7"
-        const val guava = "31.0.1-jre"
+        const val logback = "1.4.11"
    }
 }
@@ -50,6 +50,7 @@ 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.");
+        if(platform.getTerraConfig().isDebugLog())
+            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.");
    }
 }
@@ -90,6 +90,7 @@ public class BiomePipelineAddon implements AddonInitializer {
                    event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
                });
        
-        logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead.");
+        if(platform.getTerraConfig().isDebugLog())
+            logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead.");
    }
 }
@@ -22,7 +22,7 @@ public class TopLocator implements Locator {
    
    @Override
    public BinaryColumn getSuitableCoordinates(Column<?> column) {
-        for(int y : search) {
+        for(int y = search.getMax(); y >= search.getMin(); y--) {
            if(column.getBlock(y).isAir() && !column.getBlock(y - 1).isAir()) {
                return new BinaryColumn(y, y + 1, yi -> true);
            }
@@ -28,7 +28,6 @@ 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;
@@ -124,7 +123,6 @@ 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));
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.config.templates.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);
-    }
-}
@@ -9,8 +9,6 @@ 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;
@@ -22,12 +20,12 @@ public abstract class Normalizer implements NoiseSampler {
    public abstract double normalize(double in);
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        return normalize(sampler.noise(seed, x, y));
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return normalize(sampler.noise(seed, x, y, z));
    }
 }
@@ -9,8 +9,6 @@ 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;
@@ -24,7 +22,7 @@ public class DomainWarpedSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        return function.noise(seed++,
                              x + warp.noise(seed++, x, y) * amplitude,
                              y + warp.noise(seed, x, y) * amplitude
@@ -32,7 +30,7 @@ public class DomainWarpedSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return function.noise(seed++,
                              x + warp.noise(seed++, x, y, z) * amplitude,
                              y + warp.noise(seed++, x, y, z) * amplitude,
@@ -8,7 +8,6 @@
 package com.dfsek.terra.addons.noise.samplers;

 import java.awt.image.BufferedImage;
-import java.util.List;

 import com.dfsek.terra.api.noise.NoiseSampler;

@@ -26,14 +25,14 @@ public class ImageSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        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, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return noise(seed, x, y);
    }
    
@@ -9,8 +9,6 @@ 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;
@@ -27,7 +25,7 @@ public class KernelSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        x *= frequency;
        y *= frequency;
        double accumulator = 0;
@@ -45,7 +43,7 @@ public class KernelSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        x *= frequency;
        y *= frequency;
        z *= frequency;
@@ -2,8 +2,6 @@ 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;
@@ -18,12 +16,12 @@ public class LinearHeightmapSampler implements NoiseSampler {
    
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        return noise(seed, x, 0, y);
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return -y + base + sampler.noise(seed, x, y, z) * scale;
    }
 }
@@ -2,8 +2,6 @@ package com.dfsek.terra.addons.noise.samplers;

 import com.dfsek.terra.api.noise.NoiseSampler;

-import java.util.List;
-

 public class TranslateSampler implements NoiseSampler {
    
@@ -18,12 +16,12 @@ public class TranslateSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        return sampler.noise(seed, x - dx, y - dz);
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return sampler.noise(seed, x - dx, y - dy, z - dz);
    }
 }
@@ -2,8 +2,6 @@ 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;
@@ -15,12 +13,12 @@ public abstract class BinaryArithmeticSampler implements NoiseSampler {
    }
    
    @Override
-    public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y) {
        return operate(left.noise(seed, x, y), right.noise(seed, x, y));
    }
    
    @Override
-    public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double noise(long seed, double x, double y, double z) {
        return operate(left.noise(seed, x, y, z), right.noise(seed, x, y, z));
    }
    
@@ -10,8 +10,6 @@ package com.dfsek.terra.addons.noise.samplers.noise;
 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,7 +219,7 @@ public class CellularSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        int xr = (int) Math.round(x);
        int yr = (int) Math.round(y);
@@ -275,7 +273,9 @@ public class CellularSampler extends NoiseFunction {
        
        if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) {
            distance0 = Math.sqrt(distance0);
-            distance1 = Math.sqrt(distance1);
+            if(returnType != ReturnType.CellValue) {
+                distance1 = Math.sqrt(distance1);
+            }
        }
        
        return switch(returnType) {
@@ -298,7 +298,7 @@ public class CellularSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        int xr = (int) Math.round(x);
        int yr = (int) Math.round(y);
@@ -7,9 +7,6 @@

 package com.dfsek.terra.addons.noise.samplers.noise;

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


-import java.util.List;
-
-
 public class DistanceSampler extends NoiseFunction {
    
    private final DistanceFunction distanceFunction;
@@ -25,7 +22,7 @@ public class DistanceSampler extends NoiseFunction {
    }
   
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        double dx = x - ox;
        double dy = y - oz;
        if (normalize && (Math.abs(dx) > radius || Math.abs(dy) > radius)) return 1;
@@ -35,7 +32,7 @@ public class DistanceSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        double dx = x - ox;
        double dy = y - oy;
        double dz = z - oz;
@@ -13,7 +13,6 @@ 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;
@@ -42,12 +41,12 @@ public class ExpressionFunction extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        return expression.evaluate(new SeedContext(seed), x, 0, y);
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        return expression.evaluate(new SeedContext(seed), x, y, z);
    }
 }
@@ -10,8 +10,6 @@ package com.dfsek.terra.addons.noise.samplers.noise;
 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 {
    private final WhiteNoiseSampler rand;
@@ -105,12 +103,12 @@ public class GaborNoiseSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double z) {
        return gaborNoise(seed, x, z);
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        return gaborNoise(seed, x, z);
    }
 }
@@ -9,9 +9,6 @@ package com.dfsek.terra.addons.noise.samplers.noise;

 import com.dfsek.terra.api.noise.NoiseSampler;

-import java.util.ArrayList;
-import java.util.List;
-

 public abstract class NoiseFunction implements NoiseSampler {
    // Hashing
@@ -53,32 +50,16 @@ public abstract class NoiseFunction implements NoiseSampler {
    }
    
    @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);
+    public double noise(long seed, double x, double y) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency);
    }
    
    @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);
+    public double noise(long seed, double x, double y, double z) {
+        return getNoiseRaw(seed + salt, x * frequency, y * frequency, z * frequency);
    }
    
-    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);
    
-    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);
+    public abstract double getNoiseRaw(long seed, double x, double y, double z);
 }
@@ -1,404 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.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;
-    }
-}
@@ -10,8 +10,6 @@ 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 {
    public BrownianMotionSampler(NoiseSampler input) {
@@ -19,7 +17,7 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -37,7 +35,7 @@ public class BrownianMotionSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -10,8 +10,6 @@ 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 {
    private double pingPongStrength = 2.0;
@@ -31,7 +29,7 @@ public class PingPongSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -49,7 +47,7 @@ public class PingPongSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -10,8 +10,6 @@ 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 {
    
@@ -20,7 +18,7 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -38,7 +36,7 @@ public class RidgedFractalSampler extends FractalNoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        double sum = 0;
        double amp = fractalBounding;
        
@@ -9,8 +9,6 @@ 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.
@@ -23,7 +21,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        double v1, v2, s;
        do {
            v1 = whiteNoiseSampler.noise(seed++, x, y);
@@ -35,7 +33,7 @@ public class GaussianNoiseSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        double v1, v2, s;
        do {
            v1 = whiteNoiseSampler.noise(seed++, x, y, z);
@@ -10,8 +10,6 @@ package com.dfsek.terra.addons.noise.samplers.noise.random;
 import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.api.util.MathUtil;

-import java.util.List;
-

 /**
 * NoiseSampler implementation to produce random, uniformly distributed (white) noise.
@@ -42,12 +40,12 @@ public class WhiteNoiseSampler extends NoiseFunction {
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y) {
        return (getNoiseUnmapped(seed, x, y) - 1.5) * 2;
    }
    
    @Override
-    public double getNoiseRaw(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long seed, double x, double y, double z) {
        return (getNoiseUnmapped(seed, x, y, z) - 1.5) * 2;
    }
    
@@ -7,16 +7,13 @@

 package com.dfsek.terra.addons.noise.samplers.noise.simplex;

-import java.util.List;
-
-
 /**
 * NoiseSampler implementation to provide OpenSimplex2 (Smooth Variant) noise.
 */
 public class OpenSimplex2SSampler extends SimplexStyleSampler {
    @Override
    @SuppressWarnings("NumericOverflow")
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        // 2D OpenSimplex2S case is a modified 2D simplex noise.
        
@@ -124,7 +121,7 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
    
    @Override
    @SuppressWarnings("NumericOverflow")
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        // 3D OpenSimplex2S case uses two offset rotated cube grids.
        final double R3 = (2.0 / 3.0);
@@ -7,9 +7,6 @@

 package com.dfsek.terra.addons.noise.samplers.noise.simplex;

-import java.util.List;
-
-
 /**
 * NoiseSampler implementation to provide OpenSimplex2 noise.
 */
@@ -17,7 +14,7 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
    private static final double SQRT3 = 1.7320508075688772935274463415059;
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex.
        final double G2 = (3 - SQRT3) / 6;
@@ -78,7 +75,7 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        // 3D OpenSimplex2Sampler case uses two offset rotated cube grids.
        final double R3 = (2.0 / 3.0);
@@ -9,15 +9,13 @@ package com.dfsek.terra.addons.noise.samplers.noise.simplex;

 import com.dfsek.terra.api.util.MathUtil;

-import java.util.List;
-

 /**
 * NoiseSampler implementation to provide Perlin Noise.
 */
 public class PerlinSampler extends SimplexStyleSampler {
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        int x0 = (int) Math.floor(x);
        int y0 = (int) Math.floor(y);
@@ -42,7 +40,7 @@ public class PerlinSampler extends SimplexStyleSampler {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        int x0 = (int) Math.floor(x);
        int y0 = (int) Math.floor(y);
@@ -7,9 +7,6 @@

 package com.dfsek.terra.addons.noise.samplers.noise.simplex;

-import java.util.List;
-
-
 public class SimplexSampler extends SimplexStyleSampler {
    private static final Double2[] GRAD_2D = {
            new Double2(-1, -1), new Double2(1, -1), new Double2(-1, 1), new Double2(1, 1),
@@ -61,7 +58,7 @@ public class SimplexSampler extends SimplexStyleSampler {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        double t = (x + y) * F2;
        int i = (int) Math.floor(x + t);
@@ -118,7 +115,7 @@ public class SimplexSampler extends SimplexStyleSampler {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        double t = (x + y + z) * F3;
        int i = (int) Math.floor(x + t);
@@ -9,12 +9,10 @@ package com.dfsek.terra.addons.noise.samplers.noise.value;

 import com.dfsek.terra.api.util.MathUtil;

-import java.util.List;
-

 public class ValueCubicSampler extends ValueStyleNoise {
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        int x1 = (int) Math.floor(x);
        int y1 = (int) Math.floor(y);
@@ -44,7 +42,7 @@ public class ValueCubicSampler extends ValueStyleNoise {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        int x1 = (int) Math.floor(x);
        int y1 = (int) Math.floor(y);
@@ -9,12 +9,10 @@ package com.dfsek.terra.addons.noise.samplers.noise.value;

 import com.dfsek.terra.api.util.MathUtil;

-import java.util.List;
-

 public class ValueSampler extends ValueStyleNoise {
    @Override
-    public double getNoiseRaw(long sl, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
        int x0 = (int) Math.floor(x);
        int y0 = (int) Math.floor(y);
@@ -34,7 +32,7 @@ public class ValueSampler extends ValueStyleNoise {
    }
    
    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
+    public double getNoiseRaw(long sl, double x, double y, double z) {
        int seed = (int) sl;
        int x0 = (int) Math.floor(x);
        int y0 = (int) Math.floor(y);
@@ -0,0 +1,13 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+}
+
+
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.numberpredicate.lib.paralithic")
+}
@@ -0,0 +1,34 @@
+package com.dfsek.terra.addons.numberpredicate;
+
+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.tectonic.api.depth.DepthTracker;
+import com.dfsek.tectonic.api.exception.LoadException;
+import com.dfsek.tectonic.api.loader.ConfigLoader;
+import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.AnnotatedType;
+import java.util.function.DoublePredicate;
+
+
+public class DoublePredicateLoader implements TypeLoader<DoublePredicate> {
+    @Override
+    public DoublePredicate load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader,
+                                DepthTracker depthTracker) throws LoadException {
+        if (o instanceof String expressionString) {
+            Scope scope = new Scope();
+            scope.addInvocationVariable("value");
+            try {
+                Expression expression = new Parser().parse(expressionString, scope);
+                return d -> expression.evaluate(d) != 0; // Paralithic expressions treat '!= 0' as true
+            } catch(ParseException e) {
+                throw new LoadException("Failed to parse double predicate expression", e, depthTracker);
+            }
+        } else {
+            throw new LoadException("Double predicates must be defined as a string. E.g. 'value > 3'", depthTracker);
+        }
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * 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.numberpredicate;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.DoublePredicate;
+import java.util.function.Supplier;
+
+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;
+
+public class NumberPredicateAddon implements AddonInitializer {
+    
+    @Inject
+    private Platform plugin;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        plugin.getEventManager()
+              .getHandler(FunctionalEventHandler.class)
+              .register(addon, ConfigPackPreLoadEvent.class)
+              .then(event -> event.getPack().applyLoader(DoublePredicate.class, new DoublePredicateLoader()))
+              .priority(50)
+              .failThrough();
+    }
+}
@@ -0,0 +1,12 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: config-number-predicate
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addons.numberpredicate.NumberPredicateAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
@@ -14,8 +14,13 @@ 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+

 public class OreAddon implements AddonInitializer {
+    private static final Logger logger = LoggerFactory.getLogger(OreAddon.class);
+    
    @Inject
    private Platform platform;
    
@@ -29,5 +34,8 @@ public class OreAddon implements AddonInitializer {
                .register(addon, ConfigPackPreLoadEvent.class)
                .then(event -> event.getPack().registerConfigType(new OreConfigType(), addon.key("ORE"), 1))
                .failThrough();
+        
+        if(platform.getTerraConfig().isDebugLog())
+            logger.warn("The ore-config addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the ore-config-v2 addon for future pack development instead.");
    }
 }
@@ -7,6 +7,7 @@

 package com.dfsek.terra.addons.ore.ores;

+import java.util.BitSet;
 import java.util.Map;
 import java.util.Random;

@@ -40,57 +41,130 @@ public class VanillaOre implements Structure {
        this.materials = materials;
    }
    
+    protected static boolean shouldNotDiscard(Random random, double chance) {
+        if(chance <= 0.0F) {
+            return true;
+        } else if(chance >= 1.0F) {
+            return false;
+        } else {
+            return random.nextFloat() >= chance;
+        }
+    }
+    
+    public static double lerp(double t, double v0, double v1) {
+        return v0 + t * (v1 - v0);
+    }
+    
    @Override
    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
-        int centerX = location.getX();
-        int centerZ = location.getZ();
-        int centerY = location.getY();
+        float randomRadian = random.nextFloat() * (float) Math.PI;
+        double eigthSize = size / 8.0F;
        
+        // Place points to form a line segment
+        double startX = (double) location.getX() + MathUtil.sin(randomRadian) * eigthSize;
+        double endX = (double) location.getX() - MathUtil.sin(randomRadian) * eigthSize;
        
-        float f = random.nextFloat() * (float) Math.PI;
+        double startZ = (double) location.getZ() + MathUtil.cos(randomRadian) * eigthSize;
+        double endZ = (double) location.getZ() - MathUtil.cos(randomRadian) * eigthSize;
        
-        double d1 = centerX + 8 + MathUtil.sin(f) * size / 8.0F;
-        double d2 = centerX + 8 - MathUtil.sin(f) * size / 8.0F;
-        double d3 = centerZ + 8 + MathUtil.cos(f) * size / 8.0F;
-        double d4 = centerZ + 8 - MathUtil.cos(f) * size / 8.0F;
+        double startY = location.getY() + random.nextInt(3) - 2;
+        double endY = location.getY() + random.nextInt(3) - 2;
        
-        double d5 = centerY + random.nextInt(3) - 2D;
-        double d6 = centerY + random.nextInt(3) - 2D;
+        int sizeInt = (int) size;
+        double[] points = new double[sizeInt * 4];
        
-        for(int i = 0; i < size; i++) {
-            float iFactor = (float) i / (float) size;
-            
-            double d10 = random.nextDouble() * size / 16.0D;
-            double d11 = (MathUtil.sin(Math.PI * iFactor) + 1.0) * d10 + 1.0;
-            double d12 = (MathUtil.sin(Math.PI * iFactor) + 1.0) * d10 + 1.0;
-            
-            int xStart = (int) Math.round(Math.floor(d1 + (d2 - d1) * iFactor - d11 / 2.0D));
-            int yStart = (int) Math.round(Math.floor(d5 + (d6 - d5) * iFactor - d12 / 2.0D));
-            int zStart = (int) Math.round(Math.floor(d3 + (d4 - d3) * iFactor - d11 / 2.0D));
-            
-            int xEnd = (int) Math.round(Math.floor(d1 + (d2 - d1) * iFactor + d11 / 2.0D));
-            int yEnd = (int) Math.round(Math.floor(d5 + (d6 - d5) * iFactor + d12 / 2.0D));
-            int zEnd = (int) Math.round(Math.floor(d3 + (d4 - d3) * iFactor + d11 / 2.0D));
-            
-            for(int x = xStart; x <= xEnd; x++) {
-                double d13 = (x + 0.5D - (d1 + (d2 - d1) * iFactor)) / (d11 / 2.0D);
+        // Compute initial point positions and radius
+        for(int i = 0; i < sizeInt; ++i) {
+            float t = (float) i / (float) sizeInt;
+            double xt = lerp(t, startX, endX);
+            double yt = lerp(t, startY, endY);
+            double zt = lerp(t, startZ, endZ);
+            double roll = random.nextDouble() * size / 16.0;
+            // Taper radius closer to line ends
+            double radius = ((MathUtil.sin((float) Math.PI * t) + 1.0F) * roll + 1.0) / 2.0;
+            points[i * 4] = xt;
+            points[i * 4 + 1] = yt;
+            points[i * 4 + 2] = zt;
+            points[i * 4 + 3] = radius;
+        }
+        
+        // Compare every point to every other point
+        for(int a = 0; a < sizeInt - 1; ++a) {
+            double radiusA = points[a * 4 + 3];
+            if(radiusA > 0.0) {
+                for(int b = a + 1; b < sizeInt; ++b) {
+                    double radiusB = points[b * 4 + 3];
+                    if(radiusB > 0.0) {
+                        double dxt = points[a * 4] - points[b * 4];
+                        double dyt = points[a * 4 + 1] - points[b * 4 + 1];
+                        double dzt = points[a * 4 + 2] - points[b * 4 + 2];
+                        double dRadius = radiusA - radiusB;
+                        
+                        // If the radius difference is greater than the distance between the two points
+                        if(dRadius * dRadius > dxt * dxt + dyt * dyt + dzt * dzt) {
+                            // Set smaller of two radii to -1
+                            if(dRadius > 0.0) {
+                                points[b * 4 + 3] = -1.0;
+                            } else {
+                                points[a * 4 + 3] = -1.0;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        int outset = (int) Math.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F);
+        int x = (int) (location.getX() - Math.ceil(eigthSize) - outset);
+        int y = location.getY() - 2 - outset;
+        int z = (int) (location.getZ() - Math.ceil(eigthSize) - outset);
+        
+        int horizontalSize = (int) (2 * (Math.ceil(eigthSize) + outset));
+        int verticalSize = 2 * (2 + outset);
+        
+        int sphereCount = 0;
+        BitSet visited = new BitSet(horizontalSize * verticalSize * horizontalSize);
+        
+        // Generate a sphere at each point
+        for(int i = 0; i < sizeInt; ++i) {
+            double radius = points[i * 4 + 3];
+            if(radius > 0.0) {
+                double xt = points[i * 4];
+                double yt = points[i * 4 + 1];
+                double zt = points[i * 4 + 2];
                
-                if(d13 * d13 < 1.0D) {
-                    for(int y = yStart; y <= yEnd; y++) {
-                        double d14 = (y + 0.5D - (d5 + (d6 - d5) * iFactor)) / (d12 / 2.0D);
-                        if(d13 * d13 + d14 * d14 < 1.0D) {
-                            for(int z = zStart; z <= zEnd; z++) {
-                                double d15 = (z + 0.5D - (d3 + (d4 - d3) * iFactor)) / (d11 / 2.0D);
-                                if(y >= world.getMaxHeight() || y < world.getMinHeight()) continue;
-                                BlockType block = world.getBlockState(x, y, z).getBlockType();
-                                if((d13 * d13 + d14 * d14 + d15 * d15 < 1.0D) && getReplaceable().contains(block)) {
-                                    if(exposed > random.nextDouble() || !(world.getBlockState(x, y, z - 1).isAir() ||
-                                                                          world.getBlockState(x, y, z + 1).isAir() ||
-                                                                          world.getBlockState(x, y - 1, z).isAir() ||
-                                                                          world.getBlockState(x, y + 1, z).isAir() ||
-                                                                          world.getBlockState(x - 1, y, z).isAir() ||
-                                                                          world.getBlockState(x + 1, y, z).isAir())) {
-                                        world.setBlockState(x, y, z, getMaterial(block), isApplyGravity());
+                int xLowerBound = (int) Math.max(Math.floor(xt - radius), x);
+                int xUpperBound = (int) Math.max(Math.floor(xt + radius), xLowerBound);
+                
+                int yLowerBound = (int) Math.max(Math.floor(yt - radius), y);
+                int yUpperBound = (int) Math.max(Math.floor(yt + radius), yLowerBound);
+                
+                int zLowerBound = (int) Math.max(Math.floor(zt - radius), z);
+                int zUpperBound = (int) Math.max(Math.floor(zt + radius), zLowerBound);
+                
+                // Iterate over coordinates within bounds
+                for(int xi = xLowerBound; xi <= xUpperBound; ++xi) {
+                    double dx = ((double) xi + 0.5 - xt) / radius;
+                    if(dx * dx < 1.0) {
+                        for(int yi = yLowerBound; yi <= yUpperBound; ++yi) {
+                            double dy = ((double) yi + 0.5 - yt) / radius;
+                            if(dx * dx + dy * dy < 1.0) {
+                                for(int zi = zLowerBound; zi <= zUpperBound; ++zi) {
+                                    double dz = ((double) zi + 0.5 - zt) / radius;
+                                    
+                                    // If position is inside the sphere
+                                    if(dx * dx + dy * dy + dz * dz < 1.0 && !(yi < world.getMinHeight() || yi >= world.getMaxHeight())) {
+                                        int index = xi - x + (yi - y) * horizontalSize + (zi - z) * horizontalSize * verticalSize;
+                                        if(!visited.get(index)) { // Skip blocks that have already been visited
+                                            
+                                            visited.set(index);
+                                            BlockType block = world.getBlockState(xi, yi, zi).getBlockType();
+                                            if(shouldPlace(block, random, world, xi, yi, zi)) {
+                                                world.setBlockState(xi, yi, zi, getMaterial(block), isApplyGravity());
+                                                ++sphereCount;
+                                                break;
+                                            }
+                                        }
                                    }
                                }
                            }
@@ -99,7 +173,23 @@ public class VanillaOre implements Structure {
                }
            }
        }
-        return true;
+        
+        return sphereCount > 0;
+    }
+    
+    public boolean shouldPlace(BlockType type, Random random, WritableWorld world, int x, int y, int z) {
+        if(!getReplaceable().contains(type)) {
+            return false;
+        } else if(shouldNotDiscard(random, exposed)) {
+            return true;
+        } else {
+            return !(world.getBlockState(x, y, z - 1).isAir() ||
+                     world.getBlockState(x, y, z + 1).isAir() ||
+                     world.getBlockState(x, y - 1, z).isAir() ||
+                     world.getBlockState(x, y + 1, z).isAir() ||
+                     world.getBlockState(x - 1, y, z).isAir() ||
+                     world.getBlockState(x + 1, y, z).isAir());
+        }
    }
    
    public BlockState getMaterial(BlockType replace) {
@@ -1,4 +1,4 @@
-version = version("1.0.0")
+version = version("1.0.1")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
@@ -7,6 +7,11 @@ import java.util.function.Supplier;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.config.ColorLoader;
 import com.dfsek.terra.addons.image.config.ColorLoader.ColorString;
+import com.dfsek.terra.addons.image.config.ImageLibraryPackConfigTemplate;
+import com.dfsek.terra.addons.image.config.noisesampler.ChannelNoiseSamplerTemplate;
+import com.dfsek.terra.addons.image.config.noisesampler.DistanceTransformNoiseSamplerTemplate;
+import com.dfsek.terra.addons.image.config.image.ImageTemplate;
+import com.dfsek.terra.addons.image.config.image.StitchedImageTemplate;
 import com.dfsek.terra.addons.image.config.colorsampler.ConstantColorSamplerTemplate;
 import com.dfsek.terra.addons.image.config.colorsampler.image.SingleImageColorSamplerTemplate;
 import com.dfsek.terra.addons.image.config.colorsampler.image.TileImageColorSamplerTemplate;
@@ -52,6 +57,10 @@ public class ImageLibraryAddon implements AddonInitializer {
                .getHandler(FunctionalEventHandler.class)
                .register(addon, ConfigPackPreLoadEvent.class)
                .priority(10)
+                .then(event -> {
+                    ImageLibraryPackConfigTemplate config = event.loadTemplate(new ImageLibraryPackConfigTemplate());
+                    event.getPack().getContext().put(config);
+                })
                .then(event -> {
                    ConfigPack pack = event.getPack();
                    CheckedRegistry<Supplier<ObjectTemplate<Image>>> imageRegistry = pack.getOrCreateRegistry(IMAGE_REGISTRY_KEY);
@@ -0,0 +1,37 @@
+package com.dfsek.terra.addons.image.config;
+
+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.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.api.properties.Properties;
+
+public class ImageLibraryPackConfigTemplate implements ConfigTemplate, Properties {
+    // TODO - These would be better as plugin wide config parameters in config.yml
+    
+    @Value("images.cache.load-on-use")
+    @Description("If set to true, images will load into memory upon use rather than on pack load.")
+    @Default
+    private boolean loadOnUse = false;
+    
+    @Value("images.cache.timeout")
+    @Description("How many seconds to keep images loaded in the image cache for. " +
+                 "If set to a number greater than 0, images will be removed from memory if not used after the timeout, otherwise images will stay loaded in memory. " +
+                 "Setting the timeout to greater than 0 will trade decreased memory consumption when not performing any image reads for a period of time for extra processing time required to perform cache lookups.")
+    @Default
+    private int cacheTimeout = 0;
+    
+    public boolean loadOnUse() {
+        return loadOnUse;
+    }
+    
+    public boolean unloadOnTimeout() {
+        return cacheTimeout > 0;
+    }
+    
+    public int getCacheTimeout() {
+        return cacheTimeout;
+    }
+}
@@ -3,44 +3,60 @@ package com.dfsek.terra.addons.image.config.image;
 import javax.imageio.ImageIO;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;

+import com.dfsek.terra.addons.image.config.ImageLibraryPackConfigTemplate;
 import com.dfsek.terra.addons.image.image.BufferedImageWrapper;
 import com.dfsek.terra.addons.image.image.Image;
+import com.dfsek.terra.addons.image.image.SuppliedImage;
 import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.Loader;
 import com.dfsek.terra.api.properties.Properties;

+import com.dfsek.terra.api.util.generic.Lazy;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+

 /*
 * Cache prevents configs from loading the same image multiple times into memory
 */
-record ImageCache(ConcurrentHashMap<String, Image> map) implements Properties {
+record ImageCache(LoadingCache<String, Image> cache) implements Properties {
    public static Image load(String path, ConfigPack pack, Loader files) throws IOException {
-        ImageCache cache;
+        ImageLibraryPackConfigTemplate config = pack.getContext().get(ImageLibraryPackConfigTemplate.class);
+        ImageCache images;
        if(!pack.getContext().has(ImageCache.class)) {
-            cache = new ImageCache(new ConcurrentHashMap<>());
-            pack.getContext().put(cache);
-        } else {
-            cache = pack.getContext().get(ImageCache.class);
+            var cacheBuilder = Caffeine.newBuilder();
+            if (config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS);
+            images = new ImageCache(cacheBuilder.build(s -> loadImage(s, files)));
+            pack.getContext().put(images);
+        } else images = pack.getContext().get(ImageCache.class);
+        
+        if (config.loadOnUse()) {
+            if(config.unloadOnTimeout()) { // Grab directly from cache if images are to unload on timeout
+                return new SuppliedImage(() -> images.cache.get(path));
+            } else {
+                // If images do not time out, image can be lazily loaded once instead of performing cache lookups for each image operation
+                Lazy<Image> lazyImage = Lazy.lazy(() -> images.cache.get(path));
+                return new SuppliedImage(lazyImage::value);
+            }
        }
        
-        if(cache.map.containsKey(path)) {
-            return cache.map.get(path);
-        } else {
-            try {
-                BufferedImageWrapper image = new BufferedImageWrapper(ImageIO.read(files.get(path)));
-                cache.map.put(path, image);
-                return image;
-            } catch(IllegalArgumentException e) {
-                throw new IllegalArgumentException("Unable to load image (image might be too large?)", e);
-            } catch(IOException e) {
-                if(e instanceof FileNotFoundException) {
-                    // Rethrow using nicer message
-                    throw new IOException("Unable to load image: No such file or directory: " + path, e);
-                }
-                throw new IOException("Unable to load image", e);
+        return images.cache.get(path);
+    }
+    
+    private static Image loadImage(String path, Loader files) throws IOException {
+        try {
+            return new BufferedImageWrapper(ImageIO.read(files.get(path)));
+        } catch(IllegalArgumentException e) {
+            throw new IllegalArgumentException("Unable to load image (image might be too large?)", e);
+        } catch(IOException e) {
+            if(e instanceof FileNotFoundException) {
+                // Rethrow using nicer message
+                throw new IOException("Unable to load image: No such file or directory: " + path, e);
            }
+            throw new IOException("Unable to load image", e);
        }
    }
 }
@@ -0,0 +1,27 @@
+package com.dfsek.terra.addons.image.image;
+
+import java.util.function.Supplier;
+
+public class SuppliedImage implements Image {
+    
+    private final Supplier<Image> imageSupplier;
+    
+    public SuppliedImage(Supplier<Image> imageSupplier) {
+        this.imageSupplier = imageSupplier;
+    }
+    
+    @Override
+    public int getRGB(int x, int y) {
+        return imageSupplier.get().getRGB(x, y);
+    }
+    
+    @Override
+    public int getWidth() {
+        return imageSupplier.get().getWidth();
+    }
+    
+    @Override
+    public int getHeight() {
+        return imageSupplier.get().getHeight();
+    }
+}
@@ -4,7 +4,8 @@ import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.util.ColorUtil;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
 import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
+
+import static com.dfsek.terra.addons.image.util.MathUtil.lerp;


 public class ChannelNoiseSampler implements NoiseSampler {
@@ -29,7 +30,7 @@ public class ChannelNoiseSampler implements NoiseSampler {
        int sample = colorSampler.apply((int) x, (int) y);
        int premultiplied = premultiply ? ColorUtil.premultiply(sample) : sample;
        double channelValue = channel.from(premultiplied);
-        return normalize ? MathUtil.linearMap(channelValue, 0, -1, 255, 1) : channelValue;
+        return normalize ? lerp(channelValue, 0, -1, 255, 1) : channelValue;
    }
    
    @Override
@@ -4,7 +4,8 @@ import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.addons.image.util.ColorUtil;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
 import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
+
+import static com.dfsek.terra.addons.image.util.MathUtil.lerp;


 /**
@@ -156,11 +157,11 @@ public class DistanceTransform {
                double d = distances[x][y];
                distances[x][y] = switch(normalization) {
                    case None -> distances[x][y];
-                    case Linear -> MathUtil.linearMap(d, minDistance, -1, maxDistance, 1);
+                    case Linear -> lerp(d, minDistance, -1, maxDistance, 1);
                    case SmoothPreserveZero -> {
                        if(minDistance > 0 || maxDistance < 0) {
                            // Can't preserve zero if it is not contained in range so just lerp
-                            yield MathUtil.linearMap(distances[x][y], minDistance, -1, maxDistance, 1);
+                            yield lerp(distances[x][y], minDistance, -1, maxDistance, 1);
                        } else {
                            if(d > 0) {
                                yield Math.pow(d/maxDistance, 2);
@@ -0,0 +1,9 @@
+package com.dfsek.terra.addons.image.util;
+
+public class MathUtil {
+    private MathUtil() {}
+    
+    public static double lerp(double x, double x1, double y1, double x2, double y2) {
+        return (((y1-y2)*(x-x1))/(x1-x2))+y1;
+    }
+}
@@ -0,0 +1,6 @@
+version = version("1.0.0")
+
+dependencies {
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:chunk-generator-noise-3d"))
+}
@@ -0,0 +1,32 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
+import com.dfsek.terra.api.structure.feature.BinaryColumn;
+import com.dfsek.terra.api.structure.feature.Locator;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.chunk.generation.util.Column;
+
+import java.util.function.DoublePredicate;
+
+
+public class SlantLocator implements Locator {
+    
+    private final DoublePredicate predicate;
+    
+    public SlantLocator(DoublePredicate predicate) {
+        this.predicate = predicate;
+    }
+    
+    @Override
+    public BinaryColumn getSuitableCoordinates(Column<?> column) {
+        return column.newBinaryColumn(y -> {
+            int x = column.getX();
+            int z = column.getZ();
+            World world = column.getWorld();
+            NoiseChunkGenerator3D generator = (NoiseChunkGenerator3D) world.getGenerator();
+            BiomeProvider biomeProvider = world.getBiomeProvider();
+            return predicate.test(generator.getSlant(x, y, z, world, biomeProvider));
+        });
+    }
+}
@@ -0,0 +1,37 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+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.structure.feature.Locator;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+
+import java.util.function.Supplier;
+
+
+public class SlantLocatorAddon implements AddonInitializer {
+    
+    public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {
+    };
+    
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .priority(1)
+                .then(event -> event.getPack().getOrCreateRegistry(LOCATOR_TOKEN).register(addon.key("SLANT"), SlantLocatorTemplate::new))
+                .failThrough();
+    }
+}
@@ -0,0 +1,20 @@
+package com.dfsek.terra.addon.feature.locator.slant;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.api.structure.feature.Locator;
+
+import java.util.function.DoublePredicate;
+
+
+public class SlantLocatorTemplate implements ObjectTemplate<Locator> {
+    
+    @Value("condition")
+    private DoublePredicate predicate;
+    
+    @Override
+    public Locator get() {
+        return new SlantLocator(predicate);
+    }
+}
@@ -0,0 +1,14 @@
+schema-version: 1
+contributors:
+  - Terra contributors
+id: locator-slant-noise-3d
+version: @VERSION@
+entrypoints:
+  - "com.dfsek.terra.addon.feature.locator.slant.SlantLocatorAddon"
+website:
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
+depends:
+  chunk-generator-noise-3d: "[1.2.0,2.0.0)"
@@ -8,8 +8,4 @@ dependencies {
    
    api("com.github.ben-manes.caffeine:caffeine:3.1.0")

-    api("io.github.aecsocket", "cpu-features-jni", Versions.Libraries.Internal.cpuFeaturesJava)
-    api("io.github.aecsocket", "cpu-features-jni-natives-linux", Versions.Libraries.Internal.cpuFeaturesJava)
-    api("io.github.aecsocket", "cpu-features-jni-natives-windows", Versions.Libraries.Internal.cpuFeaturesJava)
-    api("io.github.aecsocket", "cpu-features-jni-natives-macos", Versions.Libraries.Internal.cpuFeaturesJava)
 }
@@ -21,6 +21,8 @@ public interface PluginConfig {
    
    boolean isDebugScript();
    
+    boolean isDebugLog();
+    
    int getBiomeSearchResolution();
    
    int getStructureCache();
@@ -13,39 +13,17 @@ import com.dfsek.terra.api.util.vector.Vector2Int;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.util.vector.Vector3Int;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-

 public interface NoiseSampler {
    static NoiseSampler zero() {
        return new NoiseSampler() {
-            
-            
            @Override
-            public double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
+            public double noise(long seed, double x, double y) {
                return 0;
            }
            
            @Override
-            public double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
-                return 0;
-            }
-            
-            @Override
-            public void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
-                //no-op
-            }
-            
-            @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() {
+            public double noise(long seed, double x, double y, double z) {
                return 0;
            }
        };
@@ -68,76 +46,15 @@ public interface NoiseSampler {
        return noise(seed, vector2.getX(), vector2.getZ());
    }
    
-    default double noise(Vector3 vector3, long seed, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextLayer, contextRadius);
-    }
-    
-    default double noise(Vector3Int vector3, long seed, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, vector3.getX(), vector3.getY(), vector3.getZ(), context, contextLayer, contextRadius);
-    }
-    
-    
-    default double noise(Vector2 vector2, long seed, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, vector2.getX(), vector2.getZ(), context, contextLayer, contextRadius);
-    }
-    
-    default double noise(Vector2Int vector2, long seed, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, vector2.getX(), vector2.getZ(), context, contextLayer, contextRadius);
-    }
-    
-    default double noise(long seed, double x, double y) {
-        int contextRadius = getContextRadius();
-        
-        ArrayList<double[]> list = new ArrayList<>();
-        generateContext(seed, x, y, list, 0, contextRadius);
-        return noise(seed, x, y, list, 0, contextRadius);
-    }
+    double noise(long seed, double x, double y);
    
    default double noise(long seed, int x, int y) {
        return noise(seed, (double) x, y);
    }
    
-    default double noise(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 noise(seed, x, y, z, list, 0, contextRadius);
-    }
+    double noise(long seed, double x, double y, double z);
    
    default double noise(long seed, int x, int y, int z) {
        return noise(seed, (double) x, y, z);
    }
-    
-    double noise(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius);
-    
-    default double noise(long seed, int x, int y, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, (double) x, y, context, contextLayer, contextRadius);
-    }
-    
-    double noise(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius);
-    
-    default double noise(long seed, int x, int y, int z, List<double[]> context, int contextLayer, int contextRadius) {
-        return noise(seed, (double) x, y, z, context, contextLayer, contextRadius);
-    }
-    
-    default void generateContext(long seed, double x, double y, List<double[]> context, int contextLayer, int contextRadius) {
-        //no-op
-    }
-    
-    default void generateContext(long seed, int x, int y, List<double[]> context, int contextLayer, int contextRadius) {
-        generateContext(seed, (double) x, y, context, contextLayer, contextRadius);
-    }
-    
-    default void generateContext(long seed, double x, double y, double z, List<double[]> context, int contextLayer, int contextRadius) {
-        //no-op
-    }
-    
-    default void generateContext(long seed, int x, int y, int z, List<double[]> context, int contextLayer, int contextRadius) {
-        generateContext(seed, (double) x, y, z, context, contextLayer, contextRadius);
-    }
-    
-    default int getContextRadius() {
-        return 0;
-    }
 }
@@ -7,11 +7,6 @@

 package com.dfsek.terra.api.util;

-import cpufeatures.CpuFeatures;
-import cpufeatures.aarch64.Aarch64Feature;
-import cpufeatures.arm.ArmFeature;
-import cpufeatures.x86.X86Feature;
-
 import java.util.List;


@@ -24,26 +19,6 @@ public final class MathUtil {
    private static final double degFull, degToIndex;
    private static final double[] sin, cos;
    
-    public static final boolean hasFMA;
-    
-    static {
-        boolean configHasFMA = false;
-        try {
-                CpuFeatures.load();
-                configHasFMA = switch (CpuFeatures.getArchitecture()) {
-                    case UNSUPPORTED -> false;
-                    case AARCH64 -> CpuFeatures.getAarch64Info().has(Aarch64Feature.ASIMD);
-                    case ARM -> CpuFeatures.getArmInfo().has(ArmFeature.NEON);
-                    case RISCV -> true;
-                    case X86 -> CpuFeatures.getX86Info().has(X86Feature.FMA3);
-                };
-        } catch (Throwable t) {
-            System.err.println("Failed to determine FMA support, assuming no FMA support");
-        }
-        hasFMA = configHasFMA;
-        System.out.println("FMA: " + configHasFMA);
-    }
-    
    static {
        SIN_BITS = 12;
        SIN_MASK = ~(-1 << SIN_BITS);
@@ -276,20 +251,4 @@ public final class MathUtil {
    public static double interpQuintic(double t) {
        return t * t * t * (t * (t * 6 - 15) + 10);
    }
-    
-    public static double linearMap(double x, double x1, double y1, double x2, double y2) {
-        return (((y1-y2)*(x-x1))/(x1-x2))+y1;
-    }
-    
-    public static double hypot(double x, double y) {
-        return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-    }
-    
-    public static double fma(double a, double b, double c) {
-        if (hasFMA) {
-            return Math.fma(a, b, c);
-        } else {
-            return a * b + c;
-        }
-    }
 }
@@ -14,8 +14,9 @@ import com.dfsek.terra.api.util.MathUtil;
 * oh yeah
 */
 public class Vector2 {
-    protected double x;
-    protected double z;
+    private static final Vector2 ZERO = new Vector2(0, 0);
+    private static final Vector2 UNIT = new Vector2(0, 1);
+    protected double x, z;
    
    /**
     * Create a vector with a given X and Z component
@@ -27,6 +28,13 @@ public class Vector2 {
        this.x = x;
        this.z = z;
    }
+    public static Vector2 zero() {
+        return ZERO;
+    }
+    
+    public static Vector2 unit() {
+        return UNIT;
+    }
    
    public static Vector2 of(double x, double z) {
        return new Vector2(x, z);
@@ -9,8 +9,7 @@ import com.dfsek.terra.api.util.Rotation;
 public class Vector2Int {
    private static final Vector2Int ZERO = new Vector2Int(0, 0);
    private static final Vector2Int UNIT = new Vector2Int(0, 1);
-    protected int x;
-    protected int z;
+    protected int x, z;
    
    protected Vector2Int(int x, int z) {
        this.x = x;
@@ -13,15 +13,22 @@ import com.dfsek.terra.api.util.MathUtil;


 public class Vector3 {
-    protected double x;
-    protected double y;
-    protected double z;
+    private static final Vector3 ZERO = new Vector3(0, 0, 0);
+    private static final Vector3 UNIT = new Vector3(0, 1, 0);
+    protected double x, y, z;
    
    private Vector3(double x, double y, double z) {
        this.x = x;
        this.y = y;
        this.z = z;
    }
+    public static Vector3 zero() {
+        return ZERO;
+    }
+    
+    public static Vector3 unit() {
+        return UNIT;
+    }
    
    public static Vector3 of(double x, double y, double z) {
        return new Vector3(x, y, z);
@@ -51,6 +51,10 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
    @Default
    private boolean debugScript = false;
    
+    @Value("debug.log")
+    @Default
+    private boolean debugLog = false;
+    
    @Value("biome-search-resolution")
    @Default
    private int biomeSearch = 4;
@@ -91,6 +95,8 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
            logger.info("Debug profiler enabled.");
        if(debugScript)
            logger.info("Script debug blocks enabled.");
+        if(debugLog)
+            logger.info("Debug logging enabled.");
    }
    
    @Override
@@ -113,6 +119,11 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig {
        return debugScript;
    }
    
+    @Override
+    public boolean isDebugLog() {
+        return debugLog;
+    }
+    
    @Override
    public int getBiomeSearchResolution() {
        return biomeSearch;
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-org.gradle.jvmargs=-Xmx4096m
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

 warn () {
    echo "$*"
-}
+} >&2

 die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
@@ -1,9 +1,11 @@
 plugins {
-    id("xyz.jpenilla.run-paper") version "1.0.6"
+    id("xyz.jpenilla.run-paper") version Versions.Bukkit.runPaper
 }

 repositories {
-    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+        name = "Sonatype"
+    }
 }

 dependencies {
@@ -13,12 +15,14 @@ dependencies {
    shaded(project(":platforms:bukkit:nms:v1_19_R2", configuration = "reobf"))
    shaded(project(":platforms:bukkit:nms:v1_19_R3", configuration = "reobf"))
    shaded(project(":platforms:bukkit:nms:v1_20_R1", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_20_R2", configuration = "reobf"))
    shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
    shadowJar {
        relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
+        relocate("com.tcoded.folialib", "com.dfsek.terra.lib.folialib")
        relocate("com.google.common", "com.dfsek.terra.lib.google.common")
        relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j")
        exclude("org/slf4j/**")
@@ -5,14 +5,11 @@ repositories {
 dependencies {
    shadedApi(project(":common:implementation:base"))
    
-    api("org.slf4j:slf4j-api:1.8.0-beta4") {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
-    
-    compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}")
+    compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
    
    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    shadedApi("com.google.guava:guava:30.0-jre")
+    shadedApi("com.tcoded", "FoliaLib" , Versions.Bukkit.foliaLib)
+    shadedApi("com.google.guava", "guava", Versions.Libraries.Internal.guava)
    
    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
 }
@@ -17,6 +17,7 @@

 package com.dfsek.terra.bukkit;

+import io.papermc.lib.PaperLib;
 import org.bukkit.Location;

 import com.dfsek.terra.api.entity.Entity;
@@ -44,14 +45,14 @@ public class BukkitEntity implements Entity {
    
    @Override
    public void position(Vector3 location) {
-        entity.teleport(BukkitAdapter.adapt(location).toLocation(entity.getWorld()));
+        PaperLib.teleportAsync(entity, BukkitAdapter.adapt(location).toLocation(entity.getWorld()));
    }
    
    @Override
    public void world(ServerWorld world) {
        Location newLoc = entity.getLocation().clone();
        newLoc.setWorld(BukkitAdapter.adapt(world));
-        entity.teleport(newLoc);
+        PaperLib.teleportAsync(entity, newLoc);
    }
    
    @Override
@@ -17,6 +17,7 @@

 package com.dfsek.terra.bukkit;

+import io.papermc.lib.PaperLib;
 import org.bukkit.Location;

 import com.dfsek.terra.api.entity.Player;
@@ -45,14 +46,14 @@ public class BukkitPlayer implements Player {
    
    @Override
    public void position(Vector3 location) {
-        delegate.teleport(BukkitAdapter.adapt(location).toLocation(delegate.getWorld()));
+        PaperLib.teleportAsync(delegate, BukkitAdapter.adapt(location).toLocation(delegate.getWorld()));
    }
    
    @Override
    public void world(ServerWorld world) {
        Location newLoc = delegate.getLocation().clone();
        newLoc.setWorld(BukkitAdapter.adapt(world));
-        delegate.teleport(newLoc);
+        PaperLib.teleportAsync(delegate, newLoc);
    }
    
    @Override
@@ -20,6 +20,7 @@ package com.dfsek.terra.bukkit;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
+import com.tcoded.folialib.wrapper.task.WrappedTask;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
@@ -29,6 +30,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Consumer;

 import com.dfsek.terra.AbstractPlatform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -85,7 +87,7 @@ public class PlatformImpl extends AbstractPlatform {
    
    @Override
    public void runPossiblyUnsafeTask(@NotNull Runnable task) {
-        Bukkit.getScheduler().runTask(plugin, task);
+        plugin.getFoliaLib().getImpl().runAsync(task);
    }
    
    @Override
@@ -42,6 +42,7 @@ import com.dfsek.terra.bukkit.nms.Initializer;
 import com.dfsek.terra.bukkit.util.PaperUtil;
 import com.dfsek.terra.bukkit.util.VersionUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import com.tcoded.folialib.FoliaLib;


 public class TerraBukkitPlugin extends JavaPlugin {
@@ -50,6 +51,8 @@ public class TerraBukkitPlugin extends JavaPlugin {
    private final PlatformImpl platform = new PlatformImpl(this);
    private final Map<String, com.dfsek.terra.api.world.chunk.generation.ChunkGenerator> generatorMap = new HashMap<>();
    
+    private final FoliaLib foliaLib = new FoliaLib(this);
+    
    @Override
    public void onEnable() {
        if(!doVersionCheck()) {
@@ -150,7 +153,7 @@ public class TerraBukkitPlugin extends JavaPlugin {
                                 """.strip());
                };
                runnable.run();
-                Bukkit.getScheduler().scheduleAsyncDelayedTask(this, runnable, 200L);
+                getFoliaLib().getImpl().runLaterAsync(runnable, 200L);
                // Bukkit.shutdown(); // we're not *that* evil
                Bukkit.getPluginManager().disablePlugin(this);
                return false;
@@ -177,4 +180,8 @@ public class TerraBukkitPlugin extends JavaPlugin {
            return pack.getGeneratorProvider().newInstance(pack);
        }), platform.getRawConfigRegistry().getByID(id).orElseThrow(), platform.getWorldHandle().air());
    }
+    
+    public FoliaLib getFoliaLib() {
+        return foliaLib;
+    }
 }
@@ -17,6 +17,8 @@

 package com.dfsek.terra.bukkit.util;

+import com.dfsek.terra.bukkit.TerraBukkitPlugin;
+
 import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -25,10 +27,10 @@ import static io.papermc.lib.PaperLib.suggestPaper;


 public final class PaperUtil {
-    public static void checkPaper(JavaPlugin main) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(main, () -> {
+    public static void checkPaper(TerraBukkitPlugin plugin) {
+        plugin.getFoliaLib().getImpl().runLaterAsync(() -> {
            if(!PaperLib.isPaper()) {
-                suggestPaper(main);
+                suggestPaper(plugin);
            }
        }, 100L);
    }
@@ -6,3 +6,4 @@ author: dfsek
 website: "@WIKI@"
 api-version: "1.13"
 description: "@DESCRIPTION@"
+folia-supported: true
@@ -7,7 +7,7 @@ repositories {
 dependencies {
    api(project(":platforms:bukkit:common"))
    paperDevBundle("1.18.2-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
@@ -7,7 +7,7 @@ repositories {
 dependencies {
    api(project(":platforms:bukkit:common"))
    paperDevBundle("1.19-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
@@ -7,7 +7,7 @@ repositories {
 dependencies {
    api(project(":platforms:bukkit:common"))
    paperDevBundle("1.19.3-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
@@ -7,7 +7,7 @@ repositories {
 dependencies {
    api(project(":platforms:bukkit:common"))
    paperDevBundle("1.19.4-R0.1-SNAPSHOT")
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
@@ -6,8 +6,8 @@ repositories {

 dependencies {
    api(project(":platforms:bukkit:common"))
-    paperDevBundle(Versions.Bukkit.paperDevBundle)
-    implementation("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT")
+    paperDevBundle("1.20.1-R0.1-SNAPSHOT")
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }

 tasks {
@@ -0,0 +1,17 @@
+apply(plugin = "io.papermc.paperweight.userdev")
+
+repositories {
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+}
+
+dependencies {
+    api(project(":platforms:bukkit:common"))
+    paperDevBundle(Versions.Bukkit.paperDevBundle)
+    implementation("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
+}
+
+tasks {
+    assemble {
+        dependsOn("reobfJar")
+    }
+}
@@ -0,0 +1,101 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.google.common.collect.ImmutableMap;
+import com.mojang.serialization.Lifecycle;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.core.WritableRegistry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.biome.Biome;
+import org.bukkit.NamespacedKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+import com.dfsek.terra.registry.master.ConfigRegistry;
+
+
+public class AwfulBukkitHacks {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AwfulBukkitHacks.class);
+    
+    private static final Map<ResourceLocation, List<ResourceLocation>> terraBiomeMap = new HashMap<>();
+    
+    public static void registerBiomes(ConfigRegistry configRegistry) {
+        try {
+            LOGGER.info("Hacking biome registry...");
+            WritableRegistry<Biome> biomeRegistry = (WritableRegistry<Biome>) RegistryFetcher.biomeRegistry();
+            
+            Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry<?>) biomeRegistry, false);
+            
+            configRegistry.forEach(pack -> pack.getRegistry(com.dfsek.terra.api.world.biome.Biome.class).forEach((key, biome) -> {
+                try {
+                    BukkitPlatformBiome platformBiome = (BukkitPlatformBiome) biome.getPlatformBiome();
+                    NamespacedKey vanillaBukkitKey = platformBiome.getHandle().getKey();
+                    ResourceLocation vanillaMinecraftKey = new ResourceLocation(vanillaBukkitKey.getNamespace(), vanillaBukkitKey.getKey());
+                    Biome platform = NMSBiomeInjector.createBiome(biome, Objects.requireNonNull(biomeRegistry.get(vanillaMinecraftKey)));
+                    
+                    ResourceKey<Biome> delegateKey = ResourceKey.create(
+                            Registries.BIOME,
+                            new ResourceLocation("terra", NMSBiomeInjector.createBiomeID(pack, key))
+                                                                       );
+                    
+                    Reference<Biome> holder = biomeRegistry.register(delegateKey, platform, Lifecycle.stable());
+                    Reflection.REFERENCE.invokeBindValue(holder, platform); // IMPORTANT: bind holder.
+                    
+                    platformBiome.getContext().put(new NMSBiomeInfo(delegateKey));
+                    
+                    terraBiomeMap.computeIfAbsent(vanillaMinecraftKey, i -> new ArrayList<>()).add(delegateKey.location());
+                    
+                    LOGGER.debug("Registered biome: " + delegateKey);
+                } catch(NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }));
+            
+            Reflection.MAPPED_REGISTRY.setFrozen((MappedRegistry<?>) biomeRegistry, true); // freeze registry again :)
+            
+            LOGGER.info("Doing tag garbage....");
+            Map<TagKey<Biome>, List<Holder<Biome>>> collect = biomeRegistry
+                    .getTags() // streamKeysAndEntries
+                    .collect(HashMap::new,
+                             (map, pair) ->
+                                     map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())),
+                             HashMap::putAll);
+            
+            terraBiomeMap
+                    .forEach((vb, terraBiomes) ->
+                                     NMSBiomeInjector.getEntry(biomeRegistry, vb).ifPresentOrElse(
+                                             vanilla -> terraBiomes.forEach(
+                                                     tb -> NMSBiomeInjector.getEntry(biomeRegistry, tb).ifPresentOrElse(
+                                                             terra -> {
+                                                                 LOGGER.debug("{} (vanilla for {}): {}",
+                                                                              vanilla.unwrapKey().orElseThrow().location(),
+                                                                              terra.unwrapKey().orElseThrow().location(),
+                                                                              vanilla.tags().toList());
+                                                                 vanilla.tags()
+                                                                        .forEach(tag -> collect
+                                                                                .computeIfAbsent(tag, t -> new ArrayList<>())
+                                                                                .add(terra));
+                                                             },
+                                                             () -> LOGGER.error("No such biome: {}", tb))),
+                                             () -> LOGGER.error("No vanilla biome: {}", vb)));
+            
+            biomeRegistry.resetTags();
+            biomeRegistry.bindTags(ImmutableMap.copyOf(collect));
+            
+        } catch(SecurityException | IllegalArgumentException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+}
+
@@ -0,0 +1,10 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.level.biome.Biome;
+
+import com.dfsek.terra.api.properties.Properties;
+
+
+public record NMSBiomeInfo(ResourceKey<Biome> biomeKey) implements Properties {
+}
@@ -0,0 +1,78 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSpecialEffects;
+
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.bukkit.config.VanillaBiomeProperties;
+
+
+public class NMSBiomeInjector {
+
+    public static <T> Optional<Holder<T>> getEntry(Registry<T> registry, ResourceLocation identifier) {
+        return registry.getOptional(identifier)
+                       .flatMap(registry::getResourceKey)
+                       .flatMap(registry::getHolder);
+    }
+
+    public static Biome createBiome(com.dfsek.terra.api.world.biome.Biome biome, Biome vanilla)
+    throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
+        Biome.BiomeBuilder builder = new Biome.BiomeBuilder();
+
+        builder
+                .downfall(vanilla.climateSettings.downfall())
+                .temperature(vanilla.getBaseTemperature())
+                .mobSpawnSettings(vanilla.getMobSettings())
+                .generationSettings(vanilla.getGenerationSettings());
+
+
+        BiomeSpecialEffects.Builder effects = new BiomeSpecialEffects.Builder();
+
+        effects.grassColorModifier(vanilla.getSpecialEffects().getGrassColorModifier());
+
+        VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
+
+        effects.fogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getFogColor(), vanilla.getFogColor()))
+
+               .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor()))
+
+               .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor()))
+
+               .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor()));
+
+        if(vanillaBiomeProperties.getFoliageColor() == null) {
+            vanilla.getSpecialEffects().getFoliageColorOverride().ifPresent(effects::foliageColorOverride);
+        } else {
+            effects.foliageColorOverride(vanillaBiomeProperties.getFoliageColor());
+        }
+
+        if(vanillaBiomeProperties.getGrassColor() == null) {
+            vanilla.getSpecialEffects().getGrassColorOverride().ifPresent(effects::grassColorOverride);
+        } else {
+            // grass
+            effects.grassColorOverride(vanillaBiomeProperties.getGrassColor());
+        }
+
+        vanilla.getAmbientLoop().ifPresent(effects::ambientLoopSound);
+        vanilla.getAmbientAdditions().ifPresent(effects::ambientAdditionsSound);
+        vanilla.getAmbientMood().ifPresent(effects::ambientMoodSound);
+        vanilla.getBackgroundMusic().ifPresent(effects::backgroundMusic);
+        vanilla.getAmbientParticle().ifPresent(effects::ambientParticle);
+
+        builder.specialEffects(effects.build());
+
+        return builder.build();
+    }
+
+    public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) {
+        return pack.getID()
+                   .toLowerCase() + "/" + biomeID.getNamespace().toLowerCase(Locale.ROOT) + "/" + biomeID.getID().toLowerCase(Locale.ROOT);
+    }
+}
@@ -0,0 +1,47 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.Holder;
+import java.util.stream.Stream;
+import net.minecraft.core.Registry;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeSource;
+import net.minecraft.world.level.biome.Climate.Sampler;
+import org.jetbrains.annotations.NotNull;
+
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
+
+
+public class NMSBiomeProvider extends BiomeSource {
+    private final BiomeProvider delegate;
+    private final long seed;
+    private final Registry<Biome> biomeRegistry = RegistryFetcher.biomeRegistry();
+
+    public NMSBiomeProvider(BiomeProvider delegate, long seed) {
+        super();
+        this.delegate = delegate;
+        this.seed = seed;
+    }
+    @Override
+    protected Stream<Holder<Biome>> collectPossibleBiomes() {
+      return delegate.stream()
+                    .map(biome -> RegistryFetcher.biomeRegistry()
+                                                 .getHolderOrThrow(((BukkitPlatformBiome) biome.getPlatformBiome()).getContext()
+                                                                                                              .get(NMSBiomeInfo.class)
+                                                                                                              .biomeKey()));
+    }
+
+    @Override
+    protected @NotNull Codec<? extends BiomeSource> codec() {
+        return BiomeSource.CODEC;
+    }
+
+    @Override
+    public @NotNull Holder<Biome> getNoiseBiome(int x, int y, int z, @NotNull Sampler sampler) {
+        return biomeRegistry.getHolderOrThrow(((BukkitPlatformBiome) delegate.getBiome(x << 2, y << 2, z << 2, seed)
+                                                                             .getPlatformBiome()).getContext()
+                                                                                                 .get(NMSBiomeInfo.class)
+                                                                                                 .biomeKey());
+    }
+}
@@ -0,0 +1,170 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import com.mojang.serialization.Codec;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.NoiseColumn;
+import net.minecraft.world.level.StructureManager;
+import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.levelgen.Beardifier;
+import net.minecraft.world.level.levelgen.DensityFunction.SinglePointContext;
+import net.minecraft.world.level.levelgen.GenerationStep.Carving;
+import net.minecraft.world.level.levelgen.Heightmap.Types;
+import net.minecraft.world.level.levelgen.RandomState;
+import net.minecraft.world.level.levelgen.blending.Blender;
+import org.bukkit.craftbukkit.v1_20_R2.block.data.CraftBlockData;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.info.WorldProperties;
+import com.dfsek.terra.bukkit.config.PreLoadCompatibilityOptions;
+import com.dfsek.terra.bukkit.world.BukkitWorldProperties;
+import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
+
+
+public class NMSChunkGeneratorDelegate extends ChunkGenerator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMSChunkGeneratorDelegate.class);
+    private final com.dfsek.terra.api.world.chunk.generation.ChunkGenerator delegate;
+    
+    private final ChunkGenerator vanilla;
+    private final ConfigPack pack;
+    
+    private final long seed;
+    
+    public NMSChunkGeneratorDelegate(ChunkGenerator vanilla, ConfigPack pack, NMSBiomeProvider biomeProvider, long seed) {
+        super(biomeProvider);
+        this.delegate = pack.getGeneratorProvider().newInstance(pack);
+        this.vanilla = vanilla;
+        this.pack = pack;
+        this.seed = seed;
+    }
+    
+    @Override
+    protected @NotNull Codec<? extends ChunkGenerator> codec() {
+        return ChunkGenerator.CODEC;
+    }
+    
+    @Override
+    public void applyCarvers(@NotNull WorldGenRegion chunkRegion, long seed, @NotNull RandomState noiseConfig, @NotNull BiomeManager world,
+                             @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk, @NotNull Carving carverStep) {
+        // no-op
+    }
+    
+    @Override
+    public void buildSurface(@NotNull WorldGenRegion region, @NotNull StructureManager structures, @NotNull RandomState noiseConfig,
+                             @NotNull ChunkAccess chunk) {
+        // no-op
+    }
+    
+    @Override
+    public void applyBiomeDecoration(@NotNull WorldGenLevel world, @NotNull ChunkAccess chunk,
+                                     @NotNull StructureManager structureAccessor) {
+        vanilla.applyBiomeDecoration(world, chunk, structureAccessor);
+    }
+    
+    @Override
+    public void spawnOriginalMobs(@NotNull WorldGenRegion region) {
+        vanilla.spawnOriginalMobs(region);
+    }
+    
+    @Override
+    public int getGenDepth() {
+        return vanilla.getGenDepth();
+    }
+    
+    @Override
+    public @NotNull CompletableFuture<ChunkAccess> fillFromNoise(@NotNull Executor executor, @NotNull Blender blender,
+                                                                 @NotNull RandomState noiseConfig,
+                                                                 @NotNull StructureManager structureAccessor, @NotNull ChunkAccess chunk) {
+        return vanilla.fillFromNoise(executor, blender, noiseConfig, structureAccessor, chunk)
+                .thenApply(c -> {
+                    LevelAccessor level = Reflection.STRUCTURE_MANAGER.getLevel(structureAccessor);
+                    BiomeProvider biomeProvider = pack.getBiomeProvider();
+                    PreLoadCompatibilityOptions compatibilityOptions = pack.getContext().get(PreLoadCompatibilityOptions.class);
+                    if(compatibilityOptions.isBeard()) {
+                        beard(structureAccessor, chunk, new BukkitWorldProperties(level.getMinecraftWorld().getWorld()), biomeProvider, compatibilityOptions);
+                    }
+                    return c;
+                });
+    }
+    
+    private void beard(StructureManager structureAccessor, ChunkAccess chunk, WorldProperties world, BiomeProvider biomeProvider,
+                       PreLoadCompatibilityOptions compatibilityOptions) {
+        Beardifier structureWeightSampler = Beardifier.forStructuresInChunk(structureAccessor, chunk.getPos());
+        double threshold = compatibilityOptions.getBeardThreshold();
+        double airThreshold = compatibilityOptions.getAirThreshold();
+        int xi = chunk.getPos().x << 4;
+        int zi = chunk.getPos().z << 4;
+        for(int x = 0; x < 16; x++) {
+            for(int z = 0; z < 16; z++) {
+                int depth = 0;
+                for(int y = world.getMaxHeight(); y >= world.getMinHeight(); y--) {
+                    double noise = structureWeightSampler.compute(new SinglePointContext(x + xi, y, z + zi));
+                    if(noise > threshold) {
+                        chunk.setBlockState(new BlockPos(x, y, z), ((CraftBlockData) ((BukkitBlockState) delegate
+                                .getPalette(x + xi, y, z + zi, world, biomeProvider)
+                                .get(depth, x + xi, y, z + zi, world.getSeed())).getHandle()).getState(), false);
+                        depth++;
+                    } else if(noise < airThreshold) {
+                        chunk.setBlockState(new BlockPos(x, y, z), Blocks.AIR.defaultBlockState(), false);
+                    } else {
+                        depth = 0;
+                    }
+                }
+            }
+        }
+    }
+    
+    @Override
+    public int getSeaLevel() {
+        return vanilla.getSeaLevel();
+    }
+    
+    @Override
+    public int getMinY() {
+        return vanilla.getMinY();
+    }
+    
+    @Override
+    public int getBaseHeight(int x, int z, @NotNull Types heightmap, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) {
+        WorldProperties properties = new NMSWorldProperties(seed, world);
+        int y = properties.getMaxHeight();
+        BiomeProvider biomeProvider = pack.getBiomeProvider();
+        while(y >= getMinY() && !heightmap.isOpaque().test(
+                ((CraftBlockData) delegate.getBlock(properties, x, y - 1, z, biomeProvider).getHandle()).getState())) {
+            y--;
+        }
+        return y;
+    }
+    
+    @Override
+    public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) {
+        BlockState[] array = new BlockState[world.getHeight()];
+        WorldProperties properties = new NMSWorldProperties(seed, world);
+        BiomeProvider biomeProvider = pack.getBiomeProvider();
+        for(int y = properties.getMaxHeight() - 1; y >= properties.getMinHeight(); y--) {
+            array[y - properties.getMinHeight()] = ((CraftBlockData) delegate.getBlock(properties, x, y, z, biomeProvider)
+                                                                             .getHandle()).getState();
+        }
+        return new NoiseColumn(getMinY(), array);
+    }
+
+    @Override
+    public void addDebugScreenInfo(@NotNull List<String> text, @NotNull RandomState noiseConfig, @NotNull BlockPos pos) {
+
+    }
+}
@@ -0,0 +1,15 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import org.bukkit.Bukkit;
+
+import com.dfsek.terra.bukkit.PlatformImpl;
+import com.dfsek.terra.bukkit.nms.Initializer;
+
+
+public class NMSInitializer implements Initializer {
+    @Override
+    public void initialize(PlatformImpl platform) {
+        AwfulBukkitHacks.registerBiomes(platform.getRawConfigRegistry());
+        Bukkit.getPluginManager().registerEvents(new NMSInjectListener(), platform.getPlugin());
+    }
+}
@@ -0,0 +1,48 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.WorldInitEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
+
+
+public class NMSInjectListener implements Listener {
+    private static final Logger LOGGER = LoggerFactory.getLogger(NMSInjectListener.class);
+    private static final Set<World> INJECTED = new HashSet<>();
+    private static final ReentrantLock INJECT_LOCK = new ReentrantLock();
+    
+    @EventHandler
+    public void onWorldInit(WorldInitEvent event) {
+        if(!INJECTED.contains(event.getWorld()) &&
+           event.getWorld().getGenerator() instanceof BukkitChunkGeneratorWrapper bukkitChunkGeneratorWrapper) {
+            INJECT_LOCK.lock();
+            INJECTED.add(event.getWorld());
+            LOGGER.info("Preparing to take over the world: {}", event.getWorld().getName());
+            CraftWorld craftWorld = (CraftWorld) event.getWorld();
+            ServerLevel serverWorld = craftWorld.getHandle();
+            
+            ConfigPack pack = bukkitChunkGeneratorWrapper.getPack();
+            
+            ChunkGenerator vanilla = serverWorld.getChunkSource().getGenerator();
+            NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), craftWorld.getSeed());
+    
+            serverWorld.getChunkSource().chunkMap.generator = new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed());
+            
+            LOGGER.info("Successfully injected into world.");
+            
+            INJECT_LOCK.unlock();
+        }
+    }
+}
@@ -0,0 +1,36 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.world.level.LevelHeightAccessor;
+
+import com.dfsek.terra.api.world.info.WorldProperties;
+
+
+public class NMSWorldProperties implements WorldProperties {
+    private final long seed;
+    private final LevelHeightAccessor height;
+    
+    public NMSWorldProperties(long seed, LevelHeightAccessor height) {
+        this.seed = seed;
+        this.height = height;
+    }
+    
+    @Override
+    public Object getHandle() {
+        return height;
+    }
+    
+    @Override
+    public long getSeed() {
+        return seed;
+    }
+    
+    @Override
+    public int getMaxHeight() {
+        return height.getMaxBuildHeight();
+    }
+    
+    @Override
+    public int getMinHeight() {
+        return height.getMinBuildHeight();
+    }
+}
@@ -0,0 +1,50 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Holder;
+import net.minecraft.core.Holder.Reference;
+import net.minecraft.core.MappedRegistry;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureManager;
+import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
+import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldSetter;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.MethodName;
+import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies;
+
+
+public class Reflection {
+    public static final MappedRegistryProxy MAPPED_REGISTRY;
+    public static final StructureManagerProxy STRUCTURE_MANAGER;
+    
+    public static final ReferenceProxy REFERENCE;
+    
+    static {
+        ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar();
+        ReflectionProxyFactory reflectionProxyFactory = ReflectionProxyFactory.create(reflectionRemapper,
+                                                                                      Reflection.class.getClassLoader());
+        
+        MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class);
+        STRUCTURE_MANAGER = reflectionProxyFactory.reflectionProxy(StructureManagerProxy.class);
+        REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class);
+    }
+    
+    
+    @Proxies(MappedRegistry.class)
+    public interface MappedRegistryProxy {
+        @FieldSetter("frozen")
+        void setFrozen(MappedRegistry<?> instance, boolean frozen);
+    }
+    
+    @Proxies(StructureManager.class)
+    public interface StructureManagerProxy {
+        @FieldGetter("level")
+        LevelAccessor getLevel(StructureManager instance);
+    }
+    
+    @Proxies(Holder.Reference.class)
+    public interface ReferenceProxy {
+        @MethodName("bindValue")
+        <T> void invokeBindValue(Reference<T> instance, T value);
+    }
+}
@@ -0,0 +1,24 @@
+package com.dfsek.terra.bukkit.nms.v1_20_R2;
+
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.world.level.biome.Biome;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+
+
+public class RegistryFetcher {
+    private static <T> Registry<T> getRegistry(ResourceKey<Registry<T>> key) {
+        CraftServer craftserver = (CraftServer) Bukkit.getServer();
+        DedicatedServer dedicatedserver = craftserver.getServer();
+        return dedicatedserver
+                .registryAccess()
+                .registryOrThrow(key);
+    }
+    
+    public static Registry<Biome> biomeRegistry() {
+        return getRegistry(Registries.BIOME);
+    }
+}
@@ -7,10 +7,10 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI"
 dependencies {
    shadedApi(project(":common:implementation:base"))
    
-    shadedApi("commons-io:commons-io:${Versions.CLI.commonsIO}")
+    shadedApi("commons-io:commons-io:${Versions.Libraries.Internal.apacheIO}")
    shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}")
    
-    shadedImplementation("com.google.guava:guava:${Versions.CLI.guava}")
+    shadedImplementation("com.google.guava:guava:${Versions.Libraries.Internal.guava}")
    
    shadedImplementation("ch.qos.logback:logback-classic:${Versions.CLI.logback}")
    
@@ -1,7 +1,7 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 architectury {
@@ -23,7 +23,7 @@ dependencies {
    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
    
-    modImplementation("net.fabricmc:fabric-loader:${Versions.Fabric.fabricLoader}")
+    modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}")
    
    setOf(
        "fabric-lifecycle-events-v1",
@@ -47,15 +47,7 @@ loom {
    mixin {
        defaultRefmapName.set("terra.fabric.refmap.json")
    }
-    
-    launches {
-        named("client") {
-            property("fabric.log.level", "info")
-        }
-        named("server") {
-            property("fabric.log.level", "info")
-        }
-    }
+
 }


@@ -33,7 +33,7 @@ public class FabricPlatform extends LifecyclePlatform {
    @Override
    protected Collection<BaseAddon> getPlatformMods() {
        return FabricLoader.getInstance().getAllMods().stream().flatMap(
-                mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString())).collect(
+                mod -> parseModData(mod.getMetadata().getId(), mod.getMetadata().getVersion().getFriendlyString(), "fabric")).collect(
                Collectors.toList());
    }
    
@@ -1,7 +1,7 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 architectury {
@@ -37,16 +37,16 @@ loom {
        defaultRefmapName.set("terra.forge.refmap.json")
    }
    
-    launches {
-        named("client") {
-            property("fabric.log.level", "info")
-            property("mixin.env.disableRefMap", "true")
-        }
-        named("server") {
-            property("fabric.log.level", "info")
-            property("mixin.env.disableRefMap", "true")
-        }
-    }
+//    launches {
+//        named("client") {
+//            property("fabric.log.level", "info")
+//            property("mixin.env.disableRefMap", "true")
+//        }
+//        named("server") {
+//            property("fabric.log.level", "info")
+//            property("mixin.env.disableRefMap", "true")
+//        }
+//    }
    
    forge {
        convertAccessWideners.set(true)
@@ -1,4 +1,4 @@
 # mixin-common

-This project contains mixins shared between Forge, Fabric and Quilt, as
+This project contains mixins shared between Forge, Fabric and formerly Quilt, as
 well as glue code.
@@ -1,7 +1,7 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 loom {
@@ -24,7 +24,8 @@ dependencies {
 }

 architectury {
-    common("fabric", "forge", "quilt")
+//    common("fabric", "forge", "quilt")
+    common("fabric", "forge")
    minecraft = Versions.Mod.minecraft
 }

@@ -1,3 +1,3 @@
 # mixin-lifecycle

-This project contains lifecycle mixins shared between Fabric and Quilt.
+This project contains lifecycle mixins shared between Fabric and formerly Quilt.
@@ -1,7 +1,7 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 dependencies {
@@ -41,6 +41,7 @@ tasks {
 }

 architectury {
-    common("fabric", "quilt")
+//    common("fabric", "quilt")
+    common("fabric")
    minecraft = Versions.Mod.minecraft
 }
@@ -108,11 +108,11 @@ public abstract class LifecyclePlatform extends ModPlatform {
        return addons;
    }
    
-    protected Stream<EphemeralAddon> parseModData(String id, String modVersion) {
+    protected Stream<EphemeralAddon> parseModData(String id, String modVersion, String platform) {
        if(id.equals("terra") || id.equals("minecraft") || id.equals("java")) return Stream.empty();
        try {
            Version version = Versions.parseVersion(modVersion);
-            return Stream.of(new EphemeralAddon(version, "quilt:" + id));
+            return Stream.of(new EphemeralAddon(version, platform + ":" + id));
        } catch(ParseException e) {
            LOGGER.warn(
                    "Mod {}, version {} does not follow semantic versioning specification, Terra addons will be unable to depend on " +
@@ -1,7 +1,7 @@
 plugins {
    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
 }

 architectury {
@@ -47,15 +47,6 @@ loom {
    mixin {
        defaultRefmapName.set("terra.quilt.refmap.json")
    }
-    
-    launches {
-        named("client") {
-            property("fabric.log.level", "info")
-        }
-        named("server") {
-            property("fabric.log.level", "info")
-        }
-    }
 }


@@ -32,7 +32,7 @@ public class QuiltPlatform extends LifecyclePlatform {
    
    @Override
    protected Collection<BaseAddon> getPlatformMods() {
-        return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw())).collect(
+        return QuiltLoader.getAllMods().stream().flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw(), "quilt")).collect(
                Collectors.toList());
    }
    
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zoë Gidiere	5829112a74	Merge branch 'ver/6.4.0' into dev/image-caching	2023-10-26 12:56:17 -06:00
Zoë Gidiere	c41bf55b7b	implement missing methods from last comit	2023-10-26 12:53:55 -06:00
Zoë Gidiere	5d12a560f1	add zero and unit vectors	2023-10-26 11:08:36 -06:00
Zoë Gidiere	6f08908bb4	merge ovre-v2 into ore(v1)	2023-10-26 10:43:13 -06:00
Zoë Gidiere	9292d3de17	Remove FastMath hotspot has intrinsics for almost everything we use it for	2023-10-26 10:37:25 -06:00
Astrash	0149a29b04	Load correct path	2023-10-24 14:08:56 +11:00
Astrash	cd8605850f	Replace unload-on-timeout with timeout > 0	2023-10-24 13:47:25 +11:00
Astrash	148b8dfe35	Bump image lib patch version	2023-10-24 13:34:10 +11:00
Astrash	3f485b1825	Add to unload on timeout description	2023-10-24 13:30:09 +11:00
Astrash	cb6ecff113	Remove sout	2023-10-24 13:29:53 +11:00
Astrash	e30bcbf1ba	Improve image caching options	2023-10-24 13:26:35 +11:00
Astrash	805f99f57a	Make ore algorithm readable	2023-10-20 10:55:23 +11:00
Astrash	4e5b02ef42	Pass correct coords for ore block checks	2023-10-20 10:30:25 +11:00
Astrash	e80e998cec	Only log warnings with debug logging	2023-10-20 10:03:04 +11:00
Zoë	fde29220af	Merge pull request #419 from PolyhedralDev/dev/disable-quilt Dev/disable quilt	2023-10-19 17:31:40 +00:00
Zoë Gidiere	d3a9b57872	disable quilt	2023-10-18 19:53:59 -06:00
Zoë	4671ec5bd3	Merge pull request #417 from PolyhedralDev/dev/folia Dev/folia	2023-10-19 01:18:45 +00:00
Zoë	9f4a8e06e1	Update DependencyConfig.kt	2023-10-17 21:00:28 -06:00
Zoë	c8f2871aaa	Update build.gradle.kts	2023-10-17 20:59:27 -06:00
Zoë	4a537a56aa	Merge pull request #415 from PolyhedralDev/dev/ore-v2 Add updated ore-v2	2023-10-18 00:33:15 +00:00
Zoë	4917160123	Update README.md	2023-10-17 18:32:00 -06:00
Zoë	b3f80dcb64	Merge pull request #410 from PolyhedralDev/dev/1.20.2 1.20.2 + update libs	2023-10-15 19:45:43 +00:00
Zoë Gidiere	d49b9ccad5	Merge branch 'dev/1.20.2' into dev/folia	2023-10-14 16:02:54 -06:00
Zoë Gidiere	a8387ce419	Merge remote-tracking branch 'origin/ver/6.4.0' into dev/1.20.2	2023-10-14 16:02:40 -06:00
Zoë Gidiere	94854f2bdb	update versions	2023-10-14 15:55:43 -06:00
Astrashh	47f531089e	Add slant locator (#413 ) * Add slant locator addon * Bump slant locator noise3d dependency version * Fix slant locator dependency version range * Actually fix slant locator dependency version range	2023-10-10 00:35:47 +00:00
Astrashh	abd83e8278	Add number predicate addon (#412 )	2023-10-10 00:35:26 +00:00
Astrash	b5e7c7c112	Fix TOP locator	2023-10-10 09:44:53 +11:00
Zoë Gidiere	d71f7d4c36	clarify value and change default	2023-10-03 21:03:44 -06:00
Zoë Gidiere	84898a7a6b	fixes	2023-10-03 20:03:46 -06:00
Zoë Gidiere	0c1a6efc72	refractor classes	2023-10-03 19:42:15 -06:00
Zoë Gidiere	200281f140	dep orev1	2023-10-03 11:58:32 -06:00
Zoë Gidiere	f1ea8074de	config-ore-v2	2023-10-03 11:54:18 -06:00
Zoë Gidiere	ce2b964ce3	Merge branch 'dev/1.20.2' into dev/folia	2023-10-02 01:38:24 -06:00
Zoë Gidiere	0ee5f49972	quilt	2023-10-02 01:38:01 -06:00
Zoë Gidiere	3bc10cdb6a	Merge branch 'dev/1.20.2' into dev/folia	2023-10-02 00:42:11 -06:00
Zoë Gidiere	86ba52850d	update strata	2023-10-02 00:41:54 -06:00
Zoë Gidiere	27eebf6a47	Folia support Co-authored-by: Janet Blackquill <uhhadd@gmail.com>	2023-10-02 00:23:19 -06:00
Zoë Gidiere	2d2bba20b6	found an untrue in read me	2023-10-01 23:22:44 -06:00
Zoë Gidiere	eb3994005c	fix me being fucking stupid	2023-10-01 22:46:41 -06:00
Zoë Gidiere	0a7cdb82a3	update deps + 1.20.2	2023-10-01 22:18:54 -06:00