Add messages to exceptions

- Combine initial load and reload logic together between each platform implementation
- Should prevent pack load errors from blocking other packs from loading.

.github/CODEOWNERS

@@ -1,14 +1,13 @@
 # Global owners, automatically request review when pull request is submitted
-*                   @dfsek @solonovamax @duplexsystem @astrsh @justaureus
+*                   @dfsek @solonovamax @duplexsystem @Astrashh @justaureus
 
 # Platforms
 /platforms/         @dfsek @solonovamax @duplexsystem @justaureus
-/platforms/bukkit   @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf
 
 # Common
-/common/            @dfsek @solonovamax @duplexsystem @astrsh
+/common/            @dfsek @solonovamax @duplexsystem @Astrashh
 
 # Gradle Stuff
 /buildSrc/          @dfsek @solonovamax @duplexsystem
 *.gradle.kts        @dfsek @solonovamax @duplexsystem
-/gradle/            @dfsek @solonovamax @duplexsystem
+/gradle/            @dfsek @solonovamax @duplexsystem

.github/workflows/gradle-build.yml

@@ -1,47 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-name: Gradle Build
-
-on: [ pull_request ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@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

.gitignore

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

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "platforms/allay/src/main/resources/mappings"]
-	path = platforms/allay/src/main/resources/mappings
-	url = https://github.com/GeyserMC/mappings
-[submodule "platforms/allay/src/main/resources/mappings-generator"]
-	path = platforms/allay/src/main/resources/mappings-generator
-	url = https://github.com/GeyserMC/mappings-generator

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

build.gradle.kts

