Disable receiving transcriptions from client-muted players

BluSpring · BluSpring · commit 11d7fed35a57 · 2024-09-10T08:22:07.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,6 +73,7 @@ val architecturyVersion = when (mcData.version.rawVersion) {
 dependencies {
     implementation("de.maxhenkel.voicechat:voicechat-api:${project.property("voicechat_api_version")}")
     compileOnly("su.plo.voice.api:server:${project.property("plasmo_api_version")}")
+    compileOnly("su.plo.voice.api:client:${project.property("plasmo_api_version")}")
 
     modApi("dev.architectury:architectury-${mcData.loader.friendlyString}:$architecturyVersion")
 
@@ -98,6 +99,7 @@ dependencies {
     else if (!mcData.isNeoForge) {
         modRuntimeOnly("maven.modrinth:plasmo-voice:${mcData.loader.friendlyString}-${if (mcData.version != MinecraftVersion.VERSION_1_21_1) mcData.version else "1.21"}-${project.property("plasmo_version")}")
         runtimeOnly("su.plo.voice.api:server:${project.property("plasmo_api_version")}")
+        runtimeOnly("su.plo.voice.api:client:${project.property("plasmo_api_version")}")
     }
 
     val clothConfigVersion = when(mcData.version.rawVersion) {
diff --git a/src/main/kotlin/xyz/bluspring/unitytranslate/client/gui/TranscriptBox.kt b/src/main/kotlin/xyz/bluspring/unitytranslate/client/gui/TranscriptBox.kt
@@ -12,6 +12,7 @@ import net.minecraft.world.entity.player.Player
 import xyz.bluspring.unitytranslate.Language
 import xyz.bluspring.unitytranslate.UnityTranslate
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
+import xyz.bluspring.unitytranslate.compat.voicechat.UTVoiceChatCompat
 import xyz.bluspring.unitytranslate.events.TranscriptEvents
 import xyz.bluspring.unitytranslate.transcript.Transcript
 import java.util.*
@@ -147,6 +148,9 @@ data class TranscriptBox(
     }
 
     fun updateTranscript(source: Player, text: String, language: Language, index: Int, updateTime: Long, incomplete: Boolean) {
+        if (!UTVoiceChatCompat.isPlayerAudible(source))
+            return
+
         if (this.transcripts.any { it.player.uuid == source.uuid && it.index == index }) {
             val transcript = this.transcripts.first { it.player.uuid == source.uuid && it.index == index }
 
diff --git a/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/PlasmoVoiceChatCompat.kt b/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/PlasmoVoiceChatCompat.kt
@@ -1,12 +1,20 @@
 package xyz.bluspring.unitytranslate.compat.voicechat
 
 import com.google.inject.Inject
+import net.minecraft.client.Minecraft
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.player.Player
 import su.plo.voice.api.addon.AddonInitializer
 import su.plo.voice.api.addon.AddonLoaderScope
 import su.plo.voice.api.addon.annotation.Addon
+import su.plo.voice.api.client.PlasmoVoiceClient
+import su.plo.voice.api.client.event.connection.VoicePlayerUpdateEvent
+import su.plo.voice.api.event.EventSubscribe
 import su.plo.voice.api.server.PlasmoVoiceServer
 import su.plo.voice.api.server.audio.capture.ProximityServerActivationHelper
+import su.plo.voice.api.server.event.mute.PlayerVoiceMutedEvent
+import xyz.bluspring.unitytranslate.UnityTranslate
+import xyz.bluspring.unitytranslate.client.UnityTranslateClient
 
 @Addon(
     id = "pv-unitytranslate-compat",
@@ -19,17 +27,38 @@ class PlasmoVoiceChatCompat : AddonInitializer {
     @Inject
     lateinit var voiceServer: PlasmoVoiceServer
 
+    @Inject
+    lateinit var voiceClient: PlasmoVoiceClient
+
     private var proximityHelper: ProximityServerActivationHelper? = null
 
     override fun onAddonInitialize() {
         instance = this
     }
 
+    @EventSubscribe
+    fun onVoiceUpdateEvent(event: VoicePlayerUpdateEvent) {
+        if (event.player.playerId != Minecraft.getInstance().player?.uuid)
+            return
+
+        if (UnityTranslate.config.client.muteTranscriptWhenVoiceChatMuted) {
+            if (event.player.isVoiceDisabled) {
+                UnityTranslateClient.shouldTranscribe = false
+            } else if (!event.player.isVoiceDisabled && !(event.player.isMuted || event.player.isMicrophoneMuted)) {
+                UnityTranslateClient.shouldTranscribe = true
+            } else if (!event.player.isVoiceDisabled && (event.player.isMuted || event.player.isMicrophoneMuted)) {
+                UnityTranslateClient.shouldTranscribe = false
+            }
+        }
+    }
+
     companion object {
         lateinit var instance: PlasmoVoiceChatCompat
 
         fun init() {
-            PlasmoVoiceServer.getAddonsLoader().load(PlasmoVoiceChatCompat())
+            val compat = PlasmoVoiceChatCompat()
+            PlasmoVoiceServer.getAddonsLoader().load(compat)
+            PlasmoVoiceClient.getAddonsLoader().load(compat)
         }
 
         fun getNearbyPlayers(source: ServerPlayer): List<ServerPlayer> {
@@ -47,6 +76,13 @@ class PlasmoVoiceChatCompat : AddonInitializer {
             }
         }
 
+        fun isPlayerAudible(source: Player): Boolean {
+            val connection = instance.voiceClient.serverConnection.orElse(null) ?: return false
+            val vcPlayer = connection.getPlayerById(source.uuid).orElse(null) ?: return false
+
+            return !vcPlayer.isMuted && !vcPlayer.isMicrophoneMuted && !vcPlayer.isVoiceDisabled
+        }
+
         fun playerSharesGroup(player: ServerPlayer, other: ServerPlayer): Boolean {
             // TODO: Support pv-addon-groups
             return false
diff --git a/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/SimpleVoiceChatCompat.kt b/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/SimpleVoiceChatCompat.kt
@@ -2,13 +2,16 @@ package xyz.bluspring.unitytranslate.compat.voicechat
 
 import de.maxhenkel.voicechat.api.ForgeVoicechatPlugin
 import de.maxhenkel.voicechat.api.Group
+import de.maxhenkel.voicechat.api.VoicechatClientApi
 import de.maxhenkel.voicechat.api.VoicechatPlugin
 import de.maxhenkel.voicechat.api.VoicechatServerApi
+import de.maxhenkel.voicechat.api.events.ClientVoicechatInitializationEvent
 import de.maxhenkel.voicechat.api.events.EventRegistration
 import de.maxhenkel.voicechat.api.events.MicrophoneMuteEvent
 import de.maxhenkel.voicechat.api.events.VoicechatDisableEvent
 import de.maxhenkel.voicechat.api.events.VoicechatServerStartedEvent
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.player.Player
 import xyz.bluspring.unitytranslate.UnityTranslate
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
 
@@ -42,10 +45,15 @@ class SimpleVoiceChatCompat : VoicechatPlugin {
         registration.registerEvent(VoicechatServerStartedEvent::class.java) {
             voiceChatServer = it.voicechat
         }
+
+        registration.registerEvent(ClientVoicechatInitializationEvent::class.java) {
+            voiceChatClient = it.voicechat
+        }
     }
 
     companion object {
         lateinit var voiceChatServer: VoicechatServerApi
+        lateinit var voiceChatClient: VoicechatClientApi
 
         fun getNearbyPlayers(source: ServerPlayer): List<ServerPlayer> {
             if (isPlayerDeafened(source))
@@ -72,6 +80,11 @@ class SimpleVoiceChatCompat : VoicechatPlugin {
             return firstGroup.id == secondGroup.id
         }
 
+        fun isPlayerAudible(player: Player): Boolean {
+            // FIXME: SVC doesn't provide an easy way of detecting this...
+            return true
+        }
+
         fun isPlayerDeafened(player: ServerPlayer): Boolean {
             return voiceChatServer.getConnectionOf(player.uuid)?.isDisabled == true
         }
diff --git a/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/UTVoiceChatCompat.kt b/src/main/kotlin/xyz/bluspring/unitytranslate/compat/voicechat/UTVoiceChatCompat.kt
@@ -1,6 +1,8 @@
 package xyz.bluspring.unitytranslate.compat.voicechat
 
+import net.minecraft.client.Minecraft
 import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.GameType
 import xyz.bluspring.unitytranslate.UnityTranslate
 
@@ -38,6 +40,17 @@ object UTVoiceChatCompat {
             false
     }
 
+    fun isPlayerAudible(player: Player): Boolean {
+        if (player == Minecraft.getInstance().player)
+            return true
+
+        return if (usesSimpleVoiceChat)
+            SimpleVoiceChatCompat.isPlayerAudible(player)
+        else if (usesPlasmoVoice)
+            PlasmoVoiceChatCompat.isPlayerAudible(player)
+        else false
+    }
+
     fun areBothSpectator(player: ServerPlayer, other: ServerPlayer): Boolean {
         if (player.gameMode.gameModeForPlayer == GameType.SPECTATOR && other.gameMode.gameModeForPlayer == GameType.SPECTATOR)
             return true
diff --git a/src/main/kotlin/xyz/bluspring/unitytranslate/network/UTClientNetworking.kt b/src/main/kotlin/xyz/bluspring/unitytranslate/network/UTClientNetworking.kt
@@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft
 import xyz.bluspring.unitytranslate.Language
 import xyz.bluspring.unitytranslate.UnityTranslate
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
+import xyz.bluspring.unitytranslate.compat.voicechat.UTVoiceChatCompat
 import xyz.bluspring.unitytranslate.events.TranscriptEvents
 import xyz.bluspring.unitytranslate.transcript.Transcript
 import java.util.*
@@ -96,7 +97,7 @@ object UTClientNetworking {
                 val box = boxes.firstOrNull { it.language == language }
                 box?.updateTranscript(source, text, sourceLanguage, index, updateTime, false)
 
-                if (box == null) {
+                if (box == null && UTVoiceChatCompat.isPlayerAudible(ctx.player)) {
                     TranscriptEvents.UPDATE.invoker().onTranscriptUpdate(Transcript(index, source, text, language, updateTime, false), language)
                 }
             }
