From 7f6d65a13e6c43b084a0665fdfcc00020d4326a3 Mon Sep 17 00:00:00 2001
From: Julian Krings <juliankrings6@gmail.com>
Date: Wed, 4 Jun 2025 23:03:54 +0200
Subject: [PATCH] fix worm ignoring the breakSurface option

---
 .../main/java/com/volmit/iris/engine/object/IrisCave.java | 8 +++-----
 .../com/volmit/iris/engine/object/IrisCavePlacer.java     | 2 +-
 .../java/com/volmit/iris/engine/object/IrisRavine.java    | 3 +--
 .../main/java/com/volmit/iris/engine/object/IrisWorm.java | 7 +++++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisCave.java b/core/src/main/java/com/volmit/iris/engine/object/IrisCave.java
index e0e818403..22a45ccc4 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisCave.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisCave.java
@@ -66,14 +66,12 @@ public class IrisCave extends IrisRegistrant {
     }
 
     public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) {
-        generate(writer, rng, engine, x, y, z, 0, -1);
+        generate(writer, rng, engine, x, y, z, 0, -1, true);
     }
 
-    public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int recursion, int waterHint) {
-
+    public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int recursion, int waterHint, boolean breakSurface) {
         double girth = getWorm().getGirth().get(rng, x, z, engine.getData());
-        KList<IrisPosition> points = getWorm().generate(rng, engine.getData(), writer, verticalRange, x, y, z, (at) -> {
-        });
+        KList<IrisPosition> points = getWorm().generate(rng, engine.getData(), writer, verticalRange, x, y, z, breakSurface, girth + 9);
         int highestWater = Math.max(waterHint, -1);
 
         if (highestWater == -1) {
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java b/core/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java
index 1a95493a1..eb97b14fd 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java
@@ -96,7 +96,7 @@ public class IrisCavePlacer implements IRare {
         }
 
         try {
-             cave.generate(mantle, rng, engine, x + rng.nextInt(15), y, z + rng.nextInt(15), recursion, waterHint);
+             cave.generate(mantle, rng, engine, x + rng.nextInt(15), y, z + rng.nextInt(15), recursion, waterHint, breakSurface);
         } catch (Throwable e) {
             e.printStackTrace();
             fail.set(true);
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisRavine.java b/core/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
index e2d9a79e4..3edd37c29 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisRavine.java
@@ -97,8 +97,7 @@ public class IrisRavine extends IrisRegistrant {
     }
 
     public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int recursion, int waterHint) {
-        KList<IrisPosition> pos = getWorm().generate(rng, engine.getData(), writer, null, x, y, z, (at) -> {
-        });
+        KList<IrisPosition> pos = getWorm().generate(rng, engine.getData(), writer, null, x, y, z, true, 0);
         CNG dg = depthStyle.getGenerator().createNoCache(rng, engine.getData());
         CNG bw = baseWidthStyle.getGenerator().createNoCache(rng, engine.getData());
         int highestWater = Math.max(waterHint, -1);
diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisWorm.java b/core/src/main/java/com/volmit/iris/engine/object/IrisWorm.java
index e2c414533..b50f9d3be 100644
--- a/core/src/main/java/com/volmit/iris/engine/object/IrisWorm.java
+++ b/core/src/main/java/com/volmit/iris/engine/object/IrisWorm.java
@@ -62,7 +62,7 @@ public class IrisWorm {
     private IrisStyledRange girth = new IrisStyledRange().setMin(3).setMax(5)
             .setStyle(new IrisGeneratorStyle(NoiseStyle.PERLIN));
 
-    public KList<IrisPosition> generate(RNG rng, IrisData data, MantleWriter writer, IrisRange verticalRange, int x, int y, int z, Consumer<IrisPosition> fork) {
+    public KList<IrisPosition> generate(RNG rng, IrisData data, MantleWriter writer, IrisRange verticalRange, int x, int y, int z, boolean breakSurface, double distance) {
         int itr = maxIterations;
         double jx, jy, jz;
         double cx = x;
@@ -77,7 +77,6 @@ public class IrisWorm {
 
         while (itr-- > 0) {
             IrisPosition current = new IrisPosition(Math.round(cx), Math.round(cy), Math.round(cz));
-            fork.accept(current);
             pos.add(current);
 
             if (check != null) {
@@ -92,6 +91,10 @@ public class IrisWorm {
             cz += jz;
             IrisPosition next = new IrisPosition(Math.round(cx), Math.round(cy), Math.round(cz));
 
+            if (!breakSurface && writer.getEngineMantle().getHighest(next.getX(), next.getZ(), true) <= next.getY() + distance) {
+                break;
+            }
+
             if (verticalRange != null && !verticalRange.contains(next.getY())) {
                 break;
             }