From 1c7c7af1055dc38e8f5b592e1605d034f1b40a80 Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 2 Dec 2021 18:05:52 -0700 Subject: [PATCH] implement PropertyHolder in ChunkGenerator --- .../generation/generators/NoiseChunkGenerator3D.java | 7 +++++++ .../terra/api/world/chunk/generation/ChunkGenerator.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index d37fb8959..e9fec4dcc 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.generators; +import com.dfsek.terra.api.properties.Context; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.WritableWorld; @@ -37,6 +38,7 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette; public class NoiseChunkGenerator3D implements ChunkGenerator { + private final Context context = new Context(); private final ConfigPack configPack; private final Platform platform; private final List generationStages = new ArrayList<>(); @@ -138,4 +140,9 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { return paletteInfo.getOcean().get(paletteInfo.getSeaLevel() - y, x, y, z, world.getSeed()); } else return air; } + + @Override + public Context getContext() { + return context; + } } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index eb2ea3807..0e7e14d8e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -7,6 +7,7 @@ package com.dfsek.terra.api.world.chunk.generation; +import com.dfsek.terra.api.properties.PropertyHolder; import com.dfsek.terra.api.world.World; import org.jetbrains.annotations.NotNull; @@ -23,7 +24,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; -public interface ChunkGenerator { +public interface ChunkGenerator extends PropertyHolder { void generateChunkData(@NotNull ProtoChunk chunk, @NotNull WritableWorld world, int chunkZ, int chunkX); Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);