Updated ChestESP

Author: cev-api

src/main/java/net/wurstclient/hacks/ChestEspHack.java

@@ -44,12 +44,13 @@
 import net.minecraft.world.level.block.entity.HopperBlockEntity;
 import net.minecraft.world.level.block.entity.DispenserBlockEntity;
 import net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity;
-import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.LevelChunkSection;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import net.wurstclient.Category;
 import net.wurstclient.events.CameraTransformViewBobbingListener;
 import net.wurstclient.events.PacketInputListener;
@@ -145,10 +146,10 @@ public class ChestEspHack extends Hack implements UpdateListener,
 		"Only show buried containers (non-air above for chests/barrels; blocked opening side for shulkers).",
 		false);
 
-	private final CheckboxSetting filterNearSpawners = new CheckboxSetting(
-		"Filter spawners",
-		"Hides single chests that are near a mob spawner. Does not affect double chests or shulkers.",
-		false);
+	private final CheckboxSetting filterNearSpawners = new CheckboxSetting(
+		"Filter spawners",
+		"Hides single chests that are near a mob spawner in the Overworld. Does not affect double chests or shulkers.",
+		false);
 
 	private final CheckboxSetting filterTrialChambers = new CheckboxSetting(
 		"Filter trial chambers",
@@ -301,8 +302,8 @@ public void onUpdate()
 		// Build environmental caches first so we can pre-filter before adding
 		invalidateEnvFilterCacheIfNeeded();
 		refreshEnvironmentalCaches();
-		preFilteredEnv = MC.level != null && (filterNearSpawners.isChecked()
-			|| filterTrialChambers.isChecked() || filterVillages.isChecked());
+		preFilteredEnv = MC.level != null && (isSpawnerFilterActive()
+			|| filterTrialChambers.isChecked() || filterVillages.isChecked());
 
 		double yLimit = aboveGroundY.getValue();
 		boolean enforceAboveGround = onlyAboveGround.isChecked();
@@ -546,10 +547,10 @@ private void renderBoxes(PoseStack matrixStack)
 		String curDim = MC.level == null ? "overworld"
 			: MC.level.dimension().identifier().getPath();
 
-		boolean applyEnvFilters = MC.level != null && !preFilteredEnv
-			&& (filterNearSpawners.isChecked()
-				|| filterTrialChambers.isChecked()
-				|| filterVillages.isChecked());
+		boolean applyEnvFilters = MC.level != null && !preFilteredEnv
+			&& (isSpawnerFilterActive()
+				|| filterTrialChambers.isChecked()
+				|| filterVillages.isChecked());
 
 		for(ChestEspGroup group : groups.allGroups)
 		{
@@ -904,10 +905,10 @@ private void renderTracers(PoseStack matrixStack, float partialTicks)
 				: MC.level.dimension().identifier().getPath();
 		}
 
-		boolean applyEnvFilters = MC.level != null && !preFilteredEnv
-			&& (filterNearSpawners.isChecked()
-				|| filterTrialChambers.isChecked()
-				|| filterVillages.isChecked());
+		boolean applyEnvFilters = MC.level != null && !preFilteredEnv
+			&& (isSpawnerFilterActive()
+				|| filterTrialChambers.isChecked()
+				|| filterVillages.isChecked());
 
 		for(ChestEspGroup group : groups.allGroups)
 		{
@@ -1376,10 +1377,10 @@ private void refreshEnvironmentalCaches()
 		lastEnvironmentRefreshAnchor = currentAnchor.immutable();
 		lastEnvironmentRefreshDimension = currentDimension;
 
-		if(filterNearSpawners.isChecked())
-			cachedSpawners = collectSpawnerPositions();
-		else
-			cachedSpawners = List.of();
+		if(isSpawnerFilterActive())
+			cachedSpawners = collectSpawnerPositions();
+		else
+			cachedSpawners = List.of();
 
 		if(filterTrialChambers.isChecked())
 			cachedTrialSpawners = collectTrialSpawnerPositions();
@@ -1500,9 +1501,9 @@ && isInTrialChamberArea(barrelPos))
 				continue;
 			}
 
-			if(filterNearSpawners.isChecked()
-				&& isNearSpawner(singleChestPos, 7))
-				continue;
+			if(isSpawnerFilterActive()
+				&& isNearSpawner(singleChestPos, 7))
+				continue;
 
 			if(filterTrialChambers.isChecked()
 				&& isInTrialChamberArea(singleChestPos))
