fix custom name properties to actually work

.idea/workspace.xml

@@ -4,7 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="" />
+    <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestPlayerCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestPlayerCommand.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -64,9 +70,12 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
+    <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.1/5aea4193d2dadf2f99523ded56a910c4dd98d23f/api-2.2.1-default.jar!/com/github/retrooper/packetevents/protocol/entity/pose/EntityPose.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.1/5aea4193d2dadf2f99523ded56a910c4dd98d23f/api-2.2.1-default.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerEntityAnimation.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.1/5aea4193d2dadf2f99523ded56a910c4dd98d23f/api-2.2.1-default.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSystemChatMessage.class" root0="SKIP_INSPECTION" />
+    <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.1/5aea4193d2dadf2f99523ded56a910c4dd98d23f/api-2.2.1-default.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerTeams.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/spigot/2.0.2/e1b5c8968213460b6bcf919597ea94de2157cb31/spigot-2.0.2.jar!/com/github/retrooper/packetevents/event/PacketListenerCommon.class" root0="SKIP_INSPECTION" />
+    <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/spigot/2.2.0/d8ce06232bdbdec3b31021c84545bd1aff957af0/spigot-2.2.0.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerTeams.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spigotmc/spigot-api/1.20.1-R0.1-SNAPSHOT/23c0dae3633c3dd31d4503969fa7f9f3d36840fb/spigot-api-1.20.1-R0.1-SNAPSHOT.jar!/org/bukkit/plugin/EventExecutor.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spigotmc/spigot-api/1.20.1-R0.1-SNAPSHOT/23c0dae3633c3dd31d4503969fa7f9f3d36840fb/spigot-api-1.20.1-R0.1-SNAPSHOT.jar!/org/bukkit/plugin/PluginManager.class" root0="SKIP_INSPECTION" />
     <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spigotmc/spigot-api/1.20.1-R0.1-SNAPSHOT/23c0dae3633c3dd31d4503969fa7f9f3d36840fb/spigot-api-1.20.1-R0.1-SNAPSHOT.jar!/org/bukkit/profile/PlayerProfile.class" root0="SKIP_INSPECTION" />
@@ -87,39 +96,39 @@
     <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;Downloaded.Files.Path.Enabled&quot;: &quot;false&quot;,
+    "Downloaded.Files.Path.Enabled": "false",
-    &quot;Gradle.Build EntityLib.executor&quot;: &quot;Run&quot;,
+    "Gradle.Build EntityLib.executor": "Run",
-    &quot;Gradle.EntityLib [dependencies].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [dependencies].executor": "Run",
-    &quot;Gradle.EntityLib [publish].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib [publish].executor": "Run",
-    &quot;Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [publish].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [publish].executor": "Run",
-    &quot;Gradle.EntityLib:test-plugin [runServer].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [runServer].executor": "Debug",
-    &quot;Gradle.EntityLib:test-plugin [shadowJar].executor&quot;: &quot;Run&quot;,
+    "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run",
-    &quot;Repository.Attach.Annotations&quot;: &quot;false&quot;,
+    "Repository.Attach.Annotations": "false",
-    &quot;Repository.Attach.JavaDocs&quot;: &quot;false&quot;,
+    "Repository.Attach.JavaDocs": "false",
-    &quot;Repository.Attach.Sources&quot;: &quot;false&quot;,
+    "Repository.Attach.Sources": "false",
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    "WebServerToolWindowFactoryState": "false",
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    "git-widget-placeholder": "master",
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    "ignore.virus.scanning.warn.message": "true",
-    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-17&quot;,
+    "jdk.selected.JAVA_MODULE": "corretto-17",
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    "kotlin-language-version-configured": "true",
-    &quot;last_opened_file_path&quot;: &quot;D:/Github/EntityLib/api/src/main/java/me/tofaa/entitylib/extras&quot;,
+    "last_opened_file_path": "D:/Github/EntityLib/api/src/main/java/me/tofaa/entitylib/extras",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    "project.structure.last.edited": "Project",
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    "project.structure.proportion": "0.15",
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    "project.structure.side.proportion": "0.2",
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    "settings.editor.selected.configurable": "preferences.pluginManager",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Github\EntityLib\api\src\main\java\me\tofaa\entitylib\extras" />
@@ -312,6 +321,12 @@
       <workItem from="1708591139716" duration="1553000" />
       <workItem from="1708597333736" duration="3637000" />
       <workItem from="1708679023133" duration="6858000" />
