From ef083196708ad469903b1944f62089df0a270532 Mon Sep 17 00:00:00 2001
From: DanLT <danielmillst@gmail.com>
Date: Wed, 1 Sep 2021 15:17:00 -0800
Subject: [PATCH] Disable cave lava for now

---
 .../volmit/iris/engine/object/IrisCave.java   | 17 ++---------
 .../iris/engine/object/IrisDimension.java     |  2 +-
 .../volmit/iris/engine/object/IrisRavine.java | 30 ++++++++++++-------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCave.java b/src/main/java/com/volmit/iris/engine/object/IrisCave.java
index 6c1733907..21d982853 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisCave.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisCave.java
@@ -18,6 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.framework.Engine;
@@ -55,9 +56,6 @@ public class IrisCave extends IrisRegistrant {
     @Desc("Limit the worm from ever getting higher or lower than this range")
     private IrisRange verticalRange = new IrisRange(3, 255);
 
-    @Desc("To fill this cave with lava, set the lava level to a height from the bottom most point of the cave.")
-    private int lavaLevel = -1;
-
     @Override
     public String getFolderName() {
         return "caves";
@@ -77,7 +75,6 @@ public class IrisCave extends IrisRegistrant {
         double girth = getWorm().getGirth().get(rng, x, z, engine.getData());
         KList<IrisPosition> points = getWorm().generate(rng, engine.getData(), writer, verticalRange, x, y, z, (at) -> {});
         int highestWater = Math.max(waterHint, -1);
-        int lowestPoint = Integer.MAX_VALUE;
 
         if (highestWater == -1) {
             for (IrisPosition i : points) {
@@ -91,13 +88,6 @@ public class IrisCave extends IrisRegistrant {
             }
         }
 
-        if(lavaLevel >= 0)
-        {
-            for(IrisPosition i : points)
-            {
-                lowestPoint = Math.min(i.getY(), lowestPoint);
-            }
-        }
 
         int h = Math.min(Math.max(highestWater, waterHint), engine.getDimension().getFluidHeight());
 
@@ -107,11 +97,10 @@ public class IrisCave extends IrisRegistrant {
 
         MatterCavern c = new MatterCavern(true, customBiome, (byte) 0);
         MatterCavern w = new MatterCavern(true, customBiome, (byte) 1);
-        MatterCavern l = new MatterCavern(true, customBiome, (byte) 2);
-        int flp = lowestPoint - worm.getGirth().getMid();
+
         writer.setLineConsumer(points,
                 girth, true,
-                (xf, yf, zf) -> (lavaLevel + flp >= yf && lavaLevel >= 0) ? l : (yf <= h ? w : c));
+                (xf, yf, zf) -> yf <= h ? w : c);
     }
 
     @Override
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
index ae86f33bb..1d44b9c12 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
@@ -293,7 +293,7 @@ public class IrisDimension extends IrisRegistrant {
             }
 
             pos.remove(0);
-            
+
             return pos;
         });
     }
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRavine.java b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
index 2665dafa7..d6f79ea42 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
@@ -18,6 +18,7 @@
 
 package com.volmit.iris.engine.object;
 
+import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.framework.Engine;
@@ -103,15 +104,6 @@ public class IrisRavine extends IrisRegistrant {
         CNG bw = baseWidthStyle.getGenerator().createNoCache(rng, engine.getData());
         int highestWater = Math.max(waterHint, -1);
         boolean water = false;
-        int lowestPoint = Integer.MAX_VALUE;
-
-        if(lavaLevel >= 0)
-        {
-            for(IrisPosition i : pos)
-            {
-                lowestPoint = Math.min(i.getY(), lowestPoint);
-            }
-        }
 
         if (highestWater == -1) {
             for (IrisPosition i : pos) {
@@ -158,7 +150,15 @@ public class IrisRavine extends IrisRegistrant {
                         break;
                     }
 
-                    writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, ((lavaLevel + (lowestPoint - depthStyle.getMid())) >= i) && lavaLevel >= 0 ? l : c);
+                    if(lavaLevel >= 0 &&  i <= lavaLevel + (surface - depthStyle.getMid()))
+                    {
+                        writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, l);
+                    }
+
+                    else
+                    {
+                        writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c);
+                    }
                 }
             }
 
@@ -174,7 +174,15 @@ public class IrisRavine extends IrisRegistrant {
                         break;
                     }
 
-                    writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, ((lavaLevel + (lowestPoint - depthStyle.getMid())) >= i) && lavaLevel >= 0 ? l : c);
+                    if(lavaLevel >= 0 &&  i <= lavaLevel + (surface - depthStyle.getMid()))
+                    {
+                        writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, l);
+                    }
+
+                    else
+                    {
+                        writer.setElipsoid(p.getX(), i, p.getZ(), v, ribThickness, v, true, c);
+                    }
                 }
             }
         }