Merge remote-tracking branch 'upstream/master'

Author: cev-api

includes.txt

@@ -17,6 +17,8 @@
 --include-function genBiomeNoiseBetaScaled
 --include-function genBiomeNoiseChunkSection
 --include-function genBiomeNoiseScaled
+--include-function generateColumn
+--include-function generateRegion
 --include-function genEndScaled
 --include-function genNetherScaled
 --include-function getBiomeDepthAndScale
@@ -43,6 +45,7 @@
 --include-function sampleClimatePara
 --include-function sampleEntrances
 --include-function sampleFinalDensity
+--include-function sampleNoiseColumn
 --include-function sampleNoodle
 --include-function samplePillars
 --include-function samplePreliminarySurfaceLevel

src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java

@@ -32,7 +32,9 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.foreign.Arena;
+import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SequenceLayout;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -254,6 +256,14 @@ private static int highlightTerrain(CustomClientCommandSource source, int chunkR
         int version = source.getVersion();
 
         ChunkPos center = new ChunkPos(BlockPos.containing(source.getPosition()));
+        int minChunkX = center.x - chunkRange;
+        int minChunkZ = center.z - chunkRange;
+        int chunkW = chunkRange * 2 + 1;
+        int chunkH = chunkRange * 2 + 1;
+        int blockW = chunkW << 4;
+        int blockH = chunkH << 4;
+        int minX = minChunkX << 4;
+        int minZ = minChunkZ << 4;
 
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment params = TerrainNoiseParameters.allocate(arena);
@@ -262,24 +272,23 @@ private static int highlightTerrain(CustomClientCommandSource source, int chunkR
             }
 
             Set<BlockPos> blocks = new HashSet<>();
-            SpiralLoop.spiral(center.x, center.z, chunkRange, (chunkX, chunkZ) -> {
-                final int minChunkX = chunkX << 4;
-                final int minChunkZ = chunkZ << 4;
-                for (int x = minChunkX; x < minChunkX + 16; x++) {
-                    for (int z = minChunkZ; z < minChunkZ + 16; z++) {
-                        for (int y = -64; y < 320; y++) {
-                            double spaghettiRoughness = Cubiomes.sampleSpaghettiRoughness(params, x, y, z);
-                            double entrances = Cubiomes.sampleEntrances(params, x, y, z, spaghettiRoughness);
-                            double slopedCheese = Cubiomes.sampleSlopedCheese(params, x, y, z);
-                            double sample = Cubiomes.sampleFinalDensity(params, x, y, z, spaghettiRoughness, entrances, slopedCheese);
-                            if (sample <= 0) {
-                                blocks.add(new BlockPos(x, y, z));
-                            }
+            SequenceLayout columnLayout = MemoryLayout.sequenceLayout(384, Cubiomes.C_INT);
+            MemorySegment blockStates = arena.allocate(columnLayout, (long) blockW * blockH);
+            Cubiomes.generateRegion(params, minChunkX, minChunkZ, chunkW, chunkH, blockStates, MemorySegment.NULL, 0);
+
+            for (int relX = 0; relX < blockW; relX++) {
+                int x = minX + relX;
+                for (int relZ = 0; relZ < blockH; relZ++) {
+                    int z = minZ + relZ;
+                    int columnIdx = (relX * blockH + relZ) * 384;
+                    for (int y = -64; y < 320; y++) {
+                        int block = blockStates.getAtIndex(Cubiomes.C_INT, columnIdx + y + 64);
+                        if (block == 1) {
+                            blocks.add(new BlockPos(x, y, z));
                         }
                     }
                 }
-                return false;
-            });
+            }
             RenderManager.drawBoxes(blocks, Configs.TerrainESP, 0xFF_FF0000);
             return blocks.size();
         }

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapScreen.java

@@ -104,6 +104,7 @@
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SequenceLayout;
 import java.lang.foreign.ValueLayout;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -157,7 +158,7 @@ public class SeedMapScreen extends Screen {
 
     static {
         // unsigned char color[3]
-        MemoryLayout rgbLayout = MemoryLayout.sequenceLayout(3, Cubiomes.C_CHAR);
+        SequenceLayout rgbLayout = MemoryLayout.sequenceLayout(3, Cubiomes.C_CHAR);
 
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment biomeColoursInternal = arena.allocate(rgbLayout, biomeColours.length);