Skip to content

Commit 7718ffb

Browse files
gigglingbedgigglingbed
committed
Package and updates
1 parent 190369b commit 7718ffb

40 files changed

+145
-139
lines changed

‎.editorconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[*]
2+
charset = utf-8
3+
indent_style = space
4+
insert_final_newline = true
5+
trim_trailing_whitespace = true
6+
indent_size = 4
7+
8+
[*.{json, yml}]
9+
indent_size = 2
10+
11+
[*.md]
12+
trim_trailing_whitespace = false

‎.gitignore

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
.gradle
22
.idea
33
build
4-
5-
capes
6-
74
private-config.properties
8-
gmail_credentials.json
9-
tokens
105
.DS_Store

‎build.gradle

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
plugins {
22
id 'java'
33
id 'application'
4-
id 'com.github.johnrengelman.shadow' version '6.0.0'
4+
id 'com.github.johnrengelman.shadow' version '7.0.0'
55
}
66

7-
group 'minegame159.meteorbot'
8-
version '0.1.0'
7+
group 'meteordevelopment.meteorbot'
8+
version '0.2'
99
mainClassName = group + '.MeteorBot'
1010

11-
sourceCompatibility = JavaVersion.VERSION_1_8
12-
targetCompatibility = JavaVersion.VERSION_1_8
11+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
1312

1413
repositories {
1514
mavenCentral()
16-
jcenter()
15+
maven {
16+
name 'm2-dv8tion'
17+
url 'https://m2.dv8tion.net/releases'
18+
}
1719
}
1820

1921
dependencies {
20-
implementation 'net.dv8tion:JDA:4.2.0_168'
21-
implementation 'ch.qos.logback:logback-classic:1.2.3'
22-
implementation 'org.mongodb:mongodb-driver-sync:4.1.0-beta2'
23-
implementation 'com.konghq:unirest-java:3.11.02'
22+
implementation 'net.dv8tion:JDA:4.3.0_277'
23+
implementation 'org.mongodb:mongodb-driver-sync:4.3.0'
24+
implementation 'com.konghq:unirest-java:3.11.12'
2425
implementation 'org.reflections:reflections:0.9.12'
25-
implementation 'com.sun.activation:javax.activation:1.2.0'
26+
implementation 'com.sparkjava:spark-core:2.9.3'
2627
}
2728

2829
compileJava.options.encoding = "UTF-8"

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/main/java/minegame159/meteorbot/Config.java renamed to ‎src/main/java/meteordevelopment/meteorbot/Config.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package minegame159.meteorbot;
1+
package meteordevelopment.meteorbot;
22

33
import java.io.FileInputStream;
44
import java.io.IOException;

‎src/main/java/minegame159/meteorbot/InfoChannels.java renamed to ‎src/main/java/meteordevelopment/meteorbot/InfoChannels.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package minegame159.meteorbot;
1+
package meteordevelopment.meteorbot;
22

33
import kong.unirest.Unirest;
4-
import minegame159.meteorbot.utils.Utils;
4+
import meteordevelopment.meteorbot.utils.Utils;
55

