Skip to content

Commit 08fb831

Browse files
committed
Updated to newest version of MangoBotCore!
1 parent 394f11d commit 08fb831

23 files changed

Lines changed: 84 additions & 83 deletions

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ dependencies {
7474
testImplementation 'org.junit.jupiter:junit-jupiter'
7575

7676
installer('org.mangorage:installer:4.0.26')
77-
bootstrap("org.mangorage:mangobotbootstrap:1.0.66")
77+
bootstrap("org.mangorage:mangobotbootstrap:1.0.72")
7878

79-
plugin('org.mangorage:mangobot:12.0.76')
79+
plugin('org.mangorage:mangobot:12.0.80')
8080

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

src/main/java/module-info.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import org.mangorage.bootstrap.api.module.IModuleConfigurator;
2+
import org.mangorage.mangobotcore.api.plugin.v1.Plugin;
3+
import org.mangorage.mangobotplugin.module.ModuleConfigurator;
4+
15
module org.mangorage.mangobotplugin {
26
requires okio;
37
requires kotlin.stdlib;
@@ -35,8 +39,10 @@
3539
opens org.mangorage.mangobotplugin.commands.trick.lua to com.google.gson;
3640
opens org.mangorage.mangobotplugin.commands.music;
3741

38-
provides org.mangorage.mangobotcore.plugin.api.Plugin with org.mangorage.mangobotplugin.entrypoint.MangoBot;
39-
provides org.mangorage.bootstrap.api.module.IModuleConfigurator with org.mangorage.mangobotplugin.module.ModuleConfigurator;
4042

41-
uses org.mangorage.mangobotcore.plugin.api.Plugin;
43+
provides Plugin with org.mangorage.mangobotplugin.entrypoint.MangoBot;
44+
provides IModuleConfigurator with ModuleConfigurator;
45+
46+
uses Plugin;
47+
uses IModuleConfigurator;
4248
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
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.commonutils.jda.slash.command.watcher.WatcherManager;
11-
import org.mangorage.mangobotcore.jda.event.DiscordButtonInteractEvent;
12-
import org.mangorage.mangobotcore.jda.event.DiscordMessageReactionAddEvent;
13-
import org.mangorage.mangobotcore.jda.event.DiscordMessageReceivedEvent;
14-
import org.mangorage.mangobotcore.jda.event.DiscordModalInteractionEvent;
10+
import org.mangorage.mangobotcore.api.jda.event.v1.DiscordButtonInteractEvent;
11+
import org.mangorage.mangobotcore.api.jda.event.v1.DiscordMessageReactionAddEvent;
12+
import org.mangorage.mangobotcore.api.jda.event.v1.DiscordMessageReceivedEvent;
13+
import org.mangorage.mangobotcore.api.jda.event.v1.DiscordModalInteractionEvent;
14+
import org.mangorage.mangobotcore.api.util.jda.slash.command.watcher.WatcherManager;
1515
import org.mangorage.mangobotplugin.entrypoint.MangoBot;
1616

1717
public final class BotEventListener {

src/main/java/org/mangorage/mangobotplugin/actions/TrashButtonAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
2727
import net.dv8tion.jda.api.interactions.components.buttons.Button;
2828
import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
29-
import org.mangorage.commonutils.jda.ButtonAction;
29+
import org.mangorage.mangobotcore.api.util.jda.ButtonAction;
3030

3131
public class TrashButtonAction extends ButtonAction {
3232

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.mangorage.mangobotplugin.commands;
22

33
import net.dv8tion.jda.api.entities.Message;
4-
import org.mangorage.commonutils.misc.Arguments;
5-
import org.mangorage.mangobotcore.jda.command.api.CommandResult;
6-
import org.mangorage.mangobotcore.jda.command.api.ICommand;
4+
import org.mangorage.mangobotcore.api.jda.command.v1.CommandResult;
5+
import org.mangorage.mangobotcore.api.jda.command.v1.ICommand;
6+
import org.mangorage.mangobotcore.api.util.misc.Arguments;
77

88
import java.util.List;
99

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import net.dv8tion.jda.api.EmbedBuilder;
44
import net.dv8tion.jda.api.entities.Message;
55
import net.dv8tion.jda.api.entities.MessageEmbed;
6-
import org.mangorage.commonutils.misc.Arguments;
7-
import org.mangorage.mangobotcore.jda.command.api.CommandResult;
8-
import org.mangorage.mangobotcore.jda.command.api.ICommand;
6+
import org.mangorage.mangobotcore.api.jda.command.v1.CommandResult;
7+
import org.mangorage.mangobotcore.api.jda.command.v1.ICommand;
8+
import org.mangorage.mangobotcore.api.util.misc.Arguments;
99

1010
import java.awt.*;
1111
import java.util.List;

src/main/java/org/mangorage/mangobotplugin/commands/internal/EmojiCommand.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
77
import net.dv8tion.jda.api.entities.emoji.Emoji;
88
import net.dv8tion.jda.api.interactions.commands.OptionType;
9-
import org.mangorage.commonutils.jda.slash.command.Command;
10-
import org.mangorage.commonutils.jda.slash.command.CommandOption;
11-
import org.mangorage.commonutils.misc.Arguments;
12-
import org.mangorage.mangobotcore.jda.command.api.CommandResult;
13-
import org.mangorage.mangobotcore.jda.command.api.ICommand;
9+
import org.mangorage.mangobotcore.api.jda.command.v1.CommandResult;
10+
import org.mangorage.mangobotcore.api.jda.command.v1.ICommand;
11+
import org.mangorage.mangobotcore.api.util.jda.slash.command.Command;
12+
import org.mangorage.mangobotcore.api.util.jda.slash.command.CommandOption;
13+
import org.mangorage.mangobotcore.api.util.misc.Arguments;
14+
1415
import java.util.List;
1516

1617
public final class EmojiCommand implements ICommand {

src/main/java/org/mangorage/mangobotplugin/commands/internal/HomeDepotAlertCommand.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
88
import com.google.zxing.common.HybridBinarizer;
99
import net.dv8tion.jda.api.entities.Message;
10-
import org.mangorage.commonutils.misc.Arguments;
11-
import org.mangorage.mangobotcore.jda.command.api.CommandResult;
12-
import org.mangorage.mangobotcore.jda.command.api.ICommand;
10+
import org.mangorage.mangobotcore.api.jda.command.v1.CommandResult;
11+
import org.mangorage.mangobotcore.api.jda.command.v1.ICommand;
12+
import org.mangorage.mangobotcore.api.util.misc.Arguments;
1313

1414
import javax.imageio.ImageIO;
1515
import java.awt.image.BufferedImage;

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicPlayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
3636
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
3737
import net.dv8tion.jda.api.audio.AudioSendHandler;
38-
import org.mangorage.commonutils.log.LogHelper;
38+
import org.mangorage.mangobotcore.api.util.log.LogHelper;
3939

4040
import java.nio.ByteBuffer;
4141
import java.util.ArrayDeque;

src/main/java/org/mangorage/mangobotplugin/commands/music/MusicUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
import net.dv8tion.jda.api.interactions.components.buttons.Button;
3939
import net.dv8tion.jda.api.managers.AudioManager;
4040
import net.dv8tion.jda.api.utils.MarkdownUtil;
41-
import org.mangorage.commonutils.log.LogHelper;
42-
import org.mangorage.commonutils.misc.PagedList;
43-
import org.mangorage.mangobotcore.MangoBotCore;
41+
import org.mangorage.mangobotcore.api.plugin.MangoBotCore;
42+
import org.mangorage.mangobotcore.api.util.log.LogHelper;
43+
import org.mangorage.mangobotcore.api.util.misc.PagedList;
4444
import org.mangorage.mangobotplugin.pagedlist.PagedListManager;
4545
import org.mangorage.mangobotplugin.pagedlist.PagedListWithAction;
4646

0 commit comments

Comments
 (0)