From 5b17d87a97d411d0d9edac87e881e9c1f83ac5f0 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sat, 5 Dec 2020 16:11:56 -0700
Subject: [PATCH] Carving is now very much optimized

---
 .../com/dfsek/terra/carving/CarverCache.java  |  2 +-
 .../terra/carving/UserDefinedCarver.java      | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/dfsek/terra/carving/CarverCache.java b/src/main/java/com/dfsek/terra/carving/CarverCache.java
index 04dd95eee..bd3accae8 100644
--- a/src/main/java/com/dfsek/terra/carving/CarverCache.java
+++ b/src/main/java/com/dfsek/terra/carving/CarverCache.java
@@ -25,7 +25,7 @@ public class CarverCache {
         if(carvers.size() > PluginConfig.getCacheSize() * 2) carvers.clear();
         return carvers.computeIfAbsent((((long) chunkX) << 32) | (chunkZ & 0xffffffffL) ^ w.getSeed(), key -> {
             TerraBiomeGrid grid = TerraWorld.getWorld(w).getGrid();
-            if(carver.isChunkCarved(w, chunkX, chunkZ, new FastRandom(MathUtil.hashToLong(this.getClass().getName() + "_" + chunkX + "&" + chunkZ)))) {
+            if(carver.isChunkCarved(w, chunkX, chunkZ, new FastRandom(MathUtil.hashToLong(carver.getClass().getName() + "_" + chunkX + "&" + chunkZ)))) {
                 long seed = MathUtil.getCarverChunkSeed(chunkX, chunkZ, w.getSeed());
                 carver.getSeedVar().setValue(seed);
                 Random r = new FastRandom(seed);
diff --git a/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java b/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java
index 6ea46baf9..94f8aaf92 100644
--- a/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java
+++ b/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java
@@ -9,6 +9,7 @@ import net.jafama.FastMath;
 import org.bukkit.World;
 import org.bukkit.util.Vector;
 import org.polydev.gaea.generation.GenerationPhase;
+import org.polydev.gaea.math.MathUtil;
 import org.polydev.gaea.math.Range;
 import org.polydev.gaea.util.FastRandom;
 import org.polydev.gaea.world.carving.Carver;
@@ -30,6 +31,9 @@ public class UserDefinedCarver extends Carver {
     private final int hash;
     private final int topCut;
     private final int bottomCut;
+    private double step = 2;
+    private Range recalc = new Range(8, 10);
+    private double recalcMagnitude = 3;
     private final CarverTemplate config;
     private final Expression xRad;
     private final Expression yRad;
@@ -40,9 +44,6 @@ public class UserDefinedCarver extends Carver {
     private final Range height;
     private final double sixtyFourSq = FastMath.pow(64, 2);
     private final CarverCache cache = new CarverCache();
-    private double step = 2;
-    private Range recalc = new Range(8, 10);
-    private double recalcMagnitude = 3;
 
     public UserDefinedCarver(Range height, Range length, double[] start, double[] mutate, List<String> radii, Scope parent, int hash, int topCut, int bottomCut, CarverTemplate config) throws ParseException {
         super(height.getMin(), height.getMax());
@@ -104,12 +105,14 @@ public class UserDefinedCarver extends Carver {
         int carvingRadius = getCarvingRadius();
         for(int x = chunkX - carvingRadius; x <= chunkX + carvingRadius; x++) {
             for(int z = chunkZ - carvingRadius; z <= chunkZ + carvingRadius; z++) {
-                cache.getPoints(x, z, w, this).forEach(point -> {
-                    Vector origin = point.getOrigin();
-                    if(FastMath.floorDiv(origin.getBlockX(), 16) != chunkX && FastMath.floorDiv(origin.getBlockZ(), 16) != chunkZ)
-                        return;
-                    point.carve(chunkX, chunkZ, consumer);
-                });
+                if(isChunkCarved(w, x, z, new FastRandom(MathUtil.hashToLong(this.getClass().getName() + "_" + x + "&" + z)))) {
+                    cache.getPoints(x, z, w, this).forEach(point -> {
+                        Vector origin = point.getOrigin();
+                        if(FastMath.floorDiv(origin.getBlockX(), 16) != chunkX && FastMath.floorDiv(origin.getBlockZ(), 16) != chunkZ)
+                            return;
+                        point.carve(chunkX, chunkZ, consumer);
+                    });
+                }
             }
         }
     }