Merge remote-tracking branch 'origin/master' into dev/layered-generator

2026-06-25 22:09:34 +00:00 · 2024-10-13 18:51:14 -06:00
parent e51fb9c580 0a952cff4c
commit 3eb6f89776
967 changed files with 10918 additions and 11559 deletions
@@ -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
@@ -1,19 +1,14 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax
+*                   @dfsek @solonovamax @duplexsystem @astrsh @justaureus
 # Platforms
-## dfsek wrote the majority of the platform impls
+/platforms/         @dfsek @solonovamax @duplexsystem @justaureus
-/platforms/bukkit/  @dfsek
+/platforms/bukkit   @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf
 /platforms/fabric/  @dfsek
 /platforms/forge/   @dfsek
 /platforms/sponge/  @dfsek
 ## solonovamax is working on the region generator (unless duplexsystem takes it over)
 /platforms/region/  @solonovamax
 # Common
-/common/            @dfsek @solonovamax
+/common/            @dfsek @solonovamax @duplexsystem @astrsh
 # Gradle Stuff
-## Most gradle stuff was written by solonovamax
+/buildSrc/          @dfsek @solonovamax @duplexsystem
-/buildSrc/           @solonovamax
+*.gradle.kts        @dfsek @solonovamax @duplexsystem
-*.gradle.kts        @solonovamax
+/gradle/            @dfsek @solonovamax @duplexsystem
@@ -52,7 +52,7 @@ assignees: ""
 <!-- You can fill out the different items by putting the correct value beside each cell. -->
 | Name                         | Value                                                                                                                                                                       |
-|------------------------------|-------|
+|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Terra Version                | <!-- Put your Terra version here. (remove the comment) -->                                                                                                                  
 | Platform / Platform Version  | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) --> 
 | Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->                                       
@@ -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 -->
 <!--
-###########################################################################
+If applicable, include 'Fixes #XXXX' or 'Closes #XXXX' for any related open issues.
-## WARNING!                                                              ##
+This helps us relate, track, and close the relevant issues.
 ## 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.
 -->
-## Licensing
+### Changelog
 <!-- 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
 <!--
-    What is the goal of the PR?
+Fill out a changelog below of what has been done, and what might be planned to be done. 
-    Put a checklist here of what has been done
+You may delete this if your PR is not adding new features, only fixing bugs or adding translations.
    (and what *hasn't*, but you plan to do),
    so we can easily know what was changed.
    Note: this is only required for PRs that add new features.
    If your PR is not adding new features, only fixing bugs or adding translations, then you may delete this section.
 -->
 - [ ] <!-- First thing -->
@@ -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.)
+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. -->
+- [ ] Bug Fix <!-- Changes include bug fixes. -->
- [ ] Build system <!-- Anything which pretain to the build system. -->
+- [ ] Build system <!-- Changes the build system. -->
- [ ] Documentation <!-- Anything which adds or improves documentation for existing features. -->
+- [ ] Documentation <!-- Changes add to or improve documentation. -->
- [ ] New Feature <!-- Anything which adds new functionality to Terra. -->
+- [ ] New Feature <!-- Changes add new functionality to Terra. -->
- [ ] Performance <!-- Anything which is imrpoves the performance of Terra. -->
+- [ ] Performance <!-- Changes improve the performance of Terra. -->
- [ ] Refactoring <!-- Anything which does not add any new code, only moves code around. -->
+- [ ] Refactoring <!-- Changes do not add any new code, only moves code around. -->
- [ ] Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
+- [ ] Repository <!-- Changes affect the repository. E.g. changes to the `README.md` file. -->
- [ ] Revert <!-- Anything which reverts previous commits. -->
+- [ ] Revert <!-- Changes revert previous commits. -->
- [ ] Style <!-- Anything which updates style. -->
+- [ ] Style <!-- Changes update style, namely the .editorconfig file. -->
- [ ] Tests <!-- Anything which adds or updates tests. -->
+- [ ] Tests <!-- Changes add or update tests. -->
- [ ] Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
+- [ ] Translation <!-- Changes include translations to other languages for Terra. -->
-#### Compatiblity
+#### Compatibility
- [ ] Breaking
+<!-- The following options determine if the PR pertains to a major, minor, or patch version bump -->
-  change <!-- A fix, or a feature, that breaks some previous functionality to Terra. -->
+
- [ ] Non-Breaking change.
+- [ ] Introduces a breaking change
  <!--
-        A change which does not break *any* previous functionality of Terra.
+  Breaking changes are any fix or feature that breaks some previous functionality to Terra / is not backwards compatible.
-        (ie. is backwards compatible and will work with *any* previously existing supported features.
+  Breaking changes do not include:
-        Note: if a feature is annotated with @Incubating, @Preview, @Experimental,
+    - changes that are backwards compatible and will work with *any* previously existing supported features.
-        or is in a package called something similar to the previous annotations,
+    - changes to code marked as in a pre-release
-        then you may push breaking changes to only THOSE parts of Terra.)
+      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.
-#### Contribution Guidelines.
+- [ ] Introduces bug fixes
 - [ ] I have read
  the [`CONTRIBUTING.md`](https://github.com/PolyhedralDev/Terra/blob/master/CONTRIBUTING.md)
  document in the root of the git repository.
 - [ ] My code follows the code style for this
  project. <!-- There is an included `.editorconfig` file in the base of the repo. Please use a plugin for your IDE of choice that follows those settings. -->
 #### Documentation
@@ -113,6 +85,20 @@
 - [ ] 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.
+  Tests are typically not necessary for small changes.
-        But if you add big changes, you should probably at least write *some* testing, where applicable.
+  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.)
  -->
