Merge remote-tracking branch 'upstream/master'

cev-api · cev-api · commit 776e698e0924 · 2026-05-05T22:51:04.000+10:00
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", "@src/main/c/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");
+        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", "@src/main/c/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", "features/stronghold.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/changelog.md b/changelog.md
@@ -1,5 +1,6 @@
 ## Changelog
-- Added 26.1.2 version argument.
+- Re-enabled Baritone integration.
+- Fixed carver highlighting on 1.17.1 and below.
 
 ## Mod compatibility
 |      | Mod JAR | Biomes | Structures | Loot | Ores | Slime chunks |
diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=2.22.2-CevAPI
-fork_release_version=v0.18
+mod_version=2.22.3-CevAPI
+fork_release_version=v0.19
 maven_group=dev.xpple
 archives_base_name=SeedMapper
 
@@ -27,7 +27,7 @@ simplewaypoints_version=1.3.0
 mod_publish_plugin_version=1.1.0
 
 # Optional library dependencies
-baritone_version=1.21.11-SNAPSHOT
+baritone_version=26.1-SNAPSHOT
 
 devauth_version=1.2.2
 
diff --git a/src/main/c/cubiomes b/src/main/c/cubiomes
@@ -1 +1 @@
-Subproject commit e472ad97b999a1b5838bfe28d319465e5a1db8c6
+Subproject commit d826db77c478f8be2db5946893aa709dbdb455cc
diff --git a/src/main/java/dev/xpple/seedmapper/SeedMapper.java b/src/main/java/dev/xpple/seedmapper/SeedMapper.java
@@ -60,8 +60,7 @@ public class SeedMapper implements ClientModInitializer {
 
     private static final Logger LOGGER = LogUtils.getLogger();
 
-    // FIXME
-    public static final boolean BARITONE_AVAILABLE = false; // FabricLoader.getInstance().getModContainer("baritone-meteor").isPresent();
+    public static final boolean BARITONE_AVAILABLE = FabricLoader.getInstance().getModContainer("baritone-meteor").isPresent();
 
     static {
         String libraryName = System.mapLibraryName("cubiomes");
diff --git a/src/main/java/dev/xpple/seedmapper/command/arguments/StructurePredicateArgument.java b/src/main/java/dev/xpple/seedmapper/command/arguments/StructurePredicateArgument.java
@@ -103,6 +103,20 @@ public class StructurePredicateArgument implements ArgumentType<StructurePredica
             .put("corridor_nether_wart", Cubiomes.CORRIDOR_NETHER_WART())
             .put("fortress_end", Cubiomes.FORTRESS_END())
             .build())
+        .put(Cubiomes.Stronghold(), ImmutableMap.<String, Integer>builder()
+            .put("straight", Cubiomes.SH_STRAIGHT())
+            .put("prison_hall", Cubiomes.SH_PRISON_HALL())
+            .put("left_turn", Cubiomes.SH_LEFT_TURN())
+            .put("right_turn", Cubiomes.SH_RIGHT_TURN())
+            .put("room_crossing", Cubiomes.SH_ROOM_CROSSING())
+            .put("straight_stairs_down", Cubiomes.SH_STRAIGHT_STAIRS_DOWN())
+            .put("stairs_down", Cubiomes.SH_STAIRS_DOWN())
+            .put("five_crossing", Cubiomes.SH_FIVE_CROSSING())
+            .put("chest_corridor", Cubiomes.SH_CHEST_CORRIDOR())
+            .put("library", Cubiomes.SH_LIBRARY())
+            .put("portal_room", Cubiomes.SH_PORTAL_ROOM())
+            .put("filler_corridor", Cubiomes.SH_FILLER_CORRIDOR())
+            .build())
         .build();
     //</editor-fold>
 
diff --git a/src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java b/src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java
@@ -8,6 +8,7 @@
 import com.github.cubiomes.OreVeinParameters;
 import com.github.cubiomes.Pos3;
 import com.github.cubiomes.Pos3List;
+import com.github.cubiomes.Range;
 import com.github.cubiomes.SurfaceNoise;
 import com.github.cubiomes.TerrainNoise;
 import com.mojang.brigadier.CommandDispatcher;
@@ -46,7 +47,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -86,7 +86,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                 .requires(_ -> Configs.DevMode)
                 .then(argument("cave", caveCarver())
                     .executes(ctx -> highlightCave(CustomClientCommandSource.of(ctx.getSource()), getCaveCarver(ctx, "cave")))
-                    .then(argument("chunks", integer(0, 20))
+                    .then(argument("chunks", integer(0, 10))
                         .executes(ctx -> submit(() -> highlightCave(CustomClientCommandSource.of(ctx.getSource()), getCaveCarver(ctx, "cave"), getInteger(ctx, "chunks"))))))));
     }
 
