From 522d4e4d3ac0ef90d9534551edbbe371c5221c4d Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 17 Jun 2022 17:51:30 -0700 Subject: [PATCH] use vanilla getBaseColumn --- .../bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java | 7 +++++-- .../bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java index 0f8504c44..b4ee58521 100644 --- a/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java @@ -81,7 +81,7 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator { return vanilla.getSeaLevel(); } - @Override //fillFromNoise + @Override public @NotNull CompletableFuture fillFromNoise(@NotNull Executor executor, @NotNull Blender blender, @NotNull StructureFeatureManager structureAccessor, @NotNull ChunkAccess chunk) { return vanilla.fillFromNoise(executor, blender, structureAccessor, chunk); @@ -97,8 +97,9 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator { return ChunkGenerator.CODEC; } - @Override // getColumn + @Override public @NotNull NoiseColumn getBaseColumn(int x, int z, LevelHeightAccessor height) { + /* BlockState[] array = new BlockState[height.getHeight()]; WorldProperties properties = new NMSWorldProperties(seed, height); BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties); @@ -107,6 +108,8 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator { .getHandle()).getState(); } return new NoiseColumn(getMinY(), array); + */ + return vanilla.getBaseColumn(x, z, height); } @Override // withSeed diff --git a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java index b95a7f53c..f99530f5a 100644 --- a/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.StructureManager; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeManager; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkGenerator; @@ -33,6 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Objects; @@ -129,6 +131,7 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator { @Override public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) { + /* BlockState[] array = new BlockState[world.getHeight()]; WorldProperties properties = new NMSWorldProperties(seed, world); BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties); @@ -137,6 +140,9 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator { .getHandle()).getState(); } return new NoiseColumn(getMinY(), array); + + */ + return vanilla.getBaseColumn(x, z, world, noiseConfig); } @Override