Merge remote-tracking branch 'origin/version/1.21.10' into version/1.21.10

# Conflicts:
#	gradle.properties
#	gradle/libs.versions.toml
#	surf-api-gradle-plugin/build.gradle.kts

Author: ammodev

gradle.properties

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=21
 mcVersion=1.21.10
 group=dev.slne.surf
-version=1.21.10-2.40.2
+version=1.21.10-2.42.3
 relocationPrefix=dev.slne.surf.surfapi.libs
 snapshot=false

gradle/libs.versions.toml

@@ -8,8 +8,8 @@ kotlinxCoroutines = "1.10.2"
 kotlinx-serialization = "1.9.0"
 
 # Packet Events
-packetevents = "2.10.0-SNAPSHOT"
-packetevents-plugin = "2.10.0-SNAPSHOT"
+packetevents = "2.10.0"
+packetevents-plugin = "2.10.0"
 
 # Command API
 commandapi = "11.0.0"
@@ -49,6 +49,7 @@ okhttp = "5.1.0"
 dazzleconf = "1.4.0-M1"
 reflection-remapper = "0.1.3"
 brigadier = "1.0.500"
+datafixerupper = "8.0.16"
 configurate = "4.2.0"
 more-persistent-data-types = "2.4.0"
 stefvanschie-if = "0.11.3"
@@ -148,6 +149,7 @@ flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" }
 flogger-slf4j-backend = { module = "com.google.flogger:flogger-slf4j-backend", version.ref = "flogger" }
 aide-reflection = { module = "tech.hiddenproject:aide-reflection", version.ref = "aide-reflection" }
 glm = { module = "io.github.kotlin-graphics:glm", version.ref = "glm" }
+datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixerupper" }
 
 auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "auto-service" }
 auto-service = { module = "dev.zacsweers.autoservice:auto-service-ksp", version.ref = "auto-service-ksp" }

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

@@ -0,0 +1,19 @@
+package dev.slne.surf.surfapi.bukkit.api.nms.bridges.packets.player
+
+import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution
+import dev.slne.surf.surfapi.bukkit.api.nms.bridges.packets.PacketOperation
+import dev.slne.surf.surfapi.bukkit.api.nms.bridges.packets.player.toast.Toast
+import dev.slne.surf.surfapi.core.api.util.requiredService
+
+@NmsUseWithCaution
+interface SurfBukkitNmsPlayerToastPackets {
+
+    fun showToast(toast: Toast): PacketOperation
+
+    companion object {
+        val instance = requiredService<SurfBukkitNmsPlayerToastPackets>()
+    }
+}
+
+@NmsUseWithCaution
+val toastPacketsBridge get() = SurfBukkitNmsPlayerToastPackets.instance

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

@@ -0,0 +1,66 @@
+package dev.slne.surf.surfapi.bukkit.api.nms.bridges.packets.player.toast
+
+import dev.slne.surf.surfapi.bukkit.api.builder.buildItem
+import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution
+import dev.slne.surf.surfapi.bukkit.api.nms.bridges.packets.player.toastPacketsBridge
+import dev.slne.surf.surfapi.core.api.messages.builder.SurfComponentBuilder
+import io.papermc.paper.advancement.AdvancementDisplay
+import net.kyori.adventure.text.Component
+import org.bukkit.inventory.ItemStack
+import org.bukkit.inventory.ItemType
+
+data class Toast(
+    val icon: ItemStack,
+    val title: Component,
+    val frame: AdvancementDisplay.Frame = AdvancementDisplay.Frame.TASK,
+) {
+
+    @NmsUseWithCaution
+    fun createOperation() = toastPacketsBridge.showToast(this)
+
+    companion object {
+        inline operator fun invoke(block: Builder.() -> Unit): Toast {
+            return Builder().apply(block).build()
+        }
+
+        class Builder @PublishedApi internal constructor() {
+            private var icon: ItemStack? = null
+            private var title: Component? = null
+            private var frame: AdvancementDisplay.Frame = AdvancementDisplay.Frame.TASK
+
+            fun icon(itemStack: ItemStack) {
+                this.icon = itemStack
+            }
+
+            fun icon(type: ItemType) {
+                this.icon = type.createItemStack()
+            }
+
+            fun icon(type: ItemType, block: ItemStack.() -> Unit) {
+                this.icon = buildItem(type, init = block)
+            }
+
+            fun title(component: Component) {
+                this.title = component
+            }
+
+            fun title(block: SurfComponentBuilder.() -> Unit) {
+                this.title = SurfComponentBuilder(block)
+            }
+
+            fun frame(frame: AdvancementDisplay.Frame) {
+                this.frame = frame
+            }
+
+            fun build() = Toast(
+                icon = icon ?: error("Icon must be set!"),
+                title = title ?: error("Title must be set!"),
+                frame = frame
+            )
+        }
+    }
+}
+
+inline fun toast(block: Toast.Companion.Builder.() -> Unit): Toast {
+    return Toast(block)
+}

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/nms/bridges/packets/player/toast/Toast.kt

