use Ranges

.editorconfig

@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = false
 max_line_length = 140
 tab_width = 4
-ij_continuation_indent_size = 4
+ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
@@ -25,12 +25,12 @@ ij_java_align_multiline_annotation_parameters = true
 ij_java_align_multiline_array_initializer_expression = true
 ij_java_align_multiline_assignment = true
 ij_java_align_multiline_binary_operation = true
-ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_chained_methods = true
 ij_java_align_multiline_extends_list = true
 ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_method_parentheses = true
 ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parameters_in_calls = true
 ij_java_align_multiline_parenthesized_expression = true
 ij_java_align_multiline_records = true
 ij_java_align_multiline_resources = true
@@ -127,7 +127,7 @@ ij_java_keep_blank_lines_in_declarations = 2
 ij_java_keep_builder_methods_indents = true
 ij_java_keep_control_statement_in_one_line = true
 ij_java_keep_first_column_comment = false
-ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_indents_on_empty_lines = true
 ij_java_keep_line_breaks = true
 ij_java_keep_multiple_expressions_in_one_line = false
 ij_java_keep_simple_blocks_in_one_line = true
@@ -577,14 +577,14 @@ ij_properties_keep_blank_lines = false
 ij_properties_key_value_delimiter = equals
 ij_properties_spaces_around_key_value_delimiter = false
 
-[{*.yml, *.yaml}]
+[{*.yaml, *.yml}]
 indent_size = 2
 ij_visual_guides = none
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false
 ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_indents_on_empty_lines = true
 ij_yaml_keep_line_breaks = true
 ij_yaml_sequence_on_new_line = false
 ij_yaml_space_before_colon = false

.github/CODEOWNERS

@@ -1,14 +1,19 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax @duplexsystem @astrsh @justaureus
+*                   @dfsek @solonovamax
 
 # Platforms
-/platforms/         @dfsek @solonovamax @duplexsystem @justaureus
-/platforms/bukkit   @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf
+## dfsek wrote the majority of the platform impls
+/platforms/bukkit/  @dfsek
+/platforms/fabric/  @dfsek
+/platforms/forge/   @dfsek
+/platforms/sponge/  @dfsek
+## solonovamax is working on the region generator (unless duplexsystem takes it over)
+/platforms/region/  @solonovamax
 
 # Common
-/common/            @dfsek @solonovamax @duplexsystem @astrsh
+/common/            @dfsek @solonovamax
 
 # Gradle Stuff
-/buildSrc/          @dfsek @solonovamax @duplexsystem
-*.gradle.kts        @dfsek @solonovamax @duplexsystem
-/gradle/            @dfsek @solonovamax @duplexsystem
+## Most gradle stuff was written by solonovamax
+/buildSrc/           @solonovamax
+*.gradle.kts        @solonovamax

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -51,13 +51,13 @@ assignees: ""
 
 <!-- You can fill out the different items by putting the correct value beside each cell. -->
 
-| Name                         | Value                                                                                                                                                                       |
-|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Terra Version                | <!-- Put your Terra version here. (remove the comment) -->                                                                                                                  
-| Platform / Platform Version  | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) --> 
-| Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->                                       
-| Terra Packs In Use           | <!-- Put a list of all the Terra packs you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te packs may be used to get a list) -->     
-| Terra Addons In Use          | <!-- Put a list of all the Terra addons you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te addons may be used to get a list) -->   
+| Name                         | Value |
+|------------------------------|-------|
+| Terra Version                | <!-- Put your Terra version here. (remove the comment) -->
+| Platform / Platform Version  | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) -->
+| Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->
+| Terra Packs In Use           | <!-- Put a list of all the Terra packs you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te packs may be used to get a list) -->
+| Terra Addons In Use          | <!-- Put a list of all the Terra addons you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te addons may be used to get a list) -->
 
 ## Issue Description
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,58 @@
 # Pull Request
 
-## Description
+## Brief description.
 
-<!-- Include a description of the PR here -->
+<!-- Please provide a brief description of the goals of your PR -->
 
 <!--
-If applicable, include 'Fixes #XXXX' or 'Closes #XXXX' for any related open issues.
-This helps us relate, track, and close the relevant issues.
+###########################################################################
+## WARNING!                                                              ##
+## IGNORING THE FOLLOWING TEMPLATE WILL RESULT IN YOUR PR BEING CLOSED   ##
+###########################################################################
+-->
+<!--
+  Please go through this checklist item by item and make sure you have successfully completed each of these steps.
+    - Your pull request MUST be either on the latest version of Terra, or on a branch for a future release.
+    - Make sure that there are no already existing PRs that fix this. If so, it will be closed as a duplicate.
+    - Make sure that this change is actually within the scope of Terra and is something a terrain generator should be doing.
+    - Make sure that this is not an issue with a specific Terra *pack*, and instead applies to all of Terra.
+    - Make sure that you have filled out all the required information and given descriptions of everything.
+-->
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+### What Issues Does This Fix?
+
+<!--
+    Put Fix #XXXX or Closes #XXXX here if there are any open issues that this PR fixes.
+    This is to automatically close the relevant issues.
+    You may remove this if there is no issue for this PR.
+    But unless this is a very small change, you should make an issue for it.
 -->
 
-### Changelog
+## Licensing
+
+<!-- In order to be accepted, your changes must be under the GPLv3 license. Please check one of the following: -->
+
+- [ ] I am the original author of this code, and I am willing to release it
+  under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
+- [ ] I am not the original author of this code, but it is in public domain or
+  released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a
+  compatible license.
+    <!--
+      Please provide reliable evidence of this.
+      NOTE: for compatible licenses, you must make sure to add the included license somewhere in the program, if so required.
+      (And even if it's not required, it's still nice to do it. Also add attribution somewhere.)
+    -->
+
+## Goal of the PR
 
 <!--
-Fill out a changelog below of what has been done, and what might be planned to be done. 
-You may delete this if your PR is not adding new features, only fixing bugs or adding translations.
+    What is the goal of the PR?
+    Put a checklist here of what has been done
+    (and what *hasn't*, but you plan to do),
+    so we can easily know what was changed.
+    Note: this is only required for PRs that add new features.
+    If your PR is not adding new features, only fixing bugs or adding translations, then you may delete this section.
 -->
 
 - [ ] <!-- First thing -->
@@ -22,59 +61,47 @@ You may delete this if your PR is not adding new features, only fixing bugs or a
 - [ ] <!-- Second thing -->
 - [ ] <!-- etc. -->
 
-## Checklist
+## Affects of the PR
 
-<!--
-Select the options below that apply.
-You must put an x in all the boxes that it applies to. (Like this: [x])
+<!---
+    What types of changes does your code introduce? (Select any that apply. You may select multiple.)
+    You must put an x in all the boxes that it applies to. (Like this: [x])
 -->
 
-#### Mandatory checks
-
-- [ ] The base branch of this PR is an unreleased version branch (that has a `ver/` prefix)
-  or is a branch that is intended to be merged into a version branch.
-  <!--
-  This is not applicable if the PR is a version branch itself.
-  PRs for new versions should use the `master` branch instead.
-  -->
-- [ ] There are no already existing PRs that provide the same changes.
-  <!-- If this is not applicable, the PR will be removed as a duplicate. -->
-- [ ] The PR is within the scope of Terra (i.e. is something a configurable terrain generator should be doing).
-- [ ] Changes follow the code style for this project.
-  <!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
-- [ ] I have read the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
-  document in the root of the git repository.
-- [ ] LLM-based tools were not used to create this PR. (ChatGPT, Claude, etc)
-
 #### Types of changes
 
-- [ ] Bug Fix <!-- Changes include bug fixes. -->
-- [ ] Build system <!-- Changes the build system. -->
-- [ ] Documentation <!-- Changes add to or improve documentation. -->
-- [ ] New Feature <!-- Changes add new functionality to Terra. -->
-- [ ] Performance <!-- Changes improve the performance of Terra. -->
-- [ ] Refactoring <!-- Changes do not add any new code, only moves code around. -->
-- [ ] Repository <!-- Changes affect the repository. E.g. changes to the `README.md` file. -->
-- [ ] Revert <!-- Changes revert previous commits. -->
-- [ ] Style <!-- Changes update style, namely the .editorconfig file. -->
-- [ ] Tests <!-- Changes add or update tests. -->
-- [ ] Translation <!-- Changes include translations to other languages for Terra. -->
+- [ ] Bug Fix <!-- Anything which fixes an issue in Terra. -->
+- [ ] Build system <!-- Anything which pretain to the build system. -->
+- [ ] Documentation <!-- Anything which adds or improves documentation for existing features. -->
+- [ ] New Feature <!-- Anything which adds new functionality to Terra. -->
+- [ ] Performance <!-- Anything which is imrpoves the performance of Terra. -->
+- [ ] Refactoring <!-- Anything which does not add any new code, only moves code around. -->
+- [ ] Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
+- [ ] Revert <!-- Anything which reverts previous commits. -->
+- [ ] Style <!-- Anything which updates style. -->
+- [ ] Tests <!-- Anything which adds or updates tests. -->
+- [ ] Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
 
-#### Compatibility
+#### Compatiblity
 
-<!-- The following options determine if the PR pertains to a major, minor, or patch version bump -->
+- [ ] Breaking
+  change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
+- [ ] Non-Breaking change.
+    <!--
+        A change which does not break *any* previous functionality of Terra.
+        (ie. is backwards compatible and will work with *any* previously existing supported features.
+        Note: if a feature is annotated with @Incubating, @Preview, @Experimental,
+        or is in a package called something similar to the previous annotations,
+        then you may push breaking changes to only THOSE parts of Terra.)
+    -->
 
-- [ ] Introduces a breaking change
-  <!--
-  Breaking changes are any fix or feature that breaks some previous functionality to Terra / is not backwards compatible.
-  Breaking changes do not include:
-    - changes that are backwards compatible and will work with *any* previously existing supported features.
-    - changes to code marked as in a pre-release
-      state (annotated with @Incubating, @Preview, @Experimental
-      or in a package called something similar to the previous annotations)
-  -->
-- [ ] Introduces new functionality in a backwards compatible way.
-- [ ] Introduces bug fixes
+#### Contribution Guidelines.
+
+- [ ] I have read
+  the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
+  document in the root of the git repository.
+- [ ] My code follows the code style for this
+  project. <!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
 
 #### Documentation
 
@@ -85,21 +112,7 @@ You must put an x in all the boxes that it applies to. (Like this: [x])
 
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.
-  <!--
-  Tests are typically not necessary for small changes.
-  Including *some* testing is recommended for large changes where applicable.
-  -->
-
-#### Licensing
-
-<!-- In order to be accepted, your changes must be under the GPLv3 license. Please check one of the following: -->
-
-- [ ] I am the original author of this code, and I am willing to
-  release it under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
-- [ ] I am not the original author of this code, but it is in public domain or
-  released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) or a compatible license.
-  <!--
-  Please provide reliable evidence of this. LLM-generated code does not satisfy this requirement.
-  NOTE: for compatible licenses, you must make sure to add the included license somewhere in the program, if so required.
-  (And even if it's not required, it's still nice to do it. Also add attribution somewhere.)
-  -->
+    <!--
+        If it only introduces small changes, you don't need to add tests.
+        But if you add big changes, you should probably at least write *some* testing, where applicable.
+    -->

.github/workflows/gradle-build.yml

