Merge remote-tracking branch 'origin/ver/6.5.0' into dev/metapacks

This occurs when the NoiseChunkGenerator3D#getSlant method is invoked at
a position where the biome has an empty slant holder, currently possible
when using the slant locator addon.

This is fixed by making slant calculation independent of SlantHolders.
Some minor refactoring has also been done as a result of this change.

.editorconfig

@@ -8,7 +8,7 @@ indent_style = space
 insert_final_newline = false
 max_line_length = 140
 tab_width = 4
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 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 = true
+ij_java_align_multiline_chained_methods = false
 ij_java_align_multiline_extends_list = true
 ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = true
+ij_java_align_multiline_method_parentheses = false
 ij_java_align_multiline_parameters = true
-ij_java_align_multiline_parameters_in_calls = true
+ij_java_align_multiline_parameters_in_calls = false
 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 = true
+ij_java_keep_indents_on_empty_lines = false
 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
 
-[{*.yaml, *.yml}]
+[{*.yml, *.yaml}]
 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 = true
+ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
 ij_yaml_sequence_on_new_line = false
 ij_yaml_space_before_colon = false

.github/CODEOWNERS

@@ -1,19 +1,13 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax
+*                   @dfsek @solonovamax @duplexsystem @Astrashh @justaureus
 
 # Platforms
-## 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
+/platforms/         @dfsek @solonovamax @duplexsystem @justaureus
 
 # Common
-/common/            @dfsek @solonovamax
+/common/            @dfsek @solonovamax @duplexsystem @Astrashh
 
 # Gradle Stuff
-## Most gradle stuff was written by solonovamax
-/buildSrc/           @solonovamax
-*.gradle.kts        @solonovamax
+/buildSrc/          @dfsek @solonovamax @duplexsystem
+*.gradle.kts        @dfsek @solonovamax @duplexsystem
+/gradle/            @dfsek @solonovamax @duplexsystem

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-    -   name: Which Issue Template do I Choose?
-        url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
-        about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you.
-    -   name: Terra Wiki
-        url: https://github.com/PolyhedralDev/Terra/wiki
-        about: Documentation for all things Terra.
-    -   name: Join the Support Discord
-        url: https://discord.dfsek.com
-        about: If you have a basic support question, join the Discord instead.
+  - name: Which Issue Template do I Choose?
+    url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template
+    about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you.
+  - name: Terra Wiki
+    url: https://github.com/PolyhedralDev/Terra/wiki
+    about: Documentation for all things Terra.
+  - name: Join the Support Discord
+    url: https://discord.dfsek.com
+    about: If you have a basic support question, join the Discord instead.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,58 +1,19 @@
 # Pull Request
 
-## Brief description.
+## Description
 
-<!-- Please provide a brief description of the goals of your PR -->
+<!-- Include a description of the PR here -->
 
 <!--
-###########################################################################
-## 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.
+If applicable, include 'Fixes #XXXX' or 'Closes #XXXX' for any related open issues.
+This helps us relate, track, and close the relevant issues.
 -->
 
-## 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
+### Changelog
 
 <!--
-    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.
+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.
 -->
 
 - [ ] <!-- First thing -->
@@ -61,47 +22,58 @@
 - [ ] <!-- Second thing -->
 - [ ] <!-- etc. -->
 
-## Affects of the PR
+## Checklist
 
-<!---
-    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])
+<!--
+Select the options below that apply.
+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.
+
 #### Types of changes
 
-- [ ] 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. -->
+- [ ] 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. -->
 
-#### Compatiblity
+#### Compatibility
 
-- [ ] 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.)
-    -->
+<!-- The following options determine if the PR pertains to a major, minor, or patch version bump -->
 
-#### 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. -->
+- [ ] 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
 
 #### Documentation
 
@@ -112,7 +84,21 @@
 
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.
-    <!--
-        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.
-    -->
+  <!--
+  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.
+  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.)
+  -->

.github/workflows/gradle-build.yml

@@ -0,0 +1,47 @@
+# 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@b4ffde65f46336ab88eb53be808477a3936bae11
+      - name: Set up JDK 17
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
+        with:
+          java-version: '17'
+          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@03c71a8ba93d670980695505f48f49daf43704a6
+        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,3 +249,5 @@ nbdist/
 
 platforms/**/run/**
 
+#Vale Config File
+**/.vale.ini

build.gradle.kts

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

buildSrc/build.gradle.kts

@@ -17,10 +17,10 @@ repositories {
 dependencies {
     //TODO Allow pulling from Versions.kt
     implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.11")
 
-    implementation("org.ow2.asm", "asm", "9.5")
-    implementation("org.ow2.asm", "asm-tree", "9.5")
-    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("org.ow2.asm", "asm", "9.6")
+    implementation("org.ow2.asm", "asm-tree", "9.6")
+    implementation("com.dfsek.tectonic", "common", "4.2.1")
     implementation("org.yaml", "snakeyaml", "2.2")
 }

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 {
-                println("Deleting old addon: " + it.absolutePath)
+                logger.info("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}"
                 
-                println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
+                logger.info("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
                 
                 jar.archiveFile.orNull?.asFile?.copyTo(target)
             }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -48,17 +48,14 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        maven("https://nexuslite.gcnt.net/repos/other/") {
-            name = "GCNT"
-        }
     }
     
     dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-        compileOnly("org.jetbrains:annotations:23.0.0")
+        testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit)
+        testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit)
+        compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
         
