Backport some stuff from rewrite and 0.1.19-xushii

Author: BluSpring

fabric/src/main/kotlin/xyz/bluspring/unitytranslate/fabric/UnityTranslateFabric.kt

@@ -1,11 +1,33 @@
 package xyz.bluspring.unitytranslate.fabric
 
 import net.fabricmc.api.ModInitializer
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
+import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents
+import net.minecraft.commands.CommandSourceStack
 import xyz.bluspring.unitytranslate.UnityTranslate
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
+import xyz.bluspring.unitytranslate.translator.TranslatorManager
 
 class UnityTranslateFabric : ModInitializer {
     override fun onInitialize() {
         instance = UnityTranslate()
+
+        CommandRegistrationCallback.EVENT.register { dispatcher, registryAccess, environment ->
+            UnityTranslateCommands.register(dispatcher, "unitytranslate", false, CommandSourceStack::sendSystemMessage)
+        }
+
+        ServerLifecycleEvents.SERVER_STARTING.register { server ->
+            TranslatorManager.serverStarting(server)
+        }
+
+        ServerLifecycleEvents.SERVER_STOPPING.register { _ ->
+            TranslatorManager.serverStopping()
+        }
+
+        ServerPlayConnectionEvents.DISCONNECT.register { handler, server ->
+            TranslatorManager.playerQuit(handler.player)
+        }
     }
 
     companion object {

fabric/src/main/kotlin/xyz/bluspring/unitytranslate/fabric/client/UnityTranslateFabricClient.kt

@@ -1,12 +1,15 @@
 package xyz.bluspring.unitytranslate.fabric.client
 
 import net.fabricmc.api.ClientModInitializer
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
 
 class UnityTranslateFabricClient : ClientModInitializer {
     override fun onInitializeClient() {
@@ -31,5 +34,9 @@ class UnityTranslateFabricClient : ClientModInitializer {
         HudRenderCallback.EVENT.register { guiGraphics, delta ->
             instance.clientRenderHud(guiGraphics, delta)
         }
+
+        ClientCommandRegistrationCallback.EVENT.register { dispatcher, registryAccess ->
+            UnityTranslateCommands.register(dispatcher, "unitytranslateclient", true, FabricClientCommandSource::sendFeedback)
+        }
     }
 }

forge/src/main/kotlin/xyz/bluspring/unitytranslate/forge/ForgeEvents.kt

@@ -1,8 +1,11 @@
 package xyz.bluspring.unitytranslate.forge
 
+import net.minecraft.commands.CommandSourceStack
 import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.event.RegisterCommandsEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import net.minecraftforge.server.permission.events.PermissionGatherEvent
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
 
 object ForgeEvents {
      fun init() {
@@ -13,4 +16,9 @@ object ForgeEvents {
      fun onPermissionsGather(event: PermissionGatherEvent.Nodes) {
          event.addNodes(UnityTranslateForge.REQUEST_TRANSLATIONS_NODE)
      }
+
+    @SubscribeEvent
+    fun onCommandRegister(ev: RegisterCommandsEvent) {
+        UnityTranslateCommands.register(ev.dispatcher, "unitytranslate", false, CommandSourceStack::sendSystemMessage)
+    }
 }

forge/src/main/kotlin/xyz/bluspring/unitytranslate/forge/UnityTranslateForgeClient.kt

@@ -1,11 +1,14 @@
 package xyz.bluspring.unitytranslate.forge
 
 import net.minecraft.client.Minecraft
+import net.minecraft.commands.CommandSourceStack
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent
+import net.minecraftforge.client.event.RegisterClientCommandsEvent
 import net.minecraftforge.client.event.RenderGuiEvent
 import net.minecraftforge.event.TickEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
 
 object UnityTranslateForgeClient {
     val instance = UnityTranslateClient()
@@ -17,6 +20,11 @@ object UnityTranslateForgeClient {
         }
     }
 
+    @SubscribeEvent
+    fun onClientCommands(ev: RegisterClientCommandsEvent) {
+        UnityTranslateCommands.register(ev.dispatcher, "unitytranslateclient", true, CommandSourceStack::sendSystemMessage)
+    }
+
     @SubscribeEvent
     fun onHudRender(ev: RenderGuiEvent.Post) {
         this.instance.clientRenderHud(ev.guiGraphics, ev.partialTick)

src/main/kotlin/xyz/bluspring/unitytranslate/PlatformProxyImpl.kt

@@ -7,11 +7,11 @@ import xyz.bluspring.unitytranslate.compat.voicechat.PlasmoVoiceChatCompat
 import xyz.bluspring.unitytranslate.compat.voicechat.UTVoiceChatCompat
 import xyz.bluspring.unitytranslate.config.UnityTranslateConfig
 import xyz.bluspring.unitytranslate.network.UTServerNetworking
-import xyz.bluspring.unitytranslate.translator.LocalLibreTranslateInstance
 import xyz.bluspring.unitytranslate.translator.TranslatorManager
 import java.io.File
+import java.util.*
 
-class UnityTranslate(val proxy: PlatformProxy = PlatformProxyImpl()) {
+class UnityTranslate(val proxy: PlatformProxy = ServiceLoader.load(PlatformProxy::class.java).first()) {
     init {
         instance = this
         configFile = File(proxy.configDir.toFile(), "unitytranslate.json")
@@ -28,7 +28,7 @@ class UnityTranslate(val proxy: PlatformProxy = PlatformProxyImpl()) {
     }
 
     fun serverStopping() {
-        LocalLibreTranslateInstance.killOpenInstances()
+//        LocalLibreTranslateInstance.killOpenInstances()
     }
 
     companion object {

src/main/kotlin/xyz/bluspring/unitytranslate/UnityTranslate.kt

@@ -1,25 +1,24 @@
 package xyz.bluspring.unitytranslate.client
 
+//? if >= 1.20.6 {
+/*import xyz.bluspring.unitytranslate.network.payloads.SendTranscriptToServerPayload
+*///? }
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.ChatFormatting
 import net.minecraft.client.KeyMapping
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.CommonComponents
 import net.minecraft.network.chat.Component
+import xyz.bluspring.unitytranslate.Language
 import xyz.bluspring.unitytranslate.UnityTranslate
 import xyz.bluspring.unitytranslate.client.gui.*
 import xyz.bluspring.unitytranslate.client.transcribers.SpeechTranscriber
 import xyz.bluspring.unitytranslate.client.transcribers.windows.sapi5.WindowsSpeechApiTranscriber
 import xyz.bluspring.unitytranslate.compat.talkballoons.TalkBalloonsCompat
-import xyz.bluspring.unitytranslate.events.TranscriptEvents
 import xyz.bluspring.unitytranslate.network.PacketIds
 import xyz.bluspring.unitytranslate.network.UTClientNetworking
-import xyz.bluspring.unitytranslate.transcript.Transcript
-//? if >= 1.20.6 {
-/*import xyz.bluspring.unitytranslate.network.payloads.SendTranscriptToServerPayload
-*///? }
-import xyz.bluspring.unitytranslate.translator.LocalLibreTranslateInstance
+import xyz.bluspring.unitytranslate.transcript.TranscriptHolder
 import xyz.bluspring.unitytranslate.translator.TranslatorManager
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.function.BiConsumer
@@ -77,7 +76,7 @@ class UnityTranslateClient {
         }
 
         if (CLEAR_TRANSCRIPTS.consumeClick()) {
-            for (box in languageBoxes) {
+            for (box in transcriptHolders) {
                 box.transcripts.clear()
             }
         }
@@ -101,7 +100,7 @@ class UnityTranslateClient {
 
         // prune transcripts
         val currentTime = System.currentTimeMillis()
-        for (box in languageBoxes) {
+        for (box in transcriptHolders) {
             if (box.transcripts.size > 50) {
                 for (i in 0..(box.transcripts.size - 50)) {
                     box.transcripts.remove()
@@ -147,16 +146,13 @@ class UnityTranslateClient {
 
                 UnityTranslate.instance.proxy.sendPacketClient(PacketIds.SEND_TRANSCRIPT, buf)
                 //? }
-                languageBoxes.firstOrNull { it.language == transcriber.language }?.updateTranscript(Minecraft.getInstance().player!!, text, transcriber.language, index, updateTime, false)
 
-                if (languageBoxes.none { it.language == transcriber.language }) {
-                    TranscriptEvents.UPDATE.invoker().onTranscriptUpdate(Transcript(index, Minecraft.getInstance().player!!, text, transcriber.language, updateTime, false), transcriber.language)
-                }
+                getTranscriptHolder(transcriber.language)?.updateTranscript(Minecraft.getInstance().player!!, text, transcriber.language, index, updateTime, false)
             } else {
                 if (Minecraft.getInstance().player == null)
                     return@BiConsumer
 
-                for (box in languageBoxes) {
+                for (box in transcriptHolders) {
                     if (box.language == transcriber.language) {
                         box.updateTranscript(Minecraft.getInstance().player!!, text, transcriber.language, index, updateTime, false)
 
@@ -171,10 +167,6 @@ class UnityTranslateClient {
                             box.updateTranscript(Minecraft.getInstance().player!!, it, transcriber.language, index, updateTime, false)
                         }
                 }
-
-                if (languageBoxes.none { it.language == transcriber.language }) {
-                    TranscriptEvents.UPDATE.invoker().onTranscriptUpdate(Transcript(index, Minecraft.getInstance().player!!, text, transcriber.language, updateTime, false), transcriber.language)
-                }
             }
         }
     }
@@ -198,6 +190,12 @@ class UnityTranslateClient {
 
         var shouldRenderBoxes = true
 
+        val transcriptHolders = mutableSetOf<TranscriptHolder>()
+
+        fun getTranscriptHolder(language: Language): TranscriptHolder? {
+            return transcriptHolders.firstOrNull { it.language == language }
+        }
+
         val languageBoxes: MutableList<TranscriptBox>
             get() {
                 return UnityTranslate.config.client.transcriptBoxes

src/main/kotlin/xyz/bluspring/unitytranslate/client/UnityTranslateClient.kt

@@ -1,22 +1,16 @@
 package xyz.bluspring.unitytranslate.client.gui
 
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import net.minecraft.ChatFormatting
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.util.FastColor
 import net.minecraft.util.Mth
-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.*
-import java.util.concurrent.ConcurrentLinkedQueue
 
 @Serializable
 data class TranscriptBox(
@@ -65,10 +59,9 @@ data class TranscriptBox(
             }
         }
 
-    @Transient
-    val transcripts = ConcurrentLinkedQueue<Transcript>()
-
     fun render(guiGraphics: GuiGraphics, partialTick: Float) {
+        val holder = UnityTranslateClient.getTranscriptHolder(this.language) ?: return
+
         guiGraphics.pose().pushPose()
 
         guiGraphics.pose().translate(0.0, 0.0, -255.0)
@@ -84,7 +77,7 @@ data class TranscriptBox(
 
         guiGraphics.enableScissor(x, y + 15, x + width, y + height)
 
-        val lines = transcripts.sortedByDescending { it.arrivalTime }
+        val lines = holder.transcripts.sortedByDescending { it.arrivalTime }
 
         val font = Minecraft.getInstance().font
         val scale = UnityTranslate.config.client.textScale / 100f
@@ -147,32 +140,6 @@ data class TranscriptBox(
         guiGraphics.pose().popPose()
     }
 
-    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 }
-
-            // it's possible for this to go out of order, let's avoid that
-            if (transcript.lastUpdateTime > updateTime)
-                return
-
-            transcript.lastUpdateTime = updateTime
-            transcript.text = text
-            transcript.incomplete = incomplete
-            transcript.arrivalTime = System.currentTimeMillis()
-
-            TranscriptEvents.UPDATE.invoker().onTranscriptUpdate(transcript, this@TranscriptBox.language)
-
-            return
-        }
-
-        this.transcripts.add(Transcript(index, source, text, language, updateTime, incomplete).apply {
-            TranscriptEvents.UPDATE.invoker().onTranscriptUpdate(this, this@TranscriptBox.language)
-        })
-    }
-
     companion object {
         val TRANSCRIPT_MUTED = UnityTranslate.id("textures/gui/transcription_muted.png")
     }