Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 10:36:10 +01:00
Code Issues Projects Releases Wiki Activity

Add per-line margin to hologram lines for items

Browse Source
This commit is contained in:
fullwall 2023-02-14 23:19:45 +08:00
parent 9cebd487f7
commit 9bf3194710
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
View File

@ -130,7 +130,15 @@ public class HologramTrait extends Trait {
}
private double getHeight(int lineNumber) {
return getLineHeight() * (lastNameplateVisible ? lineNumber + 1 : lineNumber);
double base = (lastNameplateVisible ? 0 : -getLineHeight());
for (int i = 0; i <= lineNumber; i++) {
HologramLine line = lines.get(i);
base += line.mb + getLineHeight();
if (i != lineNumber) {
base += line.mt;
}
}
return base;
}
/**
@ -156,7 +164,7 @@ public class HologramTrait extends Trait {
}
private double getMaxHeight() {
return getLineHeight() * (lines.size() + (lastNameplateVisible ? 1 : -1));
return (lastNameplateVisible ? getLineHeight() : 0) + getHeight(lines.size() - 1);
}
/**
@ -371,6 +379,7 @@ public class HologramTrait extends Trait {
private class HologramLine {
NPC hologram;
double mb, mt;
boolean persist;
String text;
int ticks;
@ -383,6 +392,10 @@ public class HologramTrait extends Trait {
this.text = text;
this.persist = persist;
this.ticks = ticks;
if (ITEM_MATCHER.matcher(text).matches()) {
mb = 0.21;
mt = 0.07;
}
}
public void removeNPC() {