From b7c381b0f9c7ddf8d27b2c606ff51205f19592a5 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 15 Jun 2022 21:46:20 -0700 Subject: [PATCH] dont use column in ChunkInterpolator --- .../math/interpolation/ChunkInterpolator.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java index cf3ea06b7..1b4e10879 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java @@ -8,16 +8,10 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation; import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties; -import com.dfsek.terra.api.util.Column; -import com.dfsek.terra.api.util.mutable.MutableInteger; -import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import net.jafama.FastMath; -import java.util.HashMap; -import java.util.Map; - /** * Class to abstract away the Interpolators needed to generate a chunk.
@@ -41,7 +35,7 @@ public class ChunkInterpolator { public ChunkInterpolator(long seed, int chunkX, int chunkZ, BiomeProvider provider, int min, int max) { this.min = min; this.max = max; - + int xOrigin = chunkX << 4; int zOrigin = chunkZ << 4; @@ -59,12 +53,11 @@ public class ChunkInterpolator { for(int z = 0; z < 5; z++) { int scaledZ = z << 2; int absoluteZ = zOrigin + scaledZ; - Column column = provider.getColumn(absoluteX, absoluteZ, seed, min, max); for(int y = 0; y < size; y++) { int scaledY = (y << 2) + min; - BiomeNoiseProperties generationSettings = column.get(scaledY) - .getContext() - .get(BiomeNoiseProperties.class); + BiomeNoiseProperties generationSettings = provider.getBiome(absoluteX, scaledY, absoluteZ, seed) + .getContext() + .get(BiomeNoiseProperties.class); int step = generationSettings.blendStep(); int blend = generationSettings.blendDistance();