Update Cubiomes

xpple · xpple · commit 7d56a064d896 · 2026-01-02T16:48:12.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -50,21 +50,29 @@ dependencies {
 	include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
 	include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
 
-//	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-//		exclude group: 'net.fabricmc', module: 'fabric-loader'
-//	}
-//	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-//		exclude group: 'net.fabricmc', module: 'fabric-loader'
-//	}
+	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+		exclude group: 'net.fabricmc', module: 'fabric-loader'
+	}
+	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+		exclude group: 'net.fabricmc', module: 'fabric-loader'
+	}
 
 	testImplementation platform("org.junit:junit-bom:${project.junit_version}")
 	testImplementation 'org.junit.jupiter:junit-jupiter'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
+clean {
+    delete fileTree("${projectDir}/src/main/java/com/github/cubiomes") {
+        exclude '.gitkeep'
+    }
+}
+
 tasks.register('createJavaBindings', CreateJavaBindingsTask) {}
 compileJava.dependsOn('createJavaBindings')
 
+createJavaBindings.dependsOn(clean)
+
 tasks.register('generateBuildInfo', GenerateBuildInfoTask) {
 	outputFile = new File(temporaryDir, "build_info.json")
 }
diff --git a/buildSrc/src/main/java/dev/xpple/seedmapper/buildscript/CreateJavaBindingsTask.java b/buildSrc/src/main/java/dev/xpple/seedmapper/buildscript/CreateJavaBindingsTask.java
@@ -13,6 +13,6 @@ public abstract class CreateJavaBindingsTask extends Exec {
 
         this.setWorkingDir(this.getProject().getRootDir());
         this.setStandardOutput(System.out);
-        this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c/cubiomes", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "biomenoise.h", "biomes.h", "noise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "loot/items.h", "loot/logging.h", "loot/loot_functions.h", "loot/loot_table_context.h", "loot/loot_table_parser.h", "loot/loot_tables.h", "loot/mc_loot.h");
+        this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c/cubiomes", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "biomenoise.h", "biomes.h", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "loot/items.h", "loot/logging.h", "loot/loot_functions.h", "loot/loot_table_context.h", "loot/loot_table_parser.h", "loot/loot_tables.h", "loot/mc_loot.h");
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ betterconfig_version=2.5.0
 clientarguments_version=1.11.6
 simplewaypoints_version=1.2.0
 
-devauth_version=1.2.1
+devauth_version=1.2.2
 
 # Test dependencies
 junit_version=5.13.4
diff --git a/includes.txt b/includes.txt
@@ -11,14 +11,14 @@
 --include-struct SplineStack
 --include-struct SurfaceNoise
 --include-struct SurfaceNoiseBeta
---include-struct TerrainNoiseParameters
+--include-struct TerrainNoise
+--include-function addSplineVal
 --include-function approxSurfaceBeta
 --include-function climateToBiome
+--include-function createFixSpline
 --include-function genBiomeNoiseBetaScaled
 --include-function genBiomeNoiseChunkSection
 --include-function genBiomeNoiseScaled
---include-function generateColumn
---include-function generateRegion
 --include-function genEndScaled
 --include-function genNetherScaled
 --include-function getBiomeDepthAndScale
@@ -31,34 +31,13 @@
 --include-function initBlendedNoise
 --include-function initSurfaceNoise
 --include-function initSurfaceNoiseBeta
---include-function initTerrainNoise
 --include-function mapEnd
 --include-function mapEndBiome
 --include-function mapEndSurfaceHeight
 --include-function mapNether2D
 --include-function mapNether3D
---include-function sampleBase3dNoise
---include-function sampleBiomeNoise
---include-function sampleBiomeNoiseBeta
---include-function sampleCaveCheese
---include-function sampleCaveEntrance
---include-function sampleCaveLayer
---include-function sampleClimatePara
---include-function sampleEntrances
---include-function sampleFinalDensity
---include-function sampleNoiseColumn
---include-function sampleNoiseParameters
---include-function sampleNoodle
---include-function samplePillars
---include-function samplePreliminarySurfaceLevel
---include-function sampleSlopedCheese
---include-function sampleSpaghetti2d
---include-function sampleSpaghetti3d
---include-function sampleSpaghetti2dThicknessModulator
---include-function sampleSpaghettiRoughness
 --include-function sampleSurfaceNoise
 --include-function sampleSurfaceNoiseBetween
