Refactor ChestESP groups

Author: Alexander01998

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

@@ -7,134 +7,34 @@
  */
 package net.wurstclient.hacks;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import net.minecraft.block.entity.*;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.vehicle.ChestBoatEntity;
-import net.minecraft.entity.vehicle.ChestMinecartEntity;
-import net.minecraft.entity.vehicle.ChestRaftEntity;
-import net.minecraft.entity.vehicle.HopperMinecartEntity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 import net.wurstclient.Category;
 import net.wurstclient.events.CameraTransformViewBobbingListener;
 import net.wurstclient.events.RenderListener;
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
-import net.wurstclient.hacks.chestesp.ChestEspBlockGroup;
-import net.wurstclient.hacks.chestesp.ChestEspEntityGroup;
 import net.wurstclient.hacks.chestesp.ChestEspGroup;
-import net.wurstclient.settings.CheckboxSetting;
-import net.wurstclient.settings.ColorSetting;
+import net.wurstclient.hacks.chestesp.ChestEspGroupManager;
 import net.wurstclient.settings.EspStyleSetting;
-import net.wurstclient.util.LootrModCompat;
 import net.wurstclient.util.RenderUtils;
 import net.wurstclient.util.chunk.ChunkUtils;
 
 public class ChestEspHack extends Hack implements UpdateListener,
 	CameraTransformViewBobbingListener, RenderListener
 {
 	private final EspStyleSetting style = new EspStyleSetting();
-	
-	private final ChestEspBlockGroup basicChests = new ChestEspBlockGroup(
-		new ColorSetting("Chest color",
-			"Normal chests will be highlighted in this color.", Color.GREEN),
-		new CheckboxSetting("Include normal chests", true));
-	
-	private final ChestEspBlockGroup trapChests = new ChestEspBlockGroup(
-		new ColorSetting("Trap chest color",
-			"Trapped chests will be highlighted in this color.",
-			new Color(0xFF8000)),
-		new CheckboxSetting("Include trap chests", true));
-	
-	private final ChestEspBlockGroup enderChests = new ChestEspBlockGroup(
-		new ColorSetting("Ender color",
-			"Ender chests will be highlighted in this color.", Color.CYAN),
-		new CheckboxSetting("Include ender chests", true));
-	
-	private final ChestEspEntityGroup chestCarts =
-		new ChestEspEntityGroup(
-			new ColorSetting("Chest cart color",
-				"Minecarts with chests will be highlighted in this color.",
-				Color.YELLOW),
-			new CheckboxSetting("Include chest carts", true));
-	
-	private final ChestEspEntityGroup chestBoats =
-		new ChestEspEntityGroup(
-			new ColorSetting("Chest boat color",
-				"Boats with chests will be highlighted in this color.",
-				Color.YELLOW),
-			new CheckboxSetting("Include chest boats", true));
-	
-	private final ChestEspBlockGroup barrels = new ChestEspBlockGroup(
-		new ColorSetting("Barrel color",
-			"Barrels will be highlighted in this color.", Color.GREEN),
-		new CheckboxSetting("Include barrels", true));
-	
-	private final ChestEspBlockGroup pots = new ChestEspBlockGroup(
-		new ColorSetting("Pots color",
-			"Decorated pots will be highlighted in this color.", Color.GREEN),
-		new CheckboxSetting("Include pots", false));
-	
-	private final ChestEspBlockGroup shulkerBoxes = new ChestEspBlockGroup(
-		new ColorSetting("Shulker color",
-			"Shulker boxes will be highlighted in this color.", Color.MAGENTA),
-		new CheckboxSetting("Include shulkers", true));
-	
-	private final ChestEspBlockGroup hoppers = new ChestEspBlockGroup(
-		new ColorSetting("Hopper color",
-			"Hoppers will be highlighted in this color.", Color.WHITE),
-		new CheckboxSetting("Include hoppers", false));
-	
-	private final ChestEspEntityGroup hopperCarts =
-		new ChestEspEntityGroup(
-			new ColorSetting("Hopper cart color",
-				"Minecarts with hoppers will be highlighted in this color.",
-				Color.YELLOW),
-			new CheckboxSetting("Include hopper carts", false));
-	
-	private final ChestEspBlockGroup droppers = new ChestEspBlockGroup(
-		new ColorSetting("Dropper color",
-			"Droppers will be highlighted in this color.", Color.WHITE),
-		new CheckboxSetting("Include droppers", false));
-	
-	private final ChestEspBlockGroup dispensers = new ChestEspBlockGroup(
-		new ColorSetting("Dispenser color",
-			"Dispensers will be highlighted in this color.",
-			new Color(0xFF8000)),
-		new CheckboxSetting("Include dispensers", false));
-	
-	private final ChestEspBlockGroup crafters = new ChestEspBlockGroup(
-		new ColorSetting("Crafter color",
-			"Crafters will be highlighted in this color.", Color.WHITE),
-		new CheckboxSetting("Include crafters", false));
-	
-	private final ChestEspBlockGroup furnaces =
-		new ChestEspBlockGroup(new ColorSetting("Furnace color",
-			"Furnaces, smokers, and blast furnaces will be highlighted in this color.",
-			Color.RED), new CheckboxSetting("Include furnaces", false));
-	
-	private final List<ChestEspGroup> groups =
-		Arrays.asList(basicChests, trapChests, enderChests, chestCarts,
-			chestBoats, barrels, pots, shulkerBoxes, hoppers, hopperCarts,
-			droppers, dispensers, crafters, furnaces);
-	
-	private final List<ChestEspEntityGroup> entityGroups =
-		Arrays.asList(chestCarts, chestBoats, hopperCarts);
+	private final ChestEspGroupManager groups = new ChestEspGroupManager();
 
 	public ChestEspHack()
 	{
 		super("ChestESP");
 		setCategory(Category.RENDER);
-		
 		addSetting(style);
-		groups.stream().flatMap(ChestEspGroup::getSettings)
+		groups.allGroups.stream().flatMap(ChestEspGroup::getSettings)
 			.forEach(this::addSetting);
 	}
 
@@ -152,53 +52,17 @@ protected void onDisable()
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(CameraTransformViewBobbingListener.class, this);
 		EVENTS.remove(RenderListener.class, this);
-		
-		groups.forEach(ChestEspGroup::clear);
+		groups.allGroups.forEach(ChestEspGroup::clear);
 	}
 
 	@Override
 	public void onUpdate()
 	{
-		groups.forEach(ChestEspGroup::clear);
-		
-		ArrayList<BlockEntity> blockEntities =
-			ChunkUtils.getLoadedBlockEntities()
-				.collect(Collectors.toCollection(ArrayList::new));
-		
-		for(BlockEntity blockEntity : blockEntities)
-			if(blockEntity instanceof TrappedChestBlockEntity)
-				trapChests.add(blockEntity);
-			else if(blockEntity instanceof ChestBlockEntity)
-				basicChests.add(blockEntity);
-			else if(blockEntity instanceof EnderChestBlockEntity)
-				enderChests.add(blockEntity);
-			else if(blockEntity instanceof ShulkerBoxBlockEntity
-				|| LootrModCompat.isLootrShulkerBox(blockEntity))
-				shulkerBoxes.add(blockEntity);
-			else if(blockEntity instanceof BarrelBlockEntity
-				|| LootrModCompat.isLootrBarrel(blockEntity))
-				barrels.add(blockEntity);
-			else if(blockEntity instanceof DecoratedPotBlockEntity)
-				pots.add(blockEntity);
-			else if(blockEntity instanceof HopperBlockEntity)
-				hoppers.add(blockEntity);
-			else if(blockEntity instanceof DropperBlockEntity)
-				droppers.add(blockEntity);
-			else if(blockEntity instanceof DispenserBlockEntity)
-				dispensers.add(blockEntity);
-			else if(blockEntity instanceof CrafterBlockEntity)
-				crafters.add(blockEntity);
-			else if(blockEntity instanceof AbstractFurnaceBlockEntity)
-				furnaces.add(blockEntity);
-			
-		for(Entity entity : MC.world.getEntities())
-			if(entity instanceof ChestMinecartEntity)
-				chestCarts.add(entity);
-			else if(entity instanceof HopperMinecartEntity)
-				hopperCarts.add(entity);
-			else if(entity instanceof ChestBoatEntity
-				|| entity instanceof ChestRaftEntity)
-				chestBoats.add(entity);
+		groups.allGroups.forEach(ChestEspGroup::clear);
+		ChunkUtils.getLoadedBlockEntities().forEach(
+			be -> groups.blockGroups.forEach(group -> group.addIfMatches(be)));
+		MC.world.getEntities().forEach(
+			e -> groups.entityGroups.forEach(group -> group.addIfMatches(e)));
 	}
 
 	@Override
