reformat

Updated to 1.21.9

.github/workflows/gradle-build.yml

@@ -17,16 +17,16 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+      - uses: actions/checkout@v4.2.2
       - name: Set up JDK 21
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
+        uses: actions/setup-java@v4.7.1
         with:
           java-version: '21'
           distribution: 'temurin'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-      - uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+      - uses: burrunan/gradle-cache-action@v3.0.1
         name: Build Terra
         with:
           # Specifies arguments for Gradle execution
@@ -44,4 +44,4 @@ jobs:
           # Properties are passed as -Pname=value
           properties: |
             kotlin.js.compiler=ir
-            kotlin.parallel.tasks.in.project=true
+            kotlin.parallel.tasks.in.project=true

buildSrc/build.gradle.kts

@@ -6,6 +6,12 @@ plugins {
 repositories {
     mavenCentral()
     gradlePluginPortal()
+    maven("https://maven.solo-studios.ca/releases") {
+        name = "Solo Studios"
+    }
+    maven("https://maven.solo-studios.ca/snapshots") {
+        name = "Solo Studios"
+    }
     maven("https://repo.codemc.org/repository/maven-public") {
         name = "CodeMC"
     }
@@ -16,11 +22,11 @@ repositories {
 
 dependencies {
     //TODO Allow pulling from Versions.kt
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.1")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
 
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.16")
-    implementation("org.ow2.asm", "asm", "9.7")
-    implementation("org.ow2.asm", "asm-tree", "9.7")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "2.0.0-beta.17")
+    implementation("org.ow2.asm", "asm", "9.8")
+    implementation("org.ow2.asm", "asm-tree", "9.8")
     implementation("com.dfsek.tectonic", "common", "4.2.1")
-    implementation("org.yaml", "snakeyaml", "2.3")
+    implementation("org.yaml", "snakeyaml", "2.4")
 }

buildSrc/src/main/kotlin/DependencyConfig.kt

@@ -30,6 +30,12 @@ fun Project.configureDependencies() {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven("https://maven.solo-studios.ca/releases") {
+            name = "Solo Studios"
+        }
+        maven("https://maven.solo-studios.ca/snapshots") {
+            name = "Solo Studios"
+        }
         maven("https://maven.fabricmc.net/") {
             name = "FabricMC"
         }
@@ -60,17 +66,14 @@ fun Project.configureDependencies() {
         maven("https://storehouse.okaeri.eu/repository/maven-public/") {
             name = "Okaeri"
         }
-        maven("https://maven.solo-studios.ca/releases") {
-            name = "Solo Studios"
-        }
-        maven("https://maven.solo-studios.ca/snapshots") {
-            name = "Solo Studios"
+        maven("https://repo.onarandombox.com/multiverse-releases") {
+            name = "onarandombox"
         }
     }
     
     dependencies {
-        testImplementation("org.junit.jupiter", "junit-jupiter-api", Versions.Libraries.Internal.junit)
-        testImplementation("org.junit.jupiter", "junit-jupiter-engine", Versions.Libraries.Internal.junit)
+        testImplementation("org.junit.jupiter", "junit-jupiter", Versions.Libraries.Internal.junit)
+        "testRuntimeOnly"("org.junit.platform", "junit-platform-launcher")
         compileOnly("org.jetbrains", "annotations", Versions.Libraries.Internal.jetBrainsAnnotations)
         
         compileOnly("com.google.guava", "guava", Versions.Libraries.Internal.guava)

buildSrc/src/main/kotlin/DistributionConfig.kt

@@ -52,7 +52,8 @@ fun Project.configureDistribution() {
                 val defaultPackUrl =
                     URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip")
                 downloadPack(defaultPackUrl, project)
-            } catch (_:Exception) {}
+            } catch (_: Exception) {
+            }
         }
     }
     

buildSrc/src/main/kotlin/Versions.kt

@@ -1,36 +1,36 @@
 object Versions {
     object Terra {
-        const val overworldConfig = "v1.3.4"
+        const val overworldConfig = "v1.5.2"
     }
     
     object Libraries {
         const val tectonic = "4.2.1"
-        const val paralithic = "1.0.3-SNAPSHOT"
+        const val paralithic = "2.0.1"
         const val strata = "1.3.2"
-        const val seismic = "0.3.2-SNAPSHOT"
+        const val seismic = "2.0.4"
         
         const val cloud = "2.0.0"
         
-        const val caffeine = "3.1.8"
-        
-        const val slf4j = "2.0.16"
+        const val caffeine = "3.2.1"
         
+        const val slf4j = "2.0.17"
+
         object Internal {
-            const val shadow = "8.3.3"
-            const val apacheText = "1.12.0"
-            const val apacheIO = "2.17.0"
-            const val guava = "33.3.1-jre"
-            const val asm = "9.7.1"
-            const val snakeYml = "2.3"
-            const val jetBrainsAnnotations = "26.0.1"
-            const val junit = "5.11.3"
+            const val shadow = "8.3.6"
+            const val apacheText = "1.13.1"
+            const val apacheIO = "2.19.0"
+            const val guava = "33.4.8-jre"
+            const val asm = "9.8"
+            const val snakeYml = "2.4"
+            const val jetBrainsAnnotations = "26.0.2"
+            const val junit = "5.13.1"
             const val nbt = "6.1"
         }
     }
     
     object Fabric {
-        const val fabricAPI = "0.118.0+${Mod.minecraft}"
-        const val cloud = "2.0.0-beta.9"
+        const val fabricAPI = "0.133.14+${Mod.minecraft}"
+        const val cloud = "2.0.0-beta.11"
     }
 //
 //    object Quilt {
@@ -39,14 +39,15 @@ object Versions {
 //    }
     
     object Mod {
-        const val mixin = "0.15.3+mixin.0.8.7"
+        const val mixin = "0.15.5+mixin.0.8.7"
+        const val mixinExtras = "0.4.1"
         
-        const val minecraft = "1.21.4"
-        const val yarn = "$minecraft+build.8"
-        const val fabricLoader = "0.16.10"
+        const val minecraft = "1.21.9"
+        const val yarn = "$minecraft+build.1"
+        const val fabricLoader = "0.17.2"
         
-        const val architecuryLoom = "1.9.428"
-        const val architecturyPlugin = "3.4.161"
+        const val architecuryLoom = "1.11.440"
+        const val architecturyPlugin = "3.4.162"
 
     }
 //
@@ -56,18 +57,20 @@ object Versions {
 //    }
     
     object Bukkit {
-        const val minecraft = "1.21.4"
-        const val paperBuild = "$minecraft-R0.1-20250317.101324-208"
+        const val minecraft = "1.21.9-rc1-R0.1"
+        const val paperBuild = "$minecraft-20250930.133904-13"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
-        const val reflectionRemapper = "0.1.1"
+        const val reflectionRemapper = "0.1.2"
         const val paperDevBundle = paperBuild
         const val runPaper = "2.3.1"
-        const val paperWeight = "2.0.0-beta.16"
-        const val cloud = "2.0.0-beta.10"
+        const val runPaperMinecraft = "1.21.9"
+        const val paperWeight = "2.0.0-beta.17"
+        const val cloud = "2.0.0-beta.11"
+        const val multiverse = "5.0.2"
     }
     
-    //
+//
 //    object Sponge {
 //        const val sponge = "9.0.0-SNAPSHOT"
 //        const val mixin = "0.8.2"
@@ -75,18 +78,18 @@ object Versions {
 //    }
 //
     object CLI {
-        const val logback = "1.5.8"
-        const val picocli = "4.7.6"
+        const val logback = "1.5.18"
+        const val picocli = "4.7.7"
     }
     
     object Allay {
-        const val api = "0.2.0"
-        const val gson = "2.12.1"
+        const val api = "0.4.1"
+        const val gson = "2.13.1"
         const val mappings = "3626653"
         const val mappingsGenerator = "366618e"
     }
     
     object Minestom {
-        const val minestom = "187931e50b"
+        const val minestom = "1_21_6-a40d7115d4"
     }
 }

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

@@ -14,14 +14,14 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 public class BiomeExtrusionProvider implements BiomeProvider {
     private final BiomeProvider delegate;
     private final Set<Biome> biomes;
-    private final List<Extrusion> extrusions;
+    private final Extrusion[] extrusions;
     private final int resolution;
 
     public BiomeExtrusionProvider(BiomeProvider delegate, List<Extrusion> extrusions, int resolution) {
         this.delegate = delegate;
         this.biomes = delegate.stream().collect(Collectors.toSet());
         extrusions.forEach(e -> biomes.addAll(e.getBiomes()));
-        this.extrusions = extrusions;
+        this.extrusions = extrusions.toArray(new Extrusion[0]);
         this.resolution = resolution;
     }
 
@@ -33,8 +33,8 @@ public class BiomeExtrusionProvider implements BiomeProvider {
     }
 
     public Biome extrude(Biome original, int x, int y, int z, long seed) {
-        for(Extrusion extrusion : extrusions) {
-            original = extrusion.extrude(original, x, y, z, seed);
+        for(int i = 0; i < extrusions.length; i++) {
+            original = extrusions[i].extrude(original, x, y, z, seed);
         }
         return original;
     }

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.biome.extrusion.config.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.range.Range;
 
 

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -7,9 +9,8 @@ import java.util.stream.Collectors;
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
 import com.dfsek.terra.addons.biome.query.api.BiomeQueries;
-import com.dfsek.seismic.type.sampler.Sampler;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.world.biome.Biome;
 
 

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

@@ -1,14 +1,15 @@
 package com.dfsek.terra.addons.biome.extrusion.extrusions;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.Collection;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import com.dfsek.terra.addons.biome.extrusion.api.Extrusion;
 import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome;
-import com.dfsek.seismic.type.sampler.Sampler;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.world.biome.Biome;
 
 

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

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.biome.image;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.biome.image.config.ImageProviderTemplate;
 import com.dfsek.terra.addons.biome.image.config.converter.ClosestBiomeColorConverterTemplate;
 import com.dfsek.terra.addons.biome.image.config.converter.ExactBiomeColorConverterTemplate;
@@ -27,8 +29,6 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
-import java.util.function.Supplier;
-
 
 public class ImageBiomeProviderAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {

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

@@ -7,8 +7,7 @@
 
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
-
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 
@@ -22,9 +21,9 @@ import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
 import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
+import com.dfsek.terra.api.util.cache.SeededVector2Key;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
@@ -83,8 +82,8 @@ public class PipelineBiomeProvider implements BiomeProvider {
 
     public Biome getBiome(int x, int z, long seed) {
 
-        x += mutator.getSample(seed + 1, x, z) * noiseAmp;
-        z += mutator.getSample(seed + 2, x, z) * noiseAmp;
+        x += (int) (mutator.getSample(seed + 1, x, z) * noiseAmp);
+        z += (int) (mutator.getSample(seed + 2, x, z) * noiseAmp);
 
         x /= resolution;
         z /= resolution;

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

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

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

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.biome.pipeline.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -19,7 +20,6 @@ import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 

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

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.biome.pipeline.config.source;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
@@ -14,7 +15,6 @@ import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

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

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.biome.pipeline.config.stage;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public abstract class StageTemplate implements ObjectTemplate<Stage> {

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.pipeline;
 
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
+
 import java.util.List;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
@@ -98,7 +100,7 @@ public class BiomeChunkImpl implements BiomeChunk {
         // chunk samples points on the same overall grid.
         // Without this, shared chunk borders (required because of adjacent cell reads) will not be identical
         // because points would be sampled on grids at different offsets, resulting in artifacts at borders.
-        return (int) Math.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
+        return FloatingPointFunctions.ceil((double) finalGridOrigin / initialGridInterval) * initialGridInterval;
     }
 
     private static int calculateFinalGridOrigin(int totalExpanderCount, List<Stage> stages) {

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.biome.pipeline.pipeline;
 
-import com.dfsek.terra.api.util.cache.SeededVector2Key;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,6 +10,7 @@ import com.dfsek.terra.addons.biome.pipeline.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.api.util.cache.SeededVector2Key;
 
 
 public class PipelineImpl implements Pipeline {

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

@@ -7,9 +7,10 @@
 
 package com.dfsek.terra.addons.biome.pipeline.source;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

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

@@ -1,9 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.stage.expander;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.addons.biome.pipeline.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class FractalExpander implements Expander {

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

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.seismic.type.vector.Vector2Int;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -14,12 +17,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import com.dfsek.seismic.type.vector.Vector2Int;
-
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

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

@@ -7,6 +7,9 @@
 
 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.seismic.type.vector.Vector2Int;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -16,9 +19,7 @@ import java.util.function.Predicate;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.seismic.type.vector.Vector2Int;
 
 
 public class BorderStage implements Stage {

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

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -15,7 +17,6 @@ import java.util.stream.Stream;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

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

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -14,7 +16,6 @@ import java.util.stream.Stream;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

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

@@ -7,12 +7,13 @@
 
 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.Objects;
 
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class SmoothStage implements Stage {

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.chunkgenerator.config.noise;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class BiomeNoiseConfigTemplate implements ObjectTemplate<BiomeNoiseProperties> {

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

@@ -1,6 +1,7 @@
 package com.dfsek.terra.addons.chunkgenerator.config.noise;
 
 import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.api.properties.Properties;
 
 

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

@@ -1,8 +1,9 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.seismic.type.vector.Vector3;
 
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
+
 
 public enum SlantCalculationMethod {
     DotProduct {

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

@@ -33,6 +33,7 @@ public class Interpolator {
     }
 
     //TODO this system is not very good, replace it wholesale
+
     /**
      * 2D Bilinear interpolation between 4 points on a unit square.
      *

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

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
 import com.dfsek.seismic.math.numericanalysis.interpolation.InterpolationFunctions;
 
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
@@ -28,8 +29,8 @@ public class LazilyEvaluatedInterpolator {
                                        PropertyKey<BiomeNoiseProperties> noisePropertiesKey, int min, int horizontalRes, int verticalRes,
                                        long seed) {
         this.noisePropertiesKey = noisePropertiesKey;
-        int hSamples = (int) Math.ceil(16.0 / horizontalRes);
-        int vSamples = (int) Math.ceil((double) (max - min) / verticalRes);
+        int hSamples = FloatingPointFunctions.ceil(16.0 / horizontalRes);
+        int vSamples = FloatingPointFunctions.ceil((double) (max - min) / verticalRes);
         this.zMul = (hSamples + 1);
         this.yMul = zMul * zMul;
         samples = new Double[yMul * (vSamples + 1)];

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

@@ -7,6 +7,8 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
 
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
+
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator;
@@ -26,7 +28,8 @@ public class Sampler3D {
     }
 
     public double sample(double x, double y, double z) {
-        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation((int) Math.round(x), (int) Math.round(z));
+        return interpolator.getNoise(x, y, z) + elevationInterpolator.getElevation(FloatingPointFunctions.round(x),
+            FloatingPointFunctions.round(z));
     }
 
     public double sample(int x, int y, int z) {

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

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.feature.distributor.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.feature.distributor.distributors.SamplerDistributor;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.feature.Distributor;
 
 

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

@@ -1,12 +1,11 @@
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
+import com.dfsek.seismic.algorithms.hashing.HashingFunctions;
+import com.dfsek.seismic.math.integer.IntegerFunctions;
+
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGeneratorFactory;
 
-import com.dfsek.seismic.algorithms.hashing.HashingFunctions;
-
-import com.dfsek.seismic.math.integer.IntegerFunctions;
-
 import com.dfsek.terra.api.structure.feature.Distributor;
 
 

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

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
 import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.api.structure.feature.Distributor;
 
 

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.feature;
 
 import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.feature.Distributor;
 import com.dfsek.terra.api.structure.feature.Feature;

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java

@@ -7,12 +7,12 @@
 
 package com.dfsek.terra.addons.feature;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Final;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.feature.Distributor;
 import com.dfsek.terra.api.structure.feature.Locator;

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

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.flora;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Final;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -16,7 +17,6 @@ import java.util.List;
 import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
 import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.MaterialSet;
 
 

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

@@ -7,21 +7,21 @@
 
 package com.dfsek.terra.addons.flora.flora.gen;
 
+import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGeneratorFactory;
 
-import com.dfsek.seismic.type.Rotation;
-
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.state.properties.enums.Direction;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 
 

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

@@ -7,12 +7,12 @@
 
 package com.dfsek.terra.addons.feature.locator.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.addons.feature.locator.locators.Sampler3DLocator;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.feature.Locator;
 
 

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

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.feature.locator.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
@@ -14,7 +15,6 @@ import java.util.List;
 
 import com.dfsek.terra.addons.feature.locator.locators.SamplerLocator;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.feature.Locator;
 
 

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

@@ -13,8 +13,8 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern;
 import com.dfsek.terra.addons.feature.locator.patterns.Pattern;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.MaterialSet;
+import com.dfsek.terra.api.util.range.Range;
 
 
 public class BlockSetMatchPatternTemplate implements ObjectTemplate<Pattern> {

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

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.feature.locator.locators;
 
 import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.world.chunk.generation.util.Column;

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

@@ -7,9 +7,10 @@
 
 package com.dfsek.terra.addons.feature.locator.locators;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.List;
 
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.structure.feature.BinaryColumn;
 import com.dfsek.terra.api.structure.feature.Locator;
 import com.dfsek.terra.api.world.chunk.generation.util.Column;

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

@@ -8,9 +8,26 @@
 package com.dfsek.terra.addons.noise;
 
 import com.dfsek.paralithic.eval.parser.Parser.ParseOptions;
-import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.AdditionSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.DivisionSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.MaxSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.MinSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.MultiplicationSampler;
+import com.dfsek.seismic.algorithms.sampler.arithmetic.SubtractionSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.random.GaussianNoiseSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.random.PositiveWhiteNoiseSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.random.WhiteNoiseSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2SSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler;
+import com.dfsek.seismic.algorithms.sampler.noise.simplex.PerlinSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.simplex.SimplexSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.value.ValueCubicSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.value.ValueSampler;
 import com.dfsek.seismic.type.CubicSpline;
 import com.dfsek.seismic.type.DistanceFunction;
+import com.dfsek.seismic.type.sampler.DerivativeSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.LinkedHashMap;
@@ -52,17 +69,9 @@ import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.seismic.type.sampler.DerivativeSampler;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
-import com.dfsek.seismic.algorithms.sampler.noise.*;
-import com.dfsek.seismic.algorithms.sampler.noise.simplex.*;
-import com.dfsek.seismic.algorithms.sampler.noise.fractal.*;
-import com.dfsek.seismic.algorithms.sampler.noise.random.*;
-import com.dfsek.seismic.algorithms.sampler.noise.value.*;
-import com.dfsek.seismic.algorithms.sampler.normalizer.*;
-import com.dfsek.seismic.algorithms.sampler.arithmetic.*;
+
 
 public class NoiseAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<Sampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {
@@ -86,8 +95,8 @@ public class NoiseAddon implements AddonInitializer {
                 event.getPack()
                     .applyLoader(DistanceFunction.class,
                         (type, o, loader, depthTracker) -> DistanceFunction.valueOf((String) o))
-                    .applyLoader(CellularSampler.ReturnType.class,
-                        (type, o, loader, depthTracker) -> CellularSampler.ReturnType.valueOf((String) o))
+                    .applyLoader(CellularStyleSampler.CellularReturnType.class,
+                        (type, o, loader, depthTracker) -> CellularStyleSampler.CellularReturnType.valueOf((String) o))
                     .applyLoader(DistanceFunction.class,
                         (type, o, loader, depthTracker) -> DistanceFunction.valueOf((String) o))
                     .applyLoader(DimensionApplicableSampler.class, DimensionApplicableSampler::new)
@@ -110,21 +119,21 @@ public class NoiseAddon implements AddonInitializer {
                 noiseRegistry.register(addon.key("PING_PONG"), PingPongTemplate::new);
                 noiseRegistry.register(addon.key("RIDGED"), RidgedFractalTemplate::new);
 
-                noiseRegistry.register(addon.key("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new));
-                noiseRegistry.register(addon.key("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new));
-                noiseRegistry.register(addon.key("PERLIN"), () -> new SimpleNoiseTemplate(PerlinSampler::new));
-                noiseRegistry.register(addon.key("SIMPLEX"), () -> new SimpleNoiseTemplate(SimplexSampler::new));
+                noiseRegistry.register(addon.key("OPEN_SIMPLEX_2"), () -> new SimpleNoiseTemplate<>(OpenSimplex2Sampler.class));
+                noiseRegistry.register(addon.key("OPEN_SIMPLEX_2S"), () -> new SimpleNoiseTemplate<>(OpenSimplex2SSampler.class));
+                noiseRegistry.register(addon.key("PERLIN"), () -> new SimpleNoiseTemplate<>(PerlinSampler.class));
+                noiseRegistry.register(addon.key("SIMPLEX"), () -> new SimpleNoiseTemplate<>(SimplexSampler.class));
                 noiseRegistry.register(addon.key("GABOR"), GaborNoiseTemplate::new);
                 noiseRegistry.register(addon.key("PSEUDOEROSION"), PseudoErosionTemplate::new);
 
-                noiseRegistry.register(addon.key("VALUE"), () -> new SimpleNoiseTemplate(ValueSampler::new));
-                noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate(ValueCubicSampler::new));
+                noiseRegistry.register(addon.key("VALUE"), () -> new SimpleNoiseTemplate<>(ValueSampler.class));
+                noiseRegistry.register(addon.key("VALUE_CUBIC"), () -> new SimpleNoiseTemplate<>(ValueCubicSampler.class));
 
                 noiseRegistry.register(addon.key("CELLULAR"), CellularNoiseTemplate::new);
 
-                noiseRegistry.register(addon.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new));
-                noiseRegistry.register(addon.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate(PositiveWhiteNoiseSampler::new));
-                noiseRegistry.register(addon.key("GAUSSIAN"), () -> new SimpleNoiseTemplate(GaussianNoiseSampler::new));
+                noiseRegistry.register(addon.key("WHITE_NOISE"), () -> new SimpleNoiseTemplate<>(WhiteNoiseSampler.class));
+                noiseRegistry.register(addon.key("POSITIVE_WHITE_NOISE"), () -> new SimpleNoiseTemplate<>(PositiveWhiteNoiseSampler.class));
+                noiseRegistry.register(addon.key("GAUSSIAN"), () -> new SimpleNoiseTemplate<>(GaussianNoiseSampler.class));
 
                 noiseRegistry.register(addon.key("DISTANCE"), DistanceSamplerTemplate::new);
 
@@ -147,7 +156,8 @@ public class NoiseAddon implements AddonInitializer {
 
                 Map<String, DimensionApplicableSampler> packSamplers = new LinkedHashMap<>();
                 Map<String, FunctionTemplate> packFunctions = new LinkedHashMap<>();
-                noiseRegistry.register(addon.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions, expressionParseOptions));
+                noiseRegistry.register(addon.key("EXPRESSION"),
+                    () -> new ExpressionFunctionTemplate(packSamplers, packFunctions, expressionParseOptions));
                 noiseRegistry.register(addon.key("EXPRESSION_NORMALIZER"),
                     () -> new ExpressionNormalizerTemplate(packSamplers, packFunctions, expressionParseOptions));
 

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

@@ -4,9 +4,9 @@ import com.dfsek.seismic.type.CubicSpline.Point;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-
 import com.dfsek.terra.api.config.meta.Meta;
 
+
 public class CubicSplinePointTemplate implements ObjectTemplate<Point> {
 
     @Value("from")

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

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.noise.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class DimensionApplicableSampler implements ObjectTemplate<DimensionApplicableSampler> {

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

@@ -1,18 +1,16 @@
 package com.dfsek.terra.addons.noise.config.sampler;
 
 import com.dfsek.seismic.type.sampler.Sampler;
-
-import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key;
-import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key;
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
-import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
-
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.Scheduler;
 import org.jetbrains.annotations.ApiStatus.Experimental;
 
+import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key;
+import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.generic.pair.Pair.Mutable;
+
 import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
 
 
@@ -25,7 +23,7 @@ public class CacheSampler implements Sampler {
 
     public CacheSampler(Sampler sampler, int dimensions) {
         this.sampler = sampler;
-        if (dimensions == 2) {
+        if(dimensions == 2) {
             this.cache2D = ThreadLocal.withInitial(() -> {
                 LoadingCache<DoubleSeededVector2Key, Double> cache = Caffeine
                     .newBuilder()

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

@@ -1,12 +1,12 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.algorithms.sampler.arithmetic.BinaryArithmeticSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.function.BiFunction;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class BinaryArithmeticTemplate<T extends BinaryArithmeticSampler> extends SamplerTemplate<T> {

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

@@ -1,14 +1,12 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.seismic.type.sampler.Sampler;
+import org.jetbrains.annotations.ApiStatus.Experimental;
 
 import com.dfsek.terra.addons.noise.config.sampler.CacheSampler;
 
-import org.jetbrains.annotations.ApiStatus.Experimental;
-
 
 @Experimental
 public class CacheSamplerTemplate extends SamplerTemplate<CacheSampler> {

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

@@ -1,11 +1,10 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.type.sampler.DerivativeSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.exception.ValidationException;
 
-import com.dfsek.seismic.type.sampler.Sampler;
-
 
 public class DerivativeSamplerTemplate extends SamplerTemplate<DerivativeSampler> {
 

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

@@ -8,11 +8,11 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.algorithms.sampler.DomainWarpedSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

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

@@ -12,12 +12,12 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.api.config.meta.Meta;
-
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
 
+import com.dfsek.terra.api.config.meta.Meta;
+
 
 @SuppressWarnings("unused")
 public class FunctionTemplate implements ObjectTemplate<FunctionTemplate> {

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

@@ -8,6 +8,7 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.algorithms.sampler.KernelSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.exception.ValidationException;
@@ -15,7 +16,6 @@ import com.dfsek.tectonic.api.exception.ValidationException;
 import java.util.List;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
@@ -45,8 +45,7 @@ public class KernelTemplate extends SamplerTemplate<KernelSampler> {
             }
         }
 
-        KernelSampler sampler = new KernelSampler(k, function);
-        sampler.setFrequency(frequency);
+        KernelSampler sampler = new KernelSampler(frequency, k, function);
         return sampler;
     }
 

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.algorithms.sampler.LinearHeightmapSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings("FieldMayBeFinal")

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

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.noise.config.templates;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.ValidatedConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -14,7 +15,6 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.tectonic.api.exception.ValidationException;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings("FieldMayBeFinal")

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.seismic.algorithms.sampler.TranslateSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class TranslateSamplerTemplate extends SamplerTemplate<TranslateSampler> {

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

@@ -7,15 +7,15 @@
 
 package com.dfsek.terra.addons.noise.config.templates.noise;
 
-import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularSampler;
+import com.dfsek.seismic.algorithms.sampler.noise.cellular.CellularStyleSampler;
 import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.seismic.type.DistanceFunction;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings("FieldMayBeFinal")
@@ -26,16 +26,15 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
 
     @Value("return")
     @Default
-    private CellularSampler.@Meta ReturnType cellularReturnType = CellularSampler.ReturnType.Distance;
+    private CellularStyleSampler.@Meta CellularReturnType cellularReturnType = CellularStyleSampler.CellularReturnType.Distance;
 
     @Value("jitter")
     @Default
     private @Meta double cellularJitter = 1.0D;
 
-
     @Value("lookup")
     @Default
-    private @Meta Sampler lookup = new OpenSimplex2Sampler();
+    private @Meta Sampler lookup = new OpenSimplex2Sampler(0.02d, 0);
 
     @Value("salt-lookup")
     @Default
@@ -43,14 +42,8 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
 
     @Override
     public Sampler get() {
-        CellularSampler sampler = new CellularSampler();
-        sampler.setNoiseLookup(lookup);
-        sampler.setFrequency(frequency);
-        sampler.setJitterModifier(cellularJitter);
-        sampler.setReturnType(cellularReturnType);
-        sampler.setDistanceFunction(cellularDistanceFunction);
-        sampler.setSalt(salt);
-        sampler.setSaltLookup(saltLookup);
+        CellularSampler sampler = new CellularSampler(frequency, salt, lookup, cellularDistanceFunction, cellularReturnType, cellularJitter,
+            saltLookup);
         return sampler;
     }
 }

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

@@ -8,12 +8,12 @@
 package com.dfsek.terra.addons.noise.config.templates.noise;
 
 import com.dfsek.seismic.algorithms.sampler.noise.ConstantSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings("FieldMayBeFinal")

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

@@ -5,12 +5,10 @@ import com.dfsek.seismic.type.DistanceFunction;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
-
 import com.dfsek.terra.api.config.meta.Meta;
 
 
-public class DistanceSamplerTemplate extends SamplerTemplate<DistanceSampler> {
+public class DistanceSamplerTemplate extends NoiseTemplate<DistanceSampler> {
 
     @Value("distance-function")
     @Default
@@ -38,6 +36,6 @@ public class DistanceSamplerTemplate extends SamplerTemplate<DistanceSampler> {
 
     @Override
     public DistanceSampler get() {
-        return new DistanceSampler(distanceFunction, x, y, z, normalize, normalizeRadius);
+        return new DistanceSampler(salt, distanceFunction, x, y, z, normalize, normalizeRadius);
     }
 }

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

@@ -10,6 +10,7 @@ package com.dfsek.terra.addons.noise.config.templates.noise;
 import com.dfsek.paralithic.eval.parser.Parser.ParseOptions;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.paralithic.sampler.noise.ExpressionNoiseFunction;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
@@ -21,7 +22,6 @@ import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers;
 
@@ -58,7 +58,8 @@ public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionNoiseF
         var mergedSamplers = new HashMap<>(globalSamplers);
         mergedSamplers.putAll(samplers);
         try {
-            return new ExpressionNoiseFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, parseOptions);
+            return new ExpressionNoiseFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars,
+                parseOptions);
         } catch(ParseException e) {
             throw new RuntimeException("Failed to parse expression.", e);
         }

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

@@ -8,12 +8,11 @@
 package com.dfsek.terra.addons.noise.config.templates.noise;
 
 import com.dfsek.seismic.algorithms.sampler.noise.GaborSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings("FieldMayBeFinal")
@@ -38,16 +37,13 @@ public class GaborNoiseTemplate extends NoiseTemplate<GaborSampler> {
     @Default
     private @Meta double f0 = 0.625;
 
+    @Value("a")
+    @Default
+    private @Meta double a = 0.1;
+
     @Override
     public Sampler get() {
-        GaborSampler gaborSampler = new GaborSampler();
-        gaborSampler.setFrequency(frequency);
-        gaborSampler.setRotation(rotation);
-        gaborSampler.setIsotropic(isotropic);
-        gaborSampler.setDeviation(deviation);
-        gaborSampler.setImpulsesPerKernel(impulses);
-        gaborSampler.setFrequency0(f0);
-        gaborSampler.setSalt(salt);
+        GaborSampler gaborSampler = new GaborSampler(frequency, salt, f0, deviation, rotation, impulses, a, isotropic);
         return gaborSampler;
     }
 }

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

@@ -2,11 +2,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise;
 
 import com.dfsek.seismic.algorithms.sampler.noise.PseudoErosionSampler;
 import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler;
+import com.dfsek.seismic.type.sampler.DerivativeSampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.DerivativeSampler;
 
 
 public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
@@ -45,7 +45,7 @@ public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
 
     @Value("sampler")
     @Default
-    private DerivativeSampler heightSampler = new OpenSimplex2Sampler();
+    private DerivativeSampler heightSampler = new OpenSimplex2Sampler(0.02d, 0);
 
     @Value("slope-mask.enable")
     @Default
@@ -69,11 +69,9 @@ public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
 
     @Override
     public PseudoErosionSampler get() {
-        PseudoErosionSampler pseudoErosion = new PseudoErosionSampler(octaves, gain, lacunarity,
+        PseudoErosionSampler pseudoErosion = new PseudoErosionSampler(frequency, salt, octaves, gain, lacunarity,
             slopeStrength, branchStrength, strength,
             erosionFrequency, heightSampler, slopeMask, slopeMaskFull, slopeMaskNone, jitterModifier, averageErosionImpulses);
-        pseudoErosion.setFrequency(frequency);
-        pseudoErosion.setSalt(salt);
         return pseudoErosion;
     }
 }

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

@@ -7,24 +7,28 @@
 
 package com.dfsek.terra.addons.noise.config.templates.noise;
 
-import java.util.function.Supplier;
-
 import com.dfsek.seismic.algorithms.sampler.noise.NoiseFunction;
 import com.dfsek.seismic.type.sampler.Sampler;
 
+import java.lang.reflect.InvocationTargetException;
 
-public class SimpleNoiseTemplate extends NoiseTemplate<NoiseFunction> {
-    private final Supplier<NoiseFunction> samplerSupplier;
 
-    public SimpleNoiseTemplate(Supplier<NoiseFunction> samplerSupplier) {
-        this.samplerSupplier = samplerSupplier;
+public class SimpleNoiseTemplate<T extends NoiseFunction> extends NoiseTemplate<NoiseFunction> {
+    private final Class<T> samplerClass;
+
+    public SimpleNoiseTemplate(Class<T> samplerClass) {
+        this.samplerClass = samplerClass;
     }
 
     @Override
     public Sampler get() {
-        NoiseFunction sampler = samplerSupplier.get();
-        sampler.setFrequency(frequency);
-        sampler.setSalt(salt);
+        NoiseFunction sampler;
+        try {
+            sampler = samplerClass.getConstructor(double.class, long.class)
+                .newInstance(frequency, salt);
+        } catch(InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
         return sampler;
     }
 }

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

@@ -15,11 +15,8 @@ import com.dfsek.seismic.type.sampler.Sampler;
 public class BrownianMotionTemplate extends FractalTemplate<BrownianMotionSampler> {
     @Override
     public Sampler get() {
-        BrownianMotionSampler sampler = new BrownianMotionSampler(function);
-        sampler.setGain(fractalGain);
-        sampler.setLacunarity(fractalLacunarity);
-        sampler.setOctaves(octaves);
-        sampler.setWeightedStrength(weightedStrength);
+        BrownianMotionSampler sampler = new BrownianMotionSampler(salt, function, fractalGain, fractalLacunarity, weightedStrength,
+            octaves);
         return sampler;
     }
 }

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

@@ -8,15 +8,15 @@
 package com.dfsek.terra.addons.noise.config.templates.noise.fractal;
 
 import com.dfsek.seismic.algorithms.sampler.noise.fractal.FractalNoiseFunction;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.NoiseTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
-public abstract class FractalTemplate<T extends FractalNoiseFunction> extends SamplerTemplate<T> {
+public abstract class FractalTemplate<T extends FractalNoiseFunction> extends NoiseTemplate<T> {
     @Value("octaves")
     @Default
     protected @Meta int octaves = 3;

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

@@ -8,11 +8,11 @@
 package com.dfsek.terra.addons.noise.config.templates.noise.fractal;
 
 import com.dfsek.seismic.algorithms.sampler.noise.fractal.PingPongSampler;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
@@ -23,12 +23,7 @@ public class PingPongTemplate extends FractalTemplate<PingPongSampler> {
 
     @Override
     public Sampler get() {
-        PingPongSampler sampler = new PingPongSampler(function);
-        sampler.setGain(fractalGain);
-        sampler.setLacunarity(fractalLacunarity);
-        sampler.setOctaves(octaves);
-        sampler.setWeightedStrength(weightedStrength);
-        sampler.setPingPongStrength(pingPong);
+        PingPongSampler sampler = new PingPongSampler(salt, function, fractalGain, fractalLacunarity, weightedStrength, octaves, pingPong);
         return sampler;
     }
 }

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

@@ -15,11 +15,7 @@ import com.dfsek.seismic.type.sampler.Sampler;
 public class RidgedFractalTemplate extends FractalTemplate<RidgedFractalSampler> {
     @Override
     public Sampler get() {
-        RidgedFractalSampler sampler = new RidgedFractalSampler(function);
-        sampler.setGain(fractalGain);
-        sampler.setLacunarity(fractalLacunarity);
-        sampler.setOctaves(octaves);
-        sampler.setWeightedStrength(weightedStrength);
+        RidgedFractalSampler sampler = new RidgedFractalSampler(salt, function, fractalGain, fractalLacunarity, weightedStrength, octaves);
         return sampler;
     }
 }

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

@@ -8,10 +8,10 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.ClampNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

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

@@ -4,13 +4,13 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer;
 import com.dfsek.seismic.algorithms.sampler.normalizer.CubicSplineNormalizer;
 import com.dfsek.seismic.type.CubicSpline;
 import com.dfsek.seismic.type.CubicSpline.Point;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import java.util.List;
 
-import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
+
 
 public class CubicSplineNormalizerTemplate extends NormalizerTemplate<CubicSplineNormalizer> {
 

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

@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.paralithic.eval.parser.Parser.ParseOptions;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
+import com.dfsek.paralithic.sampler.normalizer.ExpressionNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
@@ -19,8 +21,6 @@ import java.util.Map;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
-import com.dfsek.paralithic.sampler.normalizer.ExpressionNormalizer;
 
 import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers;
 
@@ -62,7 +62,8 @@ public class ExpressionNormalizerTemplate extends NormalizerTemplate<ExpressionN
         var mergedSamplers = new HashMap<>(globalSamplers);
         mergedSamplers.putAll(samplers);
         try {
-            return new ExpressionNormalizer(function, convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, parseOptions);
+            return new ExpressionNormalizer(function, convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars,
+                parseOptions);
         } catch(ParseException e) {
             throw new RuntimeException("Failed to parse expression.", e);
         }

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.LinearMapNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class LinearMapNormalizerTemplate extends NormalizerTemplate<LinearMapNormalizer> {

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

@@ -8,10 +8,10 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.LinearNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

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

@@ -8,11 +8,11 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.NormalNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

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

@@ -8,11 +8,11 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.Normalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public abstract class NormalizerTemplate<T extends Normalizer> extends SamplerTemplate<T> {

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

@@ -8,10 +8,10 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.PosterizationNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.noise.config.templates.normalizer;
 
 import com.dfsek.seismic.algorithms.sampler.normalizer.ScaleNormalizer;
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class ScaleNormalizerTemplate extends NormalizerTemplate<ScaleNormalizer> {

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

@@ -2,17 +2,14 @@ package com.dfsek.terra.addons.noise.paralithic;
 
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.paralithic.functions.Function;
+import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction2;
+import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction3;
+import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction2;
+import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction3;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction2;
-
-import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction3;
-import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction2;
-
-import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction3;
-
 import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 

common/addons/config-number-predicate/build.gradle.kts

@@ -1,5 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 version = version("1.0.0")
 
 dependencies {

common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java

@@ -30,7 +30,8 @@ public class NumberPredicateAddon implements AddonInitializer {
         plugin.getEventManager()
             .getHandler(FunctionalEventHandler.class)
             .register(addon, ConfigPackPreLoadEvent.class)
-            .then(event -> event.getPack().applyLoader(DoublePredicate.class, new DoublePredicateLoader(event.getPack().getExpressionParseOptions())))
+            .then(event -> event.getPack()
+                .applyLoader(DoublePredicate.class, new DoublePredicateLoader(event.getPack().getExpressionParseOptions())))
             .priority(50)
             .failThrough();
     }

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java

@@ -7,19 +7,20 @@
 
 package com.dfsek.terra.addons.ore.ores;
 
-import java.util.BitSet;
-import java.util.Map;
-import java.util.random.RandomGenerator;
-
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
 import com.dfsek.seismic.math.numericanalysis.interpolation.InterpolationFunctions;
 import com.dfsek.seismic.math.trigonometry.TrigonometryFunctions;
 import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
+import java.util.BitSet;
+import java.util.Map;
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.collection.MaterialSet;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 
 import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace;
@@ -104,7 +105,7 @@ public class VanillaOre implements Structure {
             }
         }
 
-        int outset = (int) Math.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F);
+        int outset = FloatingPointFunctions.ceil((size / 16.0F * 2.0F + 1.0F) / 2.0F);
         int x = (int) (location.getX() - Math.ceil(eighthSize) - outset);
         int y = location.getY() - 2 - outset;
         int z = (int) (location.getZ() - Math.ceil(eighthSize) - outset);

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java

@@ -1,14 +1,14 @@
 package com.dfsek.terra.addons.ore.ores;
 
+import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
 import java.util.Map;
 import java.util.random.RandomGenerator;
 
-import com.dfsek.seismic.type.Rotation;
-
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.collection.MaterialSet;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 
 import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace;

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.palette;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Final;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -16,7 +17,6 @@ import java.util.List;
 import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder;
 import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 @SuppressWarnings({ "FieldMayBeFinal", "unused" })

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java

@@ -7,14 +7,16 @@
 
 package com.dfsek.terra.addons.palette.palette;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
+
 /**
  * A class representation of a "slice" of the world.
  * Used to get a section of blocks, based on the depth at which they are found.
@@ -25,12 +27,12 @@ public class PaletteImpl implements Palette {
     public PaletteImpl(List<PaletteLayerHolder> layers, Sampler defaultSampler) {
         List<PaletteLayer> layerArray = new ArrayList<>();
 
-        for (PaletteLayerHolder holder : layers) {
+        for(PaletteLayerHolder holder : layers) {
             PaletteLayer layer;
             ProbabilityCollection<BlockState> materials = holder.getLayer();
             Sampler sampler = holder.getSampler() == null ? defaultSampler : holder.getSampler();
             layer = new PaletteLayer(materials, sampler);
-            for (int i = 0; i < holder.getSize(); i++)
+            for(int i = 0; i < holder.getSize(); i++)
                 layerArray.add(layer);
         }
 

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java

@@ -7,10 +7,10 @@
 
 package com.dfsek.terra.addons.palette.palette;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import org.jetbrains.annotations.NotNull;
 
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.palette.palette;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java

@@ -14,8 +14,8 @@ import com.dfsek.terra.api.config.AbstractableTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java

@@ -10,8 +10,8 @@ package com.dfsek.terra.addons.structure;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
 import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.util.range.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.range.Range;
 
 
 public class TerraStructure implements ConfiguredStructure {

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

@@ -7,18 +7,18 @@
 
 package com.dfsek.terra.addons.generation.feature;
 
+import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.sampler.Sampler;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
 import java.util.Collections;
 import java.util.random.RandomGenerator;
 import java.util.random.RandomGeneratorFactory;
 
-import com.dfsek.seismic.type.Rotation;
-
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;

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

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.generation.feature.config;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.ValidatedConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -8,7 +9,6 @@ import com.dfsek.tectonic.api.exception.ValidationException;
 
 import com.dfsek.terra.addons.generation.feature.FeatureGenerationStage;
 import com.dfsek.terra.api.Platform;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.properties.PropertyKey;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.image;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import java.util.function.Supplier;
@@ -26,7 +27,6 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.inject.annotations.Inject;
-import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.addons.image.config.image;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Scheduler;
 
 import javax.imageio.ImageIO;
 import java.io.IOException;
@@ -18,8 +19,6 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.properties.Properties;
 import com.dfsek.terra.api.util.generic.Lazy;
 
-import com.github.benmanes.caffeine.cache.Scheduler;
-
 import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR;
 
 

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java

@@ -3,11 +3,11 @@ package com.dfsek.terra.addons.image.config.image;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.io.IOException;
+
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.api.config.ConfigPack;
 
-import java.io.IOException;
-
 
 public class ImageTemplate implements ObjectTemplate<Image> {
 

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ChannelSamplerTemplate.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.image.config.sampler;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
@@ -7,7 +8,6 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.sampler.ChannelSampler;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class ChannelSamplerTemplate implements ObjectTemplate<Sampler> {

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/DistanceTransformSamplerTemplate.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.addons.image.config.sampler;
 
+import com.dfsek.seismic.type.sampler.Sampler;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
@@ -9,7 +10,6 @@ import com.dfsek.terra.addons.image.operator.DistanceTransform;
 import com.dfsek.terra.addons.image.operator.DistanceTransform.CostFunction;
 import com.dfsek.terra.addons.image.operator.DistanceTransform.Normalization;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 
 public class DistanceTransformSamplerTemplate implements ObjectTemplate<Sampler> {

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java

@@ -1,9 +1,11 @@
 package com.dfsek.terra.addons.image.operator;
 
+import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.addons.image.util.ColorUtil;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 import static com.dfsek.terra.addons.image.util.MathUtil.lerp;
 
@@ -232,7 +234,7 @@ public class DistanceTransform {
         @Override
         public double getSample(long seed, double x, double y) {
             if(x < 0 || y < 0 || x >= transform.width || y >= transform.height) return transform.minDistance;
-            return transform.distances[(int) Math.floor(x)][(int) Math.floor(y)];
+            return transform.distances[FloatingPointFunctions.floor(x)][FloatingPointFunctions.floor(y)];
         }
 
         @Override

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ChannelSampler.java

@@ -1,9 +1,10 @@
 package com.dfsek.terra.addons.image.sampler;
 
+import com.dfsek.seismic.type.sampler.Sampler;
+
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.util.ColorUtil;
 import com.dfsek.terra.addons.image.util.ColorUtil.Channel;
-import com.dfsek.seismic.type.sampler.Sampler;
 
 import static com.dfsek.terra.addons.image.util.MathUtil.lerp;
 

common/addons/pipeline-image/src/main/java/com/dfsek/terra/addons/biome/pipeline/image/config/converter/mapping/DefinedPipelineBiomeColorMappingTemplate.java

@@ -3,13 +3,13 @@ package com.dfsek.terra.addons.biome.pipeline.image.config.converter.mapping;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import java.util.Map;
-
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.addons.image.config.ColorLoader.ColorString;
 import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
 import com.dfsek.terra.addons.image.util.MapUtil;
 
+import java.util.Map;
+
 
 public class DefinedPipelineBiomeColorMappingTemplate implements ObjectTemplate<ColorMapping<PipelineBiome>> {
 

common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.addons.palette.shortcut.block;
 
+import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
 import java.util.random.RandomGenerator;
 
-import com.dfsek.seismic.type.Rotation;
-
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 
 

common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.structure.mutator;
 
-import java.util.random.RandomGenerator;
-
 import com.dfsek.seismic.type.Rotation;
+import com.dfsek.seismic.type.vector.Vector3Int;
+
+import java.util.random.RandomGenerator;
 
 import com.dfsek.terra.api.registry.key.Keyed;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.structure.Structure;
-import com.dfsek.seismic.type.vector.Vector3Int;
 import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.api.world.util.ReadInterceptor;
 import com.dfsek.terra.api.world.util.WriteInterceptor;

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

@@ -1,5 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 version = version("1.0.0")
 
 dependencies {

common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java

@@ -7,6 +7,7 @@
 
 package com.dfsek.terra.addons.sponge;
 
+import com.dfsek.seismic.type.vector.Vector3Int;
 import net.querz.nbt.io.NBTDeserializer;
 import net.querz.nbt.tag.ByteArrayTag;
 import net.querz.nbt.tag.CompoundTag;
@@ -31,7 +32,6 @@ import com.dfsek.terra.api.inject.annotations.Inject;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.util.FileUtil;
-import com.dfsek.seismic.type.vector.Vector3Int;
 
 
 public class SpongeSchematicAddon implements AddonInitializer {