Updated ChestESP and BedESP

Author: cev-api

README.md

@@ -121,6 +121,7 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 ### BedESP
 - Finds all bed types.  
 - Chunk-based scanning with configurable color and Box/Line style.  
+- Adjustable tracer line thickness
 - Rendering: Boxes, Lines, or Both in a fixed color.
 - Filter for hiding Trial Chamber and or Villager beds.
 
@@ -459,7 +460,8 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 - Added ESP Y limit
 - Added HackList count
 - Added Buried chest highlighting including a filter to only find buried chests
-- Added filters for chests to not highlight them if near spawners, trial chambers and villages (Excluding double chests and shulkers)
+- Added filters for chests and barrels to not highlight them if near spawners, trial chambers and villages (Excluding double chests and shulkers)
+- Option to suppress single chests in favor of double
 
 ### ItemESP (Expanded)
 Highlights dropped, equipped, and framed items with powerful filters and customization.

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

@@ -78,6 +78,10 @@ public final class BedEspHack extends Hack implements UpdateListener,
 		"The area around the player to search in.\n"
 			+ "Higher values require a faster computer.");
 
+	private final SliderSetting tracerThickness =
+		new SliderSetting("Tracer thickness", 2, 0.5, 8, 0.1,
+			SliderSetting.ValueDisplay.DECIMAL.withSuffix("px"));
+	
 	// Above-ground filter
 	private final net.wurstclient.settings.CheckboxSetting onlyAboveGround =
 		new net.wurstclient.settings.CheckboxSetting("Above ground only",
@@ -120,6 +124,7 @@ public BedEspHack()
 		addSetting(showCountInHackList);
 		addSetting(area);
 		addSetting(stickyArea);
+		addSetting(tracerThickness);
 		addSetting(onlyAboveGround);
 		addSetting(aboveGroundY);
 		addSetting(filterTrialChambers);
@@ -232,11 +237,14 @@ private void renderTracers(PoseStack matrixStack, float partialTicks)
 				continue;
 
 			List<AABB> boxes = group.getBoxes();
-			List<Vec3> ends = boxes.stream().map(AABB::getCenter).toList();
 			int color = group.getColorI(0x80);
+			List<RenderUtils.ColoredPoint> ends = boxes.stream()
+				.map(
+					box -> new RenderUtils.ColoredPoint(box.getCenter(), color))
+				.toList();
 
-			RenderUtils.drawTracers(matrixStack, partialTicks, ends, color,
-				false);
+			RenderUtils.drawTracers(matrixStack, partialTicks, ends, false,
+				tracerThickness.getValue());
 		}
 	}
 

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

@@ -29,6 +29,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.ChestType;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.ChestBlockEntity;
 import net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
@@ -100,9 +101,14 @@ public class ChestEspHack extends Hack implements UpdateListener,
 
 	private final CheckboxSetting filterTrialChambers = new CheckboxSetting(
 		"Filter trial chambers",
-		"Hides single chests that match common trial chamber layouts. Does not affect double chests or shulkers.",
+		"Hides single chests and barrels that match common trial chamber layouts. Does not affect double chests or shulkers.",
 		false);
 
+	private final CheckboxSetting doubleChestsOnly =
+		new CheckboxSetting("Double chests only",
+			"Only highlight/tracer double chests when searching for chests.",
+			false);
+	
 	private final CheckboxSetting filterVillages = new CheckboxSetting(
 		"Filter villages",
 		"Hides single chests that appear to belong to villages. Does not affect double chests or shulkers.",
@@ -129,6 +135,7 @@ public ChestEspHack()
 		addSetting(onlyBuried);
 		addSetting(filterNearSpawners);
 		addSetting(filterTrialChambers);
+		addSetting(doubleChestsOnly);
 		addSetting(filterVillages);
 		addSetting(showCountInHackList);
 		groups.allGroups.stream().flatMap(ChestEspGroup::getSettings)
@@ -169,6 +176,9 @@ public void onUpdate()
 			if(enforceAboveGround && be.getBlockPos().getY() < yLimit)
 				return;
 
+			if(shouldSkipSingleChest(be))
+				return;
+			
 			groups.blockGroups.forEach(group -> group.addIfMatches(be));
 		});
 
@@ -771,6 +781,17 @@ private List<AABB> filterBoxesByEnvironment(List<AABB> boxes)
 			BlockPos singleChestPos = getSingleChestPosIfApplicable(box);
 			if(singleChestPos == null)
 			{
+				BlockPos barrelPos = getSingleBarrelPosIfApplicable(box);
+				if(barrelPos == null)
+				{
+					out.add(box);
+					continue;
+				}
+				
+				if(filterTrialChambers.isChecked()
+					&& isTrialChamberChest(barrelPos))
+					continue;
+				
 				out.add(box);
 				continue;
 			}
@@ -846,6 +867,60 @@ private BlockPos getSingleChestPosIfApplicable(AABB box)
 		return foundChest;
 	}
 
+	private BlockPos getSingleBarrelPosIfApplicable(AABB box)
+	{
+		if(MC.level == null || box == null)
+			return null;
+		
+		int boxMinX = (int)Math.floor(box.minX + 1e-6);
+		int boxMaxX = (int)Math.floor(box.maxX - 1e-6);
+		int boxMinY = (int)Math.floor(box.minY + 1e-6);
+		int boxMaxY = (int)Math.floor(box.maxY - 1e-6);
+		int boxMinZ = (int)Math.floor(box.minZ + 1e-6);
+		int boxMaxZ = (int)Math.floor(box.maxZ - 1e-6);
+		
+		BlockPos foundBarrel = null;
+		int barrelCount = 0;
+		
+		for(int x = boxMinX; x <= boxMaxX; x++)
+		{
+			for(int y = boxMinY; y <= boxMaxY; y++)
+			{
+				for(int z = boxMinZ; z <= boxMaxZ; z++)
+				{
+					BlockPos pos = new BlockPos(x, y, z);
+					BlockState state = MC.level.getBlockState(pos);
+					if(state == null)
+						continue;
+					
+					if(state.getBlock() instanceof BarrelBlock)
+					{
+						barrelCount++;
+						if(foundBarrel == null)
+							foundBarrel = pos;
+						
+						if(barrelCount > 1)
+							return null;
+					}
+				}
+			}
+		}
+		
+		return foundBarrel;
+	}
+	
+	private boolean shouldSkipSingleChest(BlockEntity be)
+	{
+		if(!doubleChestsOnly.isChecked() || !(be instanceof ChestBlockEntity))
+			return false;
+		
+		BlockState state = be.getBlockState();
+		if(!state.hasProperty(ChestBlock.TYPE))
+			return false;
+		
+		return state.getValue(ChestBlock.TYPE) == ChestType.SINGLE;
+	}
+	
 	private boolean isNearSpawner(BlockPos center, int range)
 	{
 		return BlockUtils.getAllInBoxStream(center, range)

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

@@ -1000,9 +1000,9 @@ private void applyWorldBorderLimit()
 			ChatUtils.error("World border limit must be a whole number.");
 			return;
 		}
-		runSimpleCommand("sm:config WorldBorder set " + limit,
-			"set WorldBorder to " + limit);
-	}
+		runSimpleCommand("sm:config WorldBorder set " + limit,
+			"set WorldBorder to " + limit);
+	}
 
 	private void applyManualWaypointCompassOverlay()
 	{