feat: server-bound packets

Author: RedVortexDev

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

@@ -1,13 +1,15 @@
 package com.mcdiamondfire.proto;
 
 import com.google.protobuf.Message;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Represents a deserialized ModAPI message.
  *
- * @param id      the unique identifier of the ModAPI message type
- * @param message the deserialized Protocol Message instance
+ * @param id        the unique identifier of the ModAPI message type
+ * @param message   the deserialized Protocol Message instance
+ * @param requestId the ID of the original request message, or null if not applicable
  */
-public record ModAPIMessage(String id, Message message) {
-
+public record ModAPIMessage(String id, Message message, @Nullable Integer requestId) {
+	
 }

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

@@ -2,8 +2,9 @@
 
 import com.google.protobuf.Message;
 import com.mcdiamondfire.proto.messages.clientbound.player.*;
-import com.mcdiamondfire.proto.messages.clientbound.plot.S2CPlotInfo;
+import com.mcdiamondfire.proto.messages.clientbound.plot.*;
 import com.mcdiamondfire.proto.messages.clientbound.server.*;
+import com.mcdiamondfire.proto.messages.serverbound.player.*;
 
 import java.util.*;
 
@@ -16,17 +17,31 @@ public final class ModAPIMessages {
 	private static final Map<String, Class<? extends Message>> ID_CLASS_MAP = new HashMap<>();
 
 	static {
+		
+		// Client-bound.
+		
 		// Server.
 		registerMessage(S2CServerInfo.class, "server_info");
 		registerMessage(S2CServerBooster.class, "server_booster");
 
 		// Plot.
 		registerMessage(S2CPlotInfo.class, "plot_info");
+		registerMessage(S2CTemplate.class, "template");
 
 		// Player.
 		registerMessage(S2CPlayerCurrency.class, "player_currency");
 		registerMessage(S2CPlayerPermissions.class, "player_permissions");
 		registerMessage(S2CPlayerSwitchMode.class, "player_switch_mode");
+		
+		// Server-bound.
+		
+		// Plot.
+		registerMessage(C2SGetTemplate.class, "get_template");
+		
+		// Player.
+		registerMessage(C2SPlayerTeleport.class, "player_teleport");
+		
+		
 	}
 
 	private ModAPIMessages() {

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

@@ -3,13 +3,15 @@
 import com.google.gson.*;
 import com.google.protobuf.*;
 import com.google.protobuf.util.JsonFormat;
+import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Optional;
 
 /**
  * Utility class for serializing ModAPI messages to JSON format.
  */
+@SuppressWarnings("unused")
 public final class ModAPIUtility {
 
 	private static final JsonFormat.Parser JSON_PARSER = JsonFormat.parser().ignoringUnknownFields();
@@ -27,13 +29,29 @@ private ModAPIUtility() {
 	 * @throws InvalidProtocolBufferException if serialization fails
 	 */
 	public static String serializeMessage(final Message message) throws InvalidProtocolBufferException {
-		final String json = JsonFormat.printer().print(message);
-		final JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
-		final Optional<String> messageId = ModAPIMessages.getMessageId(message.getClass());
-		if (messageId.isEmpty()) {
-			throw new IllegalArgumentException("Message class not registered: " + message.getClass().getName());
+		return serializeMessage(message, null);
+	}
+	
+	/**
+	 * Serializes a Protocol Message to a JSON string,
+	 * including the packet ID and a request ID to correlate requests and responses.
+	 *
+	 * @param message   the Protocol Message to serialize
+	 * @param requestId the request ID to include in the serialized message
+	 * @return the serialized JSON string with its packet ID and request ID included
+	 * @throws InvalidProtocolBufferException if serialization fails
+	 */
+	public static String serializeMessage(final Message message, final @Nullable Integer requestId) throws InvalidProtocolBufferException {
+		final JsonObject jsonObject = JsonParser.parseString(JsonFormat.printer().print(message)).getAsJsonObject();
+		
+		final String messageId = ModAPIMessages.getMessageId(message.getClass())
+				.orElseThrow(() -> new IllegalArgumentException("Message class not registered: " + message.getClass().getName()));
+		
+		jsonObject.add("packet_id", new JsonPrimitive(messageId));
+		if (requestId != null) {
+			jsonObject.add("request_id", new JsonPrimitive(requestId));
 		}
-		jsonObject.add("packet_id", new JsonPrimitive(messageId.get()));
+		
 		return jsonObject.toString();
 	}
 
@@ -51,16 +69,16 @@ public static String serializeMessage(final Message message) throws InvalidProto
 	public static ModAPIMessage deserializeMessage(final String json) throws InvalidProtocolBufferException {
 		try {
 			final JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
-			final String packetId = jsonObject.remove("packet_id").getAsString();
-			final String cleanedJson = jsonObject.toString();
+			final String packetId = jsonObject.get("packet_id").getAsString();
+			final Integer requestId = jsonObject.has("request_id") ? jsonObject.get("request_id").getAsInt() : null;
 
 			final Optional<Class<? extends Message>> clazz = ModAPIMessages.getMessageClass(packetId);
 			if (clazz.isEmpty()) {
 				throw new IllegalStateException("No message class registered for packet ID: " + packetId);
 			}
 			final Message.Builder builder = (Message.Builder) clazz.get().getMethod("newBuilder").invoke(null);
-			JSON_PARSER.merge(cleanedJson, builder);
-			return new ModAPIMessage(packetId, builder.build());
+			JSON_PARSER.merge(json, builder);
+			return new ModAPIMessage(packetId, builder.build(), requestId);
 		} catch (final NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
 			throw new RuntimeException("Failed to deserialize message.", e);
 		}