Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 19:46:32 +01:00
Code Issues Projects Releases Wiki Activity

Update some ugly messages

Browse Source
This commit is contained in:
Luck 2016-10-31 22:25:42 +00:00
parent d2de26f765
commit 42882ebe11
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
4 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/me/lucko/luckperms/common/commands/CommandManager.java
View File

@ -206,6 +206,7 @@ public class CommandManager {
args.remove(2); args.remove(2);
args.add(2, "permission"); args.add(2, "permission");
break; break;
case "chat":
case "m": case "m":
args.remove(2); args.remove(2);
args.add(2, "meta"); args.add(2, "meta");
@ -214,7 +215,10 @@ public class CommandManager {
case "inherit": case "inherit":
case "inheritances": case "inheritances":
case "group": case "group":
case "groups":
case "rank": case "rank":
case "ranks":
case "parents":
args.remove(2); args.remove(2);
args.add(2, "parent"); args.add(2, "parent");
break; break;

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

@ -156,10 +156,10 @@ public class Util {
sb.append("&3> ").append(node.getValue() ? "&a" : "&c"); sb.append("&3> ").append(node.getValue() ? "&a" : "&c");
sb.append(node.getPermission()); sb.append(node.getPermission());
if (node.isServerSpecific()) { if (node.isServerSpecific()) {
sb.append(" &7(&f").append(node.getServer().get()).append("&7)"); sb.append(" &8(&7server=&f").append(node.getServer().get()).append("&8)");
} }
if (node.isWorldSpecific()) { if (node.isWorldSpecific()) {
sb.append(" &7(&f").append(node.getWorld().get()).append("&7)"); sb.append(" &8(&7world&f").append(node.getWorld().get()).append("&8)");
} }
sb.append("\n"); sb.append("\n");
} }
@ -182,13 +182,13 @@ public class Util {
sb.append("&3> ").append(node.getValue() ? "&a" : "&c"); sb.append("&3> ").append(node.getValue() ? "&a" : "&c");
sb.append(node.getPermission()); sb.append(node.getPermission());
if (node.isServerSpecific()) { if (node.isServerSpecific()) {
sb.append(" &7(&f").append(node.getServer().get()).append("&7)"); sb.append(" &8(&7server=&f").append(node.getServer().get()).append("&8)");
} }
if (node.isWorldSpecific()) { if (node.isWorldSpecific()) {
sb.append(" &7(&f").append(node.getWorld().get()).append("&7)"); sb.append(" &8(&7world=&f").append(node.getWorld().get()).append("&8)");
} }
sb.append("&6 - expires in ").append(DateUtil.formatDateDiff(node.getExpiryUnixTime())).append("\n"); sb.append("\n&2- expires in ").append(DateUtil.formatDateDiff(node.getExpiryUnixTime())).append("\n");
} }
if (sb.length() == 0) { if (sb.length() == 0) {
@ -211,10 +211,10 @@ public class Util {
sb.append("&3> &f").append(node.getGroupName()); sb.append("&3> &f").append(node.getGroupName());
if (node.isServerSpecific()) { if (node.isServerSpecific()) {
sb.append(" &7(&f").append(node.getServer().get()).append("&7)"); sb.append(" &8(&7server=&f").append(node.getServer().get()).append("&8)");
} }
if (node.isWorldSpecific()) { if (node.isWorldSpecific()) {
sb.append(" &7(&f").append(node.getWorld().get()).append("&7)"); sb.append(" &8(&7world=&f").append(node.getWorld().get()).append("&8)");
} }
sb.append("\n"); sb.append("\n");
} }
@ -240,13 +240,13 @@ public class Util {
sb.append("&3> &f").append(node.getGroupName()); sb.append("&3> &f").append(node.getGroupName());
if (node.isServerSpecific()) { if (node.isServerSpecific()) {
sb.append(" &7(&f").append(node.getServer().get()).append("&7)"); sb.append(" &8(&7server=&f").append(node.getServer().get()).append("&8)");
} }
if (node.isWorldSpecific()) { if (node.isWorldSpecific()) {
sb.append(" &7(&f").append(node.getWorld().get()).append("&7)"); sb.append(" &8(&7world=&f").append(node.getWorld().get()).append("&8)");
} }
sb.append("&6 - expires in ").append(DateUtil.formatDateDiff(node.getExpiryUnixTime())).append("\n"); sb.append("\n&2- expires in ").append(DateUtil.formatDateDiff(node.getExpiryUnixTime())).append("\n");
} }
if (sb.length() == 0) { if (sb.length() == 0) {

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

@ -119,18 +119,18 @@ public enum Message {
UPDATE_TASK_PUSH_FAILURE("&cError whilst pushing changes to other servers. Is Redis enabled?", true), UPDATE_TASK_PUSH_FAILURE("&cError whilst pushing changes to other servers. Is Redis enabled?", true),
INFO( INFO(
"{PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2." + "\n" + "{PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2." + "\n" +
"{PREFIX}&f-> &3Platform: &f{1}" + "\n" + "{PREFIX}&f- &3Platform: &f{1}" + "\n" +
"{PREFIX}&f-> &3Storage Method: &f{2}" + "\n" + "{PREFIX}&f- &3Storage Method: &f{2}" + "\n" +
"{PREFIX}&f-> &3Server Name: &f{3}" + "\n" + "{PREFIX}&f- &3Server Name: &f{3}" + "\n" +
"{PREFIX}&f-> &3Sync Interval: &f{4} minutes" + "\n" + "{PREFIX}&f- &3Sync Interval: &f{4} minutes" + "\n" +
"{PREFIX}&f-> &3Include Global: &f{5}" + "\n" + "{PREFIX}&f- &3Include Global: &f{5}" + "\n" +
"{PREFIX}&f-> &3Include Global World: &f{6}" + "\n" + "{PREFIX}&f- &3Include Global World: &f{6}" + "\n" +
"{PREFIX}&f-> &3Apply Global Groups: &f{7}" + "\n" + "{PREFIX}&f- &3Apply Global Groups: &f{7}" + "\n" +
"{PREFIX}&f-> &3Apply Global World Groups: &f{8}" + "\n" + "{PREFIX}&f- &3Apply Global World Groups: &f{8}" + "\n" +
"{PREFIX}&f-> &3Online Mode: &f{9}" + "\n" + "{PREFIX}&f- &3Online Mode: &f{9}" + "\n" +
"{PREFIX}&f-> &3Apply Wildcards: &f{10}" + "\n" + "{PREFIX}&f- &3Apply Wildcards: &f{10}" + "\n" +
"{PREFIX}&f-> &3Apply Regex: &f{11}" + "\n" + "{PREFIX}&f- &3Apply Regex: &f{11}" + "\n" +
"{PREFIX}&f-> &3Apply Shorthand: &f{12}", "{PREFIX}&f- &3Apply Shorthand: &f{12}",
false false
), ),
DEBUG( DEBUG(
@ -254,13 +254,13 @@ public enum Message {
BULK_CHANGE_SUCCESS("&aApplied bulk change successfully. {0} records were changed.", true), BULK_CHANGE_SUCCESS("&aApplied bulk change successfully. {0} records were changed.", true),
USER_INFO( USER_INFO(
"{PREFIX}&f-> &3User: &f{0}" + "\n" + "{PREFIX}&b&l> &bUser Info: &f{0}" + "\n" +
"{PREFIX}&f-> &3UUID: &f{1}" + "\n" + "{PREFIX}&f- &3UUID: &f{1}" + "\n" +
"{PREFIX}&f-> &3Status: {2}" + "\n" + "{PREFIX}&f- &3Status: {2}" + "\n" +
"{PREFIX}&f-> &3Primary Group: &f{3}" + "\n" + "{PREFIX}&f- &3Primary Group: &f{3}" + "\n" +
"{PREFIX}&f-> &3Permissions: &f{4}" + "\n" + "{PREFIX}&f- &3Permissions: &f{4}" + "\n" +
"{PREFIX}&f-> &3Temporary Permissions: &f{5}" + "\n" + "{PREFIX}&f- &3Temporary Permissions: &f{5}" + "\n" +
"{PREFIX}&f-> &3Use &b/{6} user {7} listnodes &3to see all permissions.", "{PREFIX}&f- &3Use &b/{6} user {7} permission info &3to see all permissions.",
false false
), ),
USER_GETUUID("&bThe UUID of &b{0}&b is &b{1}&b.", true), USER_GETUUID("&bThe UUID of &b{0}&b is &b{1}&b.", true),
@ -290,16 +290,16 @@ public enum Message {
USER_SHOWPOS("&aShowing &b{0}&a's position on track &b{1}&a.\n{2}", true), USER_SHOWPOS("&aShowing &b{0}&a's position on track &b{1}&a.\n{2}", true),
GROUP_INFO( GROUP_INFO(
"{PREFIX}&f-> &3Group: &f{0}" + "\n" + "{PREFIX}&b&l> &bGroup Info: &f{0}" + "\n" +
"{PREFIX}&f-> &3Permissions: &f{1}" + "\n" + "{PREFIX}&f- &3Permissions: &f{1}" + "\n" +
"{PREFIX}&f-> &3Temporary Permissions: &f{2}" + "\n" + "{PREFIX}&f- &3Temporary Permissions: &f{2}" + "\n" +
"{PREFIX}&f-> &3Use &b/{3} group {4} listnodes &3to see all permissions.", "{PREFIX}&f- &3Use &b/{3} group {4} permission info &3to see all permissions.",
false false
), ),
TRACK_INFO( TRACK_INFO(
"{PREFIX}&f-> &3Track: &f{0}" + "\n" + "{PREFIX}&b&l> Showing Track: &f{0}" + "\n" +
"{PREFIX}&f-> &3Path: &f{1}", "{PREFIX}&f- &7Path: &f{1}",
false false
), ),
TRACK_CLEAR("&b{0}&a's groups track was cleared.", true), TRACK_CLEAR("&b{0}&a's groups track was cleared.", true),

50
default-lang.yml
View File

@ -80,18 +80,18 @@ update-task-push-success: "&aOther servers were notified successfully."
update-task-push-failure: "&cError whilst pushing changes to other servers. Is Redis enabled?" update-task-push-failure: "&cError whilst pushing changes to other servers. Is Redis enabled?"
info: > info: >
{PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2.\n {PREFIX}&2Running &bLuckPerms v{0}&2 by &bLuck&2.\n
{PREFIX}&f-> &3Platform: &f{1}\n {PREFIX}&f- &3Platform: &f{1}\n
{PREFIX}&f-> &3Storage Method: &f{2}\n {PREFIX}&f- &3Storage Method: &f{2}\n
{PREFIX}&f-> &3Server Name: &f{3}\n {PREFIX}&f- &3Server Name: &f{3}\n
{PREFIX}&f-> &3Sync Interval: &f{4} minutes\n {PREFIX}&f- &3Sync Interval: &f{4} minutes\n
{PREFIX}&f-> &3Include Global: &f{5}\n {PREFIX}&f- &3Include Global: &f{5}\n
{PREFIX}&f-> &3Include Global World: &f{6}\n {PREFIX}&f- &3Include Global World: &f{6}\n
{PREFIX}&f-> &3Apply Global Groups: &f{7}\n {PREFIX}&f- &3Apply Global Groups: &f{7}\n
{PREFIX}&f-> &3Apply Global World Groups: &f{8}\n {PREFIX}&f- &3Apply Global World Groups: &f{8}\n
{PREFIX}&f-> &3Online Mode: &f{9}\n {PREFIX}&f- &3Online Mode: &f{9}\n
{PREFIX}&f-> &3Apply Wildcards: &f{10}\n {PREFIX}&f- &3Apply Wildcards: &f{10}\n
{PREFIX}&f-> &3Apply Regex: &f{11}\n {PREFIX}&f- &3Apply Regex: &f{11}\n
{PREFIX}&f-> &3Apply Shorthand: &f{12} {PREFIX}&f- &3Apply Shorthand: &f{12}
debug: > debug: >
{PREFIX}&d&l> &dDebug Info\n {PREFIX}&d&l> &dDebug Info\n
{PREFIX}&f> &3Online Players: &f{0}\n {PREFIX}&f> &3Online Players: &f{0}\n
@ -207,13 +207,13 @@ bulk-change-type-error: "Invalid type. Was expecting 'server' or 'world'."
bulk-change-success: "&aApplied bulk change successfully. {0} records were changed." bulk-change-success: "&aApplied bulk change successfully. {0} records were changed."
user-info: > user-info: >
{PREFIX}&f-> &3User: &f{0}\n {PREFIX}&b&l> &bUser Info: &f{0}\n
{PREFIX}&f-> &3UUID: &f{1}\n {PREFIX}&f- &3UUID: &f{1}\n
{PREFIX}&f-> &3Status: {2}\n {PREFIX}&f- &3Status: {2}\n
{PREFIX}&f-> &3Primary Group: &f{3}\n {PREFIX}&f- &3Primary Group: &f{3}\n
{PREFIX}&f-> &3Permissions: &f{4}\n {PREFIX}&f- &3Permissions: &f{4}\n
{PREFIX}&f-> &3Temporary Permissions: &f{5}\n {PREFIX}&f- &3Temporary Permissions: &f{5}\n
{PREFIX}&f-> &3Use &b/{6} user {7} listnodes &3to see all permissions. {PREFIX}&f- &3Use &b/{6} user {7} permission info &3to see all permissions.
user-getuuid: "&bThe UUID of &b{0}&b is &b{1}&b." user-getuuid: "&bThe UUID of &b{0}&b is &b{1}&b."
user-removegroup-error-primary: "You cannot remove a user from their primary group." user-removegroup-error-primary: "You cannot remove a user from their primary group."
user-primarygroup-success: "&b{0}&a's primary group was set to &b{1}&a." user-primarygroup-success: "&b{0}&a's primary group was set to &b{1}&a."
@ -237,14 +237,14 @@ user-demote-error-not-contain-group: "Demotions are done based on primary groups
user-showpos: "&aShowing &b{0}&a's position on track &b{1}&a.{2}" user-showpos: "&aShowing &b{0}&a's position on track &b{1}&a.{2}"
group-info: > group-info: >
{PREFIX}&f-> &3Group: &6{0}\n {PREFIX}&b&l> &bGroup Info: &f{0}\n
{PREFIX}&f-> &3Permissions: &6{1}\n {PREFIX}&f- &3Permissions: &6{1}\n
{PREFIX}&f-> &3Temporary Permissions: &6{2}\n {PREFIX}&f- &3Temporary Permissions: &6{2}\n
{PREFIX}&f-> &3Use &b/{3} group {4} listnodes &3to see all permissions. {PREFIX}&f- &3Use &b/{3} group {4} permission info &3to see all permissions.
track-info: > track-info: >
{PREFIX}&b-> &eTrack: &6{0}\n {PREFIX}&b&l> Showing Track: &f{0}\n
{PREFIX}&b-> &ePath: &6{1} {PREFIX}&f- &7Path: &f{1}
track-clear: "&b{0}&a's groups track was cleared." track-clear: "&b{0}&a's groups track was cleared."
track-append-success: "&aGroup &b{0}&a was successfully appended to track &b{1}&a." track-append-success: "&aGroup &b{0}&a was successfully appended to track &b{1}&a."
track-insert-success: "&aGroup &b{0}&a was successfully inserted into track &b{1}&a at position &b{2}&a." track-insert-success: "&aGroup &b{0}&a was successfully inserted into track &b{1}&a at position &b{2}&a."