Upstream
/
HolographicDisplays
mirror of https://github.com/filoghost/HolographicDisplays.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add back support for placeholder toggle

This commit is contained in:
filoghost 2021-07-25 20:18:28 +02:00
parent 51b0f7fd30
commit ed73b8e098
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/me/filoghost/holographicdisplays/common/hologram/StandardHologramLine.java
View File

@ -15,4 +15,6 @@ public interface StandardHologramLine extends StandardHologramComponent {
double getHeight();
void setChanged();
}

3
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java
View File

@ -101,6 +101,9 @@ public class APIHologram extends BaseHologram<APIHologramLine> implements Hologr
}
this.allowPlaceholders = allowPlaceholders;
for (APIHologramLine line : getLines()) {
line.setChanged();
}
}
@Override

3
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologramLine.java
View File

@ -30,7 +30,8 @@ public abstract class BaseHologramLine extends BaseHologramComponent implements
return hologram;
}
protected void setChanged() {
@Override
public void setChanged() {
tracker.setLineChanged();
}

2
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/tracking/DisplayText.java
View File

@ -26,7 +26,7 @@ class DisplayText {
void set(@Nullable String textString) {
textWithoutReplacements = StringWithPlaceholders.of(textString);
textWithGlobalReplacements = null;
textWithGlobalReplacements = textWithoutReplacements;
}
String get() {

19
plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/tracking/TextLineTracker.java
View File

@ -20,6 +20,7 @@ public class TextLineTracker extends TouchableLineTracker<StandardTextLine> {
private final DisplayText displayText;
private boolean displayTextChanged;
private boolean allowPlaceholders;
public TextLineTracker(StandardTextLine line, NMSManager nmsManager, PlaceholderTracker placeholderTracker) {
super(line, nmsManager);
@ -29,6 +30,10 @@ public class TextLineTracker extends TouchableLineTracker<StandardTextLine> {
@Override
protected boolean updatePlaceholders() {
if (!allowPlaceholders) {
return false;
}
boolean placeholdersChanged = displayText.updateGlobalReplacements();
if (placeholdersChanged) {
displayTextChanged = true; // Mark as changed to trigger a packet send with updated placeholders
@ -46,6 +51,12 @@ public class TextLineTracker extends TouchableLineTracker<StandardTextLine> {
this.displayText.set(displayText);
this.displayTextChanged = true;
}
boolean allowPlaceholders = line.isAllowPlaceholders();
if (this.allowPlaceholders != allowPlaceholders) {
this.allowPlaceholders = allowPlaceholders;
this.displayTextChanged = true;
}
}
@MustBeInvokedByOverriders
@ -60,7 +71,9 @@ public class TextLineTracker extends TouchableLineTracker<StandardTextLine> {
protected void addSpawnPackets(NMSPacketList packetList) {
super.addSpawnPackets(packetList);
if (displayText.containsIndividualPlaceholders()) {
if (!allowPlaceholders) {
packetList.addArmorStandSpawnPackets(armorStandEntityID, locationX, getArmorStandLocationY(), locationZ, displayText.get());
} else if (displayText.containsIndividualPlaceholders()) {
packetList.addArmorStandSpawnPackets(armorStandEntityID, locationX, getArmorStandLocationY(), locationZ, displayText::getWithIndividualReplacements);
} else {
packetList.addArmorStandSpawnPackets(armorStandEntityID, locationX, getArmorStandLocationY(), locationZ, displayText.getWithGlobalReplacements());
@ -79,7 +92,9 @@ public class TextLineTracker extends TouchableLineTracker<StandardTextLine> {
super.addChangesPackets(packetList);
if (displayTextChanged) {
if (displayText.containsIndividualPlaceholders()) {
if (!allowPlaceholders) {
packetList.addArmorStandNameChangePackets(armorStandEntityID, displayText.get());
} else if (displayText.containsIndividualPlaceholders()) {
packetList.addArmorStandNameChangePackets(armorStandEntityID, displayText::getWithIndividualReplacements);
} else {
packetList.addArmorStandNameChangePackets(armorStandEntityID, displayText.getWithGlobalReplacements());