Skip to content

Commit e74c117

Browse files
committed
chore: update dependencies and bump version to 1.21.11
1 parent 6e09127 commit e74c117

File tree

10 files changed

+14526
-17220
lines changed

10 files changed

+14526
-17220
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar.Companion.shad
22
import kotlinx.validation.KotlinApiBuildTask
33

44
plugins {
5-
id("io.papermc.paperweight.userdev") version "2.0.0-beta.17" apply false
5+
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19" apply false
66
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.18.1"
77
// alias(libs.plugins.dokka)
88
}

buildSrc/src/main/kotlin/core-convention.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
compileOnly(libs.auto.service.annotations)
3030
ksp(project(":surf-api-gradle-plugin:surf-api-processor"))
3131

32-
compileOnlyApi("org.jetbrains:annotations:24.1.0")
32+
compileOnlyApi("org.jetbrains:annotations:26.0.2-1")
3333
}
3434

3535
ksp {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ kapt.use.k2=true
55
org.gradle.jvmargs=-Xmx4G
66
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
77
javaVersion=21
8-
mcVersion=1.21.10
8+
mcVersion=1.21.11
99
group=dev.slne.surf
10-
version=1.21.10-2.43.0
10+
version=1.21.11-2.43.0
1111
relocationPrefix=dev.slne.surf.surfapi.libs
1212
snapshot=false

gradle/libs.versions.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
# Paper
3-
paper-api = "1.21.10-R0.1-SNAPSHOT"
3+
paper-api = "1.21.11-R0.1-SNAPSHOT"
44

55
# Kolin
6-
kotlinVersion = "2.2.20"
6+
kotlinVersion = "2.2.21"
77
kotlinxCoroutines = "1.10.2"
88
kotlinx-serialization = "1.9.0"
99

1010
# Packet Events
11-
packetevents = "2.10.0"
12-
packetevents-plugin = "2.10.0"
11+
packetevents = "2.11.0"
12+
packetevents-plugin = "2.11.0"
1313

1414
# Command API
1515
commandapi = "11.0.0"
@@ -19,8 +19,8 @@ luckperms = "v5.5.0-bukkit"
1919

2020
# Scoreboard Library
2121
scoreboard-library = "2.4.3"
22-
scoreboard-library-implementation = "2.4.2"
23-
scoreboard-library-modern = "2.4.2"
22+
scoreboard-library-implementation = "2.4.3"
23+
scoreboard-library-modern = "2.4.3"
2424

2525
# Adventure
2626
adventure-api = "4.25.0"
@@ -36,38 +36,38 @@ mccoroutine = "2.22.0"
3636

3737
# Miscellaneous Libraries
3838
guava = "33.5.0-jre"
39-
caffeine = "3.2.1"
40-
caffeine-courotines = "2.0.2"
39+
caffeine = "3.2.3"
40+
caffeine-courotines = "3.0.1"
4141
gson = "2.13.2"
42-
commons-lang3 = "3.19.0"
43-
commons-text = "1.14.0"
42+
commons-lang3 = "3.20.0"
43+
commons-text = "1.15.0"
4444
commons-math4-core = "4.0-beta1"
4545
plugin-yml-paper = "0.8.0"
4646
spongepowered-math = "2.0.1"
4747
fastutil = "8.5.18"
48-
okhttp = "5.1.0"
48+
okhttp = "5.3.2"
4949
dazzleconf = "1.4.0-M1"
5050
reflection-remapper = "0.1.3"
5151
brigadier = "1.0.500"
5252
datafixerupper = "8.0.16"
5353
configurate = "4.2.0"
5454
more-persistent-data-types = "2.4.0"
55-
stefvanschie-if = "0.11.3"
56-
inventory-framework = "3.5.4"
55+
stefvanschie-if = "0.11.5"
56+
inventory-framework = "3.7.1"
5757
flogger = "0.9"
5858
aide-reflection = "1.3"
5959
auto-service = "1.1.1"
6060
auto-service-ksp = "1.2.0"
61-
ktor = "3.3.1"
62-
glm = "0.9.9.1-12"
63-
ksp-version = "2.2.20-2.0.4"
64-
reactor-netty = "1.3.0"
61+
ktor = "3.3.3"
62+
glm = "0.9.9.1-15"
63+
ksp-version = "2.3.3"
64+
reactor-netty = "1.3.1"
6565

6666
# Plugin versions
6767
maven-repo-auth = "3.0.4"
68-
shadow-gradle-plugin = "9.2.2"
69-
run-paper-gradle-plugin = "3.0.1"
70-
dokka = "2.0.0"
68+
shadow-gradle-plugin = "9.3.0"
69+
run-paper-gradle-plugin = "3.0.2"
70+
dokka = "2.1.0"
7171

7272

7373
[libraries]

surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api

Lines changed: 4862 additions & 5733 deletions
Large diffs are not rendered by default.

surf-api-bukkit/surf-api-bukkit-plugin-test/src/main/java/dev/slne/surf/surfapi/bukkit/test/command/subcommands/scoreboard/CreateScoreboard.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Map;
1111
import java.util.UUID;
1212
import net.kyori.adventure.text.Component;
13-
import net.minecraft.Util;
13+
import net.minecraft.util.Util;
1414
import org.jetbrains.annotations.Contract;
1515

1616
public class CreateScoreboard extends CommandAPICommand {

surf-api-bukkit/surf-api-bukkit-server/src/main/kotlin/dev/slne/surf/surfapi/bukkit/server/impl/nms/bridges/packets/player/SurfBukkitNmsPlayerToastPacketsImpl.kt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ import net.minecraft.advancements.AdvancementProgress
1111
import net.minecraft.advancements.AdvancementRequirements
1212
import net.minecraft.network.chat.Component
1313
import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket
14-
import net.minecraft.resources.ResourceLocation
14+
import net.minecraft.resources.Identifier
1515
import java.util.*
1616

1717

1818
@NmsUseWithCaution
1919
@AutoService(SurfBukkitNmsPlayerToastPackets::class)
2020
class SurfBukkitNmsPlayerToastPacketsImpl : SurfBukkitNmsPlayerToastPackets {
2121
override fun showToast(toast: Toast) = PacketOperationImpl.complex { _, packets ->
22-
val id = ResourceLocation.fromNamespaceAndPath("surfapi", "toast_${UUID.randomUUID()}")
22+
val id = Identifier.fromNamespaceAndPath("surfapi", "toast_${UUID.randomUUID()}")
2323

2424
packets.add(showPacket(id, toast))
2525
packets.add(hidePacket(id))
2626

2727
packets
2828
}
2929

30-
private fun showPacket(id: ResourceLocation, toast: Toast) =
30+
private fun showPacket(id: Identifier, toast: Toast) =
3131
ClientboundUpdateAdvancementsPacket(
3232
false, listOf(createAdvancement(id, toast)), emptySet(), mapOf(
3333
id to AdvancementProgress().apply {
@@ -36,23 +36,24 @@ class SurfBukkitNmsPlayerToastPacketsImpl : SurfBukkitNmsPlayerToastPackets {
3636
}), true
3737
)
3838

39-
private fun hidePacket(id: ResourceLocation) = ClientboundUpdateAdvancementsPacket(
39+
private fun hidePacket(id: Identifier) = ClientboundUpdateAdvancementsPacket(
4040
false, emptyList(), setOf(id), emptyMap(), false
4141
)
4242

43-
private fun createAdvancement(id: ResourceLocation, toast: Toast) = Advancement.Builder.recipeAdvancement()
44-
.display(
45-
toast.icon.toNms(),
46-
toast.title.toNms(),
47-
Component.empty(),
48-
null,
49-
toast.frame.toNms(),
50-
true,
51-
false,
52-
false
53-
)
54-
.requirements(requirements)
55-
.build(id)
43+
private fun createAdvancement(id: Identifier, toast: Toast) =
44+
Advancement.Builder.recipeAdvancement()
45+
.display(
46+
toast.icon.toNms(),
47+
toast.title.toNms(),
48+
Component.empty(),
49+
null,
50+
toast.frame.toNms(),
51+
true,
52+
false,
53+
false
54+
)
55+
.requirements(requirements)
56+
.build(id)
5657

5758
companion object {
5859
private const val CRITERION_ID = "surfapi_toast"

0 commit comments

Comments
 (0)