@@ -330,13 +330,8 @@ private static int highlightCanyon(CustomClientCommandSource source, int canyonC
             if (CanyonCarverConfig.dim(ccc) != dimension) {
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
-            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed.seed(), dimension, version, source.getGeneratorFlags());
-            return highlightCarver(source, chunkRange, Configs.CanyonESP, (chunkX, chunkZ) -> {
-                int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
-                if (Cubiomes.isViableCanyonBiome(canyonCarver, biome) == 0) {
-                    return null;
-                }
-                return Cubiomes.carveCanyon(arena, seed.seed(), chunkX, chunkZ, ccc);
+            return highlightCarver(source, chunkRange, Configs.CanyonESP, arena, (chunkX, chunkZ, biomes, poses) -> {
+                Cubiomes.carveCanyon(seed.seed(), version, chunkX, chunkZ, ccc, canyonCarver, biomes, poses);
             });
         }
     }
@@ -359,34 +354,63 @@ private static int highlightCave(CustomClientCommandSource source, int caveCarve
             if (CaveCarverConfig.dim(ccc) != dimension) {
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
-            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed.seed(), dimension, version, source.getGeneratorFlags());
-            return highlightCarver(source, chunkRange, Configs.CaveESP, (chunkX, chunkZ) -> {
-                int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
-                if (Cubiomes.isViableCaveBiome(caveCarver, biome) == 0) {
-                    return null;
-                }
-                return Cubiomes.carveCave(arena, seed.seed(), chunkX, chunkZ, ccc);
+            return highlightCarver(source, chunkRange, Configs.CaveESP, arena, (chunkX, chunkZ, biomes, poses) -> {
+                Cubiomes.carveCave(seed.seed(), version, chunkX, chunkZ, ccc, caveCarver, biomes, poses);
             });
         }
     }
 
-    private static int highlightCarver(CustomClientCommandSource source, int chunkRange, EspStyle style, BiFunction<Integer, Integer, @Nullable MemorySegment> carverFunction) {
+    private static int highlightCarver(CustomClientCommandSource source, int chunkRange, EspStyle style, Arena arena, CarverFunction carverFunction) throws CommandSyntaxException {
+        SeedIdentifier seed = source.getSeed().getSecond();
+        int dimension = source.getDimension();
+        int version = source.getVersion();
+        int generatorFlags = source.getGeneratorFlags();
+
+        @Nullable MemorySegment generator, range;
+        MemorySegment biomes;
+        if (version <= Cubiomes.MC_1_17_1()) {
+            generator = Generator.allocate(arena);
+            Cubiomes.setupGenerator(generator, version, generatorFlags);
+            Cubiomes.applySeed(generator, dimension, seed.seed());
+
+            range = Range.allocate(arena);
+            Range.scale(range, 16);
+            Range.sx(range, 17);
+            Range.sz(range, 17);
+            Range.y(range, 0);
+            Range.sy(range, 0);
+
+            long cacheSize = Cubiomes.getMinCacheSize(generator, Range.scale(range), Range.sx(range), Range.sy(range), Range.sz(range));
+            biomes = arena.allocate(Cubiomes.C_INT, cacheSize);
+        } else {
+            generator = null;
+            range = null;
+            biomes = arena.allocate(MemoryLayout.sequenceLayout(17, MemoryLayout.sequenceLayout(17, Cubiomes.C_INT)));
+        }
+
+        MemorySegment pos3List = Pos3List.allocate(arena);
+        Cubiomes.createPos3List(pos3List, 1024);
+
         ChunkPos center = ChunkPos.containing(BlockPos.containing(source.getPosition()));
-        Set<BlockPos> blocks = new HashSet<>();
         SpiralLoop.spiral(center.x(), center.z(), chunkRange, (chunkX, chunkZ) -> {
-            MemorySegment pos3List = carverFunction.apply(chunkX, chunkZ);
-            if (pos3List == null) {
-                return false;
-            }
-            int size = Pos3List.size(pos3List);
-            MemorySegment pos3s = Pos3List.pos3s(pos3List);
-            for (int i = 0; i < size; i++) {
-                MemorySegment pos3 = Pos3.asSlice(pos3s, i);
-                blocks.add(new BlockPos(Pos3.x(pos3), Pos3.y(pos3), Pos3.z(pos3)));
+            if (version <= Cubiomes.MC_1_17_1()) {
+                assert range != null;
+                Range.x(range, chunkX - 8);
+                Range.z(range, chunkZ - 8);
+                Cubiomes.genBiomes(generator, biomes, range);
             }
-
+            carverFunction.carve(chunkX, chunkZ, biomes, pos3List);
             return false;
         });
+
+        Set<BlockPos> blocks = new HashSet<>();
+        int size = Pos3List.size(pos3List);
+        MemorySegment pos3s = Pos3List.pos3s(pos3List);
+        for (int i = 0; i < size; i++) {
+            MemorySegment pos3 = Pos3.asSlice(pos3s, i);
+            blocks.add(new BlockPos(Pos3.x(pos3), Pos3.y(pos3), Pos3.z(pos3)));
+        }
+        Cubiomes.freePos3List(pos3List);
         RenderManager.drawBoxes(blocks, style, 0xFF_FF0000);
         source.getClient().schedule(() -> source.sendFeedback(Component.translatable("command.highlight.carver.success", accent(String.valueOf(blocks.size())))));
         return blocks.size();
@@ -396,4 +420,9 @@ private static boolean isAirOrLava(LevelChunk chunk, BlockPos pos) {
         var state = chunk.getBlockState(pos);
         return state.isAir() || state.is(Blocks.LAVA) || state.getFluidState().is(Fluids.LAVA);
     }
+
+    @FunctionalInterface
+    private interface CarverFunction {
+        void carve(int chunkX, int chunkZ, MemorySegment biomes, MemorySegment poses);
+    }
 }
diff --git a/src/main/java/dev/xpple/seedmapper/command/commands/LocateCommand.java b/src/main/java/dev/xpple/seedmapper/command/commands/LocateCommand.java
@@ -71,7 +71,7 @@ public class LocateCommand {
     private static final int BIOME_SEARCH_HORIZONTAL_STEP = 32;
     private static final int BIOME_SEARCH_VERTICAL_STEP = 64;
 
-    public static final Set<Integer> LOOT_SUPPORTED_STRUCTURES = Set.of(Cubiomes.Treasure(), Cubiomes.Desert_Pyramid(), Cubiomes.End_City(), Cubiomes.Igloo(), Cubiomes.Jungle_Pyramid(), Cubiomes.Ruined_Portal(), Cubiomes.Ruined_Portal_N(), Cubiomes.Fortress(), Cubiomes.Bastion(), Cubiomes.Outpost(), Cubiomes.Shipwreck());
+    public static final Set<Integer> LOOT_SUPPORTED_STRUCTURES = Set.of(Cubiomes.Treasure(), Cubiomes.Desert_Pyramid(), Cubiomes.End_City(), Cubiomes.Igloo(), Cubiomes.Jungle_Pyramid(), Cubiomes.Ruined_Portal(), Cubiomes.Ruined_Portal_N(), Cubiomes.Fortress(), Cubiomes.Bastion(), Cubiomes.Outpost(), Cubiomes.Shipwreck(), Cubiomes.Stronghold());
 
     public record LootStructureResult(String structureName, int count, List<BlockPos> positions) {}
     public record LootLocateResult(int totalFound, String itemName, BlockPos pos, BlockPos searchOrigin, List<LootStructureResult> structureResults) {}
@@ -550,7 +550,16 @@ private static int locateCanyon(CustomClientCommandSource source) throws Command
         }
         ChunkPos center = ChunkPos.containing(BlockPos.containing(source.getPosition()));
         try (Arena arena = Arena.ofConfined()) {
-            ToIntBiFunction<Integer, Integer> biomeFunction = getCarverBiomeFunction(arena, seed.seed(), dimension, version, source.getGeneratorFlags());
+            ToIntBiFunction<Integer, Integer> biomeFunction;
+            int generatorFlags = source.getGeneratorFlags();
+            if (version > Cubiomes.MC_1_17_1()) {
+                biomeFunction = (_, _) -> -1;
+            } else {
+                MemorySegment generator = Generator.allocate(arena);
+                Cubiomes.setupGenerator(generator, version, generatorFlags);
+                Cubiomes.applySeed(generator, dimension, seed.seed());
+                biomeFunction = (chunkX, chunkZ) -> Cubiomes.getBiomeAt(generator, 4, chunkX << 2, 0, chunkZ << 2);
+            }
             MemorySegment ccc = CanyonCarverConfig.allocate(arena);
             MemorySegment rnd = arena.allocate(Cubiomes.C_LONG_LONG);
             SpiralLoop.Coordinate pos = SpiralLoop.spiral(center.x(), center.z(), 6400, (chunkX, chunkZ) -> {
@@ -576,14 +585,4 @@ private static int locateCanyon(CustomClientCommandSource source) throws Command
             return Command.SINGLE_SUCCESS;
         }
     }
-
-    static ToIntBiFunction<Integer, Integer> getCarverBiomeFunction(Arena arena, long seed, int dimension, int version, int generatorFlags) {
-        if (version > Cubiomes.MC_1_17_1()) {
-            return (_, _) -> -1;
-        }
-        MemorySegment generator = Generator.allocate(arena);
-        Cubiomes.setupGenerator(generator, version, generatorFlags);
-        Cubiomes.applySeed(generator, dimension, seed);
-        return (chunkX, chunkZ) -> Cubiomes.getBiomeAt(generator, 4, chunkX << 2, 0, chunkZ << 2);
-    }
 }
diff --git a/src/main/java/dev/xpple/seedmapper/feature/StructureChecks.java b/src/main/java/dev/xpple/seedmapper/feature/StructureChecks.java
@@ -46,6 +46,11 @@ private StructureChecks() {
                     int numPieces = Cubiomes.getFortressPieces(pieces, MAX_END_CITY_AND_FORTRESS_PIECES, Generator.mc(generator), Generator.seed(generator), Pos.x(structurePos) >> 4, Pos.z(structurePos) >> 4);
                     return piecesPredicate.test(numPieces, pieces);
                 });
+            } else if (structure == Cubiomes.Stronghold()) {
+                tempPiecesPredicateChecks.put(structure, (piecesPredicate, pieces, generator, structurePos) -> {
+                    int numPieces = Cubiomes.getStrongholdPieces(pieces, MAX_END_CITY_AND_FORTRESS_PIECES, Generator.mc(generator), Generator.seed(generator), Pos.x(structurePos) >> 4, Pos.z(structurePos) >> 4);
+                    return piecesPredicate.test(numPieces, pieces);
+                });
             } else {
                 throw new AssertionError();
             }
diff --git a/src/main/java/dev/xpple/seedmapper/util/BaritoneIntegration.java b/src/main/java/dev/xpple/seedmapper/util/BaritoneIntegration.java
@@ -13,20 +13,10 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
-// FIXME: update as soon as MeteorDevelopment/baritone is updated to 26.1
-
 /*
  * This class should NOT be loaded if Baritone is not available.
  */
 public class BaritoneIntegration {
-
-    // FIXME
-    static {
-        if (true) {
-            throw new AssertionError();
-        }
-    }
-
     /*
      * There probably exists a more efficient data structure, but I couldn't find one that really appealed to me.
      * Basically, you want a data structure that implements fast nearest-neighbour searches with popping (i.e. find the
@@ -59,8 +49,7 @@ public static void onGoalCompletion(Goal goal) {
         // check goal equality by reference, this makes sure it was the goal from SeedMapper that was completed
         synchronized (CURRENT_GOAL_LOCK) {
             if (goal == currentGoal) {
-                // FIXME
-                // minedBlocks.add(currentGoal.getGoalPos());
+                minedBlocks.add(currentGoal.getGoalPos());
                 setGoalForNextBlock();
             }
         }
@@ -78,8 +67,7 @@ private static void setGoalForNextBlock() {
         Vec3 playerPos = player.position();
         BlockPos closest = targetBlocks.stream().min(Comparator.comparingDouble(b -> b.distToLowCornerSqr(playerPos.x, playerPos.y, playerPos.z))).orElseThrow();
         targetBlocks.remove(closest);
-        // FIXME
-        // currentGoal = new GoalBlock(closest);
+        currentGoal = new GoalBlock(closest);
         // delay configuring the goal until the next tick, otherwise the new goal won't be executed
         Minecraft.getInstance().schedule(() -> BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(currentGoal));
     }
diff --git a/src/main/resources/cubiomes.dll b/src/main/resources/cubiomes.dll

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", "@src/main/c/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");
	`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", "@src/main/c/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", "features/stronghold.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`	`}`