From 9fb4b11ce77594be7d2f2022a2378192de05c4ec Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 15 Apr 2024 01:56:10 +0800 Subject: [PATCH] Add back getNameEntity internal method to fix denizen compat --- .../net/citizensnpcs/trait/HologramTrait.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java index b6a0fd3d7..5bf624812 100644 --- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java +++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java @@ -123,6 +123,11 @@ public class HologramTrait extends Trait { return base; } + public Collection getHologramEntities() { + return lines.stream().filter(l -> l.renderer.getEntity() != null).map(l -> l.renderer.getEntity()) + .collect(Collectors.toList()); + } + /** * @return The line height between each hologram line, in blocks */ @@ -137,6 +142,10 @@ public class HologramTrait extends Trait { return Lists.transform(lines, l -> l.text); } + public Entity getNameEntity() { + return nameLine == null ? null : nameLine.renderer.getEntity(); + } + public int getViewRange() { return viewRange; } @@ -424,6 +433,9 @@ public class HologramTrait extends Trait { public static interface HologramRenderer { void destroy(); + @Deprecated + Entity getEntity(); + String getPerPlayerText(NPC npc, Player viewer); default boolean isSneaking(NPC npc, Player player) { @@ -505,6 +517,11 @@ public class HologramTrait extends Trait { } } + @Override + public Entity getEntity() { + return hologram != null ? hologram.getEntity() : null; + } + @Override public String getPerPlayerText(NPC npc, Player viewer) { return Placeholders.replace(text, viewer, npc);