remove additional events, make Event extend Monad

Linear map normalizer

buildSrc/build.gradle.kts

@@ -3,32 +3,20 @@ 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()
     maven("https://repo.codemc.org/repository/maven-public") {
         name = "CodeMC"
     }
-    maven("https://papermc.io/repo/repository/maven-public/") {
-        name = "PaperMC"
-    }
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    implementation(libs.libraries.internal.shadow)
+
     
-    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(libs.libraries.internal.asm)
+    implementation(libs.libraries.internal.asm.tree)
+    implementation(libs.libraries.tectonic)
+    implementation(libs.libraries.snakeyaml)
 }

buildSrc/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -5,6 +5,8 @@ import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.getting
 import org.gradle.kotlin.dsl.maven
 import org.gradle.kotlin.dsl.repositories
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.kotlin.dsl.apply
 
 fun Project.configureDependencies() {
     val testImplementation by configurations.getting
@@ -15,6 +17,8 @@ fun Project.configureDependencies() {
     
     val shaded by configurations.creating
     
+    val libs = rootProject.project.versionCatalogs.libs
+    
     @Suppress("UNUSED_VARIABLE")
     val shadedApi by configurations.creating {
         shaded.extendsFrom(this)
@@ -48,14 +52,17 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
+        maven("https://api.modrinth.com/maven") {
+            name = "Modrinth"
+        }
     }
     
     dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        compileOnly("org.jetbrains:annotations:23.0.0")
-        
-        compileOnly("com.google.guava:guava:30.0-jre")
-        testImplementation("com.google.guava:guava:30.0-jre")
+        testImplementation(libs.findLibrary("libraries.internal.junit.jupiter.api").get())
+        testImplementation(libs.findLibrary("libraries.internal.junit.jupiter.engine").get())
+        compileOnly(libs.findLibrary("libraries.internal.jetbrains.annotations").get())
+    
+        compileOnly(libs.findLibrary("libraries.guava").get())
+        testImplementation(libs.findLibrary("libraries.guava").get())
     }
 }

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -8,7 +8,6 @@ import java.nio.file.StandardCopyOption
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginExtension
-import org.gradle.kotlin.dsl.TaskContainerScope
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
@@ -88,7 +87,8 @@ fun Project.configureDistribution() {
                 val jar = getJarTask().archiveFileName.get()
                 resources.computeIfAbsent(
                     if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
-                    else "addons") { ArrayList() }.add(jar)
+                    else "addons"
+                                         ) { ArrayList() }.add(jar)
             }
             
             val options = DumperOptions()
@@ -109,7 +109,7 @@ fun Project.configureDistribution() {
             FileWriter(manifest).use {
                 yaml.dump(resources, it)
             }
-
+            
         }
     }
     

buildSrc/src/main/kotlin/Helper.kt

@@ -0,0 +1,12 @@
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.*
+
+internal
+val Project.versionCatalogs: VersionCatalogsExtension
+    get() = the<VersionCatalogsExtension>()
+
+internal
+val VersionCatalogsExtension.libs: VersionCatalog
+    get() = named("libs")

buildSrc/src/main/kotlin/Versions.kt

@@ -1,69 +0,0 @@
-object Versions {
-    object Libraries {
-        const val tectonic = "4.2.0"
-        const val paralithic = "0.7.0"
-        const val strata = "1.1.1"
-        
-        const val cloud = "1.7.0"
-        
-        const val slf4j = "1.7.36"
-        const val log4j_slf4j_impl = "2.14.1"
-        
-        object Internal {
-            const val apacheText = "1.9"
-            const val jafama = "2.3.2"
-            const val apacheIO = "2.6"
-            const val fastutil = "8.5.6"
-        }
-    }
-    
-    object Fabric {
-        const val fabricLoader = "0.14.8"
-        const val fabricAPI = "0.57.0+1.19"
-    }
-    
-    object Quilt {
-        const val quiltLoader = "0.17.0"
-        const val fabricApi = "2.0.0-beta.4+0.57.0-1.19"
-    }
-    
-    object Mod {
-        const val mixin = "0.11.2+mixin.0.8.5"
-        
-        const val minecraft = "1.19"
-        const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.14.2"
-        
-        const val architecuryLoom = "0.12.0.290"
-        const val architecturyPlugin = "3.4-SNAPSHOT"
-        
-        const val loomQuiltflower = "1.7.1"
-        
-        const val lazyDfu = "0.1.2"
-    }
-    
-    object Forge {
-        const val forge = "${Mod.minecraft}-41.0.63"
-        const val burningwave = "12.53.0"
-    }
-    
-    object Bukkit {
-        const val paper = "1.18.2-R0.1-SNAPSHOT"
-        const val paperLib = "1.0.5"
-        const val minecraft = "1.19"
-        const val reflectionRemapper = "0.1.0-SNAPSHOT"
-    }
-    
-    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"
-    }
-}

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/BiomeExtrusionAddon.java

@@ -10,58 +10,60 @@ import com.dfsek.terra.addons.biome.extrusion.config.BiomeExtrusionTemplate;
 import com.dfsek.terra.addons.biome.extrusion.config.ReplaceableBiomeLoader;
 import com.dfsek.terra.addons.biome.extrusion.config.extrusions.ReplaceExtrusionTemplate;
 import com.dfsek.terra.addons.biome.extrusion.config.extrusions.SetExtrusionTemplate;
-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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.function.monad.Monad;
+import com.dfsek.terra.api.util.generic.Construct;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
+import org.jetbrains.annotations.NotNull;
 
-public class BiomeExtrusionAddon implements AddonInitializer {
+
+public class BiomeExtrusionAddon implements MonadAddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<Extrusion>>> EXTRUSION_REGISTRY_KEY = new TypeKey<>() {
     };
     
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
     
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
-                            event.getPack()
-                                 .getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("EXTRUSION"), BiomeExtrusionTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Extrusion>>> extrusionRegistry = event.getPack().getOrCreateRegistry(
-                            EXTRUSION_REGISTRY_KEY);
-                    extrusionRegistry.register(addon.key("SET"), SetExtrusionTemplate::new);
-                    extrusionRegistry.register(addon.key("REPLACE"), ReplaceExtrusionTemplate::new);
-                })
-                .failThrough();
-        
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPostLoadEvent.class)
-                .then(event -> {
-                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                    event.getPack().applyLoader(ReplaceableBiome.class, new ReplaceableBiomeLoader(biomeRegistry));
-                });
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(Construct.construct(() -> {
+                    functionalEventHandler.register(base, ConfigPackPostLoadEvent.class)
+                                          .then(event -> {
+                                              Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
+                                              event.getPack().applyLoader(ReplaceableBiome.class,
+                                                                          new ReplaceableBiomeLoader(biomeRegistry));
+                                          });
+                    return functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                                 .then(event -> {
+                                                     Registry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
+                                                             event.getPack()
+                                                                  .createRegistry(PROVIDER_REGISTRY_KEY);
+                                                     providerRegistry.register(base.key("EXTRUSION"), BiomeExtrusionTemplate::new);
+                                                 })
+                                                 .then(event -> {
+                                                     Registry<Supplier<ObjectTemplate<Extrusion>>> extrusionRegistry =
+                                                             event.getPack().createRegistry(
+                                                                     EXTRUSION_REGISTRY_KEY);
+                                                     extrusionRegistry.register(base.key("SET"), SetExtrusionTemplate::new);
+                                                     extrusionRegistry.register(base.key("REPLACE"), ReplaceExtrusionTemplate::new);
+                                                 })
+                                                 .failThrough();
+                }))
+                ));
     }
 }

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

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

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

@@ -11,39 +11,41 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
+import org.jetbrains.annotations.NotNull;
 
-public class ImageBiomeProviderAddon implements AddonInitializer {
+
+public class ImageBiomeProviderAddon implements MonadAddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("IMAGE"),
-                                              () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
-                })
-                .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  Registry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().createRegistry(
+                                                          PROVIDER_REGISTRY_KEY);
+                                                  providerRegistry.register(base.key("IMAGE"),
+                                                                            () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
+                                              })
+                                              .failThrough()))
+                      );
+    
     }
 }

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

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

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

@@ -1,94 +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.biome.pipeline;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
-
-
-public class BiomeHolderImpl implements BiomeHolder {
-    private final Vector2.Mutable origin;
-    private final int width;
-    private final int offset;
-    private BiomeDelegate[][] biomes;
-    
-    public BiomeHolderImpl(int width, Vector2.Mutable origin) {
-        width += 4;
-        this.width = width;
-        biomes = new BiomeDelegate[width][width];
-        this.origin = origin;
-        this.offset = 2;
-    }
-    
-    private BiomeHolderImpl(BiomeDelegate[][] biomes, Vector2.Mutable origin, int width, int offset) {
-        this.biomes = biomes;
-        this.origin = origin;
-        this.width = width;
-        this.offset = 2 * offset;
-    }
-    
-    @Override
-    public BiomeHolder expand(BiomeExpander expander, long seed) {
-        BiomeDelegate[][] old = biomes;
-        int newWidth = width * 2 - 1;
-        
-        biomes = new BiomeDelegate[newWidth][newWidth];
-        
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                biomes[x * 2][z * 2] = old[x][z];
-                if(z != width - 1)
-                    biomes[x * 2][z * 2 + 1] = expander.getBetween(x + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
-                                                                   old[x][z + 1]);
-                if(x != width - 1)
-                    biomes[x * 2 + 1][z * 2] = expander.getBetween(x + 1 + origin.getX(), z + origin.getZ(), seed, old[x][z],
-                                                                   old[x + 1][z]);
-                if(x != width - 1 && z != width - 1)
-                    biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(x + 1 + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
-                                                                       old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
-            }
-        }
-        return new BiomeHolderImpl(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth, offset);
-    }
-    
-    @Override
-    public void mutate(BiomeMutator mutator, long seed) {
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                BiomeMutator.ViewPoint viewPoint = new BiomeMutator.ViewPoint(this, x, z);
-                biomes[x][z] = mutator.mutate(viewPoint, x + origin.getX(), z + origin.getZ(), seed);
-            }
-        }
-    }
-    
-    @Override
-    public void fill(BiomeSource source, long seed) {
-        for(int x = 0; x < width; x++) {
-            for(int z = 0; z < width; z++) {
-                biomes[x][z] = source.getBiome(origin.getX() + x, origin.getZ() + z, seed);
-            }
-        }
-    }
-    
-    @Override
-    public BiomeDelegate getBiome(int x, int z) {
-        x += offset;
-        z += offset;
-        return getBiomeRaw(x, z);
-    }
-    
-    @Override
-    public BiomeDelegate getBiomeRaw(int x, int z) {
-        if(x >= width || z >= width || x < 0 || z < 0) return null;
-        return biomes[x][z];
-    }
-}

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

@@ -1,83 +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.biome.pipeline;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.util.vector.Vector2;
-
-
-public class BiomePipeline {
-    private final BiomeSource source;
-    private final List<Stage> stages;
-    private final int size;
-    private final int init;
-    
-    private BiomePipeline(BiomeSource source, List<Stage> stages, int size, int init) {
-        this.source = source;
-        this.stages = stages;
-        this.size = size;
-        this.init = init;
-    }
-    
-    /**
-     * Get biomes in a chunk
-     *
-     * @param x Chunk X coord
-     * @param z Chunk Z coord
-     *
-     * @return BiomeHolder containing biomes.
-     */
-    public BiomeHolder getBiomes(int x, int z, long seed) {
-        BiomeHolder holder = new BiomeHolderImpl(init, Vector2.of(x * (init - 1), z * (init - 1)).mutable());
-        holder.fill(source, seed);
-        for(Stage stage : stages) holder = stage.apply(holder, seed);
-        return holder;
-    }
-    
-    public BiomeSource getSource() {
-        return source;
-    }
-    
-    public List<Stage> getStages() {
-        return Collections.unmodifiableList(stages);
-    }
-    
-    public int getSize() {
-        return size;
-    }
-    
-    public static final class BiomePipelineBuilder {
-        private final int init;
-        private final List<Stage> stages = new ArrayList<>();
-        private int expand;
-        
-        public BiomePipelineBuilder(int init) {
-            this.init = init;
-            expand = init;
-        }
-        
-        public BiomePipeline build(BiomeSource source) {
-            for(Stage stage : stages) {
-                if(stage.isExpansion()) expand = expand * 2 - 1;
-            }
-            
-            return new BiomePipeline(source, stages, expand, init);
-        }
-        
-        public BiomePipelineBuilder addStage(Stage stage) {
-            stages.add(stage);
-            return this;
-        }
-    }
-}

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

@@ -11,79 +11,84 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.BiomeDelegateLoader;
 import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.SamplerSourceTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.PipelineBiomeLoader;
