Merge Greg's branch into the master branch #282

Merged
greg6775 merged 12 commits from greg-dev into master 2019-12-30 19:30:32 +01:00
3 changed files with 8 additions and 23 deletions
Showing only changes of commit 9d0f60fe56 - Show all commits

View file

@ -4,9 +4,14 @@ package com.bbn.hadder.commands;
* @author Skidder / GregTCLTK
*/
import com.bbn.hadder.commands.general.HelpCommand;
public interface Command {
void executed(String[] args, CommandEvent event);
HelpCommand.HelpInfo HELP_INFO();
String[] labels();
String description();
String usage();
String ex
}

View file

@ -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) {
if (!cmd.getClass().getPackageName().endsWith("owner") || (cmd.getClass().getPackageName().endsWith("owner") &&
(event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")))) {

View file

@ -16,12 +16,6 @@ public class TestCommand implements Command {
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
public String[] labels() {
return new String[]{"test"};