mirror of
https://github.com/neoStudiosLCE/neoLegacy.git
synced 2026-08-20 09:57:09 +00:00
Revert "Changed Steve's skin from 64x64 to 64x32"
This reverts commit 4a96ce18b2.
This commit is contained in:
parent
4a96ce18b2
commit
5b2fd49b40
|
|
@ -262,7 +262,7 @@ void UIControl_PlayerSkinPreview::render(EntityRenderer *renderer, double x, dou
|
||||||
|
|
||||||
if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 46 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 54)
|
if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 46 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 54)
|
||||||
model = static_cast<HumanoidModel *>(renderer->getNewModelSlim());
|
model = static_cast<HumanoidModel *>(renderer->getNewModelSlim());
|
||||||
else if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 38 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 45)
|
else if (t->loadMemTexture(m_customTextureUrl, m_backupTexture) >= 37 && t->loadMemTexture(m_customTextureUrl, m_backupTexture) <= 45)
|
||||||
model = static_cast<HumanoidModel *>(renderer->getNewModel());
|
model = static_cast<HumanoidModel *>(renderer->getNewModel());
|
||||||
else
|
else
|
||||||
model = static_cast<HumanoidModel *>(renderer->getModel());
|
model = static_cast<HumanoidModel *>(renderer->getModel());
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.6 KiB |
|
|
@ -66,7 +66,7 @@ void LivingEntityRenderer::render(shared_ptr<Entity> _mob, double x, double y, d
|
||||||
glDisable(GL_CULL_FACE);
|
glDisable(GL_CULL_FACE);
|
||||||
|
|
||||||
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
||||||
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 2 && player->getCustomSkin() <= 9)) resModel = newModel;
|
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9)) resModel = newModel;
|
||||||
else resModel = model;
|
else resModel = model;
|
||||||
|
|
||||||
resModel->attackTime = getAttackAnim(mob, a);
|
resModel->attackTime = getAttackAnim(mob, a);
|
||||||
|
|
@ -263,7 +263,7 @@ void LivingEntityRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, f
|
||||||
Model *resModel;
|
Model *resModel;
|
||||||
|
|
||||||
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
||||||
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 2 && player->getCustomSkin() <= 9)) resModel = newModel;
|
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9)) resModel = newModel;
|
||||||
else resModel = model;
|
else resModel = model;
|
||||||
|
|
||||||
bindTexture(mob);
|
bindTexture(mob);
|
||||||
|
|
@ -341,7 +341,7 @@ void LivingEntityRenderer::renderArrows(shared_ptr<LivingEntity> mob, float a)
|
||||||
Model *resModel;
|
Model *resModel;
|
||||||
|
|
||||||
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
if (player != nullptr && newModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newModelSlim;
|
||||||
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 2 && player->getCustomSkin() <= 9)) resModel = newModel;
|
else if (player != nullptr && newModel != nullptr && (player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9)) resModel = newModel;
|
||||||
else resModel = model;
|
else resModel = model;
|
||||||
|
|
||||||
int arrowCount = mob->getArrowCount();
|
int arrowCount = mob->getArrowCount();
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,7 @@ void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double
|
||||||
if(mob->hasInvisiblePrivilege()) return;
|
if(mob->hasInvisiblePrivilege()) return;
|
||||||
|
|
||||||
if (mob != nullptr && newHumanoidModelSlim != nullptr && (mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
if (mob != nullptr && newHumanoidModelSlim != nullptr && (mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
||||||
else if (mob != nullptr && newHumanoidModel != nullptr && (mob->getCustomSkin() >= 2 && mob->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
else if (mob != nullptr && newHumanoidModel != nullptr && (mob->getCustomSkin() >= 0 && mob->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
||||||
else resModel = humanoidModel;
|
else resModel = humanoidModel;
|
||||||
|
|
||||||
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
|
shared_ptr<ItemInstance> item = mob->inventory->getSelected();
|
||||||
|
|
@ -276,7 +276,7 @@ void PlayerRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
|
||||||
HumanoidModel *resModel;
|
HumanoidModel *resModel;
|
||||||
|
|
||||||
if (mob != nullptr && newHumanoidModelSlim != nullptr && (mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
if (mob != nullptr && newHumanoidModelSlim != nullptr && (mob->getCustomSkin() >= 10 && mob->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
||||||
else if (mob != nullptr && newHumanoidModel != nullptr && (mob->getCustomSkin() >= 2 && mob->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
else if (mob != nullptr && newHumanoidModel != nullptr && (mob->getCustomSkin() >= 0 && mob->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
||||||
else resModel = humanoidModel;
|
else resModel = humanoidModel;
|
||||||
|
|
||||||
shared_ptr<ItemInstance> headGear = mob->inventory->getArmor(3);
|
shared_ptr<ItemInstance> headGear = mob->inventory->getArmor(3);
|
||||||
|
|
@ -525,7 +525,7 @@ void PlayerRenderer::renderHand()
|
||||||
HumanoidModel *resModel;
|
HumanoidModel *resModel;
|
||||||
|
|
||||||
if (player != nullptr && newHumanoidModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
if (player != nullptr && newHumanoidModelSlim != nullptr && (player->getCustomSkin() >= 10 && player->getCustomSkin() <= 18)) resModel = newHumanoidModelSlim;
|
||||||
else if (player != nullptr && newHumanoidModel != nullptr && (player->getCustomSkin() >= 2 && player->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
else if (player != nullptr && newHumanoidModel != nullptr && (player->getCustomSkin() >= 0 && player->getCustomSkin() <= 9)) resModel = newHumanoidModel;
|
||||||
else resModel = humanoidModel;
|
else resModel = humanoidModel;
|
||||||
|
|
||||||
float brightness = 1;
|
float brightness = 1;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue