Merge Greg's branch into the master branch #282
3 changed files with 8 additions and 23 deletions
|
|
@ -4,9 +4,14 @@ package com.bbn.hadder.commands;
|
||||||
* @author Skidder / GregTCLTK
|
* @author Skidder / GregTCLTK
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import com.bbn.hadder.commands.general.HelpCommand;
|
|
||||||
|
|
||||||
public interface Command {
|
public interface Command {
|
||||||
void executed(String[] args, CommandEvent event);
|
void executed(String[] args, CommandEvent event);
|
||||||
HelpCommand.HelpInfo HELP_INFO();
|
|
||||||
|
String[] labels();
|
||||||
|
|
||||||
|
String description();
|
||||||
|
|
||||||
|
String usage();
|
||||||
|
|
||||||
|
String ex
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,20 +57,6 @@ public class HelpCommand implements Command {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class HelpInfo {
|
|
||||||
private String[] labels;
|
|
||||||
private String description;
|
|
||||||
private String usage;
|
|
||||||
private String example;
|
|
||||||
|
|
||||||
public HelpInfo(String[] labels, String description, String usage, String example) {
|
|
||||||
this.labels = labels;
|
|
||||||
this.description = description;
|
|
||||||
this.usage = usage;
|
|
||||||
this.example = example;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void sendHelp(Command cmd, CommandEvent event) {
|
public void sendHelp(Command cmd, CommandEvent event) {
|
||||||
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
|
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
|
||||||
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
|
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {
|
||||||
|
|
|
||||||
|
|
@ -16,12 +16,6 @@ public class TestCommand implements Command {
|
||||||
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
|
event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageType.INFO, "commands.owner.test.success", "").build()).queue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public HelpCommand.HelpInfo HELP_INFO() {
|
|
||||||
String[] d = {"d", "d"};
|
|
||||||
return new HelpCommand.HelpInfo(d, "", "", "");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] labels() {
|
public String[] labels() {
|
||||||
return new String[]{"test"};
|
return new String[]{"test"};
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue