Revert "push discord fix"

This reverts commit 2aaccb6.

Author: emyfops

build.gradle.kts

@@ -70,7 +70,7 @@ configurations.all {
 repositories {
     mavenLocal() // Allow the use of local repositories
     maven("https://maven.2b2t.vc/releases") // Baritone
-    maven("https://maven.firstdark.dev/releases")
+    maven("https://jitpack.io") // KDiscordIPC
     maven("https://api.modrinth.com/maven")
     mavenCentral()
 
@@ -155,7 +155,7 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     includeLib("io.github.classgraph:classgraph:${classGraphVersion}")
-    includeLib("dev.firstdark.discordrpc:discord-rpc:1.0.4")
+    includeLib("com.github.emyfops:KDiscordIPC:$discordIPCVersion")
     includeLib("com.pngencoder:pngencoder:$pngEncoderVersion")
 
     includeLib("io.github.spair:imgui-java-binding:$spairVersion")

src/main/kotlin/com/lambda/module/modules/client/Discord.kt

@@ -18,21 +18,27 @@
 package com.lambda.module.modules.client
 
 import com.lambda.Lambda
+import com.lambda.Lambda.LOG
 import com.lambda.context.SafeContext
-import com.lambda.event.events.ClientEvent
+import com.lambda.event.EventFlow
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listenOnce
-import com.lambda.event.listener.UnsafeListener.Companion.listenOnceUnsafe
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.network.NetworkManager.updateToken
+import com.lambda.network.api.v1.endpoints.linkDiscord
 import com.lambda.threading.runConcurrent
+import com.lambda.util.Communication.warn
 import com.lambda.util.Nameable
 import com.lambda.util.extension.dimensionName
 import com.lambda.util.extension.fullHealth
 import com.lambda.util.extension.worldName
-import dev.firstdark.rpc.DiscordRpc
-import dev.firstdark.rpc.handlers.RPCEventHandler
-import dev.firstdark.rpc.models.DiscordRichPresence
+import dev.cbyrne.kdiscordipc.KDiscordIPC
+import dev.cbyrne.kdiscordipc.core.packet.inbound.impl.AuthenticatePacket
+import dev.cbyrne.kdiscordipc.data.activity.button
+import dev.cbyrne.kdiscordipc.data.activity.largeImage
+import dev.cbyrne.kdiscordipc.data.activity.smallImage
+import dev.cbyrne.kdiscordipc.data.activity.timestamps
 import kotlinx.coroutines.delay
 
 object Discord : Module(
@@ -48,55 +54,63 @@ object Discord : Module(
     private val line2Left by setting("Line 2 Left", LineInfo.Version)
     private val line2Right by setting("Line 2 Right", LineInfo.Fps)
 
-    val rpc = DiscordRpc()
+    val rpc = KDiscordIPC(Lambda.APP_ID, scope = EventFlow.lambdaScope)
+
     private var startup = System.currentTimeMillis()
 
-//    var discordAuth: AuthenticatePacket.Data? = null; private set
+    var discordAuth: AuthenticatePacket.Data? = null; private set
 
     init {
         listenOnce<WorldEvent.Join> {
+            if (rpc.connected) return@listenOnce false
+
             runConcurrent {
                 start()
-                update()
+                handleLoop()
             }
 
             return@listenOnce true
         }
 
-        onEnable { runConcurrent { start(); update() } }
+        onEnable { runConcurrent { start(); handleLoop() } }
         onDisable { stop() }
     }
 
-    private fun start() {
-        rpc.init(Lambda.APP_ID, RPCEventHandler(), true)
-//        val auth = rpc.applicationManager.authenticate()
-//
-//        linkDiscord(discordToken = auth.accessToken)
-//            .onSuccess { updateToken(it); discordAuth = auth }
-//            .onFailure { LOG.error(it); warn("Failed to link your discord account") }
+    private suspend fun start() {
+        if (rpc.connected) return
+
+        runConcurrent { rpc.connect() }
+        delay(1000)
+
+        val auth = rpc.applicationManager.authenticate()
+
+        linkDiscord(discordToken = auth.accessToken)
+            .onSuccess { updateToken(it); discordAuth = auth }
+            .onFailure { LOG.error(it); warn("Failed to link your discord account") }
     }
 
     private fun stop() {
-        rpc.shutdown()
+        if (rpc.connected) rpc.disconnect()
+    }
+
+    private suspend fun SafeContext.handleLoop() {
+        while (rpc.connected) {
+            update()
+            delay(delay)
+        }
     }
 
     private suspend fun SafeContext.update() {
-        val presence = DiscordRichPresence
-            .builder()
-            .details("${line1Left.value(this)} | ${line1Right.value(this)}".take(128))
-            .state("${line2Left.value(this)} | ${line2Right.value(this)}".take(128))
-            .largeImageKey("lambda")
-            .largeImageText(Lambda.VERSION)
-            .smallUrl("https://mc-heads.net/avatar/${mc.gameProfile.id}/nohelm")
-            .smallImageText(mc.gameProfile.name)
-            .button(DiscordRichPresence.RPCButton.of("Download", "https://github.com/lambda-client/lambda"))
-
-        if (showTime)
-            presence.startTimestamp(startup)
-
-        rpc.updatePresence(presence.build())
-
-        delay(delay)
+        rpc.activityManager.setActivity {
+            details = "${line1Left.value(this@update)} | ${line1Right.value(this@update)}".take(128)
+            state = "${line2Left.value(this@update)} | ${line2Right.value(this@update)}".take(128)
+
+            largeImage("lambda", Lambda.VERSION)
+            smallImage("https://mc-heads.net/avatar/${mc.gameProfile.id}/nohelm", mc.gameProfile.name)
+            button("Download", "https://github.com/lambda-client/lambda")
+
+            if (showTime) timestamps(startup)
+        }
     }
 
     private enum class LineInfo(val value: SafeContext.() -> String) : Nameable {