backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-06-09 00:33:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: use existing packet for quick equip

Browse source
This commit is contained in:
SevenToaster509 2026-04-28 16:18:31 +01:00
parent 2186908e16
commit 39820d961e
4 changed files with 75 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
Minecraft.Client/PlayerConnection.cpp
View file

@ -817,6 +817,42 @@ skipUseItemOn:
send(std::make_shared<ContainerSetSlotPacket>(player->containerMenu->containerId, s->index, player->inventory->getSelected()));
}
}
//Migrate QuickEquip packet here instead
if (item != nullptr && (item->getItem()->getBaseItemType() == Item::eBaseItemType_helmet
|| item->getItem()->getBaseItemType() == Item::eBaseItemType_chestplate
|| item->getItem()->getBaseItemType() == Item::eBaseItemType_leggings
|| item->getItem()->getBaseItemType() == Item::eBaseItemType_boots)) {
int slot = Mob::getEquipmentSlotForItem(item) - 1;
auto item1 = item->clone(item);
// If player is in survival mode
if (!player->abilities.instabuild) { //
// Equip the armor to the appropriate slot
if (player->inventory->armor[slot] == nullptr) {
player->inventory->removeItemNoUpdate(player->inventory->selected);
player->inventory->setItem(36 + slot, item);
}
else {
player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
player->inventory->setItem(36 + slot, item);
}
}
else {
if (player->inventory->armor[slot] == nullptr) {
player->inventory->setItem(36 + slot, item);
//hacky fix for ghost item
player->inventory->setItem(player->inventory->selected, item1);
}
else {
player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
player->inventory->setItem(36 + slot, item);
}
}
}
}
void PlayerConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason, void *reasonObjects)
@ -2060,34 +2096,34 @@ void PlayerConnection::handleCustomPayload(shared_ptr<CustomPayloadPacket> custo
}
}
else if (CustomPayloadPacket::QUICK_EQUIP_PACKET.compare(customPayloadPacket->identifier) == 0) {
ByteArrayInputStream bais(customPayloadPacket->data);
DataInputStream input(&bais);
shared_ptr<ItemInstance> sentItem = Packet::readItem(&input);
//->connection->send(std::make_shared<SetEquippedItemPacket>(e->entityId, i, item));
int slot = Mob::getEquipmentSlotForItem(sentItem) - 1;
//ByteArrayInputStream bais(customPayloadPacket->data);
//DataInputStream input(&bais);
//shared_ptr<ItemInstance> sentItem = Packet::readItem(&input);
////->connection->send(std::make_shared<SetEquippedItemPacket>(e->entityId, i, item));
//int slot = Mob::getEquipmentSlotForItem(sentItem) - 1;
// If player is in survival mode (not creative)
if(!player->abilities.instabuild) { //
// Equip the armor to the appropriate slot
if (player->inventory->armor[slot] == nullptr) {
player->inventory->setItem(36 + slot, sentItem);
player->inventory->removeItemNoUpdate(player->inventory->selected);
}
else {
player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
player->inventory->setItem(36 + slot, sentItem);
}
}
else {
if (player->inventory->armor[slot] == nullptr) {
player->inventory->setItem(36 + slot, sentItem);
}
else {
player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
player->inventory->setItem(36 + slot, sentItem);
}
}
PlayerList* playerList = MinecraftServer::getInstance()->getPlayers();
//// If player is in survival mode (not creative)
//if(!player->abilities.instabuild) { //
// // Equip the armor to the appropriate slot
// if (player->inventory->armor[slot] == nullptr) {
// player->inventory->setItem(36 + slot, sentItem);
// player->inventory->removeItemNoUpdate(player->inventory->selected);
// }
// else {
// player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
// player->inventory->setItem(36 + slot, sentItem);
// }
//}
//else {
// if (player->inventory->armor[slot] == nullptr) {
// player->inventory->setItem(36 + slot, sentItem);
// }
// else {
// player->inventory->setItem(player->inventory->selected, player->inventory->armor[slot]);
// player->inventory->setItem(36 + slot, sentItem);
// }
//}
//PlayerList* playerList = MinecraftServer::getInstance()->getPlayers();
//playerList->broadcastAll(std::make_shared<SetEquippedItemPacket>(player->entityId, slot, sentItem));
}
@ -2316,20 +2352,24 @@ void PlayerConnection::handleCraftItem(shared_ptr<CraftItemPacket> packet)
}
// handle achievements
switch(pTempItemInst->id )
switch(pTempItemInst->id)
{
case Tile::workBench_Id: player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); break;
case Item::pickAxe_wood_Id: player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); break;
case Tile::furnace_Id: player->awardStat(GenericStats::buildFurnace(), GenericStats::param_buildFurnace()); break;
case Item::hoe_wood_Id: player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break;
//case Item::hoe_wood_Id: player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break;
case Item::bread_Id: player->awardStat(GenericStats::makeBread(), GenericStats::param_makeBread()); break;
case Item::cake_Id: player->awardStat(GenericStats::bakeCake(), GenericStats::param_bakeCake()); break;
case Item::pickAxe_stone_Id: player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); break;
case Item::sword_wood_Id: player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break;
//case Item::sword_wood_Id: player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break;
case Tile::dispenser_Id: player->awardStat(GenericStats::dispenseWithThis(), GenericStats::param_dispenseWithThis()); break;
case Tile::enchantTable_Id: player->awardStat(GenericStats::enchantments(), GenericStats::param_enchantments()); break;
case Tile::bookshelf_Id: player->awardStat(GenericStats::bookcase(), GenericStats::param_bookcase()); break;
}
switch (pTempItemInst->getItem()->getBaseItemType()) {
case Item::eBaseItemType_hoe: player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break;
case Item::eBaseItemType_sword: player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break;
}
//}
// ELSE The server thinks the client was wrong...
}

