diff --git a/build.gradle.kts b/build.gradle.kts
index fc913d0e..bafae71e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.gradle.toolchains.foojay.match
 
 plugins {
     id("earth.terrarium.cloche") version "0.19.14"
@@ -127,6 +128,10 @@ cloche {
     }
 }
 
+tasks.withType<Jar>() {
+    exclude(".cache")
+}
+
 /*
 tasks.named("runNeoforgeData") {
     enabled = false
diff --git a/gradle.properties b/gradle.properties
index 96d4d82f..ac9fdf85 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,9 @@ org.gradle.configureondemand=true
 group=net.nostalgica
 version=5.0.0-alpha.4
 
-minecraft_version=26.4-snapshot-4
+minecraft_version=26.4-snapshot-5
 fabric_minecraft_version_range=26.4.x
 
 fabric_loader_version=0.20.0
-fabric_api_version=0.163.0
+fabric_api_version=0.165.0
 fabric_api_minecraft_version=26.4
diff --git a/src/common/main/java/net/nostalgica/modernerbeta/density/LegacyNoiseFunction.java b/src/common/main/java/net/nostalgica/modernerbeta/density/LegacyNoiseFunction.java
index 5e8fd92a..a66ee52a 100644
--- a/src/common/main/java/net/nostalgica/modernerbeta/density/LegacyNoiseFunction.java
+++ b/src/common/main/java/net/nostalgica/modernerbeta/density/LegacyNoiseFunction.java
@@ -17,6 +17,7 @@ import net.minecraft.world.level.levelgen.densityfunction.DensityVolume;
 import net.minecraft.world.level.levelgen.densityfunction.DfRewriteRule;
 import net.minecraft.world.level.levelgen.densityfunction.SamplerContext;
 import net.minecraft.world.level.levelgen.synth.BlendedNoise;
+import org.jspecify.annotations.NonNull;
 
 public record LegacyNoiseFunction(
     Holder<NoiseLayout> layout,
@@ -40,17 +41,17 @@ public record LegacyNoiseFunction(
     ).apply(instance, LegacyNoiseFunction::new));
 
     @Override
-    public DensitySampler compileSampler(CompileContext context) {
+    public @NonNull DensitySampler compileSampler(CompileContext context) {
         return new Sampler(this, this.layout.value().create(this.noise, context.createRandom(BlendedNoise.NOISE_SEED)));
     }
 
     @Override
-    public DensityFunction rewriteChildren(DfRewriteRule rule) {
+    public @NonNull DensityFunction rewriteChildren(@NonNull DfRewriteRule rule) {
         return this;
     }
 
     @Override
-    public Interval range() {
+    public @NonNull Interval range() {
         return Interval.of(-LIMIT, LIMIT);
     }
 
@@ -60,18 +61,18 @@ public record LegacyNoiseFunction(
     }
 
     @Override
-    public MapCodec<LegacyNoiseFunction> codec() {
+    public @NonNull MapCodec<LegacyNoiseFunction> codec() {
         return CODEC;
     }
 
     private record Sampler(LegacyNoiseFunction function, LegacyNoise noise) implements DensitySampler {
         @Override
-        public void sampleVolume(SamplerContext context, DensityBuffer outputBuffer, DensityVolume volume) {
+        public void sampleVolume(@NonNull SamplerContext context, @NonNull DensityBuffer outputBuffer, @NonNull DensityVolume volume) {
             DensitySampler.sampleVolumeNaive(context, outputBuffer, volume, this);
         }
 
         @Override
-        public float sampleValue(SamplerContext context, int blockX, int blockY, int blockZ) {
+        public float sampleValue(@NonNull SamplerContext context, int blockX, int blockY, int blockZ) {
             LegacyNoiseFunction f = this.function;
             double value = this.noise.sample(
                 Mth.floorDiv(blockX, f.xzSpacing),
diff --git a/src/common/main/java/net/nostalgica/modernerbeta/density/OldBlendedNoiseFunction.java b/src/common/main/java/net/nostalgica/modernerbeta/density/OldBlendedNoiseFunction.java
index d3677824..a78176fe 100644
--- a/src/common/main/java/net/nostalgica/modernerbeta/density/OldBlendedNoiseFunction.java
+++ b/src/common/main/java/net/nostalgica/modernerbeta/density/OldBlendedNoiseFunction.java
@@ -14,6 +14,7 @@ import net.minecraft.world.level.levelgen.densityfunction.DensityVolume;
 import net.minecraft.world.level.levelgen.densityfunction.DfRewriteRule;
 import net.minecraft.world.level.levelgen.densityfunction.SamplerContext;
 import net.minecraft.world.level.levelgen.synth.BlendedNoise;
+import org.jspecify.annotations.NonNull;
 
 public record OldBlendedNoiseFunction(
     double xzScale,
@@ -36,7 +37,7 @@ public record OldBlendedNoiseFunction(
     ).apply(instance, OldBlendedNoiseFunction::new));
 
     @Override
-    public DensitySampler compileSampler(CompileContext context) {
+    public @NonNull DensitySampler compileSampler(CompileContext context) {
         return this.createSampler(context.createRandom(BlendedNoise.NOISE_SEED));
     }
 
@@ -63,12 +64,12 @@ public record OldBlendedNoiseFunction(
     }
 
     @Override
-    public DensityFunction rewriteChildren(DfRewriteRule rule) {
+    public @NonNull DensityFunction rewriteChildren(@NonNull DfRewriteRule rule) {
         return this;
     }
 
     @Override
-    public Interval range() {
+    public @NonNull Interval range() {
         return Interval.of(-LegacyNoiseFunction.LIMIT, LegacyNoiseFunction.LIMIT);
     }
 
@@ -78,7 +79,7 @@ public record OldBlendedNoiseFunction(
     }
 
     @Override
-    public MapCodec<OldBlendedNoiseFunction> codec() {
+    public @NonNull MapCodec<OldBlendedNoiseFunction> codec() {
         return CODEC;
     }
 
@@ -94,12 +95,12 @@ public record OldBlendedNoiseFunction(
         double mainSmear
     ) implements DensitySampler {
         @Override
-        public void sampleVolume(SamplerContext context, DensityBuffer outputBuffer, DensityVolume volume) {
+        public void sampleVolume(@NonNull SamplerContext context, @NonNull DensityBuffer outputBuffer, @NonNull DensityVolume volume) {
             DensitySampler.sampleVolumeNaive(context, outputBuffer, volume, this);
         }
 
         @Override
-        public float sampleValue(SamplerContext context, int blockX, int blockY, int blockZ) {
+        public float sampleValue(@NonNull SamplerContext context, int blockX, int blockY, int blockZ) {
             return LegacyNoiseFunction.toFloat(this.value(blockX, blockY, blockZ));
         }
 
diff --git a/src/fabric/data/java/net/nostalgica/modernerbeta/data/ModernerBetaNoiseSettings.java b/src/fabric/data/java/net/nostalgica/modernerbeta/data/ModernerBetaNoiseSettings.java
index c8c8a3a6..ab754718 100644
--- a/src/fabric/data/java/net/nostalgica/modernerbeta/data/ModernerBetaNoiseSettings.java
+++ b/src/fabric/data/java/net/nostalgica/modernerbeta/data/ModernerBetaNoiseSettings.java
@@ -36,7 +36,7 @@ public final class ModernerBetaNoiseSettings {
                 zero,
                 zero,
                 DensityFunctions.add(
-                    DensityFunctions.interpolated(ModernerBetaDensityFunctions.get(functions, ModernerBetaDensityFunctions.ALPHA_TERRAIN), 4, 8),
+                    DensityFunctions.linearUpscale(ModernerBetaDensityFunctions.get(functions, ModernerBetaDensityFunctions.ALPHA_TERRAIN), 4, 8),
                     DensityFunctions.beardifier()
                 )
             ),