Reformat

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;
 
-import java.util.Collection;
-
 import com.dfsek.terra.api.world.biome.Biome;
 
+import java.util.Collection;
+
 
 public interface Extrusion {
     Biome extrude(Biome original, int x, int y, int z, long seed);

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.biome.pipeline.api.delegate;
 
-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Collections;
 import java.util.Set;
 
+import com.dfsek.terra.api.world.biome.Biome;
+
 
 final class SelfDelegate implements BiomeDelegate {
     public static final SelfDelegate INSTANCE = new SelfDelegate();

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

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.biome.holder;
 
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;
+
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
 
 public class PaletteHolderBuilder {
     private final TreeMap<Integer, Palette> paletteMap = new TreeMap<>();

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

@@ -7,11 +7,11 @@
 
 package com.dfsek.terra.addons.feature.distributor.distributors;
 
-import java.util.Set;
-
 import com.dfsek.terra.addons.feature.distributor.util.Point;
 import com.dfsek.terra.api.structure.feature.Distributor;
 
+import java.util.Set;
+
 
 public class PointSetDistributor implements Distributor {
     private final Set<Point> points;

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

@@ -9,17 +9,46 @@ package com.dfsek.terra.addons.noise;
 
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate;
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
-import com.dfsek.terra.addons.noise.config.templates.*;
-import com.dfsek.terra.addons.noise.config.templates.noise.*;
+import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate;
+import com.dfsek.terra.addons.noise.config.templates.DerivativeNoiseSamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate;
+import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
+import com.dfsek.terra.addons.noise.config.templates.ImageSamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.KernelTemplate;
+import com.dfsek.terra.addons.noise.config.templates.LinearHeightmapSamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.TranslateSamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.CellularNoiseTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.ConstantNoiseTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.DistanceSamplerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.ExpressionFunctionTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.GaborNoiseTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.PseudoErosionTemplate;
+import com.dfsek.terra.addons.noise.config.templates.noise.SimpleNoiseTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.BrownianMotionTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.PingPongTemplate;
 import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractalTemplate;
-import com.dfsek.terra.addons.noise.config.templates.normalizer.*;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.CubicSplineNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.NormalNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.PosterizationNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.ProbabilityNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.ScaleNormalizerTemplate;
 import com.dfsek.terra.addons.noise.math.CubicSpline;
-import com.dfsek.terra.addons.noise.samplers.arithmetic.*;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.AdditionSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.DivisionSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.MaxSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.MinSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.MultiplicationSampler;
+import com.dfsek.terra.addons.noise.samplers.arithmetic.SubtractionSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.DistanceSampler;
 import com.dfsek.terra.addons.noise.samplers.noise.random.GaussianNoiseSampler;
@@ -41,10 +70,6 @@ import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.function.Supplier;
-
 
 public class NoiseAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<NoiseSampler>>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {

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

@@ -11,14 +11,14 @@ import com.dfsek.tectonic.api.config.template.ConfigTemplate;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler;
 import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.properties.Properties;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 
 @SuppressWarnings("FieldMayBeFinal")
 public class NoiseConfigPackTemplate implements ConfigTemplate, Properties {

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

@@ -14,7 +14,8 @@ public class DerivativeNoiseSamplerTemplate extends SamplerTemplate<DerivativeNo
 
     @Override
     public boolean validate() throws ValidationException {
-        if (!DerivativeNoiseSampler.isDifferentiable(sampler)) throw new ValidationException("Provided sampler does not support calculating a derivative");
+        if(!DerivativeNoiseSampler.isDifferentiable(sampler)) throw new ValidationException(
+            "Provided sampler does not support calculating a derivative");
         return super.validate();
     }
 

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

@@ -8,16 +8,15 @@
 package com.dfsek.terra.addons.noise.config.templates;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-
-import com.dfsek.terra.addons.noise.samplers.ImageSampler;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.noise.NoiseSampler;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.awt.image.BufferedImage;
 
+import com.dfsek.terra.addons.noise.samplers.ImageSampler;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.noise.NoiseSampler;
+
 
 @SuppressWarnings({ "unused", "FieldMayBeFinal" })
 public class ImageSamplerTemplate extends SamplerTemplate<ImageSampler> {

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

@@ -10,60 +10,47 @@ import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 
 public class PseudoErosionTemplate extends NoiseTemplate<PseudoErosionSampler> {
 
-    @Value("octaves")
-    @Default
-    private int octaves = 4;
-
-    @Value("lacunarity")
-    @Default
-    private double lacunarity = 2.0;
-
-    @Value("gain")
-    @Default
-    private double gain = 0.5;
-
-    @Value("slope-strength")
-    @Default
-    private double slopeStrength = 1.0;
-
-    @Value("branch-strength")
-    @Default
-    private double branchStrength = 1.0;
-
-    @Value("strength")
-    @Default
-    private double strength = 0.04;
-
-    @Value("erosion-frequency")
-    @Default
-    private double erosionFrequency = 0.02;
-
-    @Value("sampler")
-    private DerivativeNoiseSampler heightSampler;
-
-    @Value("slope-mask.enable")
-    @Default
-    private boolean slopeMask = true;
-
-    @Value("slope-mask.none")
-    @Default
-    private double slopeMaskNone = -0.5;
-
-    @Value("slope-mask.full")
-    @Default
-    private double slopeMaskFull = 1;
-
-    @Value("jitter")
-    @Default
-    private double jitterModifier = 1;
-
-    @Value("average-impulses")
-    @Default
-    private boolean averageErosionImpulses = true;
-
     @Value("frequency")
     @Default
     protected @Meta double frequency = 1d;
+    @Value("octaves")
+    @Default
+    private int octaves = 4;
+    @Value("lacunarity")
+    @Default
+    private double lacunarity = 2.0;
+    @Value("gain")
+    @Default
+    private double gain = 0.5;
+    @Value("slope-strength")
+    @Default
+    private double slopeStrength = 1.0;
+    @Value("branch-strength")
+    @Default
+    private double branchStrength = 1.0;
+    @Value("strength")
+    @Default
+    private double strength = 0.04;
+    @Value("erosion-frequency")
+    @Default
+    private double erosionFrequency = 0.02;
+    @Value("sampler")
+    private DerivativeNoiseSampler heightSampler;
+    @Value("slope-mask.enable")
+    @Default
+    private boolean slopeMask = true;
+    @Value("slope-mask.none")
+    @Default
+    private double slopeMaskNone = -0.5;
+    @Value("slope-mask.full")
+    @Default
+    private double slopeMaskFull = 1;
+    @Value("jitter")
+    @Default
+    private double jitterModifier = 1;
+    @Value("average-impulses")
+    @Default
+    private boolean averageErosionImpulses = true;
 
     @Override
     public PseudoErosionSampler get() {

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

@@ -2,6 +2,7 @@ package com.dfsek.terra.addons.noise.samplers.noise;
 
 import com.dfsek.terra.api.noise.DerivativeNoiseSampler;
 
+
 public abstract class DerivativeNoiseFunction extends NoiseFunction implements DerivativeNoiseSampler {
     @Override
     public boolean isDifferentiable() {

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

@@ -9,12 +9,12 @@ public class PseudoErosionSampler extends NoiseFunction {
     public static final float TAU = (float) (2.0 * Math.PI);
     private static final float HASH_X = 0.3183099f;
     private static final float HASH_Y = 0.3678794f;
-    private final int octaves;
     public final double gain;
     public final double lacunarity;
     public final double slopeStrength;
     public final double branchStrength;
     public final double erosionStrength;
+    private final int octaves;
     private final double erosionFrequency;
     private final DerivativeNoiseSampler sampler;
     private final boolean slopeMask;
@@ -25,7 +25,8 @@ public class PseudoErosionSampler extends NoiseFunction {
     private final double maxCellDistSqRecip;
     private final boolean averageErosionImpulses;
 
-    public PseudoErosionSampler(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength, double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler,
+    public PseudoErosionSampler(int octaves, double gain, double lacunarity, double slopeStrength, double branchStrength,
+                                double erosionStrength, double erosionFrequency, DerivativeNoiseSampler sampler,
                                 boolean slopeMask, double slopeMaskFull, double slopeMaskNone, double jitterModifier,
                                 boolean averageErosionImpulses) {
         this.octaves = octaves;
@@ -62,6 +63,21 @@ public class PseudoErosionSampler extends NoiseFunction {
         return (x - (float) Math.floor(x));
     }
 
+    public static float smoothstep(float edge0, float edge1, float x) {
+        // Scale, bias and saturate x to 0..1 range
+        x = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
+        // Evaluate polynomial
+        return x * x * (3 - 2 * x);
+    }
+
+    public static float clamp(float x, float minVal, float maxVal) {
+        return Math.max(minVal, Math.min(maxVal, x));
+    }
+
+    public static float dot(float x1, float y1, float x2, float y2) {
+        return x1 * x2 + y1 * y2;
+    }
+
     public float[] erosion(int seed, float x, float y, float dirX, float dirY) {
         int gridX = Math.round(x);
         int gridY = Math.round(y);
@@ -79,7 +95,8 @@ public class PseudoErosionSampler extends NoiseFunction {
                 float cellOriginDeltaY = (y - cellY) + cellOffsetY;
                 float cellOriginDistSq = cellOriginDeltaX * cellOriginDeltaX + cellOriginDeltaY * cellOriginDeltaY;
                 if(cellOriginDistSq > maxCellDistSq) continue; // Skip calculating cells too far away
-                float ampTmp = (float) ((cellOriginDistSq * maxCellDistSqRecip) - 1); float amp = ampTmp * ampTmp; // Decrease cell amplitude further away
+                float ampTmp = (float) ((cellOriginDistSq * maxCellDistSqRecip) - 1);
+                float amp = ampTmp * ampTmp; // Decrease cell amplitude further away
                 cumAmp += amp;
                 float directionalStrength = dot(cellOriginDeltaX, cellOriginDeltaY, dirX, dirY) * TAU;
                 noise += (float) (MathUtil.cos(directionalStrength) * amp);
@@ -96,17 +113,6 @@ public class PseudoErosionSampler extends NoiseFunction {
         return new float[]{ noise, dirOutX, dirOutY };
     }
 
-    public static float smoothstep(float edge0, float edge1, float x) {
-        // Scale, bias and saturate x to 0..1 range
-        x = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
-        // Evaluate polynomial
-        return x * x * (3 - 2 * x);
-    }
-
-    public static float clamp(float x, float minVal, float maxVal) {
-        return Math.max(minVal, Math.min(maxVal, x));
-    }
-
     public float heightMap(long seed, float x, float y) {
         double[] sample = sampler.noised(seed, x, y);
         float height = (float) sample[0];
@@ -139,7 +145,6 @@ public class PseudoErosionSampler extends NoiseFunction {
             freq *= lacunarity;
         }
 
-        // TODO - Test different output ranges, see how they affect visuals
         // Normalize erosion noise
         erosion /= cumAmp;
         // [-1, 1] -> [0, 1]
@@ -156,10 +161,6 @@ public class PseudoErosionSampler extends NoiseFunction {
         return (float) (height + erosion * erosionStrength);
     }
 
-    public static float dot(float x1, float y1, float x2, float y2) {
-        return x1 * x2 + y1 * y2;
-    }
-
     @Override
     public double getNoiseRaw(long seed, double x, double y) {
         return heightMap(seed, (float) x, (float) y);

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

@@ -276,6 +276,7 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
 
         return value * 9.046026385208288;
     }
+
     @Override
     public boolean isDifferentiable() {
         return true;
@@ -321,7 +322,6 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
         out[2] = gy0 * aaaa0 - 8 * rampValue0 * aaa0 * y0;
 
 
-
         double a1 = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0);
         double x1 = x0 - (1 - 2 * G2);
         double y1 = y0 - (1 - 2 * G2);
@@ -403,7 +403,8 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
                     double rampValue2 = gx2 * x2 + gy2 * y2;
                     out[0] += aaaa2 * rampValue2;
                     out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                            out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;                }
+                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
+                }
             } else {
                 double x2 = x0 + (G2 - 1);
                 double y2 = y0 + G2;
@@ -430,7 +431,8 @@ public class OpenSimplex2SSampler extends SimplexStyleSampler {
                     double rampValue2 = gx2 * x2 + gy2 * y2;
                     out[0] += aaaa2 * rampValue2;
                     out[1] += gx2 * aaaa2 - 8 * rampValue2 * aaa2 * x2;
-                            out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;                }
+                    out[2] += gy2 * aaaa2 - 8 * rampValue2 * aaa2 * y2;
+                }
             } else {
                 double x2 = x0 + G2;
                 double y2 = y0 + (G2 - 1);

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

@@ -206,7 +206,8 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
             double rampValue = gx * x2 + gy * y2;
             out[0] += cccc * rampValue;
             out[1] += gx * cccc - 8 * rampValue * ccc * x2;
-            out[2] += gy * cccc - 8 * rampValue * ccc * y2;        }
+            out[2] += gy * cccc - 8 * rampValue * ccc * y2;
+        }
 
         if(y0 > x0) {
             double x1 = x0 + G2;
@@ -219,7 +220,8 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
                 double rampValue = gx * x1 + gy * y1;
                 out[0] += bbbb * rampValue;
                 out[1] += gx * bbbb - 8 * rampValue * bbb * x1;
-                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;            }
+                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;
+            }
         } else {
             double x1 = x0 + (G2 - 1);
             double y1 = y0 + G2;
@@ -231,7 +233,8 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
                 double rampValue = gx * x1 + gy * y1;
                 out[0] += bbbb * rampValue;
                 out[1] += gx * bbbb - 8 * rampValue * bbb * x1;
-                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;            }
+                out[2] += gy * bbbb - 8 * rampValue * bbb * y1;
+            }
         }
 
         out[0] *= 99.83685446303647f;
@@ -309,7 +312,8 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
                     out[0] += bbbb * rampValue;
                     out[1] += gx * bbbb - 8 * rampValue * bbb * x0;
                     out[1] += gy * bbbb - 8 * rampValue * bbb * (y0 + yNSign);
-                        out[2] += gz * bbbb - 8 * rampValue * bbb * z0;                    }
+                    out[2] += gz * bbbb - 8 * rampValue * bbb * z0;
+                }
             } else {
                 double b = a + az0 + az0;
                 if(b > 1) {
@@ -321,7 +325,8 @@ public class OpenSimplex2Sampler extends SimplexStyleSampler {
                     out[0] += bbbb * rampValue;
                     out[1] += gx * bbbb - 8 * rampValue * bbb * x0;
                     out[1] += gy * bbbb - 8 * rampValue * bbb * y0;
-                        out[2] += gz * bbbb - 8 * rampValue * bbb * (z0 + zNSign);                    }
+                    out[2] += gz * bbbb - 8 * rampValue * bbb * (z0 + zNSign);
+                }
             }
 
             if(l == 1) break;

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

@@ -8,7 +8,6 @@
 package com.dfsek.terra.addons.noise.samplers.noise.simplex;
 
 import com.dfsek.terra.addons.noise.samplers.noise.DerivativeNoiseFunction;
-import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction;
 
 
 /**

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

@@ -11,13 +11,6 @@ import com.dfsek.tectonic.api.config.template.dynamic.DynamicTemplate;
 import com.dfsek.tectonic.api.config.template.dynamic.DynamicValue;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.addons.generation.feature.config.FeatureStageTemplate;
 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
@@ -35,6 +28,9 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 
+import java.util.*;
+import java.util.function.Supplier;
+
 
 public class FeatureGenerationAddon implements AddonInitializer {
     public static final TypeKey<Supplier<ObjectTemplate<GenerationStage>>> STAGE_TYPE_KEY = new TypeKey<>() {

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

@@ -7,9 +7,6 @@
 
 package com.dfsek.terra.addons.generation.feature;
 
-import java.util.Collections;
-import java.util.Random;
-
 import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.noise.NoiseSampler;
@@ -22,6 +19,9 @@ import com.dfsek.terra.api.world.chunk.generation.ProtoWorld;
 import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.Column;
 
+import java.util.Collections;
+import java.util.Random;
+
 
 public class FeatureGenerationStage implements GenerationStage, StringIdentifiable {
     private final Platform platform;

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

@@ -1,7 +1,5 @@
 package com.dfsek.terra.addons.structure.mutator;
 
-import java.util.Random;
-
 import com.dfsek.terra.api.registry.key.Keyed;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.structure.Structure;
@@ -11,6 +9,8 @@ import com.dfsek.terra.api.world.WritableWorld;
 import com.dfsek.terra.api.world.util.ReadInterceptor;
 import com.dfsek.terra.api.world.util.WriteInterceptor;
 
+import java.util.Random;
+
 
 public class MutatedStructure implements Structure, Keyed<MutatedStructure> {
     private final RegistryKey key;

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

@@ -7,15 +7,15 @@
 
 package com.dfsek.terra.addons.terrascript.parser;
 
-import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
-import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
-import com.dfsek.terra.addons.terrascript.tokenizer.Token;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException;
+import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
+import com.dfsek.terra.addons.terrascript.tokenizer.Token;
+
 
 public class ParserUtil {
 

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

@@ -7,13 +7,13 @@
 
 package com.dfsek.terra.addons.terrascript.script.builders;
 
-import java.util.List;
-
 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.CheckBlockFunction;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;
 
+import java.util.List;
+
 
 public class CheckBlockFunctionBuilder implements FunctionBuilder<CheckBlockFunction> {
     @SuppressWarnings("unchecked")

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

@@ -22,19 +22,23 @@ public interface DerivativeNoiseSampler extends NoiseSampler {
 
     /**
      * Derivative return version of standard 2D noise evaluation
+     *
      * @param seed
      * @param x
      * @param y
+     *
      * @return 3 element array, in index order: noise value, partial x derivative, partial y derivative
      */
     double[] noised(long seed, double x, double y);
 
     /**
      * Derivative return version of standard 3D noise evaluation
+     *
      * @param seed
      * @param x
      * @param y
      * @param z
+     *
      * @return 4 element array, in index order: noise value, partial x derivative, partial y derivative, partial z derivative
      */
     double[] noised(long seed, double x, double y, double z);

common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java

@@ -7,18 +7,18 @@
 
 package com.dfsek.terra.api.world.biome.generation;
 
-import org.jetbrains.annotations.Contract;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
 import com.dfsek.terra.api.util.Column;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.util.vector.Vector3Int;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.info.WorldProperties;
 
+import org.jetbrains.annotations.Contract;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
 
 /**
  * Provides locations of biomes in a world.

common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java

@@ -24,14 +24,15 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.preprocessor.Result;
+
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.reflection.TypeKey;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.AnnotatedType;
 import java.util.Map;
 
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 
 public class MetaNumberPreprocessor extends MetaPreprocessor<Meta> {
     public static final TypeKey<String> META_STRING_KEY = new TypeKey<@Meta String>() {

common/implementation/base/src/main/java/com/dfsek/terra/event/FunctionalEventHandlerImpl.java

@@ -17,6 +17,17 @@
 
 package com.dfsek.terra.event;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.event.events.Event;
 import com.dfsek.terra.api.event.events.FailThroughEvent;
@@ -25,12 +36,6 @@ import com.dfsek.terra.api.event.functional.EventContext;
 import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
 import com.dfsek.terra.api.util.reflection.TypeKey;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Type;
-import java.util.*;
-
 
 public class FunctionalEventHandlerImpl implements FunctionalEventHandler {
     private static final Logger logger = LoggerFactory.getLogger(FunctionalEventHandlerImpl.class);

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java

@@ -17,14 +17,14 @@
 
 package com.dfsek.terra.bukkit;
 
+import io.papermc.lib.PaperLib;
+import org.bukkit.Location;
+
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.util.vector.Vector3;
 import com.dfsek.terra.api.world.ServerWorld;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 
-import io.papermc.lib.PaperLib;
-import org.bukkit.Location;
-
 
 public class BukkitEntity implements Entity {
     private final org.bukkit.entity.Entity entity;

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorldProperties.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world;
 
-import org.bukkit.generator.WorldInfo;
-
 import com.dfsek.terra.api.world.info.WorldProperties;
 
+import org.bukkit.generator.WorldInfo;
+
 
 public class BukkitWorldProperties implements WorldProperties {
     private final WorldInfo delegate;

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java

@@ -1,5 +1,8 @@
 package com.dfsek.terra.lifecycle;
 
+import com.dfsek.terra.api.command.CommandSender;
+import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
+
 import net.minecraft.server.command.ServerCommandSource;
 import org.incendo.cloud.SenderMapper;
 import org.incendo.cloud.execution.ExecutionCoordinator;
@@ -7,9 +10,6 @@ import org.incendo.cloud.fabric.FabricServerCommandManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
-
 
 public final class LifecycleEntryPoint {
     private static final Logger logger = LoggerFactory.getLogger(LifecycleEntryPoint.class);

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java

@@ -18,6 +18,7 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
 import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
 
+
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
     @Inject(method = "<init>(Ljava/lang/Thread;Lnet/minecraft/world/level/storage/LevelStorage$Session;" +

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleUtil.java

@@ -13,6 +13,7 @@ import com.dfsek.terra.mod.CommonPlatform;
 
 public final class LifecycleUtil {
     public static boolean initialized = false;
+
     private LifecycleUtil() {
 
     }