@@ -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 21
        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
        with:
          java-version: '21'
          distribution: 'temurin'
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file
      - uses: burrunan/gradle-cache-action@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
@@ -249,3 +249,5 @@ nbdist/
 platforms/**/run/**
 #Vale Config File
 **/.vale.ini
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -47,14 +47,7 @@ JARs are produced in `platforms/<platform>/build/libs`.
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
 * Bukkit
-    * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test
+    * `runServer` - Run the Paper test server with Terra installed.
      server. (Only needs to be run once).
    * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur)
      test server. (Only needs to be run once).
    * `runPaper` - Run the Paper test server with Terra (`installPaper` must
      have been run previously).
    * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must
      have been run previously).
 * Fabric
    * `runClient` - Run a Minecraft Fabric client with Terra installed.
    * `runServer` - Run a Minecraft Fabric server with Terra installed.
@@ -1,8 +1,8 @@
 preRelease(true)
-versionProjects(":common:api", version("6.4.0"))
+versionProjects(":common:api", version("6.5.1"))
-versionProjects(":common:implementation", version("6.4.0"))
+versionProjects(":common:implementation", version("6.5.1"))
-versionProjects(":platforms", version("6.4.0"))
+versionProjects(":platforms", version("6.5.1"))
 allprojects {
@@ -15,6 +15,7 @@ allprojects {
    tasks.withType<JavaCompile>().configureEach {
        options.isFork = true
        options.isIncremental = true
        options.release.set(21)
    }
    tasks.withType<Test>().configureEach {
@@ -44,7 +45,7 @@ afterEvaluate {
    }
    project(":platforms:bukkit:common").configureDistribution()
    forSubProjects(":common:addons") {
-        apply(plugin = "com.github.johnrengelman.shadow")
+        apply(plugin = "com.gradleup.shadow")
        tasks.named("build") {
            finalizedBy(tasks.named("shadowJar"))
@@ -3,32 +3,24 @@ plugins {
    kotlin("jvm") version embeddedKotlinVersion
 }
 buildscript {
    configurations.all {
        resolutionStrategy {
            force("org.ow2.asm:asm:9.3") // TODO: remove when ShadowJar updates ASM version
            force("org.ow2.asm:asm-commons:9.3")
        }
    }
 }
 repositories {
    mavenCentral()
    gradlePluginPortal()
    maven("https://repo.codemc.org/repository/maven-public") {
        name = "CodeMC"
    }
-    maven("https://papermc.io/repo/repository/maven-public/") {
+    maven("https://repo.papermc.io/repository/maven-public/") {
        name = "PaperMC"
    }
 }
 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
+    //TODO Allow pulling from Versions.kt
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1")
    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.2")
-    implementation("org.ow2.asm:asm:9.3")
+    implementation("org.ow2.asm", "asm", "9.7")
-    implementation("org.ow2.asm:asm-tree:9.3")
+    implementation("org.ow2.asm", "asm-tree", "9.7")
-    implementation("com.dfsek.tectonic:common:4.2.0")
+    implementation("com.dfsek.tectonic", "common", "4.2.1")
-    implementation("org.yaml:snakeyaml:1.27")
+    implementation("org.yaml", "snakeyaml", "2.3")
 }
@@ -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)
            }
@@ -22,8 +22,8 @@ fun Project.configureCompilation() {
    apply<TectonicDocPlugin>()
    configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_21
    }
    tasks.withType<JavaCompile> {
@@ -36,7 +36,7 @@ fun Project.configureDependencies() {
        maven("https://repo.codemc.org/repository/maven-public") {
            name = "CodeMC"
        }
-        maven("https://papermc.io/repo/repository/maven-public/") {
+        maven("https://repo.papermc.io/repository/maven-public/") {
            name = "PaperMC"
        }
        maven("https://files.minecraftforge.net/maven/") {
@@ -48,14 +48,17 @@ fun Project.configureDependencies() {
        maven("https://jitpack.io") {
            name = "JitPack"
        }
        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
            name = "Sonatype Snapshots"
        }
    }
    dependencies {
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
+        testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit)
-        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit)
-        compileOnly("org.jetbrains:annotations:23.0.0")
+        compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
-        compileOnly("com.google.guava:guava:30.0-jre")
+        compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
-        testImplementation("com.google.guava:guava:30.0-jre")
+        testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
    }
 }
@@ -1,15 +1,12 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import io.papermc.paperweight.util.path
 import java.io.File
 import java.io.FileWriter
 import java.net.URI
 import java.net.URL
 import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginExtension
 import org.gradle.kotlin.dsl.TaskContainerScope
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
@@ -17,16 +14,21 @@ import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.named
 import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.Yaml
 import kotlin.io.path.copyTo
 import kotlin.io.path.createDirectories
 import kotlin.io.path.createFile
 import kotlin.io.path.exists
 fun Project.configureDistribution() {
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
    val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
        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)
        }
    }
@@ -45,21 +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
            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
                forSubProjects(":common:addons") {
                    val jar = getJarTask()
-                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                    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 (!Files.exists(addonPath)) {
+                    if (!addonPath.exists()) {
-                        Files.createDirectories(addonPath.parent)
+                        addonPath.parent.createDirectories()
-                        Files.createFile(addonPath)
+                        addonPath.createFile()
-                        Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
+                        jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
                    }
                }
@@ -89,7 +92,8 @@ fun Project.configureDistribution() {
                val jar = getJarTask().archiveFileName.get()
                resources.computeIfAbsent(
                    if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
-                    else "addons") { ArrayList() }.add(jar)
+                    else "addons"
                                         ) { ArrayList() }.add(jar)
            }
            val options = DumperOptions()
@@ -126,7 +130,7 @@ fun Project.configureDistribution() {
        dependsOn(downloadDefaultPacks)
        configurations = listOf(project.configurations["shaded"])
        archiveClassifier.set("shaded")
-        setVersion(project.version)
+        version = project.version
        relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
        relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
        relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")
@@ -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 {
@@ -1,68 +1,78 @@
 object Versions {
    object Terra {
        const val overworldConfig = "v1.3.4"
    }
    object Libraries {
-        const val tectonic = "4.2.0"
+        const val tectonic = "4.2.1"
-        const val paralithic = "0.7.0"
+        const val paralithic = "0.7.1"
-        const val strata = "1.1.1"
+        const val strata = "1.3.2"
-        const val cloud = "1.8.0"
+        const val cloud = "2.0.0"
        const val cloudPaper = "2.0.0-beta.10"
        const val cloudFabric = "2.0.0-beta.9"
-        const val slf4j = "1.7.36"
+        const val caffeine = "3.1.8"
-        const val log4j_slf4j_impl = "2.14.1"
+        
        const val slf4j = "2.0.16"
        object Internal {
-            const val apacheText = "1.9"
+            const val shadow = "8.3.1"
-            const val jafama = "2.3.2"
+            const val apacheText = "1.12.0"
-            const val apacheIO = "2.6"
+            const val apacheIO = "2.16.1"
-            const val fastutil = "8.5.6"
+            const val guava = "33.3.0-jre"
            const val asm = "9.7"
            const val snakeYml = "2.3"
            const val jetBrainsAnnotations = "24.1.0"
            const val junit = "5.11.0"
        }
    }
    object Fabric {
-        const val fabricLoader = "0.14.8"
+        const val fabricAPI = "0.104.0+${Mod.minecraft}"
        const val fabricAPI = "0.83.1+1.20.1"
    }
    object Quilt {
        const val quiltLoader = "0.17.0"
        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
    }
 //
 //    object Quilt {
 //        const val quiltLoader = "0.20.2"
 //        const val fabricApi = "7.3.1+0.89.3-1.20.1"
 //    }
    object Mod {
-        const val mixin = "0.11.2+mixin.0.8.5"
+        const val mixin = "0.15.3+mixin.0.8.7"
-        const val minecraft = "1.20.1"
+        const val minecraft = "1.21.1"
-        const val yarn = "$minecraft+build.2"
+        const val yarn = "$minecraft+build.3"
-        const val fabricLoader = "0.14.21"
+        const val fabricLoader = "0.16.5"
-        const val architecuryLoom = "0.12.0.290"
+        const val architecuryLoom = "1.7.413"
-        const val architecturyPlugin = "3.4-SNAPSHOT"
+        const val architecturyPlugin = "3.4.159"
        const val loomQuiltflower = "1.7.1"
    }
    object Forge {
        const val forge = "${Mod.minecraft}-47.0.3"
        const val burningwave = "12.53.0"
    }
 //
 //    object Forge {
 //        const val forge = "${Mod.minecraft}-48.0.13"
 //        const val burningwave = "12.63.0"
 //    }
    object Bukkit {
-        const val paper = "1.18.2-R0.1-SNAPSHOT"
+        const val minecraft = "1.21.1"
-        const val paperLib = "1.0.5"
+        const val paperBuild = "$minecraft-R0.1-20240917.151311-80"
-        const val minecraft = "1.20.1"
+        const val paper = paperBuild
-        const val reflectionRemapper = "0.1.0-SNAPSHOT"
+        const val paperLib = "1.0.8"
-        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
+        const val reflectionRemapper = "0.1.1"
-    }
+        const val paperDevBundle = paperBuild
-    
+        const val runPaper = "2.3.1"
-    object Sponge {
+        const val paperWeight = "1.7.2"
        const val sponge = "9.0.0-SNAPSHOT"
        const val mixin = "0.8.2"
        const val minecraft = "1.17.1"
    }
    //
 //    object Sponge {
 //        const val sponge = "9.0.0-SNAPSHOT"
 //        const val mixin = "0.8.2"
 //        const val minecraft = "1.17.1"
 //    }
 //
    object CLI {
        const val nbt = "6.1"
-        const val logback = "1.2.9"
+        const val logback = "1.5.8"
        const val commonsIO = "2.7"
        const val guava = "31.0.1-jre"
    }
 }
@@ -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.*"
                        })
                    }
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;
 import java.util.Collection;
 import com.dfsek.terra.api.world.biome.Biome;
 import java.util.Collection;
 public interface Extrusion {
    Biome extrude(Biome original, int x, int y, int z, long seed);
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,12 +1,8 @@
-version = version("1.0.0")
+version = version("1.0.1")
 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    compileOnlyApi(project(":common:addons:library-image"))
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+
    relocate("net.jafama", "com.dfsek.terra.addons.biome.image.lib.jafama")
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -9,8 +9,8 @@ package com.dfsek.terra.addons.biome.image.v2;
 import java.util.Optional;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -58,15 +58,19 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
                providerRegistry.register(addon.key("IMAGE"), ImageProviderTemplate::new);
            })
            .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry = event.getPack().getOrCreateRegistry(
+                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(
+                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("USE_BIOME_COLORS"),
                    () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
                        b -> b));
                biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
            })
            .failThrough();
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -13,8 +13,8 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,11 +1,7 @@
-version = version("1.0.0")
+version = version("1.0.1")
 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+
    relocate("net.jafama", "com.dfsek.terra.addons.biome.image.lib.jafama")
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,6 @@
 package com.dfsek.terra.addons.biome.image;
 import net.jafama.FastMath;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
