From 9e7262660f32ff56a540ae775ef08f0cc2a67d39 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Mon, 20 Sep 2021 16:39:19 +0200
Subject: [PATCH] Density range. Now use getDensity(rng, x, z, IrisData)

---
 .../components/MantleObjectComponent.java     |  4 +--
 .../engine/object/IrisObjectPlacement.java    | 30 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
index 2e75773c1..214c679a9 100644
--- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
+++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java
@@ -87,7 +87,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
 
     @BlockCoordinates
     private void placeObject(MantleWriter writer, RNG rng, int x, int z, IrisObjectPlacement objectPlacement) {
-        for (int i = 0; i < objectPlacement.getDensity(); i++) {
+        for (int i = 0; i < objectPlacement.getDensity(rng, x, z, getData()); i++) {
             IrisObject v = objectPlacement.getScale().get(rng, objectPlacement.getObject(getComplex(), rng));
             if (v == null) {
                 return;
@@ -104,7 +104,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
     @BlockCoordinates
     private Set<String> guessPlacedKeys(RNG rng, int x, int z, IrisObjectPlacement objectPlacement) {
         Set<String> f = new KSet<>();
-        for (int i = 0; i < objectPlacement.getDensity(); i++) {
+        for (int i = 0; i < objectPlacement.getDensity(rng, x, z, getData()); i++) {
             IrisObject v = objectPlacement.getScale().get(rng, objectPlacement.getObject(getComplex(), rng));
             if (v == null) {
                 continue;
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
index 923054d9b..92cde98c2 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java
@@ -62,7 +62,6 @@ public class IrisObjectPlacement {
     private IrisObjectRotation rotation = new IrisObjectRotation();
     @Desc("Limit the max height or min height of placement.")
     private IrisObjectLimit clamp = new IrisObjectLimit();
-
     @MinNumber(0)
     @MaxNumber(1)
     @Desc("The maximum layer level of a snow filter overtop of this placement. Set to 0 to disable. Max of 1.")
@@ -74,6 +73,8 @@ public class IrisObjectPlacement {
     @MinNumber(1)
     @Desc("If the chance check passes, place this many in a single chunk")
     private int density = 1;
+    @Desc("If the chance check passes, and you specify this, it picks a number in the range based on noise, and 'density' is ignored.")
+    private IrisStyledRange densityStyle = null;
     @MaxNumber(64)
     @MinNumber(0)
     @Desc("If the place mode is set to stilt, you can over-stilt it even further into the ground. Especially useful when using fast stilt due to inaccuracies.")
@@ -164,18 +165,6 @@ public class IrisObjectPlacement {
         return getSurfaceWarp(rng, data).fitDouble(-(getWarp().getMultiplier() / 2D), (getWarp().getMultiplier() / 2D), x, y, z);
     }
 
-    public int getTriesForChunk(RNG random) {
-        if (chance <= 0) {
-            return 0;
-        }
-
-        if (chance >= 1 || random.nextDouble() < chance) {
-            return density;
-        }
-
-        return 0;
-    }
-
     public IrisObject getObject(DataProvider g, RNG random) {
         if (place.isEmpty()) {
             return null;
@@ -194,6 +183,21 @@ public class IrisObjectPlacement {
         return false;
     }
 
+    public int getDensity() {
+        if (densityStyle == null) {
+            return density;
+        }
+        return densityStyle.getMid();
+    }
+
+    public int getDensity(RNG rng, double x, double z, IrisData data) {
+        if (densityStyle == null) {
+            return density;
+        }
+
+        return (int) Math.round(densityStyle.get(rng, x, z, data));
+    }
+
     private TableCache getCache(IrisData manager) {
         return cache.aquire(() -> {
             TableCache tc = new TableCache();