Refactor objects package

src/main/java/wtf/beatrice/hidekobot/commands/message/CommandsCommand.java

@@ -2,7 +2,7 @@ package wtf.beatrice.hidekobot.commands.message;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.objects.MessageCommand;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 
 import java.util.Collections;
 import java.util.LinkedList;

src/main/java/wtf/beatrice/hidekobot/commands/message/HelloCommand.java

@@ -1,7 +1,7 @@
 package wtf.beatrice.hidekobot.commands.message;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-import wtf.beatrice.hidekobot.objects.MessageCommand;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
 
 import java.util.Arrays;
 import java.util.LinkedList;

src/main/java/wtf/beatrice/hidekobot/commands/slash/AvatarCommand.java

@@ -9,7 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class AvatarCommand extends SlashCommandImpl
 {

src/main/java/wtf/beatrice/hidekobot/commands/slash/BotInfoCommand.java

@@ -7,8 +7,8 @@ import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
-import wtf.beatrice.hidekobot.objects.SlashCommand;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 import wtf.beatrice.hidekobot.util.FormatUtil;
 
 import java.lang.management.ManagementFactory;

src/main/java/wtf/beatrice/hidekobot/commands/slash/ClearCommand.java

@@ -18,7 +18,7 @@ import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.requests.restaction.WebhookMessageEditAction;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/wtf/beatrice/hidekobot/commands/slash/CoinFlipCommand.java

@@ -11,7 +11,7 @@ import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 import wtf.beatrice.hidekobot.util.RandomUtil;
 
 import java.util.List;

src/main/java/wtf/beatrice/hidekobot/commands/slash/DieCommand.java

@@ -7,7 +7,7 @@ import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;

src/main/java/wtf/beatrice/hidekobot/commands/slash/HelpCommand.java

@@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class HelpCommand extends SlashCommandImpl
 {

src/main/java/wtf/beatrice/hidekobot/commands/slash/InviteCommand.java

@@ -13,7 +13,7 @@ import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import org.jetbrains.annotations.NotNull;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class InviteCommand extends SlashCommandImpl
 {

src/main/java/wtf/beatrice/hidekobot/commands/slash/PingCommand.java

@@ -4,7 +4,7 @@ import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEve
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class PingCommand extends SlashCommandImpl
 {

src/main/java/wtf/beatrice/hidekobot/commands/slash/SayCommand.java

@@ -9,7 +9,7 @@ import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import org.jetbrains.annotations.NotNull;
-import wtf.beatrice.hidekobot.objects.SlashCommandImpl;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommandImpl;
 
 public class SayCommand extends SlashCommandImpl
 {

src/main/java/wtf/beatrice/hidekobot/listeners/MessageCommandListener.java

@@ -4,8 +4,8 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import wtf.beatrice.hidekobot.objects.MessageCommand;
-import wtf.beatrice.hidekobot.objects.MessageCommandAliasesComparator;
+import wtf.beatrice.hidekobot.objects.commands.MessageCommand;
+import wtf.beatrice.hidekobot.objects.comparators.MessageCommandAliasesComparator;
 import wtf.beatrice.hidekobot.util.Logger;
 
 import java.util.*;

src/main/java/wtf/beatrice/hidekobot/listeners/SlashCommandListener.java

@@ -3,7 +3,7 @@ package wtf.beatrice.hidekobot.listeners;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
-import wtf.beatrice.hidekobot.objects.SlashCommand;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
 
 import java.util.LinkedList;
 import java.util.TreeMap;

src/main/java/wtf/beatrice/hidekobot/objects/commands/MessageCommand.java

@@ -1,4 +1,4 @@
-package wtf.beatrice.hidekobot.objects;
+package wtf.beatrice.hidekobot.objects.commands;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 

src/main/java/wtf/beatrice/hidekobot/objects/commands/SlashCommand.java

@@ -1,4 +1,4 @@
-package wtf.beatrice.hidekobot.objects;
+package wtf.beatrice.hidekobot.objects.commands;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;

src/main/java/wtf/beatrice/hidekobot/objects/commands/SlashCommandImpl.java

@@ -1,4 +1,4 @@
-package wtf.beatrice.hidekobot.objects;
+package wtf.beatrice.hidekobot.objects.commands;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;

src/main/java/wtf/beatrice/hidekobot/objects/comparators/MessageCommandAliasesComparator.java

@@ -1,4 +1,4 @@
-package wtf.beatrice.hidekobot.objects;
+package wtf.beatrice.hidekobot.objects.comparators;
 
 import java.util.Comparator;
 import java.util.LinkedList;

src/main/java/wtf/beatrice/hidekobot/util/SlashCommandUtil.java

@@ -6,7 +6,7 @@ import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import wtf.beatrice.hidekobot.Cache;
 import wtf.beatrice.hidekobot.HidekoBot;
 import wtf.beatrice.hidekobot.listeners.MessageCommandListener;
-import wtf.beatrice.hidekobot.objects.SlashCommand;
+import wtf.beatrice.hidekobot.objects.commands.SlashCommand;
 
 import java.util.ArrayList;
 import java.util.List;