@@ -0,0 +1,16 @@
+package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.blockdata
+
+import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
+import dev.slne.surf.surfapi.bukkit.api.extensions.server
+import org.bukkit.block.data.BlockData
+
+object BlockDataCodec {
+    val CODEC: Codec<BlockData> = Codec.STRING.comapFlatMap({ data ->
+        try {
+            DataResult.success(server.createBlockData(data))
+        } catch (e: IllegalArgumentException) {
+            DataResult.error { "Invalid block data: $data (${e.message})" }
+        }
+    }, BlockData::getAsString)
+}

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/blockdata/BlockDataCodec.kt

@@ -0,0 +1,24 @@
+package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.blockdata
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.bukkit.Bukkit
+import org.bukkit.block.data.BlockData
+
+object BlockDataSerializer : KSerializer<BlockData> {
+    override val descriptor =
+        PrimitiveSerialDescriptor("surfapi.bukkit.BlockData", PrimitiveKind.STRING)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: BlockData,
+    ) {
+        encoder.encodeString(value.asString)
+    }
+
+    override fun deserialize(decoder: Decoder) =
+        Bukkit.createBlockData(decoder.decodeString())
+}

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/blockdata/BlockDataSerializer.kt

@@ -0,0 +1,12 @@
+package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.blockstate
+
+import com.mojang.serialization.Codec
+import org.bukkit.Bukkit
+import org.bukkit.block.BlockState
+
+object BlockStateCodec {
+    val CODEC: Codec<BlockState> = Codec.STRING.xmap(
+        { str -> Bukkit.createBlockData(str).createBlockState() },
+        { blockState -> blockState.blockData.asString }
+    )
+}

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/blockstate/BlockStateCodec.kt

@@ -0,0 +1,24 @@
+package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.blockstate
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.bukkit.Bukkit
+import org.bukkit.block.BlockState
+
+object BlockStateSerializer : KSerializer<BlockState> {
+    override val descriptor =
+        PrimitiveSerialDescriptor("surfapi.bukkit.BlockState", PrimitiveKind.STRING)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: BlockState,
+    ) {
+        encoder.encodeString(value.blockData.asString)
+    }
+
+    override fun deserialize(decoder: Decoder) =
+        Bukkit.createBlockData(decoder.decodeString()).createBlockState()
+}

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/blockstate/BlockStateSerializer.kt

@@ -0,0 +1,17 @@
+package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.itemstack
+
+import com.mojang.serialization.Codec
+import org.bukkit.inventory.ItemStack
+import java.nio.ByteBuffer
+
+object ItemStackCodec {
+    val CODEC: Codec<ItemStack> = Codec.BYTE_BUFFER
+        .xmap(
+            { buffer ->
+                val bytes = ByteArray(buffer.remaining())
+                buffer.get(bytes)
+                ItemStack.deserializeBytes(bytes)
+            },
+            { itemStack -> ByteBuffer.wrap(itemStack.serializeAsBytes()) }
+        )
+}