various fixes for the rpc

Author: emyfops

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

@@ -19,18 +19,28 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ConnectionEvent;
-import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.encryption.NetworkEncryptionException;
+import net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 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;
+import java.security.PublicKey;
 
-@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));
+@Mixin(LoginHelloS2CPacket.class)
+public abstract class LoginHelloC2SPacketMixin {
+    @Shadow @Final private String serverId;
+
+    @Shadow @Final private byte[] nonce;
+
+    @Shadow public abstract PublicKey getPublicKey() throws NetworkEncryptionException;
+
+    @Inject(method = "<init>(Lnet/minecraft/network/PacketByteBuf;)V", at = @At("TAIL"))
+    private void onLoginHelloC2SPacket(PacketByteBuf buf, CallbackInfo ci) throws NetworkEncryptionException {
+        EventFlow.post(new ConnectionEvent.Connect.Login.EncryptionRequest(serverId, getPublicKey(), nonce));
     }
 }

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

@@ -32,8 +32,6 @@
 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));
+        EventFlow.post(new ConnectionEvent.Connect.Login.EncryptionResponse(secretKey, publicKey, nonce));
     }
 }

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

@@ -38,11 +38,5 @@ object RpcCommand : LambdaCommand(
                 }
             }
         }
-
-        required(literal("accept")) {
-            execute {
-                DiscordRPC.join()
-            }
-        }
     }
 }

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

@@ -25,7 +25,6 @@ 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
 
 /**
@@ -69,26 +68,28 @@ sealed class ConnectionEvent : Event {
          */
         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.
+             * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=19208#Encryption_Request">Encryption Request</a>
              */
-            class Hello(
-                val name: String,
-                val uuid: UUID,
+            class EncryptionRequest(
+                val serverId: String,
+                val publicKey: PublicKey,
+                val nonce: ByteArray,
             ) : 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.
+             * Event representing the exchange of cryptographic keys during login
+             * from the client to the server
+             *
+             * Note that this event won't be posted if the server is in offline mode
+             * because the player doesn't fetch the server's public key
+             *
+             * The secret key must be destroyed if stored for long periods
+             * 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
              *
-             * 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.
+             * @see <a href="https://wiki.vg/index.php?title=Protocol&oldid=19208#Encryption_Response">Encryption Response</a>
              */
-            class Key(
+            class EncryptionResponse(
                 val secretKey: SecretKey,
                 val publicKey: PublicKey,
                 val nonce: ByteArray,
@@ -105,7 +106,6 @@ sealed class ConnectionEvent : Event {
     }
 
     /**
-     * Event representing a disconnection.
      * @property reason The reason for disconnection.
      */
     class Disconnect(val reason: Text) : ConnectionEvent()

common/src/main/kotlin/com/lambda/http/api/rpc/v1/endpoints/UpdateParty.kt

@@ -33,16 +33,13 @@ fun editParty(
     // Whether the party is public or not.
     // If false can only be joined by invite.
     // example: true
-    public: Boolean = true,
+    // public: Boolean = true,
 ) =
     request("$endpoint/api/$version/party/edit") {
         method(Method.PATCH)
 
         parameters(
-            mapOf(
-                "max_players" to maxPlayers,
-                "public" to public,
-            )
+            mapOf("max_players" to maxPlayers)
         )
 
         headers(

common/src/main/kotlin/com/lambda/http/api/rpc/v1/models/Party.kt

@@ -18,12 +18,13 @@
 package com.lambda.http.api.rpc.v1.models
 
 import com.google.gson.annotations.SerializedName
+import java.util.UUID
 
 data class Party(
     // The ID of the party.
     // It is a random string of 30 characters.
     @SerializedName("id")
-    val id: String,
+    val id: UUID,
 
     // The join secret of the party.
     // It is a random string of 100 characters.

common/src/main/kotlin/com/lambda/http/api/rpc/v1/models/Player.kt

@@ -18,6 +18,7 @@
 package com.lambda.http.api.rpc.v1.models
 
 import com.google.gson.annotations.SerializedName
+import java.util.UUID
 
 data class Player(
     // The player's name.
@@ -27,11 +28,15 @@ data class Player(
 
     // The player's UUID.
     // example: 069a79f4-44e9-4726-a5be-fca90e38aaf5
-    @SerializedName("uuid")
-    val uuid: String,
+    @SerializedName("id")
+    val uuid: UUID,
 
     // The player's Discord ID.
     // example: "385441179069579265"
     @SerializedName("discord_id")
     val discordId: String,
+
+    // Whether the player is verified or not
+    @SerializedName("unsafe")
+    val unsafe: Boolean,
 )

common/src/main/kotlin/com/lambda/http/api/rpc/v1/models/Settings.kt

@@ -28,6 +28,6 @@ data class Settings(
     // Whether the party is public or not.
     // If false can only be joined by invite.
     // example: true
-    @SerializedName("public")
-    val public: Boolean,
+    // @SerializedName("public")
+    // val public: Boolean,
 )