Merge pull request #318 from PolyhedralDev/dev/1.19

Update to 1.19

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -21,8 +21,8 @@ assignees: ""
     - You must be on the LATEST version of Terra to receive any support. There is no support for older versions of Terra.
     - Make sure that this is not a *specific* compatibility issue with another terrain generation mod.
         Do not request *specific* compatibility with mods or plugins (e.g. "Compatibility with TechCraft v7").
-        That should be implemented in an addon, **not** in the platform project.
-        *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from parent biomes") will be considered in the platform project.
+        That should be implemented in an addon, **not** in the main project.
+        *General* compatibility (e.g. "Ability to pull Vanilla/Modded features from parent biomes") will be considered in the main project.
     - Make sure that there are no already existing issues open with your problem. If you open a duplicate, it will be closed as such.
     - Make sure that it is actually Terra causing the issue, and not another mod/plugin.
         You can do this by testing to see if you can recreate the issue without Terra installed.

.github/PULL_REQUEST_TEMPLATE.md

@@ -72,19 +72,15 @@
 
 - [ ] Bug Fix <!-- Anything which fixes an issue in Terra. -->
 - [ ] Build system <!-- Anything which pretain to the build system. -->
-- [ ] 
-  Documentation <!-- Anything which adds or improves documentation for existing features. -->
+- [ ] Documentation <!-- Anything which adds or improves documentation for existing features. -->
 - [ ] New Feature <!-- Anything which adds new functionality to Terra. -->
 - [ ] Performance <!-- Anything which is imrpoves the performance of Terra. -->
-- [ ] 
-  Refactoring <!-- Anything which does not add any new code, only moves code around. -->
-- [ ] 
-  Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
+- [ ] Refactoring <!-- Anything which does not add any new code, only moves code around. -->
+- [ ] Repository <!-- Anything which affects the repository. Eg. changes to the `README.md` file. -->
 - [ ] Revert <!-- Anything which reverts previous commits. -->
 - [ ] Style <!-- Anything which updates style. -->
 - [ ] Tests <!-- Anything which adds or updates tests. -->
-- [ ] 
-  Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
+- [ ] Translation <!-- Anything which is internationalizing the Terra program to other languages. -->
 
 #### Compatiblity
 
@@ -119,4 +115,4 @@
     <!--
         If it only introduces small changes, you don't need to add tests.
         But if you add big changes, you should probably at least write *some* testing, where applicable.
-    -->
+    -->

build.gradle.kts

@@ -1,8 +1,8 @@
 preRelease(true)
 
