[1.20.x] [All] Feat: Discord RPC

.gitignore

@@ -49,3 +49,7 @@ logs/
 
 ### Architectury ###
 .architectury-transformer/
+
+### Kotlin ###
+*.kotlin_module
+.kotlin/

build.gradle.kts

@@ -62,11 +62,11 @@ allprojects {
     base.archivesName = modId
 
     repositories {
-        maven("https://api.modrinth.com/maven")
-        maven("https://jitpack.io")
-        maven("https://maven.shedaniel.me/") { name = "Architectury" }
+        maven("https://maven.shedaniel.me/") // Architectury
         maven("https://maven.terraformersmc.com/releases/")
-        maven("https://babbaj.github.io/maven/")
+        maven("https://babbaj.github.io/maven/") // Baritone
+        maven("https://jitpack.io") // KDiscordIPC
+        mavenCentral()
 
         // Allow the use of local libraries
         flatDir {

common/build.gradle.kts

@@ -2,6 +2,7 @@ val modId: String by project
 val fabricLoaderVersion: String by project
 val kotlinVersion: String by project
 val kotlinxCoroutinesVersion: String by project
+val discordIPCVersion: String by project
 
 architectury { common("fabric", "forge", "neoforge") }
 
@@ -21,6 +22,7 @@ dependencies {
 
     // Add dependencies on the required Kotlin modules.
     implementation("org.reflections:reflections:0.10.2")
+    implementation("com.github.Edouard127:KDiscordIPC:$discordIPCVersion")
 
     // Add Kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")

common/src/main/java/com/lambda/mixin/ClientConnectionMixin.java → common/src/main/java/com/lambda/mixin/network/ClientConnectionMixin.java

@@ -1,4 +1,4 @@
-package com.lambda.mixin;
+package com.lambda.mixin.network;
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ConnectionEvent;
@@ -73,7 +73,7 @@ private void onConnect(
             ConnectionIntent intent,
             CallbackInfo ci
     ) {
-        EventFlow.post(new ConnectionEvent.Connect(address, port, listener, intent));
+        EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, listener, intent));
     }
 
     @Inject(method = "disconnect(Lnet/minecraft/text/Text;)V", at = @At("HEAD"))

common/src/main/java/com/lambda/mixin/network/ClientLoginNetworkMixin.java

@@ -0,0 +1,22 @@
+package com.lambda.mixin.network;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ConnectionEvent;
+import com.lambda.module.modules.client.DiscordRPC;
+import net.minecraft.client.network.ClientLoginNetworkHandler;
+import net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(ClientLoginNetworkHandler.class)
+public class ClientLoginNetworkMixin {
+
+    @Inject(method = "onSuccess(Lnet/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket;)V", at = @At("HEAD"))
+    private void onSuccess(LoginSuccessS2CPacket packet, CallbackInfo ci) {
+        EventFlow.post(new ConnectionEvent.Connect.Post(packet.getProfile()));
+    }
+}

common/src/main/java/com/lambda/mixin/network/HandshakeC2SPacketMixin.java

@@ -0,0 +1,18 @@
+package com.lambda.mixin.network;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ConnectionEvent;
+import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
+import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(HandshakeC2SPacket.class)
+public class HandshakeC2SPacketMixin {
+    @Inject(method = "<init>(ILjava/lang/String;ILnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("TAIL"))
+    private void onHandshakeC2SPacket(int i, String string, int j, ConnectionIntent connectionIntent, CallbackInfo ci) {
+        EventFlow.post(new ConnectionEvent.Connect.Handshake(i, string, j, connectionIntent));
+    }
+}

common/src/main/java/com/lambda/mixin/network/LoginHelloC2SPacketMixin.java

@@ -0,0 +1,19 @@
+package com.lambda.mixin.network;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ConnectionEvent;
+import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.UUID;
+
+@Mixin(LoginHelloC2SPacket.class)
+public class LoginHelloC2SPacketMixin {
+    @Inject(method = "<init>(Ljava/lang/String;Ljava/util/UUID;)V", at = @At("TAIL"))
+    private void onLoginHelloC2SPacket(String string, UUID uUID, CallbackInfo ci) {
+        EventFlow.post(new ConnectionEvent.Connect.Login.Hello(string, uUID));
+    }
+}

common/src/main/java/com/lambda/mixin/network/LoginKeyC2SPacketMixin.java

@@ -0,0 +1,22 @@
+package com.lambda.mixin.network;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ConnectionEvent;
+import net.minecraft.network.packet.c2s.login.LoginKeyC2SPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import javax.crypto.SecretKey;
+import java.security.PublicKey;
+
+@Mixin(LoginKeyC2SPacket.class)
+public class LoginKeyC2SPacketMixin {
+    @Inject(method = "<init>(Ljavax/crypto/SecretKey;Ljava/security/PublicKey;[B)V", at = @At("TAIL"))
+    private void onLoginKeyC2SPacket(SecretKey secretKey, PublicKey publicKey, byte[] nonce, CallbackInfo ci) {
+        // Please note this won't work if the server is offline mode because the player doesn't
+        // fetch the server's public key.
+        EventFlow.post(new ConnectionEvent.Connect.Login.Key(secretKey, publicKey, nonce));
+    }
+}

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -26,6 +26,7 @@ object Lambda {
     const val MOD_NAME = "Lambda"
     const val MOD_ID = "lambda"
     const val SYMBOL = "λ"
+    const val APP_ID = "1221289599427416127"
     val VERSION: String = LoaderInfo.getVersion()
     val LOG: Logger = LogManager.getLogger(SYMBOL)
 

common/src/main/kotlin/com/lambda/command/commands/RpcCommand.kt

@@ -0,0 +1,31 @@
+package com.lambda.command.commands
+
+import com.lambda.brigadier.*
+import com.lambda.brigadier.argument.literal
+import com.lambda.brigadier.argument.value
+import com.lambda.brigadier.argument.word
+import com.lambda.command.LambdaCommand
+import com.lambda.module.modules.client.DiscordRPC
+import com.lambda.util.extension.CommandBuilder
+
+object RpcCommand : LambdaCommand(
+    name = "rpc",
+    description = "Discord Rich Presence commands.",
+    usage = "rpc <join [id] | accept>"
+) {
+    override fun CommandBuilder.create() {
+        required(literal("join")) {
+            required(word("id")) { id ->
+                execute {
+                    DiscordRPC.join(id().value())
+                }
+            }
+        }
+
+        required(literal("accept")) {
+            execute {
+                DiscordRPC.join()
+            }
+        }
+    }
+}

common/src/main/kotlin/com/lambda/event/events/ConnectionEvent.kt

@@ -1,17 +1,93 @@
 package com.lambda.event.events
 
 import com.lambda.event.Event
+import com.mojang.authlib.GameProfile
 import net.minecraft.network.listener.PacketListener
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent
 import net.minecraft.text.Text
+import java.security.PublicKey
+import java.util.UUID
+import javax.crypto.SecretKey
 
-abstract class ConnectionEvent : Event {
-    class Connect(
-        val host: String,
-        val port: Int,
-        val listener: PacketListener,
-        val intent: ConnectionIntent,
-    ) : ConnectionEvent()
+/**
+ * Sealed class representing connection events.
+ */
+sealed class ConnectionEvent : Event {
+    /**
+     * Sealed class representing various stages of connection establishment.
+     */
+    sealed class Connect {
+        /**
+         * Event representing a pre-connection attempt.
+         * @property address The address of the connection attempt.
+         * @property port The port of the connection attempt.
+         * @property listener The packet listener associated with the connection.
+         * @property intent The connection intent.
+         */
+        class Pre(
+            val address: String,
+            val port: Int,
+            val listener: PacketListener,
+            val intent: ConnectionIntent,
+        ) : ConnectionEvent()
 
+        /**
+         * Event representing a handshake during connection.
+         * @property protocolVersion The protocol version of the connection.
+         * @property address The address of the connection attempt.
+         * @property port The port of the connection attempt.
+         * @property intent The connection intent.
+         */
+        class Handshake(
+            val protocolVersion: Int,
+            val address: String,
+            val port: Int,
+            val intent: ConnectionIntent,
+        ) : ConnectionEvent()
+
+        /**
+         * Sealed class representing login-related connection events.
+         */
+        sealed class Login : ConnectionEvent() {
+            /**
+             * Event representing a hello message during login.
+             * @property name The name associated with the login.
+             * @property uuid The UUID associated with the login.
+             */
+            class Hello(
+                val name: String,
+                val uuid: UUID,
+            ) : ConnectionEvent()
+
+            /**
+             * Event representing the exchange of cryptographic keys during login.
+             * @property secretKey The secret key exchanged during login.
+             * @property publicKey The public key exchanged during login.
+             * @property nonce The nonce associated with the login.
+             *
+             * The secret key MUST ABSOLUTELY be, if stored, destroyed after use to avoid security vulnerabilities.
+             * This can be done by calling the `destroy()` method on the secret key object.
+             * We are NOT responsible for any incidents that may occur due to improper handling of cryptographic keys.
+             */
+            class Key(
+                val secretKey: SecretKey,
+                val publicKey: PublicKey,
+                val nonce: ByteArray,
+            ) : ConnectionEvent()
+        }
+
+        /**
+         * Event representing post-connection actions.
+         * @property profile The game profile associated with the connection.
+         */
+        class Post(
+            val profile: GameProfile,
+        ) : ConnectionEvent()
+    }
+
+    /**
+     * Event representing a disconnection.
+     * @property reason The reason for disconnection.
+     */
     class Disconnect(val reason: Text) : ConnectionEvent()
 }

common/src/main/kotlin/com/lambda/http/Extensions.kt

@@ -0,0 +1,34 @@
+package com.lambda.http
+
+import com.lambda.Lambda
+import java.net.URLEncoder
+
+/**
+ * Extension property to convert a map to a URL query string.
+ */
+val Map<String, Any>.query: String
+    get() = map { (key, value) -> "$key=${value.urlEncoded}" }.joinToString("&")
+
+/**
+ * Extension property to URL encode a string.
+ */
+val Any.urlEncoded: String get() = URLEncoder.encode(toString(), "UTF-8")
+
+/**
+ * Extension function to convert a map to a JSON string.
+ */
+fun Map<String, Any>.toJson(): String = Lambda.gson.toJson(this)
+
+/**
+ * Try-catch block wrapped with a default value.
+ */
+fun <T> tryOrDefault(default: T, block: () -> T): T = try {
+    block()
+} catch (e: Exception) {
+    default
+}
+
+/**
+ * Try-catch block wrapped with null
+ */
+fun <T> tryOrNull(block: () -> T): T? = tryOrDefault(null, block)

common/src/main/kotlin/com/lambda/http/Method.kt

@@ -0,0 +1,15 @@
+package com.lambda.http
+
+/**
+ * Enum representing HTTP methods.
+ */
+enum class Method {
+    GET,
+    HEAD,
+    POST,
+    PUT,
+    DELETE,
+    OPTIONS,
+    TRACE,
+    PATCH;
+}