backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix

Browse source
This commit is contained in:
ItzSonicFaner 2026-03-14 12:43:29 +02:00
parent 415557a063
commit 0d4bd61c06
3 changed files with 27 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
View file

@ -258,48 +258,14 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
glDisable(GL_CULL_FACE);
HumanoidModel *model;
Textures *t = Minecraft::GetInstance()->textures;
switch (m_backupTexture)
{
case TN_MOB_ALEX:
if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 46 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 53)
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX1:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX2:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX3:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX4:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX5:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX6:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_ALEX7:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_DEVALEX:
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
break;
case TN_MOB_DEVSTEVE:
else if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 37 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 45)
model = static_cast<HumanoidModel *>(renderer->getModel());
else
model = static_cast<HumanoidModel *>(renderer->getModelCustom());
break;
default:
if (m_uiAnimOverrideBitmask&(1<<18))
model = static_cast<HumanoidModel *>(renderer->getModelCustom());
else if (m_uiAnimOverrideBitmask&(1<<19))
model = static_cast<HumanoidModel *>(renderer->getModelSlim());
else
model = static_cast<HumanoidModel *>(renderer->getModel());
break;
}
//getAttackAnim(mob, a);
//if (armor != nullptr) armor->attackTime = model->attackTime;

26
Minecraft.Client/LivingEntityRenderer.cpp
View file

