more packet work :(

CMakeLists.txt

@@ -80,6 +80,7 @@ add_executable(bds_btb
     src/lua/scripting.cpp
     src/logger/logger.cpp
     src/event/event.cpp
+    src/minecraft/network/protocol.cpp
     ${base64_SOURCE_DIR}/base64.cpp
 )
 

src/main.cpp

@@ -1,8 +1,6 @@
 #include "pch.h"
 #include "event/types/ServerUpdate.h"
 
-using namespace RakNet;
-
 struct ResponsePacket1 {
     int64_t pingId;
     int64_t serverId;
@@ -40,38 +38,7 @@ int main() {
         while (true) {
             EventManager::registerListener(ServerUpdateType, onServerUpdate);
 
-            Packet* packet;
-            while ((packet = peer->Receive())) {
-
-                Logger::Info("Received packet with ID: " + std::to_string(packet->data[0]));
-
-                std::string hexData;
-                for (size_t i = 0; i < packet->length; ++i) {
-                    hexData += " " + to_hex_string(packet->data[i]);
-                }
-                Logger::Info("Packet Data (Hex):" + hexData);
-
-                std::string u8Data(reinterpret_cast<const char*>(packet->data), packet->length);
-                Logger::Info("Packet Data (u8string): " + std::string(u8Data.begin(), u8Data.end()));
-
-                std::string charData(reinterpret_cast<const char*>(packet->data), packet->length);
-                Logger::Info("Packet Data (char): " + charData);
-
-                if (packet->data[0] == 1) {
-                    Logger::Info("Ping received, sending empty packet back.");
-
-                    ResponsePacket1 responsePacket;
-                    responsePacket.pingId = 0x00000000003c6d0d;
-                    responsePacket.serverId = 0x00000000372cdc9e;
-                    responsePacket.identifier = "MCPE;Steve;2 7;1.1.3;0;20";
-
-                    BitStream bs;
-                    bs.Write(reinterpret_cast<const char*>(&responsePacket), sizeof(responsePacket));
-                    peer->Send(&bs, HIGH_PRIORITY, RELIABLE_ORDERED, 0, packet->systemAddress, false);
-                }
-
-                peer->DeallocatePacket(packet);
-            }
+            ProtocolManager::Init(peer);
 
 
             ServerUpdate event;

src/minecraft/network/packets/PingPacket.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <RakPeerInterface.h>
+#include <RakNetTypes.h>
+#include <MessageIdentifiers.h>
+#include <BitStream.h>
+
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <nlohmann/json.hpp>
+#include <base64.h>
+
+using json = nlohmann::json;
+using namespace RakNet;
+
+struct PingPacket : Packet {
+    uint8_t packetType;
+    int64_t clientTimestamp;
+};

src/minecraft/network/protocol.cpp

@@ -0,0 +1,30 @@
+#include "protocol.h"
+
+void ProtocolManager::Init(RakPeerInterface* peer) {
+	Packet* packet;
+	while ((packet = peer->Receive())) {
+		int packetType = packet->data[0];
+
+		Logger::Info("Received packet with ID: " + std::to_string(packetType));
+
+		switch (packetType) {
+		case 0:
+			ProtocolManager::PingPacketCallback(peer, packet);
+		case 1:
+			ProtocolManager::PingPacketCallback(peer, packet);
+		}
+
+		peer->DeallocatePacket(packet);
+	}
+};
+
+void ProtocolManager::PingPacketCallback(RakPeerInterface* peer, Packet* packet) {
+	PingPacket* pingPacket = reinterpret_cast<PingPacket*>(packet);
+
+	PingPacket pongPacket;
+	pongPacket.packetType = 1;
+	pongPacket.clientTimestamp = pingPacket->clientTimestamp;
+
+	peer->Send(reinterpret_cast<const char*>(&pongPacket), sizeof(PingPacket), HIGH_PRIORITY, RELIABLE_ORDERED, 0, packet->systemAddress, false);
+	Logger::Info("send a pong");
+};

src/minecraft/network/protocol.h

@@ -1,4 +1,16 @@
 #pragma once
 
-#include "packets/LoginPacket.h"
-#include "packets/PlayStatusPacket.h"
+#include <RakPeerInterface.h>
+#include <RakNetTypes.h>
+#include <MessageIdentifiers.h>
+#include <BitStream.h>
+
+#include "packets/PingPacket.h"
+
+using namespace RakNet;
+
+class ProtocolManager {
+public:
+	static void Init(RakPeerInterface* peer);
+	static void PingPacketCallback(RakPeerInterface* peer, Packet* packet);
+};