+      <workItem from="1708698582801" duration="3731000" />
+      <workItem from="1708809296046" duration="2479000" />
+      <workItem from="1708858398530" duration="1080000" />
+      <workItem from="1709057446428" duration="195000" />
+      <workItem from="1709074092924" duration="24000" />
+      <workItem from="1709139306864" duration="1813000" />
     </task>
     <servers />
   </component>

api/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java

@@ -13,11 +13,13 @@ import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEn
 import me.tofaa.entitylib.EntityLib;
 import me.tofaa.entitylib.extras.InvalidVersionException;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 
@@ -111,6 +113,18 @@ public class EntityMeta implements EntityMetadataProvider {
         return getMaskBit(OFFSET, HAS_GLOWING_EFFECT_BIT);
     }
 
+    public boolean isGlowing() {
+        return hasGlowingEffect();
+    }
+
+    public void setHasGlowingEffect(boolean value) {
+        setMaskBit(OFFSET, HAS_GLOWING_EFFECT_BIT, value);
+    }
+
+    public void setGlowing(boolean value) {
+        setHasGlowingEffect(value);
+    }
+
     public boolean isSwimming() {
         return getMaskBit(OFFSET, SWIMMING_BIT);
     }
@@ -119,10 +133,6 @@ public class EntityMeta implements EntityMetadataProvider {
         setMaskBit(OFFSET, SWIMMING_BIT, value);
     }
 
-    public void setHasGlowingEffect(boolean value) {
-        setMaskBit(OFFSET, HAS_GLOWING_EFFECT_BIT, value);
-    }
-
     public boolean isFlyingWithElytra() {
         return getMaskBit(OFFSET, FLYING_WITH_ELYTRA_BIT);
     }
