New Melyca Game Mode

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.12</version>
+            <version>5.0.0-beta.15</version>
         </dependency>
         <dependency>
             <groupId>io.github.cdimascio</groupId>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.github.mesalytic</groupId>
             <artifactId>Lavalink-Client</artifactId>
-            <version>5821488fbf</version>
+            <version>08a01bda67</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>

src/main/java/org/virep/jdabot/Main.java

@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.virep.jdabot.database.Database;
+import org.virep.jdabot.handlers.TextHandler;
 import org.virep.jdabot.language.Language;
 import org.virep.jdabot.listeners.AfkListener;
 import org.virep.jdabot.listeners.AutoroleListener;
@@ -20,8 +21,9 @@
 import org.virep.jdabot.listeners.LogsListener;
 import org.virep.jdabot.listeners.ReactionRoleListener;
 import org.virep.jdabot.listeners.SelectMenuInteractionListener;
-import org.virep.jdabot.slashcommandhandler.SlashHandler;
+import org.virep.jdabot.handlers.SlashHandler;
 import org.virep.jdabot.listeners.SlashListener;
+import org.virep.jdabot.listeners.TextCommandListener;
 import org.virep.jdabot.utils.Config;
 
 import java.net.URI;
@@ -68,10 +70,14 @@ public static void main(String[] args) throws Exception {
         Language.getLanguages();
 
         SlashHandler slashHandler = new SlashHandler(jda);
+        TextHandler textHandler = new TextHandler();
 
         jda.addEventListener(new SlashListener(slashHandler));
+        jda.addEventListener(new TextCommandListener(new TextHandler()));
 
         slashHandler.addCommands();
+        textHandler.addCommands();
+
         log.info("Slash Commands registered");
 
         lavalink.setAutoReconnect(true);

src/main/java/org/virep/jdabot/commands/administration/AutoroleCommand.java

@@ -14,7 +14,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -25,7 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class AutoroleCommand implements Command {
+public class AutoroleCommand implements SlashCommand {
     @Override
     public String getName() {
         return "autorole";

src/main/java/org/virep/jdabot/commands/administration/EmojisCommand.java

@@ -20,7 +20,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.IOException;
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class EmojisCommand implements Command {
+public class EmojisCommand implements SlashCommand {
     @Override
     public String getName() {
         return "emojis";

src/main/java/org/virep/jdabot/commands/administration/InteractionroleCommand.java

@@ -23,7 +23,7 @@
 import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -34,7 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class InteractionroleCommand implements Command {
+public class InteractionroleCommand implements SlashCommand {
     @Override
     public String getName() {
         return "interactionrole";

src/main/java/org/virep/jdabot/commands/administration/LangCommand.java

@@ -13,7 +13,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -23,7 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class LangCommand implements Command {
+public class LangCommand implements SlashCommand {
 
     @Override
     public String getName() {

src/main/java/org/virep/jdabot/commands/administration/LogsCommand.java

@@ -15,7 +15,7 @@
 import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -26,7 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class LogsCommand implements Command {
+public class LogsCommand implements SlashCommand {
     @Override
     public String getName() {
         return "logs";

src/main/java/org/virep/jdabot/commands/administration/MessageCommand.java

@@ -13,7 +13,7 @@
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -24,7 +24,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class MessageCommand implements Command {
+public class MessageCommand implements SlashCommand {
     @Override
     public String getName() {
         return "message";

src/main/java/org/virep/jdabot/commands/administration/ReactionroleCommand.java

@@ -14,7 +14,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.*;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public class ReactionroleCommand implements Command {
+public class ReactionroleCommand implements SlashCommand {
     @Override
     public String getName() {
         return "reactionrole";

src/main/java/org/virep/jdabot/commands/administration/ShutdownCommand.java

@@ -7,12 +7,12 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 
 import java.util.Collections;
 import java.util.List;
 
-public class ShutdownCommand implements Command {
+public class ShutdownCommand implements SlashCommand {
 
     @Override
     public String getName() {

src/main/java/org/virep/jdabot/commands/games/ActivityCommand.java

@@ -16,7 +16,7 @@
 import org.json.JSONObject;
 import org.json.JSONTokener;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.IOException;
@@ -25,7 +25,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class ActivityCommand implements Command {
+public class ActivityCommand implements SlashCommand {
     @Override
     public String getName() {
         return "activity";

src/main/java/org/virep/jdabot/commands/games/TTTCommand.java

@@ -13,11 +13,11 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 
 import java.util.*;
 
-public class TTTCommand implements Command {
+public class TTTCommand implements SlashCommand {
     private static final int[][] board = new int[3][3];
     public static final Map<Long, int[][]> boards = new HashMap<>();
     public static final Map<Long, long[]> players = new HashMap<>();

src/main/java/org/virep/jdabot/commands/general/AfkCommand.java

@@ -12,7 +12,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import org.virep.jdabot.database.Database;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.sql.Connection;
@@ -23,7 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 
-public class AfkCommand implements Command {
+public class AfkCommand implements SlashCommand {
     @Override
     public String getName() {
         return "afk";

src/main/java/org/virep/jdabot/commands/general/AvatarCommand.java

@@ -9,13 +9,13 @@
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class AvatarCommand implements Command {
+public class AvatarCommand implements SlashCommand {
     @Override
     public String getName() {
         return "avatar";

src/main/java/org/virep/jdabot/commands/general/BannerCommand.java

@@ -16,7 +16,7 @@
 import okhttp3.Response;
 import org.json.JSONObject;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.IOException;
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-public class BannerCommand implements Command {
+public class BannerCommand implements SlashCommand {
     @Override
     public String getName() {
         return "banner";

src/main/java/org/virep/jdabot/commands/general/ColorCommand.java

@@ -14,7 +14,7 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import org.json.JSONObject;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.awt.*;
@@ -29,7 +29,7 @@
 
 import static org.virep.jdabot.utils.Utils.getRandomColor;
 
-public class ColorCommand implements Command {
+public class ColorCommand implements SlashCommand {
     @Override
     public String getName() {
         return "color";

src/main/java/org/virep/jdabot/commands/general/EmojiCommand.java

@@ -15,7 +15,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.utils.FileUpload;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 import org.virep.jdabot.utils.Twemoji;
 
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class EmojiCommand implements Command {
+public class EmojiCommand implements SlashCommand {
     @Override
     public String getName() {
         return "emoji";

src/main/java/org/virep/jdabot/commands/general/InteractCommand.java

@@ -17,7 +17,7 @@
 import okhttp3.ResponseBody;
 import org.json.JSONObject;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.IOException;
@@ -28,7 +28,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-public class InteractCommand implements Command {
+public class InteractCommand implements SlashCommand {
     @Override
     public String getName() {
         return "interact";

src/main/java/org/virep/jdabot/commands/general/MathCommand.java

@@ -26,7 +26,7 @@
 import org.scilab.forge.jlatexmath.TeXFormula;
 import org.scilab.forge.jlatexmath.TeXIcon;
 import org.virep.jdabot.language.Language;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import javax.imageio.ImageIO;
@@ -43,7 +43,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-public class MathCommand implements Command {
+public class MathCommand implements SlashCommand {
     @Override
     public String getName() {
         return "math";

src/main/java/org/virep/jdabot/commands/general/MemeCommand.java

@@ -15,7 +15,7 @@
 import okhttp3.Response;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.IOException;
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-public class MemeCommand implements Command {
+public class MemeCommand implements SlashCommand {
     @Override
     public String getName() {
         return "meme";

src/main/java/org/virep/jdabot/commands/general/OsuCommand.java

@@ -14,7 +14,7 @@
 import okhttp3.Response;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 import org.virep.jdabot.utils.ErrorManager;
 
 import java.io.ByteArrayInputStream;
@@ -26,7 +26,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-public class OsuCommand implements Command {
+public class OsuCommand implements SlashCommand {
     @Override
     public String getName() {
         return "osu";

src/main/java/org/virep/jdabot/commands/general/PingCommand.java

@@ -4,12 +4,12 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import org.virep.jdabot.slashcommandhandler.Command;
+import org.virep.jdabot.handlers.SlashCommand;
 
 import java.util.Collections;
 import java.util.List;
 
-public class PingCommand implements Command {
+public class PingCommand implements SlashCommand {
     @Override
     public String getName() {
         return "ping";