mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 06:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

use vanilla getBaseColumn

Browse Source
This commit is contained in:
dfsek
2022-06-17 17:51:30 -07:00
parent 915dcf9b9b
commit 522d4e4d3a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/bukkit/nms/v1_18_R2/src/main/java/com/dfsek/terra/bukkit/nms/v1_18_R2/NMSChunkGeneratorDelegate.java
+5 -2
View File
@@ -81,7 +81,7 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
return vanilla.getSeaLevel(); return vanilla.getSeaLevel();
} }
@Override //fillFromNoise @Override
public @NotNull CompletableFuture<ChunkAccess> fillFromNoise(@NotNull Executor executor, @NotNull Blender blender, @NotNull StructureFeatureManager structureAccessor, public @NotNull CompletableFuture<ChunkAccess> fillFromNoise(@NotNull Executor executor, @NotNull Blender blender, @NotNull StructureFeatureManager structureAccessor,
@NotNull ChunkAccess chunk) { @NotNull ChunkAccess chunk) {
return vanilla.fillFromNoise(executor, blender, structureAccessor, chunk); return vanilla.fillFromNoise(executor, blender, structureAccessor, chunk);
@@ -97,8 +97,9 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
return ChunkGenerator.CODEC; return ChunkGenerator.CODEC;
} }
@Override // getColumn @Override
public @NotNull NoiseColumn getBaseColumn(int x, int z, LevelHeightAccessor height) { public @NotNull NoiseColumn getBaseColumn(int x, int z, LevelHeightAccessor height) {
/*
BlockState[] array = new BlockState[height.getHeight()]; BlockState[] array = new BlockState[height.getHeight()];
WorldProperties properties = new NMSWorldProperties(seed, height); WorldProperties properties = new NMSWorldProperties(seed, height);
BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties); BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties);
@@ -107,6 +108,8 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
.getHandle()).getState(); .getHandle()).getState();
} }
return new NoiseColumn(getMinY(), array); return new NoiseColumn(getMinY(), array);
*/
return vanilla.getBaseColumn(x, z, height);
} }
@Override // withSeed @Override // withSeed
platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/NMSChunkGeneratorDelegate.java
+6
View File
@@ -16,6 +16,7 @@ import net.minecraft.world.level.StructureManager;
import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.BiomeManager; 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.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -33,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@@ -129,6 +131,7 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
@Override @Override
public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) { public @NotNull NoiseColumn getBaseColumn(int x, int z, @NotNull LevelHeightAccessor world, @NotNull RandomState noiseConfig) {
/*
BlockState[] array = new BlockState[world.getHeight()]; BlockState[] array = new BlockState[world.getHeight()];
WorldProperties properties = new NMSWorldProperties(seed, world); WorldProperties properties = new NMSWorldProperties(seed, world);
BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties); BiomeProvider biomeProvider = pack.getBiomeProvider().caching(properties);
@@ -137,6 +140,9 @@ public class NMSChunkGeneratorDelegate extends ChunkGenerator {
.getHandle()).getState(); .getHandle()).getState();
} }
return new NoiseColumn(getMinY(), array); return new NoiseColumn(getMinY(), array);
*/
return vanilla.getBaseColumn(x, z, world, noiseConfig);
} }
@Override @Override