@@ -140,11 +150,12 @@ public class EntityMeta implements EntityMetadataProvider {
     }
 
     public Component getCustomName() {
-        return this.metadata.getIndex(customNameOffset(), null);
+        Optional<Component> component = this.metadata.getIndex(customNameOffset(), null);
+        return component.orElse(null);
     }
 
     public void setCustomName(Component value) {
-        this.metadata.setIndex(customNameOffset(), EntityDataTypes.ADV_COMPONENT, value);
+        this.metadata.setIndex(customNameOffset(), EntityDataTypes.OPTIONAL_ADV_COMPONENT, Optional.ofNullable(value));
     }
 
     public boolean isCustomNameVisible() {

api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java

@@ -1,5 +1,9 @@
 package me.tofaa.entitylib.wrapper;
 
+import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityDataType;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
+import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.world.Location;
@@ -44,7 +48,6 @@ public class WrapperEntity implements Tickable, TrackedEntity {
         this.passengers = ConcurrentHashMap.newKeySet();
     }
 
-
     public boolean spawn(Location location) {
         if (spawned) return false;
         this.location = location;

platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/InternalRegistryListener.java

@@ -28,6 +28,7 @@ final class InternalRegistryListener extends PacketListenerAbstract implements L
     public void onPacketSend(PacketSendEvent event) {
         final User user = event.getUser();
         final PacketTypeCommon type = event.getPacketType();
+        
         if (type == PacketType.Play.Server.DESTROY_ENTITIES) {
             WrapperPlayServerDestroyEntities packet = new WrapperPlayServerDestroyEntities(event);
             int[] ids = packet.getEntityIds();

test-plugin/src/main/java/me/tofaa/testentitylib/TestPlayerCommand.java

@@ -38,37 +38,39 @@ public class TestPlayerCommand extends BukkitCommand {
             return false;
         }
         String arg = strings[0].toLowerCase();
-        if (arg.equals("spawn")) {
+        switch (arg) {
-            UserProfile profile = new UserProfile(UUID.randomUUID(), "randomname", new ArrayList<>());
+            case "spawn":
-            p = new WrapperPlayer(profile, EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER));
+                UserProfile profile = new UserProfile(UUID.randomUUID(), "randomname", new ArrayList<>());
-            p.spawn(SpigotConversionUtil.fromBukkitLocation(player.getLocation()));
+                p = new WrapperPlayer(profile, EntityLib.getPlatform().getEntityIdProvider().provide(profile.getUUID(), EntityTypes.PLAYER));
-            p.addViewer(player.getUniqueId());
+                p.spawn(SpigotConversionUtil.fromBukkitLocation(player.getLocation()));
-            ItemStack stack = ItemStack.builder().type(ItemTypes.DIAMOND_BOOTS).build();
+                p.addViewer(player.getUniqueId());
-            p.getEquipment().setBoots(stack);
+                ItemStack stack = ItemStack.builder().type(ItemTypes.DIAMOND_BOOTS).build();
-        }
+                p.getEquipment().setBoots(stack);
-        else if (arg.equals( "texture")) {
+                break;
-            p.setTextureProperties(ExtraConversionUtil.getProfileFromBukkitPlayer(player).getTextureProperties());
+            case "texture":
-            player.sendMessage("texture");
+                p.setTextureProperties(ExtraConversionUtil.getProfileFromBukkitPlayer(player).getTextureProperties());
-        }
+                player.sendMessage("texture");
-        else if (arg.equals( "ping")) {
+                break;
-            p.setLatency(1000);
+            case "ping":
-            player.sendMessage("Pong");
+                p.setLatency(1000);
-        }
+                player.sendMessage("Pong");
-        else if (arg.equals( "gamemode")) {
+                break;
-            p.setGameMode(GameMode.CREATIVE);
+            case "gamemode":
-            player.sendMessage("Gamemode set to creative");
+                p.setGameMode(GameMode.CREATIVE);
-        }
+                player.sendMessage("Gamemode set to creative");
-        else if (arg.equals( "displayname")) {
+                break;
-            p.setDisplayName(Component.text("Hello"));
+            case "displayname":
-            player.sendMessage("Display name set to Hello");
+                p.setDisplayName(Component.text("Hello"));
-        }
+                player.sendMessage("Display name set to Hello");
-        else if (arg.equals( "tablist")) {
+                break;
-            p.setInTablist(!p.isInTablist());
+            case "tablist":
-            player.sendMessage("Tablist " + (p.isInTablist() ? "enabled" : "disabled"));
+                p.setInTablist(!p.isInTablist());
-        }
+                player.sendMessage("Tablist " + (p.isInTablist() ? "enabled" : "disabled"));
-        else if (arg.equals("remove")) {
+                break;
-            p.remove();
+            case "remove":
-            player.sendMessage("Entity removed");
+                p.remove();
+                player.sendMessage("Entity removed");
+                break;
         }
         return true;
     }
@@ -77,7 +79,7 @@ public class TestPlayerCommand extends BukkitCommand {
     @Override
     public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
         if (args.length == 1) {
-            return Arrays.asList(new String[]{"spawn", "texture", "ping", "gamemode", "displayname", "tablist", "remove"});
+            return Arrays.asList("spawn", "texture", "ping", "gamemode", "displayname", "tablist", "remove", "sneak");
         }
         return Collections.emptyList();
     }

test-plugin/src/main/java/me/tofaa/testentitylib/TestTextDisplayCommand.java

@@ -4,6 +4,7 @@ import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import me.tofaa.entitylib.EntityLib;
 import me.tofaa.entitylib.meta.display.TextDisplayMeta;
+import me.tofaa.entitylib.meta.mobs.passive.PigMeta;
 import me.tofaa.entitylib.wrapper.WrapperEntity;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
@@ -24,18 +25,15 @@ public class TestTextDisplayCommand extends BukkitCommand {
         if (!(commandSender instanceof Player)) return true;
         Player player = (Player) commandSender;
         if (e == null) {
-            e = EntityLib.getApi().createEntity(EntityTypes.TEXT_DISPLAY);
+            e = EntityLib.getApi().createEntity(EntityTypes.PIG);
-            if (e == null) {
-                player.sendMessage("Failed to spawn entity");
-                return true;
-            }
             e.spawn(SpigotConversionUtil.fromBukkitLocation(player.getLocation()));
             e.addViewer(player.getUniqueId());
             player.sendMessage("Spawned");
         }
         String msg = String.join(" ", strings);
-        TextDisplayMeta meta = (TextDisplayMeta) e.getEntityMeta();
+        PigMeta meta = (PigMeta) e.getEntityMeta();
-        meta.setText(Component.text(msg));
+        meta.setCustomNameVisible(true);
+        meta.setCustomName(Component.text(msg));
         player.sendMessage("Set text to: " + msg);
         return true;
     }