fix esp block entities

Author: beanbag44

src/main/kotlin/com/lambda/config/groups/EntityColorSettings.kt

@@ -24,9 +24,11 @@ import com.lambda.friend.FriendManager.isFriend
 import com.lambda.util.EntityUtils
 import com.lambda.util.EntityUtils.entityGroup
 import com.lambda.util.NamedEnum
+import com.lambda.util.extension.blockColor
 import com.lambda.util.extension.entityColor
 import com.lambda.util.math.dist
 import com.lambda.util.math.lerp
+import net.minecraft.block.entity.BlockEntity
 import net.minecraft.client.network.OtherClientPlayerEntity
 import net.minecraft.entity.Entity
 import java.awt.Color
@@ -76,11 +78,15 @@ class EntityColorSettings(
 			EntityUtils.EntityGroup.Projectile -> projectileColor
 			EntityUtils.EntityGroup.Boss -> bossColor
 			EntityUtils.EntityGroup.Decoration -> decorationColor
-			EntityUtils.EntityGroup.Block -> blockColor
-			EntityUtils.EntityGroup.Misc -> miscColor
+			else -> miscColor
 		}
 	}
 
+	context(safeContext: SafeContext)
+	fun getColor(blockEntity: BlockEntity): Color =
+		if (useNaturalColors) safeContext.blockColor(blockEntity.cachedState, blockEntity.pos)
+		else blockColor
+
 	private fun hasSpecialCase(entity: Entity, group: EntityUtils.EntityGroup) =
 		group == EntityUtils.EntityGroup.Player &&
 				((entity is OtherClientPlayerEntity && entity.isFriend && separateFriendColor) || playerDistanceGradient)

src/main/kotlin/com/lambda/module/modules/render/ESP.kt

@@ -21,17 +21,18 @@ import com.lambda.config.applyEdits
 import com.lambda.config.groups.EntityColorSettings
 import com.lambda.config.groups.EntitySelectionSettings
 import com.lambda.config.groups.OutlineSettings
-import com.lambda.config.groups.ScreenLineSettings
 import com.lambda.config.groups.WorldLineSettings
+import com.lambda.graphics.mc.RenderBuilder
 import com.lambda.graphics.mc.renderer.ImmediateRenderer.Companion.immediateRenderer
 import com.lambda.graphics.util.DynamicAABB.Companion.interpolatedBox
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.EntityUtils
 import com.lambda.util.NamedEnum
 import com.lambda.util.math.setAlpha
-import fi.dy.masa.malilib.render.RenderUtils.depthTest
-import net.minecraft.client.network.ClientPlayerEntity
+import net.minecraft.block.entity.BlockEntity
+import net.minecraft.entity.Entity
+import net.minecraft.util.math.Box
+import java.awt.Color
 
 object ESP : Module(
 	name = "ESP",
@@ -72,16 +73,45 @@ object ESP : Module(
 			with(safeContext) {
 				world.entities.forEach { entity ->
 					if (!entitySettings.isSelected(entity)) return@forEach
-					val entityColor = entityColors.getColor(entity)
-					when (mode) {
-						EspMode.Shader -> worldOutline(entity, outlineStyle.toStyle(entityColor))
-						EspMode.Box -> {
-							box(entity.interpolatedBox, boxOutlineSettings) {
-								if (!drawFilled) hideFill()
-								else if (!drawOutline) hideOutline()
-								colors(entityColor.setAlpha(fillAlpha), entityColor.setAlpha(outlineAlpha))
-							}
-						}
+					val color = entityColors.getColor(entity)
+					drawEsp<Entity>(
+						entity,
+						color,
+						{ worldOutline(it, outlineStyle.toStyle(color)) },
+						{ listOf(it.interpolatedBox) }
+					)
+				}
+				val chunkMap = world.chunkManager.chunks
+				(0 until chunkMap.loadedChunkCount).forEach { chunk ->
+					chunkMap.chunks.get(chunk)?.blockEntities?.values?.forEach { blockEntity ->
+						if (!entitySettings.isSelected(blockEntity)) return@forEach
+						val color = entityColors.getColor(blockEntity)
+						drawEsp<BlockEntity>(
+							blockEntity,
+							color,
+							{ worldOutline(it.pos, outlineStyle.toStyle(color)) },
+							{ it.cachedState.getOutlineShape(world, it.pos).boundingBoxes }
+						)
+					}
+				}
+			}
+		}
+	}
+
+	private fun <T> RenderBuilder.drawEsp(
+		entity: T,
+		color: Color,
+		outline: RenderBuilder.(T) -> Unit,
+		boxes: (T) -> Collection<Box>
+	) {
+		when (mode) {
+			EspMode.Shader -> outline(entity)
+			EspMode.Box -> {
+				boxes(entity).forEach { box ->
+					box(box, boxOutlineSettings) {
+						if (!drawFilled) hideFill()
+						else if (!drawOutline) hideOutline()
+						colors(color.setAlpha(fillAlpha), color.setAlpha(outlineAlpha))
 					}
 				}
 			}

src/main/kotlin/com/lambda/module/modules/render/Nametags.kt

@@ -46,7 +46,6 @@ import org.joml.component2
 import java.awt.Color
 import kotlin.math.max
 
-//ToDo: implement all settings
 object Nametags : Module(
 	name = "Nametags",
 	description = "Displays information about entities above them",
@@ -76,7 +75,11 @@ object Nametags : Module(
 	private val itemNameScale by setting("Item Name Scale", 0.7f, 0.1f..1.0f, 0.01f) { itemName }.group(Group.General)
 	private val itemCount by setting("Item Count", true).group(Group.General)
 	private val durabilityMode by setting("Durability Mode", DurabilityMode.Text) { gear }.group(Group.General)
-	private val entitySelectionSettings = EntitySelectionSettings(c = this, baseGroup = arrayOf(Group.Entities))
+	private val entitySelectionSettings = EntitySelectionSettings(c = this, baseGroup = arrayOf(Group.Entities)).apply {
+		applyEdits {
+			hide(::blockEntities)
+		}
+	}
 	private val background by setting("Background", true).group(Group.Background)
 	private val backgroundColor by setting("Background Color", Color(0, 0, 0, 60)) { background }.group(Group.Background)
 	private val backgroundSize by setting("Background Size", 1.0f, 1.0f..2.0f, 0.01f) { background }.group(Group.Background)