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

Merge pull request #954 from CocoTheOwner/slopes

Browse Source 
Slope condition
This commit is contained in:
Brian Fopiano 2023-02-15 14:46:28 -08:00 committed by GitHub
commit 3e022e1931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/volmit/iris/engine/object/IrisObject.java
View File

@ -496,6 +496,13 @@ public class IrisObject extends IrisRegistrant {
public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, BiConsumer<BlockPosition, BlockData> listener, CarveResult c, IrisData rdata) { public int place(int x, int yv, int z, IObjectPlacer oplacer, IrisObjectPlacement config, RNG rng, BiConsumer<BlockPosition, BlockData> listener, CarveResult c, IrisData rdata) {
IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer; IObjectPlacer placer = (config.getHeightmap() != null) ? new HeightmapObjectPlacer(oplacer.getEngine() == null ? IrisContext.get().getEngine() : oplacer.getEngine(), rng, x, yv, z, config, oplacer) : oplacer;
// Slope calculation
if (!config.getSlopeCondition().isDefault() &&
!config.getSlopeCondition().isValid(rdata.getEngine().getComplex().getSlopeStream().get(x, z)))
{
return -1;
}
if (config.isSmartBore()) { if (config.isSmartBore()) {
ensureSmartBored(placer.isDebugSmartBore()); ensureSmartBored(placer.isDebugSmartBore());
} }

2
src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
View File

@ -62,6 +62,8 @@ public class IrisObjectPlacement {
private double snow = 0; private double snow = 0;
@Desc("Whether or not this object can be targeted by a dolphin.") @Desc("Whether or not this object can be targeted by a dolphin.")
private boolean isDolphinTarget = false; private boolean isDolphinTarget = false;
@Desc("The slope at which this object can be placed. Range from 0 to 10 by default. Calculated from the corners of the object.")
private IrisSlopeClip slopeCondition = new IrisSlopeClip();
@MinNumber(0) @MinNumber(0)
@MaxNumber(1) @MaxNumber(1)
@Desc("The chance for this to place in a chunk. If you need multiple per chunk, set this to 1 and use density.") @Desc("The chance for this to place in a chunk. If you need multiple per chunk, set this to 1 and use density.")