use Ranges

.editorconfig

@@ -577,14 +577,14 @@ ij_properties_keep_blank_lines = false
 ij_properties_key_value_delimiter = equals
 ij_properties_spaces_around_key_value_delimiter = false
 
-[{*.yml, *.yaml}]
+[{*.yaml, *.yml}]
 indent_size = 2
 ij_visual_guides = none
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false
 ij_yaml_indent_sequence_value = true
-ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_indents_on_empty_lines = true
 ij_yaml_keep_line_breaks = true
 ij_yaml_sequence_on_new_line = false
 ij_yaml_space_before_colon = false

.github/ISSUE_TEMPLATE/BUG_REPORT.md

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

LICENSE

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

README.md

@@ -47,7 +47,14 @@ JARs are produced in `platforms/<platform>/build/libs`.
 To run Minecraft with Terra in the IDE (for testing) use the following tasks:
 
 * Bukkit
-    * `runServer` - Run the Paper test server with Terra installed.
+    * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test
+      server. (Only needs to be run once).
+    * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur)
+      test server. (Only needs to be run once).
+    * `runPaper` - Run the Paper test server with Terra (`installPaper` must
+      have been run previously).
+    * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must
+      have been run previously).
 * Fabric
     * `runClient` - Run a Minecraft Fabric client with Terra installed.
     * `runServer` - Run a Minecraft Fabric server with Terra installed.

build.gradle.kts

@@ -7,32 +7,32 @@ 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"))

buildSrc/build.gradle.kts

@@ -3,6 +3,15 @@ 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()
@@ -15,12 +24,11 @@ repositories {
 }
 
 dependencies {
-    //TODO Allow pulling from Versions.kt
-    implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.6")
-
-    implementation("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")
+    implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
+    
+    implementation("org.ow2.asm:asm:9.3")
+    implementation("org.ow2.asm:asm-tree:9.3")
+    implementation("com.dfsek.tectonic:common:4.2.0")
+    implementation("org.yaml:snakeyaml:1.27")
 }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -48,9 +48,6 @@ fun Project.configureDependencies() {
         maven("https://jitpack.io") {
             name = "JitPack"
         }
-        maven("https://nexuslite.gcnt.net/repos/other/") {
-            name = "GCNT"
-        }
     }
     
     dependencies {
@@ -61,4 +58,4 @@ fun Project.configureDependencies() {
         compileOnly("com.google.guava:guava:30.0-jre")
         testImplementation("com.google.guava:guava:30.0-jre")
     }
-}
+}

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -3,11 +3,13 @@ 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
@@ -15,10 +17,6 @@ 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() {
@@ -49,28 +47,19 @@ fun Project.configureDistribution() {
             // https://github.com/johnrengelman/shadow/issues/111
             val dest = URI.create("jar:" + tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toURI())
             
-            val provider = try {
-                FileSystems.getFileSystem(dest)
-            } catch (e: FileSystemNotFoundException) {
-                null
-            } ?: FileSystems.newFileSystem(dest, mapOf("create" to "false"), null)
-            provider?.use { fs ->
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
                 forSubProjects(":common:addons") {
-                    if (fs.isOpen) {
-                        val jar = getJarTask()
-                        
-                        if (jar.archiveFile.get().asFile.exists()) {
-                            println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-                            
-                            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-                            val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
-                            
-                            if (!addonPath.exists()) {
-                                addonPath.parent.createDirectories()
-                                addonPath.createFile()
-                                jar.archiveFile.get().asFile.toPath().copyTo(addonPath, overwrite = true)
-                            }
-                        }
+                    val jar = getJarTask()
+                    
+                    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)
                     }
                     
                 }
@@ -100,8 +89,7 @@ fun Project.configureDistribution() {
                 val jar = getJarTask().archiveFileName.get()
                 resources.computeIfAbsent(
                     if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
-                    else "addons"
-                                         ) { ArrayList() }.add(jar)
+                    else "addons") { ArrayList() }.add(jar)
             }
             
             val options = DumperOptions()
@@ -122,7 +110,7 @@ fun Project.configureDistribution() {
             FileWriter(manifest).use {
                 yaml.dump(resources, it)
             }
-            
+
         }
     }
     
