Redstoner/CommandManager
Archived
0
Fork 0
Code Pull Requests Activity

improved message coloring

Browse Source
This commit is contained in:
NEMESIS13cz
2016-11-19 16:25:07 +01:00
parent 4e7049b213
commit 5358030f8d
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
com/nemez/cmdmgr/CommandManager.java
View File

@@ -92,12 +92,12 @@ public class CommandManager {
public static boolean errors = false; public static boolean errors = false;
/* Switches for color and formatting in the built-in help message and pagination text */ /* Switches for color and formatting in the built-in help message and pagination text */
public static String helpDescriptionFormatting = "<EFBFBD>b"; public static String helpDescriptionFormatting = "&b";
public static String helpUsageFormatting = "<EFBFBD>6"; public static String helpUsageFormatting = "&6";
public static String helpPageHeaderFormatting = "<EFBFBD>a"; public static String helpPageHeaderFormatting = "&a";
public static String helpInvalidPageFormatting = "<EFBFBD>c"; public static String helpInvalidPageFormatting = "&c";
public static String noPermissionFormatting = "<EFBFBD>c"; public static String noPermissionFormatting = "&c";
public static String notAllowedFormatting = "<EFBFBD>c"; public static String notAllowedFormatting = "&c";
/** /**
* Registers a command from a String of source code * Registers a command from a String of source code
@@ -454,13 +454,6 @@ public class CommandManager {
return false; return false;
} }
/* typical escape sequences and such */ /* typical escape sequences and such */
}else if (current == '&' && currentProp == Property.HELP) {
if (previous == '\\') {
buffer.append('&');
}else{
/* for color codes and formatting */
buffer.append('<27>');
}
}else if (current == 'n' && currentProp == Property.HELP) { }else if (current == 'n' && currentProp == Property.HELP) {
if (previous == '\\') { if (previous == '\\') {
buffer.append('\n'); buffer.append('\n');

19
com/nemez/cmdmgr/util/Executable.java
View File

@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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())) { 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; return true;
} }
if (def.getExecType() == Type.PLAYER) { if (def.getExecType() == Type.PLAYER) {
if (!(sender instanceof 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; return true;
} }
}else if (def.getExecType() == Type.CONSOLE) { }else if (def.getExecType() == Type.CONSOLE) {
if (sender instanceof Player) { 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; return true;
} }
}else if (def.getExecType() == Type.NOBODY) { }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; return true;
} }
ArrayList<Object> arguments = new ArrayList<Object>(); ArrayList<Object> arguments = new ArrayList<Object>();
@@ -385,16 +386,16 @@ public class Executable extends org.bukkit.command.Command {
private void printPage(CommandSender sender, int page) { private void printPage(CommandSender sender, int page) {
page--; page--;
if (page < 0 || page >= help.size()) { 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{ }else{
HelpPageCommand[] pageData = help.get(page); 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) { for (HelpPageCommand c : pageData) {
if (c != null) { 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.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)) { if (c.permission == null || c.permission.equals("null") || sender.hasPermission(c.permission)) {
sender.sendMessage(CommandManager.helpUsageFormatting + c.usage); sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpUsageFormatting + c.usage));
sender.sendMessage(CommandManager.helpDescriptionFormatting + c.description); sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandManager.helpDescriptionFormatting + c.description));
} }
} }
} }

3
com/nemez/cmdmgr/util/ExecutableDefinition.java
View File

@@ -4,6 +4,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@@ -161,7 +162,7 @@ public class ExecutableDefinition {
return (boolean) target.invoke(methodContainer, args); return (boolean) target.invoke(methodContainer, args);
} }
} catch (Exception e) { } 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"); plugin.getLogger().log(Level.WARNING, "Runtime Error: invalid method");
e.printStackTrace(); e.printStackTrace();
return true; return true;