@@ -1,47 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-name: Gradle Build
-
-on: [ pull_request ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.1
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - uses: burrunan/gradle-cache-action@v3.0.1
-        name: Build Terra
-        with:
-          # Specifies arguments for Gradle execution
-          # If arguments is missing or empty, then Gradle is not executed
-          arguments: build
-          # arguments can be multi-line for better readability
-          # arguments: |
-          #  --no-paralell
-          #  build
-          #  -x test
-          # Gradle version to use for execution:
-          #   wrapper (default), current, rc, nightly, release-nightly, or
-          #   versions like 6.6 (see https://services.gradle.org/versions/all)
-          gradle-version: wrapper
-          # Properties are passed as -Pname=value
-          properties: |
-            kotlin.js.compiler=ir
-            kotlin.parallel.tasks.in.project=true

.gitignore

@@ -249,5 +249,3 @@ nbdist/
 
 platforms/**/run/**
 
-#Vale Config File
-**/.vale.ini

CONTRIBUTING.md

@@ -258,9 +258,6 @@ as [GitHub Pull Requests](https://guides.github.com/activities/forking/#making-a
   see instead** and why.
 - **Explain why this enhancement would be useful** to most Terra users and isn't
   something that can or should be implemented as an addon.
-- **Do not use LLM/"AI" tools to create your pull request.** Your pr should be written
-  by you. Using an LLM to automate small, tedious tasks (regex and other fiddly things like it)
-  is acceptable, but submitting a low-effort, completely LLM-generated PR will result in a ban.
 
 ## Styleguides
 
@@ -384,7 +381,7 @@ compatibilities are welcome and encouraged, in the form of addons.**
 
 ### Platform-Agnostic Design
 
-Terra must, at all times, remain platform-agnostic. This means it must be able
+Terra must, at all times, remain platform agnostic. This means it must be able
 to run on theoretically any voxel based platform. Including non-minecraft games
 like Terasology.
 
@@ -394,7 +391,7 @@ it'll be running on.
 Examples:
 
 - Don't assume the world height is 256.
-- Don't assume that a specific block, item, or entity exists. (E.g. don't assume
+- Don't assume that a specific block, item, or entity exists. (Eg. don't assume
   there exists a block called `minecraft:grass_block`)
 
 ### Data-Driven

Jenkinsfile

@@ -1,149 +0,0 @@
-pipeline {
-    agent any
-
-    tools {
-        jdk "Temurin Java 21"
-    }
-
-    triggers {
-        githubPush()
-    }
-
-    environment {
-        DISCORD_WEBHOOK_URL = credentials('polydev-discord-webhook-url')
-    }
-
-    stages {
-        stage('Checkout') {
-            steps {
-                scmSkip(deleteBuild: true)
-            }
-        }
-
-        stage('Setup Gradle') {
-            steps {
-                sh 'chmod +x gradlew'
-            }
-        }
-
-        stage('Build') {
-            steps {
-                withGradle {
-                    sh './gradlew build --rerun-tasks -x check'
-                    sh './gradlew javadoc'
-                }
-            }
-
-            post {
-                success {
-                    archiveArtifacts artifacts: 'platforms/fabric/build/libs/Terra-fabric*.jar,platforms/bukkit/build/libs/Terra-bukkit*-shaded.jar,platforms/allay/build/libs/Terra-allay*.jar,platforms/minestom/build/libs/Terra-minestom*.jar', fingerprint: true, onlyIfSuccessful: true
-
-                    javadoc javadocDir: 'common/api/build/docs/javadoc', keepAll: true
-                }
-            }
-        }
-
-        stage('Tests') {
-            steps {
-                withGradle {
-                    sh './gradlew test --rerun-tasks'
-                }
-            }
-        }
-
-//         stage('Deploy to snapshots repositories') {
-//             when {
-//                 allOf {
-//                     not { buildingTag() }
-//                     not { expression { env.TAG_NAME != null && env.TAG_NAME.matches('v\\d+\\.\\d+\\.\\d+') } }
-//                 }
-//             }
-//
-//             steps {
-//                 withCredentials([
-//                     string(credentialsId: 'maven-signing-key', variable: 'ORG_GRADLE_PROJECT_signingKey'),
-//                     string(credentialsId: 'maven-signing-key-password', variable: 'ORG_GRADLE_PROJECT_signingPassword'),
-//                     usernamePassword(
-//                         credentialsId: 'solo-studios-maven',
-//                         passwordVariable: 'ORG_GRADLE_PROJECT_SoloStudiosSnapshotsPassword',
-//                         usernameVariable: 'ORG_GRADLE_PROJECT_SoloStudiosSnapshotsUsername'
-//                     )
-//                 ]) {
-//                     withGradle {
-//                         sh './gradlew publishAllPublicationsToSoloStudiosSnapshotsRepository'
-//                     }
-//                 }
-//             }
-//         }
-
-        stage('Deploy to releases repositories') {
-//             when {
-//                 allOf {
-//                     buildingTag()
-//                     expression { env.TAG_NAME != null && env.TAG_NAME.matches('v\\d+\\.\\d+\\.\\d+') }
-//                 }
-//             }
-
-            steps {
-                withCredentials([
-                    string(credentialsId: 'maven-signing-key', variable: 'ORG_GRADLE_PROJECT_signingKey'),
-                    string(credentialsId: 'maven-signing-key-password', variable: 'ORG_GRADLE_PROJECT_signingPassword'),
-                    usernamePassword(
-                        credentialsId: 'solo-studios-maven',
-                        passwordVariable: 'ORG_GRADLE_PROJECT_SoloStudiosReleasesPassword',
-                        usernameVariable: 'ORG_GRADLE_PROJECT_SoloStudiosReleasesUsername'
-                    ),
-                    // TODO: does not yet exist (uncomment once added)
-                    // usernamePassword(
-                    //     credentialsId: 'sonatype-maven-credentials',
-                    //     passwordVariable: 'ORG_GRADLE_PROJECT_SonatypePassword',
-                    //     usernameVariable: 'ORG_GRADLE_PROJECT_SonatypeUsername'
-                    // ),
-                    // usernamePassword(
-                    //     credentialsId: 'codemc-maven-credentials',
-                    //     passwordVariable: 'ORG_GRADLE_PROJECT_CodeMCPassword',
-                    //     usernameVariable: 'ORG_GRADLE_PROJECT_CodeMCUsername'
-                    // )
-                ]) {
-                    withGradle {
-                        sh './gradlew publish'
-                        //sh './gradlew publishAllPublicationsToSoloStudiosReleasesRepository'
-                        // sh './gradlew publishAllPublicationsToSonatypeRepository'
-                        // sh './gradlew publishAllPublicationsToCodeMCRepository'
-                    }
-                }
-            }
-        }
-    }
-
-    post {
-        always {
-            discoverReferenceBuild()
-
-            // junit testResults: '**/build/test-results/*/TEST-*.xml'
-
-            recordIssues(
-                aggregatingResults: true,
-                enabledForFailure: true,
-                minimumSeverity: 'ERROR',
-                sourceCodeEncoding: 'UTF-8',
-                checksAnnotationScope: 'ALL',
-                sourceCodeRetention: 'LAST_BUILD',
-                tools: [java(), javaDoc()]
-            )
-
-            discordSend(
-                title: env.JOB_NAME + ' ' + env.BUILD_DISPLAY_NAME,
-                showChangeset: true,
-                enableArtifactsList: true,
-                link: env.BUILD_URL,
-                result: currentBuild.currentResult,
-                customAvatarUrl: 'https://github.com/PolyhedralDev.png',
-                customUsername: 'Solo Studios Jenkins',
-                webhookURL: env.DISCORD_WEBHOOK_URL,
-            )
-
-            cleanWs()
-        }
-    }
-}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Polyhedral Development
+Copyright (c) 2020-2021 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -47,7 +47,14 @@ JARs are produced in `platforms/<platform>/build/libs`.
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
 
 * Bukkit
-    * `runServer` - Run the Paper test server with Terra installed.
+    * `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.

build.gradle.kts

@@ -1,39 +1,38 @@
 preRelease(true)
 
-versionProjects(":common:api", version("7.0.0"))
-versionProjects(":common:implementation", version("7.0.0"))
-versionProjects(":platforms", version("7.0.0"))
+versionProjects(":common:api", version("6.4.0"))
+versionProjects(":common:implementation", version("6.4.0"))
+versionProjects(":platforms", version("6.4.0"))
 
 
 allprojects {
     group = "com.dfsek.terra"
-
+    
     configureCompilation()
     configureDependencies()
     configurePublishing()
-
+    
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
         options.isIncremental = true
-        options.release.set(21)
     }
-
+    
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
-
+        
         maxHeapSize = "2G"
         ignoreFailures = false
         failFast = true
         maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1
-
+        
         reports.html.required.set(false)
         reports.junitXml.required.set(false)
     }
-
+    
     tasks.withType<Copy>().configureEach {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
-
+    
     tasks.withType<Jar>().configureEach {
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
@@ -44,14 +43,13 @@ afterEvaluate {
         configureDistribution()
     }
     project(":platforms:bukkit:common").configureDistribution()
-    project(":platforms:minestom:example").configureDistribution()
     forSubProjects(":common:addons") {
-        apply(plugin = "com.gradleup.shadow")
-
+        apply(plugin = "com.github.johnrengelman.shadow")
+        
         tasks.named("build") {
             finalizedBy(tasks.named("shadowJar"))
         }
-
+        
         dependencies {
             "compileOnly"(project(":common:api"))
             "testImplementation"(project(":common:api"))

buildSrc/build.gradle.kts

@@ -3,30 +3,32 @@ plugins {
     kotlin("jvm") version embeddedKotlinVersion
 }
 
+buildscript {
+    configurations.all {
+        resolutionStrategy {
+            force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version
+            force("org.ow2.asm:asm-commons:9.3")
+        }
+    }
+}
+
 repositories {
     mavenCentral()
     gradlePluginPortal()
-    maven("https://maven.solo-studios.ca/releases") {
-        name = "Solo Studios"
-    }
-    maven("https://maven.solo-studios.ca/snapshots") {
-        name = "Solo Studios"
-    }
     maven("https://repo.codemc.org/repository/maven-public") {
         name = "CodeMC"
     }
-    maven("https://repo.papermc.io/repository/maven-public/") {
+    maven("https://papermc.io/repo/repository/maven-public/") {
         name = "PaperMC"
     }
 }
 
 dependencies {
-    //TODO Allow pulling from Versions.kt
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.9")
-
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.18")
-    implementation("org.ow2.asm", "asm", "9.9")
-    implementation("org.ow2.asm", "asm-tree", "9.9")
-    implementation("com.dfsek.tectonic", "common", "4.3.1")
-    implementation("org.yaml", "snakeyaml", "2.5")
+    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    
+    implementation("org.ow2.asm:asm:9.3")
+    implementation("org.ow2.asm:asm-tree:9.3")
+    implementation("com.dfsek.tectonic:common:4.2.0")
+    implementation("org.yaml:snakeyaml:1.27")
 }

buildSrc/src/main/kotlin/AddonConfig.kt

@@ -18,7 +18,7 @@ fun Project.addonDir(dir: File, task: Task) {
             matchingAddons(dir) {
                 it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
             }.forEach {
-                logger.info("Deleting old addon: " + it.absolutePath)
+                println("Deleting old addon: " + it.absolutePath)
                 it.delete()
             }
             forSubProjects(":common:addons") {
@@ -29,7 +29,7 @@ fun Project.addonDir(dir: File, task: Task) {
                 
                 val base = "${jar.archiveBaseName.get()}-${version}"
                 
-                logger.info("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
+                println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
                 
                 jar.archiveFile.orNull?.asFile?.copyTo(target)
             }

buildSrc/src/main/kotlin/CompilationConfig.kt

@@ -13,7 +13,6 @@ import org.gradle.kotlin.dsl.getByName
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
 import org.gradle.language.jvm.tasks.ProcessResources
-import org.gradle.plugins.ide.idea.model.IdeaModel
 
 fun Project.configureCompilation() {
     apply(plugin = "maven-publish")
@@ -22,16 +21,9 @@ fun Project.configureCompilation() {
     apply(plugin = "idea")
     apply<TectonicDocPlugin>()
     
-    configure<IdeaModel> {
-        module {
-            isDownloadJavadoc = true
-            isDownloadSources = true
-        }
-    }
-    
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     
     tasks.withType<JavaCompile> {

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -30,19 +30,13 @@ fun Project.configureDependencies() {
     repositories {
         mavenCentral()
         gradlePluginPortal()
-        maven("https://maven.solo-studios.ca/releases") {
-            name = "Solo Studios"
-        }
-        maven("https://maven.solo-studios.ca/snapshots") {
-            name = "Solo Studios"
-        }
         maven("https://maven.fabricmc.net/") {
             name = "FabricMC"
         }
         maven("https://repo.codemc.org/repository/maven-public") {
             name = "CodeMC"
         }
-        maven("https://repo.papermc.io/repository/maven-public/") {
+        maven("https://papermc.io/repo/repository/maven-public/") {
             name = "PaperMC"
         }
         maven("https://files.minecraftforge.net/maven/") {
@@ -54,20 +48,14 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
-            name = "Sonatype Snapshots"
-        }
-        maven("https://repo.onarandombox.com/multiverse-releases") {
-            name = "onarandombox"
-        }
     }
     
     dependencies {
-        testImplementation("org.junit.jupiter", "junit-jupiter", Versions.Libraries.Internal.junit)
-        "testRuntimeOnly"("org.junit.platform", "junit-platform-launcher")
-        compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
+        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        compileOnly("org.jetbrains:annotations:23.0.0")
         
-        compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
-        testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
+        compileOnly("com.google.guava:guava:30.0-jre")
+        testImplementation("com.google.guava:guava:30.0-jre")
     }
-}
+}

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -1,14 +1,15 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import io.papermc.paperweight.util.path
 import java.io.File
 import java.io.FileWriter
+import java.net.URI
 import java.net.URL
 import java.nio.file.FileSystems
-import java.nio.file.Path
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 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.TaskContainerScope
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
@@ -16,54 +17,17 @@ import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.named
 import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.Yaml
-import kotlin.io.path.copyTo
-import kotlin.io.path.createDirectories
-import kotlin.io.path.createFile
-import kotlin.io.path.exists
 
-private fun Project.installAddonsInto(dest: Path) {
-    FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
-        forSubProjects(":common:addons") {
-            val jar = getJarTask()
-            
-            logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-            
-            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-            val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
-            
-            if (!addonPath.exists()) {
-                addonPath.parent.createDirectories()
-                addonPath.createFile()
-                jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
-            }
-            
-        }
-    }
-}
 
 fun Project.configureDistribution() {
-    apply(plugin = "com.gradleup.shadow")
+    apply(plugin = "com.github.johnrengelman.shadow")
     
     val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
         group = "terra"
         doFirst {
-            try {
-                file("${buildDir}/resources/main/packs/").deleteRecursively()
-                file("${buildDir}/resources/main/metapacks/").deleteRecursively()
-                val overworldPackUrl =
-                    URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/Overworld.zip")
-                val reimagENDPackUrl =
-                    URL("https://github.com/PolyhedralDev/ReimagEND/releases/download/" + Versions.Terra.reimagENDConfig + "/ReimagEND.zip")
-                val tartarusPackUrl =
-                    URL("https://github.com/PolyhedralDev/Tartarus/releases/download/" + Versions.Terra.tartarusConfig + "/Tartarus.zip")
-                val defaultPackUrl =
-                    URL("https://github.com/PolyhedralDev/DefaultMetapack/releases/download/" + Versions.Terra.defaultConfig + "/default.zip")
-                downloadPack(overworldPackUrl, project)
-                downloadPack(reimagENDPackUrl, project)
-                downloadPack(tartarusPackUrl, project)
-                downloadPack(defaultPackUrl, project, true)
-            } catch (_: Exception) {
-            }
+            file("${buildDir}/resources/main/packs/").deleteRecursively()
+            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+            downloadPack(defaultPackUrl, project)
         }
     }
     
@@ -81,18 +45,25 @@ fun Project.configureDistribution() {
         
         doLast {
             // https://github.com/johnrengelman/shadow/issues/111
-            val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().path
-            installAddonsInto(dest)
-        }
-    }
-    
-    tasks.create("installAddonsIntoDefaultJar") {
-        group = "terra"
-        dependsOn(compileAddons)
-        
-        doLast {
-            val dest = tasks.named<Jar>("jar").get().archiveFile.get().path
-            installAddonsInto(dest)
+            val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
+            
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
+                forSubProjects(":common:addons") {
+                    val jar = getJarTask()
+                    
+                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                    
+                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
+                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
+                    
+                    if (!Files.exists(addonPath)) {
+                        Files.createDirectories(addonPath.parent)
+                        Files.createFile(addonPath)
+                        Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
+                    }
+                    
+                }
+            }
         }
     }
     
@@ -107,13 +78,6 @@ fun Project.configureDistribution() {
                 resources.computeIfAbsent("packs") { ArrayList() }.add(it.name)
             }
             
-            val metaPacksDir = File("${project.buildDir}/resources/main/metapacks/")
-            
-            metaPacksDir.walkTopDown().forEach {
-                if (it.isDirectory || !it.name.endsWith(".zip")) return@forEach
-                resources.computeIfAbsent("metapacks") { ArrayList() }.add(it.name)
-            }
-            
             val langDir = File("${project(":common:implementation").buildDir}/resources/main/lang/")
             
             langDir.walkTopDown().forEach {
@@ -125,8 +89,7 @@ fun Project.configureDistribution() {
                 val jar = getJarTask().archiveFileName.get()
                 resources.computeIfAbsent(
                     if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
-                    else "addons"
-                                         ) { ArrayList() }.add(jar)
+                    else "addons") { ArrayList() }.add(jar)
             }
             
             val options = DumperOptions()
@@ -147,7 +110,7 @@ fun Project.configureDistribution() {
             FileWriter(manifest).use {
                 yaml.dump(resources, it)
             }
-            
+
         }
     }
     
@@ -163,9 +126,10 @@ fun Project.configureDistribution() {
         dependsOn(downloadDefaultPacks)
         configurations = listOf(project.configurations["shaded"])
         archiveClassifier.set("shaded")
-        version = project.version
+        setVersion(project.version)
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
         relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
+        relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
         
@@ -181,10 +145,9 @@ fun Project.configureDistribution() {
     }
 }
 
-fun downloadPack(packUrl: URL, project: Project, metapack: Boolean = false) {
+fun downloadPack(packUrl: URL, project: Project) {
     val fileName = packUrl.file.substring(packUrl.file.lastIndexOf("/"))
-    val resourceType = if (metapack) "metapacks" else "packs"
-    val file = File("${project.buildDir}/resources/main/${resourceType}/${fileName}")
+    val file = File("${project.buildDir}/resources/main/packs/${fileName}")
     file.parentFile.mkdirs()
     file.outputStream().write(packUrl.readBytes())
 }

buildSrc/src/main/kotlin/PublishingConfig.kt

@@ -16,17 +16,16 @@ fun Project.configurePublishing() {
         }
         
         repositories {
-            val mavenUrl = "https://maven.solo-studios.ca/releases/"
+            val mavenUrl = "https://repo.codemc.io/repository/maven-releases/"
             //val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/"
             
             maven(mavenUrl) {
-                val SoloStudiosReleasesUsername: String? by project
-                val SoloStudiosReleasesPassword: String? by project
-                
-                if (SoloStudiosReleasesUsername != null && SoloStudiosReleasesPassword != null) {
+                val mavenUsername: String? by project
+                val mavenPassword: String? by project
+                if (mavenUsername != null && mavenPassword != null) {
                     credentials {
-                        username = SoloStudiosReleasesUsername
-                        password = SoloStudiosReleasesPassword
+                        username = mavenUsername
+                        password = mavenPassword
                     }
                 }
             }

buildSrc/src/main/kotlin/Utils.kt

@@ -42,10 +42,10 @@ fun preRelease(preRelease: Boolean) {
 fun Project.versionProjects(project: String, version: String) {
     forSubProjects(project) {
         this.version = version
-        logger.info("Setting version of $path to $version")
+        println("Setting version of $path to $version")
     }
     project(project).version = version
-    logger.info("Setting version of $project to $version")
+    println("Setting version of $project to $version")
 }
 
 fun Project.version(version: String): String {

buildSrc/src/main/kotlin/Versions.kt

@@ -1,101 +1,68 @@
 object Versions {
-    object Terra {
-        const val overworldConfig = "latest"
-        const val reimagENDConfig = "latest"
-        const val tartarusConfig = "latest"
-        const val defaultConfig = "latest"
-    }
-    
     object Libraries {
-        const val tectonic = "4.3.1"
-        const val paralithic = "2.0.1"
-        const val strata = "1.3.2"
-        const val seismic = "2.5.7"
+        const val tectonic = "4.2.0"
+        const val paralithic = "0.7.0"
+        const val strata = "1.1.1"
         
-        const val cloud = "2.0.0"
+        const val cloud = "1.8.0"
         
-        const val caffeine = "3.2.2"
+        const val slf4j = "1.7.36"
+        const val log4j_slf4j_impl = "2.14.1"
         
-        const val slf4j = "2.0.17"
-
         object Internal {
-            const val shadow = "8.3.9"
-            const val apacheText = "1.14.0"
-            const val apacheIO = "2.20.0"
-            const val guava = "33.5.0-jre"
-            const val asm = "9.9"
-            const val snakeYml = "2.5"
-            const val jetBrainsAnnotations = "26.0.2-1"
-            const val junit = "6.0.0"
-            const val nbt = "6.1"
+            const val apacheText = "1.9"
+            const val jafama = "2.3.2"
+            const val apacheIO = "2.6"
+            const val fastutil = "8.5.6"
         }
     }
     
     object Fabric {
-        const val fabricAPI = "0.134.1+${Mod.minecraft}"
-        const val cloud = "2.0.0-beta.13"
+        const val fabricLoader = "0.14.8"
+        const val fabricAPI = "0.83.1+1.20.1"
+    }
+    
+    object Quilt {
+        const val quiltLoader = "0.17.0"
+        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
     }
-//
-//    object Quilt {
-//        const val quiltLoader = "0.20.2"
-//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
-//    }
     
     object Mod {
-        const val mixin = "0.16.4+mixin.0.8.7"
-        const val mixinExtras = "0.5.0"
+        const val mixin = "0.11.2+mixin.0.8.5"
         
-        const val minecraft = "1.21.10"
-        const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.18.2"
+        const val minecraft = "1.20.1"
+        const val yarn = "$minecraft+build.2"
+        const val fabricLoader = "0.14.21"
         
-        const val architecuryLoom = "1.11.451"
-        const val architecturyPlugin = "3.4.162"
-
+        const val architecuryLoom = "0.12.0.290"
+        const val architecturyPlugin = "3.4-SNAPSHOT"
+        
+        const val loomQuiltflower = "1.7.1"
+    }
+    
+    object Forge {
+        const val forge = "${Mod.minecraft}-47.0.3"
+        const val burningwave = "12.53.0"
     }
-//
-//    object Forge {
-//        const val forge = "${Mod.minecraft}-48.0.13"
-//        const val burningwave = "12.63.0"
-//    }
     
     object Bukkit {
-        const val minecraft = "1.21.10"
-        const val nms = "$minecraft-R0.1"
-        const val paperBuild = "$nms-20251012.013929-7"
-        const val paper = paperBuild
-        const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.3"
-        const val paperDevBundle = paperBuild
-        const val runPaper = "2.3.1"
-        const val paperWeight = "2.0.0-beta.19"
-        const val cloud = "2.0.0-beta.12"
-        const val multiverse = "5.3.0"
+        const val paper = "1.18.2-R0.1-SNAPSHOT"
+        const val paperLib = "1.0.5"
+        const val minecraft = "1.20.1"
+        const val reflectionRemapper = "0.1.0-SNAPSHOT"
+        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
+    }
+    
+    object Sponge {
+        const val sponge = "9.0.0-SNAPSHOT"
+        const val mixin = "0.8.2"
+        const val minecraft = "1.17.1"
     }
     
-//
-//    object Sponge {
-//        const val sponge = "9.0.0-SNAPSHOT"
-//        const val mixin = "0.8.2"
-//        const val minecraft = "1.17.1"
-//    }
-//
     object CLI {
-        const val logback = "1.5.19"
-        const val picocli = "4.7.7"
+        const val nbt = "6.1"
+        const val logback = "1.2.9"
+        const val commonsIO = "2.7"
+        const val guava = "31.0.1-jre"
     }
-    
-    object Allay {
-        const val api = "0.20.0"
-        const val gson = "2.13.2"
-        
-        const val mappings = "366baa6"
-        const val mappingsGenerator = "e957088"
-        
-        const val mcmeta = "c976eb3"
-    }
-    
-    object Minestom {
-        const val minestom = "2025.10.04-1.21.8"
-    }
-}
+}

buildSrc/src/main/kotlin/com/dfsek/terra/tectonicdoc/GenerateDocsTask.kt

@@ -82,7 +82,7 @@ abstract class GenerateDocsTask : DefaultTask() {
                         }
                         
                         template.add(keyName.toString(), description.toString().ifBlank {
-                            logger.info("No description provided for field " + field.name + " in class " + name)
+                            println("No description provided for field " + field.name + " in class " + name)
                             "*No description provided.*"
                         })
                     }

common/addons/api-addon-loader/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Polyhedral Development
+Copyright (c) 2020-2021 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddon.java

@@ -8,17 +8,17 @@ import com.dfsek.terra.api.addon.BaseAddon;
 public class ApiAddon implements BaseAddon {
     private final Version version;
     private final String id;
-
+    
     public ApiAddon(Version version, String id) {
         this.version = version;
         this.id = id;
     }
-
+    
     @Override
     public Version getVersion() {
         return version;
     }
-
+    
     @Override
     public String getID() {
         return id;

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -15,7 +15,7 @@ public class ApiAddonClassLoader extends URLClassLoader {
     static {
         ClassLoader.registerAsParallelCapable();
     }
-
+    
     public ApiAddonClassLoader(URL[] urls, ClassLoader parent) {
         super(urls, parent);
     }

common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -20,18 +20,18 @@ import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
 
 public class ApiAddonLoader implements BootstrapBaseAddon<BaseAddon> {
     private static final Version VERSION = Versions.getVersion(1, 0, 0);
-
+    
     @Override
     public Iterable<BaseAddon> loadAddons(Path addonsFolder, BootstrapAddonClassLoader parent) {
-
+        
         return Collections.emptySet();
     }
-
+    
     @Override
     public String getID() {
         return "API";
     }
-
+    
     @Override
     public Version getVersion() {
         return VERSION;

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

@@ -9,11 +9,11 @@ class BaseBiomeColumn implements Column<Biome> {
     private final Biome base;
     private final int min;
     private final int max;
-
+    
     private final int x;
     private final int z;
     private final long seed;
-
+    
     protected BaseBiomeColumn(BiomeExtrusionProvider biomeProvider, Biome base, int min, int max, int x, int z, long seed) {
         this.biomeProvider = biomeProvider;
         this.base = base;
@@ -23,29 +23,29 @@ class BaseBiomeColumn implements Column<Biome> {
         this.z = z;
         this.seed = seed;
     }
-
+    
     @Override
     public int getMinY() {
         return min;
     }
-
+    
     @Override
     public int getMaxY() {
         return max;
     }
-
+    
     @Override
     public int getX() {
         return x;
     }
-
+    
     @Override
     public int getZ() {
         return z;
     }
-
+    
     @Override
     public Biome get(int y) {
-        return biomeProvider.pipeline.extrude(base, x, y, z, seed);
+        return biomeProvider.extrude(base, x, y, z, seed);
     }
 }

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

@@ -27,41 +27,41 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public class BiomeExtrusionAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<Extrusion>>> EXTRUSION_REGISTRY_KEY = new TypeKey<>() {
     };
-
+    
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
-
+    
     @Inject
     private Platform platform;
-
+    
     @Inject
     private BaseAddon addon;
-
+    
     @Override
     public void initialize() {
         platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPreLoadEvent.class)
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
-                    event.getPack()
-                        .getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
-                providerRegistry.register(addon.key("EXTRUSION"), BiomeExtrusionTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<Extrusion>>> extrusionRegistry = event.getPack().getOrCreateRegistry(
-                    EXTRUSION_REGISTRY_KEY);
-                extrusionRegistry.register(addon.key("SET"), SetExtrusionTemplate::new);
-                extrusionRegistry.register(addon.key("REPLACE"), ReplaceExtrusionTemplate::new);
-            })
-            .failThrough();
-
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry =
+                            event.getPack()
+                                 .getOrCreateRegistry(PROVIDER_REGISTRY_KEY);
+                    providerRegistry.register(addon.key("EXTRUSION"), BiomeExtrusionTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<Extrusion>>> extrusionRegistry = event.getPack().getOrCreateRegistry(
+                            EXTRUSION_REGISTRY_KEY);
+                    extrusionRegistry.register(addon.key("SET"), SetExtrusionTemplate::new);
+                    extrusionRegistry.register(addon.key("REPLACE"), ReplaceExtrusionTemplate::new);
+                })
+                .failThrough();
+        
         platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPostLoadEvent.class)
-            .then(event -> {
-                Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                event.getPack().applyLoader(ReplaceableBiome.class, new ReplaceableBiomeLoader(biomeRegistry));
-            });
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPostLoadEvent.class)
+                .then(event -> {
+                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
+                    event.getPack().applyLoader(ReplaceableBiome.class, new ReplaceableBiomeLoader(biomeRegistry));
+                });
     }
 }

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

@@ -6,58 +6,62 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
-import com.dfsek.terra.addons.biome.extrusion.utils.ExtrusionPipeline;
-import com.dfsek.terra.addons.biome.extrusion.utils.ExtrusionPipelineFactory;
 import com.dfsek.terra.api.util.Column;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class BiomeExtrusionProvider implements BiomeProvider {
-    public final ExtrusionPipeline pipeline;
     private final BiomeProvider delegate;
     private final Set<Biome> biomes;
+    private final List<Extrusion> extrusions;
     private final int resolution;
-
+    
     public BiomeExtrusionProvider(BiomeProvider delegate, List<Extrusion> extrusions, int resolution) {
         this.delegate = delegate;
         this.biomes = delegate.stream().collect(Collectors.toSet());
         extrusions.forEach(e -> biomes.addAll(e.getBiomes()));
-
-        this.pipeline = ExtrusionPipelineFactory.create(extrusions);
-
+        this.extrusions = extrusions;
         this.resolution = resolution;
     }
-
+    
     @Override
     public Biome getBiome(int x, int y, int z, long seed) {
         Biome delegated = delegate.getBiome(x, y, z, seed);
-        return pipeline.extrude(delegated, x, y, z, seed);
+        
+        return extrude(delegated, x, y, z, seed);
     }
-
+    
+    public Biome extrude(Biome original, int x, int y, int z, long seed) {
+        for(Extrusion extrusion : extrusions) {
+            original = extrusion.extrude(original, x, y, z, seed);
+        }
+        return original;
+    }
+    
     @Override
     public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
         return delegate.getBaseBiome(x, z, seed)
-            .map(base -> (Column<Biome>) new BaseBiomeColumn(this, base, min, max, x, z, seed))
-            .orElseGet(() -> BiomeProvider.super.getColumn(x, z, seed, min, max));
+                       .map(base -> (Column<Biome>) new BaseBiomeColumn(this, base, min, max, x, z, seed))
+                       .orElseGet(() -> BiomeProvider.super.getColumn(x, z, seed, min, max));
     }
-
+    
     @Override
     public Optional<Biome> getBaseBiome(int x, int z, long seed) {
         return delegate.getBaseBiome(x, z, seed);
     }
-
+    
     @Override
     public Iterable<Biome> getBiomes() {
         return biomes;
     }
-
+    
     @Override
     public int resolution() {
         return resolution;
     }
-
+    
     public BiomeProvider getDelegate() {
         return delegate;
     }
-}
+}

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

@@ -7,6 +7,6 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 public interface Extrusion {
     Biome extrude(Biome original, int x, int y, int z, long seed);
-
+    
     Collection<Biome> getBiomes();
 }

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

@@ -6,16 +6,16 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 final class PresentBiome implements ReplaceableBiome {
     private final Biome biome;
-
+    
     PresentBiome(Biome biome) {
         this.biome = biome;
     }
-
+    
     @Override
     public Biome get(Biome existing) {
         return biome;
     }
-
+    
     @Override
     public boolean isSelf() {
         return false;

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

@@ -13,19 +13,19 @@ public sealed interface ReplaceableBiome permits PresentBiome, SelfBiome {
     static ReplaceableBiome of(Biome biome) {
         return new PresentBiome(biome);
     }
-
+    
     static ReplaceableBiome self() {
         return SelfBiome.INSTANCE;
     }
-
+    
     Biome get(Biome existing);
-
+    
     default Biome get() {
         if(isSelf()) {
             throw new IllegalStateException("Cannot get() self biome!");
         }
         return get(null);
     }
-
+    
     boolean isSelf();
 }

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

@@ -8,12 +8,12 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 final class SelfBiome implements ReplaceableBiome {
     public static final SelfBiome INSTANCE = new SelfBiome();
-
+    
     @Override
     public Biome get(Biome existing) {
         return Objects.requireNonNull(existing);
     }
-
+    
     @Override
     public boolean isSelf() {
         return true;

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

@@ -15,14 +15,14 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public class BiomeExtrusionTemplate implements ObjectTemplate<BiomeProvider> {
     @Value("provider")
     private @Meta BiomeProvider provider;
-
+    
     @Value("resolution")
     @Default
     private @Meta int resolution = 4;
-
+    
     @Value("extrusions")
     private @Meta List<@Meta Extrusion> extrusions;
-
+    
     @Override
     public BiomeProvider get() {
         return new BiomeExtrusionProvider(provider, extrusions, resolution);

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

@@ -15,18 +15,18 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 public class ReplaceableBiomeLoader implements TypeLoader<ReplaceableBiome> {
     private final Registry<Biome> biomeRegistry;
-
+    
     public ReplaceableBiomeLoader(Registry<Biome> biomeRegistry) {
         this.biomeRegistry = biomeRegistry;
     }
-
+    
     @Override
     public ReplaceableBiome load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
     throws LoadException {
         if(c.equals("SELF")) return ReplaceableBiome.self();
         return biomeRegistry
-            .getByID((String) c)
-            .map(ReplaceableBiome::of)
-            .orElseThrow(() -> new LoadException("No such biome: " + c, depthTracker));
+                .getByID((String) c)
+                .map(ReplaceableBiome::of)
+                .orElseThrow(() -> new LoadException("No such biome: " + c, depthTracker));
     }
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/ReplaceExtrusionTemplate.java

@@ -12,10 +12,10 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class ReplaceExtrusionTemplate extends SamplerExtrusionTemplate {
     @Value("to")
     private @Meta ProbabilityCollection<@Meta ReplaceableBiome> biomes;
-
+    
     @Value("from")
     private @Meta String fromTag;
-
+    
     @Override
     public Extrusion get() {
         return new ReplaceExtrusion(sampler, range, biomes, fromTag);

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java

@@ -1,18 +1,18 @@
 package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
 
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.range.Range;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.Range;
 
 
 public abstract class SamplerExtrusionTemplate implements ObjectTemplate<Extrusion> {
     @Value("sampler")
-    protected @Meta Sampler sampler;
-
+    protected @Meta NoiseSampler sampler;
+    
     @Value("range")
     protected @Meta Range range;
 }

common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SetExtrusionTemplate.java

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class SetExtrusionTemplate extends SamplerExtrusionTemplate {
     @Value("to")
     private @Meta ProbabilityCollection<@Meta ReplaceableBiome> biomes;
-
+    
     @Override
     public Extrusion get() {
         return new SetExtrusion(sampler, range, biomes);

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
-import com.dfsek.seismic.type.sampler.Sampler;
-
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -9,9 +7,9 @@ import java.util.stream.Collectors;
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.util.collection.TriStateIntCache;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
@@ -19,52 +17,36 @@ import com.dfsek.terra.api.world.biome.Biome;
  * Sets biomes at locations based on a sampler.
  */
 public class ReplaceExtrusion implements Extrusion {
-    private final Sampler sampler;
+    private final NoiseSampler sampler;
+    
     private final Range range;
+    
     private final ProbabilityCollection<ReplaceableBiome> biomes;
+    
     private final Predicate<Biome> hasTag;
-    private final TriStateIntCache cache;
-
-    public ReplaceExtrusion(Sampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes, String tag) {
+    
+    public ReplaceExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes, String tag) {
         this.sampler = sampler;
         this.range = range;
         this.biomes = biomes;
         this.hasTag = BiomeQueries.has(tag);
-        this.cache = new TriStateIntCache(Biome.INT_ID_COUNTER.get());
     }
-
+    
     @Override
     public Biome extrude(Biome original, int x, int y, int z, long seed) {
-        int id = original.getIntID();
-
-        long state = cache.get(id);
-        boolean passes;
-
-        if(state == TriStateIntCache.STATE_UNSET) {
-            // Only run the test if unset in cache
-            passes = hasTag.test(original);
-            cache.set(id, passes);
-        } else {
-            // Read the primitive long directly
-            passes = (state == TriStateIntCache.STATE_TRUE);
+        if(hasTag.test(original)) {
+            return range.ifInRange(y, () -> biomes.get(sampler, x, y, z, seed).get(original), original);
         }
-
-        if(passes) {
-            if(range.isInRange(y)) {
-                return biomes.get(sampler, x, y, z, seed).get(original);
-            }
-        }
-
         return original;
     }
-
+    
     @Override
     public Collection<Biome> getBiomes() {
         return biomes
-            .getContents()
-            .stream()
-            .filter(Predicate.not(ReplaceableBiome::isSelf))
-            .map(ReplaceableBiome::get)
-            .collect(Collectors.toSet());
+                .getContents()
+                .stream()
+                .filter(Predicate.not(ReplaceableBiome::isSelf))
+                .map(ReplaceableBiome::get)
+                .collect(Collectors.toSet());
     }
 }

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

@@ -1,15 +1,14 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
-import com.dfsek.seismic.type.sampler.Sampler;
-
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.world.biome.Biome;
 
 
@@ -17,30 +16,30 @@ import com.dfsek.terra.api.world.biome.Biome;
  * Sets biomes at locations based on a sampler.
  */
 public class SetExtrusion implements Extrusion {
-    private final Sampler sampler;
-
+    private final NoiseSampler sampler;
+    
     private final Range range;
-
+    
     private final ProbabilityCollection<ReplaceableBiome> biomes;
-
-    public SetExtrusion(Sampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes) {
+    
+    public SetExtrusion(NoiseSampler sampler, Range range, ProbabilityCollection<ReplaceableBiome> biomes) {
         this.sampler = sampler;
         this.range = range;
         this.biomes = biomes;
     }
-
+    
     @Override
     public Biome extrude(Biome original, int x, int y, int z, long seed) {
         return range.ifInRange(y, () -> biomes.get(sampler, x, y, z, seed).get(original), original);
     }
-
+    
     @Override
     public Collection<Biome> getBiomes() {
         return biomes
-            .getContents()
-            .stream()
-            .filter(Predicate.not(ReplaceableBiome::isSelf))
-            .map(ReplaceableBiome::get)
-            .collect(Collectors.toSet());
+                .getContents()
+                .stream()
+                .filter(Predicate.not(ReplaceableBiome::isSelf))
+                .map(ReplaceableBiome::get)
+                .collect(Collectors.toSet());
     }
 }

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

@@ -1,8 +0,0 @@
-package com.dfsek.terra.addons.biome.extrusion.utils;
-
-import com.dfsek.terra.api.world.biome.Biome;
-
-
-public interface ExtrusionPipeline {
-    Biome extrude(Biome original, int x, int y, int z, long seed);
-}

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

@@ -1,158 +0,0 @@
-package com.dfsek.terra.addons.biome.extrusion.utils;
-
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
-import com.dfsek.terra.api.world.biome.Biome;
-
-import static org.objectweb.asm.Opcodes.AALOAD;
-import static org.objectweb.asm.Opcodes.ACC_FINAL;
-import static org.objectweb.asm.Opcodes.ACC_PRIVATE;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.GETFIELD;
-import static org.objectweb.asm.Opcodes.ILOAD;
-import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static org.objectweb.asm.Opcodes.LLOAD;
-import static org.objectweb.asm.Opcodes.PUTFIELD;
-import static org.objectweb.asm.Opcodes.RETURN;
-import static org.objectweb.asm.Opcodes.SIPUSH;
-import static org.objectweb.asm.Opcodes.SWAP;
-import static org.objectweb.asm.Opcodes.V1_8;
-
-
-public class ExtrusionPipelineFactory {
-    private static final AtomicInteger ID_COUNTER = new AtomicInteger(0);
-
-    // Type Descriptors
-    private static final String EXTRUSION_TYPE = Type.getInternalName(Extrusion.class);
-    private static final String EXTRUSION_DESC = Type.getDescriptor(Extrusion.class);
-    private static final String BIOME_DESC = Type.getDescriptor(Biome.class);
-    private static final String PIPELINE_INTERFACE = Type.getInternalName(ExtrusionPipeline.class);
-
-    // Method Signature: (Biome, int, int, int, long) -> Biome
-    private static final String EXTRUDE_SIG = "(" + BIOME_DESC + "IIIJ)" + BIOME_DESC;
-
-    public static ExtrusionPipeline create(List<Extrusion> extrusions) {
-        // Optimization: If empty, return identity
-        if(extrusions.isEmpty()) {
-            return (original, x, y, z, seed) -> original;
-        }
-
-        String className = "com/dfsek/terra/addons/biome/extrusion/GeneratedExtrusionPipeline_" + ID_COUNTER.getAndIncrement();
-
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-
-        // 1. Define Class
-        cw.visit(V1_8, ACC_PUBLIC | ACC_FINAL, className, null, "java/lang/Object", new String[]{ PIPELINE_INTERFACE });
-
-        // 2. Define Fields (e0, e1, e2...)
-        for(int i = 0; i < extrusions.size(); i++) {
-            FieldVisitor fv = cw.visitField(ACC_PRIVATE | ACC_FINAL, "e" + i, EXTRUSION_DESC, null, null);
-            fv.visitEnd();
-        }
-
-        // 3. Generate Constructor(Extrusion[])
-        generateConstructor(cw, className, extrusions.size());
-
-        // 4. Generate extrude() method
-        generateExtrudeMethod(cw, className, extrusions.size());
-
-        cw.visitEnd();
-
-        // 5. Load and Instantiate
-        byte[] bytecode = cw.toByteArray();
-        try {
-            Class<?> generatedClass = new PipelineClassLoader(ExtrusionPipelineFactory.class.getClassLoader())
-                .defineClass(className.replace('/', '.'), bytecode);
-
-            return (ExtrusionPipeline) generatedClass.getConstructor(Extrusion[].class)
-                .newInstance((Object) extrusions.toArray(new Extrusion[0]));
-        } catch(Exception e) {
-            throw new RuntimeException("Failed to generate ExtrusionPipeline", e);
-        }
-    }
-
-    private static void generateConstructor(ClassWriter cw, String className, int count) {
-        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "([L" + EXTRUSION_TYPE + ";)V", null, null);
-        mv.visitCode();
-
-        // super()
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
-
-        // Assign array elements to fields
-        for(int i = 0; i < count; i++) {
-            mv.visitVarInsn(ALOAD, 0);          // Load this
-            mv.visitVarInsn(ALOAD, 1);          // Load array argument
-            mv.visitIntInsn(SIPUSH, i);         // Load index
-            mv.visitInsn(AALOAD);               // Load array[i]
-            mv.visitFieldInsn(PUTFIELD, className, "e" + i, EXTRUSION_DESC);
-        }
-
-        mv.visitInsn(RETURN);
-        mv.visitMaxs(0, 0); // Computed automatically
-        mv.visitEnd();
-    }
-
-    private static void generateExtrudeMethod(ClassWriter cw, String className, int count) {
-        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "extrude", EXTRUDE_SIG, null, null);
-        mv.visitCode();
-
-        // Helper var indices:
-        // 0: this
-        // 1: Biome original (We will update this or chain it on stack)
-        // 2: int x
-        // 3: int y
-        // 4: int z
-        // 5: long seed
-
-        mv.visitVarInsn(ALOAD, 1); // Load 'original' Biome onto stack initially
-
-        for(int i = 0; i < count; i++) {
-            // Stack contains: [CurrentBiome]
-
-            mv.visitVarInsn(ALOAD, 0); // Load 'this'
-            mv.visitFieldInsn(GETFIELD, className, "e" + i, EXTRUSION_DESC); // Load Extrusion field
-
-            // Stack: [CurrentBiome, Extrusion]
-            // We need: [Extrusion, CurrentBiome, x, y, z, seed]
-
-            mv.visitInsn(SWAP); // Swap to get [Extrusion, CurrentBiome]
-
-            mv.visitVarInsn(ILOAD, 2); // x
-            mv.visitVarInsn(ILOAD, 3); // y
-            mv.visitVarInsn(ILOAD, 4); // z
-            mv.visitVarInsn(LLOAD, 5); // seed
-
-            // Invoke Extrusion.extrude(Biome, x, y, z, seed)
-            mv.visitMethodInsn(INVOKEINTERFACE, EXTRUSION_TYPE, "extrude", EXTRUDE_SIG, true);
-
-            // Stack now contains: [NewBiome]
-            // Loop continues using this result as input for the next one
-        }
-
-        mv.visitInsn(ARETURN); // Return the final Biome
-        mv.visitMaxs(0, 0);
-        mv.visitEnd();
-    }
-
-    // Custom ClassLoader to inject the bytes
-    private static class PipelineClassLoader extends ClassLoader {
-        public PipelineClassLoader(ClassLoader parent) {
-            super(parent);
-        }
-
-        public Class<?> defineClass(String name, byte[] b) {
-            return defineClass(name, b, 0, b.length);
-        }
-    }
-}

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

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

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

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

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

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

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.image.v2;
+
+import java.util.Optional;
+
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class ImageBiomeProvider implements BiomeProvider {
+    private final int resolution;
+    
+    private final ColorConverter<Biome> colorConverter;
+    
+    private final ColorSampler colorSampler;
+    
+    public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
+        this.resolution = resolution;
+        this.colorConverter = colorConverter;
+        this.colorSampler = colorSampler;
+    }
+    
+    @Override
+    public Biome getBiome(int x, int y, int z, long seed) {
+        return getBiome(x, z);
+    }
+    
+    public Biome getBiome(int x, int z) {
+        x /= resolution;
+        z /= resolution;
+        return colorConverter.apply(colorSampler.apply(x, z));
+    }
+    
+    @Override
+    public Optional<Biome> getBaseBiome(int x, int z, long seed) {
+        return Optional.of(getBiome(x, z));
+    }
+    
+    @Override
+    public Iterable<Biome> getBiomes() {
+        return colorConverter.getEntries();
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.image.v2;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.function.Supplier;
+
+import com.dfsek.terra.addons.biome.image.v2.config.ImageProviderTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.ClosestBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.ExactBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.image.v2.config.converter.mapping.DefinedBiomeColorMappingTemplate;
+import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
+import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class ImageBiomeProviderAddon implements AddonInitializer {
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .priority(501)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                            PROVIDER_REGISTRY_KEY);
+                    providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry = event.getPack().getOrCreateRegistry(
+                            BIOME_COLOR_CONVERTER_REGISTRY_KEY);
+                    biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
+                    biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry = event.getPack().getOrCreateRegistry(
+                            BIOME_COLOR_MAPPING_REGISTRY_KEY);
+                    biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"), () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class), b -> b));
+                    biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
+                })
+                .failThrough();
+    }
+}

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

@@ -1,38 +1,38 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.image.config;
+package com.dfsek.terra.addons.biome.image.v2.config;
 
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.biome.image.ImageBiomeProvider;
-import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
+import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 @SuppressWarnings("FieldMayBeFinal")
 public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
-
+    
     @Value("resolution")
     @Default
     @Description("Sets the resolution at which to sample the image.")
     private int resolution = 1;
-
+    
     @Value("color-sampler")
     private ColorSampler colorSampler;
-
+    
     @Value("color-conversion")
     private ColorConverter<Biome> colorConverter;
-
+    
     @Override
     public BiomeProvider get() {
         return new ImageBiomeProvider(colorConverter, colorSampler, resolution);

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

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

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

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

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

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

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

@@ -1,14 +1,14 @@
 schema-version: 1
 contributors:
   - Terra contributors
-id: locator-slant-noise-3d
+id: biome-provider-image-v2
 version: @VERSION@
 entrypoints:
-  - "com.dfsek.terra.addon.feature.locator.slant.SlantLocatorAddon"
+  - "com.dfsek.terra.addons.biome.image.v2.ImageBiomeProviderAddon"
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
   docs: https://terra.polydev.org
 license: MIT License
 depends:
-  chunk-generator-noise-3d: "[1.2.0,2.0.0)"
+  library-image: "1.+"

common/addons/biome-provider-image/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Polyhedral Development
+Copyright (c) 2020-2021 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,5 +1,6 @@
-# biome-provider-image-v2
+# biome-provider-image
 
-Implements and registers the `IMAGE` biome provider, which
-utilizes various config types provided by the `library-image` addon to
-distribute biomes based on images.
+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.

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,45 +7,80 @@
 
 package com.dfsek.terra.addons.biome.image;
 
-import java.util.Optional;
+import net.jafama.FastMath;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
-import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
-import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class ImageBiomeProvider implements BiomeProvider {
+    private final Map<Color, Biome> colorBiomeMap = new HashMap<>();
+    private final BufferedImage image;
     private final int resolution;
-
-    private final ColorConverter<Biome> colorConverter;
-
-    private final ColorSampler colorSampler;
-
-    public ImageBiomeProvider(ColorConverter<Biome> colorConverter, ColorSampler colorSampler, int resolution) {
+    private final Align align;
+    
+    public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
+        this.image = image;
         this.resolution = resolution;
-        this.colorConverter = colorConverter;
-        this.colorSampler = colorSampler;
+        this.align = align;
+        registry.forEach(biome -> colorBiomeMap.put(new Color(biome.getColor()), biome));
     }
-
+    
+    private static int distance(Color a, Color b) {
+        return FastMath.abs(a.getRed() - b.getRed()) + FastMath.abs(a.getGreen() - b.getGreen()) + FastMath.abs(a.getBlue() - b.getBlue());
+    }
+    
     @Override
     public Biome getBiome(int x, int y, int z, long seed) {
         return getBiome(x, z);
     }
-
+    
     public Biome getBiome(int x, int z) {
         x /= resolution;
         z /= resolution;
-        return colorConverter.apply(colorSampler.apply(x, z));
+        Color color = align.getColor(image, x, z);
+        return colorBiomeMap.get(colorBiomeMap.keySet()
+                                              .stream()
+                                              .reduce(colorBiomeMap.keySet().stream().findAny().orElseThrow(IllegalStateException::new),
+                                                      (running, element) -> {
+                                                          int d1 = distance(color, running);
+                                                          int d2 = distance(color, element);
+                                                          return d1 < d2 ? running : element;
+                                                      }));
     }
-
+    
     @Override
     public Optional<Biome> getBaseBiome(int x, int z, long seed) {
         return Optional.of(getBiome(x, z));
     }
-
+    
     @Override
     public Iterable<Biome> getBiomes() {
-        return colorConverter.getEntries();
+        return colorBiomeMap.values();
+    }
+    
+    public enum Align {
+        CENTER {
+            @Override
+            public Color getColor(BufferedImage image, int x, int z) {
+                return new Color(image.getRGB(FastMath.floorMod(x - image.getWidth() / 2, image.getWidth()),
+                                              FastMath.floorMod(z - image.getHeight() / 2, image.getHeight())));
+            }
+        },
+        NONE {
+            @Override
+            public Color getColor(BufferedImage image, int x, int z) {
+                return new Color(image.getRGB(FastMath.floorMod(x, image.getWidth()), FastMath.floorMod(z, image.getHeight())));
+            }
+        };
+        
+        public abstract Color getColor(BufferedImage image, int x, int z);
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -8,16 +8,11 @@
 package com.dfsek.terra.addons.biome.image;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.function.Supplier;
 
-import com.dfsek.terra.addons.biome.image.config.ImageProviderTemplate;
-import com.dfsek.terra.addons.biome.image.config.converter.ClosestBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.image.config.converter.ExactBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.image.config.converter.mapping.DefinedBiomeColorMappingTemplate;
-import com.dfsek.terra.addons.image.converter.ColorConverter;
-import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
-import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -31,48 +26,30 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class ImageBiomeProviderAddon implements AddonInitializer {
+    
+    private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
+    
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
     };
-
-    public static final TypeKey<Supplier<ObjectTemplate<ColorConverter<Biome>>>> BIOME_COLOR_CONVERTER_REGISTRY_KEY = new TypeKey<>() {
-    };
-
-    public static final TypeKey<Supplier<ObjectTemplate<ColorMapping<Biome>>>> BIOME_COLOR_MAPPING_REGISTRY_KEY = new TypeKey<>() {
-    };
-
+    
     @Inject
     private Platform platform;
-
+    
     @Inject
     private BaseAddon addon;
-
+    
     @Override
     public void initialize() {
         platform.getEventManager()
-            .getHandler(FunctionalEventHandler.class)
-            .register(addon, ConfigPackPreLoadEvent.class)
-            .priority(501)
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                    PROVIDER_REGISTRY_KEY);
-                providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry =
-                    event.getPack().getOrCreateRegistry(
-                        BIOME_COLOR_CONVERTER_REGISTRY_KEY);
-                biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
-                biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
-            })
-            .then(event -> {
-                CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry =
-                    event.getPack().getOrCreateRegistry(
-                        BIOME_COLOR_MAPPING_REGISTRY_KEY);
-                biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"),
-                    () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
-                        b -> b));
-                biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
-            })
-            .failThrough();
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                            PROVIDER_REGISTRY_KEY);
+                    providerRegistry.register(addon.key("IMAGE"),
+                                              () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
+                })
+                .failThrough();
+        logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
     }
 }

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

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.image;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.awt.image.BufferedImage;
+import java.util.HashSet;
+
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+@SuppressWarnings("FieldMayBeFinal")
+public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
+    private final Registry<Biome> biomes;
+    @Value("resolution")
+    @Default
+    @Description("Sets the resolution at which to sample the image.")
+    private int resolution = 1;
+    @Value("image.name")
+    @Description("Sets the location of the image on the filesystem, relative to the pack root.")
+    private BufferedImage image;
+    @Value("image.align")
+    @Description("Sets the alignment style to use for the image.")
+    private ImageBiomeProvider.Align align;
+    
+    public ImageProviderTemplate(Registry<Biome> set) {
+        this.biomes = set;
+    }
+    
+    @Override
+    public BiomeProvider get() {
+        return new ImageBiomeProvider(new HashSet<>(biomes.entries()), image, resolution, align);
+    }
+}

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

@@ -9,6 +9,4 @@ website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
   docs: https://terra.polydev.org
-license: MIT License
-depends:
-  library-image: "1.+"
+license: MIT License

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

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

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

@@ -0,0 +1,12 @@
+# biome-provider-pipeline-2
+
+The second version of the Biome Pipeline, a procedural biome provider that uses a series
+of "stages" to apply "mutations" to a 2D grid of biomes.
+
+Version 2 is a re-implementation of the original addon with the primary goal of providing
+consistent scaling for noise relative to the world
+(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
+included as a separate addon to maintain parity with packs utilizing the first version. 
+
+This addon registers the `PIPELINE` biome provider type, and all associated
+configurations.

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

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

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.v2;
+
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.function.Supplier;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander.ExpanderStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.manifest.api.AddonInitializer;
+import com.dfsek.terra.api.Platform;
+import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
+import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
+import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
+import com.dfsek.terra.api.inject.annotations.Inject;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class BiomePipelineAddon implements AddonInitializer {
+    
+    public static final TypeKey<Supplier<ObjectTemplate<Source>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
+    };
+    
+    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
+    };
+    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
+    };
+    @Inject
+    private Platform platform;
+    
+    @Inject
+    private BaseAddon addon;
+    
+    @Override
+    public void initialize() {
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPreLoadEvent.class)
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                            PROVIDER_REGISTRY_KEY);
+                    providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<Source>>> sourceRegistry = event.getPack().getOrCreateRegistry(
+                            SOURCE_REGISTRY_KEY);
+                    sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
+                })
+                .then(event -> {
+                    CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
+                            STAGE_REGISTRY_KEY);
+                    stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
+                    stageRegistry.register(addon.key("SMOOTH"), SmoothStageTemplate::new);
+                    stageRegistry.register(addon.key("REPLACE"), ReplaceStageTemplate::new);
+                    stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListStageTemplate::new);
+                    stageRegistry.register(addon.key("BORDER"), BorderStageTemplate::new);
+                    stageRegistry.register(addon.key("BORDER_LIST"), BorderListStageTemplate::new);
+                })
+                .failThrough();
+        platform.getEventManager()
+                .getHandler(FunctionalEventHandler.class)
+                .register(addon, ConfigPackPostLoadEvent.class)
+                .then(event -> {
+                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
+                    event.getPack().applyLoader(PipelineBiome.class, new PipelineBiomeLoader(biomeRegistry));
+                });
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.dfsek.terra.addons.biome.pipeline.v2;
+
+import java.util.function.Consumer;
+
+import com.dfsek.terra.api.util.Column;
+import com.dfsek.terra.api.util.function.IntIntObjConsumer;
+import com.dfsek.terra.api.util.function.IntObjConsumer;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+public class BiomePipelineColumn implements Column<Biome> {
+    private final int min;
+    private final int max;
+    
+    private final int x;
+    private final int z;
+    private final Biome biome;
+    
+    protected BiomePipelineColumn(BiomeProvider biomeProvider, int min, int max, int x, int z, long seed) {
+        this.min = min;
+        this.max = max;
+        this.x = x;
+        this.z = z;
+        this.biome = biomeProvider.getBiome(x, 0, z, seed);
+    }
+    
+    @Override
+    public int getMinY() {
+        return min;
+    }
+    
+    @Override
+    public int getMaxY() {
+        return max;
+    }
+    
+    @Override
+    public int getX() {
+        return x;
+    }
+    
+    @Override
+    public int getZ() {
+        return z;
+    }
+    
+    @Override
+    public Biome get(int y) {
+        return biome;
+    }
+    
+    @Override
+    public void forRanges(int resolution, IntIntObjConsumer<Biome> consumer) {
+        consumer.accept(min, max, biome);
+    }
+    
+    @Override
+    public void forEach(Consumer<Biome> consumer) {
+        for(int y = min; y < max; y++) {
+            consumer.accept(biome);
+        }
+    }
+    
+    @Override
+    public void forEach(IntObjConsumer<Biome> consumer) {
+        for(int y = min; y < max; y++) {
+            consumer.accept(y, biome);
+        }
+    }
+}

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

@@ -1,15 +1,13 @@
-/*
- * Copyright (c) 2020-2025 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
+package com.dfsek.terra.addons.biome.pipeline.v2;
 
-package com.dfsek.terra.addons.biome.pipeline;
-
-import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import net.jafama.FastMath;
 
 import java.util.Comparator;
 import java.util.HashSet;
@@ -17,35 +15,31 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
-import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class PipelineBiomeProvider implements BiomeProvider {
-
-    private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
+    
+    private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
     private final int chunkSize;
     private final int resolution;
-    private final Sampler mutator;
+    private final NoiseSampler mutator;
     private final double noiseAmp;
     private final Set<Biome> biomes;
-
-    public PipelineBiomeProvider(Pipeline pipeline, int resolution, Sampler mutator, double noiseAmp) {
+    
+    public PipelineBiomeProvider(Pipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
         this.resolution = resolution;
         this.mutator = mutator;
         this.noiseAmp = noiseAmp;
         this.chunkSize = pipeline.getChunkSize();
         this.biomeChunkCache = Caffeine.newBuilder()
-            .maximumSize(64)
-            .build(pipeline::generateChunk);
-
+                                       .maximumSize(64)
+                                       .build(pipeline::generateChunk);
+    
         Set<PipelineBiome> biomeSet = new HashSet<>();
         pipeline.getSource().getBiomes().forEach(biomeSet::add);
         Iterable<PipelineBiome> result = biomeSet;
@@ -56,65 +50,64 @@ public class PipelineBiomeProvider implements BiomeProvider {
         Iterable<PipelineBiome> finalResult = result;
         result.forEach(pipelineBiome -> {
             if(pipelineBiome.isPlaceholder()) {
-
+            
                 StringBuilder biomeList = new StringBuilder("\n");
                 StreamSupport.stream(finalResult.spliterator(), false)
-                    .sorted(Comparator.comparing(StringIdentifiable::getID))
-                    .forEach(delegate -> biomeList
-                        .append("    - ")
-                        .append(delegate.getID())
-                        .append(':')
-                        .append(delegate.getClass().getCanonicalName())
-                        .append('\n'));
+                             .sorted(Comparator.comparing(StringIdentifiable::getID))
+                             .forEach(delegate -> biomeList
+                                     .append("    - ")
+                                     .append(delegate.getID())
+                                     .append(':')
+                                     .append(delegate.getClass().getCanonicalName())
+                                     .append('\n'));
                 throw new IllegalArgumentException("Biome Pipeline leaks placeholder biome \"" + pipelineBiome.getID() +
-                                                   "\". Ensure there is a stage to guarantee replacement of the placeholder biome. " +
-                                                   "Biomes: " +
+                                                   "\". Ensure there is a stage to guarantee replacement of the placeholder biome. Biomes: " +
                                                    biomeList);
             }
             this.biomes.add(pipelineBiome.getBiome());
         });
     }
-
+    
     @Override
     public Biome getBiome(int x, int y, int z, long seed) {
         return getBiome(x, z, seed);
     }
-
+    
     public Biome getBiome(int x, int z, long seed) {
-
-        x += (int) (mutator.getSample(seed + 1, x, z) * noiseAmp);
-        z += (int) (mutator.getSample(seed + 2, x, z) * noiseAmp);
-
+    
+        x += mutator.noise(seed + 1, x, z) * noiseAmp;
+        z += mutator.noise(seed + 2, x, z) * noiseAmp;
+        
         x /= resolution;
         z /= resolution;
-
-        int chunkX = Math.floorDiv(x, chunkSize);
-        int chunkZ = Math.floorDiv(z, chunkSize);
-
+        
+        int chunkX = FastMath.floorDiv(x, chunkSize);
+        int chunkZ = FastMath.floorDiv(z, chunkSize);
+        
         int chunkWorldX = chunkX * chunkSize;
         int chunkWorldZ = chunkZ * chunkSize;
-
+        
         int xInChunk = x - chunkWorldX;
         int zInChunk = z - chunkWorldZ;
-
-        return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome();
+        
+        return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
     }
-
+    
     @Override
     public Iterable<Biome> getBiomes() {
         return biomes;
     }
-
+    
     @Override
     public Optional<Biome> getBaseBiome(int x, int z, long seed) {
         return Optional.of(getBiome(x, z, seed));
     }
-
+    
     @Override
     public Column<Biome> getColumn(int x, int z, long seed, int min, int max) {
         return new BiomePipelineColumn(this, min, max, x, z, seed);
     }
-
+    
     @Override
     public int resolution() {
         return resolution;

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

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

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

@@ -1,7 +1,7 @@
-package com.dfsek.terra.addons.biome.pipeline.api;
+package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 /**
@@ -9,16 +9,16 @@ import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
  * filling in null biomes as a result of this resizing.
  */
 public interface Expander extends Stage {
-
-    PipelineBiome fillBiome(BiomeChunkImpl.ViewPoint viewPoint);
-
+    
+    PipelineBiome fillBiome(ViewPoint viewPoint);
+    
     @Override
     default int maxRelativeReadDistance() {
         return 0;
     }
-
+    
     @Override
-    default PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) {
+    default PipelineBiome apply(ViewPoint viewPoint) {
         PipelineBiome currentBiome = viewPoint.getBiome();
         if(currentBiome == null) {
             return fillBiome(viewPoint);

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
 
 import java.util.Set;
 
@@ -7,32 +7,32 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 public final class DelegatedPipelineBiome implements PipelineBiome {
     private final Biome biome;
-
+    
     public DelegatedPipelineBiome(Biome biome) {
         this.biome = biome;
     }
-
+    
     @Override
     public Biome getBiome() {
         return biome;
     }
-
+    
     @Override
     public int hashCode() {
         return biome.hashCode();
     }
-
+    
     @Override
     public boolean equals(Object obj) {
         if(!(obj instanceof DelegatedPipelineBiome that)) return false;
         return that.biome.equals(this.biome);
     }
-
+    
     @Override
     public Set<String> getTags() {
         return biome.getTags();
     }
-
+    
     @Override
     public String getID() {
         return biome.getID();

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

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

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -9,43 +9,43 @@ import com.dfsek.terra.api.world.biome.Biome;
 final class PlaceholderPipelineBiome implements PipelineBiome {
     private final Set<String> tags;
     private final String id;
-
+    
     public PlaceholderPipelineBiome(String id) {
         this.id = id;
         tags = new HashSet<>();
         tags.add(id);
         tags.add("ALL");
     }
-
+    
     @Override
     public Biome getBiome() {
         throw new UnsupportedOperationException("Cannot get raw biome from placeholder pipeline biome");
     }
-
+    
     @Override
     public Set<String> getTags() {
         return tags;
     }
-
+    
     @Override
     public String getID() {
         return id;
     }
-
+    
     @Override
     public boolean isPlaceholder() {
         return true;
     }
-
+    
     @Override
     public int hashCode() {
         return id.hashCode();
     }
-
+    
     @Override
     public boolean equals(Object obj) {
         if(!(obj instanceof PlaceholderPipelineBiome that)) return false;
-
+        
         return this.id.equals(that.id);
     }
 }

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.biome.pipeline.api.biome;
+package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
 
 import java.util.Collections;
 import java.util.Set;
@@ -8,31 +8,31 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 final class SelfPipelineBiome implements PipelineBiome {
     public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();
-
+    
     private SelfPipelineBiome() {
 
     }
-
+    
     @Override
     public Biome getBiome() {
         throw new UnsupportedOperationException("Cannot get biome from self delegate");
     }
-
+    
     @Override
     public boolean isSelf() {
         return true;
     }
-
+    
     @Override
     public boolean isPlaceholder() {
         return true;
     }
-
+    
     @Override
     public Set<String> getTags() {
         return Collections.emptySet();
     }
-
+    
     @Override
     public String getID() {
         return "SELF";

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.v2.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import java.util.List;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+
+
+@SuppressWarnings({ "FieldMayBeFinal", "unused" })
+public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
+    @Value("resolution")
+    @Default
+    @Description("""
+                 The resolution at which to sample biomes.
+                 
+                 Larger values are quadratically faster, but produce lower quality results.
+                 For example, a value of 3 would sample every 3 blocks.""")
+    protected @Meta int resolution = 1;
+    
+    @Value("pipeline.source")
+    @Description("The Biome Source to use for initial population of biomes.")
+    private @Meta Source source;
+    
+    @Value("pipeline.stages")
+    @Description("A list of pipeline stages to apply to the result of #source")
+    private @Meta List<@Meta Stage> stages;
+    
+    @Value("blend.sampler")
+    @Default
+    @Description("A sampler to use for blending the edges of biomes via domain warping.")
+    protected @Meta NoiseSampler blendSampler = NoiseSampler.zero();
+    
+    @Value("blend.amplitude")
+    @Default
+    @Description("The amplitude at which to perform blending.")
+    protected @Meta double blendAmplitude = 0d;
+    
+    @Override
+    public BiomeProvider get() {
+        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
+    }
+}

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

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

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

@@ -1,32 +1,32 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.source;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
 
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Source;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.source.SamplerSource;
 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 public class SamplerSourceTemplate extends SourceTemplate {
     @Value("sampler")
     @Description("The sampler used to distribute biomes.")
-    private @Meta Sampler noise;
-
+    private @Meta NoiseSampler noise;
+    
     @Value("biomes")
     @Description("The biomes to be distributed.")
     private @Meta ProbabilityCollection<@Meta PipelineBiome> biomes;
-
+    
     @Override
     public Source get() {
         return new SamplerSource(biomes, noise);

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

@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.source;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.source;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 
 
 public abstract class SourceTemplate implements ObjectTemplate<Source> {

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage;
+
+import com.dfsek.tectonic.api.config.template.annotations.Description;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.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("sampler")
+    @Description("Sampler to use for stage distribution.")
+    protected @Meta NoiseSampler noise;
+}

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
+
+
+public class ExpanderStageTemplate extends StageTemplate {
+    @Override
+    public Expander get() {
+        return new FractalExpander(noise);
+    }
+}

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

@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderListStage;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
@@ -23,17 +23,17 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class BorderListStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-
+    
     @Value("default-replace")
     private @Meta String defaultReplace;
-
+    
     @Value("default-to")
     private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
-
+    
     @Value("replace")
     private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
-
-
+    
+    
     @Override
     public Stage get() {
         return new BorderListStage(replace, from, defaultReplace, noise, defaultTo);

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

@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.stage.mutators.BorderStage;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
@@ -21,13 +21,13 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class BorderStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-
+    
     @Value("replace")
     private @Meta String replace;
-
+    
     @Value("to")
     private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
-
+    
     @Override
     public Stage get() {
         return new BorderStage(from, replace, noise, to);

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

@@ -1,20 +1,20 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.Map;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceListStage;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
@@ -23,13 +23,13 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class ReplaceListStageTemplate extends StageTemplate {
     @Value("default-from")
     private @Meta String defaultFrom;
-
+    
     @Value("default-to")
     private @Meta ProbabilityCollection<@Meta PipelineBiome> defaultTo;
-
+    
     @Value("to")
     private @Meta Map<@Meta PipelineBiome, @Meta ProbabilityCollection<@Meta PipelineBiome>> replace;
-
+    
     @Override
     public Stage get() {
         return new ReplaceListStage(replace, defaultFrom, defaultTo, noise);

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

@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
-import com.dfsek.terra.addons.biome.pipeline.stage.mutators.ReplaceStage;
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
@@ -21,10 +21,10 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class ReplaceStageTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-
+    
     @Value("to")
     private @Meta ProbabilityCollection<@Meta PipelineBiome> to;
-
+    
     @Override
     public Stage get() {
         return new ReplaceStage(from, to, noise);

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
+
+
+public class SmoothStageTemplate extends StageTemplate {
+    @Override
+    public Stage get() {
+        return new SmoothStage(noise);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,27 @@
+package com.dfsek.terra.addons.biome.pipeline.v2.source;
+
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+
+
+public class SamplerSource implements Source {
+    private final ProbabilityCollection<PipelineBiome> biomes;
+    private final NoiseSampler sampler;
+    
+    public SamplerSource(ProbabilityCollection<PipelineBiome> biomes, NoiseSampler sampler) {
+        this.biomes = biomes;
+        this.sampler = sampler;
+    }
+    
+    @Override
+    public PipelineBiome get(long seed, int x, int z) {
+        return biomes.get(sampler, x, z, seed);
+    }
+    
+    @Override
+    public Iterable<PipelineBiome> getBiomes() {
+        return biomes.getContents();
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -1,39 +1,38 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
-
-import com.dfsek.seismic.type.sampler.Sampler;
+package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 public class ReplaceListStage implements Stage {
     private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
-    private final Sampler sampler;
+    private final NoiseSampler sampler;
     private final ProbabilityCollection<PipelineBiome> replaceDefault;
     private final String defaultTag;
-
+    
     public ReplaceListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String defaultTag,
-                            ProbabilityCollection<PipelineBiome> replaceDefault, Sampler sampler) {
+                            ProbabilityCollection<PipelineBiome> replaceDefault, NoiseSampler sampler) {
         this.replace = replace;
         this.sampler = sampler;
         this.defaultTag = defaultTag;
         this.replaceDefault = replaceDefault;
     }
-
+    
     @Override
     public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) {
         PipelineBiome center = viewPoint.getBiome();
@@ -47,18 +46,18 @@ public class ReplaceListStage implements Stage {
         }
         return center;
     }
-
+    
     @Override
     public int maxRelativeReadDistance() {
         return 0;
     }
-
+    
     @Override
     public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
         Set<PipelineBiome> biomeSet = new HashSet<>();
-
+        
         Set<PipelineBiome> reject = new HashSet<>();
-
+        
         biomes.forEach(biome -> {
             if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {
                 biomeSet.add(biome);

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

@@ -1,35 +1,34 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
-
-import com.dfsek.seismic.type.sampler.Sampler;
+package com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 public class ReplaceStage implements Stage {
     private final String replaceableTag;
     private final ProbabilityCollection<PipelineBiome> replace;
-    private final Sampler sampler;
-
-    public ReplaceStage(String replaceable, ProbabilityCollection<PipelineBiome> replace, Sampler sampler) {
+    private final NoiseSampler sampler;
+    
+    public ReplaceStage(String replaceable, ProbabilityCollection<PipelineBiome> replace, NoiseSampler sampler) {
         this.replaceableTag = replaceable;
         this.replace = replace;
         this.sampler = sampler;
     }
-
+    
     @Override
     public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) {
         if(viewPoint.getBiome().getTags().contains(replaceableTag)) {
@@ -38,12 +37,12 @@ public class ReplaceStage implements Stage {
         }
         return viewPoint.getBiome();
     }
-
+    
     @Override
     public int maxRelativeReadDistance() {
         return 0;
     }
-
+    
     @Override
     public Iterable<PipelineBiome> getBiomes(Iterable<PipelineBiome> biomes) {
         Set<PipelineBiome> biomeSet = new HashSet<>();

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

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

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

@@ -1,10 +1,10 @@
 schema-version: 1
 contributors:
   - Terra contributors
-id: config-number-predicate
+id: biome-provider-pipeline-v2
 version: @VERSION@
 entrypoints:
-  - "com.dfsek.terra.addons.numberpredicate.NumberPredicateAddon"
+  - "com.dfsek.terra.addons.biome.pipeline.v2.BiomePipelineAddon"
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra

common/addons/biome-provider-pipeline/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Polyhedral Development
+Copyright (c) 2020-2021 Polyhedral Development
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

common/addons/biome-provider-pipeline/README.md

@@ -1,12 +1,7 @@
-# biome-provider-pipeline-2
+# biome-provider-pipeline
 
-The second version of the Biome Pipeline, a procedural biome provider that uses a series
+Implements the Biome Pipeline, a procedural biome provider that uses a series
 of "stages" to apply "mutations" to a 2D grid of biomes.
 
-Version 2 is a re-implementation of the original addon with the primary goal of providing
-consistent scaling for noise relative to the world
-(See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
-included as a separate addon to maintain parity with packs utilizing the first version.
-
 This addon registers the `PIPELINE` biome provider type, and all associated
 configurations.

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

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

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

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline;
+
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
+import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
+import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander;
+import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.util.vector.Vector2;
+
+
+public class BiomeHolderImpl implements BiomeHolder {
+    private final Vector2.Mutable origin;
+    private final int width;
+    private final int offset;
+    private BiomeDelegate[][] biomes;
+    
+    public BiomeHolderImpl(int width, Vector2.Mutable origin) {
+        width += 4;
+        this.width = width;
+        biomes = new BiomeDelegate[width][width];
+        this.origin = origin;
+        this.offset = 2;
+    }
+    
+    private BiomeHolderImpl(BiomeDelegate[][] biomes, Vector2.Mutable origin, int width, int offset) {
+        this.biomes = biomes;
+        this.origin = origin;
+        this.width = width;
+        this.offset = 2 * offset;
+    }
+    
+    @Override
+    public BiomeHolder expand(BiomeExpander expander, long seed) {
+        BiomeDelegate[][] old = biomes;
+        int newWidth = width * 2 - 1;
+        
+        biomes = new BiomeDelegate[newWidth][newWidth];
+        
+        for(int x = 0; x < width; x++) {
+            for(int z = 0; z < width; z++) {
+                biomes[x * 2][z * 2] = old[x][z];
+                if(z != width - 1)
+                    biomes[x * 2][z * 2 + 1] = expander.getBetween(x + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
+                                                                   old[x][z + 1]);
+                if(x != width - 1)
+                    biomes[x * 2 + 1][z * 2] = expander.getBetween(x + 1 + origin.getX(), z + origin.getZ(), seed, old[x][z],
+                                                                   old[x + 1][z]);
+                if(x != width - 1 && z != width - 1)
+                    biomes[x * 2 + 1][z * 2 + 1] = expander.getBetween(x + 1 + origin.getX(), z + 1 + origin.getZ(), seed, old[x][z],
+                                                                       old[x + 1][z + 1], old[x][z + 1], old[x + 1][z]);
+            }
+        }
+        return new BiomeHolderImpl(biomes, origin.setX(origin.getX() * 2 - 1).setZ(origin.getZ() * 2 - 1), newWidth, offset);
+    }
+    
+    @Override
+    public void mutate(BiomeMutator mutator, long seed) {
+        for(int x = 0; x < width; x++) {
+            for(int z = 0; z < width; z++) {
+                BiomeMutator.ViewPoint viewPoint = new BiomeMutator.ViewPoint(this, x, z);
+                biomes[x][z] = mutator.mutate(viewPoint, x + origin.getX(), z + origin.getZ(), seed);
+            }
+        }
+    }
+    
+    @Override
+    public void fill(BiomeSource source, long seed) {
+        for(int x = 0; x < width; x++) {
+            for(int z = 0; z < width; z++) {
+                biomes[x][z] = source.getBiome(origin.getX() + x, origin.getZ() + z, seed);
+            }
+        }
+    }
+    
+    @Override
+    public BiomeDelegate getBiome(int x, int z) {
+        x += offset;
+        z += offset;
+        return getBiomeRaw(x, z);
+    }
+    
+    @Override
+    public BiomeDelegate getBiomeRaw(int x, int z) {
+        if(x >= width || z >= width || x < 0 || z < 0) return null;
+        return biomes[x][z];
+    }
+}

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

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.biome.pipeline;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
+import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage;
+import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
+import com.dfsek.terra.api.util.vector.Vector2;
+
+
+public class BiomePipeline {
+    private final BiomeSource source;
+    private final List<Stage> stages;
+    private final int size;
+    private final int init;
+    
+    private BiomePipeline(BiomeSource source, List<Stage> stages, int size, int init) {
+        this.source = source;
+        this.stages = stages;
+        this.size = size;
+        this.init = init;
+    }
+    
+    /**
+     * Get biomes in a chunk
+     *
+     * @param x Chunk X coord
+     * @param z Chunk Z coord
+     *
+     * @return BiomeHolder containing biomes.
+     */
+    public BiomeHolder getBiomes(int x, int z, long seed) {
+        BiomeHolder holder = new BiomeHolderImpl(init, Vector2.of(x * (init - 1), z * (init - 1)).mutable());
+        holder.fill(source, seed);
+        for(Stage stage : stages) holder = stage.apply(holder, seed);
+        return holder;
+    }
+    
+    public BiomeSource getSource() {
+        return source;
+    }
+    
+    public List<Stage> getStages() {
+        return Collections.unmodifiableList(stages);
+    }
+    
+    public int getSize() {
+        return size;
+    }
+    
+    public static final class BiomePipelineBuilder {
+        private final int init;
+        private final List<Stage> stages = new ArrayList<>();
+        private int expand;
+        
+        public BiomePipelineBuilder(int init) {
+            this.init = init;
+            expand = init;
+        }
+        
+        public BiomePipeline build(BiomeSource source) {
+            for(Stage stage : stages) {
+                if(stage.isExpansion()) expand = expand * 2 - 1;
+            }
+            
+            return new BiomePipeline(source, stages, expand, init);
+        }
+        
+        public BiomePipelineBuilder addStage(Stage stage) {
+            stages.add(stage);
+            return this;
+        }
+    }
+}