---include-function sampleUnderground
 --include-function setBetaBiomeSeed
 --include-function setBiomeSeed
 --include-function setClimateParaSeed
@@ -75,6 +54,10 @@
 --include-constant SAMPLE_NO_BIOME
 --include-constant SAMPLE_NO_DEPTH
 --include-constant SAMPLE_NO_SHIFT
+--include-constant SP_CONTINENTALNESS
+--include-constant SP_EROSION
+--include-constant SP_RIDGES
+--include-constant SP_WEIRDNESS
 
 --include-function areSimilar
 --include-function biomeExists
@@ -948,6 +931,53 @@
 --include-function xOctaveLegacyInit
 --include-function xPerlinInit
 
+--include-function initTerrainNoise
+--include-function generateColumn
+--include-function generateRegion
+--include-function sampleBase3dNoise
+--include-function sampleBiomeNoise
+--include-function sampleBiomeNoiseBeta
+--include-function sampleCaveCheese
+--include-function sampleCaveEntrance
+--include-function sampleCaveLayer
+--include-function sampleClimatePara
+--include-function sampleEntrances
+--include-function sampleFinalDensity
+--include-function sampleNoiseColumn
+--include-function sampleNoiseParameters
+--include-function sampleNoodle
+--include-function samplePillars
+--include-function samplePreliminarySurfaceLevel
+--include-function sampleSlopedCheese
+--include-function sampleSpaghetti2d
+--include-function sampleSpaghetti3d
+--include-function sampleSpaghetti2dThicknessModulator
+--include-function sampleSpaghettiRoughness
+--include-function sampleUnderground
+--include-function setupTerrainNoise
+--include-constant OTP_CAVE_ENTRANCE
+--include-constant OTP_CAVE_CHEESE
+--include-constant OTP_CAVE_LAYER
+--include-constant OTP_JAGGED
+--include-constant OTP_MAX
+--include-constant OTP_NOODLE
+--include-constant OTP_NOODLE_RIDGE_A
+--include-constant OTP_NOODLE_RIDGE_B
+--include-constant OTP_NOODLE_THICKNESS
+--include-constant OTP_PILLAR
+--include-constant OTP_PILLAR_RARENESS
+--include-constant OTP_PILLAR_THICKNESS
+--include-constant OTP_SPAGHETTI_2D
+--include-constant OTP_SPAGHETTI_2D_ELEVATION
+--include-constant OTP_SPAGHETTI_2D_MODULATOR
+--include-constant OTP_SPAGHETTI_2D_THICKNESS
+--include-constant OTP_SPAGHETTI_3D_1
+--include-constant OTP_SPAGHETTI_3D_2
+--include-constant OTP_SPAGHETTI_3D_RARITY
+--include-constant OTP_SPAGHETTI_3D_THICKNESS
+--include-constant OTP_SPAGHETTI_ROUGHNESS
+--include-constant OTP_SPAGHETTI_ROUGHNESS_MODULATOR
+
 --include-function getOptimalAfk
 --include-function getQuadHutCst
 --include-function scanForQuads
diff --git a/src/main/c/cubiomes b/src/main/c/cubiomes
@@ -1 +1 @@
-Subproject commit f4049d008826b822989013b53e560f5e6c7e96f3
+Subproject commit eb500f80f8c1763746d4f10227dd71f430dc891b
diff --git a/src/main/java/dev/xpple/seedmapper/command/arguments/DensityFunctionArgument.java b/src/main/java/dev/xpple/seedmapper/command/arguments/DensityFunctionArgument.java
@@ -2,7 +2,9 @@
 
 import com.github.cubiomes.BiomeNoise;
 import com.github.cubiomes.Cubiomes;
-import com.github.cubiomes.TerrainNoiseParameters;
+import com.github.cubiomes.DoublePerlinNoise;
+import com.github.cubiomes.Generator;
+import com.github.cubiomes.TerrainNoise;
 import com.google.common.collect.ImmutableMap;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