-        compileOnly("com.google.guava:guava:30.0-jre")
-        testImplementation("com.google.guava:guava:30.0-jre")
+        compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
+        testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
     }
 }

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -1,9 +1,8 @@
 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.FileSystemNotFoundException
 import java.nio.file.FileSystems
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
@@ -28,7 +27,8 @@ fun Project.configureDistribution() {
         group = "terra"
         doFirst {
             file("${buildDir}/resources/main/packs/").deleteRecursively()
-            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+            val defaultPackUrl =
+                URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
             downloadPack(defaultPackUrl, project)
         }
     }
@@ -47,30 +47,22 @@ fun Project.configureDistribution() {
         
         doLast {
             // https://github.com/johnrengelman/shadow/issues/111
-            val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
+            val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().path
             
-            val provider = try {
-                FileSystems.getFileSystem(dest)
-            } catch (e: FileSystemNotFoundException) {
-                null
-            } ?: FileSystems.newFileSystem(dest, mapOf("create" to "false"), null)
-            provider?.use { fs ->
+            
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
                 forSubProjects(":common:addons") {
-                    if (fs.isOpen) {
-                        val jar = getJarTask()
-                        
-                        if (jar.archiveFile.get().asFile.exists()) {
-                            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 (!addonPath.exists()) {
-                                addonPath.parent.createDirectories()
-                                addonPath.createFile()
-                                jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
-                            }
-                        }
+                    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)
                     }
                     
                 }

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
-        println("Setting version of $path to $version")
+        logger.info("Setting version of $path to $version")
     }
     project(project).version = version
-    println("Setting version of $project to $version")
+    logger.info("Setting version of $project to $version")
 }
 
 fun Project.version(version: String): String {

buildSrc/src/main/kotlin/Versions.kt

@@ -1,4 +1,8 @@
 object Versions {
+    object Terra {
+        const val overworldConfig = "v1.3.4"
+    }
+    
     object Libraries {
         const val tectonic = "4.2.1"
         const val paralithic = "0.7.1"
@@ -6,21 +10,25 @@ object Versions {
         
         const val cloud = "1.8.4"
         
+        const val caffeine = "3.1.8"
+        
         const val slf4j = "2.0.9"
         const val log4j_slf4j_impl = "2.20.0"
         
         object Internal {
             const val shadow = "8.1.1"
-            const val apacheText = "1.10.0"
-            const val apacheIO = "2.14.0"
+            const val apacheText = "1.11.0"
+            const val apacheIO = "2.15.1"
             const val guava = "32.1.3-jre"
-            const val asm = "9.5"
+            const val asm = "9.6"
             const val snakeYml = "2.2"
+            const val jetBrainsAnnotations = "24.1.0"
+            const val junit = "5.10.1"
         }
     }
     
     object Fabric {
-        const val fabricAPI = "0.90.0+${Mod.minecraft}"
+        const val fabricAPI = "0.91.2+${Mod.minecraft}"
     }
 //
 //    object Quilt {
@@ -31,30 +39,28 @@ object Versions {
     object Mod {
         const val mixin = "0.12.5+mixin.0.8.5"
         
-        const val minecraft = "1.20.2"
-        const val yarn = "$minecraft+build.4"
-        const val fabricLoader = "0.14.23"
+        const val minecraft = "1.20.4"
+        const val yarn = "$minecraft+build.1"
+        const val fabricLoader = "0.15.1"
         
-        const val architecuryLoom = "1.3.357"
-        const val architecturyPlugin = "3.4.146"
-        
-        const val loomVineflower = "1.11.0"
-    }
-    
-    object Forge {
-        const val forge = "${Mod.minecraft}-48.0.13"
-        const val burningwave = "12.63.0"
+        const val architecuryLoom = "1.4.369"
+        const val architecturyPlugin = "3.4.151"
     }
+//
+//    object Forge {
+//        const val forge = "${Mod.minecraft}-48.0.13"
+//        const val burningwave = "12.63.0"
+//    }
     
     object Bukkit {
-        const val paper = "1.18.2-R0.1-SNAPSHOT"
-        const val paperLib = "1.0.5"
-        const val foliaLib = "0.2.5"
-        const val minecraft = "1.20.2"
-        const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
-        const val runPaper = "2.2.0"
-        const val paperWeight = "1.5.6"
+        const val minecraft = "1.20.4"
+        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
+        const val paper = paperBuild
+        const val paperLib = "1.0.8"
+        const val reflectionRemapper = "0.1.0"
+        const val paperDevBundle = paperBuild
+        const val runPaper = "2.2.2"
+        const val paperWeight = "1.5.11"
     }
     
     //
@@ -66,6 +72,6 @@ object Versions {
 //
     object CLI {
         const val nbt = "6.1"
-        const val logback = "1.4.11"
+        const val logback = "1.4.14"
     }
 }

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 {
-                            println("No description provided for field " + field.name + " in class " + name)
+                            logger.info("No description provided for field " + field.name + " in class " + name)
                             "*No description provided.*"
                         })
                     }

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

@@ -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

@@ -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,27 +23,27 @@ 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.extrude(base, x, y, z, seed);

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

@@ -2,6 +2,8 @@ package com.dfsek.terra.addons.biome.extrusion;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.extrusion.config.BiomeExtrusionTemplate;
@@ -21,47 +23,45 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
-import java.util.function.Supplier;
-
 
 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

@@ -16,7 +16,7 @@ public class BiomeExtrusionProvider implements BiomeProvider {
     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());
@@ -24,43 +24,43 @@ public class BiomeExtrusionProvider implements BiomeProvider {
         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 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

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.util.Range;
 public abstract class SamplerExtrusionTemplate implements ObjectTemplate<Extrusion> {
     @Value("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

@@ -18,20 +18,20 @@ import com.dfsek.terra.api.world.biome.Biome;
  */
 public class ReplaceExtrusion implements Extrusion {
     private final NoiseSampler sampler;
-    
+
     private final Range range;
-    
+
     private final ProbabilityCollection<ReplaceableBiome> biomes;
-    
+
     private final Predicate<Biome> hasTag;
-    
+
     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);
     }
-    
+
     @Override
     public Biome extrude(Biome original, int x, int y, int z, long seed) {
         if(hasTag.test(original)) {
@@ -39,14 +39,14 @@ public class ReplaceExtrusion implements Extrusion {
         }
         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

@@ -17,29 +17,29 @@ import com.dfsek.terra.api.world.biome.Biome;
  */
 public class SetExtrusion implements Extrusion {
     private final NoiseSampler sampler;
-    
+
     private final Range range;
-    
+
     private final 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/resources/terra.addon.yml

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

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

@@ -17,33 +17,33 @@ 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

@@ -33,46 +33,46 @@ 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();
+            .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

@@ -21,18 +21,18 @@ 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

@@ -8,10 +8,10 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 
 public class ClosestBiomeColorConverterTemplate extends ClosestColorConverterTemplate<Biome> {
-    
+
     @Value("match")
     private ColorMapping<Biome> match;
-    
+
     @Override
     protected ColorMapping<Biome> getMapping() {
         return match;

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

@@ -9,27 +9,27 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 
 public class ExactBiomeColorConverterTemplate extends ExactColorConverterTemplate<Biome> {
-    
+
     @Value("match")
     private ColorMapping<Biome> match;
-    
+
     @Value("else")
     private Biome fallback;
-    
+
     @Value("ignore-alpha")
     @Default
     private boolean ignoreAlpha = true;
-    
+
     @Override
     protected ColorMapping<Biome> getMapping() {
         return match;
     }
-    
+
     @Override
     protected Biome getFallback() {
         return fallback;
     }
-    
+
     @Override
     protected boolean ignoreAlpha() {
         return ignoreAlpha;

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

@@ -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
+  - Terra contributors
 id: biome-provider-image-v2
 version: @VERSION@
 entrypoints:
-    - "com.dfsek.terra.addons.biome.image.v2.ImageBiomeProviderAddon"
+  - "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
+  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.+"
+  library-image: "1.+"

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

@@ -23,53 +23,53 @@ public class ImageBiomeProvider implements BiomeProvider {
     private final BufferedImage image;
     private final int resolution;
     private final Align align;
-    
+
     public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
         this.image = image;
         this.resolution = resolution;
         this.align = align;
         registry.forEach(biome -> colorBiomeMap.put(new Color(biome.getColor()), biome));
     }
-    
+
     private static int distance(Color a, Color b) {
         return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.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;
         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;
-                                                      }));
+            .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 colorBiomeMap.values();
     }
-    
+
     public enum Align {
         CENTER {
             @Override
             public Color getColor(BufferedImage image, int x, int z) {
                 return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
-                                              Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
+                    Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
             }
         },
         NONE {
@@ -78,7 +78,7 @@ public class ImageBiomeProvider implements BiomeProvider {
                 return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.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

@@ -26,31 +26,31 @@ 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<>() {
     };
     private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
     @Inject
     private Platform platform;
-    
+
     @Inject
     private BaseAddon addon;
-    
+
     @Override
     public void initialize() {
         platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("IMAGE"),
-                                              () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
-                })
-                .failThrough();
+            .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();
         if(platform.getTerraConfig().isDebugLog())
             logger.warn(
-                    "The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the " +
-                    "biome-provider-image-v2 addon for future pack development instead.");
+                "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

@@ -33,11 +33,11 @@ public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
     @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

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

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

@@ -38,52 +38,52 @@ 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();
+            .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));
-                });
+            .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

@@ -12,11 +12,11 @@ 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;
@@ -24,44 +24,44 @@ public class BiomePipelineColumn implements Column<Biome> {
         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++) {

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

@@ -22,23 +22,23 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class PipelineBiomeProvider implements BiomeProvider {
-    
+
     private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
     private final int chunkSize;
     private final int resolution;
     private final NoiseSampler mutator;
     private final double noiseAmp;
     private final Set<Biome> biomes;
-    
+
     public 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;
@@ -49,16 +49,16 @@ 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: " +
@@ -67,47 +67,47 @@ public class PipelineBiomeProvider implements BiomeProvider {
             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 += 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 chunkWorldX = chunkX * chunkSize;
         int chunkWorldZ = chunkZ * chunkSize;
-        
+
         int xInChunk = x - chunkWorldX;
         int zInChunk = z - chunkWorldZ;
-        
+
         return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
     }
-    
+
     @Override
     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

@@ -5,6 +5,6 @@ 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

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

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

@@ -5,10 +5,10 @@ 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

@@ -1,7 +1,7 @@
 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) {
@@ -9,7 +9,7 @@ public record SeededVector(long seed, int x, int z) {
         }
         return false;
     }
-    
+
     @Override
     public int hashCode() {
         int code = x;

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

@@ -6,6 +6,6 @@ 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

@@ -6,9 +6,9 @@ import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoin
 
 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,38 +1,38 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api.biome;
 
-import java.util.Set;
-
 import com.dfsek.terra.api.world.biome.Biome;
 
+import java.util.Set;
+
 
 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

@@ -10,26 +10,26 @@ public interface PipelineBiome extends StringIdentifiable {
     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

@@ -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

@@ -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

@@ -29,7 +29,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
     @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;
@@ -47,7 +47,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
     @Value("pipeline.stages")
     @Description("A list of pipeline stages to apply to the result of #source")
     private @Meta List<@Meta Stage> stages;
-    
+
     @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

@@ -15,18 +15,18 @@ 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

@@ -22,11 +22,11 @@ public class SamplerSourceTemplate extends SourceTemplate {
     @Value("sampler")
     @Description("The sampler used to distribute biomes.")
     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/stage/mutator/BorderListStageTemplate.java

@@ -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

@@ -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

@@ -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

@@ -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/pipeline/BiomeChunkImpl.java

@@ -10,44 +10,45 @@ import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 public class BiomeChunkImpl implements BiomeChunk {
-    
+
     private final SeededVector worldOrigin;
     private final int chunkOriginArrayIndex;
     private final int worldCoordinateScale;
-    private PipelineBiome[][] biomes;
-    
+    private final int size;
+    private PipelineBiome[] biomes;
+
     public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
-        
+
         this.worldOrigin = worldOrigin;
         this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
         this.worldCoordinateScale = pipeline.getResolution();
-        
-        int size = pipeline.getArraySize();
-        
+
+        this.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][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
-                                                                  zIndexToWorldCoordinate(zIndex));
+                biomes[(xIndex * size) + 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
@@ -55,31 +56,32 @@ 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
             for(int gridZ = 0; gridZ < gridSize; gridZ = gridZ + 1) {
                 for(int gridX = 0; gridX < gridSize; gridX = gridX + 1) {
                     int xIndex = gridOrigin + gridX * gridInterval;
                     int zIndex = gridOrigin + gridZ * gridInterval;
-                    biomes[xIndex][zIndex] = stage.apply(new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray));
+                    biomes[(xIndex * size) + zIndex] = stage.apply(
+                        new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray, size));
                 }
             }
         }
     }
-    
+
     protected static int initialSizeToArraySize(int expanderCount, int initialSize) {
         int size = initialSize;
         for(int i = 0; i < expanderCount; i++) {
@@ -87,18 +89,18 @@ 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 (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
     }
-    
+
     private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
         int gridOrigin = 0;
         int expansionsApplied = 0;
@@ -112,42 +114,42 @@ 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][zIndex];
+        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 SeededVector getOrigin() {
         return worldOrigin;
     }
-    
+
     /**
      * Represents a point on the operating grid within the biomes array
      */
@@ -159,10 +161,11 @@ public class BiomeChunkImpl implements BiomeChunk {
         private final int gridZ;
         private final int xIndex;
         private final int zIndex;
-        private final PipelineBiome[][] lookupArray;
-        
+        private final PipelineBiome[] lookupArray;
+        private final int size;
+
         private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex,
-                          PipelineBiome[][] lookupArray) {
+                          PipelineBiome[] lookupArray, int size) {
             this.chunk = chunk;
             this.gridInterval = gridInterval;
             this.gridX = gridX;
@@ -170,47 +173,48 @@ public class BiomeChunkImpl implements BiomeChunk {
             this.xIndex = xIndex;
             this.zIndex = zIndex;
             this.lookupArray = lookupArray;
-            this.biome = lookupArray[xIndex][zIndex];
+            this.size = size;
+            this.biome = lookupArray[(this.xIndex * this.size) + this.zIndex];
         }
-        
+
         public PipelineBiome getRelativeBiome(int x, int z) {
             int lookupXIndex = this.xIndex + x * gridInterval;
             int lookupZIndex = this.zIndex + z * gridInterval;
-            return lookupArray[lookupXIndex][lookupZIndex];
+            return lookupArray[(lookupXIndex * this.size) + lookupZIndex];
         }
-        
+
         public PipelineBiome getBiome() {
             return biome;
         }
-        
+
         /**
          * @return X position of the point relative to the operating grid
          */
         public int gridX() {
             return gridX;
         }
-        
+
         /**
          * @return Z position of the point relative to the operating grid
          */
         public int gridZ() {
             return gridZ;
         }
-        
+
         /**
          * @return X position of the point in the world
          */
         public int worldX() {
             return chunk.xIndexToWorldCoordinate(xIndex);
         }
-        
+
         /**
          * @return Z position of the point in the world
          */
         public int worldZ() {
             return chunk.zIndexToWorldCoordinate(zIndex);
         }
-        
+
         public long worldSeed() {
             return chunk.getOrigin().seed();
         }

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

@@ -14,9 +14,9 @@ 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,13 +24,13 @@ 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;
@@ -43,49 +43,49 @@ public class PipelineImpl implements Pipeline {
             if(chunkSize > 1 && arraySize >= idealChunkArraySize) break;
             initialSize++;
         }
-        
+
         this.arraySize = arraySize;
         this.chunkOriginArrayIndex = chunkOriginArrayIndex;
         this.chunkSize = chunkSize;
-        
+
         logger.debug("Initialized a new biome pipeline:");
         logger.debug("Array size: {} (Target: {})", arraySize, idealChunkArraySize);
         logger.debug("Internal array origin: {}", chunkOriginArrayIndex);
         logger.debug("Chunk size: {}", chunkSize);
     }
-    
+
     @Override
     public BiomeChunk generateChunk(SeededVector worldCoordinates) {
         return new BiomeChunkImpl(worldCoordinates, this);
     }
-    
+
     @Override
     public int getChunkSize() {
         return chunkSize;
     }
-    
+
     @Override
     public Source getSource() {
         return source;
     }
-    
+
     @Override
     public List<Stage> getStages() {
         return stages;
     }
-    
+
     protected int getExpanderCount() {
         return expanderCount;
     }
-    
+
     protected int getArraySize() {
         return arraySize;
     }
-    
+
     protected int getChunkOriginArrayIndex() {
         return chunkOriginArrayIndex;
     }
-    
+
     protected int getResolution() {
         return resolution;
     }

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

@@ -9,17 +9,17 @@ 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

@@ -8,18 +8,18 @@ import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 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

@@ -7,27 +7,27 @@ 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) :

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

@@ -28,9 +28,9 @@ public class BorderListStage implements Stage {
     private final ProbabilityCollection<PipelineBiome> replaceDefault;
     private final String defaultReplace;
     private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
-    
+
     private final Vector2Int[] borderPoints;
-    
+
     public BorderListStage(Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace, String border, String defaultReplace,
                            NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replaceDefault) {
         this.border = border;
@@ -38,7 +38,7 @@ public class BorderListStage implements Stage {
         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++) {
@@ -47,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<>();
@@ -58,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,18 +68,18 @@ public class BorderListStage implements Stage {
                 if(current != null && current.getTags().contains(border)) {
                     if(replace.containsKey(center)) {
                         PipelineBiome replacement = replace.get(center).get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
-                                                                            viewPoint.worldSeed());
+                            viewPoint.worldSeed());
                         return replacement.isSelf() ? center : replacement;
                     }
                     PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
-                                                                   viewPoint.worldSeed());
+                        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

@@ -27,7 +27,7 @@ public class BorderStage implements Stage {
     private final ProbabilityCollection<PipelineBiome> replace;
     private final String replaceTag;
     private final Vector2Int[] borderPoints;
-    
+
     public BorderStage(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<PipelineBiome> replace) {
         this.border = border;
         this.noiseSampler = noiseSampler;
@@ -42,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();
@@ -57,23 +57,23 @@ public class BorderStage implements Stage {
         }
         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

@@ -7,24 +7,24 @@
 
 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.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 java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Stream;
+
 
 public class ReplaceListStage implements Stage {
     private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
     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, NoiseSampler sampler) {
         this.replace = replace;
@@ -32,7 +32,7 @@ public class ReplaceListStage implements Stage {
         this.defaultTag = defaultTag;
         this.replaceDefault = replaceDefault;
     }
-    
+
     @Override
     public PipelineBiome apply(BiomeChunkImpl.ViewPoint viewPoint) {
         PipelineBiome center = viewPoint.getBiome();
@@ -46,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

@@ -22,13 +22,13 @@ public class ReplaceStage implements Stage {
     private final String replaceableTag;
     private final ProbabilityCollection<PipelineBiome> replace;
     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)) {
@@ -37,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

@@ -16,25 +16,25 @@ import com.dfsek.terra.api.noise.NoiseSampler;
 
 
 public class SmoothStage implements Stage {
-    
+
     private final NoiseSampler sampler;
-    
+
     public SmoothStage(NoiseSampler sampler) {
         this.sampler = sampler;
     }
-    
+
     @Override
     public PipelineBiome apply(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.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 :
@@ -48,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,12 +1,12 @@
 schema-version: 1
 contributors:
-    - Terra contributors
+  - Terra contributors
 id: biome-provider-pipeline-v2
 version: @VERSION@
 entrypoints:
-    - "com.dfsek.terra.addons.biome.pipeline.v2.BiomePipelineAddon"
+  - "com.dfsek.terra.addons.biome.pipeline.v2.BiomePipelineAddon"
 website:
-    issues: https://github.com/PolyhedralDev/Terra/issues
-    source: https://github.com/PolyhedralDev/Terra
-    docs: https://terra.polydev.org
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
 license: MIT License

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

@@ -20,7 +20,7 @@ public class BiomeHolderImpl implements BiomeHolder {
     private final int width;
     private final int offset;
     private BiomeDelegate[][] biomes;
-    
+
     public BiomeHolderImpl(int width, Vector2.Mutable origin) {
         width += 4;
         this.width = width;
@@ -28,38 +28,38 @@ public class BiomeHolderImpl implements BiomeHolder {
         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]);
+                        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]);
+                        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]);
+                        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++) {
@@ -69,7 +69,7 @@ public class BiomeHolderImpl implements BiomeHolder {
             }
         }
     }
-    
+
     @Override
     public void fill(BiomeSource source, long seed) {
         for(int x = 0; x < width; x++) {
@@ -78,14 +78,14 @@ public class BiomeHolderImpl implements BiomeHolder {
             }
         }
     }
-    
+
     @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;

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

@@ -22,14 +22,14 @@ public class BiomePipeline {
     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
      *
@@ -44,37 +44,37 @@ public class BiomePipeline {
         for(Stage stage : stages) holder = stage.apply(holder, seed);
         return holder;
     }
-    
+
     public BiomeSource getSource() {
         return source;
     }
-    
+
     public List<Stage> getStages() {
         return Collections.unmodifiableList(stages);
     }
-    
+
     public int getSize() {
         return size;
     }
-    
+
     public static final class BiomePipelineBuilder {
         private final int init;
         private final List<Stage> stages = new ArrayList<>();
         private int expand;
-        
+
         public BiomePipelineBuilder(int init) {
             this.init = init;
             expand = init;
         }
-        
+
         public BiomePipeline build(BiomeSource source) {
             for(Stage stage : stages) {
                 if(stage.isExpansion()) expand = expand * 2 - 1;
             }
-            
+
             return new BiomePipeline(source, stages, expand, init);
         }
-        
+
         public BiomePipelineBuilder addStage(Stage stage) {
             stages.add(stage);
             return this;

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

@@ -40,7 +40,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
 public class BiomePipelineAddon implements AddonInitializer {
-    
+
     public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
     };
     public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
@@ -50,47 +50,47 @@ public class BiomePipelineAddon implements AddonInitializer {
     private static final Logger logger = LoggerFactory.getLogger(BiomePipelineAddon.class);
     @Inject
     private Platform platform;
-    
+
     @Inject
     private BaseAddon addon;
-    
+
     @Override
     public void initialize() {
         platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPreLoadEvent.class)
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
-                            PROVIDER_REGISTRY_KEY);
-                    providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
-                            SOURCE_REGISTRY_KEY);
-                    sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
-                })
-                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
-                            STAGE_REGISTRY_KEY);
-                    stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
-                    stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new);
-                    stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new);
-                    stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new);
-                })
-                .failThrough();
+            .getHandler(FunctionalEventHandler.class)
+            .register(addon, ConfigPackPreLoadEvent.class)
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
+                    PROVIDER_REGISTRY_KEY);
+                providerRegistry.register(addon.key("PIPELINE"), BiomePipelineTemplate::new);
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<BiomeSource>>> sourceRegistry = event.getPack().getOrCreateRegistry(
+                    SOURCE_REGISTRY_KEY);
+                sourceRegistry.register(addon.key("SAMPLER"), SamplerSourceTemplate::new);
+            })
+            .then(event -> {
+                CheckedRegistry<Supplier<ObjectTemplate<Stage>>> stageRegistry = event.getPack().getOrCreateRegistry(
+                    STAGE_REGISTRY_KEY);
+                stageRegistry.register(addon.key("FRACTAL_EXPAND"), ExpanderStageTemplate::new);
+                stageRegistry.register(addon.key("SMOOTH"), SmoothMutatorTemplate::new);
+                stageRegistry.register(addon.key("REPLACE"), ReplaceMutatorTemplate::new);
+                stageRegistry.register(addon.key("REPLACE_LIST"), ReplaceListMutatorTemplate::new);
+                stageRegistry.register(addon.key("BORDER"), BorderMutatorTemplate::new);
+                stageRegistry.register(addon.key("BORDER_LIST"), BorderListMutatorTemplate::new);
+            })
+            .failThrough();
         platform.getEventManager()
-                .getHandler(FunctionalEventHandler.class)
-                .register(addon, ConfigPackPostLoadEvent.class)
-                .then(event -> {
-                    Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
-                    event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
-                });
-        
+            .getHandler(FunctionalEventHandler.class)
+            .register(addon, ConfigPackPostLoadEvent.class)
+            .then(event -> {
+                Registry<Biome> biomeRegistry = event.getPack().getRegistry(Biome.class);
+                event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
+            });
+
         if(platform.getTerraConfig().isDebugLog())
             logger.warn(
-                    "The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the" +
-                    " biome-provider-pipeline-v2 addon for future pack development instead.");
+                "The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the" +
+                " biome-provider-pipeline-v2 addon for future pack development instead.");
     }
 }

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