+import com.dfsek.terra.addons.biome.pipeline.config.source.SamplerSourceTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-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.addons.biome.pipeline.config.stage.mutator.BorderListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.function.monad.Monad;
+import com.dfsek.terra.api.util.generic.Construct;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class BiomePipelineAddon implements AddonInitializer {
+public class BiomePipelineAddon implements MonadAddonInitializer {
     
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
+    public static final TypeKey<Supplier<ObjectTemplate<Source>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
     };
     
     public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
     };
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
     
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
-                            SOURCE_REGISTRY_KEY);
-                    sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
-                            STAGE_REGISTRY_KEY);
-                    stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
-                    stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new);
-                })
-                .failThrough();
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPostLoadEvent.class)
-                .then(event -> {
-                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                    event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
-                });
+    public Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((functionalEventHandler, base) -> Init.ofPure(Construct.construct(() -> {
+                    functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                          .then(event -> {
+                                              CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
+                                                      event.getPack().getOrCreateRegistry(
+                                                              PROVIDER_REGISTRY_KEY);
+                                              providerRegistry.register(base.key("PIPELINE"), BiomePipelineTemplate::new);
+                                          })
+                                          .then(event -> {
+                                              CheckedRegistry<Supplier<ObjectTemplate<Source>>> sourceRegistry =
+                                                      event.getPack().getOrCreateRegistry(
+                                                              SOURCE_REGISTRY_KEY);
+                                              sourceRegistry.register(base.key("SAMPLER"), SamplerSourceTemplate::new);
+                                          })
+                                          .then(event -> {
+                                              CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry =
+                                                      event.getPack().getOrCreateRegistry(
+                                                              STAGE_REGISTRY_KEY);
+                                              stageRegistry.register(base.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
+                                              stageRegistry.register(base.key("SMOOTH"), SmoothStageTemplate::new);
+                                              stageRegistry.register(base.key("REPLACE"), ReplaceStageTemplate::new);
+                                              stageRegistry.register(base.key("REPLACE_LIST"), ReplaceListStageTemplate::new);
+                                              stageRegistry.register(base.key("BORDER"), BorderStageTemplate::new);
+                                              stageRegistry.register(base.key("BORDER_LIST"), BorderListStageTemplate::new);
+                                          })
+                                          .failThrough();
+                    return functionalEventHandler.register(base, ConfigPackPostLoadEvent.class)
+                                                 .then(event -> {
+                                                     Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
+                                                     event.getPack().applyLoader(PipelineBiome.class,
+                                                                                 new PipelineBiomeLoader(biomeRegistry));
+                                                 });
+                    
+                })))
+        );
     }
 }

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

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-class BiomePipelineColumn implements Column<Biome> {
+public class BiomePipelineColumn implements Column<Biome> {
     private final int min;
     private final int max;
     

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

@@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -13,13 +6,14 @@ import net.jafama.FastMath;
 
 import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.api.SeededVector;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
@@ -27,35 +21,35 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
-public class BiomePipelineProvider implements BiomeProvider {
-    private final LoadingCache<SeededVector, BiomeHolder> holderCache;
-    private final BiomePipeline pipeline;
+public class PipelineBiomeProvider implements BiomeProvider {
+    
+    private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
+    private final int chunkSize;
     private final int resolution;
     private final NoiseSampler mutator;
     private final double noiseAmp;
-    
     private final Set<Biome> biomes;
     
-    public BiomePipelineProvider(BiomePipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
+    public PipelineBiomeProvider(Pipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
         this.resolution = resolution;
         this.mutator = mutator;
         this.noiseAmp = noiseAmp;
-        holderCache = Caffeine.newBuilder()
-                              .maximumSize(1024)
-                              .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
-        this.pipeline = pipeline;
-        
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
+        this.chunkSize = pipeline.getChunkSize();
+        this.biomeChunkCache = Caffeine.newBuilder()
+                                       .maximumSize(1024)
+                                       .build(pipeline::generateChunk);
+    
+        Set<PipelineBiome> biomeSet = new HashSet<>();
         pipeline.getSource().getBiomes().forEach(biomeSet::add);
-        Iterable<BiomeDelegate> result = biomeSet;
+        Iterable<PipelineBiome> result = biomeSet;
         for(Stage stage : pipeline.getStages()) {
-            result = stage.getBiomes(result); // pass through all stages
+            result = stage.getBiomes(result);
         }
         this.biomes = new HashSet<>();
-        Iterable<BiomeDelegate> finalResult = result;
-        result.forEach(biomeDelegate -> {
-            if(biomeDelegate.isEphemeral()) {
-                
+        Iterable<PipelineBiome> finalResult = result;
+        result.forEach(pipelineBiome -> {
+            if(pipelineBiome.isPlaceholder()) {
+            
                 StringBuilder biomeList = new StringBuilder("\n");
                 StreamSupport.stream(finalResult.spliterator(), false)
                              .sorted(Comparator.comparing(StringIdentifiable::getID))
@@ -65,11 +59,11 @@ public class BiomePipelineProvider implements BiomeProvider {
                                      .append(':')
                                      .append(delegate.getClass().getCanonicalName())
                                      .append('\n'));
-                throw new IllegalArgumentException("Biome Pipeline leaks ephemeral biome \"" + biomeDelegate.getID() +
-                                                   "\". Ensure there is a stage to guarantee replacement of the ephemeral biome. Biomes: " +
+                throw new IllegalArgumentException("Biome Pipeline leaks placeholder biome \"" + pipelineBiome.getID() +
+                                                   "\". Ensure there is a stage to guarantee replacement of the placeholder biome. Biomes: " +
                                                    biomeList);
             }
-            this.biomes.add(biomeDelegate.getBiome());
+            this.biomes.add(pipelineBiome.getBiome());
         });
     }
     
@@ -79,22 +73,23 @@ public class BiomePipelineProvider implements BiomeProvider {
     }
     
     public Biome getBiome(int x, int z, long seed) {
+    
         x += mutator.noise(seed + 1, x, z) * noiseAmp;
         z += mutator.noise(seed + 2, x, z) * noiseAmp;
-
-
+        
         x /= resolution;
         z /= resolution;
-
-        int fdX = FastMath.floorDiv(x, pipeline.getSize());
-        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
-        return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
-                                                                          z - fdZ * pipeline.getSize()).getBiome();
-    }
-    
-    @Override
-    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
-        return Optional.of(getBiome(x, z, seed));
+        
+        int chunkX = FastMath.floorDiv(x, chunkSize);
+        int chunkZ = FastMath.floorDiv(z, chunkSize);
+        
+        int chunkWorldX = chunkX * chunkSize;
+        int chunkWorldZ = chunkZ * chunkSize;
+        
+        int xInChunk = x - chunkWorldX;
+        int zInChunk = z - chunkWorldZ;
+        
+        return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
     }
     
     @Override
@@ -111,21 +106,4 @@ public class BiomePipelineProvider implements BiomeProvider {
     public int resolution() {
         return resolution;
     }
-    
-    private record SeededVector(int x, int z, long seed) {
-        @Override
-        public boolean equals(Object obj) {
-            if(obj instanceof SeededVector that) {
-                return this.z == that.z && this.x == that.x && this.seed == that.seed;
-            }
-            return false;
-        }
-
-        @Override
-        public int hashCode() {
-            int code = x;
-            code = 31 * code + z;
-            return 31 * code + ((int) (seed ^ (seed >>> 32)));
-        }
-    }
 }

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

@@ -0,0 +1,10 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public interface BiomeChunk {
+    
+    PipelineBiome get(int xInChunk, int zInChunk);
+}

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

@@ -1,26 +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.biome.pipeline.api;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-
-
-public interface BiomeHolder {
-    BiomeHolder expand(BiomeExpander expander, long seed);
-    
-    void mutate(BiomeMutator mutator, long seed);
-    
-    void fill(BiomeSource source, long seed);
-    
-    BiomeDelegate getBiome(int x, int z);
-    
-    BiomeDelegate getBiomeRaw(int x, int z);
-}

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

@@ -0,0 +1,29 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+/**
+ * Resizes the internal grid of a BiomeChunk when applied, serves the purpose of
+ * filling in null biomes as a result of this resizing.
+ */
+public interface Expander extends Stage {
+    
+    PipelineBiome fillBiome(ViewPoint viewPoint);
+    
+    @Override
+    default int maxRelativeReadDistance() {
+        return 0;
+    }
+    
+    @Override
+    default PipelineBiome apply(ViewPoint viewPoint) {
+        PipelineBiome currentBiome = viewPoint.getBiome();
+        if(currentBiome == null) {
+            return fillBiome(viewPoint);
+        } else {
+            return currentBiome;
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import java.util.List;
+
+
+public interface Pipeline {
+    BiomeChunk generateChunk(SeededVector worldCoordinates);
+    
+    int getChunkSize();
+    
+    Source getSource();
+    
+    List<Stage> getStages();
+}

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

@@ -0,0 +1,19 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+public record SeededVector(long seed, int x, int z) {
+    
+    @Override
+    public boolean equals(Object obj) {
+        if(obj instanceof SeededVector that) {
+            return this.z == that.z && this.x == that.x && this.seed == that.seed;
+        }
+        return false;
+    }
+    
+    @Override
+    public int hashCode() {
+        int code = x;
+        code = 31 * code + z;
+        return 31 * code + ((int) (seed ^ (seed >>> 32)));
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public interface Source {
+    PipelineBiome get(long seed, int x, int z);
+    
+    Iterable<PipelineBiome> getBiomes();
+}

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

@@ -0,0 +1,15 @@
+package com.dfsek.terra.addons.biome.pipeline.api;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public interface Stage {
+    PipelineBiome apply(ViewPoint viewPoint);
+    
+    int maxRelativeReadDistance();
+    
+    default Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        return biomes;
+    }
+}

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

@@ -1,14 +1,14 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;
 
 import java.util.Set;
 
 import com.dfsek.terra.api.world.biome.Biome;
 
 
-final class DelegatedBiome implements BiomeDelegate {
+public final class DelegatedPipelineBiome implements PipelineBiome {
     private final Biome biome;
     
-    public DelegatedBiome(Biome biome) {
+    public DelegatedPipelineBiome(Biome biome) {
         this.biome = biome;
     }
     
@@ -24,7 +24,7 @@ final class DelegatedBiome implements BiomeDelegate {
     
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof DelegatedBiome that)) return false;
+        if(!(obj instanceof DelegatedPipelineBiome that)) return false;
         return that.biome.equals(this.biome);
     }
     

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

@@ -0,0 +1,35 @@
+package com.dfsek.terra.addons.biome.pipeline.api.biome;
+
+import java.util.Set;
+
+import com.dfsek.terra.api.registry.key.StringIdentifiable;
+import com.dfsek.terra.api.world.biome.Biome;
+
+
+public interface PipelineBiome extends StringIdentifiable {
+    Biome getBiome();
+    
+    static PipelineBiome placeholder(String id) {
+        return new PlaceholderPipelineBiome(id);
+    }
+    
+    static PipelineBiome from(Biome biome) {
+        return new DelegatedPipelineBiome(biome);
+    }
+    
+    static PipelineBiome self() {
+        return SelfPipelineBiome.INSTANCE;
+    }
+    
+    Set<String> getTags();
+    
+    default boolean isPlaceholder() {
+        return false;
+    }
+    
+    default boolean isSelf() {
+        return false;
+    }
+    
+    
+}

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -6,11 +6,11 @@ import java.util.Set;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
-final class EphemeralBiomeDelegate implements BiomeDelegate {
+final class PlaceholderPipelineBiome implements PipelineBiome {
     private final Set<String> tags;
     private final String id;
     
-    public EphemeralBiomeDelegate(String id) {
+    public PlaceholderPipelineBiome(String id) {
         this.id = id;
         tags = new HashSet<>();
         tags.add(id);
@@ -19,7 +19,7 @@ final class EphemeralBiomeDelegate implements BiomeDelegate {
     
     @Override
     public Biome getBiome() {
-        throw new UnsupportedOperationException("Cannot get biome from ephemeral delegate");
+        throw new UnsupportedOperationException("Cannot get raw biome from placeholder pipeline biome");
     }
     
     @Override
@@ -33,7 +33,7 @@ final class EphemeralBiomeDelegate implements BiomeDelegate {
     }
     
     @Override
-    public boolean isEphemeral() {
+    public boolean isPlaceholder() {
         return true;
     }
     
@@ -44,7 +44,7 @@ final class EphemeralBiomeDelegate implements BiomeDelegate {
     
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof EphemeralBiomeDelegate that)) return false;
+        if(!(obj instanceof PlaceholderPipelineBiome that)) return false;
         
         return this.id.equals(that.id);
     }

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
+package com.dfsek.terra.addons.biome.pipeline.api.biome;
 
 import java.util.Collections;
 import java.util.Set;
@@ -6,10 +6,10 @@ import java.util.Set;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
-final class SelfDelegate implements BiomeDelegate {
-    public static final SelfDelegate INSTANCE = new SelfDelegate();
+final class SelfPipelineBiome implements PipelineBiome {
+    public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();
     
-    private SelfDelegate() {
+    private SelfPipelineBiome() {
 
     }
     
@@ -24,7 +24,7 @@ final class SelfDelegate implements BiomeDelegate {
     }
     
     @Override
-    public boolean isEphemeral() {
+    public boolean isPlaceholder() {
         return true;
     }
     

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java

@@ -1,35 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api.delegate;
-
-import java.util.Set;
-
-import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public interface BiomeDelegate extends StringIdentifiable {
-    static BiomeDelegate ephemeral(String id) {
-        return new EphemeralBiomeDelegate(id);
-    }
-    
-    static BiomeDelegate from(Biome biome) {
-        return new DelegatedBiome(biome);
-    }
-    
-    static BiomeDelegate self() {
-        return SelfDelegate.INSTANCE;
-    }
-    
-    Biome getBiome();
-    
-    Set<String> getTags();
-    
-    default boolean isEphemeral() {
-        return false;
-    }
-    
-    default boolean isSelf() {
-        return false;
-    }
-    
-    
-}

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

@@ -1,20 +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.biome.pipeline.api.stage;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface Stage {
-    BiomeHolder apply(BiomeHolder in, long seed);
-    
-    boolean isExpansion();
-    
-    Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes);
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java

@@ -1,15 +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.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeExpander {
-    BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others);
-}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java

@@ -1,37 +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.biome.pipeline.api.stage.type;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeMutator {
-    BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed);
-    
-    default Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
-    }
-    
-    class ViewPoint {
-        private final BiomeHolder biomes;
-        private final int offX;
-        private final int offZ;
-        
-        public ViewPoint(BiomeHolder biomes, int offX, int offZ) {
-            this.biomes = biomes;
-            this.offX = offX;
-            this.offZ = offZ;
-        }
-        
-        
-        public BiomeDelegate getBiome(int x, int z) {
-            return biomes.getBiomeRaw(x + offX, z + offZ);
-        }
-    }
-}

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

@@ -10,45 +10,50 @@ package com.dfsek.terra.addons.biome.pipeline.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.List;
 
-import com.dfsek.terra.addons.biome.pipeline.BiomePipeline;
-import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.PipelineBiomeProvider;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 @SuppressWarnings({ "FieldMayBeFinal", "unused" })
-public class BiomePipelineTemplate extends BiomeProviderTemplate {
-    @Value("pipeline.initial-size")
+public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
+    @Value("resolution")
     @Default
     @Description("""
-                 The initial size of biome chunks. This value must be at least 2.
-                 <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
-                                  
-                 It is recommended to keep biome chunks' final size in the range of [50, 300]
-                 to prevent performance issues. To calculate the size of biome chunks, simply
-                 take initial-size and for each expand stage, multiply the running value by 2
-                 and subtract 1. (The size is also printed to the server console if you
-                 have debug mode enabled)""")
-    private @Meta int initialSize = 2;
+                 The resolution at which to sample biomes.
+                 
+                 Larger values are quadratically faster, but produce lower quality results.
+                 For example, a value of 3 would sample every 3 blocks.""")
+    protected @Meta int resolution = 1;
     
     @Value("pipeline.source")
     @Description("The Biome Source to use for initial population of biomes.")
-    private @Meta BiomeSource source;
+    private @Meta Source source;
     
     @Value("pipeline.stages")
     @Description("A list of pipeline stages to apply to the result of #source")
     private @Meta List<@Meta Stage> stages;
     
+    @Value("blend.sampler")
+    @Default
+    @Description("A sampler to use for blending the edges of biomes via domain warping.")
+    protected @Meta NoiseSampler blendSampler = NoiseSampler.zero();
+    
+    @Value("blend.amplitude")
+    @Default
+    @Description("The amplitude at which to perform blending.")
+    protected @Meta double blendAmplitude = 0d;
+    
     @Override
     public BiomeProvider get() {
-        BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);
-        stages.forEach(biomePipelineBuilder::addStage);
-        BiomePipeline pipeline = biomePipelineBuilder.build(source);
-        return new BiomePipelineProvider(pipeline, resolution, blend, blendAmp);
+        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 500), resolution, blendSampler, blendAmplitude);
     }
 }

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

@@ -1,37 +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.biome.pipeline.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Description;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-
-public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    @Value("resolution")
-    @Default
-    @Description("""
-                 The resolution at which to sample biomes.
-                                  
-                 Larger values are quadratically faster, but produce lower quality results.
-                 For example, a value of 3 would sample every 3 blocks.""")
-    protected @Meta int resolution = 1;
-    @Value("blend.sampler")
-    @Default
-    @Description("A sampler to use for blending the edges of biomes via domain warping.")
-    protected @Meta NoiseSampler blend = NoiseSampler.zero();
-    @Value("blend.amplitude")
-    @Default
-    @Description("The amplitude at which to perform blending.")
-    protected @Meta double blendAmp = 0d;
-}

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

@@ -8,25 +8,25 @@ import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
-public class BiomeDelegateLoader implements TypeLoader<BiomeDelegate> {
+public class PipelineBiomeLoader implements TypeLoader<PipelineBiome> {
     private final Registry<Biome> biomeRegistry;
     
-    public BiomeDelegateLoader(Registry<Biome> biomeRegistry) {
+    public PipelineBiomeLoader(Registry<Biome> biomeRegistry) {
         this.biomeRegistry = biomeRegistry;
     }
     
     @Override
-    public BiomeDelegate load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    public PipelineBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
     throws LoadException {
-        if(c.equals("SELF")) return BiomeDelegate.self();
+        if(c.equals("SELF")) return PipelineBiome.self();
         return biomeRegistry
                 .getByID((String) c)
-                .map(BiomeDelegate::from)
-                .orElseGet(() -> BiomeDelegate.ephemeral((String) c));
+                .map(PipelineBiome::from)
+                .orElseGet(() -> PipelineBiome.placeholder((String) c));
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java

@@ -5,13 +5,13 @@
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config;
+package com.dfsek.terra.addons.biome.pipeline.config.source;
 
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -25,10 +25,10 @@ public class SamplerSourceTemplate extends SourceTemplate {
     
     @Value("biomes")
     @Description("The biomes to be distributed.")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> biomes;
+    private @Meta ProbabilityCollection<@Meta PipelineBiome> biomes;
     
     @Override
-    public BiomeSource get() {
+    public Source get() {
         return new SamplerSource(biomes, noise);
     }
 }

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SourceTemplate.java

@@ -5,13 +5,13 @@
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config;
+package com.dfsek.terra.addons.biome.pipeline.config.source;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
 
 
-public abstract class SourceTemplate implements ObjectTemplate<BiomeSource> {
+public abstract class SourceTemplate implements ObjectTemplate<Source> {
 
 }

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

@@ -11,7 +11,7 @@ import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 

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

@@ -7,15 +7,14 @@
 
 package com.dfsek.terra.addons.biome.pipeline.config.stage.expander;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.expand.FractalExpander;
-import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.stage.expander.FractalExpander;
 
 
 public class ExpanderStageTemplate extends StageTemplate {
     @Override
-    public Stage get() {
-        return new ExpanderStage(new FractalExpander(noise));
+    public Expander get() {
+        return new FractalExpander(noise);
     }
 }

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

@@ -11,17 +11,16 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 @SuppressWarnings("unused")
-public class BorderListMutatorTemplate extends StageTemplate {
+public class BorderListStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
     
@@ -29,14 +28,14 @@ public class BorderListMutatorTemplate extends StageTemplate {
     private @Meta String defaultReplace;
     
     @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
+    private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
     
     @Value("replace")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
+    private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
     
     
     @Override
     public Stage get() {
-        return new MutatorStage(new BorderListMutator(replace, from, defaultReplace, noise, defaultTo));
+        return new BorderListStage(replace, from, defaultReplace, noise, defaultTo);
     }
 }

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

@@ -9,17 +9,16 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 @SuppressWarnings("unused")
-public class BorderMutatorTemplate extends StageTemplate {
+public class BorderStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
     
@@ -27,10 +26,10 @@ public class BorderMutatorTemplate extends StageTemplate {
     private @Meta String replace;
     
     @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
+    private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
     
     @Override
     public Stage get() {
-        return new MutatorStage(new BorderMutator(from, replace, noise, to));
+        return new BorderStage(from, replace, noise, to);
     }
 }

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

@@ -11,28 +11,27 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 @SuppressWarnings("unused")
-public class ReplaceListMutatorTemplate extends StageTemplate {
+public class ReplaceListStageTemplate extends StageTemplate {
     @Value("default-from")
     private @Meta String defaultFrom;
     
     @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
+    private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
     
     @Value("to")
-    private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
+    private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
     
     @Override
     public Stage get() {
-        return new MutatorStage(new ReplaceListMutator(replace, defaultFrom, defaultTo, noise));
+        return new ReplaceListStage(replace, defaultFrom, defaultTo, noise);
     }
 }

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

@@ -9,25 +9,24 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 @SuppressWarnings("unused")
-public class ReplaceMutatorTemplate extends StageTemplate {
+public class ReplaceStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
     
     @Value("to")
-    private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
+    private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
     
     @Override
     public Stage get() {
-        return new MutatorStage(new ReplaceMutator(from, to, noise));
+        return new ReplaceStage(from, to, noise);
     }
 }

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

@@ -7,15 +7,14 @@
 
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.stage.mutators.SmoothStage;
 
 
-public class SmoothMutatorTemplate extends StageTemplate {
+public class SmoothStageTemplate extends StageTemplate {
     @Override
     public Stage get() {
-        return new MutatorStage(new SmoothMutator(noise));
+        return new SmoothStage(noise);
     }
 }

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

@@ -1,27 +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.biome.pipeline.expand;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-
-
-public class FractalExpander implements BiomeExpander {
-    private final NoiseSampler sampler;
-    
-    public FractalExpander(NoiseSampler sampler) {
-        this.sampler = sampler;
-    }
-    
-    @Override
-    public BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others) {
-        return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)];
-    }
-}

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

@@ -1,67 +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.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class BorderListMutator implements BiomeMutator {
-    private final String border;
-    private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
-    private final String defaultReplace;
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
-    
-    public BorderListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String border, String defaultReplace,
-                             NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replaceDefault) {
-        this.border = border;
-        this.noiseSampler = noiseSampler;
-        this.replaceDefault = replaceDefault;
-        this.defaultReplace = defaultReplace;
-        this.replace = replace;
-    }
-    
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
-        if(origin.getTags().contains(defaultReplace)) {
-            for(int xi = -1; xi <= 1; xi++) {
-                for(int zi = -1; zi <= 1; zi++) {
-                    if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
-                        if(replace.containsKey(origin)) {
-                            BiomeDelegate biome = replace.get(origin).get(noiseSampler, x, z, seed);
-                            return biome.isSelf() ? origin : biome;
-                        }
-                        BiomeDelegate biome = replaceDefault.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
-                    }
-                }
-            }
-        }
-        return origin;
-    }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(replaceDefault.getContents().stream().filter(Predicate.not(BiomeDelegate::isSelf)).toList());
-        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents()));
-        return biomeSet;
-    }
-}

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

@@ -1,66 +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.biome.pipeline.mutator;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-public class BorderMutator implements BiomeMutator {
-    private final String border;
-    private final NoiseSampler noiseSampler;
-    private final ProbabilityCollection<BiomeDelegate> replace;
-    private final String replaceTag;
-    
-    public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replace) {
-        this.border = border;
-        this.noiseSampler = noiseSampler;
-        this.replace = replace;
-        this.replaceTag = replaceTag;
-    }
-    
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate origin = viewPoint.getBiome(0, 0);
-        if(origin.getTags().contains(replaceTag)) {
-            for(int xi = -1; xi <= 1; xi++) {
-                for(int zi = -1; zi <= 1; zi++) {
-                    if(xi == 0 && zi == 0) continue;
-                    BiomeDelegate current = viewPoint.getBiome(xi, zi);
-                    if(current != null && current.getTags().contains(border)) {
-                        BiomeDelegate biome = replace.get(noiseSampler, x, z, seed);
-                        return biome.isSelf() ? origin : biome;
-                    }
-                }
-            }
-        }
-        return origin;
-    }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        biomes.forEach(biomeSet::add);
-        biomeSet.addAll(
-                replace
-                        .getContents()
-                        .stream()
-                        .filter(
-                                Predicate.not(BiomeDelegate::isSelf)
-                               )
-                        .toList()
-                       );
-        return biomeSet;
-    }
-}

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

@@ -1,46 +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.biome.pipeline.mutator;
-
-import java.util.Objects;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-
-
-public class SmoothMutator implements BiomeMutator {
-    
-    private final NoiseSampler sampler;
-    
-    public SmoothMutator(NoiseSampler sampler) {
-        this.sampler = sampler;
-    }
-    
-    @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate top = viewPoint.getBiome(1, 0);
-        BiomeDelegate bottom = viewPoint.getBiome(-1, 0);
-        BiomeDelegate left = viewPoint.getBiome(0, 1);
-        BiomeDelegate right = viewPoint.getBiome(0, -1);
-        
-        
-        boolean vert = Objects.equals(top, bottom) && top != null;
-        boolean horiz = Objects.equals(left, right) && left != null;
-        
-        if(vert && horiz) {
-            return MathUtil.normalizeIndex(sampler.noise(seed, x, z), 2) == 0 ? left : top;
-        }
-        
-        if(vert) return top;
-        if(horiz) return left;
-        
-        return viewPoint.getBiome(0, 0);
-    }
-}

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

@@ -0,0 +1,218 @@
+package com.dfsek.terra.addons.biome.pipeline.pipeline;
+
+import net.jafama.FastMath;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.biome.pipeline.api.SeededVector;
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+
+
+public class BiomeChunkImpl implements BiomeChunk {
+    
+    private PipelineBiome[][] biomes;
+    private final SeededVector worldOrigin;
+    private final int chunkOriginArrayIndex;
+    private final int worldCoordinateScale;
+    
+    public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
+        
+        this.worldOrigin = worldOrigin;
+        this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
+        this.worldCoordinateScale = pipeline.getResolution();
+        
+        int size = pipeline.getArraySize();
+        
+        int expanderCount = pipeline.getExpanderCount();
+        int expansionsApplied = 0;
+        
+        // Allocate working arrays
+        this.biomes = new PipelineBiome[size][size];
+        PipelineBiome[][] lookupArray = new PipelineBiome[size][size];
+        // A second lookup array is required such that stage application doesn't affect lookups, otherwise application may cascade
+        
+        // Construct working grid
+        int gridOrigin = 0;
+        int gridInterval = calculateGridInterval(expanderCount, expansionsApplied);
+        int gridSize = (size / gridInterval);
+        gridSize += expanderCount > 0 ? 1 : 0; // Add an extra border if expansion occurs
+        
+        // Fill working grid with initial cells
+        for(int gridX = 0; gridX < gridSize; gridX++) {
+            for(int gridZ = 0; gridZ < gridSize; gridZ++) {
+                int xIndex = gridOrigin + gridX * gridInterval;
+                int zIndex = gridOrigin + gridZ * gridInterval;
+                biomes[xIndex][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex), zIndexToWorldCoordinate(zIndex));
+            }
+        }
+        
+        for(Stage stage : pipeline.getStages()) {
+            if(stage instanceof Expander) {
+                // Shrink working grid size, the expander will fill in null cells (as a result of shrinking the grid) during mutation
+                expansionsApplied++;
+                gridInterval = calculateGridInterval(expanderCount, expansionsApplied);
+                gridSize = expandSize(gridSize);
+            }
+            
+            int stageReadDistance = stage.maxRelativeReadDistance();
+            if(stageReadDistance > 0) {
+                // Discard edges such that adjacent lookups are only ran on valid cells
+                gridSize = contractBordersFromSize(gridSize, stageReadDistance);
+                gridOrigin += stageReadDistance * gridInterval;
+            }
+            
+            // Cycle arrays, the previously populated array is swapped to be used for lookups, and the result of the stage application
+            // overwrites the previous lookup array. This saves having to allocate a new array copy each time
+            PipelineBiome[][] tempArray = biomes;
+            biomes = lookupArray;
+            lookupArray = tempArray;
+            
+            // Apply stage to working grid
+            for(int gridZ = 0; gridZ < gridSize; gridZ = gridZ + 1) {
+                for(int gridX = 0; gridX < gridSize; gridX = gridX + 1) {
+                    int xIndex = gridOrigin + gridX * gridInterval;
+                    int zIndex = gridOrigin + gridZ * gridInterval;
+                    biomes[xIndex][zIndex] = stage.apply(new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray));
+                }
+            }
+        }
+    }
+    
+    @Override
+    public PipelineBiome get(int xInChunk, int zInChunk) {
+        int xIndex = xInChunk + chunkOriginArrayIndex;
+        int zIndex = zInChunk + chunkOriginArrayIndex;
+        return biomes[xIndex][zIndex];
+    }
+    
+    private int xIndexToWorldCoordinate(int xIndex) {
+        return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+    }
+    
+    private int zIndexToWorldCoordinate(int zIndex) {
+        return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+    }
+    
+    protected static int initialSizeToArraySize(int expanderCount, int initialSize) {
+        int size = initialSize;
+        for(int i = 0; i < expanderCount; i++) {
+            size = expandSize(size);
+        }
+        return size;
+    }
+    
+    protected static int calculateChunkOriginArrayIndex(int totalExpanderCount, List<Stage> stages) {
+        int finalGridOrigin = calculateFinalGridOrigin(totalExpanderCount, stages);
+        int initialGridInterval = calculateGridInterval(totalExpanderCount, 0);
+        
+        // Round the final grid origin up to the nearest multiple of initialGridInterval, such that each
+        // chunk samples points on the same overall grid.
+        // Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
+        // because points would be sampled on grids at different offsets, resulting in artifacts at borders.
+        return FastMath.ceilToInt((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+    }
+    
+    private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
+        int gridOrigin = 0;
+        int expansionsApplied = 0;
+        int gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
+        for (Stage stage : stages) {
+            if (stage instanceof Expander) {
+                expansionsApplied++;
+                gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
+            }
+            gridOrigin += stage.maxRelativeReadDistance() * gridInterval;
+        }
+        return gridOrigin;
+    }
+    
+    protected static int calculateChunkSize(int arraySize, int chunkOriginArrayIndex, int totalExpanderCount) {
+        return contractBordersFromSize(arraySize, chunkOriginArrayIndex) - (totalExpanderCount > 0 ? 1 : 0);
+    }
+    
+    private static int expandSize(int size) {
+        return size * 2 - 1;
+    }
+    
+    private static int contractBordersFromSize(int size, int border) {
+        return size - border * 2;
+    }
+    
+    private static int calculateGridInterval(int totalExpansions, int expansionsApplied) {
+        return 1 << (totalExpansions - expansionsApplied);
+    }
+    
+    private SeededVector getOrigin() {
+        return worldOrigin;
+    }
+    
+    /**
+     * Represents a point on the operating grid within the biomes array
+     */
+    public static class ViewPoint {
+        private final BiomeChunkImpl chunk;
+        private final PipelineBiome biome;
+        private final int gridInterval;
+        private final int gridX;
+        private final int gridZ;
+        private final int xIndex;
+        private final int zIndex;
+        private final PipelineBiome[][] lookupArray;
+        
+        private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex, PipelineBiome[][] lookupArray) {
+            this.chunk = chunk;
+            this.gridInterval = gridInterval;
+            this.gridX = gridX;
+            this.gridZ = gridZ;
+            this.xIndex = xIndex;
+            this.zIndex = zIndex;
+            this.lookupArray = lookupArray;
+            this.biome = lookupArray[xIndex][zIndex];
+        }
+        
+        public PipelineBiome getRelativeBiome(int x, int z) {
+            int lookupXIndex = this.xIndex + x * gridInterval;
+            int lookupZIndex = this.zIndex + z * gridInterval;
+            return lookupArray[lookupXIndex][lookupZIndex];
+        }
+        
+        public PipelineBiome getBiome() {
+            return biome;
+        }
+        
+        /**
+         * @return X position of the point relative to the operating grid
+         */
+        public int gridX() {
+            return gridX;
+        }
+        
+        /**
+         * @return Z position of the point relative to the operating grid
+         */
+        public int gridZ() {
+            return gridZ;
+        }
+        
+        /**
+         * @return X position of the point in the world
+         */
+        public int worldX() {
+            return chunk.xIndexToWorldCoordinate(xIndex);
+        }
+        
+        /**
+         * @return Z position of the point in the world
+         */
+        public int worldZ() {
+            return chunk.zIndexToWorldCoordinate(zIndex);
+        }
+        
+        public long worldSeed() {
+            return chunk.getOrigin().seed();
+        }
+    }
+}

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

@@ -0,0 +1,92 @@
+package com.dfsek.terra.addons.biome.pipeline.pipeline;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.api.SeededVector;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+
+
+public class PipelineImpl implements Pipeline {
+    
+    private static final Logger logger = LoggerFactory.getLogger(PipelineImpl.class);
+    
+    private final Source source;
+    private final List<Stage> stages;
+    private final int chunkSize;
+    private final int expanderCount;
+    private final int arraySize;
+    private final int chunkOriginArrayIndex;
+    private final int resolution;
+    
+    public PipelineImpl(Source source, List<Stage> stages, int resolution, int idealChunkArraySize) {
+        this.source = source;
+        this.stages = stages;
+        this.resolution = resolution;
+        this.expanderCount = (int) stages.stream().filter(s -> s instanceof Expander).count();
+        
+        // Optimize for the ideal array size
+        int arraySize;
+        int chunkOriginArrayIndex;
+        int chunkSize;
+        int initialSize = 1;
+        while (true) {
+            arraySize = BiomeChunkImpl.initialSizeToArraySize(expanderCount, initialSize);
+            chunkOriginArrayIndex = BiomeChunkImpl.calculateChunkOriginArrayIndex(expanderCount, stages);
+            chunkSize = BiomeChunkImpl.calculateChunkSize(arraySize, chunkOriginArrayIndex, expanderCount);
+            if (chunkSize > 1 && arraySize >= idealChunkArraySize) break;
+            initialSize++;
+        }
+        
+        this.arraySize = arraySize;
+        this.chunkOriginArrayIndex = chunkOriginArrayIndex;
+        this.chunkSize = chunkSize;
+    
+        logger.debug("Initialized a new biome pipeline:");
+        logger.debug("Array size: {} (Target: {})", arraySize, idealChunkArraySize);
+        logger.debug("Internal array origin: {}", chunkOriginArrayIndex);
+        logger.debug("Chunk size: {}", chunkSize);
+    }
+    
+    @Override
+    public BiomeChunk generateChunk(SeededVector worldCoordinates) {
+        return new BiomeChunkImpl(worldCoordinates, this);
+    }
+    
+    @Override
+    public int getChunkSize() {
+        return chunkSize;
+    }
+    
+    @Override
+    public Source getSource() {
+        return source;
+    }
+    
+    @Override
+    public List<Stage> getStages() {
+        return stages;
+    }
+    
+    protected int getExpanderCount() {
+        return expanderCount;
+    }
+    
+    protected int getArraySize() {
+        return arraySize;
+    }
+    
+    protected int getChunkOriginArrayIndex() {
+        return chunkOriginArrayIndex;
+    }
+    
+    protected int getResolution() {
+        return resolution;
+    }
+}

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

@@ -1,17 +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.biome.pipeline.source;
-
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-
-
-public interface BiomeSource {
-    BiomeDelegate getBiome(double x, double z, long seed);
-    
-    Iterable<BiomeDelegate> getBiomes();
-}

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

@@ -1,33 +1,27 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
 package com.dfsek.terra.addons.biome.pipeline.source;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
-public class SamplerSource implements BiomeSource {
-    private final ProbabilityCollection<BiomeDelegate> biomes;
+public class SamplerSource implements Source {
+    private final ProbabilityCollection<PipelineBiome> biomes;
     private final NoiseSampler sampler;
     
-    public SamplerSource(ProbabilityCollection<BiomeDelegate> biomes, NoiseSampler sampler) {
+    public SamplerSource(ProbabilityCollection<PipelineBiome> biomes, NoiseSampler sampler) {
         this.biomes = biomes;
         this.sampler = sampler;
     }
     
     @Override
-    public BiomeDelegate getBiome(double x, double z, long seed) {
+    public PipelineBiome get(long seed, int x, int z) {
         return biomes.get(sampler, x, z, seed);
     }
     
     @Override
-    public Iterable<BiomeDelegate> getBiomes() {
+    public Iterable<PipelineBiome> getBiomes() {
         return biomes.getContents();
     }
 }

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

@@ -0,0 +1,27 @@
+package com.dfsek.terra.addons.biome.pipeline.source;
+
+import java.util.Collections;
+import java.util.Set;
+
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.api.Source;
+
+
+public class SingleSource implements Source {
+    
+    private final PipelineBiome biome;
+    
+    public SingleSource(PipelineBiome biome) {
+        this.biome = biome;
+    }
+    
+    @Override
+    public PipelineBiome get(long seed, int x, int z) {
+        return biome;
+    }
+    
+    @Override
+    public Set<PipelineBiome> getBiomes() {
+        return Collections.singleton(biome);
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.dfsek.terra.addons.biome.pipeline.stage.expander;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+public class FractalExpander implements Expander {
+    
+    private final NoiseSampler sampler;
+    
+    public FractalExpander(NoiseSampler sampler) {
+        this.sampler = sampler;
+    }
+    
+    @Override
+    public PipelineBiome fillBiome(ViewPoint viewPoint) {
+
+        int xMod2 = viewPoint.gridX() % 2;
+        int zMod2 = viewPoint.gridZ() % 2;
+        
+        double roll = sampler.noise(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());
+        
+        if (xMod2 == 1 && zMod2 == 0) { // Pick one of 2 neighbors on X axis randomly
+            return roll > 0 ? viewPoint.getRelativeBiome(-1, 0) : viewPoint.getRelativeBiome(1, 0);
+            
+        } else if (xMod2 == 0 && zMod2 == 1) { // Pick one of 2 neighbors on Z axis randomly
+            return roll > 0 ? viewPoint.getRelativeBiome(0, -1) : viewPoint.getRelativeBiome(0, 1);
+            
+        } else { // Pick one of 4 corners randomly
+            return roll > 0 ?
+                   roll >  0.25 ? viewPoint.getRelativeBiome(-1, 1) : viewPoint.getRelativeBiome(1, 1) :
+                   roll > -0.25 ? viewPoint.getRelativeBiome(-1, -1) : viewPoint.getRelativeBiome(1, -1);
+        }
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.vector.Vector2Int;
+
+
+public class BorderListStage implements Stage {
+    private final String border;
+    private final NoiseSampler noiseSampler;
+    private final ProbabilityCollection<PipelineBiome> replaceDefault;
+    private final String defaultReplace;
+    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
+    
+    private final Vector2Int[] borderPoints;
+    
+    public BorderListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String border, String defaultReplace,
+                           NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replaceDefault) {
+        this.border = border;
+        this.noiseSampler = noiseSampler;
+        this.replaceDefault = replaceDefault;
+        this.defaultReplace = defaultReplace;
+        this.replace = replace;
+    
+        List<Vector2Int> points = new ArrayList<>();
+        for(int x = -1; x <= 1; x++) {
+            for(int z = -1; z <= 1; z++) {
+                if(x == 0 && z == 0) continue;
+                points.add(Vector2Int.of(x, z));
+            }
+        }
+        this.borderPoints = points.toArray(new Vector2Int[0]);
+        
+    }
+    
+    @Override
+    public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        Set<PipelineBiome> biomeSet = new HashSet<>();
+        biomes.forEach(biomeSet::add);
+        biomeSet.addAll(replaceDefault.getContents().stream().filter(Predicate.not(PipelineBiome::isSelf)).toList());
+        replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents()));
+        return biomeSet;
+    }
+    
+    @Override
+    public PipelineBiome apply(ViewPoint viewPoint) {
+        PipelineBiome center = viewPoint.getBiome();
+        if(center.getTags().contains(defaultReplace)) {
+            for(Vector2Int point : borderPoints) {
+                PipelineBiome current = viewPoint.getRelativeBiome(point.getX(), point.getZ());
+                if(current != null && current.getTags().contains(border)) {
+                    if(replace.containsKey(center)) {
+                        PipelineBiome replacement = replace.get(center).get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
+                                                                      viewPoint.worldSeed());
+                        return replacement.isSelf() ? center : replacement;
+                    }
+                    PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+                    return replacement.isSelf() ? center : replacement;
+                }
+            }
+        }
+        return center;
+    }
+    
+    @Override
+    public int maxRelativeReadDistance() {
+        return 1;
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.vector.Vector2Int;
+
+
+public class BorderStage implements Stage {
+    private final String border;
+    private final NoiseSampler noiseSampler;
+    private final ProbabilityCollection<PipelineBiome> replace;
+    private final String replaceTag;
+    private final Vector2Int[] borderPoints;
+    
+    public BorderStage(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replace) {
+        this.border = border;
+        this.noiseSampler = noiseSampler;
+        this.replace = replace;
+        this.replaceTag = replaceTag;
+        List<Vector2Int> points = new ArrayList<>();
+        for(int x = -1; x <= 1; x++) {
+            for(int z = -1; z <= 1; z++) {
+                if(x == 0 && z == 0) continue;
+                points.add(Vector2Int.of(x, z));
+            }
+        }
+        this.borderPoints = points.toArray(new Vector2Int[0]);
+    }
+    
+    @Override
+    public PipelineBiome apply(ViewPoint viewPoint) {
+        PipelineBiome center = viewPoint.getBiome();
+        if(center.getTags().contains(replaceTag)) {
+            for(Vector2Int point : borderPoints) {
+                PipelineBiome current = viewPoint.getRelativeBiome(point.getX(), point.getZ());
+                if(current != null && current.getTags().contains(border)) {
+                    PipelineBiome replacement = replace.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+                    return replacement.isSelf() ? center : replacement;
+                }
+            }
+        }
+        return center;
+    }
+    
+    @Override
+    public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        Set<PipelineBiome> biomeSet = new HashSet<>();
+        biomes.forEach(biomeSet::add);
+        biomeSet.addAll(
+                replace
+                        .getContents()
+                        .stream()
+                        .filter(
+                                Predicate.not(PipelineBiome::isSelf)
+                               )
+                        .toList()
+                       );
+        return biomeSet;
+    }
+    
+    @Override
+    public int maxRelativeReadDistance() {
+        return 1;
+    }
+}

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java

@@ -5,27 +5,28 @@
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.mutator;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
-public class ReplaceListMutator implements BiomeMutator {
-    private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
+public class ReplaceListStage implements Stage {
+    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
     private final NoiseSampler sampler;
-    private final ProbabilityCollection<BiomeDelegate> replaceDefault;
+    private final ProbabilityCollection<PipelineBiome> replaceDefault;
     private final String defaultTag;
     
-    public ReplaceListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String defaultTag,
-                              ProbabilityCollection<BiomeDelegate> replaceDefault, NoiseSampler sampler) {
+    public ReplaceListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String defaultTag,
+                            ProbabilityCollection<PipelineBiome> replaceDefault, NoiseSampler sampler) {
         this.replace = replace;
         this.sampler = sampler;
         this.defaultTag = defaultTag;
@@ -33,24 +34,29 @@ public class ReplaceListMutator implements BiomeMutator {
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        BiomeDelegate center = viewPoint.getBiome(0, 0);
+    public PipelineBiome apply(ViewPoint viewPoint) {
+        PipelineBiome center = viewPoint.getBiome();
         if(replace.containsKey(center)) {
-            BiomeDelegate biome = replace.get(center).get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+            PipelineBiome biome = replace.get(center).get(sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+            return biome.isSelf() ? viewPoint.getBiome() : biome;
         }
-        if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) {
-            BiomeDelegate biome = replaceDefault.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+        if(viewPoint.getBiome().getTags().contains(defaultTag)) {
+            PipelineBiome biome = replaceDefault.get(sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+            return biome.isSelf() ? viewPoint.getBiome() : biome;
         }
         return center;
     }
     
     @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
+    public int maxRelativeReadDistance() {
+        return 0;
+    }
+    
+    @Override
+    public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        Set<PipelineBiome> biomeSet = new HashSet<>();
         
-        Set<BiomeDelegate> reject = new HashSet<>();
+        Set<PipelineBiome> reject = new HashSet<>();
         
         biomes.forEach(biome -> {
             if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java

@@ -5,42 +5,48 @@
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.mutator;
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
-public class ReplaceMutator implements BiomeMutator {
+public class ReplaceStage implements Stage {
     private final String replaceableTag;
-    private final ProbabilityCollection<BiomeDelegate> replace;
+    private final ProbabilityCollection<PipelineBiome> replace;
     private final NoiseSampler sampler;
     
-    public ReplaceMutator(String replaceable, ProbabilityCollection<BiomeDelegate> replace, NoiseSampler sampler) {
+    public ReplaceStage(String replaceable, ProbabilityCollection<PipelineBiome> replace, NoiseSampler sampler) {
         this.replaceableTag = replaceable;
         this.replace = replace;
         this.sampler = sampler;
     }
     
     @Override
-    public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
-        if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
-            BiomeDelegate biome = replace.get(sampler, x, z, seed);
-            return biome.isSelf() ? viewPoint.getBiome(0, 0) : biome;
+    public PipelineBiome apply(ViewPoint viewPoint) {
+        if(viewPoint.getBiome().getTags().contains(replaceableTag)) {
+            PipelineBiome biome = replace.get(sampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+            return biome.isSelf() ? viewPoint.getBiome() : biome;
         }
-        return viewPoint.getBiome(0, 0);
+        return viewPoint.getBiome();
     }
     
     @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        Set<BiomeDelegate> biomeSet = new HashSet<>();
-        Set<BiomeDelegate> reject = new HashSet<>();
+    public int maxRelativeReadDistance() {
+        return 0;
+    }
+    
+    @Override
+    public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
+        Set<PipelineBiome> biomeSet = new HashSet<>();
+        Set<PipelineBiome> reject = new HashSet<>();
         biomes.forEach(biome -> {
             if(!biome.getTags().contains(replaceableTag)) {
                 biomeSet.add(biome);

common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
+
+import java.util.Objects;
+
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+public class SmoothStage implements Stage {
+    
+    private final NoiseSampler sampler;
+    
+    public SmoothStage(NoiseSampler sampler) {
+        this.sampler = sampler;
+    }
+    
+    @Override
+    public PipelineBiome apply(ViewPoint viewPoint) {
+        PipelineBiome top = viewPoint.getRelativeBiome(1, 0);
+        PipelineBiome bottom = viewPoint.getRelativeBiome(-1, 0);
+        PipelineBiome left = viewPoint.getRelativeBiome(0, 1);
+        PipelineBiome right = viewPoint.getRelativeBiome(0, -1);
+        
+        double roll = sampler.noise(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());
+        
+        boolean vert = Objects.equals(top, bottom);
+        boolean horiz = Objects.equals(left, right);
+    
+        if(vert && horiz) {
+            return roll > 0 ?
+                   roll > 0.25 ? left : right :
+                   roll > -0.25 ? top : bottom;
+        }
+        if(vert) {
+            return roll > 0 ? top : bottom;
+        }
+        if(horiz) {
+            return roll > 0 ? left : right;
+        }
+        return viewPoint.getBiome();
+    }
+    
+    @Override
+    public int maxRelativeReadDistance() {
+        return 1;
+    }
+}

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

@@ -1,37 +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.biome.pipeline.stages;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
-
-
-public class ExpanderStage implements Stage {
-    private final BiomeExpander expander;
-    
-    public ExpanderStage(BiomeExpander expander) {
-        this.expander = expander;
-    }
-    
-    @Override
-    public BiomeHolder apply(BiomeHolder in, long seed) {
-        return in.expand(expander, seed);
-    }
-    
-    @Override
-    public boolean isExpansion() {
-        return true;
-    }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return biomes;
-    }
-}

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

@@ -1,46 +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.biome.pipeline.stages;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
-
-
-public class MutatorStage implements Stage {
-    private final BiomeMutator mutator;
-    
-    public MutatorStage(BiomeMutator mutator) {
-        this.mutator = mutator;
-    }
-    
-    @Override
-    public BiomeHolder apply(BiomeHolder in, long seed) {
-        in.mutate(mutator, seed);
-        return in;
-    }
-    
-    @Override
-    public boolean isExpansion() {
-        return false;
-    }
-    
-    @Override
-    public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
-        return mutator.getBiomes(biomes);
-    }
-    
-    public enum Type {
-        REPLACE,
-        REPLACE_LIST,
-        BORDER,
-        BORDER_LIST,
-        SMOOTH
-    }
-}

common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java

@@ -11,37 +11,38 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
+import org.jetbrains.annotations.NotNull;
 
-public class SingleBiomeProviderAddon implements AddonInitializer {
+
+public class SingleBiomeProviderAddon implements MonadAddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
     
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("SINGLE"), SingleBiomeProviderTemplate::new);
-                })
-                .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((handler, base, platform) -> Init.ofPure(
+                        handler.register(base, ConfigPackPreLoadEvent.class)
+                               .then(event -> {
+                                   Registry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().createRegistry(
+                                           PROVIDER_REGISTRY_KEY);
+                                   providerRegistry.register(base.key("SINGLE"), SingleBiomeProviderTemplate::new);
+                               })
+                               .failThrough()))
+                      );
     }
 }

common/addons/biome-query-api/src/main/java/com/dfsek/terra/addons/biome/query/BiomeQueryAPIAddon.java

@@ -1,46 +1,48 @@
 package com.dfsek.terra.addons.biome.query;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Collection;
 
 import com.dfsek.terra.addons.biome.query.impl.BiomeTagFlattener;
 import com.dfsek.terra.addons.biome.query.impl.BiomeTagHolder;
-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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.properties.PropertyKey;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
-public class BiomeQueryAPIAddon implements AddonInitializer {
+public class BiomeQueryAPIAddon implements MonadAddonInitializer {
     public static PropertyKey<BiomeTagHolder> BIOME_TAG_KEY = Context.create(BiomeTagHolder.class);
-    @Inject
-    private Platform platform;
-    @Inject
-    private BaseAddon addon;
     
     @Override
-    public void initialize() {
-        
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPostLoadEvent.class)
-                .then(event -> {
-                    Collection<Biome> biomes = event
-                            .getPack()
-                            .getRegistry(Biome.class)
-                            .entries();
-            
-                    BiomeTagFlattener flattener = new BiomeTagFlattener(biomes
-                                                                                .stream()
-                                                                                .flatMap(biome -> biome.getTags().stream())
-                                                                                .toList());
-            
-                    biomes.forEach(biome -> biome.getContext().put(BIOME_TAG_KEY, new BiomeTagHolder(biome, flattener)));
-                })
-                .global();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((functionalEventHandler, base) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPostLoadEvent.class)
+                                              .then(event -> {
+                                                  Collection<Biome> biomes = event
+                                                          .getPack()
+                                                          .getRegistry(Biome.class)
+                                                          .entries();
+                            
+                                                  BiomeTagFlattener flattener = new BiomeTagFlattener(
+                                                          biomes.stream()
+                                                                .flatMap(biome -> biome.getTags().stream())
+                                                                .toList());
+                            
+                                                  biomes.forEach(biome -> biome.getContext()
+                                                                               .put(BIOME_TAG_KEY, new BiomeTagHolder(biome, flattener)));
+                                              })
+                                              .global()
+                                                                        )));
     }
 }

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

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

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

@@ -14,60 +14,58 @@ import com.dfsek.terra.addons.chunkgenerator.config.palette.BiomePaletteTemplate
 import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.SlantLayer;
 import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
-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.ConfigurationLoadEvent;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 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.properties.Context;
 import com.dfsek.terra.api.properties.PropertyKey;
+import com.dfsek.terra.api.util.function.monad.Monad;
+import com.dfsek.terra.api.util.generic.Construct;
 import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider;
+
+import org.jetbrains.annotations.NotNull;
 
 
-public class NoiseChunkGenerator3DAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+public class NoiseChunkGenerator3DAddon implements MonadAddonInitializer {
     @Override
-    public void initialize() {
+    public @NotNull Monad<?, Init<?>> initialize() {
         PropertyKey<PaletteInfo> paletteInfoPropertyKey = Context.create(PaletteInfo.class);
         PropertyKey<BiomeNoiseProperties> noisePropertiesPropertyKey = Context.create(BiomeNoiseProperties.class);
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .priority(1000)
-                .then(event -> {
-                    NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
-            
-                    event.getPack()
-                         .getOrCreateRegistry(ChunkGeneratorProvider.class)
-                         .register(addon.key("NOISE_3D"),
-                                   pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
-                                                                     config.getHorizontalRes(),
-                                                                     config.getVerticalRes(), noisePropertiesPropertyKey,
-                                                                     paletteInfoPropertyKey));
-                    event.getPack()
-                         .applyLoader(SlantLayer.class, SlantLayer::new);
-                })
-                .failThrough();
-        
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigurationLoadEvent.class)
-                .then(event -> {
-                    if(event.is(Biome.class)) {
-                        event.getLoadedObject(Biome.class).getContext().put(paletteInfoPropertyKey,
-                                                                            event.load(new BiomePaletteTemplate(platform)).get());
-                        event.getLoadedObject(Biome.class).getContext().put(noisePropertiesPropertyKey,
-                                                                            event.load(new BiomeNoiseConfigTemplate()).get());
-                    }
-                })
-                .failThrough();
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((handler, base, platform) -> Init.ofPure(Construct.construct(() -> {
+                                                          handler.register(base, ConfigPackPreLoadEvent.class)
+                                                                 .priority(1000)
+                                                                 .then(event -> {
+                                                                     NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
+    
+                                                                     event.getPack()
+                                                                          .createRegistry(ChunkGeneratorProvider.class)
+                                                                          .register(base.key("NOISE_3D"),
+                                                                                    pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
+                                                                                                                      config.getHorizontalRes(),
+                                                                                                                      config.getVerticalRes(), noisePropertiesPropertyKey,
+                                                                                                                      paletteInfoPropertyKey));
+                                                                     event.getPack()
+                                                                          .applyLoader(SlantLayer.class, SlantLayer::new);
+                                                                 })
+                                                                 .failThrough();
+                return handler.register(base, ConfigurationLoadEvent.class)
+                              .then(event -> {
+                                  if(event.is(Biome.class)) {
+                                      event.getLoadedObject(Biome.class).getContext().put(paletteInfoPropertyKey,
+                                                                                          event.load(new BiomePaletteTemplate(platform)).get());
+                                      event.getLoadedObject(Biome.class).getContext().put(noisePropertiesPropertyKey,
+                                                                                          event.load(new BiomeNoiseConfigTemplate()).get());
+                                  }
+                              })
+                              .failThrough();
+                }))));
+
     }
 }

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

@@ -75,15 +75,15 @@ public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
         }
         
         TreeMap<Double, PaletteHolder> slantLayers = new TreeMap<>();
-        double minThreshold = Double.MAX_VALUE;
+        double maxThreshold = Double.MIN_VALUE;
         
         for(SlantLayer layer : slant) {
             double threshold = layer.getThreshold();
-            if(threshold < minThreshold) minThreshold = threshold;
+            if(threshold > maxThreshold) maxThreshold = threshold;
             slantLayers.put(threshold, layer.getPalette());
         }
         
-        return new PaletteInfo(builder.build(), SlantHolder.of(slantLayers, minThreshold), oceanPalette, seaLevel, slantDepth,
+        return new PaletteInfo(builder.build(), SlantHolder.of(slantLayers, maxThreshold), oceanPalette, seaLevel, slantDepth,
                                updatePalette);
     }
 }

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

@@ -19,7 +19,6 @@ import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.util.Column;
 import com.dfsek.terra.api.world.biome.Biome;

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

@@ -10,6 +10,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 
@@ -22,25 +23,32 @@ public final class PaletteUtil {
     public static Palette getPalette(int x, int y, int z, Sampler3D sampler, PaletteInfo paletteInfo, int depth) {
         SlantHolder slant = paletteInfo.slantHolder();
         if(!slant.isEmpty() && depth <= paletteInfo.maxSlantDepth()) {
-            double slope = derivative(sampler, x, y, z);
-            if(slope > slant.getMinSlope()) {
-                return slant.getPalette(slope).getPalette(y);
+            double dot = surfaceNormalDotProduct(sampler, x, y, z);
+            if(dot <= slant.getMaxSlant()) {
+                return slant.getPalette(dot).getPalette(y);
             }
         }
         
         return paletteInfo.paletteHolder().getPalette(y);
     }
     
-    public static double derivative(Sampler3D sampler, double x, double y, double z) {
-        double baseSample = sampler.sample(x, y, z);
-        
-        double xVal1 = (sampler.sample(x + DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double xVal2 = (sampler.sample(x - DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
-        double zVal1 = (sampler.sample(x, y, z + DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double zVal2 = (sampler.sample(x, y, z - DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
-        double yVal1 = (sampler.sample(x, y + DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        double yVal2 = (sampler.sample(x, y - DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
-        
-        return Math.sqrt(((xVal2 - xVal1) * (xVal2 - xVal1)) + ((zVal2 - zVal1) * (zVal2 - zVal1)) + ((yVal2 - yVal1) * (yVal2 - yVal1)));
+    private static final Vector3[] samplePoints = {
+            Vector3.of(0, 0, -DERIVATIVE_DIST),
+            Vector3.of(0, 0, DERIVATIVE_DIST),
+            Vector3.of(0, -DERIVATIVE_DIST, 0),
+            Vector3.of(0, DERIVATIVE_DIST, 0),
+            Vector3.of(-DERIVATIVE_DIST, 0, 0),
+            Vector3.of(DERIVATIVE_DIST, 0, 0),
+    };
+    
+    private static final Vector3 direction = Vector3.of(0, 1, 0);
+    
+    public static double surfaceNormalDotProduct(Sampler3D sampler, double x, double y, double z) {
+        Vector3.Mutable surfaceNormalApproximation = Vector3.Mutable.of(0, 0, 0);
+        for(Vector3 point : samplePoints) {
+            double scalar = -sampler.sample(x+point.getX(), y+point.getY(), z+point.getZ());
+            surfaceNormalApproximation.add(point.mutable().multiply(scalar));
+        }
+        return direction.dot(surfaceNormalApproximation.normalize());
     }
 }

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

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

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

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

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

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

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

@@ -14,39 +14,39 @@ import java.util.TreeMap;
 
 public class SlantHolder {
     private final TreeMap<Double, PaletteHolder> layers;
-    private final double minSlope;
+    private final double maxSlant;
     
-    private SlantHolder(TreeMap<Double, PaletteHolder> layers, double minSlope) {
+    private SlantHolder(TreeMap<Double, PaletteHolder> layers, double maxSlant) {
         this.layers = layers;
-        this.minSlope = minSlope;
+        this.maxSlant = maxSlant;
     }
     
-    public static SlantHolder of(TreeMap<Double, PaletteHolder> layers, double minSlope) {
+    public static SlantHolder of(TreeMap<Double, PaletteHolder> layers, double maxSlant) {
         if(layers.size() == 1) {
             Entry<Double, PaletteHolder> firstEntry = layers.firstEntry();
-            return new Single(firstEntry.getValue(), minSlope);
+            return new Single(firstEntry.getValue(), maxSlant);
         }
-        return new SlantHolder(layers, minSlope);
+        return new SlantHolder(layers, maxSlant);
     }
     
     public boolean isEmpty() {
         return layers.isEmpty();
     }
     
-    public PaletteHolder getPalette(double slope) {
-        return layers.floorEntry(slope).getValue();
+    public PaletteHolder getPalette(double slant) {
+        return layers.ceilingEntry(slant).getValue();
     }
     
-    public double getMinSlope() {
-        return minSlope;
+    public double getMaxSlant() {
+        return maxSlant;
     }
     
     private static final class Single extends SlantHolder {
         
         private final PaletteHolder layers;
         
-        public Single(PaletteHolder layers, double minSlope) {
-            super(of(minSlope, layers), minSlope);
+        public Single(PaletteHolder layers, double maxSlant) {
+            super(of(maxSlant, layers), maxSlant);
             this.layers = layers;
         }
         
@@ -57,7 +57,7 @@ public class SlantHolder {
         }
         
         @Override
-        public PaletteHolder getPalette(double slope) {
+        public PaletteHolder getPalette(double slant) {
             return layers;
         }
     }

common/addons/command-addons/src/main/java/com/dfsek/terra/addons/commands/addons/AddonsCommandAddon.java

@@ -3,67 +3,75 @@ package com.dfsek.terra.addons.commands.addons;
 import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.CommandManager;
 
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
-import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.command.arguments.RegistryArgument;
 import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 
 
-public class AddonsCommandAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
-    
+public class AddonsCommandAddon implements MonadAddonInitializer {
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, CommandRegistrationEvent.class)
-                .then(event -> {
-                    CommandManager<CommandSender> manager = event.getCommandManager();
-            
-                    manager.command(
-                                   manager.commandBuilder("addons", ArgumentDescription.of("List installed Terra addons"))
-                                          .permission("terra.addons")
-                                          .handler(context -> {
-                                              StringBuilder addons = new StringBuilder("Installed addons:\n");
-                                              platform.getAddons()
-                                                      .forEach(addon -> addons
-                                                              .append(" - ")
-                                                              .append(addon.getID())
-                                                              .append('@')
-                                                              .append(addon.getVersion().getFormatted())
-                                                              .append('\n'));
-                                              context.getSender().sendMessage(addons.toString());
-                                          })
-                                   )
-                           .command(
-                                   manager.commandBuilder("addons")
-                                          .argument(RegistryArgument.of("addon", platform.getAddons()))
-                                          .permission("terra.addons.info")
-                                          .handler(context -> {
-                                              BaseAddon addon = context.get("addon");
-                                              StringBuilder addonInfo = new StringBuilder("Addon ").append(addon.getID()).append('\n');
-                        
-                                              addonInfo.append("Version: ").append(addon.getVersion().getFormatted()).append('\n');
-                        
-                                              addonInfo.append("Dependencies:\n");
-                                              addon.getDependencies().forEach((id, versions) -> addonInfo
-                                                      .append(" - ")
-                                                      .append(id)
-                                                      .append('@')
-                                                      .append(versions.getFormatted())
-                                                      .append('\n'));
-                                              context.getSender().sendMessage(addonInfo.toString());
-                                          })
-                                   );
-                });
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.unit() /* Init.ofPure(
+                        functionalEventHandler
+                                .register(base, CommandRegistrationEvent.class)
+                                .then(event -> {
+                                    CommandManager<CommandSender> manager = event.getCommandManager();
+                                    
+                                    manager.command(
+                                                   manager.commandBuilder("addons", ArgumentDescription.of(
+                                                                  "List installed Terra addons"))
+                                                          .permission("terra.addons")
+                                                          .handler(context -> {
+                                                              StringBuilder addons = new StringBuilder(
+                                                                      "Installed addons:\n");
+                                                              platform.addons()
+                                                                      .forEach(addon -> addons
+                                                                              .append(" - ")
+                                                                              .append(addon.getID())
+                                                                              .append('@')
+                                                                              .append(addon.getVersion().getFormatted())
+                                                                              .append('\n'));
+                                                              context.getSender().sendMessage(addons.toString());
+                                                          })
+                                                   )
+                                           .command(
+                                                   manager.commandBuilder("addons")
+                                                          .argument(
+                                                                  RegistryArgument.of("addon", platform.addons()))
+                                                          .permission("terra.addons.info")
+                                                          .handler(context -> {
+                                                              BaseAddon addon = context.get("addon");
+                                                              StringBuilder addonInfo = new StringBuilder(
+                                                                      "Addon ").append(addon.getID()).append('\n');
+                                                
+                                                              addonInfo.append("Version: ").append(
+                                                                      addon.getVersion().getFormatted()).append('\n');
+                                                
+                                                              addonInfo.append("Dependencies:\n");
+                                                              addon.getDependencies().forEach(
+                                                                      (id, versions) -> addonInfo
+                                                                              .append(" - ")
+                                                                              .append(id)
+                                                                              .append('@')
+                                                                              .append(versions.getFormatted())
+                                                                              .append('\n'));
+                                                              context.getSender().sendMessage(addonInfo.toString());
+                                                          })
+                                                   );
+                                }))*/)
+                      );
     }
 }

common/addons/command-packs/src/main/java/com/dfsek/terra/addons/commands/packs/PacksCommandAddon.java

@@ -2,87 +2,87 @@ package com.dfsek.terra.addons.commands.packs;
 
 import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.CommandManager;
+
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
+import com.dfsek.terra.api.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.command.CommandSender;
 import com.dfsek.terra.api.command.arguments.RegistryArgument;
-import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 
 
-public class PacksCommandAddon implements AddonInitializer {
+public class PacksCommandAddon implements MonadAddonInitializer {
     private static final Logger logger = LoggerFactory.getLogger(PacksCommandAddon.class);
     
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
-    
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, CommandRegistrationEvent.class)
-                .then(event -> {
-                    CommandManager<CommandSender> manager = event.getCommandManager();
-            
-                    manager.command(
-                                   manager.commandBuilder("packs", ArgumentDescription.of("List installed config packs"))
-                                          .permission("terra.packs")
-                                          .handler(context -> {
-                                              StringBuilder packs = new StringBuilder("Installed packs:\n");
-                                              platform.getConfigRegistry().forEach(pack -> packs.append(" - ")
-                                                                                                .append(pack.getID())
-                                                                                                .append('@')
-                                                                                                .append(pack.getVersion().getFormatted()));
-                                              context.getSender().sendMessage(packs.toString());
-                                          })
-                                   )
-                           .command(
-                                   manager.commandBuilder("packs")
-                                          .literal("info", ArgumentDescription.of("Get information about a pack"))
-                                          .permission("terra.packs.info")
-                                          .argument(RegistryArgument.of("pack", platform.getConfigRegistry()))
-                                          .handler(context -> {
-                                              ConfigPack pack = context.get("pack");
-                                              StringBuilder packInfo = new StringBuilder("Pack ").append(pack.getID()).append('\n');
-                        
-                                              packInfo.append("Version: ").append(pack.getVersion().getFormatted()).append('\n');
-                                              packInfo.append("Author: ").append(pack.getAuthor()).append('\n');
-                        
-                                              packInfo.append("Addon Dependencies:\n");
-                                              pack.addons().forEach((id, versions) -> packInfo
-                                                      .append(" - ")
-                                                      .append(id.getID())
-                                                      .append('@')
-                                                      .append(versions.getFormatted())
-                                                      .append('\n'));
-                                              context.getSender().sendMessage(packInfo.toString());
-                                          }))
-                           .command(
-                                   manager.commandBuilder("packs")
-                                          .literal("reload", ArgumentDescription.of("Reload config packs"))
-                                          .permission("terra.packs.reload")
-                                          .handler(context -> {
-                                              context.getSender().sendMessage("Reloading Terra...");
-                                              logger.info("Reloading Terra...");
-                                              if(platform.reload()) {
-                                                  logger.info("Terra reloaded successfully.");
-                                                  context.getSender().sendMessage("Terra reloaded successfully.");
-                                              } else {
-                                                  logger.error("Terra failed to reload.");
-                                                  context.getSender().sendMessage(
-                                                          "Terra failed to reload. See logs for more information.");
-                                              }
-                                          }));
-                });
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(
+                        functionalEventHandler.register(base, CommandRegistrationEvent.class)
+                                              .then(event -> {
+                                                  CommandManager<CommandSender> manager = event.getCommandManager();
+    
+                                                  manager.command(
+                                                                 manager.commandBuilder("packs", ArgumentDescription.of("List installed config packs"))
+                                                                        .permission("terra.packs")
+                                                                        .handler(context -> {
+                                                                            StringBuilder packs = new StringBuilder("Installed packs:\n");
+                                                                            platform.getConfigRegistry().forEach(pack -> packs.append(" - ")
+                                                                                                                              .append(pack.getID())
+                                                                                                                              .append('@')
+                                                                                                                              .append(pack.getVersion().getFormatted()));
+                                                                            context.getSender().sendMessage(packs.toString());
+                                                                        })
+                                                                 )
+                                                         .command(
+                                                                 manager.commandBuilder("packs")
+                                                                        .literal("info", ArgumentDescription.of("Get information about a pack"))
+                                                                        .permission("terra.packs.info")
+                                                                        .argument(RegistryArgument.of("pack", platform.getConfigRegistry()))
+                                                                        .handler(context -> {
+                                                                            ConfigPack pack = context.get("pack");
+                                                                            StringBuilder packInfo = new StringBuilder("Pack ").append(pack.getID()).append('\n');
+                
+                                                                            packInfo.append("Version: ").append(pack.getVersion().getFormatted()).append('\n');
+                                                                            packInfo.append("Author: ").append(pack.getAuthor()).append('\n');
+                
+                                                                            packInfo.append("Addon Dependencies:\n");
+                                                                            pack.addons().forEach((id, versions) -> packInfo
+                                                                                    .append(" - ")
+                                                                                    .append(id.getID())
+                                                                                    .append('@')
+                                                                                    .append(versions.getFormatted())
+                                                                                    .append('\n'));
+                                                                            context.getSender().sendMessage(packInfo.toString());
+                                                                        }))
+                                                         .command(
+                                                                 manager.commandBuilder("packs")
+                                                                        .literal("reload", ArgumentDescription.of("Reload config packs"))
+                                                                        .permission("terra.packs.reload")
+                                                                        .handler(context -> {
+                                                                            context.getSender().sendMessage("Reloading Terra...");
+                                                                            logger.info("Reloading Terra...");
+                                                                            if(platform.reload()) {
+                                                                                logger.info("Terra reloaded successfully.");
+                                                                                context.getSender().sendMessage("Terra reloaded successfully.");
+                                                                            } else {
+                                                                                logger.error("Terra failed to reload.");
+                                                                                context.getSender().sendMessage(
+                                                                                        "Terra failed to reload. See logs for more information.");
+                                                                            }
+                                                                        }));
+                                              })))
+                      );
     }
 }

common/addons/command-profiler/src/main/java/com/dfsek/terra/addons/commands/profiler/ProfilerCommandAddon.java

@@ -2,10 +2,19 @@ package com.dfsek.terra.addons.commands.profiler;
 
 import cloud.commandframework.ArgumentDescription;
 import cloud.commandframework.CommandManager;
+
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+
+import com.dfsek.terra.api.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.command.CommandSender;
@@ -14,61 +23,58 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
 
 
-public class ProfilerCommandAddon implements AddonInitializer {
+public class ProfilerCommandAddon implements MonadAddonInitializer {
     private static final Logger logger = LoggerFactory.getLogger(ProfilerCommandAddon.class);
     
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
-    
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, CommandRegistrationEvent.class)
-                .then(event -> {
-                    CommandManager<CommandSender> manager = event.getCommandManager();
-                    manager
-                            .command(
-                                    manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                                           .literal("start", ArgumentDescription.of("Start profiling"), "st")
-                                           .permission("terra.profiler.start")
-                                           .handler(context -> {
-                                               platform.getProfiler().start();
-                                               context.getSender().sendMessage("Profiling started.");
-                                           }))
-                            .command(
-                                    manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                                           .literal("stop", ArgumentDescription.of("Stop profiling"), "s")
-                                           .permission("terra.profiler.stop")
-                                           .handler(context -> {
-                                               platform.getProfiler().stop();
-                                               context.getSender().sendMessage("Profiling stopped.");
-                                           }))
-                            .command(
-                                    manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                                           .literal("query", ArgumentDescription.of("Query profiler results"), "q")
-                                           .permission("terra.profiler.query")
-                                           .handler(context -> {
-                                               StringBuilder data = new StringBuilder("Terra Profiler data: \n");
-                                               platform.getProfiler().getTimings().forEach((id, timings) -> data.append(id)
-                                                                                                                .append(": ")
-                                                                                                                .append(timings.toString())
-                                                                                                                .append('\n'));
-                                               logger.info(data.toString());
-                                               context.getSender().sendMessage("Profiling data dumped to console.");
-                                           }))
-                            .command(
-                                    manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
-                                           .literal("reset", ArgumentDescription.of("Reset the profiler"), "r")
-                                           .permission("terra.profiler.reset")
-                                           .handler(context -> {
-                                               platform.getProfiler().reset();
-                                               context.getSender().sendMessage("Profiler reset.");
-                                           }));
-                });
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((handler, base, platform) -> Init.ofPure(
+                        handler.register(base, CommandRegistrationEvent.class)
+                               .then(event -> {
+                                   CommandManager<CommandSender> manager = event.getCommandManager();
+                                   manager
+                                           .command(
+                                                   manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
+                                                          .literal("start", ArgumentDescription.of("Start profiling"), "st")
+                                                          .permission("terra.profiler.start")
+                                                          .handler(context -> {
+                                                              platform.getProfiler().start();
+                                                              context.getSender().sendMessage("Profiling started.");
+                                                          }))
+                                           .command(
+                                                   manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
+                                                          .literal("stop", ArgumentDescription.of("Stop profiling"), "s")
+                                                          .permission("terra.profiler.stop")
+                                                          .handler(context -> {
+                                                              platform.getProfiler().stop();
+                                                              context.getSender().sendMessage("Profiling stopped.");
+                                                          }))
+                                           .command(
+                                                   manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
+                                                          .literal("query", ArgumentDescription.of("Query profiler results"), "q")
+                                                          .permission("terra.profiler.query")
+                                                          .handler(context -> {
+                                                              StringBuilder data = new StringBuilder("Terra Profiler data: \n");
+                                                              platform.getProfiler().getTimings().forEach((id, timings) -> data.append(id)
+                                                                                                                               .append(": ")
+                                                                                                                               .append(timings.toString())
+                                                                                                                               .append('\n'));
+                                                              logger.info(data.toString());
+                                                              context.getSender().sendMessage("Profiling data dumped to console.");
+                                                          }))
+                                           .command(
+                                                   manager.commandBuilder("profiler", ArgumentDescription.of("Access the profiler"))
+                                                          .literal("reset", ArgumentDescription.of("Reset the profiler"), "r")
+                                                          .permission("terra.profiler.reset")
+                                                          .handler(context -> {
+                                                              platform.getProfiler().reset();
+                                                              context.getSender().sendMessage("Profiler reset.");
+                                                          }));
+                               })))
+                      );
     }
 }

common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java

@@ -6,62 +6,61 @@ import cloud.commandframework.arguments.standard.EnumArgument;
 import cloud.commandframework.arguments.standard.LongArgument;
 import cloud.commandframework.context.CommandContext;
 
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
-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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.command.arguments.RegistryArgument;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.Rotation;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import org.jetbrains.annotations.NotNull;
 
-public class StructureCommandAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+
+public class StructureCommandAddon implements MonadAddonInitializer {
     private static Registry<Structure> getStructureRegistry(CommandContext<CommandSender> sender) {
         return sender.getSender().getEntity().orElseThrow().world().getPack().getRegistry(Structure.class);
     }
     
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, CommandRegistrationEvent.class)
-                .then(event -> {
-                    CommandManager<CommandSender> manager = event.getCommandManager();
-            
-                    manager.command(
-                            manager.commandBuilder("structures", ArgumentDescription.of("Manage or generate structures"))
-                                   .literal("generate")
-                                   .argument(RegistryArgument.builder("structure",
-                                                                      StructureCommandAddon::getStructureRegistry,
-                                                                      TypeKey.of(Structure.class)))
-                                   .argument(LongArgument.optional("seed", 0))
-                                   .argument(EnumArgument.optional(Rotation.class, "rotation", Rotation.NONE))
-                                   .handler(context -> {
-                                       Structure structure = context.get("structure");
-                                       Entity sender = context.getSender().getEntity().orElseThrow();
-                                       structure.generate(
-                                               sender.position().toInt(),
-                                               sender.world(),
-                                               ((Long) context.get("seed") == 0) ? new Random() : new Random(context.get("seed")),
-                                               context.get("rotation")
-                                                         );
-                                   })
-                                   .permission("terra.structures.generate")
-                                   );
-                });
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((handler, base) -> Init.ofPure(
+                        handler.register(base, CommandRegistrationEvent.class)
+                               .then(event -> {
+                                   CommandManager<CommandSender> manager = event.getCommandManager();
+                            
+                                   manager.command(
+                                           manager.commandBuilder("structures", ArgumentDescription.of("Manage or generate structures"))
+                                                  .literal("generate")
+                                                  .argument(RegistryArgument.builder("structure",
+                                                                                     StructureCommandAddon::getStructureRegistry,
+                                                                                     TypeKey.of(Structure.class)))
+                                                  .argument(LongArgument.optional("seed", 0))
+                                                  .argument(EnumArgument.optional(Rotation.class, "rotation", Rotation.NONE))
+                                                  .handler(context -> {
+                                                      Structure structure = context.get("structure");
+                                                      Entity sender = context.getSender().getEntity().orElseThrow();
+                                                      structure.generate(
+                                                              sender.position().toInt(),
+                                                              sender.world(),
+                                                              context.get("rotation"));
+                                                  })
+                                                  .permission("terra.structures.generate")
+                                                  );
+                               })))
+                      );
     }
 }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java

@@ -9,30 +9,35 @@ package com.dfsek.terra.addons.biome;
 
 import com.dfsek.terra.addons.biome.holder.PaletteHolder;
 import com.dfsek.terra.addons.biome.holder.PaletteHolderLoader;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 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.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 
 
-public class BiomeAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+public class BiomeAddon implements MonadAddonInitializer {
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), addon.key("BIOME"), 1000);
-                    event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader());
-                })
-                .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  event.getPack().registerConfigType(new BiomeConfigType(event.getPack()),
+                                                                                     base.key("BIOME"), 1000);
+                                                  event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader());
+                                              })
+                                              .failThrough()
+                                                                        )));
     }
 }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java

@@ -8,9 +8,6 @@
 package com.dfsek.terra.addons.biome;
 
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java

@@ -8,8 +8,6 @@
 package com.dfsek.terra.addons.biome;
 
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
@@ -22,6 +20,6 @@ public class BiomeFactory implements ConfigFactory<BiomeTemplate, Biome> {
     
     @Override
     public Biome build(BiomeTemplate template, Platform platform) {
-        return new UserDefinedBiome(template.getVanilla(), template);
+        return new UserDefinedBiome(template);
     }
 }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java

@@ -19,9 +19,7 @@ import java.util.Set;
 
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.AbstractableTemplate;
-import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.biome.PlatformBiome;
 
 
 @SuppressWarnings({ "FieldMayBeFinal", "unused" })
@@ -37,13 +35,11 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
     @Default
     private List<String> extended = Collections.emptyList();
     
-    @Value("vanilla")
-    private @Meta PlatformBiome vanilla;
-    
     @Value("color")
     @Final
     @Default
     private @Meta int color = 0;
+    
     @Value("tags")
     @Default
     private @Meta Set<@Meta String> tags = new HashSet<>();
@@ -77,8 +73,4 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
     public String getID() {
         return id;
     }
-    
-    public PlatformBiome getVanilla() {
-        return vanilla;
-    }
 }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.biome;
 
+import java.util.Optional;
 import java.util.Set;
 
 import com.dfsek.terra.api.properties.Context;
@@ -18,16 +19,14 @@ import com.dfsek.terra.api.world.biome.PlatformBiome;
  * Class representing a config-defined biome
  */
 public class UserDefinedBiome implements Biome {
-    private final PlatformBiome vanilla;
     private final String id;
     private final BiomeTemplate config;
     private final int color;
     private final Set<String> tags;
-    
     private final Context context = new Context();
+    private PlatformBiome platformBiome;
     
-    public UserDefinedBiome(PlatformBiome vanilla, BiomeTemplate config) {
-        this.vanilla = vanilla;
+    public UserDefinedBiome(BiomeTemplate config) {
         this.id = config.getID();
         this.config = config;
         this.color = config.getColor();
@@ -41,14 +40,18 @@ public class UserDefinedBiome implements Biome {
         return "{BIOME:" + getID() + "}";
     }
     
-    /**
-     * Gets the Vanilla biomes to represent the custom biome.
-     *
-     * @return Collection of biomes to represent the custom biome.
-     */
     @Override
-    public PlatformBiome getPlatformBiome() {
-        return vanilla;
+    public Optional<PlatformBiome> getPlatformBiome() {
+        return Optional.ofNullable(platformBiome);
+    }
+    
+    @Override
+    public void setPlatformBiome(PlatformBiome biome) {
+        if(platformBiome != null) {
+            throw new IllegalStateException("Platform biome already set");
+        }
+
+        this.platformBiome = biome;
     }
     
     @Override

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

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

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

@@ -14,55 +14,54 @@ import java.util.function.Supplier;
 import com.dfsek.terra.addons.feature.distributor.config.AndDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.NoDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.OrDistributorTemplate;
-import com.dfsek.terra.addons.feature.distributor.config.PaddedGridDistributorTemplate;
+import com.dfsek.terra.addons.feature.distributor.config.PaddedGridSamplerDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.PointSetDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.SamplerDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.XorDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.config.YesDistributorTemplate;
 import com.dfsek.terra.addons.feature.distributor.util.Point;
 import com.dfsek.terra.addons.feature.distributor.util.PointTemplate;
-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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.structure.feature.Distributor;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
 
-public class DistributorAddon implements AddonInitializer {
+public class DistributorAddon implements MonadAddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<Distributor>>> DISTRIBUTOR_TOKEN = new TypeKey<>() {
     };
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
     
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Distributor>>> distributorRegistry = event
-                            .getPack()
-                            .getOrCreateRegistry(DISTRIBUTOR_TOKEN);
-            
-                    distributorRegistry.register(addon.key("SAMPLER"), SamplerDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("POINTS"), PointSetDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("PADDED_GRID"), PaddedGridDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("AND"), AndDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("OR"), OrDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("XOR"), XorDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("YES"), YesDistributorTemplate::new);
-                    distributorRegistry.register(addon.key("NO"), NoDistributorTemplate::new);
-            
-                    event.getPack()
-                         .applyLoader(Point.class, PointTemplate::new);
-                })
-                .failThrough();
+    public Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((functionalEventHandler, base) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  CheckedRegistry<Supplier<ObjectTemplate<Distributor>>> distributorRegistry = event
+                                                          .getPack()
+                                                          .getOrCreateRegistry(DISTRIBUTOR_TOKEN);
+                            
+                                                  distributorRegistry.register(base.key("SAMPLER"), SamplerDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("POINTS"), PointSetDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("PADDED_GRID_SAMPLER"), PaddedGridSamplerDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("AND"), AndDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("OR"), OrDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("XOR"), XorDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("YES"), YesDistributorTemplate::new);
+                                                  distributorRegistry.register(base.key("NO"), NoDistributorTemplate::new);
+                            
+                                                  event.getPack()
+                                                       .applyLoader(Point.class, PointTemplate::new);
+                                              })
+                                              .failThrough()
+                                                                        )));
     }
 }

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

@@ -3,23 +3,24 @@ package com.dfsek.terra.addons.feature.distributor.config;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.feature.distributor.distributors.PaddedGridDistributor;
+import com.dfsek.terra.addons.feature.distributor.distributors.PaddedGridSamplerDistributor;
 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.structure.feature.Distributor;
 
 
-public class PaddedGridDistributorTemplate implements ObjectTemplate<Distributor> {
+public class PaddedGridSamplerDistributorTemplate implements ObjectTemplate<Distributor> {
     @Value("width")
     private @Meta int width;
     
     @Value("padding")
     private @Meta int padding;
     
-    @Value("salt")
-    private @Meta int salt;
+    @Value("sampler")
+    private @Meta NoiseSampler noise;
     
     @Override
     public Distributor get() {
-        return new PaddedGridDistributor(width, padding, salt);
+        return new PaddedGridSamplerDistributor(noise, width, padding);
     }
 }

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

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

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

@@ -0,0 +1,36 @@
+package com.dfsek.terra.addons.feature.distributor.distributors;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+import net.jafama.FastMath;
+
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
+
+import com.dfsek.terra.api.structure.feature.Distributor;
+import com.dfsek.terra.api.util.MathUtil;
+
+
+public class PaddedGridSamplerDistributor implements Distributor {
+    private final NoiseSampler sampler;
+    private final int width;
+    
+    private final int cellWidth;
+    
+    public PaddedGridSamplerDistributor(NoiseSampler sampler, int width, int padding) {
+        this.sampler = sampler;
+        this.width = width;
+        this.cellWidth = width + padding;
+    }
+    
+    @Override
+    public boolean matches(int x, int z, long seed) {
+        int cellX = FastMath.floorDiv(x, cellWidth);
+        int cellZ = FastMath.floorDiv(z, cellWidth);
+        
+        int pointX = (int) (FastMath.round(MathUtil.lerp(MathUtil.inverseLerp(sampler.noise(x, z, seed), -1, 1), 0, width)) + cellX * cellWidth);
+        int pointZ = (int) (FastMath.round(MathUtil.lerp(MathUtil.inverseLerp(sampler.noise(x, z, seed + 1), -1, 1), 0, width)) + cellZ * cellWidth);
+        
+        return x == pointX && z == pointZ;
+    }
+}

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java

@@ -7,27 +7,32 @@
 
 package com.dfsek.terra.addons.feature;
 
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 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.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 
 
-public class FeatureAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+public class FeatureAddon implements MonadAddonInitializer {
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), addon.key("FEATURE"), 500))
-                .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((functionalEventHandler, base) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> event.getPack()
+                                                                  .registerConfigType(new FeatureConfigType(), base.key("FEATURE"), 500))
+                                              .failThrough()))
+                      );
+        
     }
 }

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java

@@ -8,9 +8,6 @@
 package com.dfsek.terra.addons.feature;
 
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.structure.feature.Feature;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java

@@ -10,7 +10,6 @@ package com.dfsek.terra.addons.feature;
 import com.dfsek.tectonic.api.exception.LoadException;
 
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.structure.feature.Feature;
 
 

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

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

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

@@ -9,30 +9,33 @@ package com.dfsek.terra.addons.flora;
 
 import com.dfsek.terra.addons.flora.config.BlockLayerTemplate;
 import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 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.util.function.monad.Monad;
+
+import org.jetbrains.annotations.NotNull;
 
 
-public class FloraAddon implements AddonInitializer {
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+public class FloraAddon implements MonadAddonInitializer {
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    event.getPack().registerConfigType(new FloraConfigType(), addon.key("FLORA"), 2);
-                    event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new);
-                })
-                .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                ((functionalEventHandler, base) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  event.getPack().registerConfigType(new FloraConfigType(), base.key("FLORA"), 2);
+                                                  event.getPack().applyLoader(BlockLayer.class, BlockLayerTemplate::new);
+                                              })
+                                              .failThrough()))
+                      );
     }
 }

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

@@ -8,9 +8,6 @@
 package com.dfsek.terra.addons.flora;
 
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 

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

@@ -9,7 +9,6 @@ package com.dfsek.terra.addons.flora;
 
 import com.dfsek.terra.addons.flora.flora.gen.TerraFlora;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.structure.Structure;
 
 

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

@@ -12,7 +12,8 @@ import net.jafama.FastMath;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.properties.enums.Direction;
@@ -73,7 +74,7 @@ public class TerraFlora implements Structure {
     }
     
     @Override
-    public boolean generate(Vector3Int location, WritableWorld world, Random random, Rotation rotation) {
+    public boolean generate(Vector3Int location, WritableWorld world, Rotation rotation) {
         boolean doRotation = testRotation.size() > 0;
         int size = layers.size();
         int c = ceiling ? -1 : 1;
@@ -86,10 +87,7 @@ public class TerraFlora implements Structure {
             int lvl = (FastMath.abs(i));
             BlockState data = getStateCollection((ceiling ? lvl : size - lvl - 1)).get(distribution, location.getX(), location.getY(),
                                                                                        location.getZ(), world.getSeed());
-            if(doRotation) {
-                Direction oneFace = new ArrayList<>(faces).get(
-                        new Random(location.getX() ^ location.getZ()).nextInt(faces.size())); // Get random face.
-            }
+            
             world.setBlockState(location.mutable().add(0, i + c, 0).immutable(), data, physics);
         }
         return true;

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

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

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

@@ -13,10 +13,8 @@ import java.util.function.Supplier;
 
 import com.dfsek.terra.addons.feature.locator.config.AdjacentPatternLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.AndLocatorTemplate;
-import com.dfsek.terra.addons.feature.locator.config.GaussianRandomLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.OrLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.PatternLocatorTemplate;
-import com.dfsek.terra.addons.feature.locator.config.RandomLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.Sampler3DLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.SamplerLocatorTemplate;
 import com.dfsek.terra.addons.feature.locator.config.SurfaceLocatorTemplate;
@@ -31,64 +29,62 @@ import com.dfsek.terra.addons.feature.locator.config.pattern.SingleBlockMatchPat
 import com.dfsek.terra.addons.feature.locator.config.pattern.SolidMatchPatternTemplate;
 import com.dfsek.terra.addons.feature.locator.config.pattern.XorPatternTemplate;
 import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
-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.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.structure.feature.Locator;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
 
-public class LocatorAddon implements AddonInitializer {
+public class LocatorAddon implements MonadAddonInitializer {
     
     public static final TypeKey<Supplier<ObjectTemplate<Locator>>> LOCATOR_TOKEN = new TypeKey<>() {
     };
     public static final TypeKey<Supplier<ObjectTemplate<Pattern>>> PATTERN_TOKEN = new TypeKey<>() {
     };
-    @Inject
-    private Platform platform;
-    
-    @Inject
-    private BaseAddon addon;
-    
+
     @Override
-    public void initialize() {
-        platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
-                    locatorRegistry.register(addon.key("SURFACE"), SurfaceLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("TOP"), TopLocatorTemplate::new);
-            
-                    locatorRegistry.register(addon.key("RANDOM"), RandomLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("GAUSSIAN_RANDOM"), GaussianRandomLocatorTemplate::new);
-            
-                    locatorRegistry.register(addon.key("PATTERN"), PatternLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("ADJACENT_PATTERN"), AdjacentPatternLocatorTemplate::new);
-            
-                    locatorRegistry.register(addon.key("SAMPLER"), SamplerLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("SAMPLER_3D"), Sampler3DLocatorTemplate::new);
-            
-                    locatorRegistry.register(addon.key("AND"), AndLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("OR"), OrLocatorTemplate::new);
-                    locatorRegistry.register(addon.key("XOR"), XorLocatorTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Pattern>>> patternRegistry = event.getPack().getOrCreateRegistry(PATTERN_TOKEN);
-                    patternRegistry.register(addon.key("MATCH_AIR"), AirMatchPatternTemplate::new);
-                    patternRegistry.register(addon.key("MATCH_SOLID"), SolidMatchPatternTemplate::new);
-                    patternRegistry.register(addon.key("MATCH"), SingleBlockMatchPatternTemplate::new);
-                    patternRegistry.register(addon.key("MATCH_SET"), BlockSetMatchPatternTemplate::new);
-            
-                    patternRegistry.register(addon.key("AND"), AndPatternTemplate::new);
-                    patternRegistry.register(addon.key("OR"), OrPatternTemplate::new);
-                    patternRegistry.register(addon.key("XOR"), XorPatternTemplate::new);
-                    patternRegistry.register(addon.key("NOT"), NotPatternTemplate::new);
-                })
-                .failThrough();
+    public Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  CheckedRegistry<Supplier<ObjectTemplate<Locator>>> locatorRegistry = event.getPack().getOrCreateRegistry(LOCATOR_TOKEN);
+                                                  locatorRegistry.register(base.key("SURFACE"), SurfaceLocatorTemplate::new);
+                                                  locatorRegistry.register(base.key("TOP"), TopLocatorTemplate::new);
+    
+                                                  locatorRegistry.register(base.key("PATTERN"), PatternLocatorTemplate::new);
+                                                  locatorRegistry.register(base.key("ADJACENT_PATTERN"), AdjacentPatternLocatorTemplate::new);
+    
+                                                  locatorRegistry.register(base.key("SAMPLER"), SamplerLocatorTemplate::new);
+                                                  locatorRegistry.register(base.key("SAMPLER_3D"), Sampler3DLocatorTemplate::new);
+    
+                                                  locatorRegistry.register(base.key("AND"), AndLocatorTemplate::new);
+                                                  locatorRegistry.register(base.key("OR"), OrLocatorTemplate::new);
+                                                  locatorRegistry.register(base.key("XOR"), XorLocatorTemplate::new);
+                                              })
+                                              .then(event -> {
+                                                  CheckedRegistry<Supplier<ObjectTemplate<Pattern>>> patternRegistry = event.getPack().getOrCreateRegistry(PATTERN_TOKEN);
+                                                  patternRegistry.register(base.key("MATCH_AIR"), AirMatchPatternTemplate::new);
+                                                  patternRegistry.register(base.key("MATCH_SOLID"), SolidMatchPatternTemplate::new);
+                                                  patternRegistry.register(base.key("MATCH"), SingleBlockMatchPatternTemplate::new);
+                                                  patternRegistry.register(base.key("MATCH_SET"), BlockSetMatchPatternTemplate::new);
+    
+                                                  patternRegistry.register(base.key("AND"), AndPatternTemplate::new);
+                                                  patternRegistry.register(base.key("OR"), OrPatternTemplate::new);
+                                                  patternRegistry.register(base.key("XOR"), XorPatternTemplate::new);
+                                                  patternRegistry.register(base.key("NOT"), NotPatternTemplate::new);
+                                              })
+                                              .failThrough()))
+                      );
+    
     }
 }

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

@@ -1,39 +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.feature.locator.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.addons.feature.locator.locators.GaussianRandomLocator;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.Range;
-
-
-@SuppressWarnings("FieldMayBeFinal")
-public class GaussianRandomLocatorTemplate implements ObjectTemplate<Locator> {
-    @Value("height")
-    private @Meta Range height;
-    
-    @Value("amount")
-    private @Meta Range amount;
-    
-    @Value("standard-deviation")
-    private @Meta double standardDeviation;
-    
-    @Value("salt")
-    @Default
-    private @Meta int salt = 0;
-    
-    @Override
-    public Locator get() {
-        return new GaussianRandomLocator(height, amount, standardDeviation, salt);
-    }
-}

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

@@ -1,36 +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.feature.locator.config;
-
-import com.dfsek.tectonic.api.config.template.annotations.Default;
-import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-
-import com.dfsek.terra.addons.feature.locator.locators.RandomLocator;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.Range;
-
-
-@SuppressWarnings("FieldMayBeFinal")
-public class RandomLocatorTemplate implements ObjectTemplate<Locator> {
-    @Value("height")
-    private @Meta Range height;
-    
-    @Value("amount")
-    private @Meta Range amount;
-    
-    @Value("salt")
-    @Default
-    private @Meta int salt = 0;
-    
-    @Override
-    public Locator get() {
-        return new RandomLocator(height, amount, salt);
-    }
-}

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

@@ -1,57 +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.feature.locator.locators;
-
-import java.util.Random;
-
-import com.dfsek.terra.api.structure.feature.BinaryColumn;
-import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.chunk.generation.util.Column;
-import com.dfsek.terra.api.world.chunk.generation.util.Column.BinaryColumnBuilder;
-
-
-public class GaussianRandomLocator implements Locator {
-    private final double mean;
-    
-    private final Range points;
-    
-    private final double standardDeviation;
-    
-    private final int salt;
-    
-    
-    public GaussianRandomLocator(Range height, Range points, double standardDeviation, int salt) {
-        this.mean = (height.getMax() + height.getMin()) / 2.0;
-        this.points = points;
-        this.standardDeviation = standardDeviation;
-        this.salt = salt;
-    }
-    
-    @Override
-    public BinaryColumn getSuitableCoordinates(Column<?> column) {
-        long seed = column.getWorld().getSeed();
-        seed = 31 * seed + column.getX();
-        seed = 31 * seed + column.getZ();
-        seed += salt;
-        
-        Random r = new Random(seed);
-        
-        int size = points.get(r);
-        
-        
-        BinaryColumnBuilder results = column.newBinaryColumn();
-        for(int i = 0; i < size; i++) {
-            int h = (int) r.nextGaussian(mean, standardDeviation);
-            if(h >= column.getMaxY() || h < column.getMinY()) continue;
-            results.set(h);
-        }
-        
-        return results.build();
-    }
-}

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

@@ -1,52 +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.feature.locator.locators;
-
-import java.util.Random;
-
-import com.dfsek.terra.api.structure.feature.BinaryColumn;
-import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.Range;
-import com.dfsek.terra.api.world.chunk.generation.util.Column;
-import com.dfsek.terra.api.world.chunk.generation.util.Column.BinaryColumnBuilder;
-
-
-public class RandomLocator implements Locator {
-    private final Range height;
-    
-    private final Range points;
-    
-    private final int salt;
-    
-    public RandomLocator(Range height, Range points, int salt) {
-        this.height = height;
-        this.points = points;
-        this.salt = salt;
-    }
-    
-    @Override
-    public BinaryColumn getSuitableCoordinates(Column<?> column) {
-        long seed = column.getWorld().getSeed();
-        seed = 31 * seed + column.getX();
-        seed = 31 * seed + column.getZ();
-        seed += salt;
-        
-        Random r = new Random(seed);
-        
-        int size = points.get(r);
-        
-        BinaryColumnBuilder results = column.newBinaryColumn();
-        for(int i = 0; i < size; i++) {
-            int h = height.get(r);
-            if(h >= column.getMaxY() || h < column.getMinY()) continue;
-            results.set(h);
-        }
-        
-        return results.build();
-    }
-}

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

@@ -4,13 +4,4 @@ version = version("1.0.0")
 
 dependencies {
     compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.noise.lib.paralithic")
-    relocate("net.jafama", "com.dfsek.terra.addons.noise.lib.jafama")
 }

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

@@ -13,7 +13,10 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.addons.manifest.api.MonadAddonInitializer;
+import com.dfsek.terra.addons.manifest.api.monad.Do;
+import com.dfsek.terra.addons.manifest.api.monad.Get;
+import com.dfsek.terra.addons.manifest.api.monad.Init;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
 import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
 import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
@@ -30,6 +33,7 @@ import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotio
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearMapNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
@@ -51,97 +55,98 @@ import com.dfsek.terra.addons.noise.samplers.noise.simplex.PerlinSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.simplex.SimplexSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.value.ValueCubicSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.value.ValueSampler;
-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.noise.NoiseSampler;
-import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.function.monad.Monad;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
+import org.jetbrains.annotations.NotNull;
 
-public class NoiseAddon implements AddonInitializer {
+
+public class NoiseAddon implements MonadAddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {
     };
-    @Inject
-    private Platform plugin;
-    
-    @Inject
-    private BaseAddon addon;
     
     @Override
-    public void initialize() {
-        plugin.getEventManager()
-              .getHandler(FunctionalEventHandler.class)
-              .register(addon, ConfigPackPreLoadEvent.class)
-              .then(event -> {
-                  CheckedRegistry<Supplier<ObjectTemplate<NoiseSampler>>> noiseRegistry = event.getPack().getOrCreateRegistry(
-                          NOISE_SAMPLER_TOKEN);
-                  event.getPack()
-                       .applyLoader(CellularSampler.DistanceFunction.class,
-                                    (type, o, loader, depthTracker) -> CellularSampler.DistanceFunction.valueOf((String) o))
-                       .applyLoader(CellularSampler.ReturnType.class,
-                                    (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o))
-                       .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new)
-                       .applyLoader(FunctionTemplate.class, FunctionTemplate::new);
-            
-                  noiseRegistry.register(addon.key("LINEAR"), LinearNormalizerTemplate::new);
-                  noiseRegistry.register(addon.key("NORMAL"), NormalNormalizerTemplate::new);
-                  noiseRegistry.register(addon.key("CLAMP"), ClampNormalizerTemplate::new);
-                  noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new);
-                  noiseRegistry.register(addon.key("SCALE"), ScaleNormalizerTemplate::new);
-                  noiseRegistry.register(addon.key("POSTERIZATION"), PosterizationNormalizerTemplate::new);
-            
-                  noiseRegistry.register(addon.key("IMAGE"), ImageSamplerTemplate::new);
-            
-                  noiseRegistry.register(addon.key("DOMAIN_WARP"), DomainWarpTemplate::new);
-            
-                  noiseRegistry.register(addon.key("FBM"), BrownianMotionTemplate::new);
-                  noiseRegistry.register(addon.key("PING_PONG"), PingPongTemplate::new);
-                  noiseRegistry.register(addon.key("RIDGED"), RidgedFractalTemplate::new);
-            
-                  noiseRegistry.register(addon.key("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new));
-                  noiseRegistry.register(addon.key("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new));
-                  noiseRegistry.register(addon.key("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new));
-                  noiseRegistry.register(addon.key("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new));
-                  noiseRegistry.register(addon.key("GABOR"), GaborNoiseTemplate::new);
-            
-            
-                  noiseRegistry.register(addon.key("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new));
-                  noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new));
-            
-                  noiseRegistry.register(addon.key("CELLULAR"), CellularNoiseTemplate::new);
-            
-                  noiseRegistry.register(addon.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new));
-                  noiseRegistry.register(addon.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new));
-                  noiseRegistry.register(addon.key("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new));
-            
-                  noiseRegistry.register(addon.key("CONSTANT"), ConstantNoiseTemplate::new);
-            
-                  noiseRegistry.register(addon.key("KERNEL"), KernelTemplate::new);
-            
-                  noiseRegistry.register(addon.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new);
-            
-                  noiseRegistry.register(addon.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new));
-                  noiseRegistry.register(addon.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new));
-                  noiseRegistry.register(addon.key("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new));
-                  noiseRegistry.register(addon.key("DIV"), () -> new BinaryArithmeticTemplate<>(DivisionSampler::new));
-                  noiseRegistry.register(addon.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new));
-                  noiseRegistry.register(addon.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new));
-            
-            
-                  Map<String, DimensionApplicableNoiseSampler> packSamplers = new LinkedHashMap<>();
-                  Map<String, FunctionTemplate> packFunctions = new LinkedHashMap<>();
-                  noiseRegistry.register(addon.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions));
-            
-            
-                  NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate());
-                  packSamplers.putAll(template.getSamplers());
-                  packFunctions.putAll(template.getFunctions());
-                  event.getPack().getContext().put(template);
-              })
-              .priority(50)
-              .failThrough();
+    public @NotNull Monad<?, Init<?>> initialize() {
+        return Do.with(
+                Get.eventManager().map(eventManager -> eventManager.getHandler(FunctionalEventHandler.class)),
+                Get.addon(),
+                Get.platform(),
+                ((functionalEventHandler, base, platform) -> Init.ofPure(
+                        functionalEventHandler.register(base, ConfigPackPreLoadEvent.class)
+                                              .then(event -> {
+                                                  Registry<Supplier<ObjectTemplate<NoiseSampler>>> noiseRegistry = event.getPack().createRegistry(
+                                                          NOISE_SAMPLER_TOKEN);
+                                                  event.getPack()
+                                                       .applyLoader(CellularSampler.DistanceFunction.class,
+                                                                    (type, o, loader, depthTracker) -> CellularSampler.DistanceFunction.valueOf((String) o))
+                                                       .applyLoader(CellularSampler.ReturnType.class,
+                                                                    (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o))
+                                                       .applyLoader(DimensionApplicableNoiseSampler.class, DimensionApplicableNoiseSampler::new)
+                                                       .applyLoader(FunctionTemplate.class, FunctionTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("LINEAR"), LinearNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("LINEAR_MAP"), LinearMapNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("NORMAL"), NormalNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("CLAMP"), ClampNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("PROBABILITY"), ProbabilityNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("SCALE"), ScaleNormalizerTemplate::new);
+                                                  noiseRegistry.register(base.key("POSTERIZATION"), PosterizationNormalizerTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("IMAGE"), ImageSamplerTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("DOMAIN_WARP"), DomainWarpTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("FBM"), BrownianMotionTemplate::new);
+                                                  noiseRegistry.register(base.key("PING_PONG"), PingPongTemplate::new);
+                                                  noiseRegistry.register(base.key("RIDGED"), RidgedFractalTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new));
+                                                  noiseRegistry.register(base.key("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new));
+                                                  noiseRegistry.register(base.key("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new));
+                                                  noiseRegistry.register(base.key("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new));
+                                                  noiseRegistry.register(base.key("GABOR"), GaborNoiseTemplate::new);
+    
+    
+                                                  noiseRegistry.register(base.key("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new));
+                                                  noiseRegistry.register(base.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new));
+    
+                                                  noiseRegistry.register(base.key("CELLULAR"), CellularNoiseTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new));
+                                                  noiseRegistry.register(base.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new));
+                                                  noiseRegistry.register(base.key("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new));
+    
+                                                  noiseRegistry.register(base.key("CONSTANT"), ConstantNoiseTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("KERNEL"), KernelTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new);
+    
+                                                  noiseRegistry.register(base.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new));
+                                                  noiseRegistry.register(base.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new));
+                                                  noiseRegistry.register(base.key("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new));
+                                                  noiseRegistry.register(base.key("DIV"), () -> new BinaryArithmeticTemplate<>(DivisionSampler::new));
+                                                  noiseRegistry.register(base.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new));
+                                                  noiseRegistry.register(base.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new));
+    
+    
+                                                  Map<String, DimensionApplicableNoiseSampler> packSamplers = new LinkedHashMap<>();
+                                                  Map<String, FunctionTemplate> packFunctions = new LinkedHashMap<>();
+                                                  noiseRegistry.register(base.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions));
+    
+    
+                                                  NoiseConfigPackTemplate template = event.loadTemplate(new NoiseConfigPackTemplate());
+                                                  packSamplers.putAll(template.getSamplers());
+                                                  packFunctions.putAll(template.getFunctions());
+                                                  event.getPack().getContext().put(template);
+                                              })
+                                              .priority(50)
+                                              .failThrough()))
+                      );
+    
     }
 }