Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit 00a1b35

Browse files
authored
Merge pull request #61 from SLNE-Development/14-split-databases
feat(queue): support plugin multi-datasource, refactor queue system, and improve classloader
2 parents bfb0d9d + da642a4 commit 00a1b35

File tree

104 files changed

+2869
-850
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2869
-850
lines changed

.idea/codeStyles/Project.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.live-plugins/packet-id/plugin.kts

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

.live-plugins/test/plugin.kts

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

build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ allprojects {
4040
tasks {
4141
configureShadowJar()
4242
configureJar()
43+
44+
javadoc {
45+
val options = options as StandardJavadocDocletOptions
46+
options.use()
47+
options.tags("implNote:a:Implementation Note:")
48+
}
4349
}
4450

4551
setupPublishing()

gradle.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
org.gradle.parallel=true
22
org.gradle.daemon=true
33
org.gradle.jvmargs=-Xmx4G
4-
54
kotlin.stdlib.default.dependency=false
6-
5+
kotlin.code.style=official
76
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
87
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
9-
108
version=1.21.1-1.0.0-SNAPSHOT

gradle/libs.versions.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ehcache = "3.10.8"
2121
kotlin-byte-buf-serializer = "1.0.0"
2222
voicechat-api = "2.5.27"
2323
discord-webhooks = "1.0"
24+
konf = "1.1.2"
2425

2526

2627
[libraries]
@@ -63,27 +64,30 @@ luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms-api" }
6364
mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client" }
6465
mysql-connector-j = { module = "com.mysql:mysql-connector-j" }
6566
spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" }
67+
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
6668
reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactive-streams" }
6769
hibernate-jcache = { module = "org.hibernate.orm:hibernate-jcache" }
6870
ehcache = { module = "org.ehcache:ehcache", version.ref = "ehcache" }
6971
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages" }
7072
spring-boot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2" }
7173
spring-aop = { module = "org.springframework:spring-aop" }
7274
spring-aspects = { module = "org.springframework:spring-aspects" }
75+
spring-web = { module = "org.springframework:spring-web" }
7376
flyway-core = { module = "org.flywaydb:flyway-core" }
7477
flyway-mysql = { module = "org.flywaydb:flyway-mysql" }
7578
spring-instrument = { module = "org.springframework:spring-instrument" }
7679
kotlin-byte-buf-serializer = { module = "dev.slne.surf:kotlin-byte-buf-serializer", version.ref = "kotlin-byte-buf-serializer" }
7780
voicechat-api = { module = "de.maxhenkel.voicechat:voicechat-api", version.ref = "voicechat-api" }
78-
discord-webhooks = { module = "com.github.BinaryWriter:discord-webhooks", version.ref = "discord-webhooks"}
81+
discord-webhooks = { module = "com.github.BinaryWriter:discord-webhooks", version.ref = "discord-webhooks" }
82+
konf = { module = "com.uchuhimo:konf", version.ref = "konf" }
7983

8084
[plugins]
8185
spring-boot = { id = "org.springframework.boot" }
8286

8387
[bundles]
8488
netty-all = ["netty-all", "netty-tcnative"]
8589
spring-aop = ["spring-aop", "aspectjweaver", "aspectjrt", "spring-aspects"]
86-
spring-api-common = ["spring-boot-starter", "spring-boot-starter-cache"]
90+
spring-api-common = ["spring-boot-starter", "spring-boot-starter-cache", "spring-web"]
8791
jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin"]
8892
exposed-api-server = ["exposed-spring-boot-starter", "exposed-java-time", "exposed-migration"]
8993
maven-libraries = ["maven-impl", "maven-resolver"]

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.
212212

213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

0 commit comments

Comments
 (0)