@@ -138,7 +126,7 @@ fun Project.configureDistribution() {
         dependsOn(downloadDefaultPacks)
         configurations = listOf(project.configurations["shaded"])
         archiveClassifier.set("shaded")
-        version = project.version
+        setVersion(project.version)
         relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
         relocate("org.objectweb.asm", "com.dfsek.terra.lib.asm")
         relocate("com.dfsek.paralithic", "com.dfsek.terra.lib.paralithic")

buildSrc/src/main/kotlin/Versions.kt

@@ -1,71 +1,68 @@
 object Versions {
     object Libraries {
-        const val tectonic = "4.2.1"
-        const val paralithic = "0.7.1"
-        const val strata = "1.3.2"
+        const val tectonic = "4.2.0"
+        const val paralithic = "0.7.0"
+        const val strata = "1.1.1"
         
-        const val cloud = "1.8.4"
+        const val cloud = "1.8.0"
         
-        const val slf4j = "2.0.9"
-        const val log4j_slf4j_impl = "2.20.0"
+        const val slf4j = "1.7.36"
+        const val log4j_slf4j_impl = "2.14.1"
         
         object Internal {
-            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"
+            const val apacheText = "1.9"
+            const val jafama = "2.3.2"
+            const val apacheIO = "2.6"
+            const val fastutil = "8.5.6"
         }
     }
     
     object Fabric {
-        const val fabricAPI = "0.90.0+${Mod.minecraft}"
+        const val fabricLoader = "0.14.8"
+        const val fabricAPI = "0.83.1+1.20.1"
+    }
+    
+    object Quilt {
+        const val quiltLoader = "0.17.0"
+        const val fabricApi = "6.0.0-beta.3+0.76.0-1.19.4"
     }
-//
-//    object Quilt {
-//        const val quiltLoader = "0.20.2"
-//        const val fabricApi = "7.3.1+0.89.3-1.20.1"
-//    }
     
     object Mod {
-        const val mixin = "0.12.5+mixin.0.8.5"
+        const val mixin = "0.11.2+mixin.0.8.5"
         
-        const val minecraft = "1.20.2"
-        const val yarn = "$minecraft+build.4"
-        const val fabricLoader = "0.14.23"
+        const val minecraft = "1.20.1"
+        const val yarn = "$minecraft+build.2"
+        const val fabricLoader = "0.14.21"
         
-        const val architecuryLoom = "1.3.357"
-        const val architecturyPlugin = "3.4.146"
+        const val architecuryLoom = "0.12.0.290"
+        const val architecturyPlugin = "3.4-SNAPSHOT"
         
-        const val loomVineflower = "1.11.0"
+        const val loomQuiltflower = "1.7.1"
     }
     
     object Forge {
-        const val forge = "${Mod.minecraft}-48.0.13"
-        const val burningwave = "12.63.0"
+        const val forge = "${Mod.minecraft}-47.0.3"
+        const val burningwave = "12.53.0"
     }
     
     object Bukkit {
         const val paper = "1.18.2-R0.1-SNAPSHOT"
         const val paperLib = "1.0.5"
-        const val foliaLib = "0.2.5"
-        const val minecraft = "1.20.2"
+        const val minecraft = "1.20.1"
         const val reflectionRemapper = "0.1.0-SNAPSHOT"
-        const val paperDevBundle = "1.20.2-R0.1-SNAPSHOT"
-        const val runPaper = "2.2.0"
-        const val paperWeight = "1.5.6"
+        const val paperDevBundle = "1.20.1-R0.1-SNAPSHOT"
+    }
+    
+    object Sponge {
+        const val sponge = "9.0.0-SNAPSHOT"
+        const val mixin = "0.8.2"
+        const val minecraft = "1.17.1"
     }
     
-    //
-//    object Sponge {
-//        const val sponge = "9.0.0-SNAPSHOT"
-//        const val mixin = "0.8.2"
-//        const val minecraft = "1.17.1"
-//    }
-//
     object CLI {
         const val nbt = "6.1"
-        const val logback = "1.4.11"
+        const val logback = "1.2.9"
+        const val commonsIO = "2.7"
+        const val guava = "31.0.1-jre"
     }
 }

common/addons/api-addon-loader/LICENSE

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -2,6 +2,8 @@ package com.dfsek.terra.addons.biome.extrusion;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.extrusion.config.BiomeExtrusionTemplate;
@@ -21,8 +23,6 @@ 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<>() {

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -9,8 +9,8 @@ package com.dfsek.terra.addons.biome.image.v2;
 
 import java.util.Optional;
 
-import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -58,19 +58,15 @@ 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();

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
+import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 

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

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

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

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

common/addons/biome-provider-image/LICENSE

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.biome.image;
 
+import net.jafama.FastMath;
+
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.util.HashMap;
@@ -32,7 +34,7 @@ public class ImageBiomeProvider implements BiomeProvider {
     }
     
     private static int distance(Color a, Color b) {
-        return Math.abs(a.getRed() - b.getRed()) + Math.abs(a.getGreen() - b.getGreen()) + Math.abs(a.getBlue() - b.getBlue());
+        return FastMath.abs(a.getRed() - b.getRed()) + FastMath.abs(a.getGreen() - b.getGreen()) + FastMath.abs(a.getBlue() - b.getBlue());
     }
     
     @Override
@@ -68,14 +70,14 @@ public class ImageBiomeProvider implements BiomeProvider {
         CENTER {
             @Override
             public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(Math.floorMod(x - image.getWidth() / 2, image.getWidth()),
-                                              Math.floorMod(z - image.getHeight() / 2, image.getHeight())));
+                return new Color(image.getRGB(FastMath.floorMod(x - image.getWidth() / 2, image.getWidth()),
+                                              FastMath.floorMod(z - image.getHeight() / 2, image.getHeight())));
             }
         },
         NONE {
             @Override
             public Color getColor(BufferedImage image, int x, int z) {
-                return new Color(image.getRGB(Math.floorMod(x, image.getWidth()), Math.floorMod(z, image.getHeight())));
+                return new Color(image.getRGB(FastMath.floorMod(x, image.getWidth()), FastMath.floorMod(z, image.getHeight())));
             }
         };
         

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -27,9 +27,11 @@ 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;
     
@@ -48,9 +50,6 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
                                               () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
                 })
                 .failThrough();