@@ -12,11 +12,11 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 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;
@@ -24,44 +24,44 @@ class BiomePipelineColumn implements Column<Biome> {
         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++) {

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

@@ -32,18 +32,18 @@ public class BiomePipelineProvider implements BiomeProvider {
     private final int resolution;
     private final NoiseSampler mutator;
     private final double noiseAmp;
-    
+
     private final Set<Biome> biomes;
-    
+
     public BiomePipelineProvider(BiomePipeline pipeline, int resolution, NoiseSampler mutator, double noiseAmp) {
         this.resolution = resolution;
         this.mutator = mutator;
         this.noiseAmp = noiseAmp;
         holderCache = Caffeine.newBuilder()
-                              .maximumSize(1024)
-                              .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
+            .maximumSize(1024)
+            .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
         this.pipeline = pipeline;
-        
+
         Set<BiomeDelegate> biomeSet = new HashSet<>();
         pipeline.getSource().getBiomes().forEach(biomeSet::add);
         Iterable<BiomeDelegate> result = biomeSet;
@@ -54,16 +54,16 @@ public class BiomePipelineProvider implements BiomeProvider {
         Iterable<BiomeDelegate> finalResult = result;
         result.forEach(biomeDelegate -> {
             if(biomeDelegate.isEphemeral()) {
-                
+
                 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 ephemeral biome \"" + biomeDelegate.getID() +
                                                    "\". Ensure there is a stage to guarantee replacement of the ephemeral biome. Biomes: " +
                                                    biomeList);
@@ -71,46 +71,46 @@ public class BiomePipelineProvider implements BiomeProvider {
             this.biomes.add(biomeDelegate.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 += mutator.noise(seed + 1, x, z) * noiseAmp;
         z += mutator.noise(seed + 2, x, z) * noiseAmp;
-        
-        
+
+
         x /= resolution;
         z /= resolution;
-        
+
         int fdX = Math.floorDiv(x, pipeline.getSize());
         int fdZ = Math.floorDiv(z, pipeline.getSize());
         return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
-                                                                          z - fdZ * pipeline.getSize()).getBiome();
+            z - fdZ * pipeline.getSize()).getBiome();
     }
-    
+
     @Override
     public Optional<Biome> getBaseBiome(int x, int z, long seed) {
         return Optional.of(getBiome(x, z, seed));
     }
-    
+
     @Override
     public Iterable<Biome> getBiomes() {
         return biomes;
     }
-    
+
     @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;
     }
-    
+
     private record SeededVector(int x, int z, long seed) {
         @Override
         public boolean equals(Object obj) {
@@ -119,7 +119,7 @@ public class BiomePipelineProvider implements BiomeProvider {
             }
             return false;
         }
-        
+
         @Override
         public int hashCode() {
             int code = x;

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

@@ -15,12 +15,12 @@ import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
 
 public interface BiomeHolder {
     BiomeHolder expand(BiomeExpander expander, long seed);
-    
+
     void mutate(BiomeMutator mutator, long seed);
-    
+
     void fill(BiomeSource source, long seed);
-    
+
     BiomeDelegate getBiome(int x, int z);
-    
+
     BiomeDelegate getBiomeRaw(int x, int z);
 }

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

@@ -10,26 +10,26 @@ public interface BiomeDelegate extends StringIdentifiable {
     static BiomeDelegate ephemeral(String id) {
         return new EphemeralBiomeDelegate(id);
     }
-    
+
     static BiomeDelegate from(Biome biome) {
         return new DelegatedBiome(biome);
     }
-    
+
     static BiomeDelegate self() {
         return SelfDelegate.INSTANCE;
     }
-    
+
     Biome getBiome();
-    
+
     Set<String> getTags();
-    
+
     default boolean isEphemeral() {
         return false;
     }
-    
+
     default boolean isSelf() {
         return false;
     }
-    
-    
+
+
 }

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

@@ -7,32 +7,32 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 final class DelegatedBiome implements BiomeDelegate {
     private final Biome biome;
-    
+
     public DelegatedBiome(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 DelegatedBiome 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/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java

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

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

@@ -8,31 +8,31 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 final class SelfDelegate implements BiomeDelegate {
     public static final SelfDelegate INSTANCE = new SelfDelegate();
-    
+
     private SelfDelegate() {
-    
+
     }
-    
+
     @Override
     public Biome getBiome() {
         throw new UnsupportedOperationException("Cannot get biome from self delegate");
     }
-    
+
     @Override
     public boolean isSelf() {
         return true;
     }
-    
+
     @Override
     public boolean isEphemeral() {
         return true;
     }
-    
+
     @Override
     public Set<String> getTags() {
         return Collections.emptySet();
     }
-    
+
     @Override
     public String getID() {
         return "SELF";

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

@@ -13,8 +13,8 @@ import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
 
 public interface Stage {
     BiomeHolder apply(BiomeHolder in, long seed);
-    
+
     boolean isExpansion();
-    
+
     Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes);
 }

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

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

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

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

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

@@ -35,15 +35,15 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
                  and subtract 1. (The size is also printed to the server console if you
                  have debug mode enabled)""")
     private @Meta int initialSize = 2;
-    
+
     @Value("pipeline.source")
     @Description("The Biome Source to use for initial population of biomes.")
     private @Meta BiomeSource source;
-    
+
     @Value("pipeline.stages")
     @Description("A list of pipeline stages to apply to the result of #source")
     private @Meta List<@Meta Stage> stages;
-    
+
     @Override
     public BiomeProvider get() {
         BiomePipeline.BiomePipelineBuilder biomePipelineBuilder = new BiomePipeline.BiomePipelineBuilder(initialSize);

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

@@ -22,11 +22,11 @@ public class SamplerSourceTemplate extends SourceTemplate {
     @Value("sampler")
     @Description("The sampler used to distribute biomes.")
     private @Meta NoiseSampler noise;
-    
+
     @Value("biomes")
     @Description("The biomes to be distributed.")
     private @Meta ProbabilityCollection<@Meta BiomeDelegate> biomes;
-    
+
     @Override
     public BiomeSource get() {
         return new SamplerSource(biomes, noise);

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

@@ -24,17 +24,17 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class BorderListMutatorTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-    
+
     @Value("default-replace")
     private @Meta String defaultReplace;
-    
+
     @Value("default-to")
     private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
-    
+
     @Value("replace")
     private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
-    
-    
+
+
     @Override
     public Stage get() {
         return new MutatorStage(new BorderListMutator(replace, from, defaultReplace, noise, defaultTo));

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

@@ -22,13 +22,13 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class BorderMutatorTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-    
+
     @Value("replace")
     private @Meta String replace;
-    
+
     @Value("to")
     private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
-    
+
     @Override
     public Stage get() {
         return new MutatorStage(new BorderMutator(from, replace, noise, to));

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

@@ -24,13 +24,13 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class ReplaceListMutatorTemplate extends StageTemplate {
     @Value("default-from")
     private @Meta String defaultFrom;
-    
+
     @Value("default-to")
     private @Meta ProbabilityCollection<@Meta BiomeDelegate> defaultTo;
-    
+
     @Value("to")
     private @Meta Map<@Meta BiomeDelegate, @Meta ProbabilityCollection<@Meta BiomeDelegate>> replace;
-    
+
     @Override
     public Stage get() {
         return new MutatorStage(new ReplaceListMutator(replace, defaultFrom, defaultTo, noise));

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

@@ -22,10 +22,10 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class ReplaceMutatorTemplate extends StageTemplate {
     @Value("from")
     private @Meta String from;
-    
+
     @Value("to")
     private @Meta ProbabilityCollection<@Meta BiomeDelegate> to;
-    
+
     @Override
     public Stage get() {
         return new MutatorStage(new ReplaceMutator(from, to, noise));

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

@@ -15,11 +15,11 @@ import com.dfsek.terra.api.util.MathUtil;
 
 public class FractalExpander implements BiomeExpander {
     private final NoiseSampler sampler;
-    
+
     public FractalExpander(NoiseSampler sampler) {
         this.sampler = sampler;
     }
-    
+
     @Override
     public BiomeDelegate getBetween(double x, double z, long seed, BiomeDelegate... others) {
         return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)];

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

@@ -24,7 +24,7 @@ public class BorderListMutator implements BiomeMutator {
     private final ProbabilityCollection<BiomeDelegate> replaceDefault;
     private final String defaultReplace;
     private final Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace;
-    
+
     public BorderListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String border, String defaultReplace,
                              NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replaceDefault) {
         this.border = border;
@@ -33,7 +33,7 @@ public class BorderListMutator implements BiomeMutator {
         this.defaultReplace = defaultReplace;
         this.replace = replace;
     }
-    
+
     @Override
     public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
         BiomeDelegate origin = viewPoint.getBiome(0, 0);
@@ -55,7 +55,7 @@ public class BorderListMutator implements BiomeMutator {
         }
         return origin;
     }
-    
+
     @Override
     public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
         Set<BiomeDelegate> biomeSet = new HashSet<>();

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

@@ -22,14 +22,14 @@ public class BorderMutator implements BiomeMutator {
     private final NoiseSampler noiseSampler;
     private final ProbabilityCollection<BiomeDelegate> replace;
     private final String replaceTag;
-    
+
     public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<BiomeDelegate> replace) {
         this.border = border;
         this.noiseSampler = noiseSampler;
         this.replace = replace;
         this.replaceTag = replaceTag;
     }
-    
+
     @Override
     public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
         BiomeDelegate origin = viewPoint.getBiome(0, 0);
@@ -47,20 +47,20 @@ public class BorderMutator implements BiomeMutator {
         }
         return origin;
     }
-    
+
     @Override
     public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
         Set<BiomeDelegate> biomeSet = new HashSet<>();
         biomes.forEach(biomeSet::add);
         biomeSet.addAll(
-                replace
-                        .getContents()
-                        .stream()
-                        .filter(
-                                Predicate.not(BiomeDelegate::isSelf)
-                               )
-                        .toList()
-                       );
+            replace
+                .getContents()
+                .stream()
+                .filter(
+                    Predicate.not(BiomeDelegate::isSelf)
+                )
+                .toList()
+        );
         return biomeSet;
     }
 }

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

@@ -23,7 +23,7 @@ public class ReplaceListMutator implements BiomeMutator {
     private final NoiseSampler sampler;
     private final ProbabilityCollection<BiomeDelegate> replaceDefault;
     private final String defaultTag;
-    
+
     public ReplaceListMutator(Map<BiomeDelegate, ProbabilityCollection<BiomeDelegate>> replace, String defaultTag,
                               ProbabilityCollection<BiomeDelegate> replaceDefault, NoiseSampler sampler) {
         this.replace = replace;
@@ -31,7 +31,7 @@ public class ReplaceListMutator implements BiomeMutator {
         this.defaultTag = defaultTag;
         this.replaceDefault = replaceDefault;
     }
-    
+
     @Override
     public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
         BiomeDelegate center = viewPoint.getBiome(0, 0);
@@ -45,13 +45,13 @@ public class ReplaceListMutator implements BiomeMutator {
         }
         return center;
     }
-    
+
     @Override
     public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
         Set<BiomeDelegate> biomeSet = new HashSet<>();
-        
+
         Set<BiomeDelegate> reject = new HashSet<>();
-        
+
         biomes.forEach(biome -> {
             if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {
                 biomeSet.add(biome);

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

@@ -21,13 +21,13 @@ public class ReplaceMutator implements BiomeMutator {
     private final String replaceableTag;
     private final ProbabilityCollection<BiomeDelegate> replace;
     private final NoiseSampler sampler;
-    
+
     public ReplaceMutator(String replaceable, ProbabilityCollection<BiomeDelegate> replace, NoiseSampler sampler) {
         this.replaceableTag = replaceable;
         this.replace = replace;
         this.sampler = sampler;
     }
-    
+
     @Override
     public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
         if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
@@ -36,7 +36,7 @@ public class ReplaceMutator implements BiomeMutator {
         }
         return viewPoint.getBiome(0, 0);
     }
-    
+
     @Override
     public Iterable<BiomeDelegate> getBiomes(Iterable<BiomeDelegate> biomes) {
         Set<BiomeDelegate> biomeSet = new HashSet<>();

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

@@ -16,31 +16,31 @@ import com.dfsek.terra.api.util.MathUtil;
 
 
 public class SmoothMutator implements BiomeMutator {
-    
+
     private final NoiseSampler sampler;
-    
+
     public SmoothMutator(NoiseSampler sampler) {
         this.sampler = sampler;
     }
-    
+
     @Override
     public BiomeDelegate mutate(ViewPoint viewPoint, double x, double z, long seed) {
         BiomeDelegate top = viewPoint.getBiome(1, 0);
         BiomeDelegate bottom = viewPoint.getBiome(-1, 0);
         BiomeDelegate left = viewPoint.getBiome(0, 1);
         BiomeDelegate right = viewPoint.getBiome(0, -1);
-        
-        
+
+
         boolean vert = Objects.equals(top, bottom) && top != null;
         boolean horiz = Objects.equals(left, right) && left != null;
-        
+
         if(vert && horiz) {
             return MathUtil.normalizeIndex(sampler.noise(seed, x, z), 2) == 0 ? left : top;
         }
-        
+
         if(vert) return top;
         if(horiz) return left;
-        
+
         return viewPoint.getBiome(0, 0);
     }
 }

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

@@ -12,6 +12,6 @@ import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate;
 
 public interface BiomeSource {
     BiomeDelegate getBiome(double x, double z, long seed);
-    
+
     Iterable<BiomeDelegate> getBiomes();
 }