66
public class InfoChannels {
77
public static void init() {

‎src/main/java/minegame159/meteorbot/MeteorBot.java renamed to ‎src/main/java/meteordevelopment/meteorbot/MeteorBot.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package minegame159.meteorbot;
1+
package meteordevelopment.meteorbot;
22

33
import kong.unirest.Unirest;
4-
import minegame159.meteorbot.commands.Commands;
5-
import minegame159.meteorbot.database.Db;
6-
import minegame159.meteorbot.tickets.Tickets;
4+
import meteordevelopment.meteorbot.commands.Commands;
5+
import meteordevelopment.meteorbot.database.Db;
6+
import meteordevelopment.meteorbot.tickets.Tickets;
77
import net.dv8tion.jda.api.JDA;
88
import net.dv8tion.jda.api.JDABuilder;
99
import net.dv8tion.jda.api.entities.*;

‎src/main/java/minegame159/meteorbot/commands/Category.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/Category.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package minegame159.meteorbot.commands;
1+
package meteordevelopment.meteorbot.commands;
22

33
public enum Category {
44
Normal,

‎src/main/java/minegame159/meteorbot/commands/Command.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/Command.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package minegame159.meteorbot.commands;
1+
package meteordevelopment.meteorbot.commands;
22

33
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
44

‎src/main/java/minegame159/meteorbot/commands/Commands.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/Commands.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package minegame159.meteorbot.commands;
1+
package meteordevelopment.meteorbot.commands;
22

3-
import minegame159.meteorbot.MeteorBot;
3+
import meteordevelopment.meteorbot.MeteorBot;
44
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
55
import org.reflections.Reflections;
66
import org.reflections.scanners.SubTypesScanner;
@@ -20,7 +20,7 @@ public class Commands {
2020

2121
public static void init() {
2222
Reflections reflections = new Reflections(new ConfigurationBuilder()
23-
.setUrls(ClasspathHelper.forPackage("minegame159.meteorbot.commands"))
23+
.setUrls(ClasspathHelper.forPackage("meteordevelopment.meteorbot.commands"))
2424
.setScanners(new SubTypesScanner())
2525
);
2626

‎src/main/java/minegame159/meteorbot/commands/OkInsults.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/OkInsults.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package minegame159.meteorbot.commands;
1+
package meteordevelopment.meteorbot.commands;
22

3-
import minegame159.meteorbot.commands.Command;
4-
import minegame159.meteorbot.commands.Commands;
5-
import minegame159.meteorbot.commands.other.OkInsultCommand;
3+
import meteordevelopment.meteorbot.commands.other.OkInsultCommand;
64

75
public class OkInsults {
86
public static String HELP_STRING;

‎src/main/java/minegame159/meteorbot/commands/help/BaritoneCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/BaritoneCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class BaritoneCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/BenefitsCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/BenefitsCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class BenefitsCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/BookDupeCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/BookDupeCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class BookDupeCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/FabricCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/FabricCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class FabricCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/FpsCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/FpsCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class FpsCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/HelpCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/HelpCommand.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.commands.Commands;
6-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.commands.Commands;
6+
import meteordevelopment.meteorbot.utils.Utils;
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88

99
public class HelpCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/MountBypassDupeCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/MountBypassDupeCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class MountBypassDupeCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/help/MulticonnectCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/help/MulticonnectCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.help;
1+
package meteordevelopment.meteorbot.commands.help;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.utils.Utils;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

88
public class MulticonnectCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/moderator/DonatorCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/moderator/DonatorCommand.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package minegame159.meteorbot.commands.moderator;
1+
package meteordevelopment.meteorbot.commands.moderator;
22

33
import kong.unirest.Unirest;
4-
import minegame159.meteorbot.Config;
5-
import minegame159.meteorbot.commands.Category;
6-
import minegame159.meteorbot.commands.Command;
7-
import minegame159.meteorbot.utils.Utils;
4+
import meteordevelopment.meteorbot.Config;
5+
import meteordevelopment.meteorbot.commands.Category;
6+
import meteordevelopment.meteorbot.commands.Command;
7+
import meteordevelopment.meteorbot.utils.Utils;
88
import net.dv8tion.jda.api.entities.Member;
99
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
1010

‎src/main/java/minegame159/meteorbot/commands/moderator/SupportMessageCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/moderator/SupportMessageCommand.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package minegame159.meteorbot.commands.moderator;
1+
package meteordevelopment.meteorbot.commands.moderator;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.tickets.Tickets;
6-
import minegame159.meteorbot.utils.Utils;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.tickets.Tickets;
6+
import meteordevelopment.meteorbot.utils.Utils;
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88

9-
import static minegame159.meteorbot.utils.Utils.embed;
9+
import static meteordevelopment.meteorbot.utils.Utils.embed;
1010

1111
public class SupportMessageCommand extends Command {
1212
public SupportMessageCommand() {

‎src/main/java/minegame159/meteorbot/commands/normal/CatCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/normal/CatCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.normal;
1+
package meteordevelopment.meteorbot.commands.normal;
22

33
import kong.unirest.Unirest;
4-
import minegame159.meteorbot.commands.Category;
5-
import minegame159.meteorbot.commands.Command;
4+
import meteordevelopment.meteorbot.commands.Category;
5+
import meteordevelopment.meteorbot.commands.Command;
66
import net.dv8tion.jda.api.EmbedBuilder;
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88

‎src/main/java/minegame159/meteorbot/commands/normal/LinkCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/normal/LinkCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package minegame159.meteorbot.commands.normal;
1+
package meteordevelopment.meteorbot.commands.normal;
22

33
import kong.unirest.Unirest;
44
import kong.unirest.json.JSONObject;
5-
import minegame159.meteorbot.Config;
6-
import minegame159.meteorbot.commands.Category;
7-
import minegame159.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.Config;
6+
import meteordevelopment.meteorbot.commands.Category;
7+
import meteordevelopment.meteorbot.commands.Command;
88
import net.dv8tion.jda.api.entities.Member;
99
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
1010

‎src/main/java/minegame159/meteorbot/commands/normal/MonkyCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/normal/MonkyCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package minegame159.meteorbot.commands.normal;
1+
package meteordevelopment.meteorbot.commands.normal;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
55
import net.dv8tion.jda.api.EmbedBuilder;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

‎src/main/java/minegame159/meteorbot/commands/normal/SnaleCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/normal/SnaleCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package minegame159.meteorbot.commands.normal;
1+
package meteordevelopment.meteorbot.commands.normal;
22

33
import kong.unirest.Unirest;
4-
import minegame159.meteorbot.commands.Category;
5-
import minegame159.meteorbot.commands.Command;
4+
import meteordevelopment.meteorbot.commands.Category;
5+
import meteordevelopment.meteorbot.commands.Command;
66
import net.dv8tion.jda.api.EmbedBuilder;
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88

‎src/main/java/minegame159/meteorbot/commands/normal/StatsCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/normal/StatsCommand.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package minegame159.meteorbot.commands.normal;
1+
package meteordevelopment.meteorbot.commands.normal;
22

33
import kong.unirest.Unirest;
44
import kong.unirest.json.JSONObject;
5-
import minegame159.meteorbot.commands.Category;
6-
import minegame159.meteorbot.commands.Command;
7-
import minegame159.meteorbot.utils.Utils;
5+
import meteordevelopment.meteorbot.commands.Category;
6+
import meteordevelopment.meteorbot.commands.Command;
7+
import meteordevelopment.meteorbot.utils.Utils;
88
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
99

1010
import java.util.regex.Pattern;

‎src/main/java/minegame159/meteorbot/commands/other/OkInsultCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/other/OkInsultCommand.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package minegame159.meteorbot.commands.other;
1+
package meteordevelopment.meteorbot.commands.other;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
55
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
66

77
public class OkInsultCommand extends Command {

‎src/main/java/minegame159/meteorbot/commands/tickets/CloseCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/tickets/CloseCommand.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package minegame159.meteorbot.commands.tickets;
1+
package meteordevelopment.meteorbot.commands.tickets;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.tickets.Ticket;
6-
import minegame159.meteorbot.tickets.Tickets;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.tickets.Ticket;
6+
import meteordevelopment.meteorbot.tickets.Tickets;
77
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
88

9-
import static minegame159.meteorbot.utils.Utils.embed;
9+
import static meteordevelopment.meteorbot.utils.Utils.embed;
1010

1111
public class CloseCommand extends Command {
1212
public CloseCommand() {

‎src/main/java/minegame159/meteorbot/commands/tickets/TicketCommand.java renamed to ‎src/main/java/meteordevelopment/meteorbot/commands/tickets/TicketCommand.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package minegame159.meteorbot.commands.tickets;
1+
package meteordevelopment.meteorbot.commands.tickets;
22

3-
import minegame159.meteorbot.commands.Category;
4-
import minegame159.meteorbot.commands.Command;
5-
import minegame159.meteorbot.tickets.Tickets;
3+
import meteordevelopment.meteorbot.commands.Category;
4+
import meteordevelopment.meteorbot.commands.Command;
5+
import meteordevelopment.meteorbot.tickets.Tickets;
66
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
77

8-
import static minegame159.meteorbot.utils.Utils.embed;
8+
import static meteordevelopment.meteorbot.utils.Utils.embed;
99

1010
public class TicketCommand extends Command {
1111
public TicketCommand() {

0 commit comments

Comments
 (0)