mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-25 07:15:10 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -7,135 +7,134 @@
|
||||
#include "PacketListener.h"
|
||||
#include "AddPlayerPacket.h"
|
||||
|
||||
|
||||
|
||||
AddPlayerPacket::AddPlayerPacket()
|
||||
{
|
||||
id = -1;
|
||||
name = L"";
|
||||
x = 0;
|
||||
y = 0;
|
||||
z = 0;
|
||||
yRot = 0;
|
||||
xRot = 0;
|
||||
carriedItem = 0;
|
||||
xuid = INVALID_XUID;
|
||||
m_playerIndex = 0;
|
||||
m_skinId = 0;
|
||||
m_capeId = 0;
|
||||
m_uiGamePrivileges = 0;
|
||||
entityData = nullptr;
|
||||
unpack = NULL;
|
||||
AddPlayerPacket::AddPlayerPacket() {
|
||||
id = -1;
|
||||
name = L"";
|
||||
x = 0;
|
||||
y = 0;
|
||||
z = 0;
|
||||
yRot = 0;
|
||||
xRot = 0;
|
||||
carriedItem = 0;
|
||||
xuid = INVALID_XUID;
|
||||
m_playerIndex = 0;
|
||||
m_skinId = 0;
|
||||
m_capeId = 0;
|
||||
m_uiGamePrivileges = 0;
|
||||
entityData = nullptr;
|
||||
unpack = NULL;
|
||||
}
|
||||
|
||||
AddPlayerPacket::~AddPlayerPacket()
|
||||
{
|
||||
if(unpack != NULL) delete unpack;
|
||||
AddPlayerPacket::~AddPlayerPacket() {
|
||||
if (unpack != NULL) delete unpack;
|
||||
}
|
||||
|
||||
AddPlayerPacket::AddPlayerPacket(std::shared_ptr<Player> player, PlayerUID xuid, PlayerUID OnlineXuid,int xp, int yp, int zp, int yRotp, int xRotp, int yHeadRotp)
|
||||
{
|
||||
id = player->entityId;
|
||||
name = player->name;
|
||||
AddPlayerPacket::AddPlayerPacket(std::shared_ptr<Player> player, PlayerUID xuid,
|
||||
PlayerUID OnlineXuid, int xp, int yp, int zp,
|
||||
int yRotp, int xRotp, int yHeadRotp) {
|
||||
id = player->entityId;
|
||||
name = player->name;
|
||||
|
||||
// 4J Stu - Send "previously sent" value of position as well so that we stay in sync
|
||||
x = xp;//Mth::floor(player->x * 32);
|
||||
y = yp;//Mth::floor(player->y * 32);
|
||||
z = zp;//Mth::floor(player->z * 32);
|
||||
// 4J - changed - send current "previously sent" value of rotations to put this in sync with other clients
|
||||
yRot = yRotp;
|
||||
xRot = xRotp;
|
||||
yHeadRot = static_cast<std::uint8_t>(yHeadRotp); // 4J Added
|
||||
// yRot = (std::uint8_t) (player->yRot * 256 / 360);
|
||||
// xRot = (std::uint8_t) (player->xRot * 256 / 360);
|
||||
// 4J Stu - Send "previously sent" value of position as well so that we stay
|
||||
// in sync
|
||||
x = xp; // Mth::floor(player->x * 32);
|
||||
y = yp; // Mth::floor(player->y * 32);
|
||||
z = zp; // Mth::floor(player->z * 32);
|
||||
// 4J - changed - send current "previously sent" value of rotations to put
|
||||
// this in sync with other clients
|
||||
yRot = yRotp;
|
||||
xRot = xRotp;
|
||||
yHeadRot = static_cast<std::uint8_t>(yHeadRotp); // 4J Added
|
||||
// yRot = (std::uint8_t) (player->yRot * 256 / 360);
|
||||
// xRot = (std::uint8_t) (player->xRot * 256 / 360);
|
||||
|
||||
//printf("%d: New add player (%f,%f,%f) : (%d,%d,%d) : xRot %d, yRot %d\n",id,player->x,player->y,player->z,x,y,z,xRot,yRot);
|
||||
// printf("%d: New add player (%f,%f,%f) : (%d,%d,%d) : xRot %d, yRot
|
||||
// %d\n",id,player->x,player->y,player->z,x,y,z,xRot,yRot);
|
||||
|
||||
std::shared_ptr<ItemInstance> itemInstance = player->inventory->getSelected();
|
||||
carriedItem = itemInstance == NULL ? 0 : itemInstance->id;
|
||||
std::shared_ptr<ItemInstance> itemInstance =
|
||||
player->inventory->getSelected();
|
||||
carriedItem = itemInstance == NULL ? 0 : itemInstance->id;
|
||||
|
||||
this->xuid = xuid;
|
||||
this->OnlineXuid = OnlineXuid;
|
||||
m_playerIndex = static_cast<std::uint8_t>(player->getPlayerIndex());
|
||||
m_skinId = player->getCustomSkin();
|
||||
m_capeId = player->getCustomCape();
|
||||
m_uiGamePrivileges = player->getAllPlayerGamePrivileges();
|
||||
this->xuid = xuid;
|
||||
this->OnlineXuid = OnlineXuid;
|
||||
m_playerIndex = static_cast<std::uint8_t>(player->getPlayerIndex());
|
||||
m_skinId = player->getCustomSkin();
|
||||
m_capeId = player->getCustomCape();
|
||||
m_uiGamePrivileges = player->getAllPlayerGamePrivileges();
|
||||
|
||||
entityData = player->getEntityData();
|
||||
unpack = NULL;
|
||||
entityData = player->getEntityData();
|
||||
unpack = NULL;
|
||||
}
|
||||
|
||||
void AddPlayerPacket::read(DataInputStream *dis) //throws IOException
|
||||
void AddPlayerPacket::read(DataInputStream* dis) // throws IOException
|
||||
{
|
||||
id = dis->readInt();
|
||||
name = readUtf(dis, Player::MAX_NAME_LENGTH);
|
||||
x = dis->readInt();
|
||||
y = dis->readInt();
|
||||
z = dis->readInt();
|
||||
yRot = static_cast<char>(dis->readByte());
|
||||
xRot = static_cast<char>(dis->readByte());
|
||||
yHeadRot = dis->readByte(); // 4J Added
|
||||
carriedItem = dis->readShort();
|
||||
xuid = dis->readPlayerUID();
|
||||
OnlineXuid = dis->readPlayerUID();
|
||||
m_playerIndex = dis->readByte();
|
||||
m_skinId = static_cast<std::uint32_t>(dis->readInt());
|
||||
m_capeId = static_cast<std::uint32_t>(dis->readInt());
|
||||
INT privileges = dis->readInt();
|
||||
m_uiGamePrivileges = static_cast<unsigned int>(privileges);
|
||||
MemSect(1);
|
||||
unpack = SynchedEntityData::unpack(dis);
|
||||
MemSect(0);
|
||||
id = dis->readInt();
|
||||
name = readUtf(dis, Player::MAX_NAME_LENGTH);
|
||||
x = dis->readInt();
|
||||
y = dis->readInt();
|
||||
z = dis->readInt();
|
||||
yRot = static_cast<char>(dis->readByte());
|
||||
xRot = static_cast<char>(dis->readByte());
|
||||
yHeadRot = dis->readByte(); // 4J Added
|
||||
carriedItem = dis->readShort();
|
||||
xuid = dis->readPlayerUID();
|
||||
OnlineXuid = dis->readPlayerUID();
|
||||
m_playerIndex = dis->readByte();
|
||||
m_skinId = static_cast<std::uint32_t>(dis->readInt());
|
||||
m_capeId = static_cast<std::uint32_t>(dis->readInt());
|
||||
INT privileges = dis->readInt();
|
||||
m_uiGamePrivileges = static_cast<unsigned int>(privileges);
|
||||
MemSect(1);
|
||||
unpack = SynchedEntityData::unpack(dis);
|
||||
MemSect(0);
|
||||
}
|
||||
|
||||
void AddPlayerPacket::write(DataOutputStream *dos) //throws IOException
|
||||
void AddPlayerPacket::write(DataOutputStream* dos) // throws IOException
|
||||
{
|
||||
dos->writeInt(id);
|
||||
writeUtf(name, dos);
|
||||
dos->writeInt(x);
|
||||
dos->writeInt(y);
|
||||
dos->writeInt(z);
|
||||
dos->writeByte(static_cast<std::uint8_t>(yRot));
|
||||
dos->writeByte(static_cast<std::uint8_t>(xRot));
|
||||
dos->writeByte(static_cast<std::uint8_t>(m_playerIndex)); // 4J Added
|
||||
dos->writeShort(carriedItem);
|
||||
dos->writePlayerUID(xuid);
|
||||
dos->writePlayerUID(OnlineXuid);
|
||||
dos->writeByte(static_cast<std::uint8_t>(m_playerIndex)); // 4J Added
|
||||
dos->writeInt(static_cast<int>(m_skinId));
|
||||
dos->writeInt(static_cast<int>(m_capeId));
|
||||
dos->writeInt(m_uiGamePrivileges);
|
||||
entityData->packAll(dos);
|
||||
|
||||
dos->writeInt(id);
|
||||
writeUtf(name, dos);
|
||||
dos->writeInt(x);
|
||||
dos->writeInt(y);
|
||||
dos->writeInt(z);
|
||||
dos->writeByte(static_cast<std::uint8_t>(yRot));
|
||||
dos->writeByte(static_cast<std::uint8_t>(xRot));
|
||||
dos->writeByte(static_cast<std::uint8_t>(m_playerIndex)); // 4J Added
|
||||
dos->writeShort(carriedItem);
|
||||
dos->writePlayerUID(xuid);
|
||||
dos->writePlayerUID(OnlineXuid);
|
||||
dos->writeByte(static_cast<std::uint8_t>(m_playerIndex)); // 4J Added
|
||||
dos->writeInt(static_cast<int>(m_skinId));
|
||||
dos->writeInt(static_cast<int>(m_capeId));
|
||||
dos->writeInt(m_uiGamePrivileges);
|
||||
entityData->packAll(dos);
|
||||
}
|
||||
|
||||
void AddPlayerPacket::handle(PacketListener *listener)
|
||||
{
|
||||
listener->handleAddPlayer(shared_from_this());
|
||||
void AddPlayerPacket::handle(PacketListener* listener) {
|
||||
listener->handleAddPlayer(shared_from_this());
|
||||
}
|
||||
|
||||
int AddPlayerPacket::getEstimatedSize()
|
||||
{
|
||||
int iSize= sizeof(int) + Player::MAX_NAME_LENGTH + sizeof(int) + sizeof(int) + sizeof(int) + sizeof(std::uint8_t) + sizeof(std::uint8_t) +sizeof(short) + sizeof(PlayerUID) + sizeof(PlayerUID) + sizeof(int) + sizeof(std::uint8_t) + sizeof(unsigned int) + sizeof(std::uint8_t);
|
||||
int AddPlayerPacket::getEstimatedSize() {
|
||||
int iSize = sizeof(int) + Player::MAX_NAME_LENGTH + sizeof(int) +
|
||||
sizeof(int) + sizeof(int) + sizeof(std::uint8_t) +
|
||||
sizeof(std::uint8_t) + sizeof(short) + sizeof(PlayerUID) +
|
||||
sizeof(PlayerUID) + sizeof(int) + sizeof(std::uint8_t) +
|
||||
sizeof(unsigned int) + sizeof(std::uint8_t);
|
||||
|
||||
if( entityData != NULL )
|
||||
{
|
||||
iSize += entityData->getSizeInBytes();
|
||||
}
|
||||
else if( unpack != NULL )
|
||||
{
|
||||
// 4J Stu - This is an incoming value which we aren't currently analysing
|
||||
//iSize += unpack->get
|
||||
}
|
||||
if (entityData != NULL) {
|
||||
iSize += entityData->getSizeInBytes();
|
||||
} else if (unpack != NULL) {
|
||||
// 4J Stu - This is an incoming value which we aren't currently
|
||||
// analysing
|
||||
// iSize += unpack->get
|
||||
}
|
||||
|
||||
return iSize;
|
||||
return iSize;
|
||||
}
|
||||
|
||||
std::vector<std::shared_ptr<SynchedEntityData::DataItem> > *AddPlayerPacket::getUnpackedData()
|
||||
{
|
||||
if (unpack == NULL)
|
||||
{
|
||||
unpack = entityData->getAll();
|
||||
}
|
||||
return unpack;
|
||||
std::vector<std::shared_ptr<SynchedEntityData::DataItem> >*
|
||||
AddPlayerPacket::getUnpackedData() {
|
||||
if (unpack == NULL) {
|
||||
unpack = entityData->getAll();
|
||||
}
|
||||
return unpack;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user