Reformat YAML files

Remove trailing whitespace in YAML formatting
change formatting
2026-05-20 08:40:26 +00:00 · 2023-11-10 10:11:56 +11:00 · 2023-11-10 10:11:46 +11:00 · 2023-11-09 12:47:48 -07:00 · 2023-11-09 11:40:19 -07:00 · 2023-11-09 11:37:46 -07:00
714 changed files with 4102 additions and 2645 deletions
@@ -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
@@ -51,13 +51,13 @@ assignees: ""

 <!-- You can fill out the different items by putting the correct value beside each cell. -->

-| Name                         | Value |
-|------------------------------|-------|
-| Terra Version                | <!-- Put your Terra version here. (remove the comment) -->
-| Platform / Platform Version  | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) -->
-| Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->
-| Terra Packs In Use           | <!-- Put a list of all the Terra packs you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te packs may be used to get a list) -->
-| Terra Addons In Use          | <!-- Put a list of all the Terra addons you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te addons may be used to get a list) -->
+| Name                         | Value                                                                                                                                                                       |
+|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Terra Version                | <!-- Put your Terra version here. (remove the comment) -->                                                                                                                  
+| Platform / Platform Version  | <!-- Put your platform and platform version here. (remove the comment) (eg. Spigot, Fabric, Paper, etc.) (If you are using the Region generator, put that here instead) --> 
+| Any External Plugins or Mods | <!-- Put a list of all the plugins or mods you have installed here. (remove the comment) (Make sure to NOT include any new lines) -->                                       
+| Terra Packs In Use           | <!-- Put a list of all the Terra packs you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te packs may be used to get a list) -->     
+| Terra Addons In Use          | <!-- Put a list of all the Terra addons you have installed here. (remove the comment) (Make sure to NOT include any new lines) (/te addons may be used to get a list) -->   

 ## Issue Description

@@ -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
-      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).
+    * `runServer` - Run the Paper test server with Terra installed.
 * Fabric
    * `runClient` - Run a Minecraft Fabric client with Terra installed.
    * `runServer` - Run a Minecraft Fabric server with Terra installed.
@@ -1,38 +1,38 @@
 preRelease(true)

