Fix two bugs with new hologram trait impl
This commit is contained in:
parent
9fb4b11ce7
commit
1e368e71a5
|
@ -48,7 +48,7 @@ import net.citizensnpcs.util.Util;
|
||||||
* Manages a set of <em>holograms</em> attached to the NPC. Holograms are lines of text or items that follow the NPC at
|
* Manages a set of <em>holograms</em> attached to the NPC. Holograms are lines of text or items that follow the NPC at
|
||||||
* some offset (typically vertically offset).
|
* some offset (typically vertically offset).
|
||||||
*/
|
*/
|
||||||
// TODO: cleanup
|
// TODO: cleanup: make HologramRenderer static, possibly make it singleton-friendly?
|
||||||
@TraitName("hologramtrait")
|
@TraitName("hologramtrait")
|
||||||
public class HologramTrait extends Trait {
|
public class HologramTrait extends Trait {
|
||||||
private Location currentLoc;
|
private Location currentLoc;
|
||||||
|
@ -97,6 +97,11 @@ public class HologramTrait extends Trait {
|
||||||
reloadLineHolograms();
|
reloadLineHolograms();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void addTemporaryLine(String text, int ticks, HologramRenderer hr) {
|
||||||
|
lines.add(new HologramLine(text, false, ticks, hr));
|
||||||
|
reloadLineHolograms();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clears all hologram lines
|
* Clears all hologram lines
|
||||||
*/
|
*/
|
||||||
|
@ -395,7 +400,7 @@ public class HologramTrait extends Trait {
|
||||||
}
|
}
|
||||||
|
|
||||||
public HologramLine(String text, boolean persist, int ticks, HologramRenderer hr) {
|
public HologramLine(String text, boolean persist, int ticks, HologramRenderer hr) {
|
||||||
if (ITEM_MATCHER.matcher(text).matches()) {
|
if (ITEM_MATCHER.matcher(text).find()) {
|
||||||
mb = 0.21;
|
mb = 0.21;
|
||||||
mt = 0.07;
|
mt = 0.07;
|
||||||
hr = new ItemRenderer();
|
hr = new ItemRenderer();
|
||||||
|
@ -420,7 +425,7 @@ public class HologramTrait extends Trait {
|
||||||
|
|
||||||
public void setText(String text) {
|
public void setText(String text) {
|
||||||
this.text = text == null ? "" : text;
|
this.text = text == null ? "" : text;
|
||||||
if (ITEM_MATCHER.matcher(text).matches()) {
|
if (ITEM_MATCHER.matcher(text).find()) {
|
||||||
renderer.destroy();
|
renderer.destroy();
|
||||||
mb = 0.21;
|
mb = 0.21;
|
||||||
mt = 0.07;
|
mt = 0.07;
|
||||||
|
@ -479,6 +484,7 @@ public class HologramTrait extends Trait {
|
||||||
@Override
|
@Override
|
||||||
protected NPC createNPC(Entity base, String name, Vector3d offset) {
|
protected NPC createNPC(Entity base, String name, Vector3d offset) {
|
||||||
Matcher itemMatcher = ITEM_MATCHER.matcher(name);
|
Matcher itemMatcher = ITEM_MATCHER.matcher(name);
|
||||||
|
itemMatcher.find();
|
||||||
Material item = SpigotUtil.isUsing1_13API() ? Material.matchMaterial(itemMatcher.group(1), false)
|
Material item = SpigotUtil.isUsing1_13API() ? Material.matchMaterial(itemMatcher.group(1), false)
|
||||||
: Material.matchMaterial(itemMatcher.group(1));
|
: Material.matchMaterial(itemMatcher.group(1));
|
||||||
ItemStack itemStack = new ItemStack(item, 1);
|
ItemStack itemStack = new ItemStack(item, 1);
|
||||||
|
@ -555,13 +561,13 @@ public class HologramTrait extends Trait {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateText(NPC npc, String text) {
|
public void updateText(NPC npc, String raw) {
|
||||||
this.text = Placeholders.replace(text, null, npc);
|
this.text = Placeholders.replace(raw, null, npc);
|
||||||
if (hologram == null)
|
if (hologram == null)
|
||||||
return;
|
return;
|
||||||
hologram.setName(text);
|
hologram.setName(text);
|
||||||
if (!Placeholders.containsPlaceholders(text)) {
|
if (!Placeholders.containsPlaceholders(raw)) {
|
||||||
hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, Messaging.stripColor(text).length() > 0);
|
hologram.data().set(NPC.Metadata.NAMEPLATE_VISIBLE, Messaging.stripColor(raw).length() > 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -600,7 +606,7 @@ public class HologramTrait extends Trait {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Pattern ITEM_MATCHER = Pattern.compile("<item:(.*?)([:].*?)?>");
|
private static final Pattern ITEM_MATCHER = Pattern.compile("<item:([a-zA-Z0-9_ ]*?)([:].*?)?>");
|
||||||
private static boolean SUPPORTS_DISPLAY = false;
|
private static boolean SUPPORTS_DISPLAY = false;
|
||||||
static {
|
static {
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in New Issue