funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-07-02 02:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

more stuff

Browse Source
This commit is contained in:
Aikar
2017-06-03 00:31:39 -04:00
parent 7bf24e9c13
commit 3c6d5bbe63
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bukkit/src/main/java/co/aikar/commands/BukkitCommandIssuer.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class BukkitCommandIssuer implements CommandIssuer {
@Override
public void sendMessage(String message) {
sender.sendMessage(message);
sender.sendMessage(ACFBukkitUtil.color(message));
}
@Override
core/src/main/java/co/aikar/commands/BaseCommand.java
+11 -19
View File
@@ -59,7 +59,7 @@ public abstract class BaseCommand {
public static final String UNKNOWN = "__unknown";
public static final String DEFAULT = "__default";
final SetMultimap<String, RegisteredCommand> subCommands = HashMultimap.create();
Method preCommandHandler;
private Method preCommandHandler;
@SuppressWarnings("WeakerAccess")
private String execLabel;
@@ -111,18 +111,13 @@ public abstract class BaseCommand {
final Class<? extends BaseCommand> self = this.getClass();
CommandAlias rootCmdAliasAnno = self.getAnnotation(CommandAlias.class);
String rootCmdAlias = rootCmdAliasAnno != null ? manager.getCommandReplacements().replace(rootCmdAliasAnno.value()).toLowerCase() : null;
if (cmd == null) {
if (rootCmdAlias == null) {
cmd = "__" + self.getSimpleName();
} else {
cmd = ACFPatterns.PIPE.split(rootCmdAlias)[0];
}
cmd = cmd.toLowerCase();
if (cmd == null && rootCmdAlias != null) {
cmd = ACFPatterns.PIPE.split(rootCmdAlias)[0];
}
this.commandName = cmd;
this.commandName = cmd != null ? cmd : self.getSimpleName().toLowerCase();
this.description = cmd + " commands";
this.usageMessage = "/" + cmd;
this.description = this.commandName + " commands";
this.usageMessage = "/" + this.commandName;
final CommandPermission perm = self.getAnnotation(CommandPermission.class);
if (perm != null) {
@@ -148,9 +143,6 @@ public abstract class BaseCommand {
}
}
if (sub != null) {
sublist = sub;
} else if (commandAliases != null) {
@@ -158,10 +150,8 @@ public abstract class BaseCommand {
}
//CommandIssuer.class, String.class, String[].class
UnknownHandler unknown = method.getAnnotation(UnknownHandler.class);
//CommandIssuer.class, String.class, String[].class
PreCommand preCommand = method.getAnnotation(PreCommand.class);
UnknownHandler unknown = method.getAnnotation(UnknownHandler.class);
PreCommand preCommand = method.getAnnotation(PreCommand.class);
if (unknown != null) {
if (!foundUnknown) {
registerSubcommand(method, UNKNOWN);
@@ -189,7 +179,9 @@ public abstract class BaseCommand {
}
}
register(cmd, this);
if (cmd != null) {
register(cmd, this);
}
for (Class<?> clazz : this.getClass().getDeclaredClasses()) {
if (BaseSubCommand.class.isAssignableFrom(clazz)) {
try {