feat: add WorldLocation

Author: entrypointkr

README.md

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation('io.typst:bukkit-kotlin-serialization:1.0.0')
+    implementation('io.typst:bukkit-kotlin-serialization:1.3.0')
 }
 ```
 

build.gradle

@@ -1,14 +1,14 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.9.22'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.23'
     id 'kr.entree.spigradle' version '2.4.3'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'maven-publish'
     id 'signing'
 }
 
 group = 'io.typst'
-version = '1.2.0'
+version = '1.3.0'
 
 repositories {
     mavenCentral()

src/main/kotlin/io/typst/bukkit/kotlin/serialization/LocationSerializer.kt

@@ -7,10 +7,10 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import org.bukkit.Location
 
-@Deprecated("Use BukkitLocation instead, this might causes issue with world manager plugins.")
+@Deprecated("Use WorldLocation instead, this might causes issue with world manager plugins.")
 typealias LocationSerializable = @Serializable(LocationSerializer::class) Location
 
-@Deprecated("Use BukkitLocation instead, this might causes issue with world manager plugins.")
+@Deprecated("Use WorldLocation instead, this might causes issue with world manager plugins.")
 class LocationSerializer : KSerializer<Location> {
     override val descriptor: SerialDescriptor
         get() = ConfigSerializableSerializer.descriptor

src/main/kotlin/io/typst/bukkit/kotlin/serialization/location/WorldLocation.kt

@@ -0,0 +1,32 @@
+package io.typst.bukkit.kotlin.serialization.location
+
+import kotlinx.serialization.Serializable
+import org.bukkit.Bukkit
+import org.bukkit.Location
+import org.bukkit.entity.Entity
+
+@Serializable
+data class WorldLocation(
+    val world: String,
+    val x: Double,
+    val y: Double,
+    val z: Double,
+    val yaw: Float = 0f,
+    val pitch: Float = 0f,
+) {
+    fun toBukkitLocation(entity: Entity? = null): Location {
+        val yaw = entity?.location?.yaw ?: this.yaw
+        val pitch = entity?.location?.pitch ?: this.pitch
+        return Location(Bukkit.getWorld(world), x, y, z, yaw, pitch)
+    }
+
+    companion object {
+        @JvmStatic
+        fun fromBukkit(loc: Location): WorldLocation =
+            WorldLocation(
+                loc.world?.name ?: "",
+                loc.x, loc.y, loc.z,
+                loc.yaw, loc.pitch
+            )
+    }
+}

src/main/kotlin/io/typst/bukkit/kotlin/serialization/time/DurationSerializer.kt

@@ -12,7 +12,7 @@ import java.time.Duration
 typealias DurationAsString = @Serializable(DurationSerializer::class) Duration
 
 object DurationSerializer : KSerializer<Duration> {
-    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Duration", PrimitiveKind.STRING)
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("JavaDuration", PrimitiveKind.STRING)
 
     override fun deserialize(decoder: Decoder): Duration {
         return Duration.parse(decoder.decodeString())