@@ -34,7 +32,7 @@ public class ImageBiomeProvider implements BiomeProvider {
    }
    private static int distance(Color a, Color b) {
-        return FastMath.abs(a.getRed() - b.getRed()) + FastMath.abs(a.getGreen() - b.getGreen()) + FastMath.abs(a.getBlue() - b.getBlue());
+        return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.abs(a.getBlue() - b.getBlue());
    }
    @Override
@@ -70,14 +68,14 @@ public class ImageBiomeProvider implements BiomeProvider {
        CENTER {
            @Override
            public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(FastMath.floorMod(x - image.getWidth() / 2, image.getWidth()),
+                return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
-                                              FastMath.floorMod(z - image.getHeight() / 2, image.getHeight())));
+                    Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
            }
        },
        NONE {
            @Override
            public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(FastMath.floorMod(x, image.getWidth()), FastMath.floorMod(z, image.getHeight())));
+                return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.floorMod(z, image.getHeight())));
            }
        };
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -27,11 +27,9 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public class ImageBiomeProviderAddon implements AddonInitializer {
    private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
    };
-    
+    private static final Logger logger = LoggerFactory.getLogger(ImageBiomeProviderAddon.class);
    @Inject
    private Platform platform;
@@ -50,6 +48,9 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
                    () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
            })
            .failThrough();
