diff --git a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java index f4307fe..f466360 100644 --- a/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java +++ b/src/main/java/wtf/beatrice/hidekobot/HidekoBot.java @@ -11,11 +11,21 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.system.ApplicationHome; import org.springframework.context.ConfigurableApplicationContext; import wtf.beatrice.hidekobot.commands.completer.ProfileImageCommandCompleter; -import wtf.beatrice.hidekobot.commands.message.MessageAliasCommand; -import wtf.beatrice.hidekobot.commands.message.MessageBotInfoCommand; -import wtf.beatrice.hidekobot.commands.message.MessageHelloCommand; -import wtf.beatrice.hidekobot.commands.message.MessageHelpCommand; +import wtf.beatrice.hidekobot.commands.message.*; import wtf.beatrice.hidekobot.commands.slash.*; +import wtf.beatrice.hidekobot.commands.slash.SlashBanCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashBannerCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashClearCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashCoinFlipCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashDiceRollCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashInviteCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashKickCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashLoveCalculatorCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashMagicBallCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashSayCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashTimeoutCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashTriviaCommand; +import wtf.beatrice.hidekobot.commands.slash.SlashUrbanDictionaryCommand; import wtf.beatrice.hidekobot.datasources.ConfigurationSource; import wtf.beatrice.hidekobot.datasources.PropertiesSource; import wtf.beatrice.hidekobot.listeners.*; @@ -153,50 +163,50 @@ public class HidekoBot MessageCommandListener messageCommandListener = context.getBean(MessageCommandListener.class); ButtonInteractionListener buttonInteractionListener = context.getBean(ButtonInteractionListener.class); SelectMenuInteractionListener selectMenuInteractionListener = context.getBean(SelectMenuInteractionListener.class); - AvatarCommand avatarCommand = new AvatarCommand(); - ProfileImageCommandCompleter avatarCommandCompleter = new ProfileImageCommandCompleter(avatarCommand); - slashCommandListener.registerCommand(avatarCommand); + SlashAvatarCommand slashAvatarCommand = new SlashAvatarCommand(); + ProfileImageCommandCompleter avatarCommandCompleter = new ProfileImageCommandCompleter(slashAvatarCommand); + slashCommandListener.registerCommand(slashAvatarCommand); slashCommandCompletionListener.registerCommandCompleter(avatarCommandCompleter); - slashCommandListener.registerCommand(new BanCommand()); - BannerCommand bannerCommand = new BannerCommand(); - ProfileImageCommandCompleter bannerCommandCompleter = new ProfileImageCommandCompleter(bannerCommand); - slashCommandListener.registerCommand(bannerCommand); + slashCommandListener.registerCommand(new SlashBanCommand()); + SlashBannerCommand slashBannerCommand = new SlashBannerCommand(); + ProfileImageCommandCompleter bannerCommandCompleter = new ProfileImageCommandCompleter(slashBannerCommand); + slashCommandListener.registerCommand(slashBannerCommand); slashCommandCompletionListener.registerCommandCompleter(bannerCommandCompleter); slashCommandListener.registerCommand(context.getBean(SlashBotInfoCommand.class)); - slashCommandListener.registerCommand(new ClearCommand()); - slashCommandListener.registerCommand(new CoinFlipCommand()); - slashCommandListener.registerCommand(new DiceRollCommand()); - slashCommandListener.registerCommand(new DieCommand()); - slashCommandListener.registerCommand(new HelpCommand()); - slashCommandListener.registerCommand(new InviteCommand()); - slashCommandListener.registerCommand(new KickCommand()); - slashCommandListener.registerCommand(new LoveCalculatorCommand()); - slashCommandListener.registerCommand(new MagicBallCommand()); - slashCommandListener.registerCommand(new PingCommand()); - slashCommandListener.registerCommand(new SayCommand()); - slashCommandListener.registerCommand(new TimeoutCommand()); - slashCommandListener.registerCommand(new TriviaCommand()); - slashCommandListener.registerCommand(new UrbanDictionaryCommand()); + slashCommandListener.registerCommand(new SlashClearCommand()); + slashCommandListener.registerCommand(new SlashCoinFlipCommand()); + slashCommandListener.registerCommand(new SlashDiceRollCommand()); + slashCommandListener.registerCommand(new SlashDieCommand()); + slashCommandListener.registerCommand(new SlashHelpCommand()); + slashCommandListener.registerCommand(new SlashInviteCommand()); + slashCommandListener.registerCommand(new SlashKickCommand()); + slashCommandListener.registerCommand(new SlashLoveCalculatorCommand()); + slashCommandListener.registerCommand(new SlashMagicBallCommand()); + slashCommandListener.registerCommand(new SlashPingCommand()); + slashCommandListener.registerCommand(new SlashSayCommand()); + slashCommandListener.registerCommand(new SlashTimeoutCommand()); + slashCommandListener.registerCommand(new SlashTriviaCommand()); + slashCommandListener.registerCommand(new SlashUrbanDictionaryCommand()); // register message commands messageCommandListener.registerCommand(new MessageHelloCommand()); messageCommandListener.registerCommand(context.getBean(MessageAliasCommand.class)); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.AvatarCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BanCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.BannerCommand()); + messageCommandListener.registerCommand(new MessageAvatarCommand()); + messageCommandListener.registerCommand(new MessageBanCommand()); + messageCommandListener.registerCommand(new MessageBannerCommand()); messageCommandListener.registerCommand(context.getBean(MessageBotInfoCommand.class)); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.CoinFlipCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.ClearCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.DiceRollCommand()); + messageCommandListener.registerCommand(new MessageCoinFlipCommand()); + messageCommandListener.registerCommand(new MessageClearCommand()); + messageCommandListener.registerCommand(new MessageDiceRollCommand()); messageCommandListener.registerCommand(context.getBean(MessageHelpCommand.class)); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.InviteCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.KickCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.LoveCalculatorCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.MagicBallCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.SayCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.TimeoutCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.TriviaCommand()); - messageCommandListener.registerCommand(new wtf.beatrice.hidekobot.commands.message.UrbanDictionaryCommand()); + messageCommandListener.registerCommand(new MessageInviteCommand()); + messageCommandListener.registerCommand(new MessageKickCommand()); + messageCommandListener.registerCommand(new MessageLoveCalculatorCommand()); + messageCommandListener.registerCommand(new MessageMagicBallCommand()); + messageCommandListener.registerCommand(new MessageSayCommand()); + messageCommandListener.registerCommand(new MessageTimeoutCommand()); + messageCommandListener.registerCommand(new MessageTriviaCommand()); + messageCommandListener.registerCommand(new MessageUrbanDictionaryCommand()); // register listeners Cache.setSlashCommandListener(slashCommandListener); diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageAvatarCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageAvatarCommand.java index 0556105..60989c4 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/AvatarCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageAvatarCommand.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class AvatarCommand implements MessageCommand +public class MessageAvatarCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/BanCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBanCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/BanCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBanCommand.java index 42af38e..8e97326 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/BanCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBanCommand.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class BanCommand implements MessageCommand +public class MessageBanCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/BannerCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBannerCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/BannerCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBannerCommand.java index c708ff4..f191ebd 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/BannerCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageBannerCommand.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class BannerCommand implements MessageCommand +public class MessageBannerCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/ClearCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageClearCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/ClearCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageClearCommand.java index 2c8318a..cc6a878 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/ClearCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageClearCommand.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class ClearCommand implements MessageCommand +public class MessageClearCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/CoinFlipCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageCoinFlipCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/CoinFlipCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageCoinFlipCommand.java index 6e2dcb2..64ae492 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/CoinFlipCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageCoinFlipCommand.java @@ -12,7 +12,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -public class CoinFlipCommand implements MessageCommand +public class MessageCoinFlipCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/DiceRollCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageDiceRollCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/DiceRollCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageDiceRollCommand.java index ac32047..72552e1 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/DiceRollCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageDiceRollCommand.java @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -public class DiceRollCommand implements MessageCommand +public class MessageDiceRollCommand implements MessageCommand { @Override public LinkedList getCommandLabels() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/InviteCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageInviteCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/InviteCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageInviteCommand.java index d120080..517c1b4 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/InviteCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageInviteCommand.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class InviteCommand implements MessageCommand +public class MessageInviteCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/KickCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageKickCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/KickCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageKickCommand.java index a09d809..1353d29 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/KickCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageKickCommand.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class KickCommand implements MessageCommand +public class MessageKickCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageLoveCalculatorCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageLoveCalculatorCommand.java index 8e0bfd1..5f62762 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/LoveCalculatorCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageLoveCalculatorCommand.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -public class LoveCalculatorCommand implements MessageCommand +public class MessageLoveCalculatorCommand implements MessageCommand { diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageMagicBallCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageMagicBallCommand.java index 27fa202..a2222aa 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/MagicBallCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageMagicBallCommand.java @@ -11,7 +11,7 @@ import wtf.beatrice.hidekobot.objects.commands.MessageCommand; import java.util.LinkedList; import java.util.List; -public class MagicBallCommand implements MessageCommand +public class MessageMagicBallCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageSayCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageSayCommand.java index 7bccd12..9cc3181 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/SayCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageSayCommand.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class SayCommand implements MessageCommand +public class MessageSayCommand implements MessageCommand { diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/TimeoutCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTimeoutCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/TimeoutCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTimeoutCommand.java index c7df0fe..bcaa6e9 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/TimeoutCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTimeoutCommand.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -public class TimeoutCommand implements MessageCommand +public class MessageTimeoutCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/TriviaCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTriviaCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/TriviaCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTriviaCommand.java index 7b93a93..b4aa540 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/TriviaCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageTriviaCommand.java @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; -public class TriviaCommand implements MessageCommand +public class MessageTriviaCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageUrbanDictionaryCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/message/MessageUrbanDictionaryCommand.java index 93169af..18e394e 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/message/UrbanDictionaryCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/message/MessageUrbanDictionaryCommand.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -public class UrbanDictionaryCommand implements MessageCommand +public class MessageUrbanDictionaryCommand implements MessageCommand { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashAvatarCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashAvatarCommand.java index e1ccef4..2b6947b 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashAvatarCommand.java @@ -11,7 +11,7 @@ import wtf.beatrice.hidekobot.commands.base.ProfileImage; import wtf.beatrice.hidekobot.objects.MessageResponse; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class AvatarCommand extends SlashCommandImpl +public class SlashAvatarCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/BanCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBanCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/BanCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBanCommand.java index 4b61d42..d34bdcf 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/BanCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBanCommand.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.UserPunishment; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class BanCommand extends SlashCommandImpl +public class SlashBanCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/BannerCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBannerCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/BannerCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBannerCommand.java index e9b2d92..9352d55 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/BannerCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashBannerCommand.java @@ -11,7 +11,7 @@ import wtf.beatrice.hidekobot.commands.base.ProfileImage; import wtf.beatrice.hidekobot.objects.MessageResponse; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class BannerCommand extends SlashCommandImpl +public class SlashBannerCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/ClearCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashClearCommand.java similarity index 98% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/ClearCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashClearCommand.java index 420db6a..a39f613 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/ClearCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashClearCommand.java @@ -13,7 +13,7 @@ import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.commands.base.ClearChat; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class ClearCommand extends SlashCommandImpl +public class SlashClearCommand extends SlashCommandImpl { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashCoinFlipCommand.java similarity index 95% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashCoinFlipCommand.java index aef6425..4789f86 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashCoinFlipCommand.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.CoinFlip; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class CoinFlipCommand extends SlashCommandImpl +public class SlashCoinFlipCommand extends SlashCommandImpl { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/DiceRollCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDiceRollCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/DiceRollCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDiceRollCommand.java index 704ab36..3124d94 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/DiceRollCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDiceRollCommand.java @@ -10,7 +10,7 @@ import wtf.beatrice.hidekobot.commands.base.DiceRoll; import wtf.beatrice.hidekobot.objects.MessageResponse; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class DiceRollCommand extends SlashCommandImpl +public class SlashDiceRollCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/DieCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDieCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/DieCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDieCommand.java index 375e9f1..9bf0e27 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/DieCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashDieCommand.java @@ -13,7 +13,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -public class DieCommand extends SlashCommandImpl +public class SlashDieCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/HelpCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashHelpCommand.java similarity index 95% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/HelpCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashHelpCommand.java index 326894c..5976f17 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/HelpCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashHelpCommand.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.Cache; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class HelpCommand extends SlashCommandImpl +public class SlashHelpCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/InviteCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashInviteCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/InviteCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashInviteCommand.java index eb4ac2b..2101b1b 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/InviteCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashInviteCommand.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.Invite; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class InviteCommand extends SlashCommandImpl +public class SlashInviteCommand extends SlashCommandImpl { @Override diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/KickCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashKickCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/KickCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashKickCommand.java index ef44a23..507cdba 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/KickCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashKickCommand.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.UserPunishment; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class KickCommand extends SlashCommandImpl +public class SlashKickCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/LoveCalculatorCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashLoveCalculatorCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/LoveCalculatorCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashLoveCalculatorCommand.java index 303118f..ecd349b 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/LoveCalculatorCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashLoveCalculatorCommand.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.LoveCalculator; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class LoveCalculatorCommand extends SlashCommandImpl +public class SlashLoveCalculatorCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashMagicBallCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashMagicBallCommand.java index 5833f59..13bf001 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/MagicBallCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashMagicBallCommand.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.MagicBall; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class MagicBallCommand extends SlashCommandImpl +public class SlashMagicBallCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/PingCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashPingCommand.java similarity index 92% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/PingCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashPingCommand.java index 9f614d1..a4b6bf1 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/PingCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashPingCommand.java @@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.build.Commands; import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class PingCommand extends SlashCommandImpl +public class SlashPingCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashSayCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashSayCommand.java index 7d18fd6..22c140e 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashSayCommand.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.Say; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class SayCommand extends SlashCommandImpl +public class SlashSayCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/TimeoutCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTimeoutCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/TimeoutCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTimeoutCommand.java index 1277c3b..b67544b 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/TimeoutCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTimeoutCommand.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; import wtf.beatrice.hidekobot.commands.base.UserPunishment; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class TimeoutCommand extends SlashCommandImpl +public class SlashTimeoutCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/TriviaCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTriviaCommand.java similarity index 96% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/TriviaCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTriviaCommand.java index 0c39104..cc5d7f4 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/TriviaCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashTriviaCommand.java @@ -11,7 +11,7 @@ import wtf.beatrice.hidekobot.commands.base.Trivia; import wtf.beatrice.hidekobot.objects.MessageResponse; import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; -public class TriviaCommand extends SlashCommandImpl +public class SlashTriviaCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData() diff --git a/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashUrbanDictionaryCommand.java similarity index 97% rename from src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java rename to src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashUrbanDictionaryCommand.java index b292bba..48ab804 100644 --- a/src/main/java/wtf/beatrice/hidekobot/commands/slash/UrbanDictionaryCommand.java +++ b/src/main/java/wtf/beatrice/hidekobot/commands/slash/SlashUrbanDictionaryCommand.java @@ -17,7 +17,7 @@ import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl; import java.io.IOException; -public class UrbanDictionaryCommand extends SlashCommandImpl +public class SlashUrbanDictionaryCommand extends SlashCommandImpl { @Override public CommandData getSlashCommandData()