mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decorate

Browse Source
This commit is contained in:
Daniel Mills 2020-08-03 23:24:09 -04:00
parent 086bb764a5
commit aca279c951
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java
View File

@ -212,7 +212,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
decorateUnderwater(biome, sliver, wx, k, wz, rx, rz, block); decorateUnderwater(biome, sliver, wx, k, wz, rx, rz, block);
} }
if((carvable && cavernSurface) || (k == Math.max(height, fluidHeight) && block.getMaterial().isSolid() && k < 255 && k > fluidHeight)) if((carvable && cavernSurface) || (k == Math.max(height, fluidHeight) && block.getMaterial().isSolid() && k < 255 && k >= fluidHeight))
{ {
decorateLand(biome, sliver, wx, k, wz, rx, rz, block); decorateLand(biome, sliver, wx, k, wz, rx, rz, block);
} }
@ -309,7 +309,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
for(IrisBiomeDecorator i : biome.getDecorators()) for(IrisBiomeDecorator i : biome.getDecorators())
{ {
if(i.getPartOf().equals(DecorationPart.SHORE_LINE) && !touchesSea(rx, rz)) if(i.getPartOf().equals(DecorationPart.SHORE_LINE) && (!touchesSea(rx, rz) || k != getFluidHeight()))
{ {
continue; continue;
} }
@ -635,6 +635,11 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator
return getNoiseHeight(x, z) + getFluidHeight(); return getNoiseHeight(x, z) + getFluidHeight();
} }
public double getTerrainHeightUncached(int x, int z)
{
return getNoiseHeight(x, z) + getFluidHeight();
}
public double getTerrainWaterHeight(int x, int z) public double getTerrainWaterHeight(int x, int z)
{ {
return Math.max(getTerrainHeight(x, z), getFluidHeight()); return Math.max(getTerrainHeight(x, z), getFluidHeight());