feat: NameTagElementHolder

Author: dvitski

gradle.properties

@@ -15,7 +15,7 @@ kotlin_version=2.2.0
 fabric_kotlin_version=1.13.4
 
 # mod properties
-mod_version=1.0.1
+mod_version=1.1.0
 maven_group=net.mcbrawls
 mod_id=populus
 

src/main/kotlin/net/mcbrawls/populus/AbstractFakePlayerEntity.kt

@@ -3,12 +3,9 @@ package net.mcbrawls.populus
 import com.mojang.authlib.GameProfile
 import com.mojang.authlib.properties.Property
 import eu.pb4.polymer.core.api.entity.PolymerEntity
-import eu.pb4.polymer.virtualentity.api.ElementHolder
 import eu.pb4.polymer.virtualentity.api.attachment.EntityAttachment
-import eu.pb4.polymer.virtualentity.api.elements.TextDisplayElement
 import net.minecraft.entity.EntityType
 import net.minecraft.entity.data.DataTracker
-import net.minecraft.entity.decoration.DisplayEntity
 import net.minecraft.entity.mob.PathAwareEntity
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.network.packet.Packet
@@ -17,10 +14,8 @@ import net.minecraft.network.packet.s2c.play.PlayerRemoveS2CPacket
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.text.Text
 import net.minecraft.util.Arm
-import net.minecraft.util.math.AffineTransformation
 import net.minecraft.world.GameMode
 import net.minecraft.world.World
-import org.joml.Vector3f
 import xyz.nucleoid.packettweaker.PacketContext
 import java.util.EnumSet
 import java.util.function.Consumer
@@ -36,37 +31,28 @@ abstract class AbstractFakePlayerEntity(type: EntityType<out AbstractFakePlayerE
      */
     open val modelParts: Byte = Byte.MAX_VALUE
 
-    /**
-     * The base name tag offset from the passenger position.
-     */
-    open val baseNameTagOffset: Float = 0.2f
-
-    /**
-     * The name tag offset for additional lines.
-     */
-    open val additionalNameTagOffset: Float = 0.25f
-
     /**
      * The generated profile name for this fake player.
      */
     val defaultProfileName: String by lazy { uuid.toString().substring(0..<16) }
 
-    private var nameElementAttachment: EntityAttachment? = null
+    var nameHolder: NameTagElementHolder = NameTagElementHolder()
+        private set
+
+    var nameAttachment: EntityAttachment? = null
+        private set
 
     init {
-        refreshNameElements()
+        nameAttachment = EntityAttachment.ofTicking(nameHolder, this)
+        refreshNameTag()
     }
 
     /**
      * Refreshes attached elements.
      */
-    fun refreshNameElements() {
-        nameElementAttachment?.destroy()
-
-        val elements = createNameAttachmentElement()
-        val holder = ElementHolder()
-        elements.forEach(holder::addPassengerElement)
-        nameElementAttachment = EntityAttachment.ofTicking(holder, this)
+    fun refreshNameTag() {
+        val text = createDisplayNameText()
+        nameHolder.setText(text)
     }
 
     /**
@@ -77,25 +63,6 @@ abstract class AbstractFakePlayerEntity(type: EntityType<out AbstractFakePlayerE
         return emptyList()
     }
 
-    /**
-     * Creates the attached elements for the player's name tag.
-     * @return null to use default name tag
-     */
-    open fun createNameAttachmentElement(): List<TextDisplayElement> {
-        val components = createDisplayNameText()
-        return components.reversed().mapIndexed { i, text ->
-            val element = TextDisplayElement(text)
-
-            val transformation = AffineTransformation(Vector3f(0.0f, baseNameTagOffset + (additionalNameTagOffset * i), 0.0f), null, null, null)
-            element.setTransformation(transformation)
-
-            element.billboardMode = DisplayEntity.BillboardMode.CENTER
-            element.teleportDuration = 1
-
-            element
-        }
-    }
-
     /**
      * Creates the player list entry for this player. Necessary for the player entity to spawn.
      */

src/main/kotlin/net/mcbrawls/populus/NameTagElementHolder.kt

@@ -0,0 +1,69 @@
+package net.mcbrawls.populus
+
+import eu.pb4.polymer.virtualentity.api.ElementHolder
+import eu.pb4.polymer.virtualentity.api.elements.TextDisplayElement
+import net.minecraft.entity.decoration.DisplayEntity
+import net.minecraft.text.Text
+import net.minecraft.util.math.AffineTransformation
+import org.joml.Vector3f
+
+class NameTagElementHolder : ElementHolder() {
+    /**
+     * The base name tag offset from the passenger position.
+     */
+    var baseNameTagOffset: Float = 0.2f
+        set(value) {
+            field = value
+            refreshElements()
+        }
+
+    /**
+     * The name tag offset for additional lines.
+     */
+    var additionalNameTagOffset: Float = 0.25f
+        set(value) {
+            field = value
+            refreshElements()
+        }
+
+    private val components: MutableList<Text> = mutableListOf()
+
+    fun setText(text: Collection<Text>) {
+        components.clear()
+        components.addAll(text)
+
+        refreshElements()
+    }
+
+    fun setText(vararg text: Text) {
+        setText(text.toList())
+    }
+
+    /**
+     * Creates the attached elements for the player's name tag.
+     * @return null to use default name tag
+     */
+    fun createElements(): List<TextDisplayElement> {
+        return components.reversed().mapIndexed { i, text ->
+            val element = TextDisplayElement(text)
+
+            val translation = Vector3f(0.0f, baseNameTagOffset + (additionalNameTagOffset * i), 0.0f)
+            val transformation = AffineTransformation(translation, null, null, null)
+            element.setTransformation(transformation)
+
+            element.billboardMode = DisplayEntity.BillboardMode.CENTER
+            element.teleportDuration = 1
+
+            element
+        }
+    }
+
+    fun refreshElements() {
+        entityIds.forEach(attachedPassengerEntityIds::removeInt)
+
+        if (attachedPassengerEntityIds.isEmpty()) {
+            val elements = createElements()
+            elements.forEach(::addPassengerElement)
+        }
+    }
+}

src/main/kotlin/net/mcbrawls/populus/NpcEntity.kt

@@ -17,7 +17,7 @@ class NpcEntity(type: EntityType<NpcEntity>, world: World) : AbstractFakePlayerE
 
     override fun createDisplayNameText(): List<Text> {
         val name = createProfileName()
-        return listOf(Text.literal("Fake ($name)"))
+        return listOf(Text.literal("NPC"), Text.literal(name))
     }
 
     companion object {