From 5358030f8d082fb26a011cf6fccb768273c70a6a Mon Sep 17 00:00:00 2001 From: NEMESIS13cz Date: Sat, 19 Nov 2016 16:25:07 +0100 Subject: improved message coloring --- com/nemez/cmdmgr/CommandManager.java | 19 ++++++------------- com/nemez/cmdmgr/util/Executable.java | 19 ++++++++++--------- com/nemez/cmdmgr/util/ExecutableDefinition.java | 3 ++- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/com/nemez/cmdmgr/CommandManager.java b/com/nemez/cmdmgr/CommandManager.java index 5c0578c..3c90ea5 100644 --- a/com/nemez/cmdmgr/CommandManager.java +++ b/com/nemez/cmdmgr/CommandManager.java @@ -92,12 +92,12 @@ public class CommandManager { public static boolean errors = false; /* Switches for color and formatting in the built-in help message and pagination text */ - public static String helpDescriptionFormatting = "�b"; - public static String helpUsageFormatting = "�6"; - public static String helpPageHeaderFormatting = "�a"; - public static String helpInvalidPageFormatting = "�c"; - public static String noPermissionFormatting = "�c"; - public static String notAllowedFormatting = "�c"; + public static String helpDescriptionFormatting = "&b"; + public static String helpUsageFormatting = "&6"; + public static String helpPageHeaderFormatting = "&a"; + public static String helpInvalidPageFormatting = "&c"; + public static String noPermissionFormatting = "&c"; + public static String notAllowedFormatting = "&c"; /** * Registers a command from a String of source code @@ -454,13 +454,6 @@ public class CommandManager { return false; } /* typical escape sequences and such */ - }else if (current == '&' && currentProp == Property.HELP) { - if (previous == '\\') { - buffer.append('&'); - }else{ - /* for color codes and formatting */ - buffer.append('�'); - } }else if (current == 'n' && currentProp == Property.HELP) { if (previous == '\\') { buffer.append('\n'); diff --git a/com/nemez/cmdmgr/util/Executable.java b/com/nemez/cmdmgr/util/Executable.java index 9926444..40d0277 100644 --- a/com/nemez/cmdmgr/util/Executable.java +++ b/com/nemez/cmdmgr/util/Executable.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.logging.Level; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -338,21 +339,21 @@ public class Executable extends org.bukkit.command.Command { } } if (def.getPermission() != null && !def.getPermission().equals("null") && !sender.hasPermission(def.getPermission())) { - sender.sendMessage(CommandManager.noPermissionFormatting + "You do not have permission to execute this command."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.noPermissionFormatting + "You do not have permission to execute this command.")); return true; } if (def.getExecType() == Type.PLAYER) { if (!(sender instanceof Player)) { - sender.sendMessage(CommandManager.notAllowedFormatting + "Only players are allowed to run this command."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.notAllowedFormatting + "Only players are allowed to run this command.")); return true; } }else if (def.getExecType() == Type.CONSOLE) { if (sender instanceof Player) { - sender.sendMessage(CommandManager.notAllowedFormatting + "Only console is allowed to run this command."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.notAllowedFormatting + "Only console is allowed to run this command.")); return true; } }else if (def.getExecType() == Type.NOBODY) { - sender.sendMessage(CommandManager.notAllowedFormatting + "Nobody can run this command."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.notAllowedFormatting + "Nobody can run this command.")); return true; } ArrayList arguments = new ArrayList(); @@ -385,16 +386,16 @@ public class Executable extends org.bukkit.command.Command { private void printPage(CommandSender sender, int page) { page--; if (page < 0 || page >= help.size()) { - sender.sendMessage(CommandManager.helpInvalidPageFormatting + "Non-existant page (" + (page + 1) + ").\nThere are " + help.size() + " pages."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpInvalidPageFormatting + "Non-existant page (" + (page + 1) + ").\nThere are " + help.size() + " pages.")); }else{ HelpPageCommand[] pageData = help.get(page); - sender.sendMessage(CommandManager.helpPageHeaderFormatting + "### Help Page " + (page + 1) + "/" + (help.size()) + " ###"); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpPageHeaderFormatting + "### Help Page " + (page + 1) + "/" + (help.size()) + " ###")); for (HelpPageCommand c : pageData) { if (c != null) { if (c.type == null || c.type == Type.BOTH || (c.type == Type.CONSOLE && !(sender instanceof Player)) || (c.type == Type.PLAYER && sender instanceof Player)) { - if (c.permission == null || sender.hasPermission(c.permission)) { - sender.sendMessage(CommandManager.helpUsageFormatting + c.usage); - sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description); + if (c.permission == null || c.permission.equals("null") || sender.hasPermission(c.permission)) { + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpUsageFormatting + c.usage)); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpDescriptionFormatting + c.description)); } } } diff --git a/com/nemez/cmdmgr/util/ExecutableDefinition.java b/com/nemez/cmdmgr/util/ExecutableDefinition.java index ae5a7f9..fdf29b6 100644 --- a/com/nemez/cmdmgr/util/ExecutableDefinition.java +++ b/com/nemez/cmdmgr/util/ExecutableDefinition.java @@ -4,6 +4,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.logging.Level; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.plugin.java.JavaPlugin; @@ -161,7 +162,7 @@ public class ExecutableDefinition { return (boolean) target.invoke(methodContainer, args); } } catch (Exception e) { - sender.sendMessage(CommandManager.helpInvalidPageFormatting + "An internal error occured, please contact the server administrator and/or report a bug."); + sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpInvalidPageFormatting + "An internal error occured, please contact the server administrator and/or report a bug.")); plugin.getLogger().log(Level.WARNING, "Runtime Error: invalid method"); e.printStackTrace(); return true; -- cgit v1.2.3