Skip to content

feat: add configurable yaw-offset for display entities #39

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

Open
VitzS7 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

feat: add configurable yaw-offset for display entities #39

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
2 changes: 1 addition & 1 deletion src/main/java/me/geyserextensionists/geyserdisplayentity/entity/ItemDisplayEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public Vector3f bedrockRotation() {
Vector3f fwd = combined.rotate(0f, 0f, 1f);
float yawDeg = (float) Math.toDegrees(Math.atan2(-fwd.getX(), fwd.getZ()));
float pitchDeg = (float) Math.toDegrees(Math.asin(MathUtils.clamp(fwd.getY(), -1f, 1f)));
yawDeg += getYaw();
yawDeg += getYaw() + GeyserDisplayEntity.getExtension().getConfigManager().getYawOffset();
yawDeg = MathUtils.wrapDegrees(yawDeg);
return Vector3f.from(pitchDeg, yawDeg, yawDeg);
}
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/me/geyserextensionists/geyserdisplayentity/managers/ConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class ConfigManager {
private Set<String> hideCustomTypes = Set.of();
private boolean hideUnmappedVanilla = true;
private boolean logDisplays = false;
private float yawOffset = 0f;

public ConfigManager(GeyserDisplayEntity extension) {
this.extension = extension;
Expand All @@ -38,6 +39,7 @@ public void load() {
this.hideCustomTypes = config.contains("hide-custom-types") ? new HashSet<>(config.getStringList("hide-custom-types")) : this.hideTypes;
this.hideUnmappedVanilla = !config.contains("hide-unmapped-vanilla-displays") || config.getBoolean("hide-unmapped-vanilla-displays");
this.logDisplays = config.getBoolean("settings.debug.log-displays");
this.yawOffset = (float) config.getDouble("general.yaw-offset");

if (!Files.exists(GeyserDisplayEntity.getExtension().dataFolder().resolve("Entities"))) {
FileUtils.createFiles(GeyserDisplayEntity.getExtension(), "Entities/item-displays.yml");
Expand Down Expand Up @@ -109,4 +111,8 @@ public boolean isHideUnmappedVanilla() {
public boolean isLogDisplays() {
return logDisplays;
}

public float getYawOffset() {
return yawOffset;
}
}
2 changes: 2 additions & 0 deletions src/main/resources/Extension/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ general:
height: 1.7
# The y-offset of display entity
y-offset: -0.5
# Extra yaw rotation (degrees) added to display entities on Bedrock. 180 = flip to face the other way.
yaw-offset: 180.0
# Use entity scale, instead of entity properties
vanilla-scale: false
vanilla-scale-multiplier: 1
Expand Down