begin work on terrain samplers

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

@@ -2,6 +2,9 @@ package com.dfsek.terra.api.world.biome;
 
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.world.palette.Palette;
+import com.dfsek.terra.world.generation.math.samplers.terrain.TerrainSampler;
+
+import java.util.List;
 
 public interface Generator {
     /**
@@ -41,4 +44,6 @@ public interface Generator {
     double getElevationWeight();
 
     int getBlendStep();
+
+    List<TerrainSampler> getTerrainSamplers();
 }

common/src/main/java/com/dfsek/terra/world/generation/WorldGenerator.java

@@ -4,6 +4,10 @@ import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.world.biome.Generator;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.holder.PaletteHolder;
+import com.dfsek.terra.world.generation.math.samplers.terrain.TerrainSampler;
+
+import java.util.Collections;
+import java.util.List;
 
 public class WorldGenerator implements Generator {
     @SuppressWarnings({"unchecked", "rawtypes", "RedundantSuppression"})
@@ -85,6 +89,11 @@ public class WorldGenerator implements Generator {
         return blendStep;
     }
 
+    @Override
+    public List<TerrainSampler> getTerrainSamplers() {
+        return Collections.emptyList();
+    }
+
     public Palette getSlantPalette(int y) {
         return slantPalettes.getPalette(y);
     }

common/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java

@@ -1,146 +0,0 @@
-package com.dfsek.terra.world.generation.generators;
-
-import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.BiomeGrid;
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkData;
-import com.dfsek.terra.api.util.world.PaletteUtil;
-import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.biome.UserDefinedBiome;
-import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
-import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
-import com.dfsek.terra.api.world.palette.Palette;
-import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFrame;
-import com.dfsek.terra.world.Carver;
-import com.dfsek.terra.world.TerraWorld;
-import com.dfsek.terra.world.carving.NoiseCarver;
-import com.dfsek.terra.world.generation.math.SamplerCache;
-import com.dfsek.terra.world.generation.math.samplers.Sampler;
-import com.dfsek.terra.world.generation.math.samplers.Sampler2D;
-import com.dfsek.terra.world.population.CavePopulator;
-import com.dfsek.terra.world.population.OrePopulator;
-import com.dfsek.terra.world.population.StructurePopulator;
-import com.dfsek.terra.world.population.TreePopulator;
-import net.jafama.FastMath;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class DefaultChunkGenerator2D implements TerraChunkGenerator {
-    private final ConfigPack configPack;
-    private final TerraPlugin main;
-
-    private final Carver carver;
-    private final List<TerraBlockPopulator> blockPopulators = new ArrayList<>();
-
-    private final SamplerCache cache;
-
-    public DefaultChunkGenerator2D(ConfigPack c, TerraPlugin main, SamplerCache cache) {
-        this.configPack = c;
-        this.main = main;
-        blockPopulators.add(new CavePopulator(main));
-        blockPopulators.add(new StructurePopulator(main));
-        blockPopulators.add(new OrePopulator(main));
-        blockPopulators.add(new TreePopulator(main));
-        blockPopulators.add(new TreePopulator(main));
-        carver = new NoiseCarver(new Range(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
-        this.cache = cache;
-    }
-
-    @Override
-    public boolean isParallelCapable() {
-        return true;
-    }
-
-    @Override
-    public boolean shouldGenerateCaves() {
-        return configPack.getTemplate().vanillaCaves();
-    }
-
-    @Override
-    public boolean shouldGenerateDecorations() {
-        return configPack.getTemplate().vanillaDecorations();
-    }
-
-    @Override
-    public boolean shouldGenerateMobs() {
-        return configPack.getTemplate().vanillaMobs();
-    }
-
-    @Override
-    public boolean shouldGenerateStructures() {
-        return configPack.getTemplate().vanillaStructures();
-    }
-
-    @Override
-    public ConfigPack getConfigPack() {
-        return configPack;
-    }
-
-    @Override
-    public TerraPlugin getMain() {
-        return main;
-    }
-
-    @Override
-    @SuppressWarnings({"try"})
-    public ChunkData generateChunkData(@NotNull World world, Random random, int chunkX, int chunkZ, ChunkData chunk) {
-        TerraWorld tw = main.getWorld(world);
-        BiomeProvider grid = tw.getBiomeProvider();
-        try(ProfileFrame ignore = main.getProfiler().profile("chunk_base_2d")) {
-            if(!tw.isSafe()) return chunk;
-            int xOrig = (chunkX << 4);
-            int zOrig = (chunkZ << 4);
-
-            Sampler sampler = cache.getChunk(chunkX, chunkZ);
-
-            for(int x = 0; x < 16; x++) {
-                for(int z = 0; z < 16; z++) {
-                    int paletteLevel = 0;
-                    int seaPaletteLevel = 0;
-
-                    int cx = xOrig + x;
-                    int cz = zOrig + z;
-
-                    TerraBiome b = grid.getBiome(xOrig + x, zOrig + z);
-                    BiomeTemplate c = ((UserDefinedBiome) b).getConfig();
-
-                    Palette seaPalette = c.getOceanPalette();
-
-                    int height = FastMath.min((int) sampler.sample(x, 0, z), world.getMaxHeight() - 1);
-
-                    for(int y = FastMath.max(height, c.getSeaLevel()); y >= 0; y--) {
-                        BlockData data = y > height ? seaPalette.get(seaPaletteLevel++, cx, y, cz) : PaletteUtil.getPalette(x, y, z, c, sampler).get(paletteLevel++, cx, y, cz);
-                        chunk.setBlock(x, y, z, data);
-                    }
-                }
-            }
-            if(configPack.getTemplate().doBetaCarvers()) {
-                carver.carve(world, chunkX, chunkZ, chunk);
-            }
-            return chunk;
-        }
-    }
-
-    @Override
-    public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) {
-        DefaultChunkGenerator3D.biomes(world, chunkX, chunkZ, biome, main);
-    }
-
-    @Override
-    public Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth) {
-        return new Sampler2D(chunkX, chunkZ, provider, world, elevationSmooth);
-    }
-
-    @Override
-    public List<TerraBlockPopulator> getPopulators() {
-        return blockPopulators;
-    }
-}

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/BilinearInterpolator.java

@@ -3,22 +3,26 @@ package com.dfsek.terra.world.generation.math.interpolation;
 /**
  * Class for bilinear interpolation of values arranged on a unit square.
  */
-public class Interpolator {
+public class BilinearInterpolator implements Interpolator2 {
     private final double v0, v1, v2, v3;
+    private final double width, height;
 
     /**
      * Constructs an interpolator with given values as vertices of a unit square.
-     *
-     * @param v0 - (0,0)
+     *  @param v0 - (0,0)
      * @param v1 - (1,0)
      * @param v2 - (0,1)
      * @param v3 - (1,1)
+     * @param width
+     * @param height
      */
-    public Interpolator(double v0, double v1, double v2, double v3) {
+    public BilinearInterpolator(double v0, double v1, double v2, double v3, double width, double height) {
         this.v0 = v0;
         this.v1 = v1;
         this.v2 = v2;
         this.v3 = v3;
+        this.width = width;
+        this.height = height;
     }
 
     /**
@@ -40,7 +44,10 @@ public class Interpolator {
      * @param t - Z value
      * @return double - The interpolated value.
      */
-    public double bilerp(double s, double t) {
+    @Override
+    public double interpolate(double s, double t) {
+        s/=width;
+        t/=height;
         double v01 = lerp(s, v0, v1);
         double v23 = lerp(s, v2, v3);
         return lerp(t, v01, v23);

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator2D.java

@@ -1,88 +0,0 @@
-package com.dfsek.terra.world.generation.math.interpolation;
-
-import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.util.mutable.MutableInteger;
-import com.dfsek.terra.api.world.biome.Generator;
-import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
-import net.jafama.FastMath;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-/**
- * Class to abstract away the Interpolators needed to generate a chunk.<br>
- * Contains method to get interpolated noise at a coordinate within the chunk.
- */
-public class ChunkInterpolator2D implements ChunkInterpolator {
-    private final Interpolator[][] interpGrid = new Interpolator[4][4];
-    private final BiFunction<Generator, Vector3, Double> noiseGetter;
-
-    /**
-     * Instantiates a 3D ChunkInterpolator3D at a pair of chunk coordinates.
-     *
-     * @param chunkX   X coordinate of the chunk.
-     * @param chunkZ   Z coordinate of the chunk.
-     * @param provider Biome Provider to use for biome fetching.
-     */
-    public ChunkInterpolator2D(World w, int chunkX, int chunkZ, BiomeProvider provider, BiFunction<Generator, Vector3, Double> noiseGetter) {
-        this.noiseGetter = noiseGetter;
-        int xOrigin = chunkX << 4;
-        int zOrigin = chunkZ << 4;
-
-        double[][] noiseStorage = new double[5][5];
-
-        for(int x = 0; x < 5; x++) {
-            for(int z = 0; z < 5; z++) {
-                Generator generator = provider.getBiome(xOrigin + (x << 2), zOrigin + (z << 2)).getGenerator(w);
-                Map<Generator, MutableInteger> genMap = new HashMap<>();
-
-                int step = generator.getBlendStep();
-                int blend = generator.getBlendDistance();
-
-                for(int xi = -blend; xi <= blend; xi++) {
-                    for(int zi = -blend; zi <= blend; zi++) {
-                        genMap.computeIfAbsent(provider.getBiome(xOrigin + (x << 2) + (xi * step), zOrigin + (z << 2) + (zi * step)).getGenerator(w), g -> new MutableInteger(0)).increment(); // Increment by 1
-                    }
-                }
-
-                noiseStorage[x][z] = computeNoise(genMap, (x << 2) + xOrigin, 0, (z << 2) + zOrigin);
-            }
-        }
-
-        for(int x = 0; x < 4; x++) {
-            for(int z = 0; z < 4; z++) {
-                interpGrid[x][z] = new Interpolator(
-                        noiseStorage[x][z],
-                        noiseStorage[x + 1][z],
-                        noiseStorage[x][z + 1],
-                        noiseStorage[x + 1][z + 1]);
-            }
-        }
-    }
-
-    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.
-     *
-     * @param x The internal X coordinate (0-15).
-     * @param z The internal Z coordinate (0-15).
-     * @return double - The interpolated noise at the coordinates.
-     */
-    @Override
-    public double getNoise(double x, double y, double z) {
-        return interpGrid[reRange(((int) x) / 4, 3)][reRange(((int) z) / 4, 3)].bilerp((x % 4) / 4, (z % 4) / 4);
-    }
-
-    public double getNoise(int x, int y, int z) {
-        return interpGrid[x / 4][z / 4].bilerp((double) (x % 4) / 4, (double) (z % 4) / 4);
-    }
-}

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator3D.java

@@ -67,7 +67,7 @@ public class ChunkInterpolator3D implements ChunkInterpolator {
         for(int x = 0; x < 4; x++) {
             for(int z = 0; z < 4; z++) {
                 for(int y = 0; y < size; y++) {
-                    interpGrid[x][y][z] = new Interpolator3(
+                    interpGrid[x][y][z] = new TrilinearInterpolator(
                             noiseStorage[x][z][y],
                             noiseStorage[x + 1][z][y],
                             noiseStorage[x][z][y + 1],
@@ -75,7 +75,7 @@ public class ChunkInterpolator3D implements ChunkInterpolator {
                             noiseStorage[x][z + 1][y],
                             noiseStorage[x + 1][z + 1][y],
                             noiseStorage[x][z + 1][y + 1],
-                            noiseStorage[x + 1][z + 1][y + 1]);
+                            noiseStorage[x + 1][z + 1][y + 1], 4, 4, 4);
                 }
             }
         }
@@ -98,10 +98,10 @@ public class ChunkInterpolator3D implements ChunkInterpolator {
      */
     @Override
     public double getNoise(double x, double y, double z) {
-        return interpGrid[reRange(((int) x) / 4, 3)][FastMath.max(FastMath.min(((int) y), max), min) / 4][reRange(((int) z) / 4, 3)].trilerp((x % 4) / 4, (y % 4) / 4, (z % 4) / 4);
+        return interpGrid[reRange(((int) x) / 4, 3)][FastMath.max(FastMath.min(((int) y), max), min) / 4][reRange(((int) z) / 4, 3)].interpolate((x % 4), (y % 4), (z % 4));
     }
 
     public double getNoise(int x, int y, int z) {
-        return interpGrid[x / 4][y / 4][z / 4].trilerp((double) (x % 4) / 4, (double) (y % 4) / 4, (double) (z % 4) / 4);
+        return interpGrid[x / 4][y / 4][z / 4].interpolate(x % 4, y % 4, z % 4);
     }
 }

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/Interpolator2.java

@@ -0,0 +1,12 @@
+package com.dfsek.terra.world.generation.math.interpolation;
+
+public interface Interpolator2 {
+    /**
+     * 2D Bilinear interpolation between 4 points on a unit square.
+     *
+     * @param s - X value
+     * @param t - Z value
+     * @return double - The interpolated value.
+     */
+    double interpolate(double s, double t);
+}

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/Interpolator3.java

@@ -1,32 +1,5 @@
 package com.dfsek.terra.world.generation.math.interpolation;
 
-/**
- * Class for bilinear interpolation of values arranged on a unit square.
- */
-public class Interpolator3 {
-    private final Interpolator bottom;
-    private final Interpolator top;
-
-    /**
-     * Constructs an interpolator with given values as vertices of a unit cube.
-     * * @param _000 The value at <code>(t, u, v) = (0, 0, 0)</code>.
-     * * @param _100 The value at <code>(t, u, v) = (1, 0, 0)</code>.
-     * * @param _010 The value at <code>(t, u, v) = (0, 1, 0)</code>.
-     * * @param _110 The value at <code>(t, u, v) = (1, 1, 0)</code>.
-     * * @param _001 The value at <code>(t, u, v) = (0, 0, 1)</code>.
-     * * @param _101 The value at <code>(t, u, v) = (1, 0, 1)</code>.
-     * * @param _011 The value at <code>(t, u, v) = (0, 1, 1)</code>.
-     * * @param _111 The value at <code>(t, u, v) = (1, 1, 1)</code>.
-     */
-    public Interpolator3(double _000, double _100,
-                         double _010, double _110,
-                         double _001, double _101,
-                         double _011, double _111) {
-        this.top = new Interpolator(_000, _010, _001, _011);
-        this.bottom = new Interpolator(_100, _110, _101, _111);
-    }
-
-    public double trilerp(double x, double y, double z) {
-        return Interpolator.lerp(x, top.bilerp(y, z), bottom.bilerp(y, z));
-    }
-}
+public interface Interpolator3 {
+    double interpolate(double x, double y, double z);
+}

common/src/main/java/com/dfsek/terra/world/generation/math/interpolation/TrilinearInterpolator.java

@@ -0,0 +1,40 @@
+package com.dfsek.terra.world.generation.math.interpolation;
+
+/**
+ * Class for bilinear interpolation of values arranged on a unit square.
+ */
+public class TrilinearInterpolator implements Interpolator3 {
+    private final BilinearInterpolator bottom;
+    private final BilinearInterpolator top;
+    private final double length, width, height;
+
+    /**
+     * Constructs an interpolator with given values as vertices of a unit cube.
+     * * @param _000 The value at <code>(t, u, v) = (0, 0, 0)</code>.
+     * * @param _100 The value at <code>(t, u, v) = (1, 0, 0)</code>.
+     * * @param _010 The value at <code>(t, u, v) = (0, 1, 0)</code>.
+     * * @param _110 The value at <code>(t, u, v) = (1, 1, 0)</code>.
+     * * @param _001 The value at <code>(t, u, v) = (0, 0, 1)</code>.
+     * * @param _101 The value at <code>(t, u, v) = (1, 0, 1)</code>.
+     * * @param _011 The value at <code>(t, u, v) = (0, 1, 1)</code>.
+     * * @param _111 The value at <code>(t, u, v) = (1, 1, 1)</code>.
+     */
+    public TrilinearInterpolator(double _000, double _100,
+                                 double _010, double _110,
+                                 double _001, double _101,
+                                 double _011, double _111, double length, double width, double height) {
+        this.length = length;
+        this.width = width;
+        this.height = height;
+        this.top = new BilinearInterpolator(_000, _010, _001, _011, 1, 1);
+        this.bottom = new BilinearInterpolator(_100, _110, _101, _111, 1, 1);
+    }
+
+    @Override
+    public double interpolate(double x, double y, double z) {
+        x/=length;
+        z/=width;
+        y/=height;
+        return BilinearInterpolator.lerp(x, top.interpolate(y, z), bottom.interpolate(y, z));
+    }
+}

common/src/main/java/com/dfsek/terra/world/generation/math/samplers/Sampler2D.java

@@ -1,27 +0,0 @@
-package com.dfsek.terra.world.generation.math.samplers;
-
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
-import com.dfsek.terra.world.generation.math.interpolation.ChunkInterpolator2D;
-import com.dfsek.terra.world.generation.math.interpolation.ElevationInterpolator;
-import net.jafama.FastMath;
-
-public class Sampler2D implements Sampler {
-    private final ChunkInterpolator2D interpolator;
-    private final ElevationInterpolator elevationInterpolator;
-
-    public Sampler2D(int x, int z, BiomeProvider provider, World world, int elevationSmooth) {
-        this.interpolator = new ChunkInterpolator2D(world, x, z, provider, (generator, coord) -> generator.getBaseSampler().getNoise(coord));
-        this.elevationInterpolator = new ElevationInterpolator(world, x, z, provider, elevationSmooth);
-    }
-
-    @Override
-    public double sample(double x, double y, double z) {
-        return interpolator.getNoise(x, 0, z) + elevationInterpolator.getElevation(FastMath.roundToInt(x), FastMath.roundToInt(z));
-    }
-
-    @Override
-    public double sample(int x, int y, int z) {
-        return interpolator.getNoise(x, 0, z) + elevationInterpolator.getElevation(FastMath.roundToInt(x), FastMath.roundToInt(z));
-    }
-}

common/src/main/java/com/dfsek/terra/world/generation/math/samplers/terrain/ExpressionSampler.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.world.generation.math.samplers.terrain;
+
+import com.dfsek.paralithic.Expression;
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator3;
+
+public class ExpressionSampler implements TerrainSampler {
+    private final Expression expression;
+
+    public ExpressionSampler(Expression expression) {
+        this.expression = expression;
+    }
+
+    @Override
+    public Interpolator3 sample(double x, double y, double z) {
+        return (i, i1, i2) -> expression.evaluate(x, y, z);
+    }
+
+    @Override
+    public int getXResolution() {
+        return 1;
+    }
+}

common/src/main/java/com/dfsek/terra/world/generation/math/samplers/terrain/InterpolatedSampler.java

@@ -0,0 +1,31 @@
+package com.dfsek.terra.world.generation.math.samplers.terrain;
+
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator3;
+
+public class InterpolatedSampler implements TerrainSampler {
+    private final InterpolatorSupplier supplier;
+
+    public InterpolatedSampler(InterpolatorSupplier supplier) {
+        this.supplier = supplier;
+    }
+
+    @Override
+    public Interpolator3 sample(double x, double y, double z) {
+        return null;
+    }
+
+    @Override
+    public int getXResolution() {
+        return supplier.getXResolution();
+    }
+
+    @Override
+    public int getYResolution() {
+        return supplier.getYResolution();
+    }
+
+    @Override
+    public int getZResolution() {
+        return supplier.getZResolution();
+    }
+}

common/src/main/java/com/dfsek/terra/world/generation/math/samplers/terrain/InterpolatorSupplier.java

@@ -0,0 +1,19 @@
+package com.dfsek.terra.world.generation.math.samplers.terrain;
+
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator2;
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator3;
+
+import java.util.function.Supplier;
+
+public interface InterpolatorSupplier {
+    int getXResolution();
+    int getYResolution();
+    int getZResolution();
+
+    Interpolator2 get(double t, double v0, double v1);
+
+    Interpolator3 get(double _000, double _100,
+                      double _010, double _110,
+                      double _001, double _101,
+                      double _011, double _111);
+}

common/src/main/java/com/dfsek/terra/world/generation/math/samplers/terrain/TerrainSampler.java

@@ -0,0 +1,22 @@
+package com.dfsek.terra.world.generation.math.samplers.terrain;
+
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator2;
+import com.dfsek.terra.world.generation.math.interpolation.Interpolator3;
+
+public interface TerrainSampler {
+    Interpolator3 sample(double x, double y, double z);
+
+    default Interpolator2 sample(double x, double z) {
+        return (s, t) -> sample(x, 0, z).interpolate(s, 0, t);
+    }
+
+    int getXResolution();
+
+    default int getYResolution() {
+        return getXResolution();
+    }
+
+    default int getZResolution() {
+        return getXResolution();
+    }
+}

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java

@@ -30,7 +30,7 @@ public class PopulationManager extends BlockPopulator {
         this.main = main;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "ResultOfMethodCallIgnored"})
     public synchronized void saveBlocks(World w) throws IOException {
         File f = new File(Gaea.getGaeaFolder(w), "chunks.bin");
         f.createNewFile();

platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java

@@ -23,6 +23,7 @@ public class FabricTree implements Tree {
     }
 
     @Override
+    @SuppressWarnings("try")
     public boolean plant(Location l, Random r) {
         try(ProfileFrame ignore = TerraFabricPlugin.getInstance().getProfiler().profile("fabric_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) {
             FabricWorldAccess fabricWorldAccess = ((FabricWorldAccess) l.getWorld());

platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java

@@ -8,6 +8,7 @@ import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.world.TerraBiomeSource;
 import com.dfsek.terra.fabric.world.handles.world.FabricSeededWorldAccess;
 import com.dfsek.terra.world.generation.generators.DefaultChunkGenerator3D;
+import com.dfsek.terra.world.generation.math.samplers.Sampler;
 import com.dfsek.terra.world.population.CavePopulator;
 import com.dfsek.terra.world.population.FloraPopulator;
 import com.dfsek.terra.world.population.OrePopulator;
@@ -15,6 +16,7 @@ import com.dfsek.terra.world.population.StructurePopulator;
 import com.dfsek.terra.world.population.TreePopulator;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.jafama.FastMath;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.structure.StructureManager;
@@ -45,6 +47,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
             PACK_CODEC.fieldOf("pack").stable().forGetter(generator -> generator.pack))
             .apply(instance, instance.stable(FabricChunkGeneratorWrapper::new)));
     private final ConfigPack pack;
+    private FabricSeededWorldAccess worldAccess;
 
     public ConfigPack getPack() {
         return pack;
@@ -84,7 +87,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     @Override
     public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk chunk) {
-        FabricSeededWorldAccess worldAccess = new FabricSeededWorldAccess(world, seed, this);
+        this.worldAccess = new FabricSeededWorldAccess(world, seed, this);
         delegate.generateChunkData(worldAccess, new FastRandom(), chunk.getPos().x, chunk.getPos().z, new FabricChunkData(chunk));
     }
 
@@ -107,7 +110,15 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     @Override
     public int getHeight(int x, int z, Heightmap.Type heightmapType) {
-        return 0;
+        Sampler sampler = TerraFabricPlugin.getInstance().getWorld(worldAccess).getConfig().getSamplerCache().getChunk(FastMath.floorDiv(x, 16), FastMath.floorDiv(z, 16));
+        int cx = FastMath.floorMod(x, 16);
+        int cz = FastMath.floorMod(z, 16);
+
+        int height = worldAccess.getMaxHeight();
+
+        while(height >= 0 && sampler.sample(cx, height, cz) < 0) height--;
+
+        return height;
     }
 
     @Override