reformat

buildSrc/src/main/kotlin/com/dfsek/terra/AddonConfig.kt

@@ -3,10 +3,7 @@ package com.dfsek.terra
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.withType
-import org.gradle.language.jvm.tasks.ProcessResources
 import java.io.File
-import java.util.*
 import java.util.function.Predicate
 import kotlin.streams.asStream
 

common/addons/README.md

@@ -1,4 +1,3 @@
 # Core Addons
 
-This directory contains the modularized "core addons" that implement
+This directory contains the modularized "core addons" that implement Terra's default behavior.
-Terra's default behavior.

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.biome.image;
 
+import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
 import net.jafama.FastMath;
 
 import java.awt.*;

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

@@ -2,13 +2,13 @@ package com.dfsek.terra.addons.biome.image;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 import java.awt.image.BufferedImage;
 import java.util.stream.Collectors;
 
-public class ImageProviderTemplate /*extends BiomeProviderTemplate */{
+public class ImageProviderTemplate /*extends BiomeProviderTemplate */ {
     private final Registry<BiomeBuilder> biomes;
     @Value("image.name")
     private BufferedImage image;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,17 +1,17 @@
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 
 public class BiomeHolderImpl implements BiomeHolder {
     private final Vector2 origin;
     private final int width;
-    private TerraBiome[][] biomes;
     private final int offset;
+    private TerraBiome[][] biomes;
 
     public BiomeHolderImpl(int width, Vector2 origin) {
         width += 4;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline;
 
-import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
-import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.api.vector.Vector2;
+import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -3,10 +3,10 @@ package com.dfsek.terra.addons.biome.pipeline.config;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.terra.addons.biome.pipeline.BiomePipelineImpl;
+import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
 import com.dfsek.terra.addons.biome.pipeline.StandardBiomeProvider;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.seeded.SourceSeeded;
-import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 import java.util.List;

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

@@ -3,8 +3,8 @@ package com.dfsek.terra.addons.biome.pipeline.config;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
+import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 
 public abstract class BiomeProviderTemplate implements ObjectTemplate<BiomeProviderBuilder>, BiomeProviderBuilder {
     @Value("resolution")

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.biome.pipeline.config;
 
 import com.dfsek.tectonic.annotations.Value;
+import com.dfsek.terra.addons.biome.pipeline.source.RandomSource;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
-import com.dfsek.terra.addons.biome.pipeline.source.RandomSource;
-import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 
 public class NoiseSourceTemplate extends SourceTemplate {
     @Value("noise")

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

@@ -4,14 +4,14 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
-import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
+import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 
 import java.lang.reflect.Type;
 import java.util.Map;

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

@@ -2,10 +2,10 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.api.util.seeded.SeededBuilder;
 import com.dfsek.terra.addons.biome.pipeline.StageSeeded;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.api.util.seeded.NoiseSeeded;
+import com.dfsek.terra.api.util.seeded.SeededBuilder;
 
 public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {
     @Value("noise")

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.expander;
 
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 import com.dfsek.terra.addons.biome.pipeline.expand.FractalExpander;
 import com.dfsek.terra.addons.biome.pipeline.stages.ExpanderStage;
-import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
 
 public class ExpanderStageTemplate extends StageTemplate {
     @Override

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 
 @SuppressWarnings("unused")

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

@@ -2,8 +2,8 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate;
+import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
 
 public abstract class MutatorStageTemplate extends StageTemplate {
     public abstract BiomeMutator build(long seed);

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
+import com.dfsek.terra.api.world.biome.TerraBiome;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator;
 
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 
 @SuppressWarnings("unused")

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.expand;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
 
 public class FractalExpander implements BiomeExpander {
     private final NoiseSampler sampler;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 
 import java.util.Map;
 

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 
 public class BorderMutator implements BiomeMutator {
     private final String border;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 
 import java.util.Map;
 

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 
 public class ReplaceMutator implements BiomeMutator {
     private final String replaceableTag;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.mutator;
 
+import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
 
 import java.util.Objects;
 

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.biome.single;
 
+import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
 
 public class SingleBiomeProvider implements BiomeProvider, BiomeProviderBuilder {
     private final TerraBiome biome;

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

@@ -2,11 +2,11 @@ package com.dfsek.terra.addons.biome.single;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
+import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
-import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 
-public class SingleBiomeProviderTemplate  implements ObjectTemplate<BiomeProviderBuilder>, BiomeProviderBuilder {
+public class SingleBiomeProviderTemplate implements ObjectTemplate<BiomeProviderBuilder>, BiomeProviderBuilder {
     @Value("biome")
     private BiomeBuilder biome;
 

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -17,8 +17,8 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.ChunkData;
 import com.dfsek.terra.api.world.generator.Sampler;
-import com.dfsek.terra.api.world.generator.TerraGenerationStage;
 import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
+import com.dfsek.terra.api.world.generator.TerraGenerationStage;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -35,6 +35,24 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
         this.main = main;
     }
 
+    @SuppressWarnings({"try"})
+    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
+        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
+            int xOrig = (chunkX << 4);
+            int zOrig = (chunkZ << 4);
+            BiomeProvider grid = main.getWorld(world).getBiomeProvider();
+            for(int x = 0; x < 4; x++) {
+                for(int z = 0; z < 4; z++) {
+                    int cx = xOrig + (x << 2);
+                    int cz = zOrig + (z << 2);
+                    TerraBiome b = grid.getBiome(cx, cz);
+
+                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
+                }
+            }
+        }
+    }
+
     @Override
     public ConfigPack getConfigPack() {
         return configPack;
@@ -85,7 +103,7 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
 
                             justSet = false;
                             paletteLevel = 0;
-                        } */else {
+                        } */ else {
 
                             justSet = false;
                             paletteLevel = 0;
@@ -116,24 +134,6 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
         return false;
     }
 
-    @SuppressWarnings({"try"})
-    static void biomes(@NotNull World world, int chunkX, int chunkZ, @NotNull BiomeGrid biome, TerraPlugin main) {
-        try(ProfileFrame ignore = main.getProfiler().profile("biomes")) {
-            int xOrig = (chunkX << 4);
-            int zOrig = (chunkZ << 4);
-            BiomeProvider grid = main.getWorld(world).getBiomeProvider();
-            for(int x = 0; x < 4; x++) {
-                for(int z = 0; z < 4; z++) {
-                    int cx = xOrig + (x << 2);
-                    int cz = zOrig + (z << 2);
-                    TerraBiome b = grid.getBiome(cx, cz);
-
-                    biome.setBiome(cx, cz, b.getVanillaBiomes().get(b.getGenerator(world).getBiomeNoise(), cx, 0, cz));
-                }
-            }
-        }
-    }
-
     @Override
     public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) {
         biomes(world, chunkX, chunkZ, biome, main);

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

@@ -82,14 +82,14 @@ public class ChunkInterpolator3D implements ChunkInterpolator {
         }
     }
 
-    public double computeNoise(Generator generator, double x, double y, double z) {
-        return noiseGetter.apply(generator, new Vector3(x, y, z));
-    }
-
     private static int reRange(int value, int high) {
         return FastMath.max(FastMath.min(value, high), 0);
     }
 
+    public double computeNoise(Generator generator, double x, double y, double z) {
+        return noiseGetter.apply(generator, new Vector3(x, y, z));
+    }
+
     /**
      * Gets the noise at a pair of internal chunk coordinates.
      *

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
 
+import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.Sampler;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D;
-import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator;
 import net.jafama.FastMath;
 
 public class Sampler3D implements Sampler {

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.biome;
 
 import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigFactory;
@@ -10,7 +9,6 @@ import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.util.seeded.BiomeBuilder;
 
-import java.lang.reflect.Type;
 import java.util.function.Supplier;
 
 public class BiomeConfigType implements ConfigType<BiomeTemplate, BiomeBuilder> {

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

@@ -168,6 +168,10 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
     @Default
     private Map<String, Integer> colors = new HashMap<>(); // Plain ol' map, so platforms can decide what to do with colors (if anything).
 
+    public BiomeTemplate(ConfigPack pack, TerraPlugin main) {
+        this.pack = pack;
+    }
+
     public List<String> getExtended() {
         return extended;
     }
@@ -208,10 +212,6 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
         return doSlabs;
     }
 
-    public BiomeTemplate(ConfigPack pack, TerraPlugin main) {
-        this.pack = pack;
-    }
-
     public Map<BlockType, Palette> getSlabPalettes() {
         return slabPalettes;
     }

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java

@@ -21,9 +21,9 @@ public class AsyncBiomeFinder implements Runnable {
     protected final int centerX;
     protected final int centerZ;
     protected final World world;
+    protected final TerraPlugin main;
     private final Consumer<Vector3> callback;
     protected int searchSize = 1;
-    protected final TerraPlugin main;
 
     public AsyncBiomeFinder(BiomeProvider provider, TerraBiome target, @NotNull Vector3 origin, World world, int startRadius, int maxRadius, Consumer<Vector3> callback, TerraPlugin main) {
         this.provider = provider;
@@ -52,6 +52,7 @@ public class AsyncBiomeFinder implements Runnable {
     public Vector3 finalizeVector(Vector3 orig) {
         return orig.multiply(main.getTerraConfig().getBiomeSearchResolution());
     }
+
     @Override
     public void run() {
         int x = centerX;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverPalette.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.carver;
 
-import com.dfsek.terra.api.block.state.BlockState;
 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.terra.api.util.collection.ProbabilityCollection;
 import net.jafama.FastMath;

common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.carver;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.profiler.ProfileFrame;

common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java

@@ -120,10 +120,10 @@ public class UserDefinedCarver extends Carver {
     private class UserDefinedWorm extends Worm {
         private final Vector3 direction;
         private final Vector3 origin;
+        private final long seed;
         private int steps;
         private int nextDirection = 0;
         private double[] currentRotation = new double[3];
-        private final long seed;
 
         public UserDefinedWorm(int length, Random r, Vector3 origin, int topCut, int bottomCut, long seed) {
             super(length, r, origin);

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin;
 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.util.collection.MaterialSet;
 import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.Flora;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise;
 
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
 
 import java.util.Map;

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

@@ -24,23 +24,19 @@ import java.util.Map;
 
 @SuppressWarnings({"FieldMayBeFinal", "unused"})
 public class ExpressionFunctionTemplate extends SamplerTemplate<ExpressionFunction> implements ValidatedConfigTemplate {
+    private final Map<String, NoiseSeeded> otherFunctions;
     @Value("variables")
     @Default
     private Map<String, Double> vars = new HashMap<>();
-
     @Value("equation")
     private String equation;
-
     @Value("functions")
     @Default
     private LinkedHashMap<String, NoiseSeeded> functions = new LinkedHashMap<>();
-
     @Value("expressions")
     @Default
     private LinkedHashMap<String, FunctionTemplate> expressions = new LinkedHashMap<>();
 
-    private final Map<String, NoiseSeeded> otherFunctions;
-
     public ExpressionFunctionTemplate(Map<String, NoiseSeeded> otherFunctions) {
         this.otherFunctions = otherFunctions;
     }

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

@@ -17,6 +17,14 @@ public class UserDefinedFunction implements DynamicFunction {
         this.args = args;
     }
 
+    public static UserDefinedFunction newInstance(FunctionTemplate template, Parser parser, Scope parent) throws ParseException {
+
+        Scope functionScope = new Scope().withParent(parent);
+
+        template.getArgs().forEach(functionScope::addInvocationVariable);
+
+        return new UserDefinedFunction(parser.parse(template.getFunction(), functionScope), template.getArgs().size());
+    }
 
     @Override
     public double eval(double... args) {
@@ -32,13 +40,4 @@ public class UserDefinedFunction implements DynamicFunction {
     public int getArgNumber() {
         return args;
     }
-
-    public static UserDefinedFunction newInstance(FunctionTemplate template, Parser parser, Scope parent) throws ParseException {
-
-        Scope functionScope = new Scope().withParent(parent);
-
-        template.getArgs().forEach(functionScope::addInvocationVariable);
-
-        return new UserDefinedFunction(parser.parse(template.getFunction(), functionScope), template.getArgs().size());
-    }
 }

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.noise.samplers.noise;
 
+import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 
 /**
  * NoiseSampler implementation for Cellular (Voronoi/Worley) Noise.

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

@@ -9,7 +9,15 @@ public abstract class NoiseFunction implements NoiseSampler {
     protected static final int PRIME_X = 501125321;
     protected static final int PRIME_Y = 1136930381;
     protected static final int PRIME_Z = 1720413743;
+    static final int precision = 100;
+    static final int modulus = 360 * precision;
+    static final double[] sin = new double[360 * 100]; // lookup table
 
+    static {
+        for(int i = 0; i < sin.length; i++) {
+            sin[i] = (float) Math.sin((double) (i) / (precision));
+        }
+    }
 
     protected double frequency = 0.02d;
     protected int seed;
@@ -22,8 +30,6 @@ public abstract class NoiseFunction implements NoiseSampler {
         return f >= 0 ? (int) f : (int) f - 1;
     }
 
-    static final int precision = 100;
-
     protected static int hash(int seed, int xPrimed, int yPrimed, int zPrimed) {
         int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed;
 
@@ -38,8 +44,6 @@ public abstract class NoiseFunction implements NoiseSampler {
         return hash;
     }
 
-    static final int modulus = 360 * precision;
-
     protected static int fastRound(double f) {
         return f >= 0 ? (int) (f + 0.5f) : (int) (f - 0.5);
     }
@@ -77,14 +81,6 @@ public abstract class NoiseFunction implements NoiseSampler {
         return FastMath.sqrt(f);
     }
 
-    static final double[] sin = new double[360 * 100]; // lookup table
-
-    static {
-        for(int i = 0; i < sin.length; i++) {
-            sin[i] = (float) Math.sin((double) (i) / (precision));
-        }
-    }
-
     protected static int fastCeil(double f) {
         int i = (int) f;
         if(i < f) i++;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.ore;
 
+import com.dfsek.terra.addons.ore.ores.Ore;
+import com.dfsek.terra.addons.ore.ores.VanillaOre;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.ConfigFactory;
-import com.dfsek.terra.addons.ore.ores.Ore;
-import com.dfsek.terra.addons.ore.ores.VanillaOre;
 
 public class OreFactory implements ConfigFactory<OreTemplate, Ore> {
     @Override

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

@@ -3,11 +3,11 @@ package com.dfsek.terra.addons.ore;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.config.AbstractableTemplate;
-import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.collection.MaterialSet;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
 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.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
@@ -15,8 +15,8 @@ public abstract class Ore {
     private final BlockState material;
     private final MaterialSet replaceable;
     private final boolean applyGravity;
-    protected TerraPlugin main;
     private final Map<BlockType, BlockState> materials;
+    protected TerraPlugin main;
 
     public Ore(BlockState material, MaterialSet replaceable, boolean applyGravity, TerraPlugin main, Map<BlockType, BlockState> materials) {
         this.material = material;

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.ore.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.BlockType;
-import com.dfsek.terra.api.util.collection.MaterialSet;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.collection.MaterialSet;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import net.jafama.FastMath;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

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

@@ -1,7 +1,6 @@
 package com.dfsek.terra.addons.palette;
 
 import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.terra.addons.palette.palette.PaletteImpl;
 import com.dfsek.terra.api.TerraPlugin;
@@ -11,7 +10,6 @@ import com.dfsek.terra.api.config.ConfigType;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.world.generator.Palette;
 
-import java.lang.reflect.Type;
 import java.util.function.Supplier;
 
 public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {

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

@@ -54,8 +54,8 @@ public abstract class PaletteImpl implements com.dfsek.terra.api.world.generator
      */
     public static class PaletteLayer {
         private final boolean col; // Is layer using a collection?
-        private ProbabilityCollection<BlockState> collection;
         private final NoiseSampler sampler;
+        private ProbabilityCollection<BlockState> collection;
         private BlockState m;
 
         /**

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

@@ -14,17 +14,18 @@ import java.util.Map;
 @SuppressWarnings("unchecked")
 public class PaletteLayerLoader implements TypeLoader<PaletteLayerHolder> {
     private static final Type BLOCK_DATA_PROBABILITY_COLLECTION_TYPE;
-    @SuppressWarnings("unused")
-    private ProbabilityCollection<BlockState> blockStateProbabilityCollection;
 
     static {
         try {
-            BLOCK_DATA_PROBABILITY_COLLECTION_TYPE =  PaletteLayerLoader.class.getDeclaredField("blockStateProbabilityCollection").getGenericType();
+            BLOCK_DATA_PROBABILITY_COLLECTION_TYPE = PaletteLayerLoader.class.getDeclaredField("blockStateProbabilityCollection").getGenericType();
         } catch(NoSuchFieldException e) {
             throw new Error("this should never happen. i dont know what you did to make this happen but something is very wrong.", e);
         }
     }
 
+    @SuppressWarnings("unused")
+    private ProbabilityCollection<BlockState> blockStateProbabilityCollection;
+
     @Override
     public PaletteLayerHolder load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
         Map<String, Object> map = (Map<String, Object>) o;

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

@@ -3,8 +3,8 @@ package com.dfsek.terra.addons.structure;
 import com.dfsek.terra.api.structure.ConfiguredStructure;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 public class TerraStructure implements ConfiguredStructure {
     private final ProbabilityCollection<Structure> structure;

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

@@ -17,9 +17,10 @@ public class AsyncStructureFinder implements Runnable {
     protected final int centerX;
     protected final int centerZ;
     protected final World world;
+    protected final TerraPlugin main;
     private final Consumer<Vector3> callback;
     protected int searchSize = 1;
-    protected final TerraPlugin main;
+
     public AsyncStructureFinder(BiomeProvider provider, ConfiguredStructure target, @NotNull Vector3 origin, World world, int startRadius, int maxRadius, Consumer<Vector3> callback, TerraPlugin main) {
         //setSearchSize(target.getSpawn().getWidth() + 2 * target.getSpawn().getSeparation());
         this.provider = provider;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.structure.command.structure;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.entity.Sign;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Argument;
 import com.dfsek.terra.api.command.annotation.Command;

common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java

@@ -1,12 +1,12 @@
 package com.dfsek.terra.addons.structure.structures.loot;
 
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.inventory.Item;
-import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.addons.structure.structures.loot.functions.AmountFunction;
 import com.dfsek.terra.addons.structure.structures.loot.functions.DamageFunction;
 import com.dfsek.terra.addons.structure.structures.loot.functions.EnchantFunction;
 import com.dfsek.terra.addons.structure.structures.loot.functions.LootFunction;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.ItemStack;
 import net.jafama.FastMath;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;

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

@@ -14,10 +14,6 @@ group = "com.dfsek.terra.common"
 
 dependencies {
     "shadedApi"(project(":common:api"))
-
-
-
-
     "compileOnly"("com.google.guava:guava:30.0-jre")
 
     "testImplementation"("com.google.guava:guava:30.0-jre")

common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.tree;
 
+import com.dfsek.terra.addons.tree.tree.TerraTree;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.ConfigFactory;
 import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.addons.tree.tree.TerraTree;
 
 public class TreeFactory implements ConfigFactory<TreeTemplate, Tree> {
     @Override

common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/tree/TreeLayer.java

@@ -8,7 +8,6 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.Tree;
 
 public class TreeLayer {
@@ -45,9 +44,9 @@ public class TreeLayer {
         BlockState current;
         int i = 0;
         for(int ignored : level) {
-            current = chunk.getBlock((int) coords.getX(), level.getMax()-i, (int) coords.getZ());
+            current = chunk.getBlock((int) coords.getX(), level.getMax() - i, (int) coords.getZ());
             if(item.getSpawnable().contains(current.getBlockType())) {
-                item.plant(new Vector3((int) coords.getX(), level.getMax()-i, (int) coords.getZ()), chunk.getWorld(), PopulationUtil.getRandom(chunk, coords.hashCode()));
+                item.plant(new Vector3((int) coords.getX(), level.getMax() - i, (int) coords.getZ()), chunk.getWorld(), PopulationUtil.getRandom(chunk, coords.hashCode()));
             }
             i--;
         }

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

@@ -42,6 +42,20 @@ public class Block implements Item<Block.ReturnInfo<?>> {
         return position;
     }
 
+    public enum ReturnLevel {
+        NONE(false), BREAK(false), CONTINUE(false), RETURN(true), FAIL(true);
+
+        private final boolean returnFast;
+
+        ReturnLevel(boolean returnFast) {
+            this.returnFast = returnFast;
+        }
+
+        public boolean isReturnFast() {
+            return returnFast;
+        }
+    }
+
     public static class ReturnInfo<T> {
         private final ReturnLevel level;
         private final T data;
@@ -59,18 +73,4 @@ public class Block implements Item<Block.ReturnInfo<?>> {
             return data;
         }
     }
-
-    public enum ReturnLevel {
-        NONE(false), BREAK(false), CONTINUE(false), RETURN(true), FAIL(true);
-
-        private final boolean returnFast;
-
-        ReturnLevel(boolean returnFast) {
-            this.returnFast = returnFast;
-        }
-
-        public boolean isReturnFast() {
-            return returnFast;
-        }
-    }
 }

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser.lang.constants;
 
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
 public class NumericConstant extends ConstantExpression<Number> {
     public NumericConstant(Number constant, Position position) {

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.terrascript.parser.lang.constants;
 
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
 public class StringConstant extends ConstantExpression<String> {
     public StringConstant(String constant, Position position) {

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.terrascript.script;
 
+import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.api.world.World;
 
 import java.util.Random;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java

@@ -1,6 +1,5 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant;
@@ -9,6 +8,7 @@ import com.dfsek.terra.addons.terrascript.script.functions.AbstractBlockFunction
 import com.dfsek.terra.addons.terrascript.script.functions.BlockFunction;
 import com.dfsek.terra.addons.terrascript.script.functions.DynamicBlockFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.StructureScript;
 import com.dfsek.terra.addons.terrascript.script.functions.LootFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.PullFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.StateFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 
 import java.util.List;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.structure.Structure;
 
 import java.util.List;
 import java.util.stream.Collectors;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java

@@ -2,11 +2,11 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 
 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.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java

@@ -3,12 +3,12 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 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.constants.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
 import java.util.Map;
 

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/DynamicBlockFunction.java

@@ -4,9 +4,9 @@ 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.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.state.BlockState;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
 import java.util.HashMap;
 import java.util.Map;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java

@@ -4,13 +4,13 @@ import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 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.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
+import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
+import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java

@@ -3,14 +3,14 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication;
 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.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.StructureScript;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.LootTable;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java

@@ -4,13 +4,13 @@ import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock;
 import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
 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.variables.Variable;
-import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
+import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
+import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java

@@ -3,11 +3,11 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator;
 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.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java

@@ -3,14 +3,14 @@ package com.dfsek.terra.addons.terrascript.script.functions;
 import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer;
 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.functions.Function;
 import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
+import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
-import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function;
-import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 import com.dfsek.terra.api.util.RotationUtil;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java

@@ -6,11 +6,6 @@ import java.util.Arrays;
 import java.util.Collection;
 
 public interface BooleanProperty extends Property<Boolean> {
-    @Override
-    default Class<Boolean> getType() {
-        return Boolean.class;
-    }
-
     static BooleanProperty of(String name) {
         return new BooleanProperty() {
             private static final Collection<Boolean> BOOLEANS = Arrays.asList(true, false);
@@ -26,4 +21,9 @@ public interface BooleanProperty extends Property<Boolean> {
             }
         };
     }
+
+    @Override
+    default Class<Boolean> getType() {
+        return Boolean.class;
+    }
 }

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java

@@ -10,6 +10,7 @@ public interface EnumProperty<T extends Enum<T>> extends Property<T> {
     static <T extends Enum<T>> EnumProperty<T> of(String name, Class<T> clazz) {
         return new EnumProperty<T>() {
             private final Lazy<Collection<T>> constants = Lazy.of(() -> Arrays.asList(clazz.getEnumConstants()));
+
             @Override
             public Class<T> getType() {
                 return clazz;

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java

@@ -8,11 +8,6 @@ import java.util.Collection;
 import java.util.List;
 
 public interface IntProperty extends Property<Integer> {
-    @Override
-    default Class<Integer> getType() {
-        return Integer.class;
-    }
-
     static IntProperty of(String name, int min, int max) {
         return new IntProperty() {
             private final Collection<Integer> collection = Construct.construct(() -> {
@@ -34,4 +29,9 @@ public interface IntProperty extends Property<Integer> {
             }
         };
     }
+
+    @Override
+    default Class<Integer> getType() {
+        return Integer.class;
+    }
 }

common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java

@@ -32,7 +32,7 @@ public enum Direction {
             case DOWN:
                 return this;
             default:
-                return rotations[(this.rotation + rotation.getDegrees()/90) % 4];
+                return rotations[(this.rotation + rotation.getDegrees() / 90) % 4];
         }
     }
 

common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.api.config;
 
+import com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.meta.RegistryFactory;
 import com.dfsek.terra.api.registry.meta.RegistryHolder;
 import com.dfsek.terra.api.tectonic.LoaderHolder;
 import com.dfsek.terra.api.tectonic.LoaderRegistrar;
-import com.dfsek.terra.api.addon.TerraAddon;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
+import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider;
 
 import java.util.Map;

common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java

@@ -1,7 +1,5 @@
 package com.dfsek.terra.api.config;
 
-import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.registry.OpenRegistry;
 

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java

@@ -15,9 +15,9 @@ import org.jetbrains.annotations.NotNull;
  */
 public class LootPopulateEvent extends AbstractCancellable implements PackEvent, Cancellable {
     private final Container container;
-    private LootTable table;
     private final ConfigPack pack;
     private final Structure structure;
+    private LootTable table;
 
     public LootPopulateEvent(Container container, LootTable table, ConfigPack pack, Structure structure) {
         this.container = container;

common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java

@@ -5,6 +5,30 @@ import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.vector.Vector3;
 
 public interface NoiseSampler {
+    static NoiseSampler zero() {
+        return new NoiseSampler() {
+            @Override
+            public double getNoise(double x, double y) {
+                return 0;
+            }
+
+            @Override
+            public double getNoise(double x, double y, double z) {
+                return 0;
+            }
+
+            @Override
+            public double getNoiseSeeded(int seed, double x, double y) {
+                return 0;
+            }
+
+            @Override
+            public double getNoiseSeeded(int seed, double x, double y, double z) {
+                return 0;
+            }
+        };
+    }
+
     /**
      * 2D noise at given position using current settings
      * <p>
@@ -30,28 +54,4 @@ public interface NoiseSampler {
     double getNoiseSeeded(int seed, double x, double y);
 
     double getNoiseSeeded(int seed, double x, double y, double z);
-
-    static NoiseSampler zero() {
-        return new NoiseSampler() {
-            @Override
-            public double getNoise(double x, double y) {
-                return 0;
-            }
-
-            @Override
-            public double getNoise(double x, double y, double z) {
-                return 0;
-            }
-
-            @Override
-            public double getNoiseSeeded(int seed, double x, double y) {
-                return 0;
-            }
-
-            @Override
-            public double getNoiseSeeded(int seed, double x, double y, double z) {
-                return 0;
-            }
-        };
-    }
 }

common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java

@@ -11,6 +11,7 @@ import java.util.function.Function;
 public interface RegistryFactory {
     /**
      * Create a generic OpenRegistry.
+     *
      * @param <T> Type of registry.
      * @return New OpenRegistry
      */
@@ -18,8 +19,9 @@ public interface RegistryFactory {
 
     /**
      * Create an OpenRegistry with custom {@link TypeLoader}
+     *
      * @param loader Function to create loader.
-     * @param <T> Type of registry.
+     * @param <T>    Type of registry.
      * @return New OpenRegistry.
      */
     <T> OpenRegistry<T> create(Function<OpenRegistry<T>, TypeLoader<T>> loader);

common/api/src/main/java/com/dfsek/terra/api/structure/ConfiguredStructure.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structure;
 
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.Range;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 public interface ConfiguredStructure {
     ProbabilityCollection<Structure> getStructure();

common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java

@@ -5,15 +5,16 @@ import com.dfsek.tectonic.loading.TypeLoader;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
 
 import java.lang.reflect.Type;
-import java.util.function.Supplier;
 
 public interface LoaderHolder {
     <T> LoaderHolder applyLoader(Type type, TypeLoader<T> loader);
+
     default <T> LoaderHolder applyLoader(Class<? extends T> type, TypeLoader<T> loader) {
         return applyLoader((Type) type, loader);
     }
 
     <T> LoaderHolder applyLoader(Type type, TemplateProvider<ObjectTemplate<T>> loader);
+
     default <T> LoaderHolder applyLoader(Class<? extends T> type, TemplateProvider<ObjectTemplate<T>> loader) {
         return applyLoader((Type) type, loader);
     }

common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java

@@ -6,9 +6,9 @@ import com.dfsek.terra.api.transform.exception.TransformException;
 import java.util.Objects;
 
 public interface Validator<T> {
-    boolean validate(T value) throws TransformException;
-
     static <T> Validator<T> notNull() {
         return Objects::nonNull;
     }
+
+    boolean validate(T value) throws TransformException;
 }

common/api/src/main/java/com/dfsek/terra/api/util/ReflectionUtil.java

@@ -6,7 +6,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.function.Consumer;
 import java.util.stream.Stream;

common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java

@@ -37,8 +37,6 @@ public final class RotationUtil {
     }
 
 
-
-
     public static Axis getRotatedAxis(Axis orig, Rotation r) {
         Axis other = orig;
         final boolean shouldSwitch = r.equals(Rotation.CW_90) || r.equals(Rotation.CCW_90);

common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java

@@ -11,6 +11,10 @@ public final class Lazy<T> {
         this.valueSupplier = valueSupplier;
     }
 
+    public static <T> Lazy<T> of(Supplier<T> valueSupplier) {
+        return new Lazy<>(valueSupplier);
+    }
+
     public T value() {
         if(!got && value == null) {
             got = true;
@@ -18,8 +22,4 @@ public final class Lazy<T> {
         }
         return value;
     }
-
-    public static <T> Lazy<T> of(Supplier<T> valueSupplier) {
-        return new Lazy<>(valueSupplier);
-    }
 }

common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java

@@ -6,11 +6,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Objects;
 
 public final class ImmutablePair<L, R> {
+    private static final ImmutablePair<?, ?> NULL = new ImmutablePair<>(null, null);
     private final L left;
     private final R right;
 
-    private static final ImmutablePair<?, ?> NULL = new ImmutablePair<>(null, null);
-
     private ImmutablePair(L left, R right) {
         this.left = left;
         this.right = right;
@@ -21,6 +20,12 @@ public final class ImmutablePair<L, R> {
         return new ImmutablePair<>(left, right);
     }
 
+    @Contract("-> new")
+    @SuppressWarnings("unchecked")
+    public static <L1, R1> ImmutablePair<L1, R1> ofNull() {
+        return (ImmutablePair<L1, R1>) NULL;
+    }
+
     public R getRight() {
         return right;
     }
@@ -29,12 +34,6 @@ public final class ImmutablePair<L, R> {
         return left;
     }
 
-    @Contract("-> new")
-    @SuppressWarnings("unchecked")
-    public static <L1, R1> ImmutablePair<L1, R1> ofNull() {
-        return (ImmutablePair<L1, R1>) NULL;
-    }
-
     @NotNull
     @Contract("-> new")
     public Pair<L, R> mutable() {