Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-10-31 07:51:05 +01:00
Code Issues Projects Releases Wiki Activity

Improve meta info command

Browse Source
This commit is contained in:
Luck 2016-11-04 19:13:39 +00:00
parent 8da96e6e48
commit 6c9041ce40
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/me/lucko/luckperms/common/commands/Util.java
View File

@ -279,15 +279,12 @@ public class Util {
private static MetaComparator metaComparator = null; private static MetaComparator metaComparator = null;
public class MetaComparator implements Comparator<Map.Entry<Integer, String>> { public class MetaComparator implements Comparator<Map.Entry<Integer, Node>> {
@Override @Override
public int compare(Map.Entry<Integer, String> o1, Map.Entry<Integer, String> o2) { public int compare(Map.Entry<Integer, Node> o1, Map.Entry<Integer, Node> o2) {
int result = Integer.compare(o1.getKey(), o2.getKey()); int result = Integer.compare(o1.getKey(), o2.getKey());
if (result == 0) { return result != 0 ? result : 1;
result = o1.getValue().compareTo(o2.getValue());
}
return result;
} }
} }
} }

81
common/src/main/java/me/lucko/luckperms/common/commands/generic/meta/MetaInfo.java
View File

@ -43,30 +43,22 @@ public class MetaInfo extends SecondarySubCommand {
@Override @Override
public CommandResult execute(LuckPermsPlugin plugin, Sender sender, PermissionHolder holder, List<String> args) { public CommandResult execute(LuckPermsPlugin plugin, Sender sender, PermissionHolder holder, List<String> args) {
SortedSet<Map.Entry<Integer, String>> prefixes = new TreeSet<>(Util.getMetaComparator().reversed()); SortedSet<Map.Entry<Integer, Node>> prefixes = new TreeSet<>(Util.getMetaComparator().reversed());
SortedSet<Map.Entry<Integer, String>> suffixes = new TreeSet<>(Util.getMetaComparator().reversed()); SortedSet<Map.Entry<Integer, Node>> suffixes = new TreeSet<>(Util.getMetaComparator().reversed());
Set<Node> meta = new HashSet<>();
// Collect data
for (Node node : holder.getAllNodes(null, Contexts.allowAll())) { for (Node node : holder.getAllNodes(null, Contexts.allowAll())) {
if (!node.isSuffix() && !node.isPrefix()) { if (!node.isSuffix() && !node.isPrefix() && !node.isMeta()) {
continue; continue;
} }
StringBuilder sb = new StringBuilder();
if (node.isServerSpecific()) {
if (node.isWorldSpecific()) {
sb.append("&6W=").append(node.getWorld().get()).append(" ");
}
sb.append("&6S=").append(node.getServer().get()).append(" ");
}
if (node.isPrefix()) { if (node.isPrefix()) {
sb.append(node.getPrefix().getValue()); prefixes.add(new AbstractMap.SimpleEntry<>(node.getPrefix().getKey(), node));
prefixes.add(new AbstractMap.SimpleEntry<>(node.getPrefix().getKey(), sb.toString())); } else if (node.isSuffix()) {
} suffixes.add(new AbstractMap.SimpleEntry<>(node.getSuffix().getKey(), node));
} else if (node.isMeta()) {
if (node.isSuffix()) { meta.add(node);
sb.append(node.getSuffix().getValue());
suffixes.add(new AbstractMap.SimpleEntry<>(node.getSuffix().getKey(), sb.toString()));
} }
} }
@ -74,8 +66,20 @@ public class MetaInfo extends SecondarySubCommand {
Message.CHAT_META_PREFIX_NONE.send(sender, holder.getFriendlyName()); Message.CHAT_META_PREFIX_NONE.send(sender, holder.getFriendlyName());
} else { } else {
Message.CHAT_META_PREFIX_HEADER.send(sender, holder.getFriendlyName()); Message.CHAT_META_PREFIX_HEADER.send(sender, holder.getFriendlyName());
for (Map.Entry<Integer, String> e : prefixes) { for (Map.Entry<Integer, Node> e : prefixes) {
Message.CHAT_META_ENTRY.send(sender, e.getKey(), e.getValue()); if (e.getValue().isServerSpecific() || e.getValue().isWorldSpecific()) {
StringBuilder sb = new StringBuilder();
if (e.getValue().isServerSpecific()) {
sb.append(" &8(&7server=&f").append(e.getValue().getServer().get()).append("&8)");
}
if (e.getValue().isWorldSpecific()) {
sb.append(" &8(&7world=&f").append(e.getValue().getWorld().get()).append("&8)");
}
Message.CHAT_META_ENTRY_WITH_CONTEXT.send(sender, e.getKey(), e.getValue().getPrefix().getValue(), sb.toString());
} else {
Message.CHAT_META_ENTRY.send(sender, e.getKey(), e.getValue().getPrefix().getValue());
}
} }
} }
@ -83,8 +87,41 @@ public class MetaInfo extends SecondarySubCommand {
Message.CHAT_META_SUFFIX_NONE.send(sender, holder.getFriendlyName()); Message.CHAT_META_SUFFIX_NONE.send(sender, holder.getFriendlyName());
} else { } else {
Message.CHAT_META_SUFFIX_HEADER.send(sender, holder.getFriendlyName()); Message.CHAT_META_SUFFIX_HEADER.send(sender, holder.getFriendlyName());
for (Map.Entry<Integer, String> e : suffixes) { for (Map.Entry<Integer, Node> e : suffixes) {
Message.CHAT_META_ENTRY.send(sender, e.getKey(), e.getValue()); if (e.getValue().isServerSpecific() || e.getValue().isWorldSpecific()) {
StringBuilder sb = new StringBuilder();
if (e.getValue().isServerSpecific()) {
sb.append(" &8(&7server=&f").append(e.getValue().getServer().get()).append("&8)");
}
if (e.getValue().isWorldSpecific()) {
sb.append(" &8(&7world=&f").append(e.getValue().getWorld().get()).append("&8)");
}
Message.CHAT_META_ENTRY_WITH_CONTEXT.send(sender, e.getKey(), e.getValue().getSuffix().getValue(), sb.toString());
} else {
Message.CHAT_META_ENTRY.send(sender, e.getKey(), e.getValue().getSuffix().getValue());
}
}
}
if (meta.isEmpty()) {
Message.META_NONE.send(sender, holder.getFriendlyName());
} else {
Message.META_HEADER.send(sender, holder.getFriendlyName());
for (Node m : meta) {
if (m.isServerSpecific() || m.isWorldSpecific()) {
StringBuilder sb = new StringBuilder();
if (m.isServerSpecific()) {
sb.append(" &8(&7server=&f").append(m.getServer().get()).append("&8)");
}
if (m.isWorldSpecific()) {
sb.append(" &8(&7world=&f").append(m.getWorld().get()).append("&8)");
}
Message.META_ENTRY_WITH_CONTEXT.send(sender, m.getMeta().getKey(), m.getMeta().getValue(), sb.toString());
} else {
Message.META_ENTRY.send(sender, m.getMeta().getKey(), m.getMeta().getValue());
}
} }
} }

7
common/src/main/java/me/lucko/luckperms/common/constants/Message.java
View File

@ -199,9 +199,14 @@ public enum Message {
CHAT_META_PREFIX_HEADER("&b{0}'s Prefixes", true), CHAT_META_PREFIX_HEADER("&b{0}'s Prefixes", true),
CHAT_META_SUFFIX_HEADER("&b{0}'s Suffixes", true), CHAT_META_SUFFIX_HEADER("&b{0}'s Suffixes", true),
CHAT_META_ENTRY("&b-> &b{0} &f- &f\"{1}&f\"", true), META_HEADER("&b{0}'s Meta", true),
CHAT_META_ENTRY("&b-> {0} &f- &f\"{1}&f\"", true),
CHAT_META_ENTRY_WITH_CONTEXT("&b-> {0} &f- &f\"{1}&f\"{2}", true),
META_ENTRY("&b-> &a{0} &f= &f\"{1}&f\"", true),
META_ENTRY_WITH_CONTEXT("&b-> &a{0} &f= &f\"{1}&f\"{2}", true),
CHAT_META_PREFIX_NONE("&b{0} has no prefixes.", true), CHAT_META_PREFIX_NONE("&b{0} has no prefixes.", true),
CHAT_META_SUFFIX_NONE("&b{0} has no suffixes.", true), CHAT_META_SUFFIX_NONE("&b{0} has no suffixes.", true),
META_NONE("&b{0} has no meta.", true),
META_INVALID_PRIORITY("Invalid priority '{0}'. Expected a number.", true), META_INVALID_PRIORITY("Invalid priority '{0}'. Expected a number.", true),
ALREADY_HAS_PREFIX("{0} already has that prefix set.", true), ALREADY_HAS_PREFIX("{0} already has that prefix set.", true),

7
default-lang.yml
View File

@ -154,9 +154,14 @@ past-date-error: "You cannot set a date in the past!"
chat-meta-prefix-header: "&b{0}'s Prefixes" chat-meta-prefix-header: "&b{0}'s Prefixes"
chat-meta-suffix-header: "&b{0}'s Suffixes" chat-meta-suffix-header: "&b{0}'s Suffixes"
chat-meta-entry: "&b-> &b{0} &f- &f\"{1}&f\"" meta-header: "&b{0}'s Meta"
chat-meta-entry: "&b-> {0} &f- &f\"{1}&f\""
chat-meta-entry-with-context: "&b-> {0} &f- &f\"{1}&f\"{2}"
meta-entry: "&b-> &a{0} &f= &f\"{1}&f\""
meta-entry-with-context: "&b-> &a{0} &f= &f\"{1}&f\"{2}"
chat-meta-prefix-none: "&b{0} has no prefixes." chat-meta-prefix-none: "&b{0} has no prefixes."
chat-meta-suffix-none: "&b{0} has no suffixes." chat-meta-suffix-none: "&b{0} has no suffixes."
meta-none: "&b{0} has no meta."
meta-invalid-priority: "Invalid priority '{0}'. Expected a number." meta-invalid-priority: "Invalid priority '{0}'. Expected a number."
already-has-prefix: "{0} already has that prefix set." already-has-prefix: "{0} already has that prefix set."