feat: refine handshake process again

Author: RedVortexDev

src/main/java/com/mcdiamondfire/proto/ModAPIMessages.java

@@ -22,7 +22,7 @@ public final class ModAPIMessages {
 		// Client-bound.
 
 		// Server.
-		registerMessage(S2CHello.class, "s2c_hlelo");
+		registerMessage(S2CHello.class, "s2c_hello");
 		registerMessage(S2CHandshakeResponse.class, "s2c_handshake_response");
 		registerMessage(S2CServerBooster.class, "s2c_server_booster");
 
@@ -35,8 +35,6 @@ public final class ModAPIMessages {
 		registerMessage(S2CPlotProfiling.class, "s2c_plot_profiling");
 
 		// Player.
-		registerMessage(S2CPlayerCurrency.class, "s2c_player_currency");
-		registerMessage(S2CPlayerPermissions.class, "s2c_player_permissions");
 		registerMessage(S2CPlayerSwitchMode.class, "s2c_player_switch_mode");
 		registerMessage(S2CChestReference.class, "s2c_chest_reference");
 

src/main/proto/clientbound_player.proto

@@ -4,8 +4,14 @@ import "data_type.proto";
 option java_package = "com.mcdiamondfire.proto.messages.clientbound.player";
 option java_multiple_files = true;
 
-// Sent when the player joins the server.
-message S2CPlayerCurrency {
+// Represents general information about the player.
+message PlayerInfo {
+	PlayerCurrency currency = 1; // The player's currency information.
+	PlayerPermissions permissions = 2; // The player's permissions.
+}
+
+// Represents the player's currency information.
+message PlayerCurrency {
 	// Represents an unclaimed ticket bundle.
 	message TicketBundle {
 		string event_name = 1; // The name of the event the bundle is from.
@@ -19,8 +25,8 @@ message S2CPlayerCurrency {
 	int32 sparks = 4; // The amount of sparks the player has.
 }
 
-// Sent when the player joins the server, admins will have all permissions set to their highest level.
-message S2CPlayerPermissions {
+// Represents the player's permissions, admins will have all permissions set to their highest level.
+message PlayerPermissions {
 	int32 donor = 1; // The donor rank level of the player. (Noble, Emperor, Mythic, Overlord)
 	int32 vip = 2; // The VIP rank level of the player. (VIP)
 	int32 qa = 3; // The QA rank level of the player. (QA)

src/main/proto/clientbound_server.proto

@@ -1,4 +1,5 @@
 syntax = "proto3";
+import "clientbound_player.proto";
 
 option java_package = "com.mcdiamondfire.proto.messages.clientbound.server";
 option java_multiple_files = true;
@@ -35,9 +36,13 @@ message S2CHandshakeResponse {
 		INCOMPATIBLE_PROTOCOL = 2; // The given protocol version is incompatible with the server.
 		ALREADY_CONNECTED = 3; // The player is already connected.
 	}
+	message Success {
+		ServerInfo server_info = 1; // The server info.
+		PlayerInfo player_info = 2; // The player's info.
+	}
 	oneof result {
 		Error error = 1; // The error that occurred, if any.
-		ServerInfo server_info = 2; // The server info, if the connection was successful.
+		Success success = 2; // The server and player info, if the connection was successful.
 	}
 }