Merge pull request LiteLDev#59 from LiteLDev/dev

Update Packet.cpp
LiteLDev · Oct 2, 2021 · ee8c5b0 · ee8c5b0
2 parents 9245a01 + c9ddabb
commit ee8c5b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/LiteLoader/api/Packet.cpp b/LiteLoader/api/Packet.cpp
@@ -5,7 +5,7 @@
 #include <mc/Player.h>
 
 namespace packetapi {
-LIAPI void sendMessage(ServerPlayer* sp, TextType tp, std::string text) {
+LIAPI MyPkt<MinecraftPacketIds(0x09)> CreateTextPacket(TextType tp, std::string text) {
     WBStream txtpkws;
     txtpkws.data.reserve(8 + text.size());
     txtpkws.apply((char)tp, (char)0);
@@ -28,6 +28,13 @@ LIAPI void sendMessage(ServerPlayer* sp, TextType tp, std::string text) {
     }
     txtpkws.apply("", "");
     MyPkt<MinecraftPacketIds(0x09)> pk{txtpkws};
-    sp->sendNetworkPacket(pk);
+    return pk;
+}
+
+LIAPI MyPkt<MinecraftPacketIds(0x55), false> CreateTransferPacket(std::string address, int port) {
+    WBStream ws;
+    ws.apply(MCString(address), (unsigned short)port);
+    MyPkt<MinecraftPacketIds(0x55), false> pk(ws);
+    return pk;
 }
 } // namespace packetapi
diff --git a/LiteLoader/api/WPlayer.cpp b/LiteLoader/api/WPlayer.cpp
@@ -10,7 +10,7 @@
 #include <api/packetApi.h>
 
 LIAPI void WPlayer::sendText(string text, TextType tp) {
-    packetapi::sendMessage(v, tp, text);
+    v->sendNetworkPacket(packetapi::CreateTextPacket(tp, text));
 }
 static MSearcherEx<NetworkIdentifier> MS_NI;
 static MSearcherEx<Certificate*>      MS_PC;

diff --git a/headers/api/packetApi.h b/headers/api/packetApi.h
@@ -4,5 +4,6 @@
 #include <mc/Player.h>
 
 namespace packetapi {
-LIAPI void sendMessage(ServerPlayer* sp, TextType tp, std::string text);
+LIAPI MyPkt<MinecraftPacketIds(0x09)> CreateTextPacket(TextType tp, std::string text);
+LIAPI MyPkt<MinecraftPacketIds(0x55), false> CreateTransferPacket(std::string address, int port);
 }