reformat

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

@@ -1,9 +1,8 @@
 package com.dfsek.terra.addons.chunkgenerator.config;
 
+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 com.dfsek.tectonic.api.config.template.ConfigTemplate;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
 import com.dfsek.terra.api.config.meta.Meta;
 

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

@@ -38,6 +38,7 @@ public class BiomeNoiseConfigTemplate implements ObjectTemplate<BiomeNoiseProper
     
     @Override
     public BiomeNoiseProperties get() {
-        return new BiomeNoiseProperties(baseSampler, elevationSampler, carvingSampler, blendDistance, blendStep, blendWeight, elevationWeight);
+        return new BiomeNoiseProperties(baseSampler, elevationSampler, carvingSampler, blendDistance, blendStep, blendWeight,
+                                        elevationWeight);
     }
 }

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

@@ -11,18 +11,18 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
-import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
-import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.world.chunk.generation.util.Palette;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
+import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
+import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.world.chunk.generation.util.Palette;
+
 
 public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
     @Value("slant")
@@ -44,10 +44,10 @@ public class BiomePaletteTemplate implements ObjectTemplate<PaletteInfo> {
                 builder.add(entry.getValue(), entry.getKey());
             }
         }
-    
+        
         TreeMap<Double, PaletteHolder> slantLayers = new TreeMap<>();
         double minThreshold = Double.MAX_VALUE;
-    
+        
         for(SlantLayer layer : slant) {
             double threshold = layer.getThreshold();
             if(threshold < minThreshold) minThreshold = threshold;

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

@@ -3,15 +3,15 @@ package com.dfsek.terra.addons.chunkgenerator.config.palette;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder;
 import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 
 public class SlantLayer implements ObjectTemplate<SlantLayer> {
     @Value("threshold")

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

@@ -11,9 +11,6 @@ package com.dfsek.terra.addons.chunkgenerator.generation;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.PaletteUtil;
 import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator;
@@ -29,7 +26,6 @@ import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator;
 import com.dfsek.terra.api.world.chunk.generation.ProtoChunk;
-import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 
 
@@ -120,7 +116,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator {
         
         int fdX = FastMath.floorMod(x, 16);
         int fdZ = FastMath.floorMod(z, 16);
-    
+        
         Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo);
         double noise = sampler.sample(fdX, y, fdZ);
         if(noise > 0) {

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

@@ -7,8 +7,8 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math;
 
-import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo;
+import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D;
 import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
 import com.dfsek.terra.api.world.chunk.generation.util.Palette;
 

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

@@ -111,7 +111,7 @@ public class ChunkInterpolator {
             BiomeNoiseProperties gen = entry.getKey();
             int weight = entry.getValue().get();
             double noise = computeNoise(gen, x, y, z);
-        
+            
             n += noise * weight;
             div += gen.blendWeight() * weight;
         }

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

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

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

@@ -1,12 +1,11 @@
 package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation;
 
+import net.jafama.FastMath;
+
 import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties;
 import com.dfsek.terra.api.noise.NoiseSampler;
-
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
-import net.jafama.FastMath;
-
 import static com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Interpolator.lerp;
 
 
@@ -26,9 +25,10 @@ public class LazilyEvaluatedInterpolator {
     private final long seed;
     private final int min;
     
-    public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes, long seed) {
-        int hSamples = FastMath.ceilToInt(16.0/horizontalRes);
-        int vSamples = FastMath.ceilToInt((double) (max-min) / verticalRes);
+    public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes,
+                                       long seed) {
+        int hSamples = FastMath.ceilToInt(16.0 / horizontalRes);
+        int vSamples = FastMath.ceilToInt((double) (max - min) / verticalRes);
         samples = new Double[hSamples + 1][vSamples + 1][hSamples + 1];
         samplers = new NoiseSampler[hSamples + 1][hSamples + 1];
         this.chunkX = cx << 4;
@@ -43,8 +43,8 @@ public class LazilyEvaluatedInterpolator {
     private double sample(int x, int y, int z, int ox, int oy, int oz) {
         Double sample = samples[x][y][z];
         if(sample == null) {
-            int xi = ox+chunkX;
-            int zi = oz+chunkZ;
+            int xi = ox + chunkX;
+            int zi = oz + chunkZ;
             
             NoiseSampler sampler = samplers[x][z];
             if(sampler == null) {
@@ -71,10 +71,10 @@ public class LazilyEvaluatedInterpolator {
         }
         
         double sample_0_0_1 = sample(xIndex, yIndex, zIndex + 1, x, y, z + horizontalRes);
-    
+        
         double sample_1_0_0 = sample(xIndex + 1, yIndex, zIndex, x + horizontalRes, y, z);
         double sample_1_0_1 = sample(xIndex + 1, yIndex, zIndex + 1, x + horizontalRes, y, z + horizontalRes);
-    
+        
         double xFrac = (double) (x % horizontalRes) / horizontalRes;
         double zFrac = (double) (z % horizontalRes) / horizontalRes;
         double lerp_bottom_0 = lerp(zFrac, sample_0_0_0, sample_0_0_1);
@@ -95,10 +95,10 @@ public class LazilyEvaluatedInterpolator {
         
         double sample_1_1_0 = sample(xIndex + 1, yIndex + 1, zIndex, x + horizontalRes, y + verticalRes, z);
         double sample_1_1_1 = sample(xIndex + 1, yIndex + 1, zIndex + 1, x + horizontalRes, y + verticalRes, z + horizontalRes);
-    
+        
         double lerp_top_0 = lerp(zFrac, sample_0_1_0, sample_0_1_1);
         double lerp_top_1 = lerp(zFrac, sample_1_1_0, sample_1_1_1);
-    
+        
         double lerp_top = lerp(xFrac, lerp_top_0, lerp_top_1);
         
         return lerp(yFrac, lerp_bottom, lerp_top);

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

@@ -17,8 +17,6 @@
 
 package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers;
 
-import com.dfsek.terra.api.world.World;
-
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -28,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 
 
@@ -35,7 +34,6 @@ public class SamplerProvider {
     private final LoadingCache<Pair<Long, World>, Sampler3D> cache;
     
     
-    
     public SamplerProvider(Platform platform, BiomeProvider provider, int elevationSmooth) {
         cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getSamplerCache())
                             .build(new CacheLoader<>() {
@@ -45,7 +43,8 @@ public class SamplerProvider {
                                     int cx = (int) (key >> 32);
                                     int cz = (int) key;
                                     World world = pair.getRight();
-                                    return new Sampler3D(cx, cz, world.getSeed(), world.getMinHeight(), world.getMaxHeight(), provider, elevationSmooth);
+                                    return new Sampler3D(cx, cz, world.getSeed(), world.getMinHeight(), world.getMaxHeight(), provider,
+                                                         elevationSmooth);
                                 }
                             });
     }