fix: Not Serializable

BlockVentureMC · Apr 30, 2024 · 032616a · 032616a
1 parent eef7084
commit 032616a
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 32 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "de.themeparkcraft.audioserver"
-version = "1.0-SNAPSHOT"
+version = "0.1-SNAPSHOT"
 
 repositories {
     maven("https://nexus.flawcra.cc/repository/maven-mirrors/")
@@ -27,4 +27,7 @@ subprojects {
         maven("https://nexus.flawcra.cc/repository/maven-mirrors/")
     }
 
+    group = project.group
+    version = project.version
+
 }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -4,9 +4,6 @@ plugins {
     id("maven-publish")
 }
 
-group = "de.themeparkcraft.audioserver"
-version = "0.1-SNAPSHOT"
-
 val protobufVersion: String by project
 
 dependencies {

diff --git a/...mmon/data/audiosources/AreaAudioSource.kt → ...rver/common/interfaces/AreaAudioSource.kt b/...mmon/data/audiosources/AreaAudioSource.kt → ...rver/common/interfaces/AreaAudioSource.kt
@@ -1,7 +1,5 @@
-package de.themeparkcraft.audioserver.common.data.audiosources
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.data.worldpositions.WorldPosition
-import de.themeparkcraft.audioserver.common.interfaces.AudioSource
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AudioSource.kt b/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/AudioSource.kt
@@ -1,10 +1,13 @@
 package de.themeparkcraft.audioserver.common.interfaces
 
+import kotlinx.serialization.Serializable
+
 /**
  * The AudioSource interface represents an audio source. It provides access to the unique identifier (uid)
  * and volume of the audio source.
  */
-interface AudioSource : RabbitSendable {
+@Serializable
+sealed interface AudioSource : RabbitSendable {
     val uid: String
     val volume: Float
 }
diff --git a/...ata/audiosources/GlobalParkAudioSource.kt → ...ommon/interfaces/GlobalParkAudioSource.kt b/...ata/audiosources/GlobalParkAudioSource.kt → ...ommon/interfaces/GlobalParkAudioSource.kt
@@ -1,7 +1,5 @@
-package de.themeparkcraft.audioserver.common.data.audiosources
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.interfaces.AudioSource
-import java.util.*
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/...erver/common/data/PlayerPositionUpdate.kt → ...common/interfaces/PlayerPositionUpdate.kt b/...erver/common/data/PlayerPositionUpdate.kt → ...common/interfaces/PlayerPositionUpdate.kt
@@ -1,7 +1,5 @@
-package de.themeparkcraft.audioserver.common.data
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.data.worldpositions.WorldPosition
-import de.themeparkcraft.audioserver.common.interfaces.RabbitSendable
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/.../audiosources/PlayerRelatedAudioSource.kt → ...on/interfaces/PlayerRelatedAudioSource.kt b/.../audiosources/PlayerRelatedAudioSource.kt → ...on/interfaces/PlayerRelatedAudioSource.kt
@@ -1,6 +1,5 @@
-package de.themeparkcraft.audioserver.common.data.audiosources
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.interfaces.AudioSource
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/...ta/worldpositions/PointedWorldPosition.kt → ...common/interfaces/PointedWorldPosition.kt b/...ta/worldpositions/PointedWorldPosition.kt → ...common/interfaces/PointedWorldPosition.kt
@@ -1,4 +1,4 @@
-package de.themeparkcraft.audioserver.common.data.worldpositions
+package de.themeparkcraft.audioserver.common.interfaces
 
 /**
  * Represents a pointed position in the world, specified by its x, y, z coordinates, the world it belongs to,

diff --git a/...ata/audiosources/PositionedAudioSource.kt → ...ommon/interfaces/PositionedAudioSource.kt b/...ata/audiosources/PositionedAudioSource.kt → ...ommon/interfaces/PositionedAudioSource.kt
@@ -1,7 +1,5 @@
-package de.themeparkcraft.audioserver.common.data.audiosources
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.data.worldpositions.WorldPosition
-import de.themeparkcraft.audioserver.common.interfaces.AudioSource
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/RabbitSendable.kt b/common/src/main/kotlin/de/themeparkcraft/audioserver/common/interfaces/RabbitSendable.kt
@@ -1,11 +1,13 @@
 package de.themeparkcraft.audioserver.common.interfaces
 
 import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromByteArray
 import kotlinx.serialization.encodeToByteArray
 import kotlinx.serialization.protobuf.ProtoBuf
 
-interface RabbitSendable {
+@Serializable
+sealed interface RabbitSendable {
 
     @OptIn(ExperimentalSerializationApi::class)
     fun encode(): ByteArray {

diff --git a/...mmon/data/worldpositions/WorldPosition.kt → ...server/common/interfaces/WorldPosition.kt b/...mmon/data/worldpositions/WorldPosition.kt → ...server/common/interfaces/WorldPosition.kt
@@ -1,6 +1,5 @@
-package de.themeparkcraft.audioserver.common.data.worldpositions
+package de.themeparkcraft.audioserver.common.interfaces
 
-import de.themeparkcraft.audioserver.common.interfaces.RabbitSendable
 import kotlinx.serialization.Serializable
 
 /**

diff --git a/minecraft/build.gradle.kts b/minecraft/build.gradle.kts
@@ -3,9 +3,6 @@ plugins {
     id("maven-publish")
 }
 
-group = "de.themeparkcraft.audioserver"
-version = "0.1-SNAPSHOT"
-
 val minecraftVersion: String by project
 
 dependencies {

diff --git a/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/AudioServer.kt b/minecraft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/AudioServer.kt
@@ -1,6 +1,6 @@
 package de.themeparkcraft.audioserver.minecraft
 
-import de.themeparkcraft.audioserver.common.data.PlayerPositionUpdate
+import de.themeparkcraft.audioserver.common.interfaces.PlayerPositionUpdate
 import de.themeparkcraft.audioserver.common.data.RabbitConfiguration
 import de.themeparkcraft.audioserver.common.errors.AudioServerNotInitializedError
 import de.themeparkcraft.audioserver.common.interfaces.AudioSource

diff --git a/...ft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/extensions/PlayerExtensions.kt b/...ft/src/main/kotlin/de/themeparkcraft/audioserver/minecraft/extensions/PlayerExtensions.kt
@@ -1,6 +1,6 @@
 package de.themeparkcraft.audioserver.minecraft.extensions
 
-import de.themeparkcraft.audioserver.common.data.worldpositions.PointedWorldPosition
+import de.themeparkcraft.audioserver.common.interfaces.PointedWorldPosition
 import org.bukkit.entity.Player
 
 /**

diff --git a/standalone/build.gradle.kts b/standalone/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
-group = "de.themeparkcraft.audioserver"
-version = "1.0-SNAPSHOT"
-
-
 dependencies {
     implementation(project(":common"))
     shadow(project(":common"))