fix: #309 #313

Author: MichaelHillcox

CHANGELOG.md

@@ -1,3 +1,14 @@
+## [21.8.1]
+
+### Fixed
+
+- Small issue with state checking. If a block now changes state in-world, whilst the block is enabled, and it no longer matches, it will be removed from the outline render.
+  - This is specifically tailored to blocks like `Suspicious Sand` and `Suspicious Gravel` which change state when brushed.
+
+### Changed
+
+- Lowered NeoForge minimum version to `1.21.7` to allow for `1.21.7` & `1.21.8` support
+
 ## [21.8.0]
 
 ### Changed

common/src/main/java/pro/mikey/xray/core/ScanController.java

@@ -200,7 +200,6 @@ public static void onBlockChange(Level level, BlockPos pos, BlockState state) {
             return;
         }
 
-
         // We're now air baby!
         if (state.isAir()) {
             // Remove the block from the render list
@@ -222,6 +221,8 @@ public static void onBlockChange(Level level, BlockPos pos, BlockState state) {
         }
 
         // Otherwise, do we have scantarget in the active list of things to find?
+        var noMatchesFound = true;
+
         Set<ActiveScanTarget> activeScanTargets = ScanController.INSTANCE.scanStore.activeScanTargets();
         for (var scanType : activeScanTargets) {
             if (scanType.type().matches(level, pos, state, state.getFluidState())) {
@@ -231,9 +232,26 @@ public static void onBlockChange(Level level, BlockPos pos, BlockState state) {
 
                 // Tell the VBO to refresh for this chunk
                 OutlineRender.refreshVBOForChunk(chunkPos);
-
+                noMatchesFound = false; // We found a match, so we can stop checking
                 break; // We found a match, so we can stop checking
             }
         }
+
+        // If no matches are found AND the block pos is currently in the render list, we need to remove it and ask the chunk to refresh
+        var blockFromRenderList = outlineRenderTargets.stream()
+                .filter(target -> target.x() == pos.getX() && target.y() == pos.getY() && target.z() == pos.getZ())
+                .findFirst();
+
+        if (blockFromRenderList.isEmpty()) {
+            return;
+        }
+
+        if (noMatchesFound) {
+            // We didn't find any matches, so we need to remove the block from the render list
+            outlineRenderTargets.remove(blockFromRenderList.get());
+
+            // Tell the VBO to refresh for this chunk
+            OutlineRender.refreshVBOForChunk(chunkPos);
+        }
     }
 }

gradle.properties

@@ -11,13 +11,13 @@ parchment_minecraft_version=1.21.6
 parchment_mappings_version=2025.06.29
 
 mod_id=xray
-mod_version=21.8.0
+mod_version=21.8.1
 minecraft_version=1.21.8
-minecraft_version_range=[%base],1.21.9
+minecraft_version_range=1.21.7,1.21.9
 
 # Forge
 forge_version=21.8.13
-forge_version_range=21.8
+forge_version_range=21.7.0
 
 # Fabric
 loader_version=0.16.14