Revert Nametag changes in #7590 (#7594)

This reverts Nametag changes in commit a7864cf.

Author: MukjepScarlet

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt

@@ -18,7 +18,6 @@
  */
 package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
-import net.ccbluex.fastutil.Pool
 import net.ccbluex.liquidbounce.event.events.OverlayRenderEvent
 import net.ccbluex.liquidbounce.event.handler
 import net.ccbluex.liquidbounce.features.module.Category
@@ -55,12 +54,11 @@ object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
     val fontRenderer
         get() = FontManager.FONT_RENDERER
 
-    private val nametagsToRender = mutableListOf<NametagRenderState>()
-    private val nametagPool = Pool(::NametagRenderState, NametagRenderState::clear)
+    private val nametagsToRender = mutableListOf<Nametag>()
 
     override fun onDisabled() {
         RenderedEntities.unsubscribe(this)
-        nametagPool.recycleAll(nametagsToRender)
+        nametagsToRender.clear()
     }
 
     override fun onEnabled() {
@@ -89,10 +87,9 @@ object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
 
     /**
      * Collects all entities that should be rendered, gets the screen position, where the name tag should be displayed,
-     * add what should be rendered. The nametags are sorted in order of rendering.
+     * add what should be rendered ([Nametag]). The nametags are sorted in order of rendering.
      */
     private fun collectAndSortNametagsToRender() {
-        nametagPool.recycleAll(nametagsToRender)
         nametagsToRender.clear()
         val maximumDistanceSquared = maximumDistance.sq()
 
@@ -101,13 +98,13 @@ object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
                 continue
             }
 
-            nametagsToRender += nametagPool.borrow().update(entity)
+            nametagsToRender += Nametag(entity)
         }
         nametagsToRender.sortWith(NAMETAG_COMPARATOR)
     }
 
-    private val NAMETAG_COMPARATOR = Comparator.comparingDouble<NametagRenderState> { nametag ->
-        nametag.entity!!.distanceToSqr(mc.cameraEntity!!)
+    private val NAMETAG_COMPARATOR = Comparator.comparingDouble<Nametag> { nametag ->
+        nametag.entity.distanceToSqr(mc.cameraEntity!!)
     }
 
     fun shouldRenderVanillaNametag(state: EntityRenderState): Boolean {

…es/render/nametags/NametagRenderState.kt …odule/modules/render/nametags/Nametag.ktsrc/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderState.kt renamed to src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderState.kt renamed to src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt

@@ -21,47 +21,39 @@ package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 import net.ccbluex.liquidbounce.render.engine.type.Vec3f
 import net.ccbluex.liquidbounce.utils.entity.interpolateCurrentPosition
 import net.ccbluex.liquidbounce.utils.render.WorldToScreen
-import net.ccbluex.liquidbounce.utils.text.PlainText
+import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.ItemStack
-import net.minecraft.network.chat.Component
-
-class NametagRenderState {
-    @JvmField
-    var entity: Entity? = null
-
-    @JvmField
-    var text: Component = PlainText.EMPTY
 
-    @JvmField
-    var items: List<ItemStack> = emptyList()
+class Nametag private constructor(
+    val entity: Entity,
+    /**
+     * The text to render as nametag
+     */
+    val text: Component,
+    /**
+     * The items that should be rendered above the name tag
+     */
+    val items: List<ItemStack>
+) {
 
-    @JvmField
     var screenPos: Vec3f? = null
+        private set
 
-    fun update(entity: Entity) = apply {
-        this.entity = entity
-        this.text = NametagTextFormatter.format(entity)
-        if (entity is LivingEntity) {
-            this.items = NametagEquipment.createItemList(entity)
-        }
-    }
+    constructor(entity: LivingEntity) : this(
+        entity,
+        NametagTextFormatter.format(entity),
+        NametagEquipment.createItemList(entity),
+    )
 
     fun calculateScreenPos(tickDelta: Float): Vec3f? {
-        val entity = this.entity ?: return null
         val nametagPos = entity.interpolateCurrentPosition(tickDelta)
             .add(0.0, entity.getEyeHeight(entity.pose) + 0.55, 0.0)
 
         screenPos = WorldToScreen.calculateScreenPos(nametagPos)
         return screenPos
     }
 
-    fun clear() {
-        this.entity = null
-        this.text = PlainText.EMPTY
-        this.items = emptyList()
-        this.screenPos = null
-    }
-
 }
+

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt

@@ -37,11 +37,10 @@ private const val BACKGROUND_Y_OFFSET_TOP = -0.1f
 private const val BACKGROUND_Y_OFFSET_BOTTOM = 1.1f
 private const val BACKGROUND_X_PADDING = 0.2f * FONT_SIZE
 
-internal fun GuiGraphics.drawNametag(nametag: NametagRenderState, posX: Float, posY: Float) {
-    val entity = nametag.entity
+internal fun GuiGraphics.drawNametag(nametag: Nametag, posX: Float, posY: Float) {
     if (nametag.items.any { !it.isEmpty }) {
         val currentItemStackRenderer = if (NametagEquipment.showInfo) {
-            if (entity === player) {
+            if (nametag.entity === player) {
                 ItemStackListRenderer.SingleItemStackRenderer.All
             } else {
                 ItemStackListRenderer.SingleItemStackRenderer.ForOtherPlayer
@@ -90,13 +89,13 @@ internal fun GuiGraphics.drawNametag(nametag: NametagRenderState, posX: Float, p
     }
 
     // Draw enchantments directly for the entity (regardless of whether items are shown)
-    if (NametagEnchantmentRenderer.running && entity is LivingEntity) {
-        val entityPos = entity.position()
+    if (NametagEnchantmentRenderer.running && nametag.entity is LivingEntity) {
+        val entityPos = nametag.entity.position()
         val worldX = entityPos.x.toFloat()
-        val worldY = (entityPos.y + entity.bbHeight + 0.5f).toFloat()
+        val worldY = (entityPos.y + nametag.entity.bbHeight + 0.5f).toFloat()
 
         drawEntityEnchantments(
-            entity,
+            nametag.entity,
             worldX,
             worldY,
         )