@ -56,9 +56,9 @@ void LivingEntityRenderer::render(shared_ptr<Entity> _mob, double x, double y, d
glPushMatrix();
glDisable(GL_CULL_FACE);
if ((player != nullptr && modelCustom != nullptr && player->getPlayerDefaultSkin() == 18) || player->getAnimOverrideBitmask()&(1<<18)) resModel = modelCustom;
else if ((player != nullptr && modelSlim != nullptr && player->getPlayerDefaultSkin() >= 9) || player->getAnimOverrideBitmask()&(1<<19)) resModel = modelSlim;
else resModel = model;
if (player != nullptr && model != nullptr && player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9) resModel = model;
else if (player != nullptr && modelSlim != nullptr && player->getCustomSkin() >= 10 && player->getCustomSkin() <= 17) resModel = modelSlim;
else resModel = modelCustom;
resModel->attackTime = getAttackAnim(mob, a);
if (armor != nullptr) armor->attackTime = resModel->attackTime;
@ -253,9 +253,9 @@ void LivingEntityRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, f
shared_ptr<Player> player = dynamic_pointer_cast<Player>(mob);
Model *resModel;
if ((player != nullptr && modelCustom != nullptr && player->getPlayerDefaultSkin() == 18) || player->getAnimOverrideBitmask()&(1<<18)) resModel = modelCustom;
else if ((player != nullptr && modelSlim != nullptr && player->getPlayerDefaultSkin() >= 9) || player->getAnimOverrideBitmask()&(1<<19)) resModel = modelSlim;
else resModel = model;
if (player != nullptr && model != nullptr && player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9) resModel = model;
else if (player != nullptr && modelSlim != nullptr && player->getCustomSkin() >= 10 && player->getCustomSkin() <= 17) resModel = modelSlim;
else resModel = modelCustom;
bindTexture(mob);
if (!mob->isInvisible())
@ -329,6 +329,12 @@ void LivingEntityRenderer::additionalRendering(shared_ptr<LivingEntity> mob, flo
void LivingEntityRenderer::renderArrows(shared_ptr<LivingEntity> mob, float a)
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>(mob);
Model *resModel;
if (player != nullptr && model != nullptr && player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9) resModel = model;
else if (player != nullptr && modelSlim != nullptr && player->getCustomSkin() >= 10 && player->getCustomSkin() <= 17) resModel = modelSlim;
else resModel = modelCustom;
int arrowCount = mob->getArrowCount();
if (arrowCount > 0)
@ -341,13 +347,7 @@ void LivingEntityRenderer::renderArrows(shared_ptr<LivingEntity> mob, float a)
glPushMatrix();
ModelPart *modelPart;
if ((player != nullptr && modelCustom != nullptr && player->getPlayerDefaultSkin() == 18) || player->getAnimOverrideBitmask()&(1<<18))
modelPart = modelCustom->getRandomModelPart(random);
else if ((player != nullptr && modelSlim != nullptr && player->getPlayerDefaultSkin() >= 9) || player->getAnimOverrideBitmask()&(1<<19))
modelPart = modelSlim->getRandomModelPart(random);
else
modelPart = model->getRandomModelPart(random);
modelPart = resModel->getRandomModelPart(random);
Cube *cube = modelPart->cubes[random.nextInt(modelPart->cubes.size())];
modelPart->translateTo(1 / 16.0f);

18
Minecraft.Client/PlayerRenderer.cpp
View file

@ -167,9 +167,9 @@ void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double
if(mob == nullptr) return;
if(mob->hasInvisiblePrivilege()) return;
if ((mob != nullptr && modelCustom != nullptr && mob->getPlayerDefaultSkin() == 18) || mob->getAnimOverrideBitmask()&(1<<18)) resModel = humanoidModelCustom;
else if ((mob != nullptr && modelSlim != nullptr && mob->getPlayerDefaultSkin() >= 9) || mob->getAnimOverrideBitmask()&(1<<19)) resModel = humanoidModelSlim;
else resModel = humanoidModel;
if (mob != nullptr && humanoidModel != nullptr && mob->getCustomSkin() >= 0 && mob->getCustomSkin() <= 9) resModel = humanoidModel;
else if (mob != nullptr && humanoidModelSlim != nullptr && mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 17) resModel = humanoidModelSlim;
else resModel = humanoidModelCustom;
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
@ -274,9 +274,9 @@ void PlayerRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
shared_ptr<Player> mob = dynamic_pointer_cast<Player>(_mob);
HumanoidModel *resModel;
if ((mob != nullptr && modelCustom != nullptr && mob->getPlayerDefaultSkin() == 18) || mob->getAnimOverrideBitmask()&(1<<18)) resModel = humanoidModelCustom;
else if ((mob != nullptr && modelSlim != nullptr && mob->getPlayerDefaultSkin() >= 9) || mob->getAnimOverrideBitmask()&(1<<19)) resModel = humanoidModelSlim;
else resModel = humanoidModel;
if (mob != nullptr && humanoidModel != nullptr && mob->getCustomSkin() >= 0 && mob->getCustomSkin() <= 9) resModel = humanoidModel;
else if (mob != nullptr && humanoidModelSlim != nullptr && mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 17) resModel = humanoidModelSlim;
else resModel = humanoidModelCustom;
shared_ptr<ItemInstance> headGear = mob->inventory->getArmor(3);
if (headGear != nullptr)
@ -523,9 +523,9 @@ void PlayerRenderer::renderHand()
shared_ptr<Player> player = dynamic_pointer_cast<Player>(Minecraft::GetInstance()->player);
HumanoidModel *resModel;
if ((player != nullptr && modelCustom != nullptr && player->getPlayerDefaultSkin() == 18) || player->getAnimOverrideBitmask()&(1<<18)) resModel = humanoidModelCustom;
else if ((player != nullptr && modelSlim != nullptr && player->getPlayerDefaultSkin() >= 9) || player->getAnimOverrideBitmask()&(1<<19)) resModel = humanoidModelSlim;
else resModel = humanoidModel;
if (player != nullptr && humanoidModel != nullptr && player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9) resModel = humanoidModel;
else if (player != nullptr && humanoidModelSlim != nullptr && player->getCustomSkin() >= 10 && player->getCustomSkin() <= 17) resModel = humanoidModelSlim;
else resModel = humanoidModelCustom;
float brightness = 1;
glColor3f(brightness, brightness, brightness);