From 30e1d9552c9ab5994f38a172ad8dc19c7721b007 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 11 Sep 2020 23:45:36 -0400 Subject: [PATCH] fg --- .../java/com/volmit/iris/gen/layer/GenLayerCarve.java | 2 +- .../java/com/volmit/iris/object/IrisObjectPlacement.java | 9 ++++++++- src/main/java/com/volmit/iris/object/IrisRegion.java | 2 +- src/main/java/com/volmit/iris/util/CarveResult.java | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java index 064ed766f..5ab97d5b4 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java @@ -72,7 +72,7 @@ public class GenLayerCarve extends GenLayer { if(lastCarve - i > 2 && !(i < terrainHeight && lastCarve - i > terrainHeight)) { - surfaces.add(new CarveResult(i, lastCarve - i)); + surfaces.add(new CarveResult(i, lastCarve)); } } diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java index a91143976..ea1abbc3f 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java @@ -26,7 +26,6 @@ import lombok.experimental.Accessors; @Data public class IrisObjectPlacement { - @RegistryListObject @Required @ArrayType(min = 1, type = String.class) @@ -99,6 +98,14 @@ public class IrisObjectPlacement @Desc("If set to true, objects will place on the terrain height, ignoring the water surface.") private boolean underwater = false; + @DontObfuscate + @Desc("If set to true, objects will place in carvings (such as underground) or under an overhang.") + private boolean allowInCarvings = true; + + @DontObfuscate + @Desc("If set to true, objects will place on carving ceilings instead of the floors. Make sure to rotate it upside down with rotate if need be as this option does NOT flip your object upside down.") + private boolean carvingCeiling = false; + @DontObfuscate @Desc("If set to true, Iris will try to fill the insides of 'rooms' and 'pockets' where air should fit based off of raytrace checks. This prevents a village house placing in an area where a tree already exists, and instead replaces the parts of the tree where the interior of the structure is. \n\nThis operation does not affect warmed-up generation speed however it does slow down loading objects.") private boolean smartBore = false; diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index ff015d57b..aaeb45222 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -79,7 +79,7 @@ public class IrisRegion extends IrisRegistrant implements IRare @DontObfuscate @Desc("Objects define what schematics (iob files) iris will place in this region") private KList objects = new KList(); - + @MinNumber(0) @DontObfuscate @Desc("The min shore height") diff --git a/src/main/java/com/volmit/iris/util/CarveResult.java b/src/main/java/com/volmit/iris/util/CarveResult.java index e0b1d1878..d31defb7e 100644 --- a/src/main/java/com/volmit/iris/util/CarveResult.java +++ b/src/main/java/com/volmit/iris/util/CarveResult.java @@ -6,5 +6,10 @@ import lombok.Value; public class CarveResult { private final int surface; - private final int height; + private final int ceiling; + + public int getHeight() + { + return ceiling - surface; + } }