Merge Greg's branch into Hax's branch #228

Merged
greg6775 merged 21 commits from greg-dev into hax-dev 2019-12-21 18:10:28 +01:00
4 changed files with 9 additions and 9 deletions
Showing only changes of commit d6e78b6a45 - Show all commits

View file

@ -47,7 +47,7 @@ public class Hadder {
helpCommand,
new TestCommand(),
new BanCommand(),
new PrefixCommand(),
new UserPrefixCommand(),
new ShutdownCommand(),
new KickCommand(),
new PingCommand(),
@ -58,7 +58,7 @@ public class Hadder {
new EqualsCommand(),
new InviteCommand(),
new NickCommand(),
new GuildPrefixCommand(),
new PrefixCommand(),
new BlowjobCommand(),
new PornCommand(),
new AnalCommand(),

View file

@ -5,7 +5,7 @@ import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.Permission;
public class GuildPrefixCommand implements Command {
public class PrefixCommand implements Command {
@Override
public void executed(String[] args, CommandEvent event) {
@ -38,7 +38,7 @@ public class GuildPrefixCommand implements Command {
@Override
public String[] labels() {
return new String[]{"guildprefix"};
return new String[]{"prefix"};
}
@Override
@ -48,6 +48,6 @@ public class GuildPrefixCommand implements Command {
@Override
public String usage() {
return "guildprefix";
return "prefix";
}
}

View file

@ -8,7 +8,7 @@ import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor;
public class PrefixCommand implements Command {
public class UserPrefixCommand implements Command {
public void executed(String[] args, CommandEvent event) {
if (args.length == 1) {
@ -26,7 +26,7 @@ public class PrefixCommand implements Command {
@Override
public String[] labels() {
return new String[] { "prefix" };
return new String[] { "userprefix" };
}
@Override
@ -36,6 +36,6 @@ public class PrefixCommand implements Command {
@Override
public String usage() {
return "prefix";
return "userprefix";
}
}

View file

@ -7,8 +7,8 @@ Hadder = Hadder
searchterm = <SearchTerm>
username = <Username>
number = <Number>/all
guildprefix = <New Guild-Prefix>
prefix = <New Prefix>
userprefix = <New User-Prefix>
vc-name/id = <VoiceChannelID|VoiceChannelName>
user+nickname = <@user> <New Nickname>
region = <region>