Skip to content

Move holograms on position update #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Swofty-Developments merged 1 commit into from
Jan 3, 2026
Merged

Move holograms on position update #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions type.generic/src/main/java/net/swofty/type/generic/entity/hologram/PlayerHolograms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,21 @@ public static void removeExternalPlayerHologram(ExternalPlayerHologram hologram)
externalPlayerHolograms.remove(hologram);
}

public static void relocateExternalPlayerHologram(ExternalPlayerHologram hologram, Pos newPosition) {
List<HologramEntity> entities = externalPlayerHolograms.get(hologram);
if (entities == null) return;

double spacing = hologram.getSpacing();
double startY = hologram.text.length * spacing - spacing;
for (int i = 0; i < entities.size(); i++) {
HologramEntity entity = entities.get(i);
entity.setInstance(
hologram.getInstance() != null ? hologram.getInstance() : HypixelConst.getInstanceContainer(),
newPosition.add(0, startY - (i * spacing), 0)
);
}
}

public static void removeExternalPlayerHologramsAt(HypixelPlayer player, Pos position) {
List<ExternalPlayerHologram> toRemove = new ArrayList<>();
for (ExternalPlayerHologram hologram : externalPlayerHolograms.keySet()) {
Expand Down
17 changes: 14 additions & 3 deletions type.generic/src/main/java/net/swofty/type/generic/entity/npc/HypixelNPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,20 @@ public static void updateForPlayer(HypixelPlayer player) {
}

if (needsUpdate && !needsFullUpdate) {
entity.setView(npcPosition.yaw(), npcPosition.pitch());
entity.setInstance(config.instance(), npcPosition);
return;
boolean onlyViewChanged = entity.getPosition().x() == npcPosition.x() && entity.getPosition().z() == npcPosition.z() && entity.getPosition().y() == npcPosition.y();
entity.setView(npcPosition.yaw(), npcPosition.pitch());
entity.setInstance(config.instance(), npcPosition);
if (!onlyViewChanged) {
boolean overflowing = npcHolograms[npcHolograms.length - 1].length() > 16;
float yOffset = overflowing ? -0.2f : 0.0f;
if (config instanceof VillagerConfiguration) {
yOffset = 0.2f;
} else if (config instanceof AnimalConfiguration animalConfig) {
yOffset = animalConfig.hologramYOffset();
}
PlayerHolograms.relocateExternalPlayerHologram(holo, npcPosition.add(0, 1.1f + yOffset, 0));
}
return;
}
if (needsFullUpdate) {
entity.remove();
Expand Down