From 6c1a2e7d0e5877e6ffcd1ff4e06483e73b67bbb3 Mon Sep 17 00:00:00 2001
From: Starmute <8108209+Starmute@users.noreply.github.com>
Date: Thu, 16 Dec 2021 14:34:29 -0500
Subject: [PATCH] Fix caveEntrance noise being scaled incorrectly (please
 check)

---
 .../mixins/NoiseColumnSamplerMixin_scarpetMixin.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java b/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java
index 3ce6bfb5..89b4a9ee 100644
--- a/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java
+++ b/src/main/java/carpet/mixins/NoiseColumnSamplerMixin_scarpetMixin.java
@@ -59,7 +59,7 @@ public abstract class NoiseColumnSamplerMixin_scarpetMixin implements NoiseColum
     @Shadow @Final
     private DoublePerlinNoiseSampler spaghetti3dSecondNoise;
 
-    @Shadow @Final
+    @Shadow @Finalav
     private DoublePerlinNoiseSampler spaghetti3dRarityNoise;
 
     @Shadow @Final
@@ -219,7 +219,11 @@ public abstract class NoiseColumnSamplerMixin_scarpetMixin implements NoiseColum
                 return NoiseHelper.lerpFromProgress(this.spaghettiRoughnessModulatorNoise, x, y, z, 0.0, 0.1);
             }
             case "caveEntrance" -> {
-                return this.sampleCaveEntranceNoise(x, y, z);
+                return this.sampleCaveEntranceNoise(
+                        BiomeCoords.toBlock(x),
+                        BiomeCoords.toBlock(y),
+                        BiomeCoords.toBlock(z)
+                );
             }
             case "caveLayer" -> {
                 // scaling them by 4 because it's sampled in normal coords