Updated OreAirCheck and Added Highlight Auto Refresh

Author: cev-api

README.md

@@ -108,6 +108,9 @@ Example: ```/sm:config BlockHighlightESP set outlineColor #ff0000 outlineAlpha 0
 
 ![ESP](https://i.imgur.com/LaHAJnI.png)
 
+### Auto Clear Highlights
+When an existing ESP highlight is already rendered and the user makes a new highlight run (on a new block/area) the highlights are now automatically cleared/refreshed. This allows air/lava checks to apply on new results.
+
 ### Improved Waypoints
 Supports [Wurst7-CevAPI](https://github.com/cev-api/Wurst7-CevAPI) waypoints, Xaero Waypoints and its own waypoint system via right click context menu. 
 
@@ -117,7 +120,6 @@ Added the ability to set the waypoint compass overlay to be manually toggled ins
 
 I also added the ability to import waypoints from [Wurst7-CevAPI](https://github.com/cev-api/Wurst7-CevAPI). Will soon be adding Xaero waypoint as well.
 
-
 ![Map](https://i.imgur.com/1qDgQw7.png)
 
 ### Highlight Timeout Setting
@@ -134,9 +136,12 @@ If the server you're in already has a seed in the database, or it has just been
 You can enable/disable this with ```/sm:config AutoApplySeedCrackerSeed true/false```
 
 ### Mark As Complete
-Can now right click on structures and mark them as complete/incomplete which adds a green tick over the icon
+Can now right click on locations and mark them as complete/incomplete which adds a green tick over the icon.
 
 ![Complete Me](https://i.imgur.com/tITHz8W.png)
 
+### OreAirCheck Expanded
+Now also skips highlights when an ore position is lava‑filled (same logic as air check).
+
 ### Notes
 If using the original SeedMapper after using my fork you must erase my ```config.json``` first due to the mismatch of settings.

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

@@ -26,9 +26,11 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.material.Fluids;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.foreign.Arena;
@@ -91,6 +93,7 @@ private static int highlightBlock(CustomClientCommandSource source, Pair<Integer
     }
 
     private static int highlightBlock(CustomClientCommandSource source, Pair<Integer, Integer> blockPair, int chunkRange) throws CommandSyntaxException {
+        RenderManager.clear();
         SeedIdentifier seed = source.getSeed().getSecond();
         int version = source.getVersion();
         int dimension = source.getDimension();
@@ -140,7 +143,7 @@ private static int highlightBlock(CustomClientCommandSource source, Pair<Integer
                             for (int i = 0; i < size; i++) {
                                 MemorySegment pos3 = Pos3.asSlice(pos3s, i);
                                 BlockPos pos = new BlockPos(Pos3.x(pos3), Pos3.y(pos3), Pos3.z(pos3));
-                                if (doAirCheck && chunk.getBlockState(pos).isAir()) {
+                                if (doAirCheck && isAirOrLava(chunk, pos)) {
                                     continue;
                                 }
                                 Integer previouslyGeneratedOre = generatedOres.get(pos);
@@ -189,6 +192,7 @@ private static int highlightOreVein(CustomClientCommandSource source) throws Com
     }
 
     private static int highlightOreVein(CustomClientCommandSource source, int chunkRange) throws CommandSyntaxException {
+        RenderManager.clear();
         int version = source.getVersion();
         SeedIdentifier seed = source.getSeed().getSecond();
         try (Arena arena = Arena.ofConfined()) {
@@ -213,7 +217,7 @@ private static int highlightOreVein(CustomClientCommandSource source, int chunkR
                                 continue;
                             }
                             BlockPos pos = new BlockPos(minX + x, y, minZ + z);
-                            if (doAirCheck && chunk.getBlockState(pos).isAir()) {
+                            if (doAirCheck && isAirOrLava(chunk, pos)) {
                                 continue;
                             }
                             blocks.put(pos, block);
@@ -248,6 +252,7 @@ private static int highlightTerrain(CustomClientCommandSource source) throws Com
     }
 
     private static int highlightTerrain(CustomClientCommandSource source, int chunkRange) throws CommandSyntaxException {
+        RenderManager.clear();
         SeedIdentifier seed = source.getSeed().getSecond();
         int dimension = source.getDimension();
         if (dimension != Cubiomes.DIM_OVERWORLD()) {
@@ -304,6 +309,7 @@ private static int highlightCanyon(CustomClientCommandSource source, int canyonC
     }
 
     private static int highlightCanyon(CustomClientCommandSource source, int canyonCarver, int chunkRange) throws CommandSyntaxException {
+        RenderManager.clear();
         SeedIdentifier seed = source.getSeed().getSecond();
         int dimension = source.getDimension();
         int version = source.getVersion();
@@ -332,6 +338,7 @@ private static int highlightCave(CustomClientCommandSource source, int caveCarve
     }
 
     private static int highlightCave(CustomClientCommandSource source, int caveCarver, int chunkRange) throws CommandSyntaxException {
+        RenderManager.clear();
         SeedIdentifier seed = source.getSeed().getSecond();
         int dimension = source.getDimension();
         int version = source.getVersion();
@@ -376,4 +383,9 @@ private static int highlightCarver(CustomClientCommandSource source, int chunkRa
         source.getClient().schedule(() -> source.sendFeedback(Component.translatable("command.highlight.carver.success", accent(String.valueOf(blocks.size())))));
         return blocks.size();
     }
+
+    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);
+    }
 }

src/main/resources/assets/seedmapper/lang/en_us.json

@@ -95,7 +95,7 @@
   "command.sample.sampleAll.success": "Sampled %s at %s: %s.",
   "command.sample.sampleDensity.success": "Sampled density at %s: %s.",
 
-  "config.oreAirCheck.comment": "Whether or not SeedMapper should use in-game air checks to invalidate ore positions.",
+  "config.oreAirCheck.comment": "Whether or not SeedMapper should use in-game air or lava checks to invalidate ore positions.",
   "config.devMode.comment": "Enables certain debug commands.",
   "config.manualWaypointCompassOverlay.comment": "Set the waypoint compass overlay to be manually toggled instead of automatic.",
   "config.worldBorder.comment": "Limits the seed map to a square world border radius in blocks for all dimensions unless overridden. Use 0 to disable.",