From aaeaf5cfa0db759eecfdb015781e31ad591baa8b Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 28 Oct 2018 21:56:42 +0000 Subject: [PATCH] Nicer format for verbose meta logging --- .../luckperms/common/locale/message/Message.java | 3 ++- .../common/verbose/VerboseListener.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java index 1913d86f5..2519acbfa 100644 --- a/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/locale/message/Message.java @@ -78,7 +78,8 @@ public enum Message { "{PREFIX}&3LOG &3&l> &f{}", false ), - VERBOSE_LOG("&3VB &3&l> &a{}&7 - &a{}&7 - {}{}", true), + VERBOSE_LOG_PERMISSION("&3VB &3&l> &a{}&7 - &a{}&7 - {}{}", true), + VERBOSE_LOG_META("&3VB &3&l> &a{}&7 - &bmeta: &a{}&7 - &7{}", true), EXPORT_LOG("&3EXPORT &3&l> &f{}", true), EXPORT_LOG_PROGRESS("&3EXPORT &3&l> &7{}", true), MIGRATION_LOG("&3MIGRATION &7[&3{}&7] &3&l> &f{}", true), diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java index 00fd4ebdb..dbdc3c1ad 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseListener.java @@ -142,7 +142,7 @@ public class VerboseListener { // just send as a raw message if (event instanceof PermissionCheckEvent) { PermissionCheckEvent permissionEvent = (PermissionCheckEvent) event; - Message.VERBOSE_LOG.send(this.notifiedSender, + Message.VERBOSE_LOG_PERMISSION.send(this.notifiedSender, permissionEvent.getCheckTarget(), permissionEvent.getPermission(), getTristateColor(permissionEvent.getResult()), @@ -150,10 +150,9 @@ public class VerboseListener { ); } else if (event instanceof MetaCheckEvent) { MetaCheckEvent metaEvent = (MetaCheckEvent) event; - Message.VERBOSE_LOG.send(this.notifiedSender, + Message.VERBOSE_LOG_META.send(this.notifiedSender, metaEvent.getCheckTarget(), - metaEvent.getKey() + " (meta)", - "&7", + metaEvent.getKey(), metaEvent.getResult() ); } else { @@ -167,7 +166,7 @@ public class VerboseListener { if (event instanceof PermissionCheckEvent) { PermissionCheckEvent permissionEvent = (PermissionCheckEvent) event; - textComponent = Message.VERBOSE_LOG.asComponent(this.notifiedSender.getPlugin().getLocaleManager(), + textComponent = Message.VERBOSE_LOG_PERMISSION.asComponent(this.notifiedSender.getPlugin().getLocaleManager(), permissionEvent.getCheckTarget(), permissionEvent.getPermission(), getTristateColor(permissionEvent.getResult()), @@ -175,10 +174,9 @@ public class VerboseListener { ); } else if (event instanceof MetaCheckEvent) { MetaCheckEvent metaEvent = (MetaCheckEvent) event; - textComponent = Message.VERBOSE_LOG.asComponent(this.notifiedSender.getPlugin().getLocaleManager(), + textComponent = Message.VERBOSE_LOG_META.asComponent(this.notifiedSender.getPlugin().getLocaleManager(), metaEvent.getCheckTarget(), - metaEvent.getKey() + " (meta)", - "&7", + metaEvent.getKey(), metaEvent.getResult() ); } else { @@ -190,10 +188,12 @@ public class VerboseListener { if (event instanceof PermissionCheckEvent) { PermissionCheckEvent permissionEvent = (PermissionCheckEvent) event; + hover.add("&aType: &2permission"); hover.add("&bOrigin: &2" + permissionEvent.getOrigin().name()); } if (event instanceof MetaCheckEvent) { MetaCheckEvent metaEvent = (MetaCheckEvent) event; + hover.add("&aType: &2meta"); hover.add("&bOrigin: &2" + metaEvent.getOrigin().name()); }