refactor

2026-06-14 04:41:13 +00:00 · 2021-01-25 19:34:29 -07:00
parent 89f52a22c8
commit 1d6cdf9eaa
181 changed files with 466 additions and 662 deletions
@@ -3,7 +3,6 @@ package com.dfsek.terra.biome;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.world.biome.TerraBiome;

 public interface BiomeProvider {
    TerraBiome getBiome(int x, int z);
@@ -1,6 +1,5 @@
 package com.dfsek.terra.biome;

-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.registry.TerraRegistry;
 import net.jafama.FastMath;

@@ -1,13 +1,12 @@
 package com.dfsek.terra.biome;

 import com.dfsek.tectonic.exception.ConfigException;
+import com.dfsek.terra.api.core.TerraPlugin;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
 import com.dfsek.terra.api.math.vector.Vector2;
-import com.dfsek.terra.api.platform.TerraPlugin;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.biome.pipeline.BiomeHolder;
 import com.dfsek.terra.biome.pipeline.BiomePipeline;
-import com.dfsek.terra.generation.config.NoiseBuilder;
+import com.dfsek.terra.world.generation.config.NoiseBuilder;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -0,0 +1,36 @@
+package com.dfsek.terra.biome;
+
+
+import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.platform.world.Biome;
+import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.world.biome.Generator;
+
+import java.util.Set;
+
+/**
+ * Interface to be implemented by a custom generator's TerraBiome enum.<br>
+ * Represents a custom biome, and contains methods to retrieve information about each type.
+ */
+public interface TerraBiome {
+
+    /**
+     * Gets the Vanilla biome to represent the custom biome.
+     *
+     * @return TerraBiome - The Vanilla biome.
+     */
+    ProbabilityCollection<Biome> getVanillaBiomes();
+
+    /**
+     * Gets the BiomeTerrain instance used to generate the biome.
+     *
+     * @return BiomeTerrain - The terrain generation instance.
+     */
+    Generator getGenerator(World w);
+
+    int getColor();
+
+    Set<String> getTags();
+
+    String getID();
+}
@@ -4,7 +4,6 @@ import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.world.biome.Generator;
-import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.config.builder.GeneratorBuilder;
 import com.dfsek.terra.config.templates.BiomeTemplate;

@@ -1,16 +0,0 @@
-package com.dfsek.terra.biome.palette;
-
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.world.palette.Palette;
-
-public class PaletteHolder {
-    private final Palette<BlockData>[] palettes;
-
-    protected PaletteHolder(Palette<BlockData>[] palettes) {
-        this.palettes = palettes;
-    }
-
-    public Palette<BlockData> getPalette(int y) {
-        return palettes[y];
-    }
-}
@@ -1,34 +0,0 @@
-package com.dfsek.terra.biome.palette;
-
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.world.palette.Palette;
-import net.jafama.FastMath;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-public class PaletteHolderBuilder {
-    private final TreeMap<Integer, Palette<BlockData>> paletteMap = new TreeMap<>();
-
-    public PaletteHolderBuilder add(int y, Palette<BlockData> palette) {
-        paletteMap.put(y, palette);
-        return this;
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes", "RedundantSuppression"})
-    public PaletteHolder build() {
-        Palette<BlockData>[] palettes = new Palette[paletteMap.lastKey() + 1];
-        for(int y = 0; y <= FastMath.max(paletteMap.lastKey(), 255); y++) {
-            Palette<BlockData> d = null;
-            for(Map.Entry<Integer, Palette<BlockData>> e : paletteMap.entrySet()) {
-                if(e.getKey() >= y) {
-                    d = e.getValue();
-                    break;
-                }
-            }
-            if(d == null) throw new IllegalArgumentException("No palette for Y=" + y);
-            palettes[y] = d;
-        }
-        return new PaletteHolder(palettes);
-    }
-}
@@ -1,31 +0,0 @@
-package com.dfsek.terra.biome.palette;
-
-import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.platform.block.BlockData;
-import org.jetbrains.annotations.NotNull;
-
-public class PaletteLayer {
-    private final ProbabilityCollection<BlockData> layer;
-    private final NoiseSampler sampler;
-    private final int size;
-
-    public PaletteLayer(@NotNull ProbabilityCollection<BlockData> layer, NoiseSampler sampler, int size) {
-        this.layer = layer;
-        this.sampler = sampler;
-        this.size = size;
-    }
-
-    @NotNull
-    public ProbabilityCollection<BlockData> getLayer() {
-        return layer;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public NoiseSampler getSampler() {
-        return sampler;
-    }
-}
@@ -1,16 +0,0 @@
-package com.dfsek.terra.biome.palette;
-
-import com.dfsek.terra.api.world.palette.Palette;
-
-public class SinglePalette<E> extends Palette<E> {
-    private final E item;
-
-    public SinglePalette(E item) {
-        this.item = item;
-    }
-
-    @Override
-    public E get(int layer, double x, double y, double z) {
-        return item;
-    }
-}
@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.pipeline;

-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;
 import com.dfsek.terra.biome.pipeline.expand.BiomeExpander;
 import com.dfsek.terra.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.biome.pipeline.source.BiomeSource;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.biome.pipeline;

 import com.dfsek.terra.api.math.vector.Vector2;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;
 import com.dfsek.terra.biome.pipeline.expand.BiomeExpander;
 import com.dfsek.terra.biome.pipeline.mutator.BiomeMutator;
 import com.dfsek.terra.biome.pipeline.source.BiomeSource;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.pipeline.expand;

-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public interface BiomeExpander {
    TerraBiome getBetween(double x, double z, TerraBiome... others);
@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.expand;

 import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public class FractalExpander implements BiomeExpander {
    private final NoiseSampler sampler;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.pipeline.mutator;

-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;
 import com.dfsek.terra.biome.pipeline.BiomeHolder;

 public interface BiomeMutator {
@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.mutator;

 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 import java.util.Map;

@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.mutator;

 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public class BorderMutator implements BiomeMutator {
    private final String border;
@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.mutator;

 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 import java.util.Map;

@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.mutator;

 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public class ReplaceMutator implements BiomeMutator {
    private final String replaceableTag;
@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.mutator;

 import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 import java.util.Objects;

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.pipeline.source;

-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public interface BiomeSource {
    TerraBiome getBiome(double x, double z);
@@ -2,7 +2,7 @@ package com.dfsek.terra.biome.pipeline.source;

 import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import com.dfsek.terra.api.world.biome.TerraBiome;
+import com.dfsek.terra.biome.TerraBiome;

 public class RandomSource implements BiomeSource {
    private final ProbabilityCollection<TerraBiome> biomes;
@@ -1,41 +0,0 @@
-package com.dfsek.terra.biome.postprocessing;
-
-import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
-import com.dfsek.terra.api.math.vector.Vector2;
-
-/**
- * Offset a coordinate pair by an amount.
- */
-public class CoordinatePerturb {
-    private final FastNoiseLite perturbX;
-    private final FastNoiseLite perturbZ;
-    private final double amplitude;
-
-    /**
-     * Create a CoordinatePerturb object with a given frequency, amplitude, and seed.
-     *
-     * @param frequency Noise frequency
-     * @param amplitude Offset amplitude
-     * @param seed      Noise seed
-     */
-    public CoordinatePerturb(double frequency, double amplitude, long seed) {
-        perturbX = new FastNoiseLite((int) seed);
-        perturbX.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
-        perturbX.setFrequency(frequency);
-        perturbZ = new FastNoiseLite((int) seed + 1);
-        perturbZ.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
-        perturbZ.setFrequency(frequency);
-        this.amplitude = amplitude;
-    }
-
-    /**
-     * Offset a coordinate pair
-     *
-     * @param x X coordinate
-     * @param z Z coordinate
-     * @return Vector2 containing offset coordinates
-     */
-    public Vector2 getShiftedCoords(int x, int z) {
-        return new Vector2(perturbX.getNoise(x, z) * amplitude + x, perturbZ.getNoise(x, z) * amplitude + z);
-    }
-}
@@ -1,35 +0,0 @@
-package com.dfsek.terra.biome.postprocessing;
-
-import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite;
-import com.dfsek.terra.api.math.noise.samplers.NoiseSampler;
-import net.jafama.FastMath;
-
-/**
- * Class to hold noise function to determine erosion.
- */
-public class ErosionNoise {
-    private final double thresh;
-    private final NoiseSampler noise;
-
-    public ErosionNoise(double freq1, double thresh, int octaves, long seed) {
-        FastNoiseLite main = new FastNoiseLite((int) (seed + 1));
-        main.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2);
-        main.setFractalType(FastNoiseLite.FractalType.FBm);
-        main.setFractalOctaves(octaves);
-        main.setFrequency(freq1);
-        this.thresh = thresh;
-        this.noise = main;
-    }
-
-    /**
-     * Get whether a location is eroded
-     *
-     * @param x X coordinate
-     * @param z Z coordinate
-     * @return Whether location is eroded
-     */
-    public boolean isEroded(int x, int z) {
-        double abs = FastMath.pow(noise.getNoise(x, z), 2);
-        return abs < thresh;
-    }
-}