feat: refine handshake process

Author: RedVortexDev

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

@@ -5,7 +5,7 @@
 import com.mcdiamondfire.proto.messages.clientbound.plot.*;
 import com.mcdiamondfire.proto.messages.clientbound.server.*;
 import com.mcdiamondfire.proto.messages.serverbound.player.*;
-import com.mcdiamondfire.proto.messages.serverbound.server.C2SModAPIConnect;
+import com.mcdiamondfire.proto.messages.serverbound.server.C2SHandshakeRequest;
 
 import java.util.*;
 
@@ -22,8 +22,8 @@ public final class ModAPIMessages {
 		// Client-bound.
 
 		// Server.
-		registerMessage(S2CServerInfo.class, "s2c_server_info");
-		registerMessage(S2CConnectionResult.class, "s2c_connection_result");
+		registerMessage(S2CHello.class, "s2c_hlelo");
+		registerMessage(S2CHandshakeResponse.class, "s2c_handshake_response");
 		registerMessage(S2CServerBooster.class, "s2c_server_booster");
 
 		// Plot.
@@ -42,13 +42,15 @@ public final class ModAPIMessages {
 
 		// Server-bound.
 
+		// Server.
+		registerMessage(C2SHandshakeRequest.class, "mc2s_handshake_request");
+		
 		// Plot.
 		registerMessage(C2SCodeOperation.class, "c2s_code_operation");
 		registerMessage(C2SMultiCodeOperations.class, "c2s_multi_code_operations");
 
 		// Player.
 		registerMessage(C2SPlayerTeleport.class, "c2s_player_teleport");
-		registerMessage(C2SModAPIConnect.class, "mc2s_modapi_connect");
 
 	}
 

src/main/proto/clientbound_server.proto

@@ -3,8 +3,13 @@ syntax = "proto3";
 option java_package = "com.mcdiamondfire.proto.messages.clientbound.server";
 option java_multiple_files = true;
 
-// Sent when the player joins the server, the server is ready to accept a S2CModAPIConnect message.
-message S2CServerInfo {
+// Sent by the server when the player connects to it, respond with C2SHandshakeRequest.
+message S2CHello {
+
+}
+
+// Represents information about the server.
+message ServerInfo {
 	// Represents a server type.
 	enum DFServerType {
 		MAIN = 0; // Main nodes.
@@ -22,14 +27,18 @@ message S2CServerInfo {
 	DFServerType server_type = 4; // The type of the server.
 }
 
-// Sent as a response to a C2SModAPIConnect message.
-message S2CConnectionResult {
+// Sent as a response to a C2SHandshakeRequest message.
+message S2CHandshakeResponse {
 	enum Error {
 		NONE = 0; // No error, the connection was successful.
 		INVALID_PROTOCOL = 1; // The given protocol version is invalid.
 		INCOMPATIBLE_PROTOCOL = 2; // The given protocol version is incompatible with the server.
+		ALREADY_CONNECTED = 3; // The player is already connected.
+	}
+	oneof result {
+		Error error = 1; // The error that occurred, if any.
+		ServerInfo server_info = 2; // The server info, if the connection was successful.
 	}
-	optional Error error = 1; // The error, if any.
 }
 
 // Sent when the player joins the server.

src/main/proto/serverbound_server.proto

@@ -7,6 +7,6 @@ option java_multiple_files = true;
 // Notifies the server you are interested in receiving ModAPI messages.
 // This must be sent before any ModAPI messages are sent by the client.
 // A S2CConnectionResult message will be sent in response.
-message C2SModAPIConnect {
+message C2SHandshakeRequest {
   string protocol_version = 1; // The version of the protocol the client is using.
 }