-versionProjects(":common:api", version("6.3.0"))
-versionProjects(":common:implementation", version("6.3.0"))
-versionProjects(":platforms", version("6.3.0"))
+versionProjects(":common:api", version("6.4.0"))
+versionProjects(":common:implementation", version("6.4.0"))
+versionProjects(":platforms", version("6.4.0"))


 allprojects {
    group = "com.dfsek.terra"
-    
+
    configureCompilation()
    configureDependencies()
    configurePublishing()
-    
+
    tasks.withType<JavaCompile>().configureEach {
        options.isFork = true
        options.isIncremental = true
    }
-    
+
    tasks.withType<Test>().configureEach {
        useJUnitPlatform()
-        
+
        maxHeapSize = "2G"
        ignoreFailures = false
        failFast = true
        maxParallelForks = (Runtime.getRuntime().availableProcessors() - 1).takeIf { it > 0 } ?: 1
-        
+
        reports.html.required.set(false)
        reports.junitXml.required.set(false)
    }
-    
+
    tasks.withType<Copy>().configureEach {
        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
    }
-    
+
    tasks.withType<Jar>().configureEach {
        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
    }
@@ -45,11 +45,11 @@ afterEvaluate {
    project(":platforms:bukkit:common").configureDistribution()
    forSubProjects(":common:addons") {
        apply(plugin = "com.github.johnrengelman.shadow")
-        
+
        tasks.named("build") {
            finalizedBy(tasks.named("shadowJar"))
        }
-        
+
        dependencies {
            "compileOnly"(project(":common:api"))
            "testImplementation"(project(":common:api"))
@@ -3,15 +3,6 @@ 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()
@@ -24,11 +15,12 @@ repositories {
 }

 dependencies {
-    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
-    
-    implementation("org.ow2.asm:asm:9.3")
-    implementation("org.ow2.asm:asm-tree:9.3")
-    implementation("com.dfsek.tectonic:common:4.2.0")
-    implementation("org.yaml:snakeyaml:1.27")
+    //TODO Allow pulling from Versions.kt
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6")
+
+    implementation("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")
 }
@@ -48,6 +48,9 @@ fun Project.configureDependencies() {
        maven("https://jitpack.io") {
            name = "JitPack"
        }
+        maven("https://nexuslite.gcnt.net/repos/other/") {
+            name = "GCNT"
+        }
    }
    
    dependencies {
@@ -58,4 +61,4 @@ fun Project.configureDependencies() {
        compileOnly("com.google.guava:guava:30.0-jre")
        testImplementation("com.google.guava:guava:30.0-jre")
    }
-}
+}
@@ -3,13 +3,11 @@ import java.io.File
 import java.io.FileWriter
 import java.net.URI
 import java.net.URL
+import java.nio.file.FileSystemNotFoundException
 import java.nio.file.FileSystems
-import 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,6 +15,10 @@ 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() {
@@ -47,19 +49,28 @@ fun Project.configureDistribution() {
            // https://github.com/johnrengelman/shadow/issues/111
            val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
            
-            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
+            val provider = try {
+                FileSystems.getFileSystem(dest)
+            } catch (e: FileSystemNotFoundException) {
+                null
+            } ?: FileSystems.newFileSystem(dest, mapOf("create" to "false"), null)
+            provider?.use { fs ->
                forSubProjects(":common:addons") {
-                    val jar = getJarTask()
-                    
-                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-                    
-                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-                    val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
-                    
-                    if (!Files.exists(addonPath)) {
-                        Files.createDirectories(addonPath.parent)
-                        Files.createFile(addonPath)
-                        Files.copy(jar.archiveFile.get().asFile.toPath(), addonPath, StandardCopyOption.REPLACE_EXISTING)
+                    if (fs.isOpen) {
+                        val jar = getJarTask()
+                        
+                        if (jar.archiveFile.get().asFile.exists()) {
+                            println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                            
+                            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
+                            val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
+                            
+                            if (!addonPath.exists()) {
+                                addonPath.parent.createDirectories()
+                                addonPath.createFile()
+                                jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
+                            }
+                        }
                    }
                    
                }
@@ -89,7 +100,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()
@@ -110,7 +122,7 @@ fun Project.configureDistribution() {
            FileWriter(manifest).use {
                yaml.dump(resources, it)
            }
-
+            
        }
    }
    
@@ -126,7 +138,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")
@@ -1,68 +1,71 @@
 object Versions {
    object Libraries {
-        const val tectonic = "4.2.0"
-        const val paralithic = "0.7.0"
-        const val strata = "1.1.1"
+        const val tectonic = "4.2.1"
+        const val paralithic = "0.7.1"
+        const val strata = "1.3.2"
        
-        const val cloud = "1.8.0"
+        const val cloud = "1.8.4"
        
-        const val slf4j = "1.7.36"
-        const val log4j_slf4j_impl = "2.14.1"
+        const val slf4j = "2.0.9"
+        const val log4j_slf4j_impl = "2.20.0"
        
        object Internal {
-            const val apacheText = "1.9"
-            const val jafama = "2.3.2"
-            const val apacheIO = "2.6"
-            const val fastutil = "8.5.6"
+            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 fabricLoader = "0.14.8"
-        const val fabricAPI = "0.83.1+1.20.1"
-    }
-    
-    object Quilt {
-        const val quiltLoader = "0.17.0"
-        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
+        const val fabricAPI = "0.90.0+${Mod.minecraft}"
    }
+//
+//    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.12.5+mixin.0.8.5"
        
-        const val minecraft = "1.20.1"
-        const val yarn = "$minecraft+build.2"
-        const val fabricLoader = "0.14.21"
+        const val minecraft = "1.20.2"
+        const val yarn = "$minecraft+build.4"
+        const val fabricLoader = "0.14.23"
        
-        const val architecuryLoom = "0.12.0.290"
-        const val architecturyPlugin = "3.4-SNAPSHOT"
+        const val architecuryLoom = "1.3.357"
+        const val architecturyPlugin = "3.4.146"
        
-        const val loomQuiltflower = "1.7.1"
+        const val loomVineflower = "1.11.0"
    }
    
    object Forge {
-        const val forge = "${Mod.minecraft}-47.0.3"
-        const val burningwave = "12.53.0"
+        const val forge = "${Mod.minecraft}-48.0.13"
+        const val burningwave = "12.63.0"
    }
    
    object Bukkit {
        const val paper = "1.18.2-R0.1-SNAPSHOT"
        const val paperLib = "1.0.5"
-        const val minecraft = "1.20.1"
+        const val foliaLib = "0.2.5"
+        const val minecraft = "1.20.2"
        const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
-    }
-    
-    object Sponge {
-        const val sponge = "9.0.0-SNAPSHOT"
-        const val mixin = "0.8.2"
-        const val minecraft = "1.17.1"
+        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
+        const val runPaper = "2.2.0"
+        const val paperWeight = "1.5.6"
    }
    
+    //
+//    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 commonsIO = "2.7"
-        const val guava = "31.0.1-jre"
+        const val logback = "1.4.11"
    }
 }
@@ -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.
@@ -2,8 +2,6 @@ package com.dfsek.terra.addons.biome.extrusion;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import java.util.function.Supplier;
-
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.extrusion.config.BiomeExtrusionTemplate;
@@ -23,6 +21,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

+import java.util.function.Supplier;
+

 public class BiomeExtrusionAddon implements AddonInitializer {
    public static final TypeKey<Supplier<ObjectTemplate<Extrusion>>> EXTRUSION_REGISTRY_KEY = new TypeKey<>() {
@@ -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(
-                            BIOME_COLOR_CONVERTER_REGISTRY_KEY);
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorConverter<Biome>>>> biomeColorConverterRegistry =
+                            event.getPack().getOrCreateRegistry(
+                                    BIOME_COLOR_CONVERTER_REGISTRY_KEY);
                    biomeColorConverterRegistry.register(addon.key("EXACT"), ExactBiomeColorConverterTemplate::new);
                    biomeColorConverterRegistry.register(addon.key("CLOSEST"), ClosestBiomeColorConverterTemplate::new);
                })
                .then(event -> {
-                    CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry = event.getPack().getOrCreateRegistry(
-                            BIOME_COLOR_MAPPING_REGISTRY_KEY);
-                    biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"), () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class), b -> b));
+                    CheckedRegistry<Supplier<ObjectTemplate<ColorMapping<Biome>>>> biomeColorMappingRegistry =
+                            event.getPack().getOrCreateRegistry(
+                                    BIOME_COLOR_MAPPING_REGISTRY_KEY);
+                    biomeColorMappingRegistry.register(addon.key("USE_BIOME_COLORS"),
+                                                       () -> () -> new BiomeDefinedColorMapping<>(event.getPack().getRegistry(Biome.class),
+                                                                                                  b -> b));
                    biomeColorMappingRegistry.register(addon.key("MAP"), DefinedBiomeColorMappingTemplate::new);
                })
                .failThrough();
@@ -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;

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.world.biome.Biome;


 public class ClosestBiomeColorConverterTemplate extends ClosestColorConverterTemplate<Biome> {
-
+    
    @Value("match")
    private ColorMapping<Biome> match;
    
@@ -12,19 +12,19 @@ public class ExactBiomeColorConverterTemplate extends ExactColorConverterTemplat
    
    @Value("match")
    private ColorMapping<Biome> match;
-
+    
    @Value("else")
    private Biome fallback;
    
    @Value("ignore-alpha")
    @Default
    private boolean ignoreAlpha = true;
-
+    
    @Override
    protected ColorMapping<Biome> getMapping() {
        return match;
    }
-
+    
    @Override
    protected Biome getFallback() {
        return fallback;
@@ -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()),
-                                              FastMath.floorMod(z - image.getHeight() / 2, image.getHeight())));
+                return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
+                                              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
@@ -6,7 +6,7 @@ of "stages" to apply "mutations" to a 2D grid of biomes.
 Version 2 is a re-implementation of the original addon with the primary goal of providing
 consistent scaling for noise relative to the world
 (See https://github.com/PolyhedralDev/Terra/issues/264 for more details), and has been
-included as a separate addon to maintain parity with packs utilizing the first version. 
+included as a separate addon to maintain parity with packs utilizing the first version.

 This addon registers the `PIPELINE` biome provider type, and all associated
 configurations.
@@ -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;
@@ -37,9 +36,9 @@ public class PipelineBiomeProvider implements BiomeProvider {
        this.noiseAmp = noiseAmp;
        this.chunkSize = pipeline.getChunkSize();
        this.biomeChunkCache = Caffeine.newBuilder()
-                                       .maximumSize(1024)
+                                       .maximumSize(64)
                                       .build(pipeline::generateChunk);
-    
+        
        Set<PipelineBiome> biomeSet = new HashSet<>();
        pipeline.getSource().getBiomes().forEach(biomeSet::add);
        Iterable<PipelineBiome> result = biomeSet;
@@ -50,7 +49,7 @@ public class PipelineBiomeProvider implements BiomeProvider {
        Iterable<PipelineBiome> finalResult = result;
        result.forEach(pipelineBiome -> {
            if(pipelineBiome.isPlaceholder()) {
-            
+                
                StringBuilder biomeList = new StringBuilder("\n");
                StreamSupport.stream(finalResult.spliterator(), false)
                             .sorted(Comparator.comparing(StringIdentifiable::getID))
@@ -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());
@@ -74,15 +74,15 @@ public class PipelineBiomeProvider implements BiomeProvider {
    }
    
    public Biome getBiome(int x, int z, long seed) {
-    
+        
        x += mutator.noise(seed + 1, x, z) * noiseAmp;
        z += mutator.noise(seed + 2, x, z) * noiseAmp;
        
        x /= resolution;
        z /= resolution;
        
-        int chunkX = FastMath.floorDiv(x, chunkSize);
-        int chunkZ = FastMath.floorDiv(z, chunkSize);
+        int chunkX = Math.floorDiv(x, 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() {
@@ -10,7 +10,7 @@ final class SelfPipelineBiome implements PipelineBiome {
    public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();
    
    private SelfPipelineBiome() {
-
+    
    }
    
    @Override
@@ -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,27 +33,23 @@ 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() {
-        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 500), resolution, blendSampler, blendAmplitude);
+        return new PipelineBiomeProvider(new PipelineImpl(source, stages, resolution, 128), resolution, blendSampler, blendAmplitude);
    }
 }
@@ -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,20 @@
 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 PipelineBiome[][] biomes;
    
    public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
        
@@ -44,7 +43,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][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
+                                                                  zIndexToWorldCoordinate(zIndex));
            }
        }
        
@@ -80,21 +80,6 @@ public class BiomeChunkImpl implements BiomeChunk {
        }
    }
    
-    @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,15 +96,15 @@ 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) {
        int gridOrigin = 0;
        int expansionsApplied = 0;
        int gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
-        for (Stage stage : stages) {
-            if (stage instanceof Expander) {
+        for(Stage stage : stages) {
+            if(stage instanceof Expander) {
                expansionsApplied++;
                gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
            }
@@ -144,6 +129,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][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;
    }
@@ -161,7 +161,8 @@ public class BiomeChunkImpl implements BiomeChunk {
        private final int zIndex;
        private final PipelineBiome[][] lookupArray;
        
-        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) {
            this.chunk = chunk;
            this.gridInterval = gridInterval;
            this.gridX = gridX;
@@ -36,18 +36,18 @@ public class PipelineImpl implements Pipeline {
        int chunkOriginArrayIndex;
        int chunkSize;
        int initialSize = 1;
-        while (true) {
+        while(true) {
            arraySize = BiomeChunkImpl.initialSizeToArraySize(expanderCount, initialSize);
            chunkOriginArrayIndex = BiomeChunkImpl.calculateChunkOriginArrayIndex(expanderCount, stages);
            chunkSize = BiomeChunkImpl.calculateChunkSize(arraySize, chunkOriginArrayIndex, expanderCount);
-            if (chunkSize > 1 && arraySize >= idealChunkArraySize) break;
+            if(chunkSize > 1 && arraySize >= idealChunkArraySize) break;
            initialSize++;
        }
        
        this.arraySize = arraySize;
        this.chunkOriginArrayIndex = chunkOriginArrayIndex;
        this.chunkSize = chunkSize;
-    
+        
        logger.debug("Initialized a new biome pipeline:");
        logger.debug("Array size: {} (Target: {})", arraySize, idealChunkArraySize);
        logger.debug("Internal array origin: {}", chunkOriginArrayIndex);
@@ -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 {
@@ -16,21 +16,21 @@ public class FractalExpander implements Expander {
    
    @Override
    public PipelineBiome fillBiome(BiomeChunkImpl.ViewPoint viewPoint) {
-
+        
        int xMod2 = viewPoint.gridX() % 2;
        int zMod2 = viewPoint.gridZ() % 2;
        
        double roll = sampler.noise(viewPoint.worldSeed(), viewPoint.worldX(), viewPoint.worldZ());
        
-        if (xMod2 == 1 && zMod2 == 0) { // Pick one of 2 neighbors on X axis randomly
+        if(xMod2 == 1 && zMod2 == 0) { // Pick one of 2 neighbors on X axis randomly
            return roll > 0 ? viewPoint.getRelativeBiome(-1, 0) : viewPoint.getRelativeBiome(1, 0);
            
-        } else if (xMod2 == 0 && zMod2 == 1) { // Pick one of 2 neighbors on Z axis randomly
+        } else if(xMod2 == 0 && zMod2 == 1) { // Pick one of 2 neighbors on Z axis randomly
            return roll > 0 ? viewPoint.getRelativeBiome(0, -1) : viewPoint.getRelativeBiome(0, 1);
            
        } else { // Pick one of 4 corners randomly
            return roll > 0 ?
-                   roll >  0.25 ? viewPoint.getRelativeBiome(-1, 1) : viewPoint.getRelativeBiome(1, 1) :
+                   roll > 0.25 ? viewPoint.getRelativeBiome(-1, 1) : viewPoint.getRelativeBiome(1, 1) :
                   roll > -0.25 ? viewPoint.getRelativeBiome(-1, -1) : viewPoint.getRelativeBiome(1, -1);
        }
    }
@@ -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.
@@ -38,7 +38,7 @@ public class BorderListStage implements Stage {
        this.replaceDefault = replaceDefault;
        this.defaultReplace = defaultReplace;
        this.replace = replace;
-    
+        
        List<Vector2Int> points = new ArrayList<>();
        for(int x = -1; x <= 1; x++) {
            for(int z = -1; z <= 1; z++) {
@@ -68,10 +68,11 @@ public class BorderListStage implements Stage {
                if(current != null && current.getTags().contains(border)) {
                    if(replace.containsKey(center)) {
                        PipelineBiome replacement = replace.get(center).get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(),
-                                                                      viewPoint.worldSeed());
+                                                                            viewPoint.worldSeed());
                        return replacement.isSelf() ? center : replacement;
                    }
-                    PipelineBiome replacement = replaceDefault.get(noiseSampler, viewPoint.worldX(), viewPoint.worldZ(), viewPoint.worldSeed());
+                    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.
@@ -34,7 +34,7 @@ public class SmoothStage implements Stage {
        
        boolean vert = Objects.equals(top, bottom);
        boolean horiz = Objects.equals(left, right);
-    
+        
        if(vert && horiz) {
            return roll > 0 ?
                   roll > 0.25 ? left : right :
@@ -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;
@@ -81,13 +80,13 @@ public class BiomePipelineProvider implements BiomeProvider {
    public Biome getBiome(int x, int z, long seed) {
        x += mutator.noise(seed + 1, x, z) * noiseAmp;
        z += mutator.noise(seed + 2, x, z) * noiseAmp;
-
-
+        
+        
        x /= resolution;
        z /= resolution;
-
-        int fdX = FastMath.floorDiv(x, pipeline.getSize());
-        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
+        
+        int fdX = Math.floorDiv(x, pipeline.getSize());
+        int fdZ = Math.floorDiv(z, pipeline.getSize());
        return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
                                                                          z - fdZ * pipeline.getSize()).getBiome();
    }
@@ -120,7 +119,7 @@ public class BiomePipelineProvider implements BiomeProvider {
            }
            return false;
        }
-
+        
        @Override
        public int hashCode() {
            int code = x;
@@ -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,10 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.api.delegate;

+import com.dfsek.terra.api.world.biome.Biome;
+
 import java.util.HashSet;
 import java.util.Set;

-import com.dfsek.terra.api.world.biome.Biome;
-

 final class EphemeralBiomeDelegate implements BiomeDelegate {
    private final Set<String> tags;
@@ -10,7 +10,7 @@ final class SelfDelegate implements BiomeDelegate {
    public static final SelfDelegate INSTANCE = new SelfDelegate();
    
    private SelfDelegate() {
-
+    
    }
    
    @Override
@@ -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.
@@ -33,12 +33,12 @@ public class BiomeQueryAPIAddon implements AddonInitializer {
                            .getPack()
                            .getRegistry(Biome.class)
                            .entries();
-            
+                    
                    BiomeTagFlattener flattener = new BiomeTagFlattener(biomes
                                                                                .stream()
                                                                                .flatMap(biome -> biome.getTags().stream())
                                                                                .toList());
-            
+                    
                    biomes.forEach(biome -> biome.getContext().put(BIOME_TAG_KEY, new BiomeTagHolder(biome, flattener)));
                })
                .global();
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.world.biome.Biome;

 public final class BiomeQueries {
    private BiomeQueries() {
-
+    
    }
    
    public static Predicate<Biome> has(String tag) {
@@ -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.
@@ -47,7 +47,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer {
                    
                    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);
                    
@@ -68,10 +68,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());
                    }
@@ -12,7 +12,7 @@ public class ThreadLocalNoiseHolder {
        if(holder.init && holder.y == y && holder.z == z && holder.x == x && holder.seed == seed) {
            return holder.noise;
        }
-
+        
        double noise = sampler.noise(seed, x, y, z);
        holder.noise = noise;
        holder.x = x;
@@ -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.
@@ -12,41 +12,37 @@ import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 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;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;

+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+

 public class BiomePaletteTemplate implements ObjectTemplate<BiomePaletteInfo> {
    private final Platform platform;
-    
+    private final SlantHolder.CalculationMethod 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,13 +52,10 @@ 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, 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,14 @@
 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.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.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigPack;
@@ -133,8 +132,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
        
        BiomePaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
        
-        int fdX = FastMath.floorMod(x, 16);
-        int fdZ = FastMath.floorMod(z, 16);
+        int fdX = Math.floorMod(x, 16);
+        int fdZ = Math.floorMod(z, 16);
        
        Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
        double noise = sampler.sample(fdX, y, fdZ);
@@ -155,6 +154,16 @@ 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);
+        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() {
        return samplerCache;
    }
@@ -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.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.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;

@@ -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,8 +144,8 @@ 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,
-                                                                                                                          3)].trilerp(
+        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);
    }
    
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Astrash	571937f853	Reformat YAML files	2023-11-10 10:11:56 +11:00
Astrash	05035edd2d	Remove trailing whitespace in YAML formatting	2023-11-10 10:11:46 +11:00
Zoë Gidiere	a117db40be	change formatting	2023-11-09 12:47:48 -07:00
Zoë Gidiere	72e0974cc5	fix cli build	2023-11-09 11:40:19 -07:00
Zoë Gidiere	d8938c5519	remove comments	2023-11-09 11:37:46 -07:00
Zoë Gidiere	acf79f5c53	change class structure of LifecycleEntryPoint	2023-11-09 11:37:01 -07:00
Zoë Gidiere	839bc23a5a	add stub for not physics	2023-11-09 11:29:09 -07:00
Zoë Gidiere	852cf0321b	Merge remote-tracking branch 'origin/ver/6.4.0' into ver/6.4.0	2023-11-08 21:59:14 -07:00
Zoë Gidiere	89d497d500	Some requested changes	2023-11-08 21:58:57 -07:00
Zoë Gidiere	0df940d688	improve invSqrt formatting Co-authored-by: solonovamax <solonovamax@12oclockpoint.com> what the fuck?	2023-11-08 21:20:01 -07:00
Zoë Gidiere	dd7bebb27f	Update lerp usage and docs	2023-11-08 21:18:35 -07:00
solonovamax	72649d5cf7	Merge remote-tracking branch 'upstream/ver/6.4.0' into ver/6.4.0	2023-11-08 22:42:23 -05:00
solonovamax	7cf87de463	Add TODO to replace FoliaLib when we drop support for 1.18 and 1.19 Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>	2023-11-08 22:42:14 -05:00
Zoë Gidiere	020033f839	add rsqrt ts function	2023-11-08 19:53:36 -07:00
Zoë Gidiere	b3ef4ac79c	optimized tan	2023-11-08 19:52:05 -07:00
solonovamax	3f9f2bdce4	Use kotlin's Path extensions rather than Files.whatever Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>	2023-11-08 20:38:25 -05:00
Zoë Gidiere	0ab463f34f	bukkit clean up	2023-11-05 21:07:25 -07:00
Zoë Gidiere	0b1d67b533	Actually fix issue	2023-11-05 20:51:28 -07:00
Zoë Gidiere	c4f665ffc5	fix format error	2023-11-05 20:13:04 -07:00
Zoë Gidiere	c00753b0fc	let reformat have another go at it	2023-11-05 20:12:57 -07:00
Zoë Gidiere	77812545df	Fix stupid build error and a couple gradle warnings thank you gradle .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() } is clearly better than .capitalize()	2023-11-05 20:07:13 -07:00
Zoë Gidiere	ad9bc7f67c	fix format error	2023-11-02 18:47:45 -06:00
Zoë Gidiere	81a96d6b76	Reformat code	2023-11-02 18:47:36 -06:00
Zoë Gidiere	d696e4fd24	Optimize imports	2023-11-02 18:45:13 -06:00
Zoë Gidiere	c98d39c5d7	Update licence year	2023-11-02 18:42:51 -06:00
Zoë	a6fe268f79	Merge pull request #422 from PolyhedralDev/dev/image-caching Improve image caching	2023-11-03 00:10:52 +00:00
Zoë	648da95e7d	Scattered ore (#424 ) * Scattered Ore Impl * remove break * remove another break * sphereCount -> blockCount --------- Co-authored-by: Astrash <astrash@protonmail.com>	2023-10-29 17:33:50 -06:00
Zoë Gidiere	5829112a74	Merge branch 'ver/6.4.0' into dev/image-caching	2023-10-26 12:56:17 -06:00
Zoë Gidiere	c41bf55b7b	implement missing methods from last comit	2023-10-26 12:53:55 -06:00
Zoë Gidiere	5d12a560f1	add zero and unit vectors	2023-10-26 11:08:36 -06:00
Zoë Gidiere	6f08908bb4	merge ovre-v2 into ore(v1)	2023-10-26 10:43:13 -06:00
Zoë Gidiere	9292d3de17	Remove FastMath hotspot has intrinsics for almost everything we use it for	2023-10-26 10:37:25 -06:00
Astrash	0149a29b04	Load correct path	2023-10-24 14:08:56 +11:00
Astrash	cd8605850f	Replace unload-on-timeout with timeout > 0	2023-10-24 13:47:25 +11:00
Astrash	148b8dfe35	Bump image lib patch version	2023-10-24 13:34:10 +11:00
Astrash	3f485b1825	Add to unload on timeout description	2023-10-24 13:30:09 +11:00
Astrash	cb6ecff113	Remove sout	2023-10-24 13:29:53 +11:00
Astrash	e30bcbf1ba	Improve image caching options	2023-10-24 13:26:35 +11:00
Astrash	805f99f57a	Make ore algorithm readable	2023-10-20 10:55:23 +11:00
Astrash	4e5b02ef42	Pass correct coords for ore block checks	2023-10-20 10:30:25 +11:00
Astrash	e80e998cec	Only log warnings with debug logging	2023-10-20 10:03:04 +11:00
Zoë	fde29220af	Merge pull request #419 from PolyhedralDev/dev/disable-quilt Dev/disable quilt	2023-10-19 17:31:40 +00:00
Zoë Gidiere	d3a9b57872	disable quilt	2023-10-18 19:53:59 -06:00
Zoë	4671ec5bd3	Merge pull request #417 from PolyhedralDev/dev/folia Dev/folia	2023-10-19 01:18:45 +00:00
Zoë	9f4a8e06e1	Update DependencyConfig.kt	2023-10-17 21:00:28 -06:00
Zoë	c8f2871aaa	Update build.gradle.kts	2023-10-17 20:59:27 -06:00
Zoë	4a537a56aa	Merge pull request #415 from PolyhedralDev/dev/ore-v2 Add updated ore-v2	2023-10-18 00:33:15 +00:00
Zoë	4917160123	Update README.md	2023-10-17 18:32:00 -06:00
Zoë	b3f80dcb64	Merge pull request #410 from PolyhedralDev/dev/1.20.2 1.20.2 + update libs	2023-10-15 19:45:43 +00:00
Zoë Gidiere	d49b9ccad5	Merge branch 'dev/1.20.2' into dev/folia	2023-10-14 16:02:54 -06:00
Zoë Gidiere	a8387ce419	Merge remote-tracking branch 'origin/ver/6.4.0' into dev/1.20.2	2023-10-14 16:02:40 -06:00
Zoë Gidiere	94854f2bdb	update versions	2023-10-14 15:55:43 -06:00
Astrashh	47f531089e	Add slant locator (#413 ) * Add slant locator addon * Bump slant locator noise3d dependency version * Fix slant locator dependency version range * Actually fix slant locator dependency version range	2023-10-10 00:35:47 +00:00
Astrashh	abd83e8278	Add number predicate addon (#412 )	2023-10-10 00:35:26 +00:00
Astrash	b5e7c7c112	Fix TOP locator	2023-10-10 09:44:53 +11:00
Zoë Gidiere	d71f7d4c36	clarify value and change default	2023-10-03 21:03:44 -06:00
Zoë Gidiere	84898a7a6b	fixes	2023-10-03 20:03:46 -06:00
Zoë Gidiere	0c1a6efc72	refractor classes	2023-10-03 19:42:15 -06:00
Zoë Gidiere	200281f140	dep orev1	2023-10-03 11:58:32 -06:00
Zoë Gidiere	f1ea8074de	config-ore-v2	2023-10-03 11:54:18 -06:00
Astrash	f896a9a278	Bump noise3d addon minor version	2023-10-03 11:01:50 +11:00
Astrash	79b3b34669	Add slant API for noise3d	2023-10-03 09:51:39 +11:00
Zoë Gidiere	ce2b964ce3	Merge branch 'dev/1.20.2' into dev/folia	2023-10-02 01:38:24 -06:00
Zoë Gidiere	0ee5f49972	quilt	2023-10-02 01:38:01 -06:00
Zoë Gidiere	3bc10cdb6a	Merge branch 'dev/1.20.2' into dev/folia	2023-10-02 00:42:11 -06:00
Zoë Gidiere	86ba52850d	update strata	2023-10-02 00:41:54 -06:00
Zoë Gidiere	27eebf6a47	Folia support Co-authored-by: Janet Blackquill <uhhadd@gmail.com>	2023-10-02 00:23:19 -06:00
Zoë Gidiere	2d2bba20b6	found an untrue in read me	2023-10-01 23:22:44 -06:00
Zoë Gidiere	eb3994005c	fix me being fucking stupid	2023-10-01 22:46:41 -06:00
Zoë Gidiere	0a7cdb82a3	update deps + 1.20.2	2023-10-01 22:18:54 -06:00
Zoë	158deaa971	Merge pull request #408 from PolyhedralDev/dev/physics Allows you to create a block with physics enabled	2023-10-01 19:07:15 -06:00
Astrash	e51e025e9c	Implement cubic spline sampler	2023-10-02 11:14:43 +11:00
Zoë Gidiere	8e0d64dccd	Make bukkit work	2023-09-30 10:49:28 -06:00
Zoë Gidiere	23f47de10a	fix pack loading error	2023-09-29 23:35:17 -06:00
Zoë Gidiere	89651597c2	default to info logging	2023-09-29 23:32:40 -06:00
Zoë	5c0c833b70	Update LifecycleEntryPoint.java	2023-09-29 23:09:41 -06:00
Zoë Gidiere	33d654dc8e	impl fabric	2023-09-29 23:05:05 -06:00
Zoë Gidiere	f0c602d7e7	implement physics on the api side we will see if platform changes are needed	2023-09-29 22:10:03 -06:00
Zoë Gidiere	0e37a839fe	We do a little commonifying	2023-09-29 21:44:12 -06:00
Astrash	3f9ead0d66	Remove repeated code in cellular sampler	2023-09-27 13:39:51 +10:00
David W	5eeb5af6c4	Add cell center offset return to CELLULAR sampler (#407 ) * Add offset lookup return to cellular sampler * bump noise function plugin version * revert version to 1.1.0 * rename OffsetNoiseLookup, switch axis orientation * rename return type aswell in cellcampler	2023-09-21 22:23:49 +00:00
Astrash	81e354f91c	Use tectonic properly	2023-07-18 22:06:08 +10:00
Astrash	aab28ff4f9	Bump version to 6.4.0	2023-07-18 14:32:12 +10:00
Astrash	0e3a756011	Bump config-noise-function to v1.1.0	2023-07-18 14:29:54 +10:00
Astrash	02198e1b88	Implement distance sampler	2023-07-18 14:29:28 +10:00
Astrash	00aeb98419	Implement translation sampler	2023-07-18 14:27:36 +10:00
Astrash	1a784b51ac	Implement expression normalizer sampler	2023-07-18 14:25:07 +10:00
Astrash	34c0895c1f	Make metalist injection error more user friendly	2023-07-16 22:46:23 +10:00
Astrash	379fa601a3	Meta annotate LINEAR_HEIGHTMAP sampler	2023-07-16 17:04:51 +10:00
Astrash	fcbf51d80b	Allow Range keys to be meta annotated	2023-07-16 11:51:51 +10:00
Astrash	9d83dfd164	Bump version to 6.3.2	2023-07-16 11:49:14 +10:00
Astrashh	72686601ee	Merge pull request #406 from PolyhedralDev/ver/6.3.1 Ver/6.3.1	2023-07-15 07:04:10 +10:00
Astrash	73baaec6cd	Bump version to 6.3.1	2023-07-11 09:33:57 +10:00
Astrashh	0be7213ee5	Merge pull request #401 from PolyhedralDev/dev/reduce-pipeline-caching Reduce pipeline v2 caching	2023-06-20 10:10:35 +10:00
Astrash	3f3e2fe97c	Reduce pipeline v2 caching	2023-06-20 09:57:43 +10:00