Skip to content

Commit 70477d0

Browse files
ArikSquadArikSquad
committed
Merge remote-tracking branch 'origin/master' into feat/garden
# Conflicts: # build.gradle.kts # service.punishment/build.gradle.kts # type.deepcaverns/src/main/java/net/swofty/type/deepcaverns/npcs/NPCRhys.java # type.dwarvenmines/src/main/java/net/swofty/type/dwarvenmines/npcs/NPCPuzzler.java # type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/npcs/NPCHungryHiker.java
2 parents 7cdfb82 + 164943c commit 70477d0

145 files changed

Lines changed: 1795 additions & 675 deletions

File tree

Some content is hidden

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

‎anticheat/build.gradle.kts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ repositories {
2828
}
2929

3030
dependencies {
31-
compileOnly("net.minestom:minestom:2025.12.20c-1.21.11") {
31+
compileOnly(libs.minestom) {
3232
exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
3333
}
34-
implementation("org.tinylog:tinylog-api:2.7.0")
35-
implementation("org.tinylog:tinylog-impl:2.7.0")
34+
implementation(libs.tinylog.api)
35+
implementation(libs.tinylog.impl)
3636

37-
compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
37+
compileOnly(libs.spigot.api)
3838

39-
compileOnly("net.dmulloy2:ProtocolLib:5.4.0")
39+
compileOnly(libs.protocollib)
4040
}
4141

4242
tasks.test {

‎build.gradle.kts‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import org.gradle.api.artifacts.VersionCatalog
2+
import org.gradle.api.artifacts.VersionCatalogsExtension
3+
import org.gradle.kotlin.dsl.getByType
4+
15
plugins {
26
base
37
java
@@ -8,13 +12,7 @@ plugins {
812
group = "net.swofty"
913
version = "1.0"
1014

11-
repositories {
12-
mavenCentral()
13-
mavenLocal()
14-
maven("https://repo.viaversion.com")
15-
maven("https://jitpack.io")
16-
maven("https://repo.lucko.me/")
17-
}
15+
val libsCatalog: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
1816

1917
subprojects {
2018
apply(plugin = "java")
@@ -36,18 +34,18 @@ subprojects {
3634
}
3735

3836
dependencies {
39-
testImplementation("org.junit.jupiter:junit-jupiter:6.0.3")
37+
testImplementation(libsCatalog.findLibrary("junit-jupiter").get())
4038

41-
implementation("org.reflections:reflections:0.10.2")
42-
implementation("org.json:json:20251224")
43-
implementation("io.sentry:sentry-async-profiler:8.30.0")
39+
implementation(libsCatalog.findLibrary("reflections").get())
40+
implementation(libsCatalog.findLibrary("json").get())
41+
implementation(libsCatalog.findLibrary("sentry-async-profiler").get())
4442

45-
compileOnly("org.projectlombok:lombok:1.18.42")
43+
compileOnly(libsCatalog.findLibrary("lombok").get())
4644

47-
implementation(platform("tools.jackson:jackson-bom:3.1.0"))
48-
implementation("tools.jackson.core:jackson-core")
49-
implementation("tools.jackson.core:jackson-databind")
50-
implementation("com.fasterxml.jackson.core:jackson-annotations:2.20")
45+
implementation(platform(libsCatalog.findLibrary("jackson-bom").get()))
46+
implementation(libsCatalog.findLibrary("jackson-core").get())
47+
implementation(libsCatalog.findLibrary("jackson-databind").get())
48+
implementation(libsCatalog.findLibrary("jackson-annotations").get())
5149
}
5250

5351
tasks.test {

‎commons/build.gradle.kts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ java {
1515
}
1616

1717
dependencies {
18-
implementation("org.yaml:snakeyaml:2.5")
18+
implementation(libs.snakeyaml)
1919
implementation(project(":packer"))
20-
implementation("org.mongodb:bson:4.11.2")
21-
implementation("org.tinylog:tinylog-api:2.7.0")
22-
implementation("org.tinylog:tinylog-impl:2.7.0")
20+
implementation(libs.mongodb.bson)
21+
implementation(libs.tinylog.api)
22+
implementation(libs.tinylog.impl)
2323

24-
compileOnly("net.minestom:minestom:2025.12.20c-1.21.11") {
24+
compileOnly(libs.minestom) {
2525
exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
2626
}
2727

2828
// Must match AtlasRedisAPI's Jedis version to avoid conflicts
29-
implementation("redis.clients:jedis:7.2.0")
29+
implementation(libs.jedis)
3030

31-
implementation("de.exlll:configlib-yaml:4.8.1")
31+
implementation(libs.configlib.yaml)
3232

33-
implementation("org.spongepowered:configurate-yaml:4.2.0")
34-
implementation("com.squareup:javapoet:1.13.0")
33+
implementation(libs.configurate.yaml)
34+
implementation(libs.javapoet)
3535
}
3636

3737
sourceSets {

‎commons/src/main/java/net/swofty/commons/Songs.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@Getter
88
public enum Songs {
99
WILDERNESS(Path.of("./configuration/skyblock/songs/wilderness.nbs")),
10+
A_SILENT_MEMOIR(Path.of("./configuration/skyblock/songs/a_silent_memoir.nbs"))
1011
;
1112

1213
private final Path path;

‎configuration/skyblock/Minestom.regions.csv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ fishing_outpost,FISHING_OUTPOST,92,69,-21,166,95,-79,SKYBLOCK_HUB
8383
museum_1,PLAYER_MUSEUM,25,78,-3,42,71,5,SKYBLOCK_HUB
8484
museum_2,PLAYER_MUSEUM,21,80,4,38,70,19,SKYBLOCK_HUB
8585
museum_3,PLAYER_MUSEUM,45,84,24,13,65,53,SKYBLOCK_HUB
86+
tangleburgs_path,TANGLEBURGS_PATH,-533,107,-32,-560,122,20,SKYBLOCK_GALATEA

‎configuration/skyblock/songs/SONGS.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# A Silent Memoir
2+
3+
"[skyblock] A Silent Memoir (Galatea)" by Huangwakawaii is licensed under CC BY-SA 4.0
4+
(https://creativecommons.org/licenses/by-sa/4.0)
5+
https://noteblock.world/song/L0PqKZeKpk
6+
7+
Originally composed by ShinkoNet for the Hypixel Network

‎configuration/skyblock/songs/a_silent_memoir.nbs‎

100 KB
Binary file not shown.

‎dungeons/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ java {
1111
}
1212

1313
dependencies {
14-
testImplementation("junit:junit:4.13.2")
15-
compileOnly("org.projectlombok:lombok:1.18.42")
14+
testImplementation(libs.junit)
15+
compileOnly(libs.lombok)
1616
}

‎gradle/libs.versions.toml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
[versions]
2+
adventure = "4.26.1"
3+
annotations = "26.1.0"
4+
atlasRedis = "1.1.5"
5+
byte-buddy = "1.18.5"
6+
caffeine = "3.2.3"
7+
configlib-yaml = "4.8.1"
8+
configurate-yaml = "4.2.0"
9+
creative = "1.7.3"
10+
fastutil = "8.5.18"
11+
gson = "2.11.0"
12+
guava = "33.5.0-jre"
13+
jackson-annotations = "2.20"
14+
jackson-bom = "3.1.0"
15+
javapoet = "1.13.0"
16+
jedis = "7.2.0"
17+
joml = "1.10.8"
18+
json = "20251224"
19+
junit = "4.13.2"
20+
junit-jupiter = "6.0.3"
21+
kotlin-stdlib = "2.3.0"
22+
lombok = "1.18.42"
23+
minestom = "2025.12.20c-1.21.11"
24+
mongodb = "5.6.4"
25+
netty-bom = "4.2.9.Final"
26+
polar = "1.15.0"
27+
protocollib = "5.4.0"
28+
reflections = "0.10.2"
29+
sentry-async-profiler = "8.30.0"
30+
slf4j = "2.0.17"
31+
snakeyaml = "2.5"
32+
spark-common = "1.10.158-20260110.094844-1"
33+
spark-core = "2.9.4"
34+
spigot-api = "1.21-R0.1-SNAPSHOT"
35+
tinylog = "2.7.0"
36+
velocity-api = "3.5.0-SNAPSHOT"
37+
viabackwards = "5.7.1"
38+
vialoader = "4.0.6"
39+
viarewind = "4.0.14"
40+
viaversion = "5.7.1"
41+
42+
[libraries]
43+
adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
44+
adventure-text-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
45+
adventure-text-serializer-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
46+
annotations = { module = "org.jetbrains:annotations", version.ref = "annotations" }
47+
atlas-redis = { module = "com.github.Swofty-Developments:AtlasRedisAPI", version.ref = "atlasRedis" }
48+
byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" }
49+
byte-buddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "byte-buddy" }
50+
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
51+
configlib-yaml = { module = "de.exlll:configlib-yaml", version.ref = "configlib-yaml" }
52+
configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate-yaml" }
53+
creative-api = { module = "team.unnamed:creative-api", version.ref = "creative" }
54+
creative-serializer-minecraft = { module = "team.unnamed:creative-serializer-minecraft", version.ref = "creative" }
55+
creative-server = { module = "team.unnamed:creative-server", version.ref = "creative" }
56+
fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
57+
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
58+
guava = { module = "com.google.guava:guava", version.ref = "guava" }
59+
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-annotations" }
60+
jackson-bom = { module = "tools.jackson:jackson-bom", version.ref = "jackson-bom" }
61+
jackson-core = { module = "tools.jackson.core:jackson-core" }
62+
jackson-databind = { module = "tools.jackson.core:jackson-databind" }
63+
javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
64+
jedis = { module = "redis.clients:jedis", version.ref = "jedis" }
65+
json = { module = "org.json:json", version.ref = "json" }
66+
joml = { module = "org.joml:joml", version.ref = "joml" }
67+
junit = { module = "junit:junit", version.ref = "junit" }
68+
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
69+
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-stdlib" }
70+
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
71+
minestom = { module = "net.minestom:minestom", version.ref = "minestom" }
72+
mongodb-bson = { module = "org.mongodb:bson", version.ref = "mongodb" }
73+
mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongodb" }
74+
netty-bom = { module = "io.netty:netty-bom", version.ref = "netty-bom" }
75+
netty-buffer = { module = "io.netty:netty-buffer" }
76+
netty-codec = { module = "io.netty:netty-codec" }
77+
netty-codec-http = { module = "io.netty:netty-codec-http" }
78+
netty-handler = { module = "io.netty:netty-handler" }
79+
netty-transport = { module = "io.netty:netty-transport" }
80+
polar = { module = "dev.hollowcube:polar", version.ref = "polar" }
81+
protocollib = { module = "net.dmulloy2:ProtocolLib", version.ref = "protocollib" }
82+
reflections = { module = "org.reflections:reflections", version.ref = "reflections" }
83+
sentry-async-profiler = { module = "io.sentry:sentry-async-profiler", version.ref = "sentry-async-profiler" }
84+
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
85+
snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
86+
spark-common = { module = "me.lucko:spark-common", version.ref = "spark-common" }
87+
spark-core = { module = "com.sparkjava:spark-core", version.ref = "spark-core" }
88+
spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "spigot-api" }
89+
tinylog-api = { module = "org.tinylog:tinylog-api", version.ref = "tinylog" }
90+
tinylog-impl = { module = "org.tinylog:tinylog-impl", version.ref = "tinylog" }
91+
velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity-api" }
92+
viabackwards-common = { module = "com.viaversion:viabackwards-common", version.ref = "viabackwards" }
93+
vialoader = { module = "com.viaversion:vialoader", version.ref = "vialoader" }
94+
viarewind-common = { module = "com.viaversion:viarewind-common", version.ref = "viarewind" }
95+
viaversion = { module = "com.viaversion:viaversion", version.ref = "viaversion" }

‎loader/build.gradle.kts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ dependencies {
6262
implementation(project(":proxy.api"))
6363
implementation(project(":spark"))
6464
implementation(project(":anticheat"))
65-
implementation("org.slf4j:slf4j-api:2.0.17")
66-
implementation("org.tinylog:tinylog-api:2.7.0")
67-
implementation("org.tinylog:tinylog-impl:2.7.0")
68-
implementation("net.minestom:minestom:2025.12.20c-1.21.11") {
65+
implementation(libs.slf4j.api)
66+
implementation(libs.tinylog.api)
67+
implementation(libs.tinylog.impl)
68+
implementation(libs.minestom) {
6969
exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
7070
}
71-
implementation("com.github.ben-manes.caffeine:caffeine:3.2.3")
72-
implementation("net.kyori:adventure-text-minimessage:4.25.0")
73-
implementation("dev.hollowcube:polar:1.15.0")
74-
implementation("org.yaml:snakeyaml:2.0")
71+
implementation(libs.caffeine)
72+
implementation(libs.adventure.text.minimessage)
73+
implementation(libs.polar)
74+
implementation(libs.snakeyaml)
7575
}
7676

7777
application {

0 commit comments

Comments
 (0)