Skip to content

Patch/brightness #15

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

Merged
3add merged 1 commit into from
Jun 1, 2026
Merged

Patch/brightness #15

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
10 changes: 10 additions & 0 deletions src/main/java/dev/threeadd/packeteventssk/api/util/ConversionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public static long toTicks(Timespan timespan) {
return timespan.getAs(Timespan.TimePeriod.TICK);
}

public static int toPackedBrightness(int level) {
int clamped = Math.clamp(level, 0, 15);
return (clamped << 4) | (clamped << 20);
}

public static int fromPackedBrightness(int packed) {
if (packed == -1) return -1;
return (packed >> 4) & 0xF;
}

public static Display.Billboard toBillboard(AbstractDisplayMeta.BillboardConstraints billboardConstraints) {
return Display.Billboard.valueOf(billboardConstraints.name());
}
Expand Down
6 changes: 3 additions & 3 deletions ...java/dev/threeadd/packeteventssk/element/entity/field/meta/DisplayMetaFieldRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ public void register() {
(meta, newBillboard) -> meta.setBillboardConstraints(ConversionUtil.toBillboardConstraints(newBillboard)),
"display billboard constraints", "display billboard")
.optionalField(Number.class,
AbstractDisplayMeta::getBrightnessOverride,
(meta, newNum) -> meta.setBrightnessOverride(newNum.intValue()),
meta -> ConversionUtil.fromPackedBrightness(meta.getBrightnessOverride()),
(meta, newNum) -> meta.setBrightnessOverride(ConversionUtil.toPackedBrightness(newNum.intValue())),
"display brightness override", "display brightness")
.optionalField(Number.class,
AbstractDisplayMeta::getViewRange,
Expand Down Expand Up @@ -297,7 +297,7 @@ else if (display.isAlignRight())

Number brightnessOverride = context.getOptional("display brightness override", Number.class);
if (brightnessOverride != null) {
meta.setBrightnessOverride(brightnessOverride.intValue());
meta.setBrightnessOverride(ConversionUtil.toPackedBrightness(brightnessOverride.intValue()));
}

Number viewRange = context.getOptional("display view range", Number.class);
Expand Down
Loading