-        logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
+        if(platform.getTerraConfig().isDebugLog())
            logger.warn(
                "The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the " +
                "biome-provider-image-v2 addon for future pack development instead.");
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,12 +1,5 @@
-version = version("1.0.0")
+version = version("1.0.1")
 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
 tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
    relocate("net.jafama", "com.dfsek.terra.addons.biome.pipeline.lib.jafama")
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -11,6 +11,9 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.function.Supplier;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.BiomePipelineTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.PipelineBiomeLoader;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.source.SamplerSourceTemplate;
@@ -20,9 +23,6 @@ import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.BorderStage
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceListStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.ReplaceStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator.SmoothStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
@@ -1,13 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import net.jafama.FastMath;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -15,6 +9,11 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.StreamSupport;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
@@ -61,7 +60,8 @@ public class PipelineBiomeProvider implements BiomeProvider {
                        .append(delegate.getClass().getCanonicalName())
                        .append('\n'));
                throw new IllegalArgumentException("Biome Pipeline leaks placeholder biome \"" + pipelineBiome.getID() +
-                                                   "\". Ensure there is a stage to guarantee replacement of the placeholder biome. Biomes: " +
+                                                   "\". Ensure there is a stage to guarantee replacement of the placeholder biome. " +
                                                   "Biomes: " +
                                                   biomeList);
            }
            this.biomes.add(pipelineBiome.getBiome());
