Skip to content

Commit b4293c3

Browse files
committed
Replace Aikar timings with Spark
1 parent bc80720 commit b4293c3

File tree

66 files changed

+1839
-2155
lines changed

Some content is hidden

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

66 files changed

+1839
-2155
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ upnp = { group = "org.cloudburstmc", name = "upnp", version = "1.1.1" }
6767
jakarta-inject = { group = "jakarta.inject", name = "jakarta.inject-api", version = "2.0.1" }
6868
jose-jwt = { group = "com.nimbusds", name = "nimbus-jose-jwt", version = "10.7" }
6969
jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" }
70+
spark-api = { group = "me.lucko", name = "spark-api", version = "0.1-SNAPSHOT" }
7071
picocli = { group = "info.picocli", name = "picocli", version = "4.7.7" }
7172

7273
[bundles]

server/build.gradle.kts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ plugins {
66
alias(libs.plugins.extra.java.module.info)
77
}
88

9+
repositories {
10+
maven {
11+
name = "luck-repo"
12+
url = uri("https://repo.lucko.me/")
13+
content {
14+
includeModule("me.lucko", "spark-api")
15+
}
16+
}
17+
}
18+
919
dependencies {
1020
implementation(project(":api")) {
1121
attributes {
@@ -26,6 +36,7 @@ dependencies {
2636

2737
compileOnly(libs.jsr305)
2838

39+
implementation(libs.spark.api)
2940
implementation(libs.terminal.console.appender)
3041
implementation(libs.jline.terminal)
3142
implementation(libs.jline.reader)
@@ -74,6 +85,7 @@ extraJavaModuleInfo {
7485
patchRealModule()
7586
}
7687
automaticModule("com.google.guava:listenablefuture", "com.google.guava.listenablefuture")
88+
automaticModule("me.lucko:spark-api", "me.lucko.spark.api")
7789
automaticModule("net.jodah:expiringmap", "net.jodah.expiringmap")
7890
automaticModule("org.osgi:org.osgi.resource", "org.osgi.resource")
7991
automaticModule("org.osgi:org.osgi.service.serviceloader", "org.osgi.service.serviceloader")

server/src/main/java/co/aikar/timings/FullServerTickTiming.java

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

server/src/main/java/co/aikar/timings/Timing.java

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

0 commit comments

Comments
 (0)