-versionProjects(":common:api", version("6.0.0"))
-versionProjects(":common:implementation", version("6.0.0"))
-versionProjects(":platforms", version("6.0.0"))
+versionProjects(":common:api", version("6.1.0"))
+versionProjects(":common:implementation", version("6.1.0"))
+versionProjects(":platforms", version("6.1.0"))
 
 
 allprojects {
@@ -39,14 +39,18 @@ allprojects {
 }
 
 afterEvaluate {
-    forSubProjects(":platforms") {
+    forImmediateSubProjects(":platforms") {
         configureDistribution()
     }
     forSubProjects(":common:addons") {
+        apply(plugin = "com.github.johnrengelman.shadow")
+        
+        tasks.named("build") {
+            finalizedBy(tasks.named("shadowJar"))
+        }
+        
         dependencies {
             "compileOnly"(project(":common:api"))
-            "shadedImplementation"("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-            "testImplementation"("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
             "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()
@@ -11,8 +20,8 @@ repositories {
 
 dependencies {
     implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:+")
-    implementation("org.ow2.asm:asm:9.2")
-    implementation("org.ow2.asm:asm-tree:9.2")
+    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/AddonConfig.kt

@@ -3,7 +3,6 @@ import java.io.File
 import java.util.function.Predicate
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.extra
 import kotlin.streams.asStream
 
@@ -12,31 +11,33 @@ import kotlin.streams.asStream
  * Configures a directory where addons will be put.
  */
 fun Project.addonDir(dir: File, task: Task) {
-    task.doFirst {
-        dir.parentFile.mkdirs()
-        matchingAddons(dir) {
-            it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
-        }.forEach {
-            println("Deleting old addon: " + it.absolutePath)
-            it.delete()
-        }
-        forSubProjects(":common:addons") {
-            val jar = if (tasks.findByName("shadowJar") != null) {
-                (tasks.named("shadowJar").get() as ShadowJar)
-            } else {
-                (tasks.named("jar").get() as Jar)
+    val moveAddons = tasks.register("moveAddons" + task.name) {
+            dependsOn("compileAddons")
+            doLast {
+                dir.parentFile.mkdirs()
+                matchingAddons(dir) {
+                    it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
+                }.forEach {
+                    println("Deleting old addon: " + it.absolutePath)
+                    it.delete()
+                }
+                forSubProjects(":common:addons") {
+                    val jar = tasks.named("shadowJar").get() as ShadowJar
+                    
+                    val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
+                    val target = File(dir, boot + jar.archiveFileName.get())
+                    
+                    val base = "${jar.archiveBaseName.get()}-${version}"
+                    
+                    println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
+                    
+                    jar.archiveFile.orNull?.asFile?.copyTo(target)
+                }
             }
             
-            val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-            val target = File(dir, boot + jar.archiveFileName.get())
-            
-            val base = "${jar.archiveBaseName.get()}-${version}"
-            
-            println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
-            
-            jar.archiveFile.orNull?.asFile?.copyTo(target)
         }
-    }
+    
+    task.dependsOn(moveAddons)
 }
 
 fun matchingAddons(dir: File, matcher: Predicate<File>): Set<File> {

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -3,14 +3,16 @@ import org.gradle.kotlin.dsl.creating
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.getValue
 import org.gradle.kotlin.dsl.getting
+import org.gradle.kotlin.dsl.maven
 import org.gradle.kotlin.dsl.repositories
 
 fun Project.configureDependencies() {
-    val api by configurations.getting
-    val implementation by configurations.getting
     val testImplementation by configurations.getting
     val compileOnly by configurations.getting
     
+    val api by configurations.getting
+    val implementation by configurations.getting
+    
     val shaded by configurations.creating
     
     @Suppress("UNUSED_VARIABLE")
@@ -28,9 +30,10 @@ fun Project.configureDependencies() {
     repositories {
         mavenCentral()
         gradlePluginPortal()
-        maven { url = uri("https://maven.fabricmc.net/") }
-        maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
-        maven { url = uri("https://repo.codemc.org/repository/maven-public") }
+        maven("https://maven.fabricmc.net/")
+        maven("https://repo.codemc.org/repository/maven-public")
+        maven("https://repo.codemc.io/repository/nms/")
+        maven("https://papermc.io/repo/repository/maven-public/")
     }
     
     dependencies {

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -1,23 +1,25 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
 import java.io.FileWriter
 import java.net.URL
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
+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.Task
 import org.gradle.api.plugins.BasePluginExtension
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.creating
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.named
 import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.Yaml
 
+
 fun Project.configureDistribution() {
     apply(plugin = "com.github.johnrengelman.shadow")
     
@@ -30,50 +32,45 @@ fun Project.configureDistribution() {
         }
     }
     
-    val installAddons = tasks.create("installAddons") {
-        group = "terra"
+    val compileAddons = tasks.create("compileAddons") {
         forSubProjects(":common:addons") {
             afterEvaluate {
                 dependsOn(getJarTask())
             }
         }
+    }
+    
+    val installAddons = tasks.create("installAddons") {
+        group = "terra"
+        dependsOn(compileAddons)
         
         doLast {
-            // The addons are copied into a JAR because of a ShadowJar bug
-            // which expands *all* JARs, even resource ones, into the fat JAR.
-            // To get around this, we copy all addon JARs into a *new* JAR,
-            // then, ShadowJar expands the newly created JAR, putting the original
-            // JARs where they should go.
-            //
             // https://github.com/johnrengelman/shadow/issues/111
-            val dest = File(buildDir, "/resources/main/addons.jar")
-            dest.parentFile.mkdirs()
+            val dest = tasks.named<ShadowJar>("shadowJar").get().archiveFile.get().asFile.toPath()
             
-            val zip = ZipOutputStream(FileOutputStream(dest))
-            
-            forSubProjects(":common:addons") {
-                val jar = getJarTask()
-                
-                println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
-                
-                val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
-                
-                val entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}")
-                zip.putNextEntry(entry)
-                FileInputStream(jar.archiveFile.get().asFile).run {
-                    copyTo(zip)
-                    close()
+            FileSystems.newFileSystem(dest, mapOf("create" to "false"), null).use { fs ->
+                forSubProjects(":common:addons") {
+                    val jar = getJarTask()
+                    
+                    println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
+                    
+                    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)
+                    }
+                    
                 }
-                zip.closeEntry()
             }
-            zip.close()
         }
     }
     
     val generateResourceManifest = tasks.create("generateResourceManifest") {
         group = "terra"
         dependsOn(downloadDefaultPacks)
-        dependsOn(installAddons)
         doLast {
             val resources = HashMap<String, MutableList<String>>()
             val packsDir = File("${project.buildDir}/resources/main/packs/")
@@ -118,18 +115,20 @@ fun Project.configureDistribution() {
     
     tasks["processResources"].dependsOn(generateResourceManifest)
     
+    
     tasks.named<ShadowJar>("shadowJar") {
         // Tell shadow to download the packs
         dependsOn(downloadDefaultPacks)
-        
         configurations = listOf(project.configurations["shaded"])
-        
         archiveClassifier.set("shaded")
         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")
         relocate("org.json", "com.dfsek.terra.lib.json")
         relocate("org.yaml", "com.dfsek.terra.lib.yaml")
+        
+        finalizedBy(installAddons)
     }
     
     configure<BasePluginExtension> {
@@ -148,10 +147,4 @@ fun downloadPack(packUrl: URL, project: Project) {
     file.outputStream().write(packUrl.readBytes())
 }
 
-fun Project.getJarTask(): Jar {
-    return if (tasks.findByName("shadowJar") != null) {
-        (tasks.named("shadowJar").get() as ShadowJar)
-    } else {
-        (tasks.named("jar").get() as Jar)
-    }
-}
+fun Project.getJarTask() = tasks.named("shadowJar").get() as ShadowJar

buildSrc/src/main/kotlin/Utils.kt

@@ -29,6 +29,12 @@ fun Project.forSubProjects(project: String, action: Action<Project>) {
     }
 }
 
+fun Project.forImmediateSubProjects(project: String, action: Action<Project>) {
+    project(project).childProjects.forEach {
+        action.execute(it.value)
+    }
+}
+
 fun preRelease(preRelease: Boolean) {
     isPrerelease = preRelease
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,7 +1,7 @@
 object Versions {
     object Libraries {
         const val tectonic = "4.2.0"
-        const val paralithic = "0.6.0"
+        const val paralithic = "0.7.0"
         const val strata = "1.1.1"
         
         const val cloud = "1.6.2"
@@ -13,17 +13,18 @@ object Versions {
             const val apacheText = "1.9"
             const val jafama = "2.3.2"
             const val apacheIO = "2.6"
-            const val asm = "9.2"
             const val fastutil = "8.5.6"
         }
     }
     
     object Fabric {
         const val fabricLoader = "0.14.2"
-        const val fabricAPI = "0.51.1+1.18.2"
-        const val minecraft = "1.18.2"
-        const val yarn = "$minecraft+build.3"
+        const val fabricAPI = "0.55.1+1.19"
+        const val minecraft = "1.19"
+        const val yarn = "$minecraft+build.1"
         const val permissionsAPI = "0.1-SNAPSHOT"
+        const val mixin = "0.11.2+mixin.0.8.5"
+        const val loom = "0.11-SNAPSHOT"
     }
     
     object Bukkit {

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

@@ -0,0 +1,26 @@
+package com.dfsek.terra.addon.loader;
+
+import ca.solostudios.strata.version.Version;
+
+import com.dfsek.terra.api.addon.BaseAddon;
+
+
+public class ApiAddon implements BaseAddon {
+    private final Version version;
+    private final String id;
+    
+    public ApiAddon(Version version, String id) {
+        this.version = version;
+        this.id = id;
+    }
+    
+    @Override
+    public Version getVersion() {
+        return version;
+    }
+    
+    @Override
+    public String getID() {
+        return id;
+    }
+}

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020-2021 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addon.loader;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+
+public class ApiAddonClassLoader extends URLClassLoader {
+    static {
+        ClassLoader.registerAsParallelCapable();
+    }
+    
+    public ApiAddonClassLoader(URL[] urls, ClassLoader parent) {
+        super(urls, parent);
+    }
+}

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

@@ -14,6 +14,7 @@ import java.nio.file.Path;
 import java.util.Collections;
 
 import com.dfsek.terra.api.addon.BaseAddon;
+import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader;
 import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
 
 
@@ -21,7 +22,8 @@ public class ApiAddonLoader implements BootstrapBaseAddon<BaseAddon> {
     private static final Version VERSION = Versions.getVersion(1, 0, 0);
     
     @Override
-    public Iterable<BaseAddon> loadAddons(Path addonsFolder, ClassLoader parent) {
+    public Iterable<BaseAddon> loadAddons(Path addonsFolder, BootstrapAddonClassLoader parent) {
+        
         return Collections.emptySet();
     }
     

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

@@ -1,5 +1,11 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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

@@ -37,7 +37,7 @@ public class ImageBiomeProvider implements BiomeProvider {
     }
     
     @Override
-    public Biome getBiome(int x, int z, long seed) {
+    public Biome getBiome(int x, int y, int z, long seed) {
         x /= resolution;
         z /= resolution;
         Color color = align.getColor(image, x, z);

common/addons/biome-provider-image/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.biome.image.ImageBiomeProviderAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-biome-provider-image/issues
-  source: https://github.com/PolyhedralDev/Terra-biome-provider-image
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

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

@@ -1,5 +1,14 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    implementation("com.github.ben-manes.caffeine:caffeine:3.1.0")
+    
+    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("com.github.benmanes.caffeine", "com.dfsek.terra.addons.biome.pipeline.lib.caffeine")
+    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/BiomePipelineProvider.java

@@ -7,11 +7,9 @@
 
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import net.jafama.FastMath;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.Comparator;
 import java.util.HashSet;
@@ -40,16 +38,9 @@ public class BiomePipelineProvider implements BiomeProvider {
         this.resolution = resolution;
         this.mutator = mutator;
         this.noiseAmp = noiseAmp;
-        holderCache = CacheBuilder.newBuilder()
-                                  .maximumSize(1024)
-                                  .build(
-                                          new CacheLoader<>() {
-                                              @Override
-                                              public BiomeHolder load(@NotNull SeededVector key) {
-                                                  return pipeline.getBiomes(key.x, key.z, key.seed);
-                                              }
-                                          }
-                                        );
+        holderCache = Caffeine.newBuilder()
+                              .maximumSize(1024)
+                              .build(key -> pipeline.getBiomes(key.x, key.z, key.seed));
         this.pipeline = pipeline;
         
         Set<BiomeDelegate> biomeSet = new HashSet<>();
@@ -81,7 +72,7 @@ public class BiomePipelineProvider implements BiomeProvider {
     }
     
     @Override
-    public Biome getBiome(int x, int z, long seed) {
+    public Biome getBiome(int x, int y, int z, long seed) {
         x += mutator.noise(seed + 1, x, z) * noiseAmp;
         z += mutator.noise(seed + 2, x, z) * noiseAmp;
         
@@ -92,7 +83,7 @@ public class BiomePipelineProvider implements BiomeProvider {
         
         int fdX = FastMath.floorDiv(x, pipeline.getSize());
         int fdZ = FastMath.floorDiv(z, pipeline.getSize());
-        return holderCache.getUnchecked(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
+        return holderCache.get(new SeededVector(fdX, fdZ, seed)).getBiome(x - fdX * pipeline.getSize(),
                                                                                    z - fdZ * pipeline.getSize()).getBiome();
     }
     

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/config/BiomePipelineTemplate.java

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

common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.biome.pipeline.BiomePipelineAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-biome-provider-pipeline/issues
-  source: https://github.com/PolyhedralDev/Terra-biome-provider-pipeline
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

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

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

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

@@ -21,7 +21,7 @@ public class SingleBiomeProvider implements BiomeProvider {
     }
     
     @Override
-    public Biome getBiome(int x, int z, long seed) {
+    public Biome getBiome(int x, int y, int z, long seed) {
         return biome;
     }
     

common/addons/biome-provider-single/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.biome.single.SingleBiomeProviderAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-biome-provider-single/issues
-  source: https://github.com/PolyhedralDev/Terra-biome-provider-single
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

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

@@ -1,5 +1,12 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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/config/palette/BiomePaletteTemplate.java

@@ -79,6 +79,6 @@ public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
             slantLayers.put(threshold, layer.getPalette());
         }
         
-        return new PaletteInfo(builder.build(), new SlantHolder(slantLayers, minThreshold), oceanPalette, seaLevel, slantDepth);
+        return new PaletteInfo(builder.build(), SlantHolder.of(slantLayers, minThreshold), oceanPalette, seaLevel, slantDepth);
     }
 }

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

@@ -18,7 +18,6 @@ import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
@@ -51,61 +50,61 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
     public void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WorldProperties world,
                                   @NotNull BiomeProvider biomeProvider,
                                   int chunkX, int chunkZ) {
-        try(ProfileFrame ignore = platform.getProfiler().profile("chunk_base_3d")) {
-            int xOrig = (chunkX << 4);
-            int zOrig = (chunkZ << 4);
-            
-            Sampler3D sampler = samplerCache.getChunk(chunkX, chunkZ, world, biomeProvider);
-            
-            long seed = world.getSeed();
-            
-            LazilyEvaluatedInterpolator carver = new LazilyEvaluatedInterpolator(biomeProvider,
-                                                                                 chunkX,
-                                                                                 chunkZ,
-                                                                                 world.getMaxHeight(),
-                                                                                 world.getMinHeight(),
-                                                                                 carverHorizontalResolution,
-                                                                                 carverVerticalResolution,
-                                                                                 seed);
-            for(int x = 0; x < 16; x++) {
-                for(int z = 0; z < 16; z++) {
-                    int paletteLevel = 0;
-                    
-                    int cx = xOrig + x;
-                    int cz = zOrig + z;
-                    
-                    Biome biome = biomeProvider.getBiome(cx, cz, seed);
-                    
-                    PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
-                    
-                    int sea = paletteInfo.seaLevel();
-                    Palette seaPalette = paletteInfo.ocean();
-                    
-                    BlockState data;
-                    for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
-                        if(sampler.sample(x, y, z) > 0) {
-                            if(carver.sample(x, y, z) <= 0) {
-                                data = PaletteUtil.getPalette(x, y, z, sampler, paletteInfo, paletteLevel).get(paletteLevel, cx, y, cz,
-                                                                                                               seed);
-                                chunk.setBlock(x, y, z, data);
-                            }
-                            
-                            paletteLevel++;
-                        } else if(y <= sea) {
-                            chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, y, z + zOrig, seed));
-                            paletteLevel = 0;
-                        } else {
-                            paletteLevel = 0;
+        platform.getProfiler().push("chunk_base_3d");
+        int xOrig = (chunkX << 4);
+        int zOrig = (chunkZ << 4);
+        
+        Sampler3D sampler = samplerCache.getChunk(chunkX, chunkZ, world, biomeProvider);
+        
+        long seed = world.getSeed();
+        
+        LazilyEvaluatedInterpolator carver = new LazilyEvaluatedInterpolator(biomeProvider,
+                                                                             chunkX,
+                                                                             chunkZ,
+                                                                             world.getMaxHeight(),
+                                                                             world.getMinHeight(),
+                                                                             carverHorizontalResolution,
+                                                                             carverVerticalResolution,
+                                                                             seed);
+        for(int x = 0; x < 16; x++) {
+            for(int z = 0; z < 16; z++) {
+                int paletteLevel = 0;
+                
+                int cx = xOrig + x;
+                int cz = zOrig + z;
+                
+                Biome biome = biomeProvider.getBiome(cx, 0, cz, seed);
+                
+                PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
+                
+                int sea = paletteInfo.seaLevel();
+                Palette seaPalette = paletteInfo.ocean();
+                
+                BlockState data;
+                for(int y = world.getMaxHeight() - 1; y >= world.getMinHeight(); y--) {
+                    if(sampler.sample(x, y, z) > 0) {
+                        if(carver.sample(x, y, z) <= 0) {
+                            data = PaletteUtil.getPalette(x, y, z, sampler, paletteInfo, paletteLevel).get(paletteLevel, cx, y, cz,
+                                                                                                           seed);
+                            chunk.setBlock(x, y, z, data);
                         }
+                        
+                        paletteLevel++;
+                    } else if(y <= sea) {
+                        chunk.setBlock(x, y, z, seaPalette.get(sea - y, x + xOrig, y, z + zOrig, seed));
+                        paletteLevel = 0;
+                    } else {
+                        paletteLevel = 0;
                     }
                 }
             }
         }
+        platform.getProfiler().pop("chunk_base_3d");
     }
     
     @Override
     public BlockState getBlock(WorldProperties world, int x, int y, int z, BiomeProvider biomeProvider) {
-        Biome biome = biomeProvider.getBiome(x, z, world.getSeed());
+        Biome biome = biomeProvider.getBiome(x, y, z, world.getSeed());
         Sampler3D sampler = samplerCache.get(x, z, world, biomeProvider);
         
         PaletteInfo paletteInfo = biome.getContext().get(PaletteInfo.class);
@@ -129,7 +128,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
     
     @Override
     public Palette getPalette(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) {
-        return biomeProvider.getBiome(x, z, world.getSeed()).getContext().get(PaletteInfo.class).paletteHolder().getPalette(y);
+        return biomeProvider.getBiome(x, y, z, world.getSeed()).getContext().get(PaletteInfo.class).paletteHolder().getPalette(y);
     }
     
     public SamplerProvider samplerProvider() {

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

@@ -55,7 +55,7 @@ public class ChunkInterpolator {
         
         for(int x = 0; x < 5; x++) {
             for(int z = 0; z < 5; z++) {
-                BiomeNoiseProperties generationSettings = provider.getBiome(xOrigin + (x << 2), zOrigin + (z << 2), seed)
+                BiomeNoiseProperties generationSettings = provider.getBiome(xOrigin + (x << 2), 0, zOrigin + (z << 2), seed)
                                                                   .getContext()
                                                                   .get(BiomeNoiseProperties.class);
                 Map<BiomeNoiseProperties, MutableInteger> genMap = new HashMap<>();
@@ -66,7 +66,7 @@ public class ChunkInterpolator {
                 for(int xi = -blend; xi <= blend; xi++) {
                     for(int zi = -blend; zi <= blend; zi++) {
                         genMap.computeIfAbsent(
-                                provider.getBiome(xOrigin + (x << 2) + (xi * step), zOrigin + (z << 2) + (zi * step), seed)
+                                provider.getBiome(xOrigin + (x << 2) + (xi * step), 0, zOrigin + (z << 2) + (zi * step), seed)
                                         .getContext()
                                         .get(BiomeNoiseProperties.class),
                                 g -> new MutableInteger(0)).increment(); // Increment by 1
@@ -133,6 +133,10 @@ public class ChunkInterpolator {
     }
     
     public double getNoise(int x, int y, int z) {
-        return interpGrid[x / 4][(y - min) / 4][z / 4].trilerp((double) (x % 4) / 4, (double) (y % 4) / 4, (double) (z % 4) / 4);
+        return interpGrid[x / 4][(y - min) / 4][z / 4].trilerp(
+                (double) (x & 3) / 4, // x & 3 == x % 4
+                (double) (y & 3) / 4, // x & 3 == x % 4
+                (double) (z & 3) / 4  // x & 3 == x % 4
+                                                              );
     }
 }

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

@@ -23,7 +23,7 @@ public class ElevationInterpolator {
         // Precompute generators.
         for(int x = -1 - smooth; x <= 16 + smooth; x++) {
             for(int z = -1 - smooth; z <= 16 + smooth; z++) {
-                gens[x + 1 + smooth][z + 1 + smooth] = provider.getBiome(xOrigin + x, zOrigin + z, seed).getContext().get(
+                gens[x + 1 + smooth][z + 1 + smooth] = provider.getBiome(xOrigin + x, 0, zOrigin + z, seed).getContext().get(
                         BiomeNoiseProperties.class);
             }
         }

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

@@ -48,7 +48,7 @@ public class LazilyEvaluatedInterpolator {
             
             NoiseSampler sampler = samplers[x][z];
             if(sampler == null) {
-                sampler = biomeProvider.getBiome(xi, zi, seed).getContext().get(BiomeNoiseProperties.class).carving();
+                sampler = biomeProvider.getBiome(xi, y, zi, seed).getContext().get(BiomeNoiseProperties.class).carving();
                 samplers[x][z] = sampler;
             }
             

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

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.chunkgenerator.palette;
 
 
+import java.util.Map.Entry;
 import java.util.TreeMap;
 
 
@@ -15,11 +16,19 @@ public class SlantHolder {
     private final TreeMap<Double, PaletteHolder> layers;
     private final double minSlope;
     
-    public SlantHolder(TreeMap<Double, PaletteHolder> layers, double minSlope) {
+    private SlantHolder(TreeMap<Double, PaletteHolder> layers, double minSlope) {
         this.layers = layers;
         this.minSlope = minSlope;
     }
     
+    public static SlantHolder of(TreeMap<Double, PaletteHolder> layers, double minSlope) {
+        if(layers.size() == 1) {
+            Entry<Double, PaletteHolder> firstEntry = layers.firstEntry();
+            return new Single(firstEntry.getValue(), minSlope);
+        }
+        return new SlantHolder(layers, minSlope);
+    }
+    
     public boolean isEmpty() {
         return layers.isEmpty();
     }
@@ -31,4 +40,25 @@ public class SlantHolder {
     public double getMinSlope() {
         return minSlope;
     }
+    
+    private static final class Single extends SlantHolder {
+        
+        private final PaletteHolder layers;
+        
+        public Single(PaletteHolder layers, double minSlope) {
+            super(of(minSlope, layers), minSlope);
+            this.layers = layers;
+        }
+        
+        private static TreeMap<Double, PaletteHolder> of(double v, PaletteHolder layer) {
+            TreeMap<Double, PaletteHolder> map = new TreeMap<>();
+            map.put(v, layer);
+            return map;
+        }
+        
+        @Override
+        public PaletteHolder getPalette(double slope) {
+            return layers;
+        }
+    }
 }

common/addons/chunk-generator-noise-3d/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.chunkgenerator.NoiseChunkGenerator3DAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-chunk-generator-noise-3d/issues
-  source: https://github.com/PolyhedralDev/Terra-chunk-generator-noise-3d
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/command-addons/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/command-addons/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/command-packs/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/command-packs/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/command-profiler/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/command-profiler/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/command-structures/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/command-structures/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/config-biome/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.biome.holder;
 
-import net.jafama.FastMath;
-
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -25,11 +23,11 @@ public class PaletteHolderBuilder {
     
     public PaletteHolder build() {
         
-        int min = FastMath.min(paletteMap.keySet().stream().min(Integer::compareTo).orElse(0), 0);
-        int max = FastMath.max(paletteMap.keySet().stream().max(Integer::compareTo).orElse(255), 255);
+        int min = Math.min(paletteMap.keySet().stream().min(Integer::compareTo).orElse(0), 0);
+        int max = Math.max(paletteMap.keySet().stream().max(Integer::compareTo).orElse(255), 255);
         
         Palette[] palettes = new Palette[paletteMap.lastKey() + 1 - min];
-        for(int y = min; y <= FastMath.max(paletteMap.lastKey(), max); y++) {
+        for(int y = min; y <= Math.max(paletteMap.lastKey(), max); y++) {
             Palette d = null;
             for(Map.Entry<Integer, Palette> e : paletteMap.entrySet()) {
                 if(e.getKey() >= y) {

common/addons/config-biome/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.biome.BiomeAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-biome/issues
-  source: https://github.com/PolyhedralDev/Terra-config-biome
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-distributors/build.gradle.kts

@@ -1,5 +1,12 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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.feature.distributor.lib.jafama")
+}

common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java

@@ -34,12 +34,12 @@ public class PaddedGridDistributor implements Distributor {
     public boolean matches(int x, int z, long seed) {
         int cellX = FastMath.floorDiv(x, cellWidth);
         int cellZ = FastMath.floorDiv(z, cellWidth);
-
+        
         Random random = new Random((murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt);
-
+        
         int pointX = random.nextInt(width) + cellX * cellWidth;
         int pointZ = random.nextInt(width) + cellZ * cellWidth;
-
+        
         return x == pointX && z == pointZ;
     }
 }

common/addons/config-distributors/src/main/resources/terra.addon.yml

@@ -6,10 +6,10 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.feature.distributor.DistributorAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-distributors/issues
-  source: https://github.com/PolyhedralDev/Terra-config-distributors
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
 depends:
-  config-feature: "0.1.+"
-  generation-stage-feature: "0.1.+"
+  config-feature: "1.+"
+  generation-stage-feature: "1.+"

common/addons/config-feature/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/config-feature/src/main/resources/terra.addon.yml

@@ -6,9 +6,9 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.feature.FeatureAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-feature/issues
-  source: https://github.com/PolyhedralDev/Terra-config-feature
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
 depends:
-  generation-stage-feature: "0.1.+"
+  generation-stage-feature: "1.+"

common/addons/config-flora/build.gradle.kts

@@ -1,5 +1,11 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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.flora.lib.jafama")
 }

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java

@@ -15,7 +15,6 @@ import java.util.List;
 import java.util.Random;
 
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.api.block.state.properties.base.Properties;
 import com.dfsek.terra.api.block.state.properties.enums.Direction;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.structure.Structure;
@@ -90,12 +89,6 @@ public class TerraFlora implements Structure {
             if(doRotation) {
                 Direction oneFace = new ArrayList<>(faces).get(
                         new Random(location.getX() ^ location.getZ()).nextInt(faces.size())); // Get random face.
-                
-                data = data.setIfPresent(Properties.DIRECTION, oneFace.opposite())
-                           .setIfPresent(Properties.NORTH, faces.contains(Direction.NORTH))
-                           .setIfPresent(Properties.SOUTH, faces.contains(Direction.SOUTH))
-                           .setIfPresent(Properties.EAST, faces.contains(Direction.EAST))
-                           .setIfPresent(Properties.WEST, faces.contains(Direction.WEST));
             }
             world.setBlockState(location.mutable().add(0, i + c, 0).immutable(), data, physics);
         }

common/addons/config-flora/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.flora.FloraAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-flora/issues
-  source: https://github.com/PolyhedralDev/Terra-config-flora
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-locators/build.gradle.kts

@@ -1,5 +1,12 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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.feature.locator.lib.jafama")
 }

common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java

@@ -7,8 +7,6 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
-import net.jafama.FastMath;
-
 import java.util.List;
 
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -31,11 +29,24 @@ public class SamplerLocator implements Locator {
         
         long seed = column.getWorld().getSeed();
         samplers.forEach(sampler -> {
-            int y = FastMath.floorToInt(sampler.noise(seed, column.getX(), column.getZ()));
+            int y = floorToInt(sampler.noise(seed, column.getX(), column.getZ()));
             if(y >= column.getMaxY() || y < column.getMinY()) return;
             results.set(y);
         });
         
         return results.build();
     }
+    
+    private static int floorToInt(double value) {
+        int valueInt = (int)value;
+        if (value < 0.0) {
+            if (value == (double)valueInt) {
+                return valueInt;
+            } else {
+                return valueInt == Integer.MIN_VALUE ? valueInt : valueInt - 1;
+            }
+        } else {
+            return valueInt;
+        }
+    }
 }

common/addons/config-locators/src/main/resources/terra.addon.yml

@@ -6,10 +6,10 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.feature.locator.LocatorAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-locators/issues
-  source: https://github.com/PolyhedralDev/Terra-config-locators
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License
 depends:
-  config-feature: "0.1.+"
-  generation-stage-feature: "0.1.+"
+  config-feature: "1.+"
+  generation-stage-feature: "1.+"

common/addons/config-noise-function/build.gradle.kts

@@ -1,11 +1,16 @@
-plugins {
-    id("me.champeau.jmh") version "0.6.6"
-}
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
-    jmh("org.openjdk.jmh:jmh-core:1.35")
-    jmh("org.openjdk.jmh:jmh-generator-annprocess:1.35")
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
+    api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
+
+
+tasks.named<ShadowJar>("shadowJar") {
+    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.noise.lib.paralithic")
+    relocate("net.jafama", "com.dfsek.terra.addons.noise.lib.jafama")
+}

common/addons/config-noise-function/src/jmh/java/com/dfsek/terra/noise_bench/Cellular.java

@@ -1,108 +0,0 @@
-package com.dfsek.terra.noise_bench;
-
-import com.dfsek.terra.addons.noise.samplers.noise.cellular.CellularSampler;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-import com.dfsek.terra.noise_bench.old.OldCellularSampler;
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Level;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-import org.openjdk.jmh.infra.Blackhole;
-
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-
-public class Cellular {
-    private static final long SEED = ThreadLocalRandom.current().nextLong();
-    @State(Scope.Benchmark)
-    public static class OldCellularParameters {
-        public int seed;
-    
-        public int x;
-    
-        public int y;
-    
-        public int z;
-        
-        public NoiseSampler sampler = new OldCellularSampler();
-    
-        @Setup(Level.Iteration)
-        public void setUp() {
-            Random random = new Random(SEED);
-            
-            seed = random.nextInt();
-            x = random.nextInt();
-            y = random.nextInt();
-            z = random.nextInt();
-        }
-    }
-    
-    @State(Scope.Benchmark)
-    public static class CellularParameters {
-        public int seed;
-    
-        public int x;
-    
-        public int y;
-    
-        public int z;
-        
-        public NoiseSampler sampler = new CellularSampler();
-    
-        @Setup(Level.Iteration)
-        public void setUp() {
-            Random random = new Random(SEED);
-        
-            seed = random.nextInt();
-            x = random.nextInt();
-            y = random.nextInt();
-            z = random.nextInt();
-        }
-    }
-    
-    @Benchmark()
-    @Warmup(iterations = 25, time = 200, timeUnit = MILLISECONDS)
-    @Measurement(iterations = 15, time = 200, timeUnit = MILLISECONDS)
-    @Fork(warmups = 2, value = 3)
-    @BenchmarkMode(Mode.Throughput)
-    public void old2D(OldCellularParameters parameters, Blackhole blackhole) {
-        blackhole.consume(parameters.sampler.noise(parameters.seed, parameters.x, parameters.y));
-    }
-    
-    @Benchmark
-    @Warmup(iterations = 25, time = 200, timeUnit = MILLISECONDS)
-    @Measurement(iterations = 15, time = 200, timeUnit = MILLISECONDS)
-    @Fork(warmups = 2, value = 3)
-    @BenchmarkMode(Mode.Throughput)
-    public void old3D(OldCellularParameters parameters, Blackhole blackhole) {
-        blackhole.consume(parameters.sampler.noise(parameters.seed, parameters.x, parameters.y, parameters.z));
-    }
-    
-    @Benchmark
-    @Warmup(iterations = 25, time = 200, timeUnit = MILLISECONDS)
-    @Measurement(iterations = 15, time = 200, timeUnit = MILLISECONDS)
-    @Fork(warmups = 2, value = 3)
-    @BenchmarkMode(Mode.Throughput)
-    public void new2D(CellularParameters parameters, Blackhole blackhole) {
-        blackhole.consume(parameters.sampler.noise(parameters.seed, parameters.x, parameters.y));
-    }
-    
-    @Benchmark
-    @Warmup(iterations = 25, time = 200, timeUnit = MILLISECONDS)
-    @Measurement(iterations = 15, time = 200, timeUnit = MILLISECONDS)
-    @Fork(warmups = 2, value = 3)
-    @BenchmarkMode(Mode.Throughput)
-    public void new3D(CellularParameters parameters, Blackhole blackhole) {
-        blackhole.consume(parameters.sampler.noise(parameters.seed, parameters.x, parameters.y, parameters.z));
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java

@@ -32,6 +32,7 @@ import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractal
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler;
@@ -40,7 +41,7 @@ import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.MinSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.MultiplicationSampler;
 import com.dfsek.terra.addons.noise.samplers.arithmetic.SubtractionSampler;
-import com.dfsek.terra.addons.noise.samplers.noise.cellular.CellularSampler;
+import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.PositiveWhiteNoiseSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.WhiteNoiseSampler;
@@ -90,6 +91,7 @@ public class NoiseAddon implements AddonInitializer {
                   noiseRegistry.register(addon.key("CLAMP"), ClampNormalizerTemplate::new);
                   noiseRegistry.register(addon.key("PROBABILITY"), ProbabilityNormalizerTemplate::new);
                   noiseRegistry.register(addon.key("SCALE"), ScaleNormalizerTemplate::new);
+                  noiseRegistry.register(addon.key("POSTERIZATION"), PosterizationNormalizerTemplate::new);
             
                   noiseRegistry.register(addon.key("IMAGE"), ImageSamplerTemplate::new);
             
@@ -121,7 +123,6 @@ public class NoiseAddon implements AddonInitializer {
             
                   noiseRegistry.register(addon.key("LINEAR_HEIGHTMAP"), LinearHeightmapSamplerTemplate::new);
             
-            
                   noiseRegistry.register(addon.key("ADD"), () -> new BinaryArithmeticTemplate<>(AdditionSampler::new));
                   noiseRegistry.register(addon.key("SUB"), () -> new BinaryArithmeticTemplate<>(SubtractionSampler::new));
                   noiseRegistry.register(addon.key("MUL"), () -> new BinaryArithmeticTemplate<>(MultiplicationSampler::new));

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java

@@ -13,6 +13,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Objects;
 
 import com.dfsek.terra.api.config.meta.Meta;
 
@@ -45,4 +46,17 @@ public class FunctionTemplate implements ObjectTemplate<FunctionTemplate> {
     public LinkedHashMap<String, FunctionTemplate> getFunctions() {
         return functions;
     }
+    
+    @Override
+    public boolean equals(Object o) {
+        if(this == o) return true;
+        if(o == null || getClass() != o.getClass()) return false;
+        FunctionTemplate that = (FunctionTemplate) o;
+        return args.equals(that.args) && function.equals(that.function) && functions.equals(that.functions);
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(args, function, functions);
+    }
 }

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java

@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.noise.config.templates.noise;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.noise.samplers.noise.cellular.CellularSampler;
+import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/PosterizationNormalizerTemplate.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.noise.config.templates.normalizer;
+
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+
+import com.dfsek.terra.addons.noise.normalizer.PosterizationNormalizer;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+@SuppressWarnings({ "unused", "FieldMayBeFinal" })
+public class PosterizationNormalizerTemplate extends NormalizerTemplate<PosterizationNormalizer> {
+    @Value("steps")
+    private @Meta int steps;
+    
+    @Override
+    public NoiseSampler get() {
+        return new PosterizationNormalizer(function, steps);
+    }
+}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/PosterizationNormalizer.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022 Polyhedral Development
+ *
+ * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in this module's root directory.
+ */
+
+package com.dfsek.terra.addons.noise.normalizer;
+
+import net.jafama.FastMath;
+
+import com.dfsek.terra.api.noise.NoiseSampler;
+
+
+public class PosterizationNormalizer extends Normalizer {
+    private final double stepSize;
+    
+    public PosterizationNormalizer(NoiseSampler sampler, int steps) {
+        super(sampler);
+        this.stepSize = 2.0 / (steps - 1);
+    }
+    
+    @Override
+    public double normalize(double in) {
+        return FastMath.roundToInt((in + 1) / stepSize) * stepSize - 1;
+    }
+}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java

@@ -15,6 +15,8 @@ import com.dfsek.paralithic.functions.dynamic.Context;
 import com.dfsek.paralithic.functions.dynamic.DynamicFunction;
 import com.dfsek.paralithic.node.Statefulness;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
@@ -24,26 +26,33 @@ public class UserDefinedFunction implements DynamicFunction {
     private final Expression expression;
     private final int args;
     
+    private static final Map<FunctionTemplate, UserDefinedFunction> CACHE = new HashMap<>();
+    
     protected UserDefinedFunction(Expression expression, int args) {
         this.expression = expression;
         this.args = args;
     }
     
     public static UserDefinedFunction newInstance(FunctionTemplate template) throws ParseException {
-        Parser parser = new Parser();
-        Scope parent = new Scope();
-        
-        Scope functionScope = new Scope().withParent(parent);
-        
-        template.getArgs().forEach(functionScope::addInvocationVariable);
-        
-        for(Entry<String, FunctionTemplate> entry : template.getFunctions().entrySet()) {
-            String id = entry.getKey();
-            FunctionTemplate nest = entry.getValue();
-            parser.registerFunction(id, newInstance(nest));
+        UserDefinedFunction function = CACHE.get(template);
+        if(function == null) {
+            Parser parser = new Parser();
+            Scope parent = new Scope();
+    
+            Scope functionScope = new Scope().withParent(parent);
+    
+            template.getArgs().forEach(functionScope::addInvocationVariable);
+    
+            for(Entry<String, FunctionTemplate> entry : template.getFunctions().entrySet()) {
+                String id = entry.getKey();
+                FunctionTemplate nest = entry.getValue();
+                parser.registerFunction(id, newInstance(nest));
+            }
+    
+            function = new UserDefinedFunction(parser.parse(template.getFunction(), functionScope), template.getArgs().size());
+            CACHE.put(template, function);
         }
-        
-        return new UserDefinedFunction(parser.parse(template.getFunction(), functionScope), template.getArgs().size());
+        return function;
     }
     
     @Override

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java

@@ -5,19 +5,18 @@
  * reference the LICENSE file in this module's root directory.
  */
 
-package com.dfsek.terra.noise_bench.old;
+package com.dfsek.terra.addons.noise.samplers.noise;
 
 import net.jafama.FastMath;
 
-import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 
 
 /**
- * NoiseSampler implementation for com.dfsek.terra.noise_bench.Cellular (Voronoi/Worley) Noise.
+ * NoiseSampler implementation for Cellular (Voronoi/Worley) Noise.
  */
-public class OldCellularSampler extends NoiseFunction {
+public class CellularSampler extends NoiseFunction {
     private static final double[] RAND_VECS_3D = {
             -0.7292736885d, -0.6618439697d, 0.1735581948d, 0, 0.790292081d, -0.5480887466d, -0.2739291014d, 0, 0.7217578935d, 0.6226212466d,
             -0.3023380997d, 0, 0.565683137d, -0.8208298145d, -0.0790000257d, 0, 0.760049034d, -0.5555979497d, -0.3370999617d, 0,
@@ -201,7 +200,7 @@ public class OldCellularSampler extends NoiseFunction {
     
     private NoiseSampler noiseLookup;
     
-    public OldCellularSampler() {
+    public CellularSampler() {
         noiseLookup = new OpenSimplex2Sampler();
     }
     

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java

@@ -22,6 +22,7 @@ public class GaborNoiseSampler extends NoiseFunction {
     private double impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius));
     private double impulsesPerCell = impulseDensity * kernelRadius * kernelRadius;
     private double g = FastMath.exp(-impulsesPerCell);
+    
     private double omega0 = Math.PI * 0.25;
     private boolean isotropic = true;
     

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/cellular/CellularSampler.java

@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.samplers.noise.cellular;
-
-import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
-
-import net.jafama.FastMath;
-
-import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
-
-/**
- * NoiseSampler implementation for Cellular (Voronoi/Worley) Noise.
- */
-public class CellularSampler extends NoiseFunction {
-    private DistanceFunction distanceFunction = DistanceFunction.EuclideanSq;
-    private ReturnType returnType = ReturnType.Distance;
-    private double jitterModifier = 1.0;
-    
-    private NoiseSampler noiseLookup;
-    
-    public CellularSampler() {
-        noiseLookup = new OpenSimplex2Sampler();
-    }
-    
-    public void setDistanceFunction(DistanceFunction distanceFunction) {
-        this.distanceFunction = distanceFunction;
-    }
-    
-    public void setJitterModifier(double jitterModifier) {
-        this.jitterModifier = jitterModifier;
-    }
-    
-    public void setNoiseLookup(NoiseSampler noiseLookup) {
-        this.noiseLookup = noiseLookup;
-    }
-    
-    public void setReturnType(ReturnType returnType) {
-        this.returnType = returnType;
-    }
-    
-    @Override
-    public double getNoiseRaw(long sl, double x, double y) {
-        int seed = (int) sl;
-        int xr = fastRound(x);
-        int yr = fastRound(y);
-        
-        double distance0 = Double.MAX_VALUE;
-        double distance1 = Double.MAX_VALUE;
-        double distance2 = Double.MAX_VALUE;
-        
-        int closestHash = 0;
-        
-        double cellularJitter = 0.43701595 * jitterModifier;
-        
-        int xPrimed = (xr - 1) * PRIME_X;
-        int yPrimedBase = (yr - 1) * PRIME_Y;
-        
-        double centerX = x;
-        double centerY = y;
-        
-        for(int xi = xr - 1; xi <= xr + 1; xi++) {
-            int yPrimed = yPrimedBase;
-            
-            for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                int hash = hash(seed, xPrimed, yPrimed);
-                int idx = hash & (255 << 1);
-                
-                double vecX = (xi - x) + RandomVectors.RAND_VECS_2D[idx] * cellularJitter;
-                double vecY = (yi - y) + RandomVectors.RAND_VECS_2D[idx | 1] * cellularJitter;
-                
-                double newDistance = distanceFunction.getDistance(vecX, vecY);
-                
-                distance1 = fastMax(fastMin(distance1, newDistance), distance0);
-                if(newDistance < distance0) {
-                    distance0 = newDistance;
-                    closestHash = hash;
-                    centerX = ((xi + RandomVectors.RAND_VECS_2D[idx] * cellularJitter) / frequency);
-                    centerY = ((yi + RandomVectors.RAND_VECS_2D[idx | 1] * cellularJitter) / frequency);
-                } else if(newDistance < distance1) {
-                    distance2 = distance1;
-                    distance1 = newDistance;
-                } else if(newDistance < distance2) {
-                    distance2 = newDistance;
-                }
-                yPrimed += PRIME_Y;
-            }
-            xPrimed += PRIME_X;
-        }
-        
-        if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) {
-            distance0 = fastSqrt(distance0);
-            if(returnType != ReturnType.CellValue) {
-                distance1 = fastSqrt(distance1);
-            }
-        }
-        
-        return switch(returnType) {
-            case CellValue -> closestHash * (1 / 2147483648.0);
-            case Distance -> distance0 - 1;
-            case Distance2 -> distance1 - 1;
-            case Distance2Add -> (distance1 + distance0) * 0.5 - 1;
-            case Distance2Sub -> distance1 - distance0 - 1;
-            case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
-            case Distance2Div -> distance0 / distance1 - 1;
-            case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY);
-            case Distance3 -> distance2 - 1;
-            case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
-            case Distance3Sub -> distance2 - distance0 - 1;
-            case Distance3Mul -> distance2 * distance0 - 1;
-            case Distance3Div -> distance0 / distance2 - 1;
-            case Angle -> FastMath.atan2(y / frequency - centerY, x / frequency - centerX);
-        };
-    }
-    
-    @Override
-    public double getNoiseRaw(long sl, double x, double y, double z) {
-        int seed = (int) sl;
-        int xr = fastRound(x);
-        int yr = fastRound(y);
-        int zr = fastRound(z);
-        
-        double distance0 = Double.MAX_VALUE;
-        double distance1 = Double.MAX_VALUE;
-        double distance2 = Double.MAX_VALUE;
-        int closestHash = 0;
-        
-        double cellularJitter = 0.39614353 * jitterModifier;
-        
-        int xPrimed = (xr - 1) * PRIME_X;
-        int yPrimedBase = (yr - 1) * PRIME_Y;
-        int zPrimedBase = (zr - 1) * PRIME_Z;
-        
-        double centerX = x;
-        double centerY = y;
-        double centerZ = z;
-        
-        for(int xi = xr - 1; xi <= xr + 1; xi++) {
-            int yPrimed = yPrimedBase;
-            
-            for(int yi = yr - 1; yi <= yr + 1; yi++) {
-                int zPrimed = zPrimedBase;
-                
-                for(int zi = zr - 1; zi <= zr + 1; zi++) {
-                    int hash = hash(seed, xPrimed, yPrimed, zPrimed);
-                    int idx = hash & (255 << 2);
-                    
-                    double vecX = (xi - x) + RandomVectors.RAND_VECS_3D[idx] * cellularJitter;
-                    double vecY = (yi - y) + RandomVectors.RAND_VECS_3D[idx | 1] * cellularJitter;
-                    double vecZ = (zi - z) + RandomVectors.RAND_VECS_3D[idx | 2] * cellularJitter;
-                    
-                    double newDistance = distanceFunction.getDistance(vecX, vecY, vecZ);
-                    
-                    if(newDistance < distance0) {
-                        distance0 = newDistance;
-                        closestHash = hash;
-                        centerX = ((xi + RandomVectors.RAND_VECS_3D[idx] * cellularJitter) / frequency);
-                        centerY = ((yi + RandomVectors.RAND_VECS_3D[idx | 1] * cellularJitter) / frequency);
-                        centerZ = ((zi + RandomVectors.RAND_VECS_3D[idx | 2] * cellularJitter) / frequency);
-                    } else if(newDistance < distance1) {
-                        distance2 = distance1;
-                        distance1 = newDistance;
-                    } else if(newDistance < distance2) {
-                        distance2 = newDistance;
-                    }
-                    zPrimed += PRIME_Z;
-                }
-                yPrimed += PRIME_Y;
-            }
-            xPrimed += PRIME_X;
-        }
-        
-        
-        if(distanceFunction == DistanceFunction.Euclidean &&
-           returnType != ReturnType.CellValue) { // optimisation: dont compute sqrt until end
-            distance0 = fastSqrt(distance0);
-            if(returnType != ReturnType.CellValue) {
-                distance1 = fastSqrt(distance1);
-            }
-        }
-        
-        return switch(returnType) {
-            case CellValue -> closestHash * (1 / 2147483648.0);
-            case Distance -> distance0 - 1;
-            case Distance2 -> distance1 - 1;
-            case Distance2Add -> (distance1 + distance0) * 0.5 - 1;
-            case Distance2Sub -> distance1 - distance0 - 1;
-            case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
-            case Distance2Div -> distance0 / distance1 - 1;
-            case NoiseLookup -> noiseLookup.noise(sl, centerX, centerY, centerZ);
-            case Distance3 -> distance2 - 1;
-            case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
-            case Distance3Sub -> distance2 - distance0 - 1;
-            case Distance3Mul -> distance2 * distance0 - 1;
-            case Distance3Div -> distance0 / distance2 - 1;
-            case Angle -> FastMath.atan2(y / frequency - centerY, x / frequency - centerX);
-        };
-    }
-    
-    public enum DistanceFunction {
-        
-        Euclidean {
-            @Override
-            public double getDistance(double x, double y) {
-                return x * x + y * y; // optimisation: dont compute sqrt until end
-            }
-            
-            @Override
-            public double getDistance(double x, double y, double z) {
-                return x * x + y * y + z * z; // optimisation: dont compute sqrt until end
-            }
-        },
-        EuclideanSq {
-            @Override
-            public double getDistance(double x, double y) {
-                return x * x + y * y;
-            }
-            
-            @Override
-            public double getDistance(double x, double y, double z) {
-                return x * x + y * y + z + z;
-            }
-        },
-        Manhattan {
-            @Override
-            public double getDistance(double x, double y) {
-                return fastAbs(x) + fastAbs(y);
-            }
-            
-            @Override
-            public double getDistance(double x, double y, double z) {
-                return fastAbs(x) + fastAbs(y) + fastAbs(z);
-            }
-        },
-        Hybrid {
-            @Override
-            public double getDistance(double x, double y) {
-                return (fastAbs(x) + fastAbs(y)) +
-                       (x * x + y * y);
-            }
-            
-            @Override
-            public double getDistance(double x, double y, double z) {
-                return (fastAbs(x) + fastAbs(y) + fastAbs(z)) +
-                       (x * x + y * y + z * z);
-            }
-        };
-        
-        public abstract double getDistance(double x, double y);
-        
-        public abstract double getDistance(double x, double y, double z);
-    }
-    
-    
-    public enum ReturnType {
-        CellValue,
-        Distance,
-        Distance2,
-        Distance2Add,
-        Distance2Sub,
-        Distance2Mul,
-        Distance2Div,
-        NoiseLookup,
-        Distance3,
-        Distance3Add,
-        Distance3Sub,
-        Distance3Mul,
-        Distance3Div,
-        Angle
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/cellular/RandomVectors.java

@@ -1,178 +0,0 @@
-package com.dfsek.terra.addons.noise.samplers.noise.cellular;
-
-public class RandomVectors {
-    static final double[] RAND_VECS_3D = {
-            -0.7292736885d, -0.6618439697d, 0.1735581948d, 0, 0.790292081d, -0.5480887466d, -0.2739291014d, 0, 0.7217578935d, 0.6226212466d,
-            -0.3023380997d, 0, 0.565683137d, -0.8208298145d, -0.0790000257d, 0, 0.760049034d, -0.5555979497d, -0.3370999617d, 0,
-            0.3713945616d, 0.5011264475d, 0.7816254623d, 0, -0.1277062463d, -0.4254438999d, -0.8959289049d, 0, -0.2881560924d,
-            -0.5815838982d, 0.7607405838d, 0, 0.5849561111d, -0.662820239d, -0.4674352136d, 0, 0.3307171178d, 0.0391653737d, 0.94291689d, 0,
-            0.8712121778d, -0.4113374369d, -0.2679381538d, 0, 0.580981015d, 0.7021915846d, 0.4115677815d, 0, 0.503756873d, 0.6330056931d,
-            -0.5878203852d, 0, 0.4493712205d, 0.601390195d, 0.6606022552d, 0, -0.6878403724d, 0.09018890807d, -0.7202371714d, 0,
-            -0.5958956522d, -0.6469350577d, 0.475797649d, 0, -0.5127052122d, 0.1946921978d, -0.8361987284d, 0, -0.9911507142d,
-            -0.05410276466d, -0.1212153153d, 0, -0.2149721042d, 0.9720882117d, -0.09397607749d, 0, -0.7518650936d, -0.5428057603d,
-            0.3742469607d, 0, 0.5237068895d, 0.8516377189d, -0.02107817834d, 0, 0.6333504779d, 0.1926167129d, -0.7495104896d, 0,
-            -0.06788241606d, 0.3998305789d, 0.9140719259d, 0, -0.5538628599d, -0.4729896695d, -0.6852128902d, 0, -0.7261455366d,
-            -0.5911990757d, 0.3509933228d, 0, -0.9229274737d, -0.1782808786d, 0.3412049336d, 0, -0.6968815002d, 0.6511274338d,
-            0.3006480328d, 0, 0.9608044783d, -0.2098363234d, -0.1811724921d, 0, 0.06817146062d, -0.9743405129d, 0.2145069156d, 0,
-            -0.3577285196d, -0.6697087264d, -0.6507845481d, 0, -0.1868621131d, 0.7648617052d, -0.6164974636d, 0, -0.6541697588d,
-            0.3967914832d, 0.6439087246d, 0, 0.6993340405d, -0.6164538506d, 0.3618239211d, 0, -0.1546665739d, 0.6291283928d, 0.7617583057d,
-            0, -0.6841612949d, -0.2580482182d, -0.6821542638d, 0, 0.5383980957d, 0.4258654885d, 0.7271630328d, 0, -0.5026987823d,
-            -0.7939832935d, -0.3418836993d, 0, 0.3202971715d, 0.2834415347d, 0.9039195862d, 0, 0.8683227101d, -0.0003762656404d,
-            -0.4959995258d, 0, 0.791120031d, -0.08511045745d, 0.6057105799d, 0, -0.04011016052d, -0.4397248749d, 0.8972364289d, 0,
-            0.9145119872d, 0.3579346169d, -0.1885487608d, 0, -0.9612039066d, -0.2756484276d, 0.01024666929d, 0, 0.6510361721d,
-            -0.2877799159d, -0.7023778346d, 0, -0.2041786351d, 0.7365237271d, 0.644859585d, 0, -0.7718263711d, 0.3790626912d, 0.5104855816d,
-            0, -0.3060082741d, -0.7692987727d, 0.5608371729d, 0, 0.454007341d, -0.5024843065d, 0.7357899537d, 0, 0.4816795475d,
-            0.6021208291d, -0.6367380315d, 0, 0.6961980369d, -0.3222197429d, 0.641469197d, 0, -0.6532160499d, -0.6781148932d, 0.3368515753d,
-            0, 0.5089301236d, -0.6154662304d, -0.6018234363d, 0, -0.1635919754d, -0.9133604627d, -0.372840892d, 0, 0.52408019d,
-            -0.8437664109d, 0.1157505864d, 0, 0.5902587356d, 0.4983817807d, -0.6349883666d, 0, 0.5863227872d, 0.494764745d, 0.6414307729d,
-            0, 0.6779335087d, 0.2341345225d, 0.6968408593d, 0, 0.7177054546d, -0.6858979348d, 0.120178631d, 0, -0.5328819713d,
-            -0.5205125012d, 0.6671608058d, 0, -0.8654874251d, -0.0700727088d, -0.4960053754d, 0, -0.2861810166d, 0.7952089234d,
-            0.5345495242d, 0, -0.04849529634d, 0.9810836427d, -0.1874115585d, 0, -0.6358521667d, 0.6058348682d, 0.4781800233d, 0,
-            0.6254794696d, -0.2861619734d, 0.7258696564d, 0, -0.2585259868d, 0.5061949264d, -0.8227581726d, 0, 0.02136306781d,
-            0.5064016808d, -0.8620330371d, 0, 0.200111773d, 0.8599263484d, 0.4695550591d, 0, 0.4743561372d, 0.6014985084d, -0.6427953014d,
-            0, 0.6622993731d, -0.5202474575d, -0.5391679918d, 0, 0.08084972818d, -0.6532720452d, 0.7527940996d, 0, -0.6893687501d,
-            0.0592860349d, 0.7219805347d, 0, -0.1121887082d, -0.9673185067d, 0.2273952515d, 0, 0.7344116094d, 0.5979668656d, -0.3210532909d,
-            0, 0.5789393465d, -0.2488849713d, 0.7764570201d, 0, 0.6988182827d, 0.3557169806d, -0.6205791146d, 0, -0.8636845529d,
-            -0.2748771249d, -0.4224826141d, 0, -0.4247027957d, -0.4640880967d, 0.777335046d, 0, 0.5257722489d, -0.8427017621d,
-            0.1158329937d, 0, 0.9343830603d, 0.316302472d, -0.1639543925d, 0, -0.1016836419d, -0.8057303073d, -0.5834887393d, 0,
-            -0.6529238969d, 0.50602126d, -0.5635892736d, 0, -0.2465286165d, -0.9668205684d, -0.06694497494d, 0, -0.9776897119d,
-            -0.2099250524d, -0.007368825344d, 0, 0.7736893337d, 0.5734244712d, 0.2694238123d, 0, -0.6095087895d, 0.4995678998d,
-            0.6155736747d, 0, 0.5794535482d, 0.7434546771d, 0.3339292269d, 0, -0.8226211154d, 0.08142581855d, 0.5627293636d, 0,
-            -0.510385483d, 0.4703667658d, 0.7199039967d, 0, -0.5764971849d, -0.07231656274d, -0.8138926898d, 0, 0.7250628871d,
-            0.3949971505d, -0.5641463116d, 0, -0.1525424005d, 0.4860840828d, -0.8604958341d, 0, -0.5550976208d, -0.4957820792d,
-            0.667882296d, 0, -0.1883614327d, 0.9145869398d, 0.357841725d, 0, 0.7625556724d, -0.5414408243d, -0.3540489801d, 0,
-            -0.5870231946d, -0.3226498013d, -0.7424963803d, 0, 0.3051124198d, 0.2262544068d, -0.9250488391d, 0, 0.6379576059d, 0.577242424d,
-            -0.5097070502d, 0, -0.5966775796d, 0.1454852398d, -0.7891830656d, 0, -0.658330573d, 0.6555487542d, -0.3699414651d, 0,
-            0.7434892426d, 0.2351084581d, 0.6260573129d, 0, 0.5562114096d, 0.8264360377d, -0.0873632843d, 0, -0.3028940016d, -0.8251527185d,
-            0.4768419182d, 0, 0.1129343818d, -0.985888439d, -0.1235710781d, 0, 0.5937652891d, -0.5896813806d, 0.5474656618d, 0,
-            0.6757964092d, -0.5835758614d, -0.4502648413d, 0, 0.7242302609d, -0.1152719764d, 0.6798550586d, 0, -0.9511914166d,
-            0.0753623979d, -0.2992580792d, 0, 0.2539470961d, -0.1886339355d, 0.9486454084d, 0, 0.571433621d, -0.1679450851d, -0.8032795685d,
-            0, -0.06778234979d, 0.3978269256d, 0.9149531629d, 0, 0.6074972649d, 0.733060024d, -0.3058922593d, 0, -0.5435478392d,
-            0.1675822484d, 0.8224791405d, 0, -0.5876678086d, -0.3380045064d, -0.7351186982d, 0, -0.7967562402d, 0.04097822706d,
-            -0.6029098428d, 0, -0.1996350917d, 0.8706294745d, 0.4496111079d, 0, -0.02787660336d, -0.9106232682d, -0.4122962022d, 0,
-            -0.7797625996d, -0.6257634692d, 0.01975775581d, 0, -0.5211232846d, 0.7401644346d, -0.4249554471d, 0, 0.8575424857d,
-            0.4053272873d, -0.3167501783d, 0, 0.1045223322d, 0.8390195772d, -0.5339674439d, 0, 0.3501822831d, 0.9242524096d, -0.1520850155d,
-            0, 0.1987849858d, 0.07647613266d, 0.9770547224d, 0, 0.7845996363d, 0.6066256811d, -0.1280964233d, 0, 0.09006737436d,
-            -0.9750989929d, -0.2026569073d, 0, -0.8274343547d, -0.542299559d, 0.1458203587d, 0, -0.3485797732d, -0.415802277d, 0.840000362d,
-            0, -0.2471778936d, -0.7304819962d, -0.6366310879d, 0, -0.3700154943d, 0.8577948156d, 0.3567584454d, 0, 0.5913394901d,
-            -0.548311967d, -0.5913303597d, 0, 0.1204873514d, -0.7626472379d, -0.6354935001d, 0, 0.616959265d, 0.03079647928d, 0.7863922953d,
-            0, 0.1258156836d, -0.6640829889d, -0.7369967419d, 0, -0.6477565124d, -0.1740147258d, -0.7417077429d, 0, 0.6217889313d,
-            -0.7804430448d, -0.06547655076d, 0, 0.6589943422d, -0.6096987708d, 0.4404473475d, 0, -0.2689837504d, -0.6732403169d,
-            -0.6887635427d, 0, -0.3849775103d, 0.5676542638d, 0.7277093879d, 0, 0.5754444408d, 0.8110471154d, -0.1051963504d, 0,
-            0.9141593684d, 0.3832947817d, 0.131900567d, 0, -0.107925319d, 0.9245493968d, 0.3654593525d, 0, 0.377977089d, 0.3043148782d,
-            0.8743716458d, 0, -0.2142885215d, -0.8259286236d, 0.5214617324d, 0, 0.5802544474d, 0.4148098596d, -0.7008834116d, 0,
-            -0.1982660881d, 0.8567161266d, -0.4761596756d, 0, -0.03381553704d, 0.3773180787d, -0.9254661404d, 0, -0.6867922841d,
-            -0.6656597827d, 0.2919133642d, 0, 0.7731742607d, -0.2875793547d, -0.5652430251d, 0, -0.09655941928d, 0.9193708367d,
-            -0.3813575004d, 0, 0.2715702457d, -0.9577909544d, -0.09426605581d, 0, 0.2451015704d, -0.6917998565d, -0.6792188003d, 0,
-            0.977700782d, -0.1753855374d, 0.1155036542d, 0, -0.5224739938d, 0.8521606816d, 0.02903615945d, 0, -0.7734880599d,
-            -0.5261292347d, 0.3534179531d, 0, -0.7134492443d, -0.269547243d, 0.6467878011d, 0, 0.1644037271d, 0.5105846203d, -0.8439637196d,
-            0, 0.6494635788d, 0.05585611296d, 0.7583384168d, 0, -0.4711970882d, 0.5017280509d, -0.7254255765d, 0, -0.6335764307d,
-            -0.2381686273d, -0.7361091029d, 0, -0.9021533097d, -0.270947803d, -0.3357181763d, 0, -0.3793711033d, 0.872258117d,
-            0.3086152025d, 0, -0.6855598966d, -0.3250143309d, 0.6514394162d, 0, 0.2900942212d, -0.7799057743d, -0.5546100667d, 0,
-            -0.2098319339d, 0.85037073d, 0.4825351604d, 0, -0.4592603758d, 0.6598504336d, -0.5947077538d, 0, 0.8715945488d, 0.09616365406d,
-            -0.4807031248d, 0, -0.6776666319d, 0.7118504878d, -0.1844907016d, 0, 0.7044377633d, 0.312427597d, 0.637304036d, 0,
-            -0.7052318886d, -0.2401093292d, -0.6670798253d, 0, 0.081921007d, -0.7207336136d, -0.6883545647d, 0, -0.6993680906d,
-            -0.5875763221d, -0.4069869034d, 0, -0.1281454481d, 0.6419895885d, 0.7559286424d, 0, -0.6337388239d, -0.6785471501d,
-            -0.3714146849d, 0, 0.5565051903d, -0.2168887573d, -0.8020356851d, 0, -0.5791554484d, 0.7244372011d, -0.3738578718d, 0,
-            0.1175779076d, -0.7096451073d, 0.6946792478d, 0, -0.6134619607d, 0.1323631078d, 0.7785527795d, 0, 0.6984635305d,
-            -0.02980516237d, -0.715024719d, 0, 0.8318082963d, -0.3930171956d, 0.3919597455d, 0, 0.1469576422d, 0.05541651717d,
-            -0.9875892167d, 0, 0.708868575d, -0.2690503865d, 0.6520101478d, 0, 0.2726053183d, 0.67369766d, -0.68688995d, 0, -0.6591295371d,
-            0.3035458599d, -0.6880466294d, 0, 0.4815131379d, -0.7528270071d, 0.4487723203d, 0, 0.9430009463d, 0.1675647412d, -0.2875261255d,
-            0, 0.434802957d, 0.7695304522d, -0.4677277752d, 0, 0.3931996188d, 0.594473625d, 0.7014236729d, 0, 0.7254336655d, -0.603925654d,
-            0.3301814672d, 0, 0.7590235227d, -0.6506083235d, 0.02433313207d, 0, -0.8552768592d, -0.3430042733d, 0.3883935666d, 0,
-            -0.6139746835d, 0.6981725247d, 0.3682257648d, 0, -0.7465905486d, -0.5752009504d, 0.3342849376d, 0, 0.5730065677d, 0.810555537d,
-            -0.1210916791d, 0, -0.9225877367d, -0.3475211012d, -0.167514036d, 0, -0.7105816789d, -0.4719692027d, -0.5218416899d, 0,
-            -0.08564609717d, 0.3583001386d, 0.929669703d, 0, -0.8279697606d, -0.2043157126d, 0.5222271202d, 0, 0.427944023d, 0.278165994d,
-            0.8599346446d, 0, 0.5399079671d, -0.7857120652d, -0.3019204161d, 0, 0.5678404253d, -0.5495413974d, -0.6128307303d, 0,
-            -0.9896071041d, 0.1365639107d, -0.04503418428d, 0, -0.6154342638d, -0.6440875597d, 0.4543037336d, 0, 0.1074204368d,
-            -0.7946340692d, 0.5975094525d, 0, -0.3595449969d, -0.8885529948d, 0.28495784d, 0, -0.2180405296d, 0.1529888965d, 0.9638738118d,
-            0, -0.7277432317d, -0.6164050508d, -0.3007234646d, 0, 0.7249729114d, -0.00669719484d, 0.6887448187d, 0, -0.5553659455d,
-            -0.5336586252d, 0.6377908264d, 0, 0.5137558015d, 0.7976208196d, -0.3160000073d, 0, -0.3794024848d, 0.9245608561d,
-            -0.03522751494d, 0, 0.8229248658d, 0.2745365933d, -0.4974176556d, 0, -0.5404114394d, 0.6091141441d, 0.5804613989d, 0,
-            0.8036581901d, -0.2703029469d, 0.5301601931d, 0, 0.6044318879d, 0.6832968393d, 0.4095943388d, 0, 0.06389988817d, 0.9658208605d,
-            -0.2512108074d, 0, 0.1087113286d, 0.7402471173d, -0.6634877936d, 0, -0.713427712d, -0.6926784018d, 0.1059128479d, 0,
-            0.6458897819d, -0.5724548511d, -0.5050958653d, 0, -0.6553931414d, 0.7381471625d, 0.159995615d, 0, 0.3910961323d, 0.9188871375d,
-            -0.05186755998d, 0, -0.4879022471d, -0.5904376907d, 0.6429111375d, 0, 0.6014790094d, 0.7707441366d, -0.2101820095d, 0,
-            -0.5677173047d, 0.7511360995d, 0.3368851762d, 0, 0.7858573506d, 0.226674665d, 0.5753666838d, 0, -0.4520345543d, -0.604222686d,
-            -0.6561857263d, 0, 0.002272116345d, 0.4132844051d, -0.9105991643d, 0, -0.5815751419d, -0.5162925989d, 0.6286591339d, 0,
-            -0.03703704785d, 0.8273785755d, 0.5604221175d, 0, -0.5119692504d, 0.7953543429d, -0.3244980058d, 0, -0.2682417366d,
-            -0.9572290247d, -0.1084387619d, 0, -0.2322482736d, -0.9679131102d, -0.09594243324d, 0, 0.3554328906d, -0.8881505545d,
-            0.2913006227d, 0, 0.7346520519d, -0.4371373164d, 0.5188422971d, 0, 0.9985120116d, 0.04659011161d, -0.02833944577d, 0,
-            -0.3727687496d, -0.9082481361d, 0.1900757285d, 0, 0.91737377d, -0.3483642108d, 0.1925298489d, 0, 0.2714911074d, 0.4147529736d,
-            -0.8684886582d, 0, 0.5131763485d, -0.7116334161d, 0.4798207128d, 0, -0.8737353606d, 0.18886992d, -0.4482350644d, 0,
-            0.8460043821d, -0.3725217914d, 0.3814499973d, 0, 0.8978727456d, -0.1780209141d, -0.4026575304d, 0, 0.2178065647d,
-            -0.9698322841d, -0.1094789531d, 0, -0.1518031304d, -0.7788918132d, -0.6085091231d, 0, -0.2600384876d, -0.4755398075d,
-            -0.8403819825d, 0, 0.572313509d, -0.7474340931d, -0.3373418503d, 0, -0.7174141009d, 0.1699017182d, -0.6756111411d, 0,
-            -0.684180784d, 0.02145707593d, -0.7289967412d, 0, -0.2007447902d, 0.06555605789d, -0.9774476623d, 0, -0.1148803697d,
-            -0.8044887315d, 0.5827524187d, 0, -0.7870349638d, 0.03447489231d, 0.6159443543d, 0, -0.2015596421d, 0.6859872284d,
-            0.6991389226d, 0, -0.08581082512d, -0.10920836d, -0.9903080513d, 0, 0.5532693395d, 0.7325250401d, -0.396610771d, 0,
-            -0.1842489331d, -0.9777375055d, -0.1004076743d, 0, 0.0775473789d, -0.9111505856d, 0.4047110257d, 0, 0.1399838409d,
-            0.7601631212d, -0.6344734459d, 0, 0.4484419361d, -0.845289248d, 0.2904925424d, 0
-    };
-    static final double[] RAND_VECS_2D = {
-            -0.2700222198d, -0.9628540911d, 0.3863092627d, -0.9223693152d, 0.04444859006d, -0.999011673d, -0.5992523158d, -0.8005602176d,
-            -0.7819280288d, 0.6233687174d, 0.9464672271d, 0.3227999196d, -0.6514146797d, -0.7587218957d, 0.9378472289d, 0.347048376d,
-            -0.8497875957d, -0.5271252623d, -0.879042592d, 0.4767432447d, -0.892300288d, -0.4514423508d, -0.379844434d, -0.9250503802d,
-            -0.9951650832d, 0.0982163789d, 0.7724397808d, -0.6350880136d, 0.7573283322d, -0.6530343002d, -0.9928004525d, -0.119780055d,
-            -0.0532665713d, 0.9985803285d, 0.9754253726d, -0.2203300762d, -0.7665018163d, 0.6422421394d, 0.991636706d, 0.1290606184d,
-            -0.994696838d, 0.1028503788d, -0.5379205513d, -0.84299554d, 0.5022815471d, -0.8647041387d, 0.4559821461d, -0.8899889226d,
-            -0.8659131224d, -0.5001944266d, 0.0879458407d, -0.9961252577d, -0.5051684983d, 0.8630207346d, 0.7753185226d, -0.6315704146d,
-            -0.6921944612d, 0.7217110418d, -0.5191659449d, -0.8546734591d, 0.8978622882d, -0.4402764035d, -0.1706774107d, 0.9853269617d,
-            -0.9353430106d, -0.3537420705d, -0.9992404798d, 0.03896746794d, -0.2882064021d, -0.9575683108d, -0.9663811329d, 0.2571137995d,
-            -0.8759714238d, -0.4823630009d, -0.8303123018d, -0.5572983775d, 0.05110133755d, -0.9986934731d, -0.8558373281d, -0.5172450752d,
-            0.09887025282d, 0.9951003332d, 0.9189016087d, 0.3944867976d, -0.2439375892d, -0.9697909324d, -0.8121409387d, -0.5834613061d,
-            -0.9910431363d, 0.1335421355d, 0.8492423985d, -0.5280031709d, -0.9717838994d, -0.2358729591d, 0.9949457207d, 0.1004142068d,
-            0.6241065508d, -0.7813392434d, 0.662910307d, 0.7486988212d, -0.7197418176d, 0.6942418282d, -0.8143370775d, -0.5803922158d,
-            0.104521054d, -0.9945226741d, -0.1065926113d, -0.9943027784d, 0.445799684d, -0.8951327509d, 0.105547406d, 0.9944142724d,
-            -0.992790267d, 0.1198644477d, -0.8334366408d, 0.552615025d, 0.9115561563d, -0.4111755999d, 0.8285544909d, -0.5599084351d,
-            0.7217097654d, -0.6921957921d, 0.4940492677d, -0.8694339084d, -0.3652321272d, -0.9309164803d, -0.9696606758d, 0.2444548501d,
-            0.08925509731d, -0.996008799d, 0.5354071276d, -0.8445941083d, -0.1053576186d, 0.9944343981d, -0.9890284586d, 0.1477251101d,
-            0.004856104961d, 0.9999882091d, 0.9885598478d, 0.1508291331d, 0.9286129562d, -0.3710498316d, -0.5832393863d, -0.8123003252d,
-            0.3015207509d, 0.9534596146d, -0.9575110528d, 0.2883965738d, 0.9715802154d, -0.2367105511d, 0.229981792d, 0.9731949318d,
-            0.955763816d, -0.2941352207d, 0.740956116d, 0.6715534485d, -0.9971513787d, -0.07542630764d, 0.6905710663d, -0.7232645452d,
-            -0.290713703d, -0.9568100872d, 0.5912777791d, -0.8064679708d, -0.9454592212d, -0.325740481d, 0.6664455681d, 0.74555369d,
-            0.6236134912d, 0.7817328275d, 0.9126993851d, -0.4086316587d, -0.8191762011d, 0.5735419353d, -0.8812745759d, -0.4726046147d,
-            0.9953313627d, 0.09651672651d, 0.9855650846d, -0.1692969699d, -0.8495980887d, 0.5274306472d, 0.6174853946d, -0.7865823463d,
-            0.8508156371d, 0.52546432d, 0.9985032451d, -0.05469249926d, 0.1971371563d, -0.9803759185d, 0.6607855748d, -0.7505747292d,
-            -0.03097494063d, 0.9995201614d, -0.6731660801d, 0.739491331d, -0.7195018362d, -0.6944905383d, 0.9727511689d, 0.2318515979d,
-            0.9997059088d, -0.0242506907d, 0.4421787429d, -0.8969269532d, 0.9981350961d, -0.061043673d, -0.9173660799d, -0.3980445648d,
-            -0.8150056635d, -0.5794529907d, -0.8789331304d, 0.4769450202d, 0.0158605829d, 0.999874213d, -0.8095464474d, 0.5870558317d,
-            -0.9165898907d, -0.3998286786d, -0.8023542565d, 0.5968480938d, -0.5176737917d, 0.8555780767d, -0.8154407307d, -0.5788405779d,
-            0.4022010347d, -0.9155513791d, -0.9052556868d, -0.4248672045d, 0.7317445619d, 0.6815789728d, -0.5647632201d, -0.8252529947d,
-            -0.8403276335d, -0.5420788397d, -0.9314281527d, 0.363925262d, 0.5238198472d, 0.8518290719d, 0.7432803869d, -0.6689800195d,
-            -0.985371561d, -0.1704197369d, 0.4601468731d, 0.88784281d, 0.825855404d, 0.5638819483d, 0.6182366099d, 0.7859920446d,
-            0.8331502863d, -0.553046653d, 0.1500307506d, 0.9886813308d, -0.662330369d, -0.7492119075d, -0.668598664d, 0.743623444d,
-            0.7025606278d, 0.7116238924d, -0.5419389763d, -0.8404178401d, -0.3388616456d, 0.9408362159d, 0.8331530315d, 0.5530425174d,
-            -0.2989720662d, -0.9542618632d, 0.2638522993d, 0.9645630949d, 0.124108739d, -0.9922686234d, -0.7282649308d, -0.6852956957d,
-            0.6962500149d, 0.7177993569d, -0.9183535368d, 0.3957610156d, -0.6326102274d, -0.7744703352d, -0.9331891859d, -0.359385508d,
-            -0.1153779357d, -0.9933216659d, 0.9514974788d, -0.3076565421d, -0.08987977445d, -0.9959526224d, 0.6678496916d, 0.7442961705d,
-            0.7952400393d, -0.6062947138d, -0.6462007402d, -0.7631674805d, -0.2733598753d, 0.9619118351d, 0.9669590226d, -0.254931851d,
-            -0.9792894595d, 0.2024651934d, -0.5369502995d, -0.8436138784d, -0.270036471d, -0.9628500944d, -0.6400277131d, 0.7683518247d,
-            -0.7854537493d, -0.6189203566d, 0.06005905383d, -0.9981948257d, -0.02455770378d, 0.9996984141d, -0.65983623d, 0.751409442d,
-            -0.6253894466d, -0.7803127835d, -0.6210408851d, -0.7837781695d, 0.8348888491d, 0.5504185768d, -0.1592275245d, 0.9872419133d,
-            0.8367622488d, 0.5475663786d, -0.8675753916d, -0.4973056806d, -0.2022662628d, -0.9793305667d, 0.9399189937d, 0.3413975472d,
-            0.9877404807d, -0.1561049093d, -0.9034455656d, 0.4287028224d, 0.1269804218d, -0.9919052235d, -0.3819600854d, 0.924178821d,
-            0.9754625894d, 0.2201652486d, -0.3204015856d, -0.9472818081d, -0.9874760884d, 0.1577687387d, 0.02535348474d, -0.9996785487d,
-            0.4835130794d, -0.8753371362d, -0.2850799925d, -0.9585037287d, -0.06805516006d, -0.99768156d, -0.7885244045d, -0.6150034663d,
-            0.3185392127d, -0.9479096845d, 0.8880043089d, 0.4598351306d, 0.6476921488d, -0.7619021462d, 0.9820241299d, 0.1887554194d,
-            0.9357275128d, -0.3527237187d, -0.8894895414d, 0.4569555293d, 0.7922791302d, 0.6101588153d, 0.7483818261d, 0.6632681526d,
-            -0.7288929755d, -0.6846276581d, 0.8729032783d, -0.4878932944d, 0.8288345784d, 0.5594937369d, 0.08074567077d, 0.9967347374d,
-            0.9799148216d, -0.1994165048d, -0.580730673d, -0.8140957471d, -0.4700049791d, -0.8826637636d, 0.2409492979d, 0.9705377045d,
-            0.9437816757d, -0.3305694308d, -0.8927998638d, -0.4504535528d, -0.8069622304d, 0.5906030467d, 0.06258973166d, 0.9980393407d,
-            -0.9312597469d, 0.3643559849d, 0.5777449785d, 0.8162173362d, -0.3360095855d, -0.941858566d, 0.697932075d, -0.7161639607d,
-            -0.002008157227d, -0.9999979837d, -0.1827294312d, -0.9831632392d, -0.6523911722d, 0.7578824173d, -0.4302626911d, -0.9027037258d,
-            -0.9985126289d, -0.05452091251d, -0.01028102172d, -0.9999471489d, -0.4946071129d, 0.8691166802d, -0.2999350194d, 0.9539596344d,
-            0.8165471961d, 0.5772786819d, 0.2697460475d, 0.962931498d, -0.7306287391d, -0.6827749597d, -0.7590952064d, -0.6509796216d,
-            -0.907053853d, 0.4210146171d, -0.5104861064d, -0.8598860013d, 0.8613350597d, 0.5080373165d, 0.5007881595d, -0.8655698812d,
-            -0.654158152d, 0.7563577938d, -0.8382755311d, -0.545246856d, 0.6940070834d, 0.7199681717d, 0.06950936031d, 0.9975812994d,
-            0.1702942185d, -0.9853932612d, 0.2695973274d, 0.9629731466d, 0.5519612192d, -0.8338697815d, 0.225657487d, -0.9742067022d,
-            0.4215262855d, -0.9068161835d, 0.4881873305d, -0.8727388672d, -0.3683854996d, -0.9296731273d, -0.9825390578d, 0.1860564427d,
-            0.81256471d, 0.5828709909d, 0.3196460933d, -0.9475370046d, 0.9570913859d, 0.2897862643d, -0.6876655497d, -0.7260276109d,
-            -0.9988770922d, -0.047376731d, -0.1250179027d, 0.992154486d, -0.8280133617d, 0.560708367d, 0.9324863769d, -0.3612051451d,
-            0.6394653183d, 0.7688199442d, -0.01623847064d, -0.9998681473d, -0.9955014666d, -0.09474613458d, -0.81453315d, 0.580117012d,
-            0.4037327978d, -0.9148769469d, 0.9944263371d, 0.1054336766d, -0.1624711654d, 0.9867132919d, -0.9949487814d, -0.100383875d,
-            -0.6995302564d, 0.7146029809d, 0.5263414922d, -0.85027327d, -0.5395221479d, 0.841971408d, 0.6579370318d, 0.7530729462d,
-            0.01426758847d, -0.9998982128d, -0.6734383991d, 0.7392433447d, 0.639412098d, -0.7688642071d, 0.9211571421d, 0.3891908523d,
-            -0.146637214d, -0.9891903394d, -0.782318098d, 0.6228791163d, -0.5039610839d, -0.8637263605d, -0.7743120191d, -0.6328039957d,
-            };
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/util/HashIntrinsic.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.util;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-public abstract class HashIntrinsic implements Serializable {
-    public static final int FLOAT_EXP_BIT_MASK = 2139095040;
-    public static final int FLOAT_SIGNIF_BIT_MASK = 8388607;
-    public static final long DOUBLE_EXP_BIT_MASK = 9218868437227405312L;
-    public static final long DOUBLE_SIGNIF_BIT_MASK = 4503599627370495L;
-    protected static final int DEFAULT_INITIAL_CAPACITY = 16;
-    protected static final int MAXIMUM_CAPACITY = 1073741824;
-    protected static final float DEFAULT_LOAD_FACTOR = 0.75F;
-    @Serial
-    private static final long serialVersionUID = 8058099372006904458L;
-    protected int size;
-    protected int threshold;
-    protected float loadFactor;
-    protected int capMinus1;
-    
-    protected HashIntrinsic(int initialCapacity, float loadFactor) {
-        if(initialCapacity <= 0) {
-            throw new IllegalArgumentException("Illegal initial capacity: " + initialCapacity);
-        } else if(!(loadFactor <= 0.0F) && !Float.isNaN(loadFactor)) {
-            if(initialCapacity > 1073741824) {
-                initialCapacity = 1073741824;
-            }
-            
-            int capacity;
-            for(capacity = 1; capacity < initialCapacity; capacity <<= 1) {
-            }
-            
-            this.capMinus1 = capacity - 1;
-            this.loadFactor = loadFactor;
-            this.threshold = (int) ((float) capacity * loadFactor);
-        } else {
-            throw new IllegalArgumentException("Illegal load factor: " + loadFactor);
-        }
-    }
-    
-    public static int floatToIntBits(float value) {
-        int result = Float.floatToRawIntBits(value);
-        if((result & 2139095040) == 2139095040 && (result & 8388607) != 0) {
-            result = 2143289344;
-        }
-        
-        return result;
-    }
-    
-    public static long doubleToLongBits(double value) {
-        long result = Double.doubleToRawLongBits(value);
-        if((result & 9218868437227405312L) == 9218868437227405312L && (result & 4503599627370495L) != 0L) {
-            result = 9221120237041090560L;
-        }
-        
-        return result;
-    }
-    
-    protected static int hashCodeLong(long value) {
-        return (int) (value ^ value >>> 32);
-    }
-    
-    protected static int hashCodeFloat(float value) {
-        return floatToIntBits(value);
-    }
-    
-    protected static int hashCodeDouble(double value) {
-        long bits = doubleToLongBits(value);
-        return (int) (bits ^ bits >>> 32);
-    }
-    
-    protected static int tableIndex(int hc, int lm1) {
-        hc ^= hc >>> 20 ^ hc >>> 12;
-        hc ^= hc >>> 7 ^ hc >>> 4;
-        return hc & lm1;
-    }
-    
-    public int size() {
-        return this.size;
-    }
-    
-    public abstract void clear();
-    
-    public boolean isEmpty() {
-        return this.size == 0;
-    }
-}

common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/util/HashMapDoubleDouble.java

@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.noise.util;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.NoSuchElementException;
-
-
-public class HashMapDoubleDouble extends HashIntrinsic {
-    @Serial
-    private static final long serialVersionUID = 2109458761298324234L;
-    private HashMapDoubleDouble.Entry[] table;
-    
-    public HashMapDoubleDouble(int initialCapacity, float loadFactor) {
-        super(initialCapacity, loadFactor);
-        this.table = this.createTable(this.capMinus1 + 1);
-    }
-    
-    public HashMapDoubleDouble(int initialCapacity) {
-        this(initialCapacity, 0.75F);
-    }
-    
-    public HashMapDoubleDouble() {
-        this(16, 0.75F);
-    }
-    
-    public final boolean contains(double key) {
-        int i = tableIndex(hashCodeDouble(key), this.capMinus1);
-        
-        for(HashMapDoubleDouble.Entry e = this.table[i]; e != null; e = e.next) {
-            if(e.key == key) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    public boolean containsValue(double value) {
-        for(Entry entry : this.table) {
-            for(Entry e = entry; e != null; e = e.next) {
-                if(value == e.value) {
-                    return true;
-                }
-            }
-        }
-        
-        return false;
-    }
-    
-    public double get(double key) {
-        int i = tableIndex(hashCodeDouble(key), this.capMinus1);
-        
-        for(HashMapDoubleDouble.Entry e = this.table[i]; e != null; e = e.next) {
-            if(key == e.key) {
-                return e.value;
-            }
-        }
-        
-        return 4.9E-324D;
-    }
-    
-    public double put(double key, double value) {
-        int i = tableIndex(hashCodeDouble(key), this.capMinus1);
-        
-        for(HashMapDoubleDouble.Entry e = this.table[i]; e != null; e = e.next) {
-            if(key == e.key) {
-                double oldValue = e.value;
-                e.value = value;
-                return oldValue;
-            }
-        }
-        
-        this.addEntry(key, value, i);
-        return 4.9E-324D;
-    }
-    
-    public void resize(int newCapacity) {
-        int oldCapacity = this.table.length;
-        if(oldCapacity == 1073741824) {
-            this.threshold = 2147483647;
-        } else {
-            HashMapDoubleDouble.Entry[] newTable = this.createTable(newCapacity);
-            this.capMinus1 = newCapacity - 1;
-            this.transfer(newTable);
-            this.table = newTable;
-            this.threshold = (int) ((float) newCapacity * this.loadFactor);
-        }
-    }
-    
-    public final HashMapDoubleDouble.Entry remove(double key) {
-        int i = tableIndex(hashCodeDouble(key), this.capMinus1);
-        HashMapDoubleDouble.Entry prev = this.table[i];
-        
-        HashMapDoubleDouble.Entry e;
-        HashMapDoubleDouble.Entry next;
-        for(e = prev; e != null; e = next) {
-            next = e.next;
-            if(key == e.key) {
-                --this.size;
-                if(prev == e) {
-                    this.table[i] = next;
-                } else {
-                    prev.next = next;
-                }
-                
-                return e;
-            }
-            
-            prev = e;
-        }
-        
-        return e;
-    }
-    
-    public void clear() {
-        Arrays.fill(this.table, null);
-        
-        this.size = 0;
-    }
-    
-    public long memoryEstimate(int ptrsize) {
-        return (long) ptrsize * (long) (this.capMinus1 + this.size + 1) + (this.size * 64L / 4);
-    }
-    
-    public HashMapDoubleDouble.Iterator iterator() {
-        return new HashMapDoubleDouble.Iterator();
-    }
-    
-    private void addEntry(double key, double value, int index) {
-        HashMapDoubleDouble.Entry e = this.table[index];
-        this.table[index] = new HashMapDoubleDouble.Entry(key, value, e);
-        if(this.size++ >= this.threshold) {
-            this.resize(2 * this.table.length);
-        }
-        
-    }
-    
-    private void transfer(HashMapDoubleDouble.Entry[] newTable) {
-        for(int j = 0; j < this.table.length; ++j) {
-            HashMapDoubleDouble.Entry e = this.table[j];
-            if(e != null) {
-                this.table[j] = null;
-                
-                HashMapDoubleDouble.Entry next;
-                do {
-                    next = e.next;
-                    int i = tableIndex(hashCodeDouble(e.key), this.capMinus1);
-                    e.next = newTable[i];
-                    newTable[i] = e;
-                    e = next;
-                } while(next != null);
-            }
-        }
-        
-    }
-    
-    private HashMapDoubleDouble.Entry[] createTable(int capacity) {
-        return new HashMapDoubleDouble.Entry[capacity];
-    }
-    
-    public HashMapDoubleDouble.Entry getEntry(double key) {
-        int i = tableIndex(hashCodeDouble(key), this.capMinus1);
-        
-        for(HashMapDoubleDouble.Entry e = this.table[i]; e != null; e = e.next) {
-            if(key == e.key) {
-                return e;
-            }
-        }
-        
-        return null;
-    }
-    
-    
-    public static class Entry implements Serializable {
-        @Serial
-        private static final long serialVersionUID = 7972173983741231238L;
-        private final double key;
-        private double value;
-        private HashMapDoubleDouble.Entry next;
-        
-        public Entry(double key, double val, HashMapDoubleDouble.Entry n) {
-            this.key = key;
-            this.value = val;
-            this.next = n;
-        }
-        
-        public final double setValue(double newValue) {
-            double oldValue = this.value;
-            this.value = newValue;
-            return oldValue;
-        }
-        
-        public final double getKey() {
-            return this.key;
-        }
-        
-        public final double getValue() {
-            return this.value;
-        }
-        
-        public final int hashCode() {
-            return hashCodeDouble(key) + hashCodeDouble(value);
-        }
-        
-        public final boolean equals(Object o) {
-            HashMapDoubleDouble.Entry e = (HashMapDoubleDouble.Entry) o;
-            return this.key == e.key && this.value == e.value;
-        }
-        
-        public final String toString() {
-            return this.key + " = " + this.value;
-        }
-    }
-    
-    
-    public class Iterator {
-        HashMapDoubleDouble.Entry next;
-        int index;
-        HashMapDoubleDouble.Entry current;
-        
-        Iterator() {
-            if(HashMapDoubleDouble.this.size > 0) {
-                while(this.index < HashMapDoubleDouble.this.table.length &&
-                      (this.next = HashMapDoubleDouble.this.table[this.index++]) == null) {
-                }
-            }
-            
-        }
-        
-        public HashMapDoubleDouble.Entry nextEntry() {
-            HashMapDoubleDouble.Entry e = this.next;
-            if(e == null) {
-                throw new NoSuchElementException();
-            } else {
-                if((this.next = e.next) == null) {
-                    while(this.index < HashMapDoubleDouble.this.table.length &&
-                          (this.next = HashMapDoubleDouble.this.table[this.index++]) == null) {
-                    }
-                }
-                
-                this.current = e;
-                return e;
-            }
-        }
-        
-        public double next() {
-            return this.nextEntry().value;
-        }
-        
-        public void remove() {
-            if(this.current == null) {
-                throw new IllegalStateException();
-            } else {
-                double k = this.current.key;
-                this.current = null;
-                HashMapDoubleDouble.this.remove(k);
-            }
-        }
-        
-        public final boolean hasNext() {
-            return this.next != null;
-        }
-    }
-}

common/addons/config-noise-function/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.noise.NoiseAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-noise-function/issues
-  source: https://github.com/PolyhedralDev/Terra-config-noise-function
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-ore/build.gradle.kts

@@ -1,5 +1,11 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    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.ore.lib.jafama")
 }

common/addons/config-ore/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.ore.OreAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-ore/issues
-  source: https://github.com/PolyhedralDev/Terra-config-ore
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-palette/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/config-palette/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.palette.PaletteAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-palette/issues
-  source: https://github.com/PolyhedralDev/Terra-config-palette
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/config-structure/build.gradle.kts

@@ -1,6 +1,13 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi("com.googlecode.json-simple:json-simple:1.1.1")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("com.googlecode.json-simple:json-simple:1.1.1")
+    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.structure.lib.jafama")
 }

common/addons/config-structure/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.structure.StructureAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-config-structure/issues
-  source: https://github.com/PolyhedralDev/Terra-config-structure
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/generation-stage-feature/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java

@@ -12,7 +12,6 @@ import java.util.Random;
 
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Rotation;
 import com.dfsek.terra.api.util.vector.Vector3Int;
@@ -27,49 +26,52 @@ public class FeatureGenerationStage implements GenerationStage, StringIdentifiab
     
     private final String id;
     
+    private final String profile;
+    
     public FeatureGenerationStage(Platform platform, String id) {
         this.platform = platform;
         this.id = id;
+        this.profile = "feature_stage:" + id;
     }
     
     @Override
     @SuppressWarnings("try")
     public void populate(ProtoWorld world) {
-        try(ProfileFrame ignore = platform.getProfiler().profile("feature_stage:" + id)) {
-            int cx = world.centerChunkX() << 4;
-            int cz = world.centerChunkZ() << 4;
-            long seed = world.getSeed();
-            for(int x = 0; x < 16; x++) {
-                for(int z = 0; z < 16; z++) {
-                    int tx = cx + x;
-                    int tz = cz + z;
-                    Column<WritableWorld> column = world.column(tx, tz);
-                    long coordinateSeed = (seed * 31 + tx) * 31 + tz;
-                    
-                    world.getBiomeProvider()
-                         .getBiome(tx, tz, seed)
-                         .getContext()
-                         .get(BiomeFeatures.class)
-                         .getFeatures()
-                         .getOrDefault(this, Collections.emptyList())
-                         .forEach(feature -> {
-                             try(ProfileFrame ignored = platform.getProfiler().profile(feature.getID())) {
-                                 if(feature.getDistributor().matches(tx, tz, seed)) {
-                                     feature.getLocator()
-                                            .getSuitableCoordinates(column)
-                                            .forEach(y ->
-                                                             feature.getStructure(world, tx, y, tz)
-                                                                    .generate(Vector3Int.of(tx, y, tz),
-                                                                              world,
-                                                                              new Random(coordinateSeed * 31 + y),
-                                                                              Rotation.NONE)
-                                                    );
-                                 }
-                             }
-                         });
-                }
+        platform.getProfiler().push(profile);
+        int cx = world.centerChunkX() << 4;
+        int cz = world.centerChunkZ() << 4;
+        long seed = world.getSeed();
+        for(int x = 0; x < 16; x++) {
+            for(int z = 0; z < 16; z++) {
+                int tx = cx + x;
+                int tz = cz + z;
+                Column<WritableWorld> column = world.column(tx, tz);
+                long coordinateSeed = (seed * 31 + tx) * 31 + tz;
+                
+                world.getBiomeProvider()
+                     .getBiome(tx, 0, tz, seed)
+                     .getContext()
+                     .get(BiomeFeatures.class)
+                     .getFeatures()
+                     .getOrDefault(this, Collections.emptyList())
+                     .forEach(feature -> {
+                         platform.getProfiler().push(feature.getID());
+                         if(feature.getDistributor().matches(tx, tz, seed)) {
+                             feature.getLocator()
+                                    .getSuitableCoordinates(column)
+                                    .forEach(y ->
+                                                     feature.getStructure(world, tx, y, tz)
+                                                            .generate(Vector3Int.of(tx, y, tz),
+                                                                      world,
+                                                                      new Random(coordinateSeed * 31 + y),
+                                                                      Rotation.NONE)
+                                            );
+                         }
+                         platform.getProfiler().pop(feature.getID());
+                     });
             }
         }
+        platform.getProfiler().pop(profile);
     }
     
     @Override

common/addons/generation-stage-feature/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.generation.feature.FeatureGenerationAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-generation-stage-feature/issues
-  source: https://github.com/PolyhedralDev/Terra-generation-stage-feature
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/generation-stage-structure/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/generation-stage-structure/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.generation.structure.StructureGenerationAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-generation-stage-structure/issues
-  source: https://github.com/PolyhedralDev/Terra-generation-stage-structure
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/language-yaml/build.gradle.kts

@@ -1,6 +1,6 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/language-yaml/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.yaml.YamlAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-language-yaml/issues
-  source: https://github.com/PolyhedralDev/Terra-language-yaml
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/manifest-addon-loader/build.gradle.kts

@@ -1,8 +1,8 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    api("commons-io:commons-io:2.7")
+    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
 }
 
 tasks.withType<Jar> {

common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java

@@ -20,7 +20,6 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -38,6 +37,7 @@ import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionRangeLoader;
 import com.dfsek.terra.addons.manifest.impl.exception.AddonException;
 import com.dfsek.terra.addons.manifest.impl.exception.ManifestException;
 import com.dfsek.terra.addons.manifest.impl.exception.ManifestNotPresentException;
+import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader;
 import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon;
 
 
@@ -72,13 +72,9 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
                     throw new AddonException("Addon " + manifest.getID() + " has unknown schema version: " + manifest.getSchemaVersion());
                 }
                 
-                @SuppressWarnings({ "IOResourceOpenedButNotSafelyClosed", "resource" })
-                ManifestAddonClassLoader childLoader = new ManifestAddonClassLoader(new URL[]{ addonPath.toUri().toURL() },
-                                                                                    loader);
-                
                 List<AddonInitializer> initializers = manifest.getEntryPoints().stream().map(entryPoint -> {
                     try {
-                        Object in = childLoader.loadClass(entryPoint).getConstructor().newInstance();
+                        Object in = loader.loadClass(entryPoint).getConstructor().newInstance();
                         if(!(in instanceof AddonInitializer)) {
                             throw new AddonException(in.getClass() + " does not extend " + AddonInitializer.class);
                         }
@@ -103,7 +99,7 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
     }
     
     @Override
-    public Iterable<ManifestAddon> loadAddons(Path addonsFolder, ClassLoader parent) {
+    public Iterable<ManifestAddon> loadAddons(Path addonsFolder, BootstrapAddonClassLoader parent) {
         logger.debug("Loading addons...");
         
         try(Stream<Path> files = Files.walk(addonsFolder, 1, FileVisitOption.FOLLOW_LINKS)) {
@@ -114,16 +110,16 @@ public class ManifestAddonLoader implements BootstrapBaseAddon<ManifestAddon> {
                     .filter(path -> path.toString().endsWith(".jar"))
                     .toList();
             
-            ManifestAddonClassLoader loader = new ManifestAddonClassLoader(addons.stream().map(path -> {
+            addons.stream().map(path -> {
                 try {
                     return path.toUri().toURL();
                 } catch(MalformedURLException e) {
                     throw new UncheckedIOException(e);
                 }
-            }).toArray(URL[]::new), getClass().getClassLoader());
+            }).forEach(parent::addURL);
             
             return addons.stream()
-                         .map(jar -> loadAddon(jar, loader))
+                         .map(jar -> loadAddon(jar, parent))
                          .collect(Collectors.toList());
         } catch(IOException e) {
             throw new UncheckedIOException(e);

common/addons/palette-block-shortcut/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/palette-block-shortcut/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/structure-block-shortcut/build.gradle.kts

@@ -1,5 +1,5 @@
-version = version("0.1.0")
+version = version("1.0.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/structure-block-shortcut/src/main/resources/terra.addon.yml

@@ -8,5 +8,5 @@ entrypoints:
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/structure-mutator/build.gradle.kts

@@ -1,5 +1,5 @@
 version = version("0.1.0")
 
 dependencies {
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }

common/addons/structure-mutator/src/main/resources/terra.addon.yml

@@ -7,5 +7,5 @@ entrypoints: [ ]
 website:
   issues: https://github.com/PolyhedralDev/Terra/issues
   source: https://github.com/PolyhedralDev/Terra
-  docs: https://github.com/PolyhedralDev/Terra/wiki
+  docs: https://terra.polydev.org
 license: MIT License

common/addons/structure-sponge-loader/build.gradle.kts

@@ -1,25 +1,17 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = version("0.1.0")
-
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
+version = version("1.0.0")
 
 repositories {
     maven { url = uri("https://jitpack.io/") }
 }
 
 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedApi("com.github.Querz:NBT:6.1")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("commons-io:commons-io:2.7")
+    api("com.github.Querz:NBT:6.1")
+    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }
 
 tasks.named<ShadowJar>("shadowJar") {
     relocate("org.apache.commons", "com.dfsek.terra.addons.sponge.lib.commons")
-}
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
 }

common/addons/structure-sponge-loader/src/main/resources/terra.addon.yml

@@ -6,7 +6,7 @@ version: @VERSION@
 entrypoints:
   - "com.dfsek.terra.addons.sponge.SpongeSchematicAddon"
 website:
-  issues: https://github.com/PolyhedralDev/Terra-structure-sponge-loader/issues
-  source: https://github.com/PolyhedralDev/Terra-structure-sponge-loader
-  docs: https://github.com/PolyhedralDev/Terra/wiki
-license: GNU LGPL v3.0
+  issues: https://github.com/PolyhedralDev/Terra/issues
+  source: https://github.com/PolyhedralDev/Terra
+  docs: https://terra.polydev.org
+license: MIT License

common/addons/structure-terrascript-loader/build.gradle.kts

@@ -1,21 +1,15 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = version("0.1.0")
-
-
-plugins {
-    id("com.github.johnrengelman.shadow")
-}
+version = version("1.0.1")
 
 dependencies {
-    shadedApi("commons-io:commons-io:2.6")
-    shadedApi(project(":common:addons:manifest-addon-loader"))
+    api("commons-io:commons-io:2.7")
+    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<ShadowJar>("shadowJar") {
     relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
-}
-
-tasks.named("build") {
-    finalizedBy(tasks.named("shadowJar"))
+    relocate("net.jafama", "com.dfsek.terra.addons.terrascript.lib.jafama")
 }

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java

@@ -12,7 +12,7 @@ public class Scope {
         public Variable<?> get(String id) {
             throw new IllegalStateException("Cannot get variable from null scope: " + id);
         }
-
+        
         @Override
         public void put(String id, Variable<?> variable) {
             throw new IllegalStateException("Cannot set variable in null scope: " + id);
@@ -38,7 +38,7 @@ public class Scope {
     public void put(String id, Variable<?> variable) {
         variableMap.put(id, variable);
     }
-
+    
     
     public Scope sub() {
         return new Scope(this);

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.Scope;
@@ -24,11 +26,11 @@ public abstract class BinaryOperation<I, O> implements Returnable<O> {
         this.start = start;
     }
     
-    public abstract O apply(I left, I right);
+    public abstract O apply(Supplier<I> left, Supplier<I> right);
     
     @Override
     public O apply(ImplementationArguments implementationArguments, Scope scope) {
-        return apply(left.apply(implementationArguments, scope), right.apply(implementationArguments, scope));
+        return apply(() -> left.apply(implementationArguments, scope), () -> right.apply(implementationArguments, scope));
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class BooleanAndOperation extends BinaryOperation<Boolean, Boolean> {
     }
     
     @Override
-    public Boolean apply(Boolean left, Boolean right) {
-        return left && right;
+    public Boolean apply(Supplier<Boolean> left, Supplier<Boolean> right) {
+        return left.get() && right.get();
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class BooleanOrOperation extends BinaryOperation<Boolean, Boolean> {
     }
     
     @Override
-    public Boolean apply(Boolean left, Boolean right) {
-        return left || right;
+    public Boolean apply(Supplier<Boolean> left, Supplier<Boolean> right) {
+        return left.get() || right.get();
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class ConcatenationOperation extends BinaryOperation<Object, Object> {
     }
     
     @Override
-    public String apply(Object left, Object right) {
-        return left.toString() + right.toString();
+    public String apply(Supplier<Object> left, Supplier<Object> right) {
+        return left.get().toString() + right.get().toString();
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class DivisionOperation extends BinaryOperation<Number, Number> {
     }
     
     @Override
-    public Number apply(Number left, Number right) {
-        return left.doubleValue() / right.doubleValue();
+    public Number apply(Supplier<Number> left, Supplier<Number> right) {
+        return left.get().doubleValue() / right.get().doubleValue();
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class ModuloOperation extends BinaryOperation<Number, Number> {
     }
     
     @Override
-    public Number apply(Number left, Number right) {
-        return left.doubleValue() % right.doubleValue();
+    public Number apply(Supplier<Number> left, Supplier<Number> right) {
+        return left.get().doubleValue() % right.get().doubleValue();
     }
     
     @Override

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.terrascript.parser.lang.operations;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
@@ -17,8 +19,8 @@ public class MultiplicationOperation extends BinaryOperation<Number, Number> {
     }
     
     @Override
-    public Number apply(Number left, Number right) {
-        return left.doubleValue() * right.doubleValue();
+    public Number apply(Supplier<Number> left, Supplier<Number> right) {
+        return left.get().doubleValue() * right.get().doubleValue();
     }
     
     @Override