Merge pull request #215 from 4jcraft/dev

just merging all of the dev branch stuff into the java gui branch
This commit is contained in:
Tropical
2026-03-13 12:11:37 -05:00
committed by GitHub
342 changed files with 4066 additions and 3340 deletions

View File

@@ -1164,12 +1164,12 @@ void LocalPlayer::onCrafted(std::shared_ptr<ItemInstance> item)
}
}
void LocalPlayer::setAndBroadcastCustomSkin(DWORD skinId)
void LocalPlayer::setAndBroadcastCustomSkin(std::uint32_t skinId)
{
setCustomSkin(skinId);
}
void LocalPlayer::setAndBroadcastCustomCape(DWORD capeId)
void LocalPlayer::setAndBroadcastCustomCape(std::uint32_t capeId)
{
setCustomCape(capeId);
}
@@ -1638,4 +1638,3 @@ void LocalPlayer::SetPlayerAdditionalModelParts(std::vector<ModelPart *>pAdditio
{
m_pAdditionalModelParts=pAdditionalModelParts;
}