@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.6.1"))
-versionProjects(":common:implementation", version("6.6.1"))
-versionProjects(":platforms", version("6.6.1"))
+versionProjects(":common:api", version("6.5.0"))
+versionProjects(":common:implementation", version("6.5.0"))
+versionProjects(":platforms", version("6.5.0"))
 
 
 allprojects {
@@ -15,7 +15,6 @@ allprojects {
     tasks.withType<JavaCompile>().configureEach {
         options.isFork = true
         options.isIncremental = true
-        options.release.set(21)
     }
 
     tasks.withType<Test>().configureEach {
@@ -44,9 +43,8 @@ afterEvaluate {
         configureDistribution()
     }
     project(":platforms:bukkit:common").configureDistribution()
-    project(":platforms:minestom:example").configureDistribution()
     forSubProjects(":common:addons") {
-        apply(plugin = "com.gradleup.shadow")
+        apply(plugin = "com.github.johnrengelman.shadow")
 
         tasks.named("build") {
             finalizedBy(tasks.named("shadowJar"))

buildSrc/build.gradle.kts

@@ -9,18 +9,18 @@ repositories {
     maven("https://repo.codemc.org/repository/maven-public") {
         name = "CodeMC"
     }
-    maven("https://repo.papermc.io/repository/maven-public/") {
+    maven("https://papermc.io/repo/repository/maven-public/") {
         name = "PaperMC"
     }
 }
 
 dependencies {
     //TODO Allow pulling from Versions.kt
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.7.2")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6")
 
-    implementation("org.ow2.asm", "asm", "9.7")
-    implementation("org.ow2.asm", "asm-tree", "9.7")
-    implementation("com.dfsek.tectonic", "common", "4.2.1")
-    implementation("org.yaml", "snakeyaml", "2.3")
+    implementation("org.ow2.asm", "asm", "9.5")
+    implementation("org.ow2.asm", "asm-tree", "9.5")
+    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("org.yaml", "snakeyaml", "2.2")
 }

buildSrc/src/main/kotlin/CompilationConfig.kt

@@ -22,8 +22,8 @@ fun Project.configureCompilation() {
     apply<TectonicDocPlugin>()
     
     configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     
     tasks.withType<JavaCompile> {

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -36,7 +36,7 @@ fun Project.configureDependencies() {
         maven("https://repo.codemc.org/repository/maven-public") {
             name = "CodeMC"
         }
-        maven("https://repo.papermc.io/repository/maven-public/") {
+        maven("https://papermc.io/repo/repository/maven-public/") {
             name = "PaperMC"
         }
         maven("https://files.minecraftforge.net/maven/") {
@@ -48,26 +48,17 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
-            name = "Sonatype Snapshots"
-        }
-        maven("https://repo.opencollab.dev/maven-releases/") {
-            name = "OpenCollab Releases"
-        }
-        maven("https://repo.opencollab.dev/maven-snapshots/") {
-            name = "OpenCollab Snapshots"
-        }
-        maven("https://storehouse.okaeri.eu/repository/maven-public/") {
-            name = "Okaeri"
+        maven("https://nexuslite.gcnt.net/repos/other/") {
+            name = "GCNT"
         }
     }
     
     dependencies {
-        testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit)
-        testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit)
-        compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
+        testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.0")
+        compileOnly("org.jetbrains:annotations:23.0.0")
         
-        compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)
-        testImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava)
+        compileOnly("com.google.guava:guava:30.0-jre")
+        testImplementation("com.google.guava:guava:30.0-jre")
     }
 }

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -4,11 +4,9 @@ import java.io.File
 import java.io.FileWriter
 import java.net.URL
 import java.nio.file.FileSystems
-import java.nio.file.Path
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePluginExtension
-import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.extra
@@ -21,38 +19,16 @@ import kotlin.io.path.createDirectories
 import kotlin.io.path.createFile
 import kotlin.io.path.exists
 
-private fun Project.installAddonsInto(dest: Path) {
-    FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
-        forSubProjects(":common:addons") {
-            val jar = getJarTask()
-            
-            logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-            
-            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-            val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
-            
-            if (!addonPath.exists()) {
-                addonPath.parent.createDirectories()
-                addonPath.createFile()
-                jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
-            }
-            
-        }
-    }
-}
 
 fun Project.configureDistribution() {
-    apply(plugin = "com.gradleup.shadow")
+    apply(plugin = "com.github.johnrengelman.shadow")
     
     val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
         group = "terra"
         doFirst {
-            try {
-                file("${buildDir}/resources/main/packs/").deleteRecursively()
-                val defaultPackUrl =
-                    URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
-                downloadPack(defaultPackUrl, project)
-            } catch (_:Exception) {}
+            file("${buildDir}/resources/main/packs/").deleteRecursively()
+            val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/latest/default.zip")
+            downloadPack(defaultPackUrl, project)
         }
     }
     
@@ -71,17 +47,25 @@ fun Project.configureDistribution() {
         doLast {
             // https://github.com/johnrengelman/shadow/issues/111
             val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().path
-            installAddonsInto(dest)
-        }
-    }
-    
-    tasks.create("installAddonsIntoDefaultJar") {
-        group = "terra"
-        dependsOn(compileAddons)
-        
-        doLast {
-            val dest = tasks.named<Jar>("jar").get().archiveFile.get().path
-            installAddonsInto(dest)
+            
+            
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
+                forSubProjects(":common:addons") {
+                    val jar = getJarTask()
+                    
+                    logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                    
+                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
+                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
+                    
+                    if (!addonPath.exists()) {
+                        addonPath.parent.createDirectories()
+                        addonPath.createFile()
+                        jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
+                    }
+                    
+                }
+            }
         }
     }
     
@@ -148,6 +132,7 @@ fun Project.configureDistribution() {
         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")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
         

buildSrc/src/main/kotlin/Versions.kt

@@ -1,35 +1,26 @@
 object Versions {
-    object Terra {
-        const val overworldConfig = "v1.3.4"
-    }
-    
     object Libraries {
         const val tectonic = "4.2.1"
-        const val paralithic = "0.8.1"
+        const val paralithic = "0.7.1"
         const val strata = "1.3.2"
         
-        const val cloud = "2.0.0"
+        const val cloud = "1.8.4"
         
-        const val caffeine = "3.1.8"
+        const val slf4j = "2.0.9"
+        const val log4j_slf4j_impl = "2.20.0"
         
-        const val slf4j = "2.0.16"
-
         object Internal {
-            const val shadow = "8.3.3"
-            const val apacheText = "1.12.0"
-            const val apacheIO = "2.17.0"
-            const val guava = "33.3.1-jre"
-            const val asm = "9.7.1"
-            const val snakeYml = "2.3"
-            const val jetBrainsAnnotations = "26.0.1"
-            const val junit = "5.11.3"
-            const val nbt = "6.1"
+            const val shadow = "8.1.1"
+            const val apacheText = "1.10.0"
+            const val apacheIO = "2.14.0"
+            const val guava = "32.1.3-jre"
+            const val asm = "9.5"
+            const val snakeYml = "2.2"
         }
     }
     
     object Fabric {
-        const val fabricAPI = "0.118.0+${Mod.minecraft}"
-        const val cloud = "2.0.0-beta.9"
+        const val fabricAPI = "0.90.0+${Mod.minecraft}"
     }
 //
 //    object Quilt {
@@ -38,32 +29,32 @@ object Versions {
 //    }
     
     object Mod {
-        const val mixin = "0.15.3+mixin.0.8.7"
+        const val mixin = "0.12.5+mixin.0.8.5"
         
-        const val minecraft = "1.21.4"
-        const val yarn = "$minecraft+build.8"
-        const val fabricLoader = "0.16.10"
+        const val minecraft = "1.20.2"
+        const val yarn = "$minecraft+build.4"
+        const val fabricLoader = "0.14.23"
         
-        const val architecuryLoom = "1.7.413"
-        const val architecturyPlugin = "3.4.159"
-
+        const val architecuryLoom = "1.3.357"
+        const val architecturyPlugin = "3.4.146"
+        
+        const val loomVineflower = "1.11.0"
+    }
+    
+    object Forge {
+        const val forge = "${Mod.minecraft}-48.0.13"
+        const val burningwave = "12.63.0"
     }
-//
-//    object Forge {
-//        const val forge = "${Mod.minecraft}-48.0.13"
-//        const val burningwave = "12.63.0"
-//    }
     
     object Bukkit {
-        const val minecraft = "1.21.4"
-        const val paperBuild = "$minecraft-R0.1-20241211.212446-17"
-        const val paper = paperBuild
-        const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.1"
-        const val paperDevBundle = paperBuild
-        const val runPaper = "2.3.1"
-        const val paperWeight = "1.7.2"
-        const val cloud = "2.0.0-beta.10"
+        const val paper = "1.18.2-R0.1-SNAPSHOT"
+        const val paperLib = "1.0.5"
+        const val foliaLib = "0.2.5"
+        const val minecraft = "1.20.2"
+        const val reflectionRemapper = "0.1.0-SNAPSHOT"
+        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
+        const val runPaper = "2.2.0"
+        const val paperWeight = "1.5.6"
     }
     
     //
@@ -74,16 +65,7 @@ object Versions {
 //    }
 //
     object CLI {
-        const val logback = "1.5.8"
-        const val picocli = "4.7.6"
+        const val nbt = "6.1"
+        const val logback = "1.4.11"
     }
-    
-    object Allay {
-        const val api = "0.2.0"
-        const val gson = "2.12.1"
-    }
-    
-    object Minestom {
-        const val minestom = "187931e50b"
-    }
-}
+}

common/addons/api-addon-loader/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-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.

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;
 
-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Collection;
 
+import com.dfsek.terra.api.world.biome.Biome;
+
 
 public interface Extrusion {
     Biome extrude(Biome original, int x, int y, int z, long seed);

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

@@ -1,9 +1,5 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
-import java.util.Collection;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
@@ -12,6 +8,10 @@ import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;
 
+import java.util.Collection;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 
 /**
  * Sets biomes at locations based on a sampler.

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

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

common/addons/biome-provider-image/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 Polyhedral Development
+ * Copyright (c) 2020-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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.biome.pipeline.v2;
 
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 
@@ -13,6 +11,7 @@ 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;
@@ -24,7 +23,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 public class PipelineBiomeProvider implements BiomeProvider {
 
-    private final LoadingCache<SeededVector2Key, BiomeChunk> biomeChunkCache;
+    private final LoadingCache<SeededVector, BiomeChunk> biomeChunkCache;
     private final int chunkSize;
     private final int resolution;
     private final NoiseSampler mutator;
@@ -91,7 +90,7 @@ public class PipelineBiomeProvider implements BiomeProvider {
         int xInChunk = x - chunkWorldX;
         int zInChunk = z - chunkWorldZ;
 
-        return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome();
+        return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome();
     }
 
     @Override

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

@@ -1,12 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
-
 import java.util.List;
 
 
 public interface Pipeline {
-    BiomeChunk generateChunk(SeededVector2Key worldCoordinates);
+    BiomeChunk generateChunk(SeededVector worldCoordinates);
 
     int getChunkSize();
 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.
@@ -29,7 +29,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
     @Default
     @Description("""
                  The resolution at which to sample biomes.
-                 
+                                  
                  Larger values are quadratically faster, but produce lower quality results.
                  For example, a value of 3 would sample every 3 blocks.""")
     protected @Meta int resolution = 1;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -4,33 +4,32 @@ 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 com.dfsek.terra.api.util.cache.SeededVector2Key;
 
 
 public class BiomeChunkImpl implements BiomeChunk {
 
-    private final SeededVector2Key worldOrigin;
+    private final SeededVector worldOrigin;
     private final int chunkOriginArrayIndex;
     private final int worldCoordinateScale;
-    private final int size;
-    private PipelineBiome[] biomes;
+    private PipelineBiome[][] biomes;
 
-    public BiomeChunkImpl(SeededVector2Key worldOrigin, PipelineImpl pipeline) {
+    public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
 
         this.worldOrigin = worldOrigin;
         this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex();
         this.worldCoordinateScale = pipeline.getResolution();
 
-        this.size = pipeline.getArraySize();
+        int size = pipeline.getArraySize();
 
         int expanderCount = pipeline.getExpanderCount();
         int expansionsApplied = 0;
 
         // Allocate working arrays
-        this.biomes = new PipelineBiome[size * size];
-        PipelineBiome[] lookupArray = new PipelineBiome[size * size];
+        this.biomes = new PipelineBiome[size][size];
+        PipelineBiome[][] lookupArray = new PipelineBiome[size][size];
         // A second lookup array is required such that stage application doesn't affect lookups, otherwise application may cascade
 
         // Construct working grid
@@ -44,7 +43,7 @@ public class BiomeChunkImpl implements BiomeChunk {
             for(int gridZ = 0; gridZ < gridSize; gridZ++) {
                 int xIndex = gridOrigin + gridX * gridInterval;
                 int zIndex = gridOrigin + gridZ * gridInterval;
-                biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed, xIndexToWorldCoordinate(xIndex),
+                biomes[xIndex][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
                     zIndexToWorldCoordinate(zIndex));
             }
         }
@@ -66,7 +65,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;
 
@@ -75,8 +74,7 @@ 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 * size) + zIndex] = stage.apply(
-                        new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray, size));
+                    biomes[xIndex][zIndex] = stage.apply(new ViewPoint(this, gridInterval, gridX, gridZ, xIndex, zIndex, lookupArray));
                 }
             }
         }
@@ -135,18 +133,18 @@ public class BiomeChunkImpl implements BiomeChunk {
     public PipelineBiome get(int xInChunk, int zInChunk) {
         int xIndex = xInChunk + chunkOriginArrayIndex;
         int zIndex = zInChunk + chunkOriginArrayIndex;
-        return biomes[(xIndex * size) + zIndex];
+        return biomes[xIndex][zIndex];
     }
 
     private int xIndexToWorldCoordinate(int xIndex) {
-        return (worldOrigin.x + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+        return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale;
     }
 
     private int zIndexToWorldCoordinate(int zIndex) {
-        return (worldOrigin.z + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
+        return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale;
     }
 
-    private SeededVector2Key getOrigin() {
+    private SeededVector getOrigin() {
         return worldOrigin;
     }
 
@@ -161,11 +159,10 @@ public class BiomeChunkImpl implements BiomeChunk {
         private final int gridZ;
         private final int xIndex;
         private final int zIndex;
-        private final PipelineBiome[] lookupArray;
-        private final int size;
+        private final PipelineBiome[][] lookupArray;
 
         private ViewPoint(BiomeChunkImpl chunk, int gridInterval, int gridX, int gridZ, int xIndex, int zIndex,
-                          PipelineBiome[] lookupArray, int size) {
+                          PipelineBiome[][] lookupArray) {
             this.chunk = chunk;
             this.gridInterval = gridInterval;
             this.gridX = gridX;
@@ -173,14 +170,13 @@ public class BiomeChunkImpl implements BiomeChunk {
             this.xIndex = xIndex;
             this.zIndex = zIndex;
             this.lookupArray = lookupArray;
-            this.size = size;
-            this.biome = lookupArray[(this.xIndex * this.size) + this.zIndex];
+            this.biome = lookupArray[xIndex][zIndex];
         }
 
         public PipelineBiome getRelativeBiome(int x, int z) {
             int lookupXIndex = this.xIndex + x * gridInterval;
             int lookupZIndex = this.zIndex + z * gridInterval;
-            return lookupArray[(lookupXIndex * this.size) + lookupZIndex];
+            return lookupArray[lookupXIndex][lookupZIndex];
         }
 
         public PipelineBiome getBiome() {
@@ -216,7 +212,7 @@ public class BiomeChunkImpl implements BiomeChunk {
         }
 
         public long worldSeed() {
-            return chunk.getOrigin().seed;
+            return chunk.getOrigin().seed();
         }
     }
 }

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
 
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,6 +8,7 @@ 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.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 
@@ -56,7 +55,7 @@ public class PipelineImpl implements Pipeline {
     }
 
     @Override
-    public BiomeChunk generateChunk(SeededVector2Key worldCoordinates) {
+    public BiomeChunk generateChunk(SeededVector worldCoordinates) {
         return new BiomeChunkImpl(worldCoordinates, this);
     }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

common/addons/biome-provider-pipeline/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.
@@ -28,7 +28,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
     @Description("""
                  The initial size of biome chunks. This value must be at least 2.
                  <b>This is not the final size of biome chunks. Final chunks will be much larger</b>.
-                 
+                                  
                  It is recommended to keep biome chunks' final size in the range of [50, 300]
                  to prevent performance issues. To calculate the size of biome chunks, simply
                  take initial-size and for each expand stage, multiply the running value by 2

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.
@@ -22,7 +22,7 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProvi
     @Default
     @Description("""
                  The resolution at which to sample biomes.
-                 
+                                  
                  Larger values are quadratically faster, but produce lower quality results.
                  For example, a value of 3 would sample every 3 blocks.""")
     protected @Meta int resolution = 1;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

common/addons/biome-provider-single/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

common/addons/chunk-generator-noise-3d/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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,7 +13,6 @@ 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;
@@ -46,8 +45,8 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
             .priority(1000)
             .then(event -> {
 
-                event.getPack().applyLoader(SlantCalculationMethod.class,
-                    (type, o, loader, depthTracker) -> SlantCalculationMethod.valueOf((String) o));
+                event.getPack().applyLoader(SlantHolder.CalculationMethod.class,
+                    (type, o, loader, depthTracker) -> SlantHolder.CalculationMethod.valueOf((String) o));
 
                 NoiseChunkGeneratorPackConfigTemplate config = event.loadTemplate(new NoiseChunkGeneratorPackConfigTemplate());
                 event.getPack().getContext().put(config);
@@ -58,8 +57,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                         pack -> new NoiseChunkGenerator3D(pack, platform, config.getElevationBlend(),
                             config.getHorizontalRes(),
                             config.getVerticalRes(), noisePropertiesPropertyKey,
-                            paletteInfoPropertyKey, config.getSlantCalculationMethod(),
-                            config.isSlantPalettesEnabled()));
+                            paletteInfoPropertyKey));
                 event.getPack()
                     .applyLoader(SlantHolder.Layer.class, SlantLayerTemplate::new);
             })

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

@@ -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.generation.math.SlantCalculationMethod;
+import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.properties.Properties;
 
@@ -24,11 +24,7 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
 
     @Value("slant.calculation-method")
     @Default
-    private @Meta SlantCalculationMethod slantCalculationMethod = SlantCalculationMethod.Derivative;
-
-    @Value("slant.disable-palettes")
-    @Default
-    private @Meta boolean disableSlantPalettes = false;
+    private SlantHolder.@Meta CalculationMethod slantCalculationMethod = SlantHolder.CalculationMethod.Derivative;
 
     public int getElevationBlend() {
         return elevationBlend;
@@ -42,11 +38,7 @@ public class NoiseChunkGeneratorPackConfigTemplate implements ConfigTemplate, Pr
         return verticalRes;
     }
 
-    public SlantCalculationMethod getSlantCalculationMethod() {
+    public SlantHolder.CalculationMethod getSlantCalculationMethod() {
         return slantCalculationMethod;
     }
-
-    public boolean isSlantPalettesEnabled() {
-        return !disableSlantPalettes;
-    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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,7 +16,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-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;
@@ -28,7 +27,7 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
     private final Platform platform;
-    private final SlantCalculationMethod slantCalculationMethod;
+    private final SlantHolder.CalculationMethod slantCalculationMethod;
     @Value("slant")
     @Default
     @Description("The slant palettes to use in this biome.")
@@ -57,7 +56,7 @@ public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
     @Default
     private @Meta boolean updatePalette = false;
 
-    public BiomePaletteTemplate(Platform platform, SlantCalculationMethod slantCalculationMethod) {
+    public BiomePaletteTemplate(Platform platform, SlantHolder.CalculationMethod slantCalculationMethod) {
         this.platform = platform;
         this.slantCalculationMethod = slantCalculationMethod;
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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,12 +11,11 @@ package com.dfsek.terra.addons.chunkgenerator.generation;
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
-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,23 +42,16 @@ 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,
-                                 SlantCalculationMethod slantCalculationMethod, boolean useSlantPalettes) {
+                                 PropertyKey<BiomePaletteInfo> paletteInfoPropertyKey) {
         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()
@@ -71,17 +63,6 @@ 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,
@@ -122,7 +103,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
 
                     if(sampler.sample(x, y, z) > 0) {
                         if(carver.sample(x, y, z) <= 0) {
-                            data = paletteAt(x, y, z, sampler, paletteInfo, paletteLevel)
+                            data = PaletteUtil
+                                .getPalette(x, y, z, sampler, paletteInfo, paletteLevel)
                                 .get(paletteLevel, cx, y, cz, seed);
                             chunk.setBlock(x, y, z, data);
                             paletteLevel++;
@@ -153,7 +135,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         int fdX = Math.floorMod(x, 16);
         int fdZ = Math.floorMod(z, 16);
 
-        Palette palette = paletteAt(fdX, y, fdZ, sampler, paletteInfo, 0);
+        Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
         double noise = sampler.sample(fdX, y, fdZ);
         if(noise > 0) {
             int level = 0;
@@ -175,8 +157,11 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
     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);
+        return biomeProvider.getBiome(x, y, z, world.getSeed())
+            .getContext()
+            .get(paletteInfoPropertyKey)
+            .slantHolder()
+            .calculateSlant(samplerCache.get(x, z, world, biomeProvider), fdX, y, fdZ);
     }
 
     public SamplerProvider samplerProvider() {

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

@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package com.dfsek.terra.addons.chunkgenerator.generation.math;
+
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+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);
+    }
+}

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

@@ -1,69 +0,0 @@
-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();
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2025 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.
@@ -14,7 +14,6 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 
 
@@ -22,7 +21,7 @@ public class MultipleSlantHolder extends SlantHolderImpl {
     private final NavigableMap<Double, PaletteHolder> layers;
     private final double slantThreshold;
 
-    MultipleSlantHolder(List<SlantHolder.Layer> slant, int slantDepth, SlantCalculationMethod calculationMethod) {
+    MultipleSlantHolder(List<SlantHolder.Layer> slant, int slantDepth, CalculationMethod calculationMethod) {
         super(slantDepth, calculationMethod);
         NavigableMap<Double, PaletteHolder> layers = new TreeMap<>(
             slant.stream().collect(Collectors.toMap(SlantHolder.Layer::threshold, SlantHolder.Layer::palette)));

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

@@ -1,6 +1,5 @@
 package com.dfsek.terra.addons.chunkgenerator.palette.slant;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 
 
@@ -8,7 +7,7 @@ final class SingleSlantHolder extends SlantHolderImpl {
 
     private final SlantHolder.Layer layer;
 
-    public SingleSlantHolder(SlantHolder.Layer layer, int slantDepth, SlantCalculationMethod calculationMethod) {
+    public SingleSlantHolder(SlantHolder.Layer layer, int slantDepth, CalculationMethod calculationMethod) {
         super(slantDepth, calculationMethod);
         this.layer = layer;
     }

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

@@ -2,13 +2,19 @@ package com.dfsek.terra.addons.chunkgenerator.palette.slant;
 
 import java.util.List;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.api.util.vector.Vector3;
 
 
 public interface SlantHolder {
 
     SlantHolder EMPTY = new SlantHolder() {
+        @Override
+        public double calculateSlant(Sampler3D sampler, double x, double y, double z) {
+            throw new UnsupportedOperationException("Empty holder should not calculate slant");
+        }
+
         @Override
         public boolean isAboveDepth(int depth) {
             return false;
@@ -25,7 +31,7 @@ public interface SlantHolder {
         }
     };
 
-    static SlantHolder of(List<SlantHolder.Layer> layers, int slantDepth, SlantCalculationMethod calculationMethod) {
+    static SlantHolder of(List<SlantHolder.Layer> layers, int slantDepth, CalculationMethod calculationMethod) {
         if(layers.isEmpty()) {
             return EMPTY;
         } else if(layers.size() == 1) {
@@ -34,6 +40,8 @@ public interface SlantHolder {
         return new MultipleSlantHolder(layers, slantDepth, calculationMethod);
     }
 
+    double calculateSlant(Sampler3D sampler, double x, double y, double z);
+
     boolean isAboveDepth(int depth);
 
     boolean isInSlantThreshold(double slant);
@@ -41,6 +49,71 @@ public interface SlantHolder {
     PaletteHolder getPalette(double slant);
 
 
+    enum CalculationMethod {
+        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();
+    }
+
+
     record Layer(PaletteHolder palette, double threshold) {
     }
 }

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

@@ -1,19 +1,26 @@
 package com.dfsek.terra.addons.chunkgenerator.palette.slant;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.SlantCalculationMethod;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 
 
 public abstract class SlantHolderImpl implements SlantHolder {
     protected final boolean floorToThreshold;
+    private final SlantHolder.CalculationMethod calculationMethod;
     private final int slantDepth;
 
-    protected SlantHolderImpl(int slantDepth, SlantCalculationMethod calculationMethod) {
+    protected SlantHolderImpl(int slantDepth, CalculationMethod calculationMethod) {
         this.floorToThreshold = calculationMethod.floorToThreshold();
+        this.calculationMethod = calculationMethod;
         this.slantDepth = slantDepth;
     }
 
     protected abstract double getSlantThreshold();
 
+    @Override
+    public final double calculateSlant(Sampler3D sampler, double x, double y, double z) {
+        return calculationMethod.slant(sampler, x, y, z);
+    }
+
     @Override
     public final boolean isAboveDepth(int depth) {
         return depth <= slantDepth;

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.addons;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.description.Description;
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.CommandManager;
 
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -30,7 +30,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                 CommandManager<CommandSender> manager = event.getCommandManager();
 
                 manager.command(
-                        manager.commandBuilder("addons", Description.of("List installed Terra addons"))
+                        manager.commandBuilder("addons", ArgumentDescription.of("List installed Terra addons"))
                             .permission("terra.addons")
                             .handler(context -> {
                                 StringBuilder addons = new StringBuilder("Installed addons:\n");
@@ -41,7 +41,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                         .append('@')
                                         .append(addon.getVersion().getFormatted())
                                         .append('\n'));
-                                context.sender().sendMessage(addons.toString());
+                                context.getSender().sendMessage(addons.toString());
                             })
                     )
                     .command(
@@ -61,7 +61,7 @@ public class AddonsCommandAddon implements AddonInitializer {
                                     .append('@')
                                     .append(versions.getFormatted())
                                     .append('\n'));
-                                context.sender().sendMessage(addonInfo.toString());
+                                context.getSender().sendMessage(addonInfo.toString());
                             })
                     );
             });

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.commands.packs;
 
-import org.incendo.cloud.CommandManager;
-import org.incendo.cloud.description.Description;
+import cloud.commandframework.ArgumentDescription;
+import cloud.commandframework.CommandManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +35,7 @@ public class PacksCommandAddon implements AddonInitializer {
                 CommandManager<CommandSender> manager = event.getCommandManager();
 
                 manager.command(
-                        manager.commandBuilder("packs", Description.of("List installed config packs"))
+                        manager.commandBuilder("packs", ArgumentDescription.of("List installed config packs"))
                             .permission("terra.packs")
                             .handler(context -> {
                                 StringBuilder packs = new StringBuilder("Installed packs:\n");
@@ -43,12 +43,12 @@ public class PacksCommandAddon implements AddonInitializer {
                                     .append(pack.getID())
                                     .append('@')
                                     .append(pack.getVersion().getFormatted()));
-                                context.sender().sendMessage(packs.toString());
+                                context.getSender().sendMessage(packs.toString());
                             })
                     )
                     .command(
                         manager.commandBuilder("packs")
-                            .literal("info", Description.of("Get information about a pack"))
+                            .literal("info", ArgumentDescription.of("Get information about a pack"))
                             .permission("terra.packs.info")
                             .argument(RegistryArgument.of("pack", platform.getConfigRegistry()))
                             .handler(context -> {
@@ -65,21 +65,21 @@ public class PacksCommandAddon implements AddonInitializer {
                                     .append('@')
                                     .append(versions.getFormatted())
                                     .append('\n'));
-                                context.sender().sendMessage(packInfo.toString());
+                                context.getSender().sendMessage(packInfo.toString());
                             }))
                     .command(
                         manager.commandBuilder("packs")
-                            .literal("reload", Description.of("Reload config packs"))
+                            .literal("reload", ArgumentDescription.of("Reload config packs"))
                             .permission("terra.packs.reload")
                             .handler(context -> {
-                                context.sender().sendMessage("Reloading Terra...");
+                                context.getSender().sendMessage("Reloading Terra...");
                                 logger.info("Reloading Terra...");
                                 if(platform.reload()) {
                                     logger.info("Terra reloaded successfully.");
-                                    context.sender().sendMessage("Terra reloaded successfully.");
+                                    context.getSender().sendMessage("Terra reloaded successfully.");
                                 } else {
                                     logger.error("Terra failed to reload.");
-                                    context.sender().sendMessage(
+                                    context.getSender().sendMessage(
                                         "Terra failed to reload. See logs for more information.");
                                 }
                             }));