abelhooge/TerraForged
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

further tweaks to village placement

Browse Source
This commit is contained in:
dags- 2020-03-21 14:38:07 +00:00
parent bc4a6db5fc
commit 0c8a7473d5
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TerraForgedMod/src/main/java/com/terraforged/mod/chunk/TerraChunkGenerator.java
View File

@ -160,7 +160,7 @@ public class TerraChunkGenerator extends ObfHelperChunkGenerator<GenerationSetti
ctx.biome = container.getBiome(dx, dz); ctx.biome = container.getBiome(dx, dz);
ChunkPopulator.INSTANCE.decorate(ctx.chunk, ctx, px, py, pz); ChunkPopulator.INSTANCE.decorate(ctx.chunk, ctx, px, py, pz);
}); });
terrainHelper.flatten(world, chunk, context.blockX, context.blockZ); terrainHelper.flatten(world, chunk, container.getChunkReader(), context.blockX, context.blockZ);
} }
@Override @Override

2
TerraForgedMod/src/main/java/com/terraforged/mod/decorator/base/ErosionDecorator.java
View File

@ -84,7 +84,7 @@ public class ErosionDecorator implements ColumnDecorator {
} }
int topY = chunk.getTopBlockY(Heightmap.Type.WORLD_SURFACE_WG, x, z); int topY = chunk.getTopBlockY(Heightmap.Type.WORLD_SURFACE_WG, x, z);
if (topY - 1 > y) { if (topY < y) {
y = topY; y = topY;
} }

19
TerraForgedMod/src/main/java/com/terraforged/mod/feature/TerrainHelper.java
View File

@ -26,6 +26,8 @@
package com.terraforged.mod.feature; package com.terraforged.mod.feature;
import com.terraforged.api.material.state.States; import com.terraforged.api.material.state.States;
import com.terraforged.core.cell.Cell;
import com.terraforged.core.region.chunk.ChunkReader;
import it.unimi.dsi.fastutil.longs.LongIterator; import it.unimi.dsi.fastutil.longs.LongIterator;
import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectList; import it.unimi.dsi.fastutil.objects.ObjectList;
@ -57,10 +59,10 @@ public class TerrainHelper {
this.radius = radius; this.radius = radius;
} }
public void flatten(IWorld world, IChunk chunk, int chunkStartX, int chunkStartZ) { public void flatten(IWorld world, IChunk chunk, ChunkReader reader, int chunkStartX, int chunkStartZ) {
ObjectList<AbstractVillagePiece> pieces = new ObjectArrayList<>(10); ObjectList<AbstractVillagePiece> pieces = new ObjectArrayList<>(10);
collectPieces(world, chunk, pieces); collectPieces(world, chunk, pieces);
buildBases(chunk, pieces, chunkStartX, chunkStartZ); buildBases(chunk, reader, pieces, chunkStartX, chunkStartZ);
} }
// see NoiseChunkGenerator // see NoiseChunkGenerator
@ -91,12 +93,11 @@ public class TerrainHelper {
} }
// lowers or raises the terrain matcher the base height of each structure piece // lowers or raises the terrain matcher the base height of each structure piece
private void buildBases(IChunk chunk, ObjectList<AbstractVillagePiece> pieces, int chunkStartX, int chunkStartZ) { private void buildBases(IChunk chunk, ChunkReader reader,ObjectList<AbstractVillagePiece> pieces, int chunkStartX, int chunkStartZ) {
BlockPos.Mutable pos = new BlockPos.Mutable(); BlockPos.Mutable pos = new BlockPos.Mutable();
MutableBoundingBox chunkBounds = new MutableBoundingBox(chunkStartX, chunkStartZ, chunkStartX + 15, chunkStartZ + 15); MutableBoundingBox chunkBounds = new MutableBoundingBox(chunkStartX, chunkStartZ, chunkStartX + 15, chunkStartZ + 15);
for (AbstractVillagePiece piece : pieces) { for (AbstractVillagePiece piece : pieces) {
MutableBoundingBox pieceBounds = piece.getBoundingBox(); MutableBoundingBox pieceBounds = piece.getBoundingBox();
int length = Math.min(pieceBounds.maxX - pieceBounds.minX, pieceBounds.maxZ - pieceBounds.minZ); int length = Math.min(pieceBounds.maxX - pieceBounds.minX, pieceBounds.maxZ - pieceBounds.minZ);
int borderRadius = Math.max(5, NoiseUtil.round(length * radius)); int borderRadius = Math.max(5, NoiseUtil.round(length * radius));
MutableBoundingBox expanded = expand(pieceBounds, borderRadius); MutableBoundingBox expanded = expand(pieceBounds, borderRadius);
@ -127,8 +128,7 @@ public class TerrainHelper {
} }
if (surface > level) { if (surface > level) {
// world-surface is higher than the piece's base .: flatten terrain flatten(chunk, reader, pieceBounds, pos.setPos(x, surface, z), dx, dz, level, surface, borderRadius);
flatten(chunk, pieceBounds, pos.setPos(x, surface, z), dx, dz, level, surface, borderRadius);
} else { } else {
// piece is higher than world-surface .: raise ground to form a base // piece is higher than world-surface .: raise ground to form a base
raise(chunk, pieceBounds, pos.setPos(x, surface, z), dx, dz, level, surface, borderRadius); raise(chunk, pieceBounds, pos.setPos(x, surface, z), dx, dz, level, surface, borderRadius);
@ -138,9 +138,12 @@ public class TerrainHelper {
} }
} }
private void flatten(IChunk chunk, MutableBoundingBox bounds, BlockPos.Mutable pos, int dx, int dz, int level, int surface, int borderRadius) { private void flatten(IChunk chunk, ChunkReader reader, MutableBoundingBox bounds, BlockPos.Mutable pos, int dx, int dz, int level, int surface, int borderRadius) {
// only flatten terrain within the footprint of the structure piece
if (pos.getX() >= bounds.minX && pos.getX() <= bounds.maxX && pos.getZ() >= bounds.minZ && pos.getZ() <= bounds.maxZ) { if (pos.getX() >= bounds.minX && pos.getX() <= bounds.maxX && pos.getZ() >= bounds.minZ && pos.getZ() <= bounds.maxZ) {
Cell<?> cell = reader.getCell(dx, dz);
cell.steepness = 0F;
cell.sediment = 0F;
cell.erosion = 0F;
for (int dy = level + 1; dy <= surface; dy++) { for (int dy = level + 1; dy <= surface; dy++) {
chunk.setBlockState(pos.setPos(dx, dy, dz), Blocks.AIR.getDefaultState(), false); chunk.setBlockState(pos.setPos(dx, dy, dz), Blocks.AIR.getDefaultState(), false);
} }