Skip to content

Commit fb477e4

Browse files
committed
Updated to use new MangoBotCore
1 parent cab735e commit fb477e4

28 files changed

Lines changed: 41 additions & 945 deletions

build.gradle

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ dependencies {
7777
testImplementation 'org.junit.jupiter:junit-jupiter'
7878

7979
installer('org.mangorage:installer:3.0.27')
80-
bot('org.mangorage:mangobot:11.0.16')
80+
bot('org.mangorage:mangobot:11.0.18')
8181

8282
compileOnly('org.mangorage:MangoBotGradle:4.0.5')
8383

8484
library('org.luaj:luaj-jse:3.0.1')
85-
library('org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5')
86-
library('org.kohsuke:github-api:1.321')
8785
library('dev.arbjerg:lavaplayer:2.2.2')
8886
library('dev.lavalink.youtube:common:1.11.3')
8987
}
@@ -111,31 +109,19 @@ tasks.named('processResources', ProcessResources).configure {
111109

112110
MangoBotConfig {
113111
setJarTask(jar)
114-
115-
addResolver(e -> {
116-
if (e.versionID2().equals("afec211f05c9dcf0b6ee44276a02f0316ea2458a-SNAPSHOT"))
117-
return e.complete(
118-
e.groupID(),
119-
e.nameID(),
120-
e.versionID(),
121-
e.nameID2(),
122-
"afec211f05c9dcf0b6ee44276a02f0316ea2458a-20240330.121616-1"
123-
)
124-
return e.pass()
125-
})
126112
}
127113

128114
publishing {
129115
publications.register("mangobotaddon", MavenPublication) {
130116
artifact jar
131117

132118
pom {
133-
name = 'MangoBot Core Plugin'
134-
description = 'The Core Plugin for MangoBot'
135-
url = 'https://github.com/MangoRageBot/MangoBot'
119+
name = 'MangoBotPlugin'
120+
description = 'The Main Plugin For MangoBot'
121+
url = 'https://github.com/MangoRageBot/MangoBotPlugin'
136122
issueManagement {
137123
system = 'github'
138-
url = 'https://github.com/MangoRageBot/MangoBot/issues'
124+
url = 'https://github.com/MangoRageBot/MangoBotPlugin/issues'
139125
}
140126
developers {
141127
developer {

gradlew

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/org/mangorage/mangobot/AutoUpdate.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.mangorage.mangobot;
22

3-
import org.apache.commons.logging.Log;
43
import org.mangorage.basicutils.LogHelper;
5-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
4+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
65
import org.w3c.dom.Document;
76
import org.w3c.dom.NodeList;
87

src/main/java/org/mangorage/mangobot/MangoBotPlugin.java

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.mangorage.basicutils.config.ISetting;
4343
import org.mangorage.basicutils.config.Transformers;
4444
import org.mangorage.jdautils.command.Command;
45-
import org.mangorage.mangobot.config.GuildConfig;
4645
import org.mangorage.mangobot.core.BotEventListener;
4746
import org.mangorage.mangobot.core.BotPermissions;
4847
import org.mangorage.mangobot.core.Listeners;
@@ -66,11 +65,7 @@
6665
import org.mangorage.mangobot.modules.developer.RunCode;
6766
import org.mangorage.mangobot.modules.developer.SpeakCommand;
6867
import org.mangorage.mangobot.modules.developer.TerminateCommand;
69-
import org.mangorage.mangobot.modules.github.GHIssueStatus;
70-
import org.mangorage.mangobot.modules.github.GHPRStatus;
71-
import org.mangorage.mangobot.modules.github.IssueScanCommand;
72-
import org.mangorage.mangobot.modules.github.PRScanCommand;
73-
import org.mangorage.mangobot.modules.github.PasteRequestModule;
68+
7469
import org.mangorage.mangobot.modules.music.commands.PauseCommand;
7570
import org.mangorage.mangobot.modules.music.commands.PlayCommand;
7671
import org.mangorage.mangobot.modules.music.commands.PlayingCommand;
@@ -83,8 +78,8 @@
8378
import org.mangorage.mangobotapi.core.events.ShutdownEvent;
8479
import org.mangorage.mangobotapi.core.events.StartupEvent;
8580
import org.mangorage.mangobotapi.core.modules.action.ButtonActionRegistry;
86-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
87-
import org.mangorage.mangobotapi.core.plugin.api.PluginMessageEvent;
81+
import org.mangorage.mangobotapi.core.plugin.PluginMessageEvent;
82+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
8883
import org.mangorage.mangobotapi.core.plugin.impl.Plugin;
8984

9085
import net.dv8tion.jda.api.JDABuilder;
@@ -160,8 +155,6 @@ public MangoBotPlugin() {
160155
getJDA().addEventListener(new BotEventListener(this));
161156

162157
new AutoUpdate(this);
163-
164-
init();
165158
}
166159

167160
public void startup() {
@@ -230,16 +223,7 @@ public void registration() {
230223
cmdRegistry.addBasicCommand(new RunCode(this));
231224
cmdRegistry.addBasicCommand(new GetEmbedsCommand());
232225

233-
234-
cmdRegistry.addBasicCommand(new PRScanCommand(this));
235-
cmdRegistry.addBasicCommand(new IssueScanCommand(this));
236-
237-
GuildConfig.loadServerConfigs();
238226
permRegistry.save();
239-
PasteRequestModule.register(getPluginBus());
240-
new GHPRStatus(this);
241-
new GHIssueStatus(this);
242-
243227

244228
getPluginBus().addListener(10, PluginMessageEvent.class, pm -> {
245229
if (pm.getMethod().equals("getDate")) {

src/main/java/org/mangorage/mangobot/config/GuildConfig.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

src/main/java/org/mangorage/mangobot/core/BotEventListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import org.mangorage.jdautils.WatcherManager;
4343
import org.mangorage.mangobotapi.core.events.DiscordEvent;
4444
import org.mangorage.mangobotapi.core.events.discord.DMessageReceivedEvent;
45-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
46-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
45+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
46+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
4747

4848
import java.util.concurrent.TimeUnit;
4949

src/main/java/org/mangorage/mangobot/core/Listeners.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
2626
import org.mangorage.mangobot.MangoBotPlugin;
2727
import org.mangorage.mangobotapi.core.events.DiscordEvent;
28-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
28+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
2929

3030
public class Listeners {
3131
private final JDAPlugin plugin;

src/main/java/org/mangorage/mangobot/core/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.mangorage.mangobotapi.core.commands.Arguments;
3333
import org.mangorage.mangobotapi.core.commands.CommandPrefix;
3434
import org.mangorage.mangobotapi.core.events.BasicCommandEvent;
35-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
35+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
3636

3737
import java.io.BufferedInputStream;
3838
import java.io.BufferedReader;

src/main/java/org/mangorage/mangobot/modules/basic/commands/AntiPingCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.mangorage.mangobotapi.core.events.DiscordEvent;
1212
import org.mangorage.mangobotapi.core.events.LoadEvent;
1313
import org.mangorage.mangobotapi.core.events.SaveEvent;
14-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
14+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
1515
import java.util.ArrayList;
1616
import java.util.HashMap;
1717
import java.util.List;

src/main/java/org/mangorage/mangobot/modules/basic/commands/HelpCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.mangorage.mangobotapi.core.commands.Arguments;
2828
import org.mangorage.mangobotapi.core.commands.CommandResult;
2929
import org.mangorage.mangobotapi.core.commands.IBasicCommand;
30-
import org.mangorage.mangobotapi.core.plugin.api.JDAPlugin;
30+
import org.mangorage.mangobotapi.core.plugin.extra.JDAPlugin;
3131

3232
public class HelpCommand implements IBasicCommand {
3333

0 commit comments

Comments
 (0)