Merge remote-tracking branch 'origin/feat/serializers' into feat/serializers

# Conflicts:
#	surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/SurfSerializerModule.kt

Author: twisti-dev

.idea/misc.xml

@@ -30,6 +30,16 @@ import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.vector.vnd.S
 import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.vector.vnf.SpongeVectorNfSerializer
 import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.vector.vni.SpongeVectorNiSerializer
 import dev.slne.surf.surfapi.core.api.serializer.spongepowered.math.vector.vnl.SpongeVectorNlSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m2d.SpongeMatrix2dSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m2f.SpongeMatrix2fSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m3d.SpongeMatrix3dSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m3f.SpongeMatrix3fSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m4d.SpongeMatrix4dSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m4f.SpongeMatrix4fSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.mnd.SpongeMatrixNdSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.mnf.SpongeMatrixNfSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.quaternion.qnd.SpongeQuaterniondSerializer
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.quaternion.qnf.SpongeQuaternionfSerializer
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.contextual
 
@@ -66,6 +76,17 @@ object SurfSerializerModule {
         contextual(SpongeVectorNfSerializer)
         contextual(SpongeVectorNiSerializer)
         contextual(SpongeVectorNlSerializer)
+
+        contextual(SpongeMatrix2dSerializer)
+        contextual(SpongeMatrix2fSerializer)
+        contextual(SpongeMatrix3dSerializer)
+        contextual(SpongeMatrix3fSerializer)
+        contextual(SpongeMatrix4dSerializer)
+        contextual(SpongeMatrix4fSerializer)
+        contextual(SpongeMatrixNdSerializer)
+        contextual(SpongeMatrixNfSerializer)
+        contextual(SpongeQuaterniondSerializer)
+        contextual(SpongeQuaternionfSerializer)
     }
 
     val java = SerializersModule {

.idea/modules.xml

@@ -0,0 +1,33 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m2d
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.DoubleArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix2d
+
+typealias SerializableMatrix2d = @Serializable(with = SpongeMatrix2dSerializer::class) Matrix2d
+
+object SpongeMatrix2dSerializer : KSerializer<Matrix2d> {
+    private val arraySerializer = DoubleArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix2d", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix2d,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix2d {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 4) { "Expected array of size 4, got ${array.size}" }
+        return Matrix2d(
+            array[0], array[1],
+            array[2], array[3],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/SurfSerializerModule.kt

@@ -0,0 +1,33 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m2f
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.FloatArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix2f
+
+typealias SerializableMatrix2f = @Serializable(with = SpongeMatrix2fSerializer::class) Matrix2f
+
+object SpongeMatrix2fSerializer : KSerializer<Matrix2f> {
+    private val arraySerializer = FloatArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix2f", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix2f,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix2f {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 4) { "Expected array of size 4, got ${array.size}" }
+        return Matrix2f(
+            array[0], array[1],
+            array[2], array[3],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/spongepowered/matrix/m2d/SpongeMatrix2dSerializer.kt

@@ -0,0 +1,35 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m3d
+
+import dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m2d.SpongeMatrix2dSerializer
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.DoubleArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix3d
+
+typealias SerializableMatrix3d = @Serializable(with = SpongeMatrix2dSerializer::class) Matrix3d
+
+object SpongeMatrix3dSerializer : KSerializer<Matrix3d> {
+    private val arraySerializer = DoubleArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix3d", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix3d,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix3d {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 9) { "Expected array of size 9, got ${array.size}" }
+        return Matrix3d(
+            array[0], array[1], array[2],
+            array[3], array[4], array[5],
+            array[6], array[7], array[8],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/spongepowered/matrix/m2f/SpongeMatrix2fSerializer.kt

@@ -0,0 +1,34 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m3f
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.FloatArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix3f
+
+typealias SerializableMatrix3f = @Serializable(with = SpongeMatrix3fSerializer::class) Matrix3f
+
+object SpongeMatrix3fSerializer : KSerializer<Matrix3f> {
+    private val arraySerializer = FloatArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix3f", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix3f,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix3f {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 9) { "Expected array of size 9, got ${array.size}" }
+        return Matrix3f(
+            array[0], array[1], array[2],
+            array[3], array[4], array[5],
+            array[6], array[7], array[8],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/spongepowered/matrix/m3d/SpongeMatrix3dSerializer.kt

@@ -0,0 +1,35 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m4d
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.DoubleArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix4d
+
+typealias SerializableMatrix4d = @Serializable(with = SpongeMatrix4dSerializer::class) Matrix4d
+
+object SpongeMatrix4dSerializer : KSerializer<Matrix4d> {
+    private val arraySerializer = DoubleArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix4d", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix4d,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix4d {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 16) { "Expected array of size 16, got ${array.size}" }
+        return Matrix4d(
+            array[0], array[1], array[2], array[3],
+            array[4], array[5], array[6], array[7],
+            array[8], array[9], array[10], array[11],
+            array[12], array[13], array[14], array[15],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/spongepowered/matrix/m3f/SpongeMatrix3fSerializer.kt

@@ -0,0 +1,35 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.m4f
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.FloatArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.Matrix4f
+
+typealias SerializableMatrix4f = @Serializable(with = SpongeMatrix4fSerializer::class) Matrix4f
+
+object SpongeMatrix4fSerializer : KSerializer<Matrix4f> {
+    private val arraySerializer = FloatArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.Matrix4f", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: Matrix4f,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): Matrix4f {
+        val array = decoder.decodeSerializableValue(arraySerializer)
+        require(array.size == 16) { "Expected array of size 16, got ${array.size}" }
+        return Matrix4f(
+            array[0], array[1], array[2], array[3],
+            array[4], array[5], array[6], array[7],
+            array[8], array[9], array[10], array[11],
+            array[12], array[13], array[14], array[15],
+        )
+    }
+}

surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/spongepowered/matrix/m4d/SpongeMatrix4dSerializer.kt

@@ -0,0 +1,29 @@
+package dev.slne.surf.surfapi.core.api.serializer.spongepowered.matrix.mnd
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.DoubleArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.spongepowered.math.matrix.MatrixNd
+
+typealias SerializableMatrixNd = @Serializable(with = SpongeMatrixNdSerializer::class) MatrixNd
+
+object SpongeMatrixNdSerializer : KSerializer<MatrixNd> {
+    private val arraySerializer = DoubleArraySerializer()
+    override val descriptor =
+        SerialDescriptor("surfapi.sponge.MatrixNd", arraySerializer.descriptor)
+
+    override fun serialize(
+        encoder: Encoder,
+        value: MatrixNd,
+    ) {
+        encoder.encodeSerializableValue(arraySerializer, value.toArray())
+    }
+
+    override fun deserialize(decoder: Decoder): MatrixNd {
+        val decodeSerializableValue = decoder.decodeSerializableValue(arraySerializer)
+        return MatrixNd(*decodeSerializableValue)
+    }
+}