@@ -212,7 +76,7 @@ public void onCameraTransformViewBobbing(
 	@Override
 	public void onRender(MatrixStack matrixStack, float partialTicks)
 	{
-		entityGroups.stream().filter(ChestEspGroup::isEnabled)
+		groups.entityGroups.stream().filter(ChestEspGroup::isEnabled)
 			.forEach(g -> g.updateBoxes(partialTicks));
 
 		if(style.hasBoxes())
@@ -224,7 +88,7 @@ public void onRender(MatrixStack matrixStack, float partialTicks)
 
 	private void renderBoxes(MatrixStack matrixStack)
 	{
-		for(ChestEspGroup group : groups)
+		for(ChestEspGroup group : groups.allGroups)
 		{
 			if(!group.isEnabled())
 				continue;
@@ -241,7 +105,7 @@ private void renderBoxes(MatrixStack matrixStack)
 
 	private void renderTracers(MatrixStack matrixStack, float partialTicks)
 	{
-		for(ChestEspGroup group : groups)
+		for(ChestEspGroup group : groups.allGroups)
 		{
 			if(!group.isEnabled())
 				continue;

src/main/java/net/wurstclient/hacks/chestesp/ChestEspBlockGroup.java

@@ -14,19 +14,17 @@
 import net.minecraft.block.enums.ChestType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
-import net.wurstclient.settings.CheckboxSetting;
-import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.util.BlockUtils;
 
-public final class ChestEspBlockGroup extends ChestEspGroup
+public abstract class ChestEspBlockGroup extends ChestEspGroup
 {
-	public ChestEspBlockGroup(ColorSetting color, CheckboxSetting enabled)
-	{
-		super(color, enabled);
-	}
+	protected abstract boolean matches(BlockEntity be);
 
-	public void add(BlockEntity be)
+	public final void addIfMatches(BlockEntity be)
 	{
+		if(!matches(be))
+			return;
+		
 		Box box = getBox(be);
 		if(box == null)
 			return;

src/main/java/net/wurstclient/hacks/chestesp/ChestEspEntityGroup.java

@@ -10,32 +10,30 @@
 import java.util.ArrayList;
 
 import net.minecraft.entity.Entity;
-import net.wurstclient.settings.CheckboxSetting;
-import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.util.EntityUtils;
 
-public final class ChestEspEntityGroup extends ChestEspGroup
+public abstract class ChestEspEntityGroup extends ChestEspGroup
 {
 	private final ArrayList<Entity> entities = new ArrayList<>();
 
-	public ChestEspEntityGroup(ColorSetting color, CheckboxSetting enabled)
-	{
-		super(color, enabled);
-	}
+	protected abstract boolean matches(Entity e);
 
-	public void add(Entity e)
+	public final void addIfMatches(Entity e)
 	{
+		if(!matches(e))
+			return;
+		
 		entities.add(e);
 	}
 
 	@Override
-	public void clear()
+	public final void clear()
 	{
 		entities.clear();
 		super.clear();
 	}
 
-	public void updateBoxes(float partialTicks)
+	public final void updateBoxes(float partialTicks)
 	{
 		boxes.clear();
 

src/main/java/net/wurstclient/hacks/chestesp/ChestEspGroup.java

@@ -24,33 +24,37 @@ public abstract class ChestEspGroup
 	private final ColorSetting color;
 	private final CheckboxSetting enabled;
 
-	public ChestEspGroup(ColorSetting color, CheckboxSetting enabled)
+	public ChestEspGroup()
 	{
-		this.color = Objects.requireNonNull(color);
-		this.enabled = enabled;
+		enabled = createIncludeSetting();
+		color = createColorSetting();
 	}
 
+	protected abstract CheckboxSetting createIncludeSetting();
+	
+	protected abstract ColorSetting createColorSetting();
+	
 	public void clear()
 	{
 		boxes.clear();
 	}
 
-	public boolean isEnabled()
+	public final boolean isEnabled()
 	{
 		return enabled == null || enabled.isChecked();
 	}
 
-	public Stream<Setting> getSettings()
+	public final Stream<Setting> getSettings()
 	{
 		return Stream.of(enabled, color).filter(Objects::nonNull);
 	}
 
-	public int getColorI(int alpha)
+	public final int getColorI(int alpha)
 	{
 		return color.getColorI(alpha);
 	}
 
-	public List<Box> getBoxes()
+	public final List<Box> getBoxes()
 	{
 		return Collections.unmodifiableList(boxes);
 	}

src/main/java/net/wurstclient/hacks/chestesp/ChestEspGroupManager.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.hacks.chestesp;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import net.wurstclient.hacks.chestesp.groups.*;
+
+public final class ChestEspGroupManager
+{
+	public final NormalChestsGroup normalChests = new NormalChestsGroup();
+	public final TrapChestsGroup trapChests = new TrapChestsGroup();
+	public final EnderChestsGroup enderChests = new EnderChestsGroup();
+	public final ChestCartsGroup chestCarts = new ChestCartsGroup();
+	public final ChestBoatsGroup chestBoats = new ChestBoatsGroup();
+	public final BarrelsGroup barrels = new BarrelsGroup();
+	public final PotsGroup pots = new PotsGroup();
+	public final ShulkerBoxesGroup shulkerBoxes = new ShulkerBoxesGroup();
+	public final HoppersGroup hoppers = new HoppersGroup();
+	public final HopperCartsGroup hopperCarts = new HopperCartsGroup();
+	public final DroppersGroup droppers = new DroppersGroup();
+	public final DispensersGroup dispensers = new DispensersGroup();
+	public final CraftersGroup crafters = new CraftersGroup();
+	public final FurnacesGroup furnaces = new FurnacesGroup();
+	
+	public final List<ChestEspBlockGroup> blockGroups =
+		List.of(normalChests, trapChests, enderChests, barrels, pots,
+			shulkerBoxes, hoppers, droppers, dispensers, crafters, furnaces);
+	
+	public final List<ChestEspEntityGroup> entityGroups =
+		List.of(chestCarts, chestBoats, hopperCarts);
+	
+	public final List<ChestEspGroup> allGroups =
+		Stream.concat(blockGroups.stream(), entityGroups.stream()).toList();
+}