phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-20 16:53:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed and added functions

Browse source 
Renamed functions with skin offset or model offset in there name to have skin adjustment instead. Added two functions in Player.cpp and Player.h to handle model types for player. Altered getModel() function in EntityRenderer.h and moved fuctionallity to EntityRenderer.cpp. Optimized write() function in TextureAndGeometryPacket.cpp with __fastcall (prevents crashes in multiplayer when instances are running on the same PC).
This commit is contained in:
Langtanium 2026-05-06 12:01:37 -07:00
parent 878547dec8
commit e8064d2ee3
21 changed files with 280 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
View file

@ -59,7 +59,7 @@ UIScene_SkinSelectMenu::UIScene_SkinSelectMenu(int iPad, void *initData, UILayer
m_selectedSkinPath = L"";
m_selectedCapePath = L"";
m_vAdditionalSkinBoxes = nullptr;
m_vSkinOffsets = nullptr;
m_vSkinAdjustments = nullptr;
m_bSlidingSkins = false;
m_bAnimatingMove = false;
@ -663,7 +663,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
m_selectedSkinPath = skinFile->getPath();
m_selectedCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
m_vAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
m_vSkinOffsets = skinFile->getOffsets();
m_vSkinAdjustments = skinFile->getOffsets();
skinName = skinFile->getParameterAsString( DLCManager::e_DLCParamType_DisplayName );
skinOrigin = skinFile->getParameterAsString( DLCManager::e_DLCParamType_ThemeName );
@ -686,7 +686,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
m_selectedSkinPath = L"";
m_selectedCapePath = L"";
m_vAdditionalSkinBoxes = nullptr;
m_vSkinOffsets = nullptr;
m_vSkinAdjustments = nullptr;
switch(m_packIndex)
{
@ -729,7 +729,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
m_selectedSkinPath = skinFile->getPath();
m_selectedCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
m_vAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
m_vSkinOffsets = skinFile->getOffsets();
m_vSkinAdjustments = skinFile->getOffsets();
skinName = skinFile->getParameterAsString( DLCManager::e_DLCParamType_DisplayName );
skinOrigin = skinFile->getParameterAsString( DLCManager::e_DLCParamType_ThemeName );
@ -778,14 +778,14 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
}
}
if(m_vSkinOffsets && m_vSkinOffsets->size()!=0)
if(m_vSkinAdjustments && m_vSkinAdjustments->size()!=0)
{
// add the boxes to the humanoid model, but only if we've not done this already
// add the skin adjustments to the humanoid model, but only if we've not done this already
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
if(pModelOffsets==nullptr)
vector<SKIN_OFFSET *> *pSkinAdjustments = app.GetSkinAdjustments(skinFile->getSkinID());
if(pSkinAdjustments==nullptr)
{
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),m_vSkinOffsets);
pSkinAdjustments = app.SetSkinAdjustments(skinFile->getSkinID(),m_vSkinAdjustments);
}
}
@ -805,7 +805,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
wstring otherSkinPath = L"";
wstring otherCapePath = L"";
vector<SKIN_BOX *> *othervAdditionalSkinBoxes=nullptr;
vector<SKIN_OFFSET *> *othervSkinOffsets=nullptr;
vector<SKIN_OFFSET *> *othervSkinAdjustments=nullptr;
wchar_t chars[256];
// turn off all displays
@ -860,7 +860,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = skinFile->getPath();
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
othervSkinOffsets = skinFile->getOffsets();
othervSkinAdjustments = skinFile->getOffsets();
backupTexture = TN_MOB_CHAR;
}
else
@ -868,7 +868,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = L"";
otherCapePath = L"";
othervAdditionalSkinBoxes=nullptr;
othervSkinOffsets=nullptr;
othervSkinAdjustments=nullptr;
switch(m_packIndex)
{
case SKIN_SELECT_PACK_DEFAULT:
@ -888,7 +888,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = skinFile->getPath();
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
othervSkinOffsets = skinFile->getOffsets();
othervSkinAdjustments = skinFile->getOffsets();
backupTexture = TN_MOB_CHAR;
}
}
@ -906,12 +906,12 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
}
}
if(othervSkinOffsets && othervSkinOffsets->size()!=0)
if(othervSkinAdjustments && othervSkinAdjustments->size()!=0)
{
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
if(pModelOffsets==nullptr)
vector<SKIN_OFFSET *> *pSkinAdjustments = app.GetSkinAdjustments(skinFile->getSkinID());
if(pSkinAdjustments==nullptr)
{
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),othervSkinOffsets);
pSkinAdjustments = app.SetSkinAdjustments(skinFile->getSkinID(),othervSkinAdjustments);
}
}
// 4J-PB - anim override needs set before SetTexture
@ -942,7 +942,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = skinFile->getPath();
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
othervSkinOffsets = skinFile->getOffsets();
othervSkinAdjustments = skinFile->getOffsets();
backupTexture = TN_MOB_CHAR;
}
else
@ -950,7 +950,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = L"";
otherCapePath = L"";
othervAdditionalSkinBoxes=nullptr;
othervSkinOffsets=nullptr;
othervSkinAdjustments=nullptr;
switch(m_packIndex)
{
case SKIN_SELECT_PACK_DEFAULT:
@ -970,7 +970,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
otherSkinPath = skinFile->getPath();
otherCapePath = skinFile->getParameterAsString(DLCManager::e_DLCParamType_Cape);
othervAdditionalSkinBoxes = skinFile->getAdditionalBoxes();
othervSkinOffsets = skinFile->getOffsets();
othervSkinAdjustments = skinFile->getOffsets();
backupTexture = TN_MOB_CHAR;
}
}
@ -988,12 +988,12 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
}
}
if(othervSkinOffsets && othervSkinOffsets->size()!=0)
if(othervSkinAdjustments && othervSkinAdjustments->size()!=0)
{
vector<SKIN_OFFSET *> *pModelOffsets = app.GetModelOffsets(skinFile->getSkinID());
if(pModelOffsets==nullptr)
vector<SKIN_OFFSET *> *pSkinAdjustments = app.GetSkinAdjustments(skinFile->getSkinID());
if(pSkinAdjustments==nullptr)
{
pModelOffsets = app.SetSkinOffsets(skinFile->getSkinID(),othervSkinOffsets);
pSkinAdjustments = app.SetSkinAdjustments(skinFile->getSkinID(),othervSkinAdjustments);
}
}
// 4J-PB - anim override needs set before SetTexture