"Hi there! I've added a 'Custom Entity Name' feature to replace the previous 'Random Number ID or Default Entity Name'.

I thought this might be useful for users who want more control over naming their entities, and I hope it adds value to the project.
If you don't mind, could you take a look at the changes? I'd love to contribute to making ZNPCsPlus even better! ❤
Thanks for your hard work on this project!"

Author: AsukaRyo12

plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java

@@ -1,8 +1,11 @@
 package lol.pyr.znpcsplus.packets;
 
 import com.github.retrooper.packetevents.PacketEventsAPI;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.github.retrooper.packetevents.util.Vector3d;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityMetadata;
 import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerSpawnEntity;
 import lol.pyr.znpcsplus.api.entity.PropertyHolder;
 import lol.pyr.znpcsplus.config.ConfigManager;
@@ -11,12 +14,15 @@
 import lol.pyr.znpcsplus.scheduling.TaskScheduler;
 import lol.pyr.znpcsplus.util.NamedColor;
 import lol.pyr.znpcsplus.util.NpcLocation;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import java.util.Collections;
 import java.util.Optional;
 
+
 public class V1_17PacketFactory extends V1_8PacketFactory {
     public V1_17PacketFactory(TaskScheduler scheduler, PacketEventsAPI<Plugin> packetEvents, EntityPropertyRegistryImpl propertyRegistry, LegacyComponentSerializer textSerializer, ConfigManager configManager) {
         super(scheduler, packetEvents, propertyRegistry, textSerializer, configManager);
@@ -27,7 +33,30 @@ public void spawnEntity(Player player, PacketEntity entity, PropertyHolder prope
         NpcLocation location = entity.getLocation();
         sendPacket(player, new WrapperPlayServerSpawnEntity(entity.getEntityId(), Optional.of(entity.getUuid()), entity.getType(),
                 npcLocationToVector(location), location.getPitch(), location.getYaw(), location.getYaw(), 0, Optional.of(new Vector3d())));
+
+        String displayName = entity.getProperty(propertyRegistry.getByName("display_name", String.class));
+        if (displayName != null) {
+            EntityData<Optional<Component>> nameData = new EntityData<>(
+                    2,
+                    EntityDataTypes.OPTIONAL_ADV_COMPONENT,
+                    Optional.of(Component.text(displayName))
+            );
+            sendPacket(player, new WrapperPlayServerEntityMetadata(
+                    entity.getEntityId(),
+                    Collections.singletonList(nameData)
+            ));
+        }
+
         sendAllMetadata(player, entity, properties);
+        EntityData<Boolean> hideNameDisplay = new EntityData<>(
+                3,
+                EntityDataTypes.BOOLEAN,
+                false
+        );
+        sendPacket(player, new WrapperPlayServerEntityMetadata(
+                entity.getEntityId(),
+                Collections.singletonList(hideNameDisplay)
+        ));
         if (EntityTypes.isTypeInstanceOf(entity.getType(), EntityTypes.LIVINGENTITY)) sendAllAttributes(player, entity, properties);
         createTeam(player, entity, properties.getProperty(propertyRegistry.getByName("glow", NamedColor.class)));
     }

plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_19_3PacketFactory.java

@@ -27,11 +27,15 @@ public V1_19_3PacketFactory(TaskScheduler scheduler, PacketEventsAPI<Plugin> pac
     @Override
     public CompletableFuture<Void> addTabPlayer(Player player, PacketEntity entity, PropertyHolder properties) {
         if (entity.getType() != EntityTypes.PLAYER) return CompletableFuture.completedFuture(null);
+
         CompletableFuture<Void> future = new CompletableFuture<>();
-        skinned(player, properties, new UserProfile(entity.getUuid(), Integer.toString(entity.getEntityId()))).thenAccept(profile -> {
+
+        String displayName = entity.getProperty(propertyRegistry.getByName("display_name", String.class)) == null ? entity.getEntityId()+"" : entity.getProperty(propertyRegistry.getByName("display_name", String.class));
+
+        skinned(player, properties, new UserProfile(entity.getUuid(), displayName)).thenAccept(profile -> {
             WrapperPlayServerPlayerInfoUpdate.PlayerInfo info = new WrapperPlayServerPlayerInfoUpdate.PlayerInfo(
                     profile, false, 1, GameMode.CREATIVE,
-                    Component.text(configManager.getConfig().tabDisplayName().replace("{id}", Integer.toString(entity.getEntityId()))), null);
+                    Component.text(configManager.getConfig().tabDisplayName().replace("{id}", displayName)), null);
             sendPacket(player, new WrapperPlayServerPlayerInfoUpdate(EnumSet.of(WrapperPlayServerPlayerInfoUpdate.Action.ADD_PLAYER,
                     WrapperPlayServerPlayerInfoUpdate.Action.UPDATE_LISTED), info, info));
             future.complete(null);

plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_20_2PacketFactory.java

@@ -18,6 +18,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
+
 public class V1_20_2PacketFactory extends V1_19_3PacketFactory {
 
     protected ConfigManager configManager;