From 1b3a079d96add707a4cbd0032792cadec790e56e Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Fri, 9 May 2014 22:25:25 +0100 Subject: [PATCH 1/2] Add suffixes for admin/all messages. --- config.yml | 12 +++++++----- src/net/timroden/adminchat/AdminChat.java | 16 ++++++++-------- src/net/timroden/adminchat/Config.java | 4 +++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/config.yml b/config.yml index 6a140f7..af06ca4 100644 --- a/config.yml +++ b/config.yml @@ -1,16 +1,18 @@ adminchat: allprefix: "&a(&7ALL&a)" allmasked: "&3ADMIN" - + allsuffix: ": " + adminprefix: "&a(&7ADMINS&a)" toadminprefix: "&a(&7TO ADMINS&a)" - + adminsuffix: ": " + usecustomconsolename: true customconsolename: "&7[&6CONSOLE&7]" - + listeninchat: true - + rawprefixadmin: "@" rawprefixall: "@@" - + notifyonversion: true \ No newline at end of file diff --git a/src/net/timroden/adminchat/AdminChat.java b/src/net/timroden/adminchat/AdminChat.java index 657f019..99bce41 100644 --- a/src/net/timroden/adminchat/AdminChat.java +++ b/src/net/timroden/adminchat/AdminChat.java @@ -143,19 +143,19 @@ public void displayMessage(CommandSender sender, String message, String name, Co if(type.equals(CommandType.AD)) { if(sender.hasPermission("adminchat.view.admin")) { - sender.sendMessage(config.adminPrefix + " " + resetName + ": " + msg); + sender.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg); } else { - sender.sendMessage(config.toAdminPrefix + " " + resetName + ": " + msg); + sender.sendMessage(config.toAdminPrefix + " " + resetName + config.adminSuffix + msg); } if(putToConsole) { - ccs.sendMessage(config.adminPrefix + " " + resetName + ": " + msg); + ccs.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg); } } if(type.equals(CommandType.ALL)) { - sender.sendMessage(config.allPrefix + " " + resetName + ": " + msg); + sender.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg); if(putToConsole) { - ccs.sendMessage(config.allPrefix + " " + resetName + ": " + msg); + ccs.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg); } } @@ -165,15 +165,15 @@ public void displayMessage(CommandSender sender, String message, String name, Co if(type.equals(CommandType.AD)) { if(pl.hasPermission("adminchat.view.admin")) { - pl.sendMessage(config.adminPrefix + " " + resetName + ": " + msg); + pl.sendMessage(config.adminPrefix + " " + resetName + config.adminSuffix + msg); } } if(type.equals(CommandType.ALL)) { if(pl.hasPermission("adminchat.send.all")) { - pl.sendMessage(config.allPrefix + " " + resetName + ": " + msg); + pl.sendMessage(config.allPrefix + " " + resetName + config.allSuffix + msg); } else { - pl.sendMessage(config.allPrefix + " " + config.allMasked + ": " + msg); + pl.sendMessage(config.allPrefix + " " + config.allMasked + config.allSuffix + msg); } } } diff --git a/src/net/timroden/adminchat/Config.java b/src/net/timroden/adminchat/Config.java index 77af65f..1df5b17 100644 --- a/src/net/timroden/adminchat/Config.java +++ b/src/net/timroden/adminchat/Config.java @@ -8,7 +8,7 @@ public class Config { private static Configuration config; public Boolean useCustomConsoleName, notifyVersion, chatListen; - public String consoleSenderName, allPrefix, adminPrefix, allMasked, toAdminPrefix, rawPrefixAdmin, rawPrefixAll; + public String consoleSenderName, allPrefix, adminPrefix, allMasked, toAdminPrefix, rawPrefixAdmin, rawPrefixAll, allSuffix, adminSuffix; public char colorPrefix; public Config(AdminChat plugin) { @@ -34,9 +34,11 @@ public void getOpts() { allPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allprefix")) + ChatColor.RESET; allMasked = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allmasked")) + ChatColor.RESET; + allSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allsuffix")); adminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminprefix")) + ChatColor.RESET; toAdminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.toadminprefix")) + ChatColor.RESET; + adminSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminsuffix")); colorPrefix = config.getString("adminchat.colorprefix").charAt(0); From 9ee5d749000aecae64296d2742b6f3c9b018ed2b Mon Sep 17 00:00:00 2001 From: Gareth Coles Date: Fri, 9 May 2014 22:33:08 +0100 Subject: [PATCH 2/2] Actually, why are we forcing colour resets at all? --- config.yml | 12 ++++++------ src/net/timroden/adminchat/Config.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.yml b/config.yml index af06ca4..b49da19 100644 --- a/config.yml +++ b/config.yml @@ -1,11 +1,11 @@ adminchat: - allprefix: "&a(&7ALL&a)" - allmasked: "&3ADMIN" - allsuffix: ": " + allprefix: "&a(&7ALL&a)&f" + allmasked: "&3ADMIN&f" + allsuffix: "&f: " - adminprefix: "&a(&7ADMINS&a)" - toadminprefix: "&a(&7TO ADMINS&a)" - adminsuffix: ": " + adminprefix: "&a(&7ADMINS&a)&f" + toadminprefix: "&a(&7TO ADMINS&a)&f" + adminsuffix: "&f: " usecustomconsolename: true customconsolename: "&7[&6CONSOLE&7]" diff --git a/src/net/timroden/adminchat/Config.java b/src/net/timroden/adminchat/Config.java index 1df5b17..674a827 100644 --- a/src/net/timroden/adminchat/Config.java +++ b/src/net/timroden/adminchat/Config.java @@ -32,12 +32,12 @@ public void getOpts() { notifyVersion = config.getBoolean("adminchat.notifyonversion"); chatListen = config.getBoolean("adminchat.listeninchat"); - allPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allprefix")) + ChatColor.RESET; - allMasked = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allmasked")) + ChatColor.RESET; + allPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allprefix")); + allMasked = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allmasked")); allSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.allsuffix")); - adminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminprefix")) + ChatColor.RESET; - toAdminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.toadminprefix")) + ChatColor.RESET; + adminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminprefix")); + toAdminPrefix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.toadminprefix")); adminSuffix = ChatColor.translateAlternateColorCodes('&', config.getString("adminchat.adminsuffix"));