reformat

2026-06-18 14:50:56 +00:00 · 2024-09-24 10:06:57 -06:00
parent a95a1284a4
commit 581651e83b
50 changed files with 179 additions and 188 deletions
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.extrusion.api;

-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Collection;

+import com.dfsek.terra.api.world.biome.Biome;
+

 public interface Extrusion {
    Biome extrude(Biome original, int x, int y, int z, long seed);
@@ -9,8 +9,6 @@ package com.dfsek.terra.addons.biome.image;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import java.util.function.Supplier;
-
 import com.dfsek.terra.addons.biome.image.config.ImageProviderTemplate;
 import com.dfsek.terra.addons.biome.image.config.converter.ClosestBiomeColorConverterTemplate;
 import com.dfsek.terra.addons.biome.image.config.converter.ExactBiomeColorConverterTemplate;
@@ -29,6 +27,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

+import java.util.function.Supplier;
+

 public class ImageBiomeProviderAddon implements AddonInitializer {
    public static final TypeKey<Supplier<ObjectTemplate<BiomeProvider>>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {
@@ -1,10 +1,5 @@
 package com.dfsek.terra.addons.biome.pipeline;

-import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
-import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
-import com.dfsek.terra.addons.biome.pipeline.api.SeededVector;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;

@@ -14,6 +9,11 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.StreamSupport;

+import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk;
+import com.dfsek.terra.addons.biome.pipeline.api.Pipeline;
+import com.dfsek.terra.addons.biome.pipeline.api.SeededVector;
+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.Column;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.biome.pipeline.api;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;


 public interface Stage {
@@ -1,9 +1,9 @@
 package com.dfsek.terra.addons.biome.pipeline.api.biome;

-import com.dfsek.terra.api.world.biome.Biome;
-
 import java.util.Set;

+import com.dfsek.terra.api.world.biome.Biome;
+

 public final class DelegatedPipelineBiome implements PipelineBiome {
    private final Biome biome;
@@ -14,10 +14,10 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

 import java.util.List;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl;
 import com.dfsek.terra.addons.biome.pipeline.PipelineBiomeProvider;
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -29,7 +29,7 @@ public class BiomePipelineTemplate implements ObjectTemplate<BiomeProvider> {
    @Default
    @Description("""
                 The resolution at which to sample biomes.
-                                  
+                 
                 Larger values are quadratically faster, but produce lower quality results.
                 For example, a value of 3 would sample every 3 blocks.""")
    protected @Meta int resolution = 1;
@@ -10,9 +10,9 @@ package com.dfsek.terra.addons.biome.pipeline.config.source;
 import com.dfsek.tectonic.api.config.template.annotations.Description;
 import com.dfsek.tectonic.api.config.template.annotations.Value;

-import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource;
 import com.dfsek.terra.api.config.meta.Meta;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.addons.biome.pipeline.stage.expander;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.Expander;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;


@@ -14,9 +14,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.vector.Vector2Int;
@@ -13,9 +13,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.util.vector.Vector2Int;
@@ -7,17 +7,17 @@

 package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
-import com.dfsek.terra.addons.biome.pipeline.api.Stage;
-import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
-import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;

+import com.dfsek.terra.addons.biome.pipeline.api.Stage;
+import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
+import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+

 public class ReplaceListStage implements Stage {
    private final Map<PipelineBiome, ProbabilityCollection<PipelineBiome>> replace;
@@ -11,9 +11,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

@@ -9,9 +9,9 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators;

 import java.util.Objects;

-import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.addons.biome.pipeline.api.Stage;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl;
 import com.dfsek.terra.api.noise.NoiseSampler;


@@ -1,8 +1,6 @@
 package com.dfsek.terra.addons.commands.structure;


-import java.util.random.RandomGenerator;
-import java.util.random.RandomGeneratorFactory;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.component.DefaultValue;
 import org.incendo.cloud.context.CommandContext;
@@ -10,7 +8,8 @@ import org.incendo.cloud.description.Description;
 import org.incendo.cloud.parser.standard.EnumParser;
 import org.incendo.cloud.parser.standard.LongParser;

-import java.util.Random;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;

 import com.dfsek.terra.addons.manifest.api.AddonInitializer;
 import com.dfsek.terra.api.Platform;
@@ -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<>();
@@ -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;
@@ -37,6 +37,7 @@ import com.dfsek.terra.addons.noise.config.templates.noise.fractal.RidgedFractal
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ClampNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.CubicSplineNormalizerTemplate;
 import com.dfsek.terra.addons.noise.config.templates.normalizer.ExpressionNormalizerTemplate;
+import com.dfsek.terra.addons.noise.config.templates.normalizer.LinearMapNormalizerTemplate;
 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;
@@ -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 {
@@ -11,12 +11,12 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

+import com.dfsek.terra.api.config.meta.Meta;
+
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;

-import com.dfsek.terra.api.config.meta.Meta;
-

@SuppressWarnings("unused")
 public class FunctionTemplate implements ObjectTemplate<FunctionTemplate> {
@@ -34,11 +34,11 @@ public class CellularNoiseTemplate extends NoiseTemplate<CellularSampler> {
    @Value("lookup")
    @Default
    private @Meta NoiseSampler lookup = new OpenSimplex2Sampler();
-    
+
    @Value("salt-lookup")
    @Default
    private @Meta boolean saltLookup = true;
-    
+
    @Override
    public NoiseSampler get() {
        CellularSampler sampler = new CellularSampler();
@@ -9,21 +9,21 @@ import com.dfsek.terra.api.noise.NoiseSampler;


 public class LinearMapNormalizerTemplate extends NormalizerTemplate<LinearMapNormalizer> {
-    
+
    @Value("from.a")
    @Default
    private @Meta double aFrom = -1;
-    
+
    @Value("from.b")
    @Default
    private @Meta double bFrom = 1;
-    
+
    @Value("to.a")
    private @Meta double aTo;
-    
+
    @Value("to.b")
    private @Meta double bTo;
-    
+
    @Override
    public NoiseSampler get() {
        return new LinearMapNormalizer(function, aFrom, aTo, bFrom, bTo);
@@ -4,15 +4,15 @@ import com.dfsek.terra.api.noise.NoiseSampler;


 public class LinearMapNormalizer extends Normalizer {
-    
+
    private final double aFrom;
-    
+
    private final double aTo;
-    
+
    private final double bFrom;
-    
+
    private final double bTo;
-    
+
    public LinearMapNormalizer(NoiseSampler sampler, double aFrom, double aTo, double bFrom, double bTo) {
        super(sampler);
        this.aFrom = aFrom;
@@ -20,7 +20,7 @@ public class LinearMapNormalizer extends Normalizer {
        this.bFrom = bFrom;
        this.bTo = bTo;
    }
-    
+
    @Override
    public double normalize(double in) {
        return (in - aFrom) * (aTo - bTo) / (aFrom - bFrom) + aTo;
@@ -7,10 +7,10 @@

 package com.dfsek.terra.addons.noise.samplers;

-import com.dfsek.terra.api.noise.NoiseSampler;
-
 import java.awt.image.BufferedImage;

+import com.dfsek.terra.api.noise.NoiseSampler;
+

 public class ImageSampler implements NoiseSampler {
    private final BufferedImage image;
@@ -197,9 +197,9 @@ public class CellularSampler extends NoiseFunction {
    private double jitterModifier = 1.0;

    private NoiseSampler noiseLookup;
-    
+
    private boolean saltLookup;
-    
+
    public CellularSampler() {
        noiseLookup = new OpenSimplex2Sampler();
    }
@@ -219,11 +219,11 @@ public class CellularSampler extends NoiseFunction {
    public void setReturnType(ReturnType returnType) {
        this.returnType = returnType;
    }
-    
+
    public void setSaltLookup(boolean saltLookup) {
        this.saltLookup = saltLookup;
    }
-    
+
    @Override
    public double getNoiseRaw(long sl, double x, double y) {
        int seed = (int) sl;
@@ -384,7 +384,8 @@ public class CellularSampler extends NoiseFunction {
            case Distance2Mul -> distance1 * distance0 * 0.5 - 1;
            case Distance2Div -> distance0 / distance1 - 1;
            case NoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), centerX, centerY, centerZ);
-            case LocalNoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), x / frequency - centerX, y / frequency - centerY, z / frequency - centerZ);
+            case LocalNoiseLookup -> noiseLookup.noise(sl - (saltLookup ? 0 : salt), x / frequency - centerX, y / frequency - centerY,
+                z / frequency - centerZ);
            case Distance3 -> distance2 - 1;
            case Distance3Add -> (distance2 + distance0) * 0.5 - 1;
            case Distance3Sub -> distance2 - distance0 - 1;
@@ -11,12 +11,12 @@ import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.api.config.meta.Meta;
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-
 import java.util.Collections;
 import java.util.Set;

+import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+

@SuppressWarnings("FieldMayBeFinal")
 public class BiomeStructuresTemplate implements ObjectTemplate<BiomeStructures> {
@@ -11,6 +11,13 @@ 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;
@@ -28,9 +35,6 @@ 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<>() {
@@ -3,11 +3,11 @@ package com.dfsek.terra.addons.image.config.image;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import java.io.IOException;
-
 import com.dfsek.terra.addons.image.image.Image;
 import com.dfsek.terra.api.config.ConfigPack;

+import java.io.IOException;
+

 public class ImageTemplate implements ObjectTemplate<Image> {

@@ -4,14 +4,14 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

 import java.util.function.Supplier;

-import com.dfsek.terra.addons.biome.pipeline.image.config.ImageSourceTemplate;
-import com.dfsek.terra.addons.biome.pipeline.image.config.converter.ClosestPipelineBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.pipeline.image.config.converter.ExactPipelineBiomeColorConverterTemplate;
-import com.dfsek.terra.addons.biome.pipeline.image.config.converter.mapping.DefinedPipelineBiomeColorMappingTemplate;
 import com.dfsek.terra.addons.biome.pipeline.BiomePipelineAddon;
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.DelegatedPipelineBiome;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.image.config.ImageSourceTemplate;
+import com.dfsek.terra.addons.biome.pipeline.image.config.converter.ClosestPipelineBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.pipeline.image.config.converter.ExactPipelineBiomeColorConverterTemplate;
+import com.dfsek.terra.addons.biome.pipeline.image.config.converter.mapping.DefinedPipelineBiomeColorMappingTemplate;
 import com.dfsek.terra.addons.image.converter.ColorConverter;
 import com.dfsek.terra.addons.image.converter.mapping.BiomeDefinedColorMapping;
 import com.dfsek.terra.addons.image.converter.mapping.ColorMapping;
@@ -3,9 +3,9 @@ package com.dfsek.terra.addons.biome.pipeline.image.config;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;

-import com.dfsek.terra.addons.biome.pipeline.image.ImageSource;
 import com.dfsek.terra.addons.biome.pipeline.api.Source;
 import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome;
+import com.dfsek.terra.addons.biome.pipeline.image.ImageSource;
 import com.dfsek.terra.addons.image.colorsampler.ColorSampler;
 import com.dfsek.terra.addons.image.converter.ColorConverter;

@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.structure.mutator;

+import java.util.random.RandomGenerator;
+
 import com.dfsek.terra.api.registry.key.Keyed;
 import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.structure.Structure;
@@ -9,8 +11,6 @@ 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.RandomGenerator;
-

 public class MutatedStructure implements Structure, Keyed<MutatedStructure> {
    private final RegistryKey key;
@@ -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")
@@ -7,6 +7,9 @@

 package com.dfsek.terra.addons.terrascript.script.builders;

+import java.util.List;
+import java.util.function.BiConsumer;
+
 import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments;
 import com.dfsek.terra.addons.terrascript.parser.lang.Returnable;
 import com.dfsek.terra.addons.terrascript.parser.lang.Scope;
@@ -15,9 +18,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments;
 import com.dfsek.terra.addons.terrascript.tokenizer.Position;

-import java.util.List;
-import java.util.function.BiConsumer;
-

 public class UnaryBooleanFunctionBuilder implements FunctionBuilder<Function<Void>> {