Skip to content

Commit 8291da4

Browse files
committed
Some minor stuff.
1 parent 6f7c4f5 commit 8291da4

5 files changed

Lines changed: 34 additions & 12 deletions

File tree

build.gradle

Lines changed: 12 additions & 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.116')
80+
plugin('org.mangorage:mangobot:12.0.118')
8181

8282
library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)
8383
library('org.luaj:luaj-jme:3.0.1')
@@ -87,6 +87,17 @@ dependencies {
8787

8888
library("com.google.zxing:core:3.5.4")
8989
library("com.google.zxing:javase:3.5.4")
90+
91+
// SQL Stuff
92+
library("org.hibernate.orm:hibernate-core:6.4.4.Final")
93+
library("jakarta.persistence:jakarta.persistence-api:3.1.0")
94+
library("jakarta.interceptor:jakarta.interceptor-api:2.1.0")
95+
library('jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1')
96+
97+
// SQL Driver
98+
library('org.postgresql:postgresql:42.7.9')
99+
library('com.h2database:h2:2.2.224')
100+
90101
}
91102

92103
test {

src/main/java/module-info.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.mangorage.mangobotplugin.module.ModuleConfigurator;
44

55
module org.mangorage.mangobotplugin {
6+
requires java.naming;
67
requires okio;
78
requires kotlin.stdlib;
89
requires com.fasterxml.jackson.databind;
@@ -25,15 +26,15 @@
2526
requires org.mangorage.bootstrap;
2627
requires com.google.zxing;
2728
requires com.google.zxing.javase;
29+
requires jakarta.persistence;
30+
requires org.hibernate.orm.core;
2831

32+
opens org.mangorage.mangobotplugin;
2933

3034
exports org.mangorage.mangobotplugin.entrypoint;
3135
exports org.mangorage.mangobotplugin.commands.trick;
3236

33-
exports org.mangorage.mangobotplugin to net.dv8tion.jda;
34-
35-
exports org.mangorage.mangobotplugin.pagedlist to net.dv8tion.jda;
36-
37+
opens org.mangorage.mangobotplugin.pagedlist to net.dv8tion.jda;
3738
opens org.mangorage.mangobotplugin.commands.trick to com.google.gson;
3839

3940

src/main/java/org/mangorage/mangobotplugin/commands/trick/impl/TrickCommand.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ public void onCommandEvent(CommandEvent event) {
4848
final var trick = trickManager.getTrickForGuildByName(guildID, command);
4949
if (trick != null) {
5050
execute(
51-
message,
52-
new String[]{
53-
"show",
54-
trick.getTrickID()
55-
},
56-
new CommandParseResult()
51+
CommandContext.of(
52+
message,
53+
new String[]{
54+
"show",
55+
trick.getTrickID()
56+
},
57+
new CommandParseResult()
58+
)
5759
);
5860
event.setHandled(JDACommandResult.PASS);
5961
}

src/main/java/org/mangorage/mangobotplugin/entrypoint/MangoBot.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.dv8tion.jda.api.entities.Activity;
77
import net.dv8tion.jda.api.entities.Message;
88
import net.dv8tion.jda.api.hooks.AnnotatedEventManager;
9-
import net.dv8tion.jda.api.interactions.commands.build.Commands;
109
import net.dv8tion.jda.api.requests.GatewayIntent;
1110
import net.dv8tion.jda.api.utils.MemberCachePolicy;
1211
import net.dv8tion.jda.api.utils.cache.CacheFlag;

src/main/java/org/mangorage/mangobotplugin/module/ModuleConfigurator.java

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

33
import org.mangorage.bootstrap.api.module.IModuleConfigurator;
4+
import org.mangorage.bootstrap.api.module.IModuleLayer;
45

56
import java.util.List;
67

@@ -14,4 +15,12 @@ public List<String> getChildren(String s) {
1415
default -> List.of();
1516
};
1617
}
18+
19+
@Override
20+
public void configureModuleLayer(IModuleLayer moduleLayer) {
21+
moduleLayer.addReads(
22+
"org.jboss.logging",
23+
"java.logging"
24+
);
25+
}
1726
}

0 commit comments

Comments
 (0)