Add missing functions from Packet additions

Author: GRAnimated

data/mcswitch_functions.csv

@@ -22,7 +22,7 @@ ClientboundAddGlobalEntityPacket::ClientboundAddGlobalEntityPacket(std::shared_p
     x = Mth::floor(entity->mX * 32.0);
     y = Mth::floor(entity->mY * 32.0);
     z = Mth::floor(entity->mZ * 32.0);
-    type = (entity->GetType() == 0xB000001);
+    type = (entity->isType(eLightningBolt));
 }
 
 int ClientboundAddGlobalEntityPacket::getEstimatedSize() {

src/Minecraft.Network/protocol/game/ClientboundAddGlobalEntityPacket.cpp

@@ -16,8 +16,8 @@ ClientboundContainerAckPacket::ClientboundContainerAckPacket() {
 
 ClientboundContainerAckPacket::ClientboundContainerAckPacket(int containerId, short uid, bool accepted) {
     mContainerId = containerId;
-    mAccepted = accepted;
     mUid = uid;
+    mAccepted = accepted;
 }
 
 int ClientboundContainerAckPacket::getEstimatedSize() {

src/Minecraft.Network/protocol/game/ClientboundContainerAckPacket.cpp

@@ -8,9 +8,10 @@ std::shared_ptr<Packet> ClientboundEntityEventPacket::create() {
     return std::shared_ptr<Packet>(new ClientboundEntityEventPacket());
 }
 
-ClientboundEntityEventPacket::ClientboundEntityEventPacket(std::shared_ptr<Entity> entity, unsigned char eventId, int data) {
-    mEventId = eventId;
+ClientboundEntityEventPacket::ClientboundEntityEventPacket(std::shared_ptr<Entity> entity,
+                                                           unsigned char eventId, int data) {
     mEntityId = entity->getId();
+    mEventId = eventId;
     mData = data;
 }
 

src/Minecraft.Network/protocol/game/ClientboundEntityEventPacket.cpp

@@ -11,9 +11,10 @@ std::shared_ptr<Packet> ClientboundRotateHeadPacket::create() {
 
 ClientboundRotateHeadPacket::ClientboundRotateHeadPacket() {}
 
-ClientboundRotateHeadPacket::ClientboundRotateHeadPacket(std::shared_ptr<Entity> entity, unsigned char yHeadRot) {
-    mYHeadRot = yHeadRot;
+ClientboundRotateHeadPacket::ClientboundRotateHeadPacket(std::shared_ptr<Entity> entity,
+                                                         unsigned char yHeadRot) {
     entityId = entity->getId();
+    mYHeadRot = yHeadRot;
 }
 
 int ClientboundRotateHeadPacket::getEstimatedSize() {

src/Minecraft.Network/protocol/game/ClientboundRotateHeadPacket.cpp

@@ -12,9 +12,9 @@ DebugOptionsPacket::DebugOptionsPacket() {
     dword18 = 0;
 }
 
-DebugOptionsPacket::DebugOptionsPacket(unsigned int unk1) {
-    dword18 = unk1;
-}
+// DebugOptionsPacket::DebugOptionsPacket(unsigned int unk1) {
+//     dword18 = unk1;
+// }
 
 int DebugOptionsPacket::getEstimatedSize() {
     return 4;

src/Minecraft.Network/protocol/game/DebugOptionsPacket.cpp

@@ -2,13 +2,12 @@
 
 #include "Minecraft.Network/protocol/Packet.h"
 
-class DebugOptionsPacket : public Packet,
-                                       public std::enable_shared_from_this<DebugOptionsPacket> {
+class DebugOptionsPacket : public Packet, public std::enable_shared_from_this<DebugOptionsPacket> {
 public:
     static std::shared_ptr<Packet> create();
 
     DebugOptionsPacket();
-    DebugOptionsPacket(unsigned int unk1);
+    // DebugOptionsPacket(unsigned int unk1); // unused in switch edition
     int getEstimatedSize() override;
     EPacketType getPacketId() override;
     void read(DataInputStream* input) override;

src/Minecraft.Network/protocol/game/DebugOptionsPacket.h

@@ -12,12 +12,8 @@ ServerboundContainerAckPacket::ServerboundContainerAckPacket() {}
 
 ServerboundContainerAckPacket::ServerboundContainerAckPacket(int containerId, short uid, bool accepted) {
     mContainerId = containerId;
-    mAccepted = accepted;
     mUid = uid;
-}
-
-int ServerboundContainerAckPacket::getEstimatedSize() {
-    return 4;
+    mAccepted = accepted;
 }
 
 EPacketType ServerboundContainerAckPacket::getPacketId() {

src/Minecraft.Network/protocol/game/ServerboundContainerAckPacket.cpp

@@ -4,13 +4,12 @@
 #include "Minecraft.Network/protocol/Packet.h"
 
 class ServerboundContainerAckPacket : public Packet,
-                                       public std::enable_shared_from_this<ServerboundContainerAckPacket> {
+                                      public std::enable_shared_from_this<ServerboundContainerAckPacket> {
 public:
     static std::shared_ptr<Packet> create();
 
     ServerboundContainerAckPacket();
     ServerboundContainerAckPacket(int containerId, short uid, bool accepted);
-    int getEstimatedSize() override;
     EPacketType getPacketId() override;
     void read(DataInputStream* input) override;
     void write(DataOutputStream* output) override;

src/Minecraft.Network/protocol/game/ServerboundContainerAckPacket.h

@@ -17,20 +17,25 @@ ServerboundInteractPacket::ServerboundInteractPacket() {
 
 ServerboundInteractPacket::ServerboundInteractPacket(std::shared_ptr<Entity> target) {
     mTarget = target->getId();
-    mAction = eAction::Interact;
+    mAction = eAction::Attack;
+    mHand = InteractionHand::MAIN_HAND;
+    mLocation = 0;
 }
 
-ServerboundInteractPacket::ServerboundInteractPacket(std::shared_ptr<Entity> target, InteractionHand::EInteractionHand hand) {
+ServerboundInteractPacket::ServerboundInteractPacket(std::shared_ptr<Entity> target,
+                                                     InteractionHand::EInteractionHand hand) {
     mTarget = target->getId();
     mAction = eAction::Interact;
     mHand = hand;
+    mLocation = 0;
 }
 
-ServerboundInteractPacket::ServerboundInteractPacket(std::shared_ptr<Entity> target, InteractionHand::EInteractionHand hand, Vec3* location) {
+ServerboundInteractPacket::ServerboundInteractPacket(std::shared_ptr<Entity> target,
+                                                     InteractionHand::EInteractionHand hand, Vec3* location) {
     mTarget = target->getId();
     mAction = eAction::InteractAt;
     mHand = hand;
-    mLocation = location;
+    mLocation = Vec3::newPermanent(location->x, location->y, location->z);
 }
 
 int ServerboundInteractPacket::getEstimatedSize() {
@@ -85,5 +90,5 @@ InteractionHand::EInteractionHand ServerboundInteractPacket::getHand() {
 }
 
 Vec3* ServerboundInteractPacket::getLocation() {
-    return mLocation;
+    return Vec3::newTemp(mLocation);
 }