Skip to content

Commit 9b391b5

Browse files
committed
Updated to support new cmd system.
1 parent 13a9a95 commit 9b391b5

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
bootstrap("org.mangorage:mangobotbootstrap:1.0.84")
7878
launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
7979

80-
plugin('org.mangorage:mangobot:12.0.93')
80+
plugin('org.mangorage:mangobot:12.0.94')
8181

8282
library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)
8383
library('org.luaj:luaj-jme:3.0.1')

src/main/java/org/mangorage/mangobotplugin/BotEventListener.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
99
import net.dv8tion.jda.api.hooks.SubscribeEvent;
10+
import org.mangorage.mangobotcore.api.command.v1.CommandParseResult;
1011
import org.mangorage.mangobotcore.api.jda.command.v1.CommandResult;
1112
import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
1213
import org.mangorage.mangobotcore.api.jda.event.v1.CommandEvent;
@@ -66,10 +67,12 @@ public void onMessageReceived(MessageReceivedEvent event) {
6667

6768

6869
if (isSilent || rawMessage.startsWith(cmdPrefix)) {
70+
final var cmdParseResult = new CommandParseResult(); // TODO: Do something with this when we convert to new cmd system!
6971
final var dispatcher = mangoBot.getCommandDispatcher();
7072
final var result = dispatcher.execute(
7173
isSilent ? rawMessage.replaceFirst(silentPrefix, "") : rawMessage.replaceFirst(cmdPrefix, ""),
72-
message
74+
message,
75+
cmdParseResult
7376
);
7477

7578
if (result != JDACommandResult.INVALID_COMMAND) {

src/main/java/org/mangorage/mangobotplugin/commands/PingCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import net.dv8tion.jda.api.entities.Message;
44
import org.mangorage.mangobotcore.api.jda.command.v2.AbstractJDACommand;
55
import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
6-
import org.mangorage.mangobotcore.api.util.misc.Arguments;
76

87
public final class PingCommand extends AbstractJDACommand {
98

@@ -12,7 +11,7 @@ public PingCommand(String name) {
1211
}
1312

1413
@Override
15-
public JDACommandResult run(Message message, Arguments arguments) {
14+
public JDACommandResult run(Message message, String[] arguments) {
1615
message.reply("Pong!").queue();
1716
return JDACommandResult.PASS;
1817
}

src/main/java/org/mangorage/mangobotplugin/commands/PingsCommand.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.mangorage.mangobotcore.api.jda.command.v2.AbstractJDACommand;
88
import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
9-
import org.mangorage.mangobotcore.api.util.misc.Arguments;
109
import java.awt.*;
1110

1211
public final class PingsCommand extends AbstractJDACommand {
@@ -27,7 +26,7 @@ public PingsCommand(String name) {
2726
}
2827

2928
@Override
30-
public JDACommandResult run(Message message, Arguments arguments) {
29+
public JDACommandResult run(Message message, String[] arguments) {
3130
var referenced = message.getReferencedMessage();
3231
if (referenced == null) {
3332
message.getChannel().sendMessageEmbeds(EMBED).queue();

0 commit comments

Comments
 (0)