-        if(platform.getTerraConfig().isDebugLog())
-            logger.warn(
-                    "The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the " +
-                    "biome-provider-image-v2 addon for future pack development instead.");
+        logger.warn("The biome-provider-image addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the biome-provider-image-v2 addon for future pack development instead.");
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -11,9 +11,6 @@ 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;
@@ -23,6 +20,9 @@ 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;

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

@@ -1,7 +1,13 @@
 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;
@@ -9,11 +15,6 @@ 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;
@@ -38,7 +39,7 @@ public class PipelineBiomeProvider implements BiomeProvider {
         this.biomeChunkCache = Caffeine.newBuilder()
                                        .maximumSize(64)
                                        .build(pipeline::generateChunk);
-        
+    
         Set<PipelineBiome> biomeSet = new HashSet<>();
         pipeline.getSource().getBiomes().forEach(biomeSet::add);
         Iterable<PipelineBiome> result = biomeSet;
@@ -49,7 +50,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))
@@ -60,8 +61,7 @@ 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 = Math.floorDiv(x, chunkSize);
-        int chunkZ = Math.floorDiv(z, chunkSize);
+        int chunkX = FastMath.floorDiv(x, chunkSize);
+        int chunkZ = FastMath.floorDiv(z, chunkSize);
         
         int chunkWorldX = chunkX * chunkSize;
         int chunkWorldZ = chunkZ * chunkSize;

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 /**

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.api;
 
-import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.v2.pipeline.BiomeChunkImpl.ViewPoint;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
 
 
 public interface Stage {

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

@@ -7,6 +7,8 @@ import com.dfsek.terra.api.world.biome.Biome;
 
 
 public interface PipelineBiome extends StringIdentifiable {
+    Biome getBiome();
+    
     static PipelineBiome placeholder(String id) {
         return new PlaceholderPipelineBiome(id);
     }
@@ -19,8 +21,6 @@ public interface PipelineBiome extends StringIdentifiable {
         return SelfPipelineBiome.INSTANCE;
     }
     
-    Biome getBiome();
-    
     Set<String> getTags();
     
     default boolean isPlaceholder() {

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

@@ -10,7 +10,7 @@ final class SelfPipelineBiome implements PipelineBiome {
     public static final SelfPipelineBiome INSTANCE = new SelfPipelineBiome();
     
     private SelfPipelineBiome() {
-    
+
     }
     
     @Override

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -15,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,20 +33,24 @@ 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() {

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.expander;
 
-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.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.expander.FractalExpander;
 
 

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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;

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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;

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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;

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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;

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.v2.config.stage.mutator;
 
-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.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.stage.mutators.SmoothStage;
 
 

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

@@ -1,20 +1,21 @@
 package com.dfsek.terra.addons.biome.pipeline.v2.pipeline;
 
-import java.util.List;
-
 import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import net.jafama.FastMath;
+
+import java.util.List;
 
 
 public class BiomeChunkImpl implements BiomeChunk {
     
+    private PipelineBiome[][] biomes;
     private final SeededVector worldOrigin;
     private final int chunkOriginArrayIndex;
     private final int worldCoordinateScale;
-    private PipelineBiome[][] biomes;
     
     public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) {
         
@@ -43,8 +44,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][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex),
-                                                                  zIndexToWorldCoordinate(zIndex));
+                biomes[xIndex][zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex), zIndexToWorldCoordinate(zIndex));
             }
         }
         
@@ -80,6 +80,21 @@ 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++) {
@@ -96,15 +111,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 (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+        return FastMath.ceilToInt((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
     }
     
     private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {
         int gridOrigin = 0;
         int expansionsApplied = 0;
         int gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
-        for(Stage stage : stages) {
-            if(stage instanceof Expander) {
+        for (Stage stage : stages) {
+            if (stage instanceof Expander) {
                 expansionsApplied++;
                 gridInterval = calculateGridInterval(totalExpanderCount, expansionsApplied);
             }
@@ -129,21 +144,6 @@ 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,8 +161,7 @@ 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;

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

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

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

@@ -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.Source;
 import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.v2.api.Source;
 
 
 public class SingleSource implements Source {

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

@@ -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);
         }
     }

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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,11 +68,10 @@ 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;
                 }
             }

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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 :

common/addons/biome-provider-pipeline/LICENSE

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -41,13 +41,15 @@ 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;
     
@@ -88,9 +90,6 @@ public class BiomePipelineAddon implements AddonInitializer {
                     event.getPack().applyLoader(BiomeDelegate.class, new BiomeDelegateLoader(biomeRegistry));
                 });
         
-        if(platform.getTerraConfig().isDebugLog())
-            logger.warn(
-                    "The biome-provider-pipeline addon is deprecated and scheduled for removal in Terra 7.0. It is recommended to use the" +
-                    " biome-provider-pipeline-v2 addon for future pack development instead.");
+        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.");
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -9,6 +9,7 @@ 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;
@@ -80,13 +81,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 = Math.floorDiv(x, pipeline.getSize());
-        int fdZ = Math.floorDiv(z, pipeline.getSize());
+
+        int fdX = FastMath.floorDiv(x, pipeline.getSize());
+        int fdZ = FastMath.floorDiv(z, pipeline.getSize());
         return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
                                                                           z - fdZ * pipeline.getSize()).getBiome();
     }
@@ -119,7 +120,7 @@ public class BiomePipelineProvider implements BiomeProvider {
             }
             return false;
         }
-        
+
         @Override
         public int hashCode() {
             int code = x;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

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

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

@@ -10,7 +10,7 @@ final class SelfDelegate implements BiomeDelegate {
     public static final SelfDelegate INSTANCE = new SelfDelegate();
     
     private SelfDelegate() {
-    
+
     }
     
     @Override

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

common/addons/biome-provider-single/LICENSE

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.

common/addons/biome-query-api/src/main/java/com/dfsek/terra/addons/biome/query/BiomeQueryAPIAddon.java

@@ -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();

common/addons/biome-query-api/src/main/java/com/dfsek/terra/addons/biome/query/api/BiomeQueries.java

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

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

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

common/addons/chunk-generator-noise-3d/build.gradle.kts

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -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,13 +68,10 @@ 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());
                     }

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

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

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -12,37 +12,41 @@ import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
+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.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
@@ -52,10 +56,13 @@ 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;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -8,14 +8,15 @@
 package com.dfsek.terra.addons.chunkgenerator.generation;
 
 
+import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
+import com.dfsek.terra.addons.chunkgenerator.palette.BiomePaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.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;
@@ -132,8 +133,8 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         
         BiomePaletteInfo paletteInfo = biome.getContext().get(paletteInfoPropertyKey);
         
-        int fdX = Math.floorMod(x, 16);
-        int fdZ = Math.floorMod(z, 16);
+        int fdX = FastMath.floorMod(x, 16);
+        int fdZ = FastMath.floorMod(z, 16);
         
         Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo, 0);
         double noise = sampler.sample(fdX, y, fdZ);
@@ -154,16 +155,6 @@ 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;
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,8 +7,8 @@
 
 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.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.slant.SlantHolder;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 

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-2023 Polyhedral Development
+ * Copyright (c) 2020-2021 Polyhedral Development
  *
  * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
  * reference the LICENSE file in this module's root directory.
@@ -7,6 +7,8 @@
 
 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;
@@ -132,7 +134,7 @@ public class ChunkInterpolator {
     }
     
     private static int reRange(int value, int high) {
-        return Math.max(Math.min(value, high), 0);
+        return FastMath.max(FastMath.min(value, high), 0);
     }
     
     /**
@@ -144,8 +146,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)][(Math.max(Math.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
-                                                                                                                  3)].trilerp(
+        return interpGrid[reRange(((int) x) / 4, 3)][(FastMath.max(FastMath.min(((int) y), max), min) - min) / 4][reRange(((int) z) / 4,
+                                                                                                                          3)].trilerp(
                 (x % 4) / 4, (y % 4) / 4, (z % 4) / 4);
     }