4
Minecraft.World/ArmorItem.cpp
View file

@ -136,14 +136,14 @@ int ArmorItem::getUseDuration(shared_ptr<ItemInstance> itemInstance)
}
shared_ptr<ItemInstance> ArmorItem::use(shared_ptr<ItemInstance> instance, Level* level, shared_ptr<Player> player) {
ByteArrayOutputStream baos;
/*ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
Packet::writeItem(instance, &dos);
for (int i = 0; i < XUSER_MAX_COUNT; i++) {
if (Minecraft::GetInstance()->localplayers[i] == player) {
Minecraft::GetInstance()->localplayers[i]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::QUICK_EQUIP_PACKET, baos.toByteArray()));
}
}
}*/
int material = Item::items[instance->id]->getMaterial();
int lo, hi;

32
Minecraft.World/ElytraItem.cpp
View file

@ -25,38 +25,6 @@ bool ElytraItem::TestUse(shared_ptr<ItemInstance> instance, Level* level, shared
shared_ptr<ItemInstance> ElytraItem::use(shared_ptr<ItemInstance> instance, Level* level, shared_ptr<Player> player)
{
// Elytra equips to the chest slot (SLOT_CHEST = 3, armor array index = SLOT_CHEST - 1 = 2)
const int chestSlot = LivingEntity::SLOT_CHEST - 1;
ItemInstance copy = *instance->copy_not_shared();
if (!player->abilities.instabuild)
{
if (player->inventory->armor[chestSlot] == nullptr)
{
player->inventory->armor[chestSlot] = make_shared<ItemInstance>(copy);
player->inventory->removeItemNoUpdate(player->inventory->selected);
instance->count = 0;
}
else
{
player->inventory->setItem(player->inventory->selected, player->inventory->armor[chestSlot]);
player->inventory->armor[chestSlot] = make_shared<ItemInstance>(copy);
}
}
else
{
if (player->inventory->armor[chestSlot] == nullptr)
{
player->inventory->armor[chestSlot] = make_shared<ItemInstance>(copy);
}
else
{
player->inventory->setItem(player->inventory->selected, player->inventory->armor[chestSlot]);
player->inventory->armor[chestSlot] = make_shared<ItemInstance>(copy);
}
}
// Play cloth armor equip sound (range 194–199)
player->playSound(194, 0.5f, 1.0f);

3
Minecraft.World/Mob.cpp
View file

@ -741,6 +741,9 @@ int Mob::getEquipmentSlotForItem(shared_ptr<ItemInstance> item)
{
return SLOT_HELM;
}
if (item->id == Item::elytra_Id) {
return SLOT_CHEST;
}
ArmorItem *armorItem = dynamic_cast<ArmorItem *>(item->getItem());
if (armorItem != nullptr)