YouHaveTrouble/NotJustNameplates
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/NotJustNameplates.git synced 2026-05-12 06:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

expose more display entity properties to config

Browse Source
This commit is contained in:
youhavetrouble
2023-07-22 21:35:30 +02:00
parent c675be69e6
commit ca4a3eaf16
4 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/notjustnameplates/NJNConfig.java
+7 -1
View File
@@ -80,6 +80,9 @@ public class NJNConfig {
DisplayContent displayContent = new DisplayContent();
displayContent.setRefreshRate(displayContentSection.getInt("refresh-rate", 0));
displayContent.setSeeThrough(displayContentSection.getBoolean("see-through", false));
displayContent.setInterpolationDelay(displayContentSection.getInt("interpolation-delay", displayContent.getRefreshRate()));
displayContent.setInterpolationDuration(displayContentSection.getInt("interpolation-duration", displayContent.getRefreshRate()));
Display.Billboard billboard = Display.Billboard.HORIZONTAL;
try {
@@ -94,7 +97,10 @@ public class NJNConfig {
if (frameSection == null) return;
String text = frameSection.getString("text", null);
String backgroundColor = frameSection.getString("background");
displayContent.addFrame(new DisplayFrame(text, colorFromHex(backgroundColor)));
float scaleX = (float) frameSection.getDouble("scale-x", 1);
float scaleY = (float) frameSection.getDouble("scale-y", 1);
float scaleZ = (float) frameSection.getDouble("offset-z", 1);
displayContent.addFrame(new DisplayFrame(text, colorFromHex(backgroundColor), scaleX, scaleY, scaleZ));
});
Permission permission = new Permission("notjustnameplates.display." + displayContentSection.getName(), "Allows player to use " + displayContentSection.getName() + " nameplate", PermissionDefault.FALSE);
plugin.getServer().getPluginManager().addPermission(permission);
src/main/java/me/youhavetrouble/notjustnameplates/displays/DisplayContent.java
+28 -4
View File
@@ -10,12 +10,12 @@ import java.util.List;
public class DisplayContent {
private final List<DisplayFrame> frames = new ArrayList<>();
private int refreshRate = 0;
private int currentFrame = 0;
private int refreshRate, interpolationDuration, interpolationDelay, currentFrame;
private Display.Billboard billboard = Display.Billboard.HORIZONTAL;
private boolean seeThrough = false;
public DisplayContent() {}
public DisplayContent() {
}
/**
* Set the refresh rate of the display in ticks. 0 means no refresh rate.
@@ -36,6 +36,30 @@ public class DisplayContent {
return billboard;
}
public void setSeeThrough(boolean seeThrough) {
this.seeThrough = seeThrough;
}
public boolean getSeeThrough() {
return seeThrough;
}
public void setInterpolationDelay(int interpolationDelay) {
this.interpolationDelay = interpolationDelay;
}
public void setInterpolationDuration(int interpolationDuration) {
this.interpolationDuration = interpolationDuration;
}
public int getInterpolationDelay() {
return interpolationDelay;
}
public int getInterpolationDuration() {
return interpolationDuration;
}
public void addFrame(DisplayFrame frame) {
frames.add(frame);
}
src/main/java/me/youhavetrouble/notjustnameplates/displays/DisplayFrame.java
+1 -8
View File
@@ -1,13 +1,6 @@
package me.youhavetrouble.notjustnameplates.displays;
import org.bukkit.Color;
import org.jetbrains.annotations.Nullable;
public record DisplayFrame(String text, Color backgroundColor) {
public DisplayFrame(@Nullable String text, @Nullable Color backgroundColor) {
this.text = text;
this.backgroundColor = backgroundColor;
}
public record DisplayFrame(String text, Color backgroundColor, float scaleX, float scaleY, float scaleZ) {
}
src/main/java/me/youhavetrouble/notjustnameplates/nameplates/Nameplate.java
+27 -8
View File
@@ -60,20 +60,26 @@ public class Nameplate {
textDisplay.setPersistent(false);
textDisplay.setAlignment(alignment);
textDisplay.setBillboard(this.content.getBillboard());
textDisplay.setSeeThrough(this.content.getSeeThrough());
textDisplay.setShadowRadius(0);
textDisplay.setInterpolationDuration(content.getInterpolationDuration());
textDisplay.setInterpolationDelay(content.getInterpolationDelay());
Color backgroundColor = this.content.getCurrentFrame().backgroundColor();
if (backgroundColor != null) textDisplay.setBackgroundColor(backgroundColor);
textDisplay.text(parseText(this.content.getCurrentFrame().text(), player));
textDisplay.setTransformation(
new Transformation(
new Vector3f(0, heightOffset, 0), // offset
new AxisAngle4f(0, 0, 0, 0), // left rotation
new Vector3f(1, 1, 1), // scale
new AxisAngle4f(0, 0, 0, 0) // right rotation
));
textDisplay.setTransformation(new Transformation(
new Vector3f(0, heightOffset, 0), // offset
new AxisAngle4f(0, 0, 0, 0), // left rotation
new Vector3f(
content.getCurrentFrame().scaleX(),
content.getCurrentFrame().scaleY(),
content.getCurrentFrame().scaleZ()
), // scale
new AxisAngle4f(0, 0, 0, 0) // right rotation
));
});
if (!this.visibleForOwner) {
player.hideEntity(NotJustNameplates.getInstance(), textDisplay);
@@ -144,7 +150,17 @@ public class Nameplate {
textDisplay.text(parseText(this.content.getCurrentFrame().text(), player));
textDisplay.setBillboard(this.content.getBillboard());
textDisplay.setInterpolationDuration(content.getRefreshRate());
textDisplay.setTransformation(new Transformation(
new Vector3f(0, heightOffset, 0), // offset
new AxisAngle4f(0, 0, 0, 0), // left rotation
new Vector3f(
content.getCurrentFrame().scaleX(),
content.getCurrentFrame().scaleY(),
content.getCurrentFrame().scaleZ()
), // scale
new AxisAngle4f(0, 0, 0, 0) // right rotation
));
Color backgroundColor = this.content.getCurrentFrame().backgroundColor();
if (backgroundColor == null) {
@@ -153,6 +169,9 @@ public class Nameplate {
textDisplay.setBackgroundColor(backgroundColor);
}
textDisplay.setInterpolationDuration(content.getInterpolationDuration());
textDisplay.setInterpolationDelay(content.getInterpolationDelay());
setVisibleForOwner(this.visibleForOwner || player.hasPermission("notjustnameplates.seeown"));
}