feat: update API

plasmoapp · May 18, 2024 · 1cd0526 · 1cd0526
1 parent 8ef1dbb
commit 1cd0526
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/common/src/main/kotlin/su/plo/voice/groups/ActivationListener.kt b/common/src/main/kotlin/su/plo/voice/groups/ActivationListener.kt
@@ -1,22 +1,15 @@
 package su.plo.voice.groups
 
-import su.plo.voice.api.event.EventPriority
-import su.plo.voice.api.event.EventSubscribe
-import su.plo.voice.api.server.PlasmoBaseVoiceServer
-import su.plo.voice.api.server.audio.capture.SelfActivationInfo
+import su.plo.voice.api.server.audio.capture.PlayerActivationInfo
 import su.plo.voice.api.server.audio.capture.ServerActivation
 import su.plo.voice.api.server.audio.source.ServerBroadcastSource
-import su.plo.voice.api.server.audio.source.ServerDirectSource
-import su.plo.voice.api.server.event.audio.source.ServerSourcePacketEvent
 import su.plo.voice.api.server.player.VoicePlayer
 import su.plo.voice.proto.packets.tcp.clientbound.SourceAudioEndPacket
-import su.plo.voice.proto.packets.tcp.clientbound.SourceInfoPacket
 import su.plo.voice.proto.packets.tcp.serverbound.PlayerAudioEndPacket
 import su.plo.voice.proto.packets.udp.clientbound.SourceAudioPacket
 import su.plo.voice.proto.packets.udp.serverbound.PlayerAudioPacket
 
 class ActivationListener(
-    voiceServer: PlasmoBaseVoiceServer,
     private val groupManager: GroupsManager,
     activation: ServerActivation
 ) {
@@ -26,8 +19,6 @@ class ActivationListener(
         activation.onPlayerActivationEnd(this::onActivationEnd)
     }
 
-    private val selfActivationInfo = SelfActivationInfo(voiceServer.udpConnectionManager)
-
     private fun onActivation(player: VoicePlayer, packet: PlayerAudioPacket): ServerActivation.Result {
         groupManager.sourceByPlayer[player.instance.uuid]?.let {
             if (sendAudioPacket(player, it, packet)) {
@@ -48,28 +39,6 @@ class ActivationListener(
         return ServerActivation.Result.IGNORED
     }
 
-    @EventSubscribe(priority = EventPriority.HIGHEST)
-    fun onSourceSendPacket(event: ServerSourcePacketEvent) {
-        val source = event.source as? ServerDirectSource ?: return
-        val sender = source.sender ?: return
-
-        if (!selfActivationInfo.lastPlayerActivationIds
-                .containsKey(sender.instance.uuid)
-        ) {
-            return
-        }
-
-        if (event.packet is SourceInfoPacket) {
-            selfActivationInfo.updateSelfSourceInfo(
-                sender,
-                source,
-                (event.packet as SourceInfoPacket).sourceInfo
-            )
-        } else if (event.packet is SourceAudioEndPacket) {
-            sender.sendPacket(event.packet)
-        }
-    }
-
     private fun sendAudioPacket(
         player: VoicePlayer,
         source: ServerBroadcastSource,
@@ -80,11 +49,8 @@ class ActivationListener(
             packet.data,
             source.id, 0.toShort()
         )
-        if (source.sendAudioPacket(sourcePacket, packet.activationId)) {
-            selfActivationInfo.sendAudioInfo(player, source, packet.activationId, sourcePacket)
-            return true
-        }
-        return false
+
+        return source.sendAudioPacket(sourcePacket, PlayerActivationInfo(player, packet))
     }
 
     private fun sendAudioEndPacket(

diff --git a/common/src/main/kotlin/su/plo/voice/groups/GroupsAddon.kt b/common/src/main/kotlin/su/plo/voice/groups/GroupsAddon.kt
@@ -109,9 +109,7 @@ abstract class GroupsAddon : AddonInitializer {
                 groupManager.groupByPlayer[it.key] = group
             } }
 
-        voiceServer.eventBus.register(this, ActivationListener(
-            voiceServer, groupManager, activation
-        ))
+        voiceServer.eventBus.register(this, ActivationListener(groupManager, activation))
 
         voiceServer.eventBus.register(this, groupManager)
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ kotlinx-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", ve
 
 plasmovoice-server = { module = "su.plo.voice.api:server", version.ref = "plasmovoice" }
 plasmovoice-proxy = { module = "su.plo.voice.api:proxy", version.ref = "plasmovoice" }
-plasmovoice-server-common = { module = "su.plo.voice.api:server-common", version.ref = "plasmovoice" }
+plasmovoice-server-common = { module = "su.plo.voice.api:server-proxy-common", version.ref = "plasmovoice" }
 
 [plugins]
 plasmovoice = { id = "su.plo.voice.plugin.entrypoints", version.ref = "plasmovoice-plugin" }