From 4d6d14a3d8b259c59af0a2b1847aee9014cf0b3d Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 13 Jun 2022 13:56:46 -0700 Subject: [PATCH] inject palette resolution options --- .../chunkgenerator/NoiseChunkGenerator3DAddon.java | 2 +- .../generation/NoiseChunkGenerator3D.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java index a36f9093b..fc44046c1 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java @@ -42,7 +42,7 @@ public class NoiseChunkGenerator3DAddon implements AddonInitializer { .getOrCreateRegistry(ChunkGeneratorProvider.class) .register(addon.key("NOISE_3D"), pack -> new NoiseChunkGenerator3D(platform, config.getElevationBlend(), config.getHorizontalRes(), - config.getVerticalRes())); + config.getVerticalRes(), config.getPaletteRes(), config.getPaletteBlendSampler(), config.getPaletteBlendAmplitude())); event.getPack() .applyLoader(SlantLayer.class, SlantLayer::new); }) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java index c06101979..bb26ecb44 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java @@ -15,6 +15,7 @@ import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.Column; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -37,12 +38,22 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { private final int carverHorizontalResolution; private final int carverVerticalResolution; + private final int paletteRes; + + private final NoiseSampler paletteBlendSampler; + + private final double paletteBlendAmplitude; + public NoiseChunkGenerator3D(Platform platform, int elevationBlend, int carverHorizontalResolution, - int carverVerticalResolution) { + int carverVerticalResolution, int paletteRes, NoiseSampler paletteBlendSampler, + double paletteBlendAmplitude) { this.platform = platform; this.air = platform.getWorldHandle().air(); this.carverHorizontalResolution = carverHorizontalResolution; this.carverVerticalResolution = carverVerticalResolution; + this.paletteRes = paletteRes; + this.paletteBlendSampler = paletteBlendSampler; + this.paletteBlendAmplitude = paletteBlendAmplitude; this.samplerCache = new SamplerProvider(platform, elevationBlend); }