feat: enhance block data, item stack, offline player, and player codecs; implement error handling for invalid inputs

Author: twisti-dev

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

@@ -1,12 +1,16 @@
 package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.blockdata
 
 import com.mojang.serialization.Codec
-import org.bukkit.Bukkit
+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.xmap(
-        { str -> Bukkit.createBlockData(str) },
-        { blockData -> blockData.asString }
-    )
+    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/itemstack/ItemStackCodec.kt

@@ -12,6 +12,6 @@ object ItemStackCodec {
                 buffer.get(bytes)
                 ItemStack.deserializeBytes(bytes)
             },
-            { itemStack -> itemStack.serializeAsBytes().let { ByteBuffer.wrap(it) } }
+            { itemStack -> ByteBuffer.wrap(itemStack.serializeAsBytes()) }
         )
 }

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/offlineplayer/OfflinePlayerCodec.kt

@@ -1,13 +1,11 @@
 package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.offlineplayer
 
 import com.mojang.serialization.Codec
+import dev.slne.surf.surfapi.bukkit.api.extensions.server
 import dev.slne.surf.surfapi.core.api.serializer.java.uuid.JavaUUIDCodec
-import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 
 object OfflinePlayerCodec {
-    val CODEC: Codec<OfflinePlayer> = JavaUUIDCodec.CODEC.xmap(
-        { uuid -> Bukkit.getOfflinePlayer(uuid) },
-        { player -> player.uniqueId }
-    )
+    val CODEC: Codec<OfflinePlayer> = JavaUUIDCodec.CODEC
+        .xmap(server::getOfflinePlayer, OfflinePlayer::getUniqueId)
 }

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/serializer/bukkit/player/PlayerCodec.kt

@@ -1,13 +1,19 @@
 package dev.slne.surf.surfapi.bukkit.api.serializer.bukkit.player
 
 import com.mojang.serialization.Codec
+import com.mojang.serialization.DataResult
+import dev.slne.surf.surfapi.bukkit.api.extensions.server
 import dev.slne.surf.surfapi.core.api.serializer.java.uuid.JavaUUIDCodec
-import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 
 object PlayerCodec {
-    val CODEC: Codec<Player> = JavaUUIDCodec.CODEC.xmap(
-        { uuid -> Bukkit.getPlayer(uuid) },
-        { player -> player.uniqueId }
-    )
+    val CODEC: Codec<Player> = JavaUUIDCodec.CODEC.comapFlatMap({ uuid ->
+        val player = server.getPlayer(uuid)
+
+        if (player != null) {
+            DataResult.success(player)
+        } else {
+            DataResult.error { "Player with UUID $uuid is not online" }
+        }
+    }, Player::getUniqueId)
 }