@@ -26,7 +28,7 @@ public class DensityFunctionArgument implements ArgumentType<DensityFunctionArgu
     private static final Collection<String> EXAMPLES = Arrays.asList("overworld", "the_nether", "the_end");
 
     public static final Map<String, DensityFunction> DENSITY_FUNCTIONS = ImmutableMap.<String, DensityFunction>builder()
-        .put("overworld.base_3d_noise", (params, x, y, z) -> Cubiomes.sampleBase3dNoise(TerrainNoiseParameters.bln(params), x, y, z))
+        .put("overworld.base_3d_noise", (params, x, y, z) -> Cubiomes.sampleBase3dNoise(TerrainNoise.base3dNoise(params), x, y, z))
         .put("overworld.caves.spaghetti_roughness_function", Cubiomes::sampleSpaghettiRoughness)
         .put("overworld.caves.spaghetti_2d_thickness_modulator", Cubiomes::sampleSpaghetti2dThicknessModulator)
         .put("overworld.caves.spaghetti_2d", Cubiomes::sampleSpaghetti2d)
@@ -81,18 +83,18 @@ public Collection<String> getExamples() {
 
     @FunctionalInterface
     public interface DensityFunction {
-        double compute(MemorySegment terrainNoiseParameters, int x, int y, int z);
+        double compute(MemorySegment terrainNoise, int x, int y, int z);
     }
 
     private static double computeSlopedCheese(MemorySegment params, int x, int y, int z) {
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment np_param = arena.allocate(Cubiomes.C_FLOAT, 4);
-            Cubiomes.sampleNoiseParameters(TerrainNoiseParameters.bn(params), x >> 2, z >> 2, np_param);
-            double depth = Cubiomes.getSpline(BiomeNoise.sp(TerrainNoiseParameters.bn(params)), np_param) - 0.50375f;
-            double factor = Cubiomes.getSpline(TerrainNoiseParameters.factorSpline(params), np_param);
-            double jagged = Cubiomes.sampleDoublePerlin(TerrainNoiseParameters.jagged(params), x * 1500.0, 0, z * 1500.0);
+            Cubiomes.sampleNoiseParameters(Generator.bn(TerrainNoise.g(params)), x >> 2, z >> 2, np_param);
+            double depth = Cubiomes.getSpline(BiomeNoise.sp(Generator.bn(TerrainNoise.g(params))), np_param) - 0.50375f;
+            double factor = Cubiomes.getSpline(TerrainNoise.factorSpline(params), np_param);
+            double jagged = Cubiomes.sampleDoublePerlin(TerrainNoise.noises(params).asSlice(Cubiomes.OTP_JAGGED() * DoublePerlinNoise.sizeof()), x * 1500.0, 0, z * 1500.0);
             jagged = jagged >= 0.0 ? jagged : jagged / 2.0;
-            jagged *= Cubiomes.getSpline(TerrainNoiseParameters.jaggednessSpline(params), np_param);
+            jagged *= Cubiomes.getSpline(TerrainNoise.jaggednessSpline(params), np_param);
             return Cubiomes.sampleSlopedCheese(params, x, y, z, depth, factor, jagged);
         }
     }
diff --git a/src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java b/src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java
@@ -9,7 +9,7 @@
 import com.github.cubiomes.Pos3;
 import com.github.cubiomes.Pos3List;
 import com.github.cubiomes.SurfaceNoise;
