Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix holder type and name on hover and click events in meta info entries (#2906)

Browse Source
This commit is contained in:
Federico López 2021-02-22 08:14:45 -03:00 committed by GitHub
parent 435e039b38
commit 4018493285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/src/main/java/me/lucko/luckperms/common/locale/Message.java
View File

@ -60,6 +60,7 @@ import java.time.Instant;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.OptionalInt; import java.util.OptionalInt;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -2237,7 +2238,14 @@ public interface Message {
.append(space()) .append(space())
.append(formatContextSetBracketed(node.getContexts(), empty())) .append(formatContextSetBracketed(node.getContexts(), empty()))
.apply(builder -> { .apply(builder -> {
String holderName = holder.getType() == HolderType.GROUP ? holder.getObjectName() : holder.getPlainDisplayName(); InheritanceOriginMetadata origin = node.metadata(InheritanceOriginMetadata.KEY);
String originName;
if (origin.wasInherited(holder.getIdentifier())) {
originName = origin.getOrigin().getName();
} else {
originName = holder.getPlainDisplayName();
}
HolderType originType = HolderType.valueOf(origin.getOrigin().getType().toUpperCase(Locale.ROOT));
boolean explicitGlobalContext = !holder.getPlugin().getConfiguration().getContextsFile().getDefaultContexts().isEmpty(); boolean explicitGlobalContext = !holder.getPlugin().getConfiguration().getContextsFile().getDefaultContexts().isEmpty();
Component hover = join(newline(), Component hover = join(newline(),
@ -2251,10 +2259,10 @@ public interface Message {
translatable() translatable()
.key("luckperms.command.generic.chat-meta.info.click-to-remove") .key("luckperms.command.generic.chat-meta.info.click-to-remove")
.color(GRAY) .color(GRAY)
.args(text(node.getMetaType().toString()), text(holderName)) .args(text(node.getMetaType().toString()), text(originName))
); );
String command = "/" + label + " " + NodeCommandFactory.undoCommand(node, holderName, holder.getType(), explicitGlobalContext); String command = "/" + label + " " + NodeCommandFactory.undoCommand(node, originName, originType, explicitGlobalContext);
builder.hoverEvent(HoverEvent.showText(hover)); builder.hoverEvent(HoverEvent.showText(hover));
builder.clickEvent(ClickEvent.suggestCommand(command)); builder.clickEvent(ClickEvent.suggestCommand(command));
@ -2305,7 +2313,14 @@ public interface Message {
.append(space()) .append(space())
.append(formatContextSetBracketed(node.getContexts(), empty())) .append(formatContextSetBracketed(node.getContexts(), empty()))
.apply(builder -> { .apply(builder -> {
String holderName = holder.getType() == HolderType.GROUP ? holder.getObjectName() : holder.getPlainDisplayName(); InheritanceOriginMetadata origin = node.metadata(InheritanceOriginMetadata.KEY);
String originName;
if (origin.wasInherited(holder.getIdentifier())) {
originName = origin.getOrigin().getName();
} else {
originName = holder.getPlainDisplayName();
}
HolderType originType = HolderType.valueOf(origin.getOrigin().getType().toUpperCase(Locale.ROOT));
boolean explicitGlobalContext = !holder.getPlugin().getConfiguration().getContextsFile().getDefaultContexts().isEmpty(); boolean explicitGlobalContext = !holder.getPlugin().getConfiguration().getContextsFile().getDefaultContexts().isEmpty();
Component hover = join(newline(), Component hover = join(newline(),
@ -2319,10 +2334,10 @@ public interface Message {
translatable() translatable()
.key("luckperms.command.generic.meta.info.click-to-remove") .key("luckperms.command.generic.meta.info.click-to-remove")
.color(GRAY) .color(GRAY)
.args(text(holderName)) .args(text(originName))
); );
String command = "/" + label + " " + NodeCommandFactory.undoCommand(node, holderName, holder.getType(), explicitGlobalContext); String command = "/" + label + " " + NodeCommandFactory.undoCommand(node, originName, originType, explicitGlobalContext);
builder.hoverEvent(HoverEvent.showText(hover)); builder.hoverEvent(HoverEvent.showText(hover));
builder.clickEvent(ClickEvent.suggestCommand(command)); builder.clickEvent(ClickEvent.suggestCommand(command));