From 34e39c2d92cde48b598bc2e8077fd2349cd5042c Mon Sep 17 00:00:00 2001 From: Oak <55620516+OakLoaf@users.noreply.github.com> Date: Fri, 31 Jan 2025 16:35:29 +0000 Subject: [PATCH] Added getEntityId method to allow additional packet manipulation through the API (#189) --- .../de/oliver/fancyholograms/api/hologram/Hologram.java | 7 +++++++ .../fancyholograms/hologram/version/Hologram1_19_4.java | 5 +++++ .../fancyholograms/hologram/version/Hologram1_20_1.java | 5 +++++ .../fancyholograms/hologram/version/Hologram1_20_2.java | 5 +++++ .../fancyholograms/hologram/version/Hologram1_20_4.java | 5 +++++ .../fancyholograms/hologram/version/HologramImpl.java | 5 +++++ 6 files changed, 32 insertions(+) diff --git a/api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java b/api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java index 37d23542..e9f2319c 100644 --- a/api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java +++ b/api/src/main/java/de/oliver/fancyholograms/api/hologram/Hologram.java @@ -53,6 +53,13 @@ public String getName() { return this.data; } + /** + * Returns the entity id of this hologram + * This id is for packet use only as the entity is not registered to the server + * @return entity id + */ + public abstract int getEntityId(); + /** * Returns the Display entity of this Hologram object. * The entity is not registered in the world or server. diff --git a/implementation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java b/implementation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java index d9f41580..74837bd9 100644 --- a/implementation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java +++ b/implementation_1_19_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_19_4.java @@ -45,6 +45,11 @@ public Hologram1_19_4(@NotNull final HologramData data) { super(data); } + @Override + public int getEntityId() { + return display.getId(); + } + @Override public @Nullable org.bukkit.entity.Display getDisplayEntity() { return display != null ? (org.bukkit.entity.Display) display.getBukkitEntity() : null; diff --git a/implementation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java b/implementation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java index c355f9c6..d7afb5c9 100644 --- a/implementation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java +++ b/implementation_1_20_1/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_1.java @@ -45,6 +45,11 @@ public Hologram1_20_1(@NotNull final HologramData data) { super(data); } + @Override + public int getEntityId() { + return display.getId(); + } + @Override public @Nullable org.bukkit.entity.Display getDisplayEntity() { return display != null ? (org.bukkit.entity.Display) display.getBukkitEntity() : null; diff --git a/implementation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java b/implementation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java index ba6b9966..f7d248fe 100644 --- a/implementation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java +++ b/implementation_1_20_2/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_2.java @@ -45,6 +45,11 @@ public Hologram1_20_2(@NotNull final HologramData data) { super(data); } + @Override + public int getEntityId() { + return display.getId(); + } + @Override public @Nullable org.bukkit.entity.Display getDisplayEntity() { return display != null ? (org.bukkit.entity.Display) display.getBukkitEntity() : null; diff --git a/implementation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java b/implementation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java index f538741f..4f1faaea 100644 --- a/implementation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java +++ b/implementation_1_20_4/src/main/java/de/oliver/fancyholograms/hologram/version/Hologram1_20_4.java @@ -45,6 +45,11 @@ public Hologram1_20_4(@NotNull final HologramData data) { super(data); } + @Override + public int getEntityId() { + return display.getId(); + } + @Override public @Nullable org.bukkit.entity.Display getDisplayEntity() { return display != null ? (org.bukkit.entity.Display) display.getBukkitEntity() : null; diff --git a/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java b/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java index 35fb4814..20325f56 100644 --- a/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java +++ b/src/main/java/de/oliver/fancyholograms/hologram/version/HologramImpl.java @@ -19,6 +19,11 @@ public HologramImpl(@NotNull final HologramData data) { super(data); } + @Override + public int getEntityId() { + return fsDisplay.getId(); + } + @Override public @Nullable org.bukkit.entity.Display getDisplayEntity() { return null;