@@ -81,8 +81,8 @@ public class PipelineBiomeProvider implements BiomeProvider {
        x /= resolution;
        z /= resolution;
-        int chunkX = FastMath.floorDiv(x, chunkSize);
+        int chunkX = Math.floorDiv(x, chunkSize);
-        int chunkZ = FastMath.floorDiv(z, chunkSize);
+        int chunkZ = Math.floorDiv(z, chunkSize);
        int chunkWorldX = chunkX * chunkSize;
        int chunkWorldZ = chunkZ * chunkSize;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 /**
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
 public interface Stage {
@@ -7,8 +7,6 @@ import com.dfsek.terra.api.world.biome.Biome;
 public interface PipelineBiome extends StringIdentifiable {
    Biome getBiome();
    static PipelineBiome placeholder(String id) {
        return new PlaceholderPipelineBiome(id);
    }
@@ -21,6 +19,8 @@ public interface PipelineBiome extends StringIdentifiable {
        return SelfPipelineBiome.INSTANCE;
    }
    Biome getBiome();
    Set<String> getTags();
    default boolean isPlaceholder() {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -15,9 +15,9 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.List;
 import com.dfsek.terra.addons.biome.pipeline.v2.PipelineBiomeProvider;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.PipelineImpl;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -33,24 +33,20 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
                 Larger values are quadratically faster, but produce lower quality results.
                 For example, a value of 3 would sample every 3 blocks.""")
    protected @Meta int resolution = 1;
    @Value("pipeline.source")
    @Description("The Biome Source to use for initial population of biomes.")
    private @Meta Source source;
    @Value("pipeline.stages")
    @Description("A list of pipeline stages to apply to the result of #source")
    private @Meta List<@Meta Stage> stages;
    @Value("blend.sampler")
    @Default
    @Description("A sampler to use for blending the edges of biomes via domain warping.")
    protected @Meta NoiseSampler blendSampler = NoiseSampler.zero();
    @Value("blend.amplitude")
    @Default
    @Description("The amplitude at which to perform blending.")
    protected @Meta double blendAmplitude = 0d;
    @Value("pipeline.source")
    @Description("The Biome Source to use for initial population of biomes.")
    private @Meta Source source;
    @Value("pipeline.stages")
    @Description("A list of pipeline stages to apply to the result of #source")
    private @Meta List<@Meta Stage> stages;
    @Override
    public BiomeProvider get() {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,8 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -11,9 +11,9 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 import java.util.Map;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -9,9 +9,9 @@ package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.BorderStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -11,9 +11,9 @@ import com.dfsek.tectonic.api.config.template.annotations.Value;
 import java.util.Map;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceListStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -9,9 +9,9 @@ package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.ReplaceStage;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,8 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
@@ -1,21 +1,21 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
 import java.util.List;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import net.jafama.FastMath;
 import java.util.List;
 public class BiomeChunkImpl implements BiomeChunk {
    private PipelineBiome[][] biomes;
    private final SeededVector worldOrigin;
    private final int chunkOriginArrayIndex;
    private final int worldCoordinateScale;
    private final int size;
    private PipelineBiome[] biomes;
    public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
@@ -23,14 +23,14 @@ public class BiomeChunkImpl implements BiomeChunk {
        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];
+        this.biomes = new PipelineBiome[size * size];
-        PipelineBiome[][] lookupArray = 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
@@ -44,7 +44,8 @@ public class BiomeChunkImpl implements BiomeChunk {
            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));
            }
        }
@@ -65,7 +66,7 @@ public class BiomeChunkImpl implements BiomeChunk {
            // 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;
@@ -74,27 +75,13 @@ public class BiomeChunkImpl implements BiomeChunk {
                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));
                }
            }
        }
    }
    @Override
    public PipelineBiome get(int xInChunk, int zInChunk) {
        int xIndex = xInChunk + chunkOriginArrayIndex;
        int zIndex = zInChunk + chunkOriginArrayIndex;
        return biomes[xIndex][zIndex];
    }
    private int xIndexToWorldCoordinate(int xIndex) {
        return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }
    private int zIndexToWorldCoordinate(int zIndex) {
        return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }
    protected static int initialSizeToArraySize(int expanderCount, int initialSize) {
        int size = initialSize;
        for(int i = 0; i < expanderCount; i++) {
@@ -111,7 +98,7 @@ public class BiomeChunkImpl implements BiomeChunk {
        // chunk samples points on the same overall grid.
        // Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
        // because points would be sampled on grids at different offsets, resulting in artifacts at borders.
-        return FastMath.ceilToInt((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+        return (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
    }
    private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
@@ -144,6 +131,21 @@ public class BiomeChunkImpl implements BiomeChunk {
        return 1 << (totalExpansions - expansionsApplied);
    }
    @Override
    public PipelineBiome get(int xInChunk, int zInChunk) {
        int xIndex = xInChunk + chunkOriginArrayIndex;
        int zIndex = zInChunk + chunkOriginArrayIndex;
        return biomes[(xIndex * size) + zIndex];
    }
    private int xIndexToWorldCoordinate(int xIndex) {
        return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }
    private int zIndexToWorldCoordinate(int zIndex) {
        return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
    }
    private SeededVector getOrigin() {
        return worldOrigin;
    }
@@ -159,9 +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) {
+        private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex,
                          PipelineBiome[] lookupArray, int size) {
            this.chunk = chunk;
            this.gridInterval = gridInterval;
            this.gridX = gridX;
@@ -169,13 +173,14 @@ 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() {
@@ -3,8 +3,8 @@ package com.dfsek.terra.addons.biome.pipeline.v2.source;
 import java.util.Collections;
 import java.util.Set;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 public class SingleSource implements Source {
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -71,7 +71,8 @@ public class BorderListStage implements Stage {
                            viewPoint.worldSeed());
                        return replacement.isSelf() ? center : replacement;
                    }
-                    PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+                    PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
                        viewPoint.worldSeed());
                    return replacement.isSelf() ? center : replacement;
                }
            }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,12 +1,5 @@
-version = version("1.0.1")
+version = version("1.0.2")
 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
 tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
    relocate("net.jafama", "com.dfsek.terra.addons.biome.pipeline.lib.jafama")
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -41,15 +41,13 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public class BiomePipelineAddon implements AddonInitializer {
    private static final Logger logger = LoggerFactory.getLogger(BiomePipelineAddon.class);
    public static final TypeKey<Supplier<ObjectTemplate<BiomeSource>>> SOURCE_REGISTRY_KEY = new TypeKey<>() {
    };
    public static final TypeKey<Supplier<ObjectTemplate<Stage>>> STAGE_REGISTRY_KEY = new TypeKey<>() {
    };
    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
    };
    private static final Logger logger = LoggerFactory.getLogger(BiomePipelineAddon.class);
    @Inject
    private Platform platform;
@@ -90,6 +88,9 @@ public class BiomePipelineAddon implements AddonInitializer {
                event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
            });
-        logger.warn("The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-pipeline-v2 addon for future pack development instead.");
+        if(platform.getTerraConfig().isDebugLog())
            logger.warn(
                "The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the" +
                " biome-provider-pipeline-v2 addon for future pack development instead.");
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -9,7 +9,6 @@ package com.dfsek.terra.addons.biome.pipeline;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import net.jafama.FastMath;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -86,8 +85,8 @@ public class BiomePipelineProvider implements BiomeProvider {
        x /= resolution;
        z /= resolution;
-        int fdX = FastMath.floorDiv(x, pipeline.getSize());
+        int fdX = Math.floorDiv(x, pipeline.getSize());
-        int fdZ = FastMath.floorDiv(z, 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();
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2020-2021 Polyhedral Development
+Copyright (c) 2020-2023 Polyhedral Development
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1,12 +1,5 @@
-version = version("1.1.0")
+version = version("1.2.1")
 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
 tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
    relocate("net.jafama", "com.dfsek.terra.addons.chunkgenerator.lib.jafama")
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -13,6 +13,7 @@ import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.BiomePaletteTemplate;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.slant.SlantLayerTemplate;
 import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
@@ -45,8 +46,8 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
            .priority(1000)
            .then(event -> {
-                    event.getPack().applyLoader(SlantHolder.CalculationMethod.class,
+                event.getPack().applyLoader(SlantCalculationMethod.class,
-                                                (type, o, loader, depthTracker) -> SlantHolder.CalculationMethod.valueOf((String) o));
+                    (type, o, loader, depthTracker) -> SlantCalculationMethod.valueOf((String) o));
                NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
                event.getPack().getContext().put(config);
@@ -57,7 +58,8 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                        pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
                            config.getHorizontalRes(),
                            config.getVerticalRes(), noisePropertiesPropertyKey,
-                                                                     paletteInfoPropertyKey));
+                            paletteInfoPropertyKey, config.getSlantCalculationMethod(),
                            config.isSlantPalettesEnabled()));
                event.getPack()
                    .applyLoader(SlantHolder.Layer.class, SlantLayerTemplate::new);
            })
@@ -68,10 +70,13 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
            .register(addon, ConfigurationLoadEvent.class)
            .then(event -> {
                if(event.is(Biome.class)) {
-                        NoiseChunkGeneratorPackConfigTemplate config = event.getPack().getContext().get(NoiseChunkGeneratorPackConfigTemplate.class);
+                    NoiseChunkGeneratorPackConfigTemplate config = event.getPack().getContext().get(
                        NoiseChunkGeneratorPackConfigTemplate.class);
                    event.getLoadedObject(Biome.class).getContext().put(paletteInfoPropertyKey,
-                                                                            event.load(new BiomePaletteTemplate(platform, config.getSlantCalculationMethod())).get());
+                        event.load(new BiomePaletteTemplate(platform,
                                config.getSlantCalculationMethod()))
                            .get());
                    event.getLoadedObject(Biome.class).getContext().put(noisePropertiesPropertyKey,
                        event.load(new BiomeNoiseConfigTemplate()).get());
                }
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.properties.Properties;
@@ -24,7 +24,11 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
    @Value("slant.calculation-method")
    @Default
-    private SlantHolder.@Meta CalculationMethod slantCalculationMethod = SlantHolder.CalculationMethod.Derivative;
+    private @Meta SlantCalculationMethod slantCalculationMethod = SlantCalculationMethod.Derivative;
    @Value("slant.disable-palettes")
    @Default
    private @Meta boolean disableSlantPalettes = false;
    public int getElevationBlend() {
        return elevationBlend;
@@ -38,7 +42,11 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
        return verticalRes;
    }
-    public SlantHolder.CalculationMethod getSlantCalculationMethod() {
+    public SlantCalculationMethod getSlantCalculationMethod() {
        return slantCalculationMethod;
    }
    public boolean isSlantPalettesEnabled() {
        return !disableSlantPalettes;
    }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -16,8 +16,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
@@ -27,26 +28,22 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
    private final Platform platform;
-    
+    private final SlantCalculationMethod slantCalculationMethod;
    @Value("slant")
    @Default
    @Description("The slant palettes to use in this biome.")
    private @Meta List<SlantHolder.@Meta Layer> slantLayers = Collections.emptyList();
    @Value("slant-depth")
    @Default
    @Description("The maximum depth at which to apply a slant palette.")
    private @Meta int slantDepth = Integer.MAX_VALUE;
    @Value("palette")
    @Description("The palettes to use in this biome.")
    private @Meta List<@Meta Map<@Meta Palette, @Meta Integer>> palettes;
    @Value("ocean.level")
    @Description("Sea level in this biome. Defaults to zero")
    @Default
    private @Meta int seaLevel = 0;
    @Value("ocean.palette")
    @Description("The palette to use for the ocean in this biome. Defaults to a blank palette.")
    @Default
@@ -56,14 +53,11 @@ public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
            return platform.getWorldHandle().air();
        }
    };
    @Value("carving.update-palette")
    @Default
    private @Meta boolean updatePalette = false;
-    private final SlantHolder.CalculationMethod slantCalculationMethod;
+    public BiomePaletteTemplate(Platform platform, SlantCalculationMethod slantCalculationMethod) {
    public BiomePaletteTemplate(Platform platform, SlantHolder.CalculationMethod slantCalculationMethod) {
        this.platform = platform;
        this.slantCalculationMethod = slantCalculationMethod;
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -8,15 +8,15 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
-import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.PaletteUtil;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -43,16 +43,23 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
    private final PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey;
    private final PropertyKey<BiomeNoiseProperties> noisePropertiesKey;
    private final SlantCalculationMethod slantCalculationMethod;
    private final boolean useSlantPalettes;
    public NoiseChunkGenerator3D(ConfigPack pack, Platform platform, int elevationBlend, int carverHorizontalResolution,
                                 int carverVerticalResolution,
                                 PropertyKey<BiomeNoiseProperties> noisePropertiesKey,
-                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey) {
+                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey,
                                 SlantCalculationMethod slantCalculationMethod, boolean useSlantPalettes) {
        this.platform = platform;
        this.air = platform.getWorldHandle().air();
        this.carverHorizontalResolution = carverHorizontalResolution;
        this.carverVerticalResolution = carverVerticalResolution;
        this.paletteInfoPropertyKey = paletteInfoPropertyKey;
        this.noisePropertiesKey = noisePropertiesKey;
        this.slantCalculationMethod = slantCalculationMethod;
        this.useSlantPalettes = useSlantPalettes;
        int maxBlend = pack
            .getBiomeProvider()
            .stream()
@@ -64,6 +71,17 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
        this.samplerCache = new SamplerProvider(platform, elevationBlend, noisePropertiesKey, maxBlend);
    }
    private Palette paletteAt(int x, int y, int z, Sampler3D sampler, BiomePaletteInfo paletteInfo, int depth) {
        SlantHolder slantHolder = paletteInfo.slantHolder();
        if(useSlantPalettes && slantHolder.isAboveDepth(depth)) {
            double slant = slantCalculationMethod.slant(sampler, x, y, z);
            if(slantHolder.isInSlantThreshold(slant)) {
                return slantHolder.getPalette(slant).getPalette(y);
            }
        }
        return paletteInfo.paletteHolder().getPalette(y);
    }
    @Override
    @SuppressWarnings("try")
    public void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WorldProperties world,
@@ -104,8 +122,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
                    if(sampler.sample(x, y, z) > 0) {
                        if(carver.sample(x, y, z) <= 0) {
-                            data = PaletteUtil
+                            data = paletteAt(x, y, z, sampler, paletteInfo, paletteLevel)
                                    .getPalette(x, y, z, sampler, paletteInfo, paletteLevel)
                                .get(paletteLevel, cx, y, cz, seed);
                            chunk.setBlock(x, y, z, data);
                            paletteLevel++;
@@ -133,10 +150,10 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
        BiomePaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
-        int fdX = FastMath.floorMod(x, 16);
+        int fdX = Math.floorMod(x, 16);
-        int fdZ = FastMath.floorMod(z, 16);
+        int fdZ = Math.floorMod(z, 16);
-        Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
+        Palette palette = paletteAt(fdX, y, fdZ, sampler, paletteInfo, 0);
        double noise = sampler.sample(fdX, y, fdZ);
        if(noise > 0) {
            int level = 0;
@@ -155,6 +172,13 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
        return biomeProvider.getBiome(x, y, z, world.getSeed()).getContext().get(paletteInfoPropertyKey).paletteHolder().getPalette(y);
    }
    public double getSlant(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) {
        int fdX = Math.floorMod(x, 16);
        int fdZ = Math.floorMod(z, 16);
        Sampler3D sampler = samplerCache.get(x, z, world, biomeProvider);
        return slantCalculationMethod.slant(sampler, fdX, y, fdZ);
    }
    public SamplerProvider samplerProvider() {
        return samplerCache;
    }
@@ -1,29 +0,0 @@
 /*
 * Copyright (c) 2020-2021 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
 */
 package com.dfsek.terra.addons.chunkgenerator.generation.math;
 import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 public final class PaletteUtil {
    public static Palette getPalette(int x, int y, int z, Sampler3D sampler, BiomePaletteInfo paletteInfo, int depth) {
        SlantHolder slantHolder = paletteInfo.slantHolder();
        if(slantHolder.isAboveDepth(depth)) {
            double slant = slantHolder.calculateSlant(sampler, x, y, z);
            if(slantHolder.isInSlantThreshold(slant)) {
                return slantHolder.getPalette(slant).getPalette(y);
            }
        }
        return paletteInfo.paletteHolder().getPalette(y);
    }
 }
@@ -0,0 +1,69 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.api.util.vector.Vector3;
 public enum SlantCalculationMethod {
    DotProduct {
        private static final Vector3 DOT_PRODUCT_DIRECTION = Vector3.of(0, 1, 0);
        private static final Vector3[] DOT_PRODUCT_SAMPLE_POINTS = {
            Vector3.of(0, 0, -DERIVATIVE_DIST),
            Vector3.of(0, 0, DERIVATIVE_DIST),
            Vector3.of(0, -DERIVATIVE_DIST, 0),
            Vector3.of(0, DERIVATIVE_DIST, 0),
            Vector3.of(-DERIVATIVE_DIST, 0, 0),
            Vector3.of(DERIVATIVE_DIST, 0, 0)
        };
        @Override
        public double slant(Sampler3D sampler, double x, double y, double z) {
            Vector3.Mutable normalApproximation = Vector3.Mutable.of(0, 0, 0);
            for(Vector3 point : DOT_PRODUCT_SAMPLE_POINTS) {
                var scalar = -sampler.sample(x + point.getX(), y + point.getY(), z + point.getZ());
                normalApproximation.add(point.mutable().multiply(scalar));
            }
            return DOT_PRODUCT_DIRECTION.dot(normalApproximation.normalize());
        }
        @Override
        public boolean floorToThreshold() {
            return false;
        }
    },
    Derivative {
        @Override
        public double slant(Sampler3D sampler, double x, double y, double z) {
            double baseSample = sampler.sample(x, y, z);
            double xVal1 = (sampler.sample(x + DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
            double xVal2 = (sampler.sample(x - DERIVATIVE_DIST, y, z) - baseSample) / DERIVATIVE_DIST;
            double zVal1 = (sampler.sample(x, y, z + DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
            double zVal2 = (sampler.sample(x, y, z - DERIVATIVE_DIST) - baseSample) / DERIVATIVE_DIST;
            double yVal1 = (sampler.sample(x, y + DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
            double yVal2 = (sampler.sample(x, y - DERIVATIVE_DIST, z) - baseSample) / DERIVATIVE_DIST;
            return Math.sqrt(
                ((xVal2 - xVal1) * (xVal2 - xVal1)) + ((zVal2 - zVal1) * (zVal2 - zVal1)) + ((yVal2 - yVal1) * (yVal2 - yVal1)));
        }
        @Override
        public boolean floorToThreshold() {
            return true;
        }
    };
    private static final double DERIVATIVE_DIST = 0.55;
    public abstract double slant(Sampler3D sampler, double x, double y, double z);
    /*
     * Controls whether palettes should be applied before or after their respective thresholds.
     *
     * If true, slant values will map to the palette of the next floor threshold, otherwise they
     * will map to the ceiling.
     */
    public abstract boolean floorToThreshold();
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,6 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 import net.jafama.FastMath;
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.util.Column;
@@ -134,7 +132,7 @@ public class ChunkInterpolator {
    }
    private static int reRange(int value, int high) {
-        return FastMath.max(FastMath.min(value, high), 0);
+        return Math.max(Math.min(value, high), 0);
    }
    /**
@@ -146,7 +144,7 @@ public class ChunkInterpolator {
     * @return double - The interpolated noise at the coordinates.
     */
    public double getNoise(double x, double y, double z) {
-        return interpGrid[reRange(((int) x) / 4, 3)][(FastMath.max(FastMath.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
+        return interpGrid[reRange(((int) x) / 4, 3)][(Math.max(Math.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
            3)].trilerp(
            (x % 4) / 4, (y % 4) / 4, (z % 4) / 4);
    }
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 Polyhedral Development
+ * Copyright (c) 2020-2023 Polyhedral Development
 *
 * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
 * reference the LICENSE file in this module's root directory.
--- a/Show More
+++ b/Show More