-import com.github.cubiomes.TerrainNoiseParameters;
+import com.github.cubiomes.TerrainNoise;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.datafixers.util.Pair;
@@ -266,8 +266,11 @@ private static int highlightTerrain(CustomClientCommandSource source, int chunkR
         int minZ = minChunkZ << 4;
 
         try (Arena arena = Arena.ofConfined()) {
-            MemorySegment params = TerrainNoiseParameters.allocate(arena);
-            if (Cubiomes.initTerrainNoise(params, seed.seed(), version, generatorFlags & Cubiomes.LARGE_BIOMES()) == 0) {
+            MemorySegment params = TerrainNoise.allocate(arena);
+            if (Cubiomes.setupTerrainNoise(params, version, generatorFlags) == 0) {
+                throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
+            }
+            if (Cubiomes.initTerrainNoise(params, seed.seed(), dimension) == 0) {
                 throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
             }
 
diff --git a/src/main/java/dev/xpple/seedmapper/command/commands/SampleCommand.java b/src/main/java/dev/xpple/seedmapper/command/commands/SampleCommand.java
@@ -1,7 +1,7 @@
 package dev.xpple.seedmapper.command.commands;
 
 import com.github.cubiomes.Cubiomes;
-import com.github.cubiomes.TerrainNoiseParameters;
+import com.github.cubiomes.TerrainNoise;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dev.xpple.seedmapper.command.CommandExceptions;
@@ -42,8 +42,11 @@ private static int sampleAll(CustomClientCommandSource source) throws CommandSyn
         BlockPos pos = BlockPos.containing(source.getPosition());
 
         try (Arena arena = Arena.ofConfined()) {
-            MemorySegment params = TerrainNoiseParameters.allocate(arena);
-            if (Cubiomes.initTerrainNoise(params, seed.seed(), version, generatorFlags & Cubiomes.LARGE_BIOMES()) == 0) {
+            MemorySegment params = TerrainNoise.allocate(arena);
+            if (Cubiomes.setupTerrainNoise(params, version, generatorFlags) == 0) {
+                throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
+            }
+            if (Cubiomes.initTerrainNoise(params, seed.seed(), dimension) == 0) {
                 throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
             }
 
@@ -68,8 +71,13 @@ private static int sampleDensity(CustomClientCommandSource source, DensityFuncti
         BlockPos pos = BlockPos.containing(source.getPosition());
 
         try (Arena arena = Arena.ofConfined()) {
-            MemorySegment params = TerrainNoiseParameters.allocate(arena);
-            Cubiomes.initTerrainNoise(params, seed.seed(), version, generatorFlags & Cubiomes.LARGE_BIOMES());
+            MemorySegment params = TerrainNoise.allocate(arena);
+            if (Cubiomes.setupTerrainNoise(params, version, generatorFlags) == 0) {
+                throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
+            }
+            if (Cubiomes.initTerrainNoise(params, seed.seed(), dimension) == 0) {
+                throw CommandExceptions.INCOMPATIBLE_PARAMETERS_EXCEPTION.create();
+            }
             double density = densityFunction.compute(params, pos.getX(), pos.getY(), pos.getZ());
             source.sendFeedback(Component.translatable("command.sample.sampleDensity.success", ComponentUtils.formatXYZ(pos.getX(), pos.getY(), pos.getZ()), ComponentUtils.formatNumber(density)));
 
diff --git a/src/main/resources/mixins.seedmapper.json b/src/main/resources/mixins.seedmapper.json
@@ -3,8 +3,8 @@
   "package": "dev.xpple.seedmapper.mixin",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "ClientPacketListenerMixin",
     "ChatScreenMixin",
+    "ClientPacketListenerMixin",
     "betterconfig.ConfigCommandClientMixin"
   ],
   "injectors": {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public abstract class CreateJavaBindingsTask extends Exec {`
`13`	`13`
`14`	`14`	`this.setWorkingDir(this.getProject().getRootDir());`
`15`	`15`	`this.setStandardOutput(System.out);`
`16`		- this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c/cubiomes", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "biomenoise.h", "biomes.h", "noise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "loot/items.h", "loot/logging.h", "loot/loot_functions.h", "loot/loot_table_context.h", "loot/loot_table_parser.h", "loot/loot_tables.h", "loot/mc_loot.h");
	`16`	+ this.commandLine("./jextract/build/jextract/bin/jextract" + EXTENSION, "--include-dir", "src/main/c/cubiomes", "--output", "src/main/java", "--use-system-load-library", "--target-package", "com.github.cubiomes", "--header-class-name", "Cubiomes", "@includes.txt", "biomenoise.h", "biomes.h", "finders.h", "generator.h", "layers.h", "biomenoise.h", "biomes.h", "noise.h", "terrainnoise.h", "rng.h", "util.h", "quadbase.h", "xrms.h", "loot/items.h", "loot/logging.h", "loot/loot_functions.h", "loot/loot_table_context.h", "loot/loot_table_parser.h", "loot/loot_tables.h", "loot/mc_loot.h");
`17`	`17`	`}`
`18`	`18`	`}`