From 6b05e47deb48ac943d351fd2a3efcebb32f05d8e Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 20 Oct 2020 13:10:39 +0100 Subject: [PATCH] Include expiry in meta info command (#2663) --- .../luckperms/common/locale/Message.java | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java index 3e7b7107e..b2c71cab8 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/Message.java @@ -2139,12 +2139,28 @@ public interface Message { ); Args3, PermissionHolder, String> CHAT_META_ENTRY = (node, holder, label) -> prefixed(text() - // "&b-> {} &f- &f'{}&f' &8(&7inherited from &a{}&8) {}" + // "&b-> {} &f- &f'{}&f' &8(&7expires in &b{}&8) &8(&7inherited from &a{}&8) {}" .append(text("->", AQUA)) .append(space()) .append(text(node.getPriority(), AQUA)) .append(text(" - ", WHITE)) .append(text().color(WHITE).append(text('\'')).append(formatColoredValue(node.getMetaValue())).append(text('\''))) + .apply(builder -> { + if (node.hasExpiry()) { + builder.append(space()); + builder.append(text() + .color(DARK_GRAY) + .append(OPEN_BRACKET) + .append(translatable() + .key("luckperms.command.generic.info.expires-in") + .color(GRAY) + .append(space()) + .append(text(DurationFormatter.CONCISE.format(node.getExpiryDuration()), AQUA)) + ) + .append(CLOSE_BRACKET) + ); + } + }) .append(space()) .append(text() .color(DARK_GRAY) @@ -2191,12 +2207,28 @@ public interface Message { )); Args3 META_ENTRY = (node, holder, label) -> prefixed(text() - // "&b-> &a{} &f= &f'{}&f' &8(&7inherited from &a{}&8) {}" + // "&b-> &a{} &f= &f'{}&f' &8(&7expires in &b{}&8) &8(&7inherited from &a{}&8) {}" .append(text("->", AQUA)) .append(space()) .append(text(node.getMetaKey(), GREEN)) .append(text(" = ", WHITE)) .append(text().color(WHITE).append(text('\'')).append(formatColoredValue(node.getMetaValue())).append(text('\''))) + .apply(builder -> { + if (node.hasExpiry()) { + builder.append(space()); + builder.append(text() + .color(DARK_GRAY) + .append(OPEN_BRACKET) + .append(translatable() + .key("luckperms.command.generic.info.expires-in") + .color(GRAY) + .append(space()) + .append(text(DurationFormatter.CONCISE.format(node.getExpiryDuration()), AQUA)) + ) + .append(CLOSE_BRACKET) + ); + } + }) .append(space()) .append(text() .color(DARK_GRAY)