@@ -1543,24 +1544,26 @@ private boolean computeShouldFilterBlockEntityByEnvironment(BlockEntity be)
 		BlockPos pos = be.getBlockPos();
 		BlockState state = be.getBlockState();
 
-		// Chest-specific single/double handling
-		if(be instanceof ChestBlockEntity)
-		{
-			boolean isSingle = true;
-			if(state != null && state.hasProperty(ChestBlock.TYPE))
-				isSingle = state.getValue(ChestBlock.TYPE) == ChestType.SINGLE;
-			
-			if(isSingle)
-			{
-				if(filterNearSpawners.isChecked() && isNearSpawner(pos, 7))
-					return true;
-				if(filterTrialChambers.isChecked() && isInTrialChamberArea(pos))
-					return true;
-				if(filterVillages.isChecked() && isLikelyVillageChest(pos))
-					return true;
-			}
-			return false;
-		}
+		// Chest-specific single/double handling
+		if(be instanceof ChestBlockEntity)
+		{
+			// Be strict: environment filters apply only to confirmed single
+			// chests. If chest type can't be read, don't filter it.
+			if(state == null || !state.hasProperty(ChestBlock.TYPE))
+				return false;
+			
+			if(state.getValue(ChestBlock.TYPE) != ChestType.SINGLE)
+				return false;
+			
+			if(isSpawnerFilterActive() && isNearSpawner(pos, 7))
+				return true;
+			if(filterTrialChambers.isChecked() && isInTrialChamberArea(pos))
+				return true;
+			if(filterVillages.isChecked() && isLikelyVillageChest(pos))
+				return true;
+			
+			return false;
+		}
 
 		// Barrels in Trial Chambers
 		if(be instanceof BarrelBlockEntity)
@@ -1619,22 +1622,22 @@ private BlockPos getSingleChestPosIfApplicable(AABB box)
 					if(b instanceof ShulkerBoxBlock)
 						return null;
 
-					if(b instanceof ChestBlock)
-					{
-						chestCount++;
-						if(foundChest == null)
-							foundChest = pos;
-						
-						if(state.hasProperty(ChestBlock.TYPE))
-						{
-							ChestType t = state.getValue(ChestBlock.TYPE);
-							if(t != ChestType.SINGLE)
-								return null;
-						}
-						
-						if(chestCount > 1)
-							return null;
-					}
+					if(b instanceof ChestBlock)
+					{
+						chestCount++;
+						if(foundChest == null)
+							foundChest = pos;
+						
+						if(!state.hasProperty(ChestBlock.TYPE))
+							return null;
+						
+						ChestType t = state.getValue(ChestBlock.TYPE);
+						if(t != ChestType.SINGLE)
+							return null;
+						
+						if(chestCount > 1)
+							return null;
+					}
 				}
 			}
 		}
@@ -1696,10 +1699,13 @@ private boolean shouldSkipSingleChest(BlockEntity be)
 		return state.getValue(ChestBlock.TYPE) == ChestType.SINGLE;
 	}
 
-	private boolean isNearSpawner(BlockPos center, int range)
-	{
-		if(isNearCachedSpawner(center, range))
-			return true;
+	private boolean isNearSpawner(BlockPos center, int range)
+	{
+		if(!isSpawnerFilterActive())
+			return false;
+		
+		if(isNearCachedSpawner(center, range))
+			return true;
 
 		// If we already have a stable non-empty spawner cache and no nearby
 		// hit,
@@ -1709,8 +1715,18 @@ private boolean isNearSpawner(BlockPos center, int range)
 
 		// Fallback to block-state scan so newly streamed areas don't briefly
 		// render near-spawner chests before block-entity caches catch up.
-		return isNearSpawnerBlock(center, range);
-	}
+		return isNearSpawnerBlock(center, range);
+	}
+	
+	private boolean isSpawnerFilterActive()
+	{
+		return filterNearSpawners.isChecked() && isInOverworld();
+	}
+	
+	private boolean isInOverworld()
+	{
+		return MC.level != null && MC.level.dimension().equals(Level.OVERWORLD);
+	}
 
 	private boolean isNearCachedSpawner(BlockPos center, int range)
 	{