fix funny ProbabilityCollection bug

fix ProbabilityCollection#getProbability
fix NPE
2026-05-20 08:40:26 +00:00 · 2021-06-14 19:45:41 -07:00 · 2021-06-14 19:39:04 -07:00 · 2021-06-14 19:20:00 -07:00 · 2021-06-14 19:15:52 -07:00 · 2021-06-14 19:13:16 -07:00
1087 changed files with 16498 additions and 15041 deletions
@@ -105,7 +105,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = never
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_imports_layout = *,|,javax.**,java.**,|,$*
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -137,7 +137,7 @@ ij_java_method_parameters_wrap = off
 ij_java_modifier_list_wrap = false
 ij_java_names_count_to_use_import_on_demand = 3
 ij_java_new_line_after_lparen_in_record_header = false
-ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
+ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
 ij_java_parameter_annotation_wrap = off
 ij_java_parentheses_expression_new_line_after_left_paren = false
 ij_java_parentheses_expression_right_paren_on_new_line = false
@@ -246,7 +246,7 @@ ij_java_wrap_comments = false
 ij_java_wrap_first_method_in_call_chain = false
 ij_java_wrap_long_lines = false

-[{*.gradle.kts, *.kt, *.kts, *.main.kts}]
+[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
 ij_kotlin_align_multiline_extends_list = false
@@ -325,7 +325,7 @@ ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 0
 ij_kotlin_wrap_first_method_in_call_chain = false

-[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config}]
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
 indent_size = 2
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
@@ -338,7 +338,7 @@ ij_json_spaces_within_braces = false
 ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false

-[{*.yaml, *.yml}]
+[{*.yaml,*.yml}]
 indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = true
 ij_yaml_keep_line_breaks = true
@@ -8,5 +8,4 @@ assignees: ""
 ---

 ## Describe the issue
-
 <!-- Please describe the issue as clearly and as concisely as possible, without missing any details. -->
@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Which Issue Template do I Choose?
-    url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
+  - name:  Which Issue Template do I Choose?
+    url:   https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
    about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you.
-  - name: Terra Wiki
-    url: https://github.com/PolyhedralDev/Terra/wiki
+  - name:  Terra Wiki
+    url:   https://github.com/PolyhedralDev/Terra/wiki
    about: Documentation for all things Terra.
-  - name: Join the Support Discord
-    url: https://discord.dfsek.com
+  - name:  Join the Support Discord
+    url:   https://discord.dfsek.com
    about: If you have a basic support question, join the Discord instead.
@@ -0,0 +1,40 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    tags:
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+      
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      
+      - name: Build Terra
+        run:  gradle shadowJar
+      
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Package
+          path: build/libs
+      
+      - name: Publish release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          prerelease: false
+          files:      |
+                      build/libs/Terra-*.jar
+                      LICENSE
+                      
@@ -7,47 +7,40 @@ to your specifications, with no knowledge of Java required.

 * Paper+ servers (Paper, Tuinity, Purpur, etc): [SpigotMC](https://www.spigotmc.org/resources/85151/)
 * Fabric: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
-* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra)
-  / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)
+* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator)

 ## Building and Running Terra

-To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and produce JARs
-in `platforms/<platform>/build/libs`
+To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and
+produce JARs in `platforms/<platform>/build/libs`

 ### Production JARs:
-
 * Bukkit: `Terra-<version>-shaded.jar`
 * Fabric: `Terra-<version>-shaded-mapped.jar`
 * Forge: `Terra-<version>-shaded.jar`

 ### Building a Specific Platform
-
 To build a specific platform, run `gradlew :platforms:<platform>:build`.

 JARs are produced in `platforms/<platform>/build/libs`.

 ### Running Minecraft in the IDE
-
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
-
 * Bukkit
-    * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once).
-    * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once).
-    * `runPaper` - Run the Paper test server with Terra (`installPaper` must have been run previously).
-    * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must have been run previously).
+  * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once).
+  * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once).
+  * `runPaper` - Run the Paper test server with Terra (`installPaper` must have been run previously).
+  * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must have been run previously).
 * Fabric
-    * `runClient` - Run a Minecraft Fabric client with Terra installed.
-    * `runServer` - Run a Minecraft Fabric server with Terra installed.
+  * `runClient` - Run a Minecraft Fabric client with Terra installed.
+  * `runServer` - Run a Minecraft Fabric server with Terra installed.
 * Forge
-    * `runClient` - Run a Minecraft Forge client with Terra installed.
-    * `runServer` - Run a Minecraft Forge server with Terra installed.
-
+  * `runClient` - Run a Minecraft Forge client with Terra installed.
+  * `runServer` - Run a Minecraft Forge server with Terra installed.
 ## Contributing
-
-Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and submit a PR!
+Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and
+submit a PR!
 Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project!

 ## Beta
-
 Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added!
@@ -1,20 +1,15 @@
-import com.dfsek.terra.*
+import com.dfsek.terra.getGitHash

-val versionObj = Version("6", "0", "0", true)
+val versionObj = Version("5", "3", "3", true)

 allprojects {
    version = versionObj
    group = "com.dfsek.terra"

-    configureDependencies()
-    configureCompilation()
-    configurePublishing()
-
    tasks.withType<JavaCompile>().configureEach {
        options.isFork = true
        options.isIncremental = true
    }
-
    tasks.withType<Test>().configureEach {
        useJUnitPlatform()

@@ -23,17 +18,11 @@ allprojects {
        failFast = true
        maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1

-        reports.html.required.set(false)
-        reports.junitXml.required.set(false)
+        reports.html.isEnabled = false
+        reports.junitXml.isEnabled = false
    }
-}

-afterEvaluate {
-    project(":platforms").subprojects.forEach { // Platform projects are where distribution happens
-        it.configureDistribution()
-    }
 }
-
 /**
 * Version class that does version stuff.
 */
@@ -10,5 +10,4 @@ repositories {

 dependencies {
    "implementation"("com.github.jengelman.gradle.plugins:shadow:+")
-    "implementation"("org.yaml:snakeyaml:1.27")
 }
@@ -1,41 +0,0 @@
-package com.dfsek.terra
-
-import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.jvm.tasks.Jar
-import java.io.File
-import java.util.function.Predicate
-import kotlin.streams.asStream
-
-
-/**
- * Configures a directory where addons will be put.
- */
-fun Project.addonDir(dir: File, task: Task) {
-    task.doFirst {
-        dir.parentFile.mkdirs()
-        matchingAddons(dir) {
-            it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
-        }.forEach {
-            println("Deleting old addon: " + it.absolutePath)
-            it.delete()
-        }
-        project(":common:addons").subprojects.forEach { addonProject ->
-            val jar = (addonProject.tasks.named("jar").get() as Jar)
-
-            val target = File(dir, jar.archiveFileName.get())
-
-            val base = "${jar.archiveBaseName.get()}-${project.version}"
-
-            println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
-
-            jar.archiveFile.orNull?.asFile?.copyTo(target)
-        }
-    }
-}
-
-fun matchingAddons(dir: File, matcher: Predicate<File>): Set<File> {
-    val matching = HashSet<File>()
-    dir.walk().maxDepth(1).asStream().filter(matcher).forEach(matching::add)
-    return matching
-}
@@ -1,8 +1,19 @@
 package com.dfsek.terra

 import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.withType
 import java.io.ByteArrayOutputStream

+fun Project.configureCommon() {
+    configureDependencies()
+    configureCompilation()
+    configureDistribution()
+
+    version = rootProject.version
+}
+
 fun Project.getGitHash(): String {
    val stdout = ByteArrayOutputStream()
    exec {
@@ -2,7 +2,7 @@ package com.dfsek.terra

 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
@@ -11,12 +11,10 @@ import org.gradle.language.jvm.tasks.ProcessResources

 fun Project.configureCompilation() {
    apply(plugin = "maven-publish")
-    apply(plugin = "java")
-    apply(plugin = "java-library")
    apply(plugin = "idea")

-    configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_16
+    configure<JavaPluginConvention> {
+        sourceCompatibility = JavaVersion.VERSION_1_8
        targetCompatibility = JavaVersion.VERSION_16
    }

@@ -1,7 +1,10 @@
 package com.dfsek.terra

 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.repositories

 fun Project.configureDependencies() {
    apply(plugin = "java")
@@ -23,22 +26,13 @@ fun Project.configureDependencies() {
        maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
        maven { url = uri("https://maven.fabricmc.net/") }
        gradlePluginPortal()
+        jcenter()
        mavenCentral()
    }

    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:20.1.0")
-
-        "compileOnly"("com.google.guava:guava:30.0-jre")
-        "testImplementation"("com.google.guava:guava:30.0-jre")
-    }
-
-    if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API.
-        dependencies {
-            "compileOnly"(project(":common:api"))
-            "testImplementation"(project(":common:api"))
-        }
+        "api"("org.jetbrains:annotations:20.1.0")
    }
 }
@@ -3,23 +3,15 @@ package com.dfsek.terra
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
-import org.gradle.api.plugins.BasePluginExtension
-import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.named
-import org.yaml.snakeyaml.DumperOptions
-import org.yaml.snakeyaml.Yaml
+import org.gradle.api.plugins.BasePluginConvention
+import org.gradle.api.tasks.bundling.Jar
+import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.kotlin.dsl.*
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.FileWriter
 import java.net.URL
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream

 fun Project.configureDistribution() {
+    apply(plugin = "java-library")
    apply(plugin = "com.github.johnrengelman.shadow")

    val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
@@ -33,85 +25,7 @@ fun Project.configureDistribution() {
            downloadPack(netherPackUrl, project)
        }
    }
-
-    val installAddons = tasks.create("installAddons") {
-        group = "terra"
-        project(":common:addons").subprojects.forEach {
-            it.afterEvaluate {
-                dependsOn(it.tasks.getByName("build")) // Depend on addon JARs
-            }
-        }
-
-        doFirst {
-            // The addons are copied into a JAR because of a ShadowJar bug
-            // which expands *all* JARs, even resource ones, into the fat JAR.
-            // To get around this, we copy all addon JARs into a *new* JAR,
-            // then, ShadowJar expands the newly created JAR, putting the original
-            // JARs where they should go.
-            //
-            // https://github.com/johnrengelman/shadow/issues/111
-            val dest = File(buildDir, "/resources/main/addons.jar")
-            dest.parentFile.mkdirs()
-
-            val zip = ZipOutputStream(FileOutputStream(dest))
-
-            project(":common:addons").subprojects.forEach { addonProject ->
-                val jar = (addonProject.tasks.named("jar").get() as Jar)
-                println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}.")
-
-                val entry = ZipEntry("addons/${jar.archiveFileName.get()}")
-                zip.putNextEntry(entry)
-                FileInputStream(jar.archiveFile.get().asFile).copyTo(zip)
-                zip.closeEntry()
-            }
-            zip.close()
-        }
-    }
-
-    val generateResourceManifest = tasks.create("generateResourceManifest") {
-        group = "terra"
-        dependsOn(downloadDefaultPacks)
-        dependsOn(installAddons)
-        doFirst {
-            val resources = HashMap<String, MutableList<String>>()
-            val packsDir = File("${project.buildDir}/resources/main/packs/")
-
-            packsDir.walkTopDown().forEach {
-                if (it.isDirectory || !it.name.endsWith(".zip")) return@forEach
-                resources.computeIfAbsent("packs") { ArrayList() }.add(it.name)
-            }
-
-            val langDir = File("${project(":common:implementation").buildDir}/resources/main/lang/")
-
-            langDir.walkTopDown().forEach {
-                if (it.isDirectory || !it.name.endsWith(".yml")) return@forEach
-                resources.computeIfAbsent("lang") { ArrayList() }.add(it.name)
-            }
-
-            project(":common:addons").subprojects.forEach { addonProject ->
-                val jar = (addonProject.tasks.named("jar").get() as Jar).archiveFileName.get()
-                resources.computeIfAbsent("addons") { ArrayList() }.add(jar)
-            }
-
-            val options = DumperOptions()
-            options.indent = 2
-            options.indentWithIndicator = true
-            options.indicatorIndent = 2
-            options.isPrettyFlow = true
-            options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
-            options.defaultScalarStyle = DumperOptions.ScalarStyle.DOUBLE_QUOTED
-
-            val yaml = Yaml(options)
-
-            val manifest = File("${project.buildDir}/resources/main/resources.yml")
-
-            if (manifest.exists()) manifest.delete()
-            manifest.createNewFile()
-            yaml.dump(resources, FileWriter(manifest))
-        }
-    }
-
-    tasks["processResources"].dependsOn(generateResourceManifest)
+    tasks["processResources"].dependsOn(downloadDefaultPacks)

    tasks.named<ShadowJar>("shadowJar") {
        // Tell shadow to download the packs
@@ -122,14 +36,17 @@ fun Project.configureDistribution() {
        archiveClassifier.set("shaded")
        setVersion(project.version)
        relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
+        relocate("net.jafama", "com.dfsek.terra.lib.jafama")
        relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
+        relocate("com.google.errorprone", "com.dfsek.terra.lib.google.errorprone")
+        relocate("com.google.j2objc", "com.dfsek.terra.lib.google.j2objc")
+        relocate("org.checkerframework", "com.dfsek.terra.lib.checkerframework")
+        relocate("org.javax.annotation", "com.dfsek.terra.lib.javax.annotation")
        relocate("org.json", "com.dfsek.terra.lib.json")
        relocate("org.yaml", "com.dfsek.terra.lib.yaml")
+        minimize()
    }
-
-    configure<BasePluginExtension> {
-        archivesName.set(project.name)
-    }
+    convention.getPlugin<BasePluginConvention>().archivesBaseName = project.name

    tasks.named<DefaultTask>("build") {
        dependsOn(tasks["shadowJar"])
@@ -1,33 +0,0 @@
-package com.dfsek.terra
-
-import org.gradle.api.Project
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.kotlin.dsl.*
-
-fun Project.configurePublishing() {
-    configure<PublishingExtension> {
-        publications {
-            create<MavenPublication>("mavenJava") {
-                artifact(tasks["sourcesJar"])
-                artifact(tasks["jar"])
-            }
-        }
-
-        repositories {
-            val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
-            //val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
-
-            maven(mavenUrl) {
-                val mavenUsername: String? by project
-                val mavenPassword: String? by project
-                if (mavenUsername != null && mavenPassword != null) {
-                    credentials {
-                        username = mavenUsername
-                        password = mavenPassword
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,3 +0,0 @@
-# Core Addons
-
-This directory contains the modularized "core addons" that implement Terra's default behavior.
@@ -1,8 +0,0 @@
-# api-features
-Contains the API for feature generation.
-
-This API implemented in:
- * `config-feature`
- * `generation-stage-feature`
- * `config-locators`
- * `config-distributors`
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,3 +0,0 @@
-dependencies {
-    "shadedApi"("commons-io:commons-io:2.6")
-}
@@ -1,26 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api;
-
-import com.dfsek.terra.addons.terrascript.api.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.api.lang.Variable;
-import com.dfsek.terra.api.properties.Context;
-
-import java.util.Map;
-
-public interface Function<T> extends Returnable<T> {
-    Function<?> NULL = new Function<Object>() {
-        @Override
-        public ReturnType returnType() {
-            return null;
-        }
-
-        @Override
-        public Object apply(Context context, Map<String, Variable<?>> variableMap) {
-            return null;
-        }
-
-        @Override
-        public Position getPosition() {
-            return null;
-        }
-    };
-}
@@ -1,13 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api;
-
-import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.World;
-
-import java.util.Random;
-
-public interface StructureScript extends Structure {
-    @SuppressWarnings("try")
-    boolean test(Vector3 location, World world, Random random, Rotation rotation);
-}
@@ -1,16 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api;
-
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-
-@Addon("api-terrascript")
-@Version("1.0.0")
-@Author("Terra")
-public class TerraScriptAPIAddon extends TerraAddon {
-    @Override
-    public void initialize() {
-
-    }
-}
@@ -1,30 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer;
-
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.World;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Cell implements BufferedItem {
-    private final List<BufferedItem> items = new ArrayList<>();
-    private String mark = null;
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        items.forEach(item -> item.paste(origin.clone(), world));
-    }
-
-    public void add(BufferedItem item) {
-        items.add(item);
-    }
-
-    public String getMark() {
-        return mark;
-    }
-
-    public void setMark(String mark) {
-        this.mark = mark;
-    }
-}
@@ -1,56 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer;
-
-import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Buffer implementation that directly pastes to the world.
- */
-public class DirectBuffer implements Buffer {
-    private final Vector3 origin;
-    private final World target;
-    private final Map<Vector3, String> marks = new LinkedHashMap<>();
-
-    public DirectBuffer(Vector3 origin, World target) {
-        this.origin = origin;
-        this.target = target;
-    }
-
-    @Override
-    public void paste(Vector3 origin, Chunk chunk) {
-        // no-op
-    }
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        // no-op
-    }
-
-    @Override
-    public Buffer addItem(BufferedItem item, Vector3 location) {
-        item.paste(origin.clone().add(location), target);
-        return this;
-    }
-
-    @Override
-    public Vector3 getOrigin() {
-        return origin;
-    }
-
-    @Override
-    public String getMark(Vector3 location) {
-        return marks.get(location);
-    }
-
-    @Override
-    public Buffer setMark(String mark, Vector3 location) {
-        marks.put(location, mark);
-        return this;
-    }
-}
@@ -1,48 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer;
-
-import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-
-public class IntermediateBuffer implements Buffer {
-    private final Buffer original;
-    private final Vector3 offset;
-
-    public IntermediateBuffer(Buffer original, Vector3 offset) {
-        this.original = original;
-        this.offset = offset.clone();
-    }
-
-    @Override
-    public void paste(Vector3 origin, Chunk chunk) {
-        // no-op
-    }
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        // no-op
-    }
-
-    @Override
-    public Buffer addItem(BufferedItem item, Vector3 location) {
-        return original.addItem(item, location.clone().add(offset));
-    }
-
-    @Override
-    public Vector3 getOrigin() {
-        return original.getOrigin().clone().add(offset);
-    }
-
-    @Override
-    public String getMark(Vector3 location) {
-        return original.getMark(location.clone().add(offset));
-    }
-
-    @Override
-    public Buffer setMark(String mark, Vector3 location) {
-        original.setMark(mark, location.clone().add(offset));
-        return this;
-    }
-}
@@ -1,68 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer;
-
-import com.dfsek.terra.api.structure.buffer.Buffer;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-import net.jafama.FastMath;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class StructureBuffer implements Buffer {
-    private final Map<Vector3, Cell> bufferedItemMap = new LinkedHashMap<>();
-    private final Vector3 origin;
-    private boolean succeeded;
-
-    public StructureBuffer(Vector3 origin) {
-        this.origin = origin;
-    }
-
-    public void paste(Vector3 origin, World world) {
-        bufferedItemMap.forEach(((vector3, item) -> item.paste(origin.clone().add(vector3), world)));
-    }
-
-    public void paste(Vector3 origin, Chunk chunk) {
-        bufferedItemMap.forEach(((location, item) -> {
-            Vector3 current = origin.clone().add(location);
-            if(FastMath.floorDiv(current.getBlockX(), 16) != chunk.getX() || FastMath.floorDiv(current.getBlockZ(), 16) != chunk.getZ())
-                return;
-            item.paste(current, chunk.getWorld());
-        }));
-    }
-
-    @Override
-    public Buffer addItem(BufferedItem item, Vector3 location) {
-        bufferedItemMap.computeIfAbsent(location.clone(), l -> new Cell()).add(item);
-        return this;
-    }
-
-    @Override
-    public String getMark(Vector3 location) {
-        Cell cell = bufferedItemMap.get(location);
-        if(cell != null) {
-            return cell.getMark();
-        }
-        return null;
-    }
-
-    @Override
-    public Buffer setMark(String mark, Vector3 location) {
-        bufferedItemMap.computeIfAbsent(location.clone(), l -> new Cell()).setMark(mark);
-        return this;
-    }
-
-    public void setSucceeded(boolean succeeded) {
-        this.succeeded = succeeded;
-    }
-
-    public boolean succeeded() {
-        return succeeded;
-    }
-
-    @Override
-    public Vector3 getOrigin() {
-        return origin.clone();
-    }
-}
@@ -1,38 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer.items;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.state.properties.base.Properties;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.World;
-
-public class BufferedBlock implements BufferedItem {
-    private final BlockState data;
-    private final boolean overwrite;
-    private final TerraPlugin main;
-    private final boolean waterlog;
-
-    public BufferedBlock(BlockState data, boolean overwrite, TerraPlugin main, boolean waterlog) {
-        this.data = data;
-        this.overwrite = overwrite;
-        this.main = main;
-        this.waterlog = waterlog;
-    }
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        try {
-            BlockState current = world.getBlockData(origin);
-            if(overwrite || current.isAir()) {
-                if(waterlog && current.has(Properties.WATERLOGGED) && current.getBlockType().isWater()) {
-                    current.set(Properties.WATERLOGGED, true);
-                }
-                world.setBlockData(origin, data);
-            }
-        } catch(RuntimeException e) {
-            main.logger().severe("Failed to place block at location " + origin + ": " + e.getMessage());
-            main.getDebugLogger().stack(e);
-        }
-    }
-}
@@ -1,26 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer.items;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.entity.Entity;
-import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.World;
-
-public class BufferedEntity implements BufferedItem {
-
-    private final EntityType type;
-    private final TerraPlugin main;
-
-    public BufferedEntity(EntityType type, TerraPlugin main) {
-        this.type = type;
-        this.main = main;
-    }
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        Entity entity = world.spawnEntity(origin.clone().add(0.5, 0, 0.5), type);
-        main.getEventManager().callEvent(new EntitySpawnEvent(entity.world().getConfig().getPack(), entity));
-    }
-}
@@ -1,26 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.buffer.items;
-
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.structure.buffer.BufferedItem;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.World;
-
-public class BufferedPulledBlock implements BufferedItem {
-    private final BlockState data;
-
-    public BufferedPulledBlock(BlockState data) {
-        this.data = data;
-    }
-
-    @Override
-    public void paste(Vector3 origin, World world) {
-        Vector3 mutable = origin.clone();
-        while(mutable.getY() > world.getMinHeight()) {
-            if(!world.getBlockData(mutable).isAir()) {
-                world.setBlockData(mutable, data);
-                break;
-            }
-            mutable.subtract(0, 1, 0);
-        }
-    }
-}
@@ -1,12 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.lang;
-
-import com.dfsek.terra.addons.terrascript.api.Position;
-import com.dfsek.terra.api.properties.Context;
-
-import java.util.Map;
-
-public interface Item<T> {
-    T apply(Context context, Map<String, Variable<?>> variableMap);
-
-    Position getPosition();
-}
@@ -1,43 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.lang;
-
-import com.dfsek.terra.addons.terrascript.api.Position;
-import com.dfsek.terra.api.properties.Context;
-
-import java.util.Map;
-
-public interface Returnable<T> extends Item<T> {
-    ReturnType returnType();
-
-    enum ReturnType {
-        NUMBER(true), STRING(true), BOOLEAN(false), VOID(false), OBJECT(false);
-
-        private final boolean comparable;
-
-        ReturnType(boolean comparable) {
-            this.comparable = comparable;
-        }
-
-        public boolean isComparable() {
-            return comparable;
-        }
-    }
-
-    static <T> Returnable<T> constant(T value, ReturnType type, Position position) {
-        return new Returnable<T>() {
-            @Override
-            public ReturnType returnType() {
-                return type;
-            }
-
-            @Override
-            public T apply(Context context, Map<String, Variable<?>> variableMap) {
-                return value;
-            }
-
-            @Override
-            public Position getPosition() {
-                return position;
-            }
-        };
-    }
-}
@@ -1,13 +0,0 @@
-package com.dfsek.terra.addons.terrascript.api.lang;
-
-import com.dfsek.terra.addons.terrascript.api.Position;
-
-public interface Variable<T> {
-    T getValue();
-
-    void setValue(T value);
-
-    Returnable.ReturnType getType();
-
-    Position getPosition();
-}
@@ -1,6 +0,0 @@
-# biome-provider-image
-
-Implements and registers the `IMAGE` biome provider, a biome provider which generates
-biomes from an image, using the `color` attribute of biomes.
-
-This addon registers the provider type, and all associated config options.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,40 +0,0 @@
-package com.dfsek.terra.addons.biome.image;
-
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.util.function.Supplier;
-
-@Addon("biome-provider-image")
-@Author("Terra")
-@Version("1.0.0")
-public class ImageBiomeProviderAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.class)));
-                })
-                .failThrough();
-    }
-}
@@ -1,33 +0,0 @@
-package com.dfsek.terra.addons.biome.image;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.awt.image.BufferedImage;
-import java.util.HashSet;
-
-public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    private final Registry<TerraBiome> biomes;
-    @Value("image.name")
-    private BufferedImage image;
-
-    @Value("image.align")
-    private ImageBiomeProvider.Align align;
-
-    @Value("resolution")
-    @Default
-    private int resolution = 1;
-
-    public ImageProviderTemplate(Registry<TerraBiome> set) {
-        this.biomes = set;
-    }
-
-    @Override
-    public BiomeProvider get() {
-        return new ImageBiomeProvider(new HashSet<>(biomes.entries()), image, resolution, align);
-    }
-}
@@ -1,7 +0,0 @@
-# biome-provider-pipeline
-
-Implements the Biome Pipeline, a procedural biome provider that uses a series
-of "stages" to apply "mutations" to a 2D grid of biomes.
-
-
-This addon registers the `PIPELINE` biome provider type, and all associated configurations.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,65 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.vector.Vector2;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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, new Vector2(x * (init - 1), z * (init - 1)));
-        holder.fill(source, seed);
-        for(Stage stage : stages) holder = stage.apply(holder, seed);
-        return holder;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public static final class BiomePipelineBuilder {
-        private final int init;
-        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;
-        }
-    }
-}
@@ -1,67 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate;
-import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate;
-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.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.util.function.Supplier;
-
-@Addon("biome-provider-pipeline")
-@Author("Terra")
-@Version("1.0.0")
-public class BiomePipelineAddon extends TerraAddon {
-
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> 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 TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register("PIPELINE", () -> new BiomePipelineTemplate(main));
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(SOURCE_REGISTRY_KEY);
-                    sourceRegistry.register("NOISE", NoiseSourceTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(STAGE_REGISTRY_KEY);
-                    stageRegistry.register("FRACTAL_EXPAND", ExpanderStageTemplate::new);
-                    stageRegistry.register("SMOOTH", SmoothMutatorTemplate::new);
-                    stageRegistry.register("REPLACE", ReplaceMutatorTemplate::new);
-                    stageRegistry.register("REPLACE_LIST", ReplaceListMutatorTemplate::new);
-                    stageRegistry.register("BORDER", BorderMutatorTemplate::new);
-                    stageRegistry.register("BORDER_LIST", BorderListMutatorTemplate::new);
-                })
-                .failThrough();
-    }
-}
@@ -1,81 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import net.jafama.FastMath;
-import org.jetbrains.annotations.NotNull;
-
-public class BiomePipelineProvider implements BiomeProvider {
-    private final LoadingCache<SeededVector, BiomeHolder> holderCache;
-    private final BiomePipeline pipeline;
-    private final int resolution;
-    private final NoiseSampler mutator;
-    private final double noiseAmp;
-
-    public BiomePipelineProvider(BiomePipeline pipeline, TerraPlugin main, int resolution, NoiseSampler mutator, double noiseAmp) {
-        this.resolution = resolution;
-        this.mutator = mutator;
-        this.noiseAmp = noiseAmp;
-        holderCache = CacheBuilder.newBuilder()
-                .maximumSize(main == null ? 32 : main.getTerraConfig().getProviderCache())
-                .build(
-                        new CacheLoader<SeededVector, BiomeHolder>() {
-                            @Override
-                            public BiomeHolder load(@NotNull SeededVector key) {
-                                return pipeline.getBiomes(key.x, key.z, key.seed);
-                            }
-                        }
-                );
-        this.pipeline = pipeline;
-    }
-
-    @Override
-    public TerraBiome getBiome(int x, int z, long seed) {
-        x += mutator.getNoiseSeeded(seed + 1, x, z) * noiseAmp;
-        z += mutator.getNoiseSeeded(seed + 2, x, z) * noiseAmp;
-
-
-        x = FastMath.floorToInt(FastMath.floorDiv(x, resolution));
-
-        z = FastMath.floorToInt(FastMath.floorDiv(z, resolution));
-
-        int fdX = FastMath.floorDiv(x, pipeline.getSize());
-        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
-        return holderCache.getUnchecked(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(), z - fdZ * pipeline.getSize());
-    }
-
-    private static final class SeededVector {
-        private final int x;
-        private final int z;
-        private final long seed;
-
-        private SeededVector(int x, int z, long seed) {
-            this.x = x;
-            this.z = z;
-            this.seed = seed;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = 0;
-            result = 31 * result + ((int) (seed ^ (seed >>> 32)));
-            result = 31 * result + x;
-            result = 31 * result + z;
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if(!(obj instanceof SeededVector)) return false;
-            SeededVector that = (SeededVector) obj;
-
-            return this.seed == that.seed && this.x == that.x && this.z == that.z;
-        }
-    }
-}
@@ -1,7 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api;
-
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public interface BiomeExpander {
-    TerraBiome getBetween(double x, double z, long seed, TerraBiome... others);
-}
@@ -1,16 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api;
-
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public interface BiomeHolder {
-    BiomeHolder expand(BiomeExpander expander, long seed);
-
-    void mutate(BiomeMutator mutator, long seed);
-
-    void fill(BiomeSource source, long seed);
-
-    TerraBiome getBiome(int x, int z);
-
-    TerraBiome getBiomeRaw(int x, int z);
-}
@@ -1,8 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.api;
-
-public interface Stage {
-    boolean isExpansion();
-
-    BiomeHolder apply(BiomeHolder in, long seed);
-
-}
@@ -1,39 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-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;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.util.List;
-
-@SuppressWarnings({"FieldMayBeFinal", "unused"})
-public class BiomePipelineTemplate extends BiomeProviderTemplate {
-    private final TerraPlugin main;
-    @Value("pipeline.initial-size")
-    @Default
-    private @Meta int initialSize = 2;
-
-    @Value("pipeline.stages")
-    private @Meta List<@Meta Stage> stages;
-
-    @Value("pipeline.source")
-    private @Meta BiomeSource source;
-
-    public BiomePipelineTemplate(TerraPlugin main) {
-        this.main = main;
-    }
-
-    @Override
-    public BiomeProvider get() {
-        BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);
-        stages.forEach(biomePipelineBuilder::addStage);
-        BiomePipeline pipeline = biomePipelineBuilder.build(source);
-        return new BiomePipelineProvider(pipeline, main, resolution, blend, blendAmp);
-    }
-}
@@ -1,16 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.lang.reflect.AnnotatedType;
-
-public class BiomeProviderLoader implements TypeLoader<BiomeProvider> {
-    @Override
-    public BiomeProvider load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException {
-        return loader.loadType(BiomePipelineProvider.class, c); // TODO: actually implement this lol
-    }
-}
@@ -1,20 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.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
-    protected @Meta int resolution = 1;
-    @Value("blend.noise")
-    @Default
-    protected @Meta NoiseSampler blend = NoiseSampler.zero();
-    @Value("blend.amplitude")
-    @Default
-    protected @Meta double blendAmp = 0d;
-}
@@ -1,22 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public class NoiseSourceTemplate extends SourceTemplate {
-    @Value("noise")
-    private @Meta NoiseSampler noise;
-
-    @Value("biomes")
-    private @Meta ProbabilityCollection<@Meta TerraBiome> biomes;
-
-    @Override
-    public BiomeSource get() {
-        return new NoiseSource(biomes, noise);
-    }
-}
@@ -1,8 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config;
-
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
-
-public abstract class SourceTemplate implements ObjectTemplate<BiomeSource> {
-
-}
@@ -1,12 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-public abstract class StageTemplate implements ObjectTemplate<Stage> {
-    @Value("noise")
-    protected @Meta NoiseSampler noise;
-}
@@ -1,13 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.expander;
-
-import com.dfsek.terra.addons.biome.pipeline.api.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;
-
-public class ExpanderStageTemplate extends StageTemplate {
-    @Override
-    public Stage get() {
-        return new ExpanderStage(new FractalExpander(noise));
-    }
-}
@@ -1,33 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.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.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-import java.util.Map;
-
-@SuppressWarnings("unused")
-public class BorderListMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("default-replace")
-    private @Meta String defaultReplace;
-
-    @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
-
-    @Value("replace")
-    private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
-
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new BorderListMutator(replace, from, defaultReplace, noise, defaultTo));
-    }
-}
@@ -1,27 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.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.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-@SuppressWarnings("unused")
-public class BorderMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("replace")
-    private @Meta String replace;
-
-    @Value("to")
-    private @Meta ProbabilityCollection<@Meta TerraBiome> to;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new BorderMutator(from, replace, noise, to));
-    }
-}
@@ -1,29 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.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.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-import java.util.Map;
-
-@SuppressWarnings("unused")
-public class ReplaceListMutatorTemplate extends StageTemplate {
-    @Value("default-from")
-    private @Meta String defaultFrom;
-
-    @Value("default-to")
-    private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
-
-    @Value("to")
-    private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new ReplaceListMutator(replace, defaultFrom, defaultTo, noise));
-    }
-}
@@ -1,24 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.addons.biome.pipeline.api.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.api.config.meta.Meta;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-@SuppressWarnings("unused")
-public class ReplaceMutatorTemplate extends StageTemplate {
-    @Value("from")
-    private @Meta String from;
-
-    @Value("to")
-    private @Meta ProbabilityCollection<@Meta TerraBiome> to;
-
-    @Override
-    public Stage get() {
-        return new MutatorStage(new ReplaceMutator(from, to, noise));
-    }
-}
@@ -1,13 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
-
-import com.dfsek.terra.addons.biome.pipeline.api.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;
-
-public class SmoothMutatorTemplate extends StageTemplate {
-    @Override
-    public Stage get() {
-        return new MutatorStage(new SmoothMutator(noise));
-    }
-}
@@ -1,19 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.expand;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.MathUtil;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public class FractalExpander implements BiomeExpander {
-    private final NoiseSampler sampler;
-
-    public FractalExpander(NoiseSampler sampler) {
-        this.sampler = sampler;
-    }
-
-    @Override
-    public TerraBiome getBetween(double x, double z, long seed, TerraBiome... others) {
-        return others[MathUtil.normalizeIndex(sampler.getNoiseSeeded(seed, x, z), others.length)];
-    }
-}
@@ -1,7 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.source;
-
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public interface BiomeSource {
-    TerraBiome getBiome(double x, double z, long seed);
-}
@@ -1,20 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.source;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public class NoiseSource implements BiomeSource {
-    private final ProbabilityCollection<TerraBiome> biomes;
-    private final NoiseSampler sampler;
-
-    public NoiseSource(ProbabilityCollection<TerraBiome> biomes, NoiseSampler sampler) {
-        this.biomes = biomes;
-        this.sampler = sampler;
-    }
-
-    @Override
-    public TerraBiome getBiome(double x, double z, long seed) {
-        return biomes.get(sampler, x, z, seed);
-    }
-}
@@ -1,27 +0,0 @@
-package com.dfsek.terra.addons.biome.pipeline.stages;
-
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-
-public class ExpanderStage implements Stage {
-    private final BiomeExpander expander;
-
-    public ExpanderStage(BiomeExpander expander) {
-        this.expander = expander;
-    }
-
-    @Override
-    public boolean isExpansion() {
-        return true;
-    }
-
-    @Override
-    public BiomeHolder apply(BiomeHolder in, long seed) {
-        return in.expand(expander, seed);
-    }
-
-    public enum Type {
-        FRACTAL
-    }
-}
@@ -1,4 +0,0 @@
-# biome-provider-single
-
-Registers and configures the `SINGLE` biome provider, a biome provider which
-accepts a single biome to generate continuously.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,17 +0,0 @@
-package com.dfsek.terra.addons.biome.single;
-
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-public class SingleBiomeProvider implements BiomeProvider {
-    private final TerraBiome biome;
-
-    public SingleBiomeProvider(TerraBiome biome) {
-        this.biome = biome;
-    }
-
-    @Override
-    public TerraBiome getBiome(int x, int z, long seed) {
-        return biome;
-    }
-}
@@ -1,39 +0,0 @@
-package com.dfsek.terra.addons.biome.single;
-
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-import java.util.function.Supplier;
-
-@Addon("biome-provider-single")
-@Author("Terra")
-@Version("1.0.0")
-public class SingleBiomeProviderAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register("SINGLE", SingleBiomeProviderTemplate::new);
-                })
-                .failThrough();
-    }
-}
@@ -1,17 +0,0 @@
-package com.dfsek.terra.addons.biome.single;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-
-public class SingleBiomeProviderTemplate implements ObjectTemplate<BiomeProvider> {
-    @Value("biome")
-    private @Meta TerraBiome biome;
-
-    @Override
-    public BiomeProvider get() {
-        return new SingleBiomeProvider(biome);
-    }
-}
@@ -1,4 +0,0 @@
-# chunk-generator-noise-3d
-
-Registers the `NOISE_3D` chunk generator, a chunk generator which uses biomes'
-samplers in 3D to generate chunk data.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,30 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.generator.Palette;
-
-public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
-    @Value("palette")
-    private @Meta PaletteHolder palette;
-
-    @Value("slant")
-    @Default
-    private @Meta SlantHolder slant = null;
-
-    @Value("ocean.level")
-    private @Meta int seaLevel;
-
-    @Value("ocean.palette")
-    private @Meta Palette oceanPalette;
-
-    @Override
-    public PaletteInfo get() {
-        return new PaletteInfo(palette, slant, oceanPalette, seaLevel);
-    }
-}
@@ -1,50 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator;
-
-import com.dfsek.terra.addons.chunkgenerator.generation.generators.NoiseChunkGenerator3D;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderLoader;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolderLoader;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
-
-@Addon("chunk-generator-noise-3d")
-@Author("Terra")
-@Version("1.0.0")
-public class NoiseChunkGenerator3DAddon extends TerraAddon {
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    event.getPack().getOrCreateRegistry(ChunkGeneratorProvider.class).register("NOISE_3D", pack -> new NoiseChunkGenerator3D(pack, main));
-                    event.getPack()
-                            .applyLoader(SlantHolder.class, new SlantHolderLoader())
-                            .applyLoader(PaletteHolder.class, new PaletteHolderLoader());
-                })
-                .failThrough();
-
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigurationLoadEvent.class)
-                .then(event -> {
-                    if(event.is(TerraBiome.class)) {
-                        event.getLoadedObject(TerraBiome.class).getContext().put(event.load(new BiomePaletteTemplate()).get());
-                    }
-                })
-                .failThrough();
-    }
-}
@@ -1,22 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.util.MathUtil;
-import com.dfsek.terra.api.world.biome.GenerationSettings;
-import com.dfsek.terra.api.world.generator.Palette;
-import com.dfsek.terra.api.world.generator.Sampler;
-
-public final class PaletteUtil {
-    public static Palette getPalette(int x, int y, int z, GenerationSettings c, Sampler sampler, PaletteInfo paletteInfo) {
-        SlantHolder slant = paletteInfo.getSlantHolder();
-        if(slant != null) {
-            double slope = MathUtil.derivative(sampler, x, y, z);
-            if(slope > slant.getMinSlope()) {
-                return slant.getPalette(slope).getPalette(y);
-            }
-        }
-
-        return paletteInfo.getPaletteHolder().getPalette(y);
-    }
-}
@@ -1,189 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.generation.generators;
-
-import com.dfsek.terra.addons.chunkgenerator.PaletteUtil;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.state.properties.base.Properties;
-import com.dfsek.terra.api.block.state.properties.enums.Direction;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.BiomeGrid;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.biome.GenerationSettings;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.world.generator.ChunkData;
-import com.dfsek.terra.api.world.generator.ChunkGenerator;
-import com.dfsek.terra.api.world.generator.GenerationStage;
-import com.dfsek.terra.api.world.generator.Palette;
-import com.dfsek.terra.api.world.generator.Sampler;
-import net.jafama.FastMath;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class NoiseChunkGenerator3D implements ChunkGenerator {
-    private final ConfigPack configPack;
-    private final TerraPlugin main;
-    private final List<GenerationStage> generationStages = new ArrayList<>();
-
-    private final BlockState air;
-
-    public NoiseChunkGenerator3D(ConfigPack c, TerraPlugin main) {
-        this.configPack = c;
-        this.main = main;
-        this.air = main.getWorldHandle().air();
-        c.getStages().forEach(stage -> generationStages.add(stage.newInstance(c)));
-    }
-
-    @SuppressWarnings({"try"})
-    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
-        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
-            int xOrig = (chunkX << 4);
-            int zOrig = (chunkZ << 4);
-            long seed = world.getSeed();
-            BiomeProvider grid = world.getBiomeProvider();
-            for(int x = 0; x < 4; x++) {
-                for(int z = 0; z < 4; z++) {
-                    int cx = xOrig + (x << 2);
-                    int cz = zOrig + (z << 2);
-                    TerraBiome b = grid.getBiome(cx, cz, seed);
-
-                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator().getBiomeNoise(), cx, 0, cz, world.getSeed()));
-                }
-            }
-        }
-    }
-
-    @Override
-    public ConfigPack getConfigPack() {
-        return configPack;
-    }
-
-    @Override
-    public TerraPlugin getMain() {
-        return main;
-    }
-
-    @Override
-    @SuppressWarnings({"try"})
-    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
-        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_3d")) {
-            BiomeProvider grid = world.getBiomeProvider();
-
-            int xOrig = (chunkX << 4);
-            int zOrig = (chunkZ << 4);
-
-            Sampler sampler = world.getConfig().getSamplerCache().getChunk(chunkX, chunkZ);
-
-            long seed = world.getSeed();
-
-            for(int x = 0; x < 16; x++) {
-                for(int z = 0; z < 16; z++) {
-                    int paletteLevel = 0;
-
-                    int cx = xOrig + x;
-                    int cz = zOrig + z;
-
-                    TerraBiome biome = grid.getBiome(cx, cz, seed);
-
-                    PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
-
-                    if(paletteInfo == null) {
-                        main.logger().info("null palette: " + biome.getID());
-                    }
-
-                    GenerationSettings generationSettings = biome.getGenerator();
-
-                    int sea = paletteInfo.getSeaLevel();
-                    Palette seaPalette = paletteInfo.getOcean();
-
-                    boolean justSet = false;
-                    BlockState data = null;
-                    for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
-                        if(sampler.sample(x, y, z) > 0) {
-                            justSet = true;
-
-                            data = PaletteUtil.getPalette(x, y, z, generationSettings, sampler, paletteInfo).get(paletteLevel, cx, y, cz, seed);
-                            chunk.setBlock(x, y, z, data);
-
-                            paletteLevel++;
-                        } else if(y <= sea) {
-                            chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, y, z + zOrig, seed));
-
-                            justSet = false;
-                            paletteLevel = 0;
-                        } else {
-
-                            justSet = false;
-                            paletteLevel = 0;
-                        }
-                    }
-                }
-            }
-            return chunk;
-        }
-    }
-
-    private boolean placeStair(BlockState orig, ChunkData chunk, Vector3 block, double thresh, Sampler sampler, BlockState stairNew) {
-
-        if(sampler.sample(block.getBlockX() - 0.55, block.getY(), block.getZ()) > thresh) {
-            stairNew.set(Properties.DIRECTION, Direction.WEST);
-        } else if(sampler.sample(block.getBlockX(), block.getY(), block.getZ() - 0.55) > thresh) {
-            stairNew.set(Properties.DIRECTION, Direction.NORTH);
-        } else if(sampler.sample(block.getBlockX(), block.getY(), block.getZ() + 0.55) > thresh) {
-            stairNew.set(Properties.DIRECTION, Direction.SOUTH);
-        } else if(sampler.sample(block.getX() + 0.55, block.getY(), block.getZ()) > thresh) {
-            stairNew.set(Properties.DIRECTION, Direction.EAST);
-        } else stairNew = null;
-        if(stairNew != null) {
-            stairNew.setIfPresent(Properties.WATERLOGGED, orig.getBlockType().isWater());
-            chunk.setBlock(block.getBlockX(), block.getBlockY(), block.getBlockZ(), stairNew);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) {
-        biomes(world, chunkX, chunkZ, biome, main);
-    }
-
-    @Override
-    public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) {
-        return new Sampler3D(chunkX, chunkZ, provider, world, elevationSmooth);
-    }
-
-    @Override
-    public List<GenerationStage> getGenerationStages() {
-        return generationStages;
-    }
-
-    @Override
-    public BlockState getBlock(World world, int x, int y, int z) {
-        BiomeProvider provider = world.getBiomeProvider();
-        TerraBiome biome = provider.getBiome(x, z, world.getSeed());
-        Sampler sampler = world.getConfig().getSamplerCache().get(x, z);
-
-        PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
-        Palette palette = PaletteUtil.getPalette(x, y, z, biome.getGenerator(), sampler, paletteInfo);
-        int fdX = FastMath.floorMod(x, 16);
-        int fdZ = FastMath.floorMod(z, 16);
-        double noise = sampler.sample(fdX, y, fdZ);
-        if(noise > 0) {
-            int level = 0;
-            for(int yi = world.getMaxHeight() - 1; yi > y; yi--) {
-                if(sampler.sample(fdX, yi, fdZ) > 0) level++;
-                else level = 0;
-            }
-            return palette.get(level, x, y, z, world.getSeed());
-        } else if(y <= paletteInfo.getSeaLevel()) {
-            return paletteInfo.getOcean().get(paletteInfo.getSeaLevel() - y, x, y, z, world.getSeed());
-        } else return air;
-    }
-}
@@ -1,36 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.palette;
-
-import com.dfsek.terra.api.world.generator.Palette;
-import net.jafama.FastMath;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-public class PaletteHolderBuilder {
-    private final TreeMap<Integer, Palette> paletteMap = new TreeMap<>();
-
-    public PaletteHolderBuilder add(int y, Palette palette) {
-        paletteMap.put(y, palette);
-        return this;
-    }
-
-    public PaletteHolder build() {
-
-        int min = FastMath.min(paletteMap.keySet().stream().min(Integer::compareTo).orElse(0), 0);
-        int max = FastMath.max(paletteMap.keySet().stream().max(Integer::compareTo).orElse(255), 255);
-
-        Palette[] palettes = new Palette[paletteMap.lastKey() + 1 - min];
-        for(int y = min; y <= FastMath.max(paletteMap.lastKey(), max); y++) {
-            Palette d = null;
-            for(Map.Entry<Integer, Palette> e : paletteMap.entrySet()) {
-                if(e.getKey() >= y) {
-                    d = e.getValue();
-                    break;
-                }
-            }
-            if(d == null) throw new IllegalArgumentException("No palette for Y=" + y);
-            palettes[y - min] = d;
-        }
-        return new PaletteHolder(palettes, -min);
-    }
-}
@@ -1,25 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.palette;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.world.generator.Palette;
-
-import java.lang.reflect.AnnotatedType;
-import java.util.List;
-import java.util.Map;
-
-public class PaletteHolderLoader implements TypeLoader<PaletteHolder> {
-    @SuppressWarnings("unchecked")
-    @Override
-    public PaletteHolder load(AnnotatedType type, Object o, ConfigLoader configLoader) throws LoadException {
-        List<Map<String, Integer>> palette = (List<Map<String, Integer>>) o;
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<String, Integer> layer : palette) {
-            for(Map.Entry<String, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), configLoader.loadType(Palette.class, entry.getKey()));
-            }
-        }
-        return builder.build();
-    }
-}
@@ -1,35 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.palette;
-
-import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.world.generator.Palette;
-
-public class PaletteInfo implements Properties {
-    private final PaletteHolder paletteHolder;
-    private final SlantHolder slantHolder;
-    private final Palette ocean;
-
-    private final int seaLevel;
-
-    public PaletteInfo(PaletteHolder paletteHolder, SlantHolder slantHolder, Palette ocean, int seaLevel) {
-        this.paletteHolder = paletteHolder;
-        this.slantHolder = slantHolder;
-        this.ocean = ocean;
-        this.seaLevel = seaLevel;
-    }
-
-    public Palette getOcean() {
-        return ocean;
-    }
-
-    public PaletteHolder getPaletteHolder() {
-        return paletteHolder;
-    }
-
-    public SlantHolder getSlantHolder() {
-        return slantHolder;
-    }
-
-    public int getSeaLevel() {
-        return seaLevel;
-    }
-}
@@ -1,22 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.palette;
-
-
-import java.util.TreeMap;
-
-public class SlantHolder {
-    private final TreeMap<Double, PaletteHolder> layers;
-    private final double minSlope;
-
-    public SlantHolder(TreeMap<Double, PaletteHolder> layers, double minSlope) {
-        this.layers = layers;
-        this.minSlope = minSlope;
-    }
-
-    public PaletteHolder getPalette(double slope) {
-        return layers.floorEntry(slope).getValue();
-    }
-
-    public double getMinSlope() {
-        return minSlope;
-    }
-}
@@ -1,28 +0,0 @@
-package com.dfsek.terra.addons.chunkgenerator.palette;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-
-import java.lang.reflect.AnnotatedType;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-@SuppressWarnings("unchecked")
-public class SlantHolderLoader implements TypeLoader<SlantHolder> {
-    @Override
-    public SlantHolder load(AnnotatedType type, Object o, ConfigLoader configLoader) throws LoadException {
-        List<Map<Object, Object>> layers = (List<Map<Object, Object>>) o;
-        TreeMap<Double, PaletteHolder> slantLayers = new TreeMap<>();
-        double minThreshold = Double.MAX_VALUE;
-
-        for(Map<Object, Object> layer : layers) {
-            double threshold = ((Number) layer.get("threshold")).doubleValue();
-            if(threshold < minThreshold) minThreshold = threshold;
-            slantLayers.put(threshold, configLoader.loadType(PaletteHolder.class, layer.get("palette")));
-        }
-
-        return new SlantHolder(slantLayers, minThreshold);
-    }
-}
@@ -1,3 +0,0 @@
-# config-biome
-
-Registers the default configuration for Terra Biomes, `BIOME`.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,32 +0,0 @@
-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.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-
-@Addon("config-biome")
-@Author("Terra")
-@Version("1.0.0")
-public class BiomeAddon extends TerraAddon {
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    event.getPack().registerConfigType(new BiomeConfigType(event.getPack()), "BIOME", 5);
-                    event.getPack().applyLoader(PaletteHolder.class, new PaletteHolderLoader());
-                })
-                .failThrough();
-    }
-}
@@ -1,49 +0,0 @@
-package com.dfsek.terra.addons.biome;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.TerraPlugin;
-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.registry.OpenRegistry;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-import java.util.function.Supplier;
-
-public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
-    public static final TypeKey<TerraBiome> BIOME_TYPE_TOKEN = new TypeKey<>() {
-    };
-    private final BiomeFactory factory;
-
-    public BiomeConfigType(ConfigPack pack) {
-        this.factory = new BiomeFactory(pack);
-    }
-
-    @Override
-    public BiomeTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
-        return new BiomeTemplate(pack, main);
-    }
-
-    @Override
-    public ConfigFactory<BiomeTemplate, TerraBiome> getFactory() {
-        return factory;
-    }
-
-    @Override
-    public TypeKey<TerraBiome> getTypeKey() {
-        return BIOME_TYPE_TOKEN;
-    }
-
-    @Override
-    public Supplier<OpenRegistry<TerraBiome>> registrySupplier(ConfigPack pack) {
-        return () -> pack.getRegistryFactory().create(registry -> (TypeLoader<TerraBiome>) (t, c, loader) -> {
-            if(c.equals("SELF")) return null;
-            TerraBiome obj = registry.get((String) c);
-            if(obj == null)
-                throw new LoadException("No such " + t.getType().getTypeName() + " matching \"" + c + "\" was found in this registry.");
-            return obj;
-        });
-    }
-}
@@ -1,21 +0,0 @@
-package com.dfsek.terra.addons.biome;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-
-public class BiomeFactory implements ConfigFactory<BiomeTemplate, TerraBiome> {
-    private final ConfigPack pack;
-
-    public BiomeFactory(ConfigPack pack) {
-        this.pack = pack;
-    }
-
-    @Override
-    public TerraBiome build(BiomeTemplate template, TerraPlugin main) {
-        UserDefinedGenerationSettings generator = new UserDefinedGenerationSettings(template.getNoiseEquation(), template.getElevationEquation(), template.getCarvingEquation(), template.getBiomeNoise(), template.getElevationWeight(),
-                template.getBlendDistance(), template.getBlendStep(), template.getBlendWeight());
-        return new UserDefinedBiome(template.getVanilla(), generator, template);
-    }
-}
@@ -1,210 +0,0 @@
-package com.dfsek.terra.addons.biome;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Final;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ValidatedConfigTemplate;
-import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockType;
-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.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.api.world.generator.Palette;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@SuppressWarnings({"FieldMayBeFinal", "unused"})
-public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTemplate {
-    private final ConfigPack pack;
-
-    @Value("id")
-    @Final
-    private @Meta String id;
-
-    @Value("extends")
-    @Final
-    @Default
-    private List<String> extended = Collections.emptyList();
-
-    @Value("variables")
-    @Default
-    private @Meta Map<String, @Meta Double> variables = new HashMap<>();
-
-    @Value("beta.carving.equation")
-    @Default
-    private @Meta NoiseSampler carvingEquation = NoiseSampler.zero();
-
-    @Value("vanilla")
-    private @Meta ProbabilityCollection<Biome> vanilla;
-
-    @Value("biome-noise")
-    @Default
-    private @Meta NoiseSampler biomeNoise = NoiseSampler.zero();
-
-    @Value("blend.distance")
-    @Default
-    private @Meta int blendDistance = 3;
-
-    @Value("blend.weight")
-    @Default
-    private @Meta double blendWeight = 1;
-
-    @Value("blend.step")
-    @Default
-    private @Meta int blendStep = 4;
-
-    @Value("noise")
-    private @Meta NoiseSampler noiseEquation;
-
-    @Value("ocean.level")
-    @Default
-    private @Meta int seaLevel = 62;
-
-    @Value("elevation.equation")
-    @Default
-    private @Meta NoiseSampler elevationEquation = NoiseSampler.zero();
-
-    @Value("elevation.weight")
-    @Default
-    private @Meta double elevationWeight = 1;
-
-    @Value("slabs.enable")
-    @Default
-    private @Meta boolean doSlabs = false;
-
-    @Value("slabs.threshold")
-    @Default
-    private @Meta double slabThreshold = 0.0075D;
-
-    @Value("slabs.palettes")
-    @Default
-    private @Meta Map<@Meta BlockType, @Meta Palette> slabPalettes;
-
-    @Value("slabs.stair-palettes")
-    @Default
-    private @Meta Map<@Meta BlockType, @Meta Palette> stairPalettes;
-
-    @Value("interpolate-elevation")
-    @Default
-    private @Meta boolean interpolateElevation = true;
-
-    @Value("color")
-    @Final
-    @Default
-    private @Meta int color = 0;
-
-    @Value("tags")
-    @Default
-    private @Meta Set<@Meta String> tags = new HashSet<>();
-
-    @Value("colors")
-    @Default
-    private @Meta Map<String, @Meta Integer> colors = new HashMap<>(); // Plain ol' map, so platforms can decide what to do with colors (if anything).
-
-    public BiomeTemplate(ConfigPack pack, TerraPlugin main) {
-        this.pack = pack;
-    }
-
-    public List<String> getExtended() {
-        return extended;
-    }
-
-    public Set<String> getTags() {
-        return tags;
-    }
-
-    public Map<String, Integer> getColors() {
-        return colors;
-    }
-
-    public double getBlendWeight() {
-        return blendWeight;
-    }
-
-    public int getColor() {
-        return color;
-    }
-
-    public int getBlendDistance() {
-        return blendDistance;
-    }
-
-    public boolean interpolateElevation() {
-        return interpolateElevation;
-    }
-
-    public double getSlabThreshold() {
-        return slabThreshold;
-    }
-
-    public boolean doSlabs() {
-        return doSlabs;
-    }
-
-    public Map<BlockType, Palette> getSlabPalettes() {
-        return slabPalettes;
-    }
-
-    public Map<BlockType, Palette> getStairPalettes() {
-        return stairPalettes;
-    }
-
-    public NoiseSampler getBiomeNoise() {
-        return biomeNoise;
-    }
-
-    public NoiseSampler getElevationEquation() {
-        return elevationEquation;
-    }
-
-    public NoiseSampler getCarvingEquation() {
-        return carvingEquation;
-    }
-
-    public ConfigPack getPack() {
-        return pack;
-    }
-
-    public int getSeaLevel() {
-        return seaLevel;
-    }
-
-    public String getID() {
-        return id;
-    }
-
-    public ProbabilityCollection<Biome> getVanilla() {
-        return vanilla;
-    }
-
-    public NoiseSampler getNoiseEquation() {
-        return noiseEquation;
-    }
-
-    public double getElevationWeight() {
-        return elevationWeight;
-    }
-
-    public int getBlendStep() {
-        return blendStep;
-    }
-
-    public Map<String, Double> getVariables() {
-        return variables;
-    }
-
-    @Override
-    public boolean validate() throws ValidationException {
-        color |= 0xff000000; // Alpha adjustment
-        return true;
-    }
-}
@@ -1,18 +0,0 @@
-package com.dfsek.terra.addons.biome;
-
-import com.dfsek.terra.addons.biome.holder.PaletteHolder;
-import com.dfsek.terra.api.world.biome.PaletteSettings;
-import com.dfsek.terra.api.world.generator.Palette;
-
-public class PaletteSettingsImpl implements PaletteSettings {
-    private final PaletteHolder palette;
-
-    public PaletteSettingsImpl(PaletteHolder palette) {
-        this.palette = palette;
-    }
-
-    @Override
-    public Palette getPalette(int y) {
-        return palette.getPalette(y);
-    }
-}
@@ -1,22 +0,0 @@
-package com.dfsek.terra.addons.biome.holder;
-
-import com.dfsek.terra.api.world.generator.Palette;
-
-public class PaletteHolder {
-    private final Palette[] palettes;
-    private final int offset;
-
-    protected PaletteHolder(Palette[] palettes, int offset) {
-        this.palettes = palettes;
-        this.offset = offset;
-    }
-
-    public Palette getPalette(int y) {
-        int index = y + offset;
-        return index >= 0
-                ? index < palettes.length
-                ? palettes[index]
-                : palettes[palettes.length - 1]
-                : palettes[0];
-    }
-}
@@ -1,25 +0,0 @@
-package com.dfsek.terra.addons.biome.holder;
-
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.world.generator.Palette;
-
-import java.lang.reflect.AnnotatedType;
-import java.util.List;
-import java.util.Map;
-
-public class PaletteHolderLoader implements TypeLoader<PaletteHolder> {
-    @SuppressWarnings("unchecked")
-    @Override
-    public PaletteHolder load(AnnotatedType type, Object o, ConfigLoader configLoader) throws LoadException {
-        List<Map<String, Integer>> palette = (List<Map<String, Integer>>) o;
-        PaletteHolderBuilder builder = new PaletteHolderBuilder();
-        for(Map<String, Integer> layer : palette) {
-            for(Map.Entry<String, Integer> entry : layer.entrySet()) {
-                builder.add(entry.getValue(), configLoader.loadType(Palette.class, entry.getKey()));
-            }
-        }
-        return builder.build();
-    }
-}
@@ -1,3 +0,0 @@
-# config-carver
-
-Registers the default configuration for Terra Carvers, `CARVER`.
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,88 +0,0 @@
-package com.dfsek.terra.addons.carver;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.config.WorldConfig;
-import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.api.util.PopulationUtil;
-import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.generator.Chunkified;
-import com.dfsek.terra.api.world.generator.GenerationStage;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-public class CavePopulator implements GenerationStage, Chunkified {
-    private static final Map<BlockType, BlockState> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time.
-    private final TerraPlugin main;
-
-    public CavePopulator(TerraPlugin main) {
-        this.main = main;
-    }
-
-    @SuppressWarnings("try")
-    @Override
-    public void populate(@NotNull World world, @NotNull Chunk chunk) {
-        try(ProfileFrame ignore = main.getProfiler().profile("carving")) {
-            Random random = PopulationUtil.getRandom(chunk);
-            WorldConfig config = world.getConfig();
-            if(config.disableCarving()) return;
-
-            for(UserDefinedCarver c : config.getRegistry(UserDefinedCarver.class).entries()) {
-                CarverTemplate template = c.getConfig();
-                Map<Vector3, BlockState> shiftCandidate = new HashMap<>();
-                c.carve(chunk.getX(), chunk.getZ(), world, (v, type) -> {
-                    try(ProfileFrame ignored = main.getProfiler().profile("carving:" + c.getConfig().getID())) {
-                        BlockState m = chunk.getBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ());
-                        BlockType re = m.getBlockType();
-                        switch(type) {
-                            case CENTER:
-                                if(template.getInner().canReplace(re)) {
-                                    chunk.setBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ(), template.getInner().get(v.getBlockY()).get(random), template.getUpdate().contains(re));
-                                    if(template.getShift().containsKey(re)) shiftCandidate.put(v, m);
-                                }
-                                break;
-                            case WALL:
-                                if(template.getOuter().canReplace(re)) {
-                                    chunk.setBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ(), template.getOuter().get(v.getBlockY()).get(random), template.getUpdate().contains(re));
-                                    if(template.getShift().containsKey(re)) shiftCandidate.put(v, m);
-                                }
-                                break;
-                            case TOP:
-                                if(template.getTop().canReplace(re)) {
-                                    chunk.setBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ(), template.getTop().get(v.getBlockY()).get(random), template.getUpdate().contains(re));
-                                    if(template.getShift().containsKey(re)) shiftCandidate.put(v, m);
-                                }
-                                break;
-                            case BOTTOM:
-                                if(template.getBottom().canReplace(re)) {
-                                    chunk.setBlock(v.getBlockX(), v.getBlockY(), v.getBlockZ(), template.getBottom().get(v.getBlockY()).get(random), template.getUpdate().contains(re));
-                                    if(template.getShift().containsKey(re)) shiftCandidate.put(v, m);
-                                }
-                                break;
-                        }
-                    }
-                });
-                for(Map.Entry<Vector3, BlockState> entry : shiftCandidate.entrySet()) {
-                    Vector3 l = entry.getKey();
-                    Vector3 mut = l.clone();
-                    BlockState orig = chunk.getBlock(l.getBlockX(), l.getBlockY(), l.getBlockZ());
-                    do mut.subtract(0, 1, 0);
-                    while(mut.getY() > world.getMinHeight() && chunk.getBlock(mut.getBlockX(), mut.getBlockY(), mut.getBlockZ()).matches(orig));
-                    try {
-                        if(template.getShift().get(entry.getValue().getBlockType()).contains(chunk.getBlock(mut.getBlockX(), mut.getBlockY(), mut.getBlockZ()).getBlockType())) {
-                            chunk.setBlock(mut.getBlockX(), mut.getBlockY(), mut.getBlockZ(), shiftStorage.computeIfAbsent(entry.getValue().getBlockType(), BlockType::getDefaultData), false);
-                        }
-                    } catch(NullPointerException ignored) {
-                    }
-                }
-            }
-
-        }
-    }
-}
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,50 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor;
-
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.distributor.config.AndDistributorTemplate;
-import com.dfsek.terra.addons.feature.distributor.config.NoiseDistributorTemplate;
-import com.dfsek.terra.addons.feature.distributor.config.OrDistributorTemplate;
-import com.dfsek.terra.addons.feature.distributor.config.PointSetDistributorTemplate;
-import com.dfsek.terra.addons.feature.distributor.util.Point;
-import com.dfsek.terra.addons.feature.distributor.util.PointTemplate;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.structure.feature.Distributor;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
-import java.util.function.Supplier;
-
-@Addon("config-distributors")
-@Version("1.0.0")
-@Author("Terra")
-public class DistributorAddon extends TerraAddon {
-    public static final TypeKey<Supplier<ObjectTemplate<Distributor>>> DISTRIBUTOR_TOKEN = new TypeKey<>() {
-    };
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Distributor>>> distributorRegistry = event.getPack().getOrCreateRegistry(DISTRIBUTOR_TOKEN);
-                    distributorRegistry.register("NOISE", NoiseDistributorTemplate::new);
-                    distributorRegistry.register("POINTS", PointSetDistributorTemplate::new);
-                    distributorRegistry.register("AND", AndDistributorTemplate::new);
-                    distributorRegistry.register("OR", OrDistributorTemplate::new);
-
-                    event.getPack()
-                            .applyLoader(Point.class, PointTemplate::new);
-                })
-                .failThrough();
-    }
-}
@@ -1,31 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.config;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ValidatedConfigTemplate;
-import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.feature.Distributor;
-
-import java.util.List;
-
-public class AndDistributorTemplate implements ObjectTemplate<Distributor>, ValidatedConfigTemplate {
-    @Value("distributors")
-    private @Meta List<@Meta Distributor> distributors;
-
-
-    @Override
-    public Distributor get() {
-        Distributor current = distributors.remove(0);
-        while(!distributors.isEmpty()) {
-            current = current.and(distributors.remove(0));
-        }
-        return current;
-    }
-
-    @Override
-    public boolean validate() throws ValidationException {
-        if(distributors.isEmpty()) throw new ValidationException("AND Distributor must specify at least 1 distributor.");
-        return true;
-    }
-}
@@ -1,23 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.config;
-
-import com.dfsek.tectonic.annotations.Default;
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.distributor.distributors.NoiseDistributor;
-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 NoiseDistributorTemplate implements ObjectTemplate<Distributor> {
-    @Value("distribution")
-    private @Meta NoiseSampler noise;
-
-    @Value("threshold")
-    @Default
-    private @Meta double threshold = 0;
-
-    @Override
-    public Distributor get() {
-        return new NoiseDistributor(noise, threshold);
-    }
-}
@@ -1,31 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.config;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.config.ValidatedConfigTemplate;
-import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.feature.Distributor;
-
-import java.util.List;
-
-public class OrDistributorTemplate implements ObjectTemplate<Distributor>, ValidatedConfigTemplate {
-    @Value("distributors")
-    private @Meta List<@Meta Distributor> distributors;
-
-
-    @Override
-    public Distributor get() {
-        Distributor current = distributors.remove(0);
-        while(!distributors.isEmpty()) {
-            current = current.or(distributors.remove(0));
-        }
-        return current;
-    }
-
-    @Override
-    public boolean validate() throws ValidationException {
-        if(distributors.isEmpty()) throw new ValidationException("AND Distributor must specify at least 1 distributor.");
-        return true;
-    }
-}
@@ -1,20 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.config;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.addons.feature.distributor.distributors.PointSetDistributor;
-import com.dfsek.terra.addons.feature.distributor.util.Point;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.feature.Distributor;
-
-import java.util.Set;
-
-public class PointSetDistributorTemplate implements ObjectTemplate<Distributor> {
-    @Value("points")
-    private @Meta Set<@Meta Point> points;
-
-    @Override
-    public Distributor get() {
-        return new PointSetDistributor(points);
-    }
-}
@@ -1,20 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.distributors;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.structure.feature.Distributor;
-
-public class NoiseDistributor implements Distributor {
-    private final NoiseSampler sampler;
-
-    private final double threshold;
-
-    public NoiseDistributor(NoiseSampler sampler, double threshold) {
-        this.sampler = sampler;
-        this.threshold = threshold;
-    }
-
-    @Override
-    public boolean matches(int x, int z, long seed) {
-        return sampler.getNoiseSeeded(seed, x, z) > threshold;
-    }
-}
@@ -1,19 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.distributors;
-
-import com.dfsek.terra.addons.feature.distributor.util.Point;
-import com.dfsek.terra.api.structure.feature.Distributor;
-
-import java.util.Set;
-
-public class PointSetDistributor implements Distributor {
-    private final Set<Point> points;
-
-    public PointSetDistributor(Set<Point> points) {
-        this.points = points;
-    }
-
-    @Override
-    public boolean matches(int x, int z, long seed) {
-        return points.contains(new Point(x, z));
-    }
-}
@@ -1,34 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.util;
-
-public class Point {
-    private final int x;
-    private final int z;
-
-    private final int hash;
-
-    public Point(int x, int z) {
-        this.x = x;
-        this.z = z;
-        this.hash = 31 * x + z;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getZ() {
-        return z;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(!(obj instanceof Point)) return false;
-        Point that = (Point) obj;
-        return this.x == that.x && this.z == that.z;
-    }
-}
@@ -1,18 +0,0 @@
-package com.dfsek.terra.addons.feature.distributor.util;
-
-import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.config.meta.Meta;
-
-public class PointTemplate implements ObjectTemplate<Point> {
-    @Value("x")
-    private @Meta int x;
-
-    @Value("z")
-    private @Meta int z;
-
-    @Override
-    public Point get() {
-        return new Point(x, z);
-    }
-}
@@ -1,2 +0,0 @@
-dependencies {
-}
@@ -1,39 +0,0 @@
-package com.dfsek.terra.addons.feature;
-
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.terra.api.structure.feature.Distributor;
-import com.dfsek.terra.api.structure.feature.Feature;
-import com.dfsek.terra.api.structure.feature.Locator;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.World;
-
-public class ConfiguredFeature implements Feature {
-    private final ProbabilityCollection<Structure> structures;
-
-    private final NoiseSampler structureSelector;
-    private final Distributor distributor;
-    private final Locator locator;
-
-    public ConfiguredFeature(ProbabilityCollection<Structure> structures, NoiseSampler structureSelector, Distributor distributor, Locator locator) {
-        this.structures = structures;
-        this.structureSelector = structureSelector;
-        this.distributor = distributor;
-        this.locator = locator;
-    }
-
-    @Override
-    public Structure getStructure(World world, int x, int y, int z) {
-        return structures.get(structureSelector, x, y, z, world.getSeed());
-    }
-
-    @Override
-    public Distributor getDistributor() {
-        return distributor;
-    }
-
-    @Override
-    public Locator getLocator() {
-        return locator;
-    }
-}
@@ -1,27 +0,0 @@
-package com.dfsek.terra.addons.feature;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addon.annotations.Version;
-import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
-import com.dfsek.terra.api.injection.annotations.Inject;
-
-@Addon("config-feature")
-@Version("1.0.0")
-@Author("Terra")
-public class FeatureAddon extends TerraAddon {
-    @Inject
-    private TerraPlugin main;
-
-    @Override
-    public void initialize() {
-        main.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(this, ConfigPackPreLoadEvent.class)
-                .then(event -> event.getPack().registerConfigType(new FeatureConfigType(), "FEATURE", 2))
-                .failThrough();
-    }
-}
@@ -1,38 +0,0 @@
-package com.dfsek.terra.addons.feature;
-
-import com.dfsek.terra.api.TerraPlugin;
-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.registry.OpenRegistry;
-import com.dfsek.terra.api.structure.feature.Feature;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
-import java.util.function.Supplier;
-
-public class FeatureConfigType implements ConfigType<FeatureTemplate, Feature> {
-    public static final TypeKey<Feature> FEATURE_TYPE_KEY = new TypeKey<>() {
-    };
-
-    private final FeatureFactory factory = new FeatureFactory();
-
-    @Override
-    public FeatureTemplate getTemplate(ConfigPack pack, TerraPlugin main) {
-        return new FeatureTemplate();
-    }
-
-    @Override
-    public ConfigFactory<FeatureTemplate, Feature> getFactory() {
-        return factory;
-    }
-
-    @Override
-    public TypeKey<Feature> getTypeKey() {
-        return FEATURE_TYPE_KEY;
-    }
-
-    @Override
-    public Supplier<OpenRegistry<Feature>> registrySupplier(ConfigPack pack) {
-        return pack.getRegistryFactory()::create;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dfsek	e0d7b03820	fix funny ProbabilityCollection bug	2021-06-14 19:45:41 -07:00
dfsek	68aa38a51a	fix ProbabilityCollection#getProbability	2021-06-14 19:39:04 -07:00
dfsek	beb07337ae	fix NPE	2021-06-14 19:20:00 -07:00
dfsek	2010c48664	mutator meta	2021-06-14 19:15:52 -07:00
dfsek	7473119238	improve ProbabilityCollection#map impl	2021-06-14 19:13:16 -07:00
dfsek	733b9fab4b	biome source meta-fication	2021-06-14 18:06:22 -07:00
dfsek	64cf6538cb	meta-ify remaining biome stuff	2021-06-14 17:59:48 -07:00
dfsek	9c86d015f0	meta-ify BiomePipelineTemplate	2021-06-14 17:55:47 -07:00
dfsek	008084fae9	TreeLayerLoader -> TreeLayerTemplate	2021-06-14 14:21:42 -07:00
dfsek	139f67af52	oreconfigloader -> OreConfigTemplate	2021-06-14 14:15:21 -07:00
dfsek	2020ef31e4	convert GridSpawnLoader to object template	2021-06-14 14:00:33 -07:00
dfsek	c6636a72da	convert FloraLayerLoader to object template	2021-06-14 13:58:15 -07:00
dfsek	97b3042357	meta noise type	2021-06-14 13:53:03 -07:00
dfsek	3aaedcf74f	normalizer meta	2021-06-14 13:33:57 -07:00
dfsek	f0655d1bb9	noise meta	2021-06-14 13:32:28 -07:00
dfsek	bdce485ca5	refactor metavalues	2021-06-14 13:19:49 -07:00
dfsek	78991c667c	noise function metavalues	2021-06-14 01:44:19 -07:00
dfsek	df45aecdab	fractal noise meta	2021-06-14 01:35:17 -07:00
dfsek	571a5fdf3a	meta values in config manifest	2021-06-14 01:33:06 -07:00
dfsek	1610d4e0c9	finish implementing GenericMetaValueLoader	2021-06-14 01:00:37 -07:00
dfsek	1e43365bbf	implement PackMetaContext	2021-06-14 00:54:26 -07:00
dfsek	587cb8755f	work on metavalue loading	2021-06-12 02:23:34 -07:00
dfsek	f90f7bd063	more metaconfig API	2021-06-10 00:16:14 -07:00
dfsek	d95239a5dd	start working on meta loaders	2021-06-08 23:50:03 -07:00
dfsek	91703c4fc9	rudimentary metaconfig API	2021-06-08 23:20:47 -07:00
dfsek	1b05ca8e96	source compatibility still java 8 We aren't sure what to do with Java versions yet, so I'm setting source compatibility to Java 8 until we figure it out.	2021-06-08 15:28:03 -07:00