diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp index df2cb390..11a855b8 100644 --- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp +++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp @@ -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) model = static_cast(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(renderer->getNewModel()); else model = static_cast(renderer->getModel()); diff --git a/Minecraft.Client/Common/res/1_2_2/mob/char.png b/Minecraft.Client/Common/res/1_2_2/mob/char.png index af78e35f..e05dbe69 100644 Binary files a/Minecraft.Client/Common/res/1_2_2/mob/char.png and b/Minecraft.Client/Common/res/1_2_2/mob/char.png differ diff --git a/Minecraft.Client/Common/res/mob/char.png b/Minecraft.Client/Common/res/mob/char.png index af78e35f..e05dbe69 100644 Binary files a/Minecraft.Client/Common/res/mob/char.png and b/Minecraft.Client/Common/res/mob/char.png differ diff --git a/Minecraft.Client/LivingEntityRenderer.cpp b/Minecraft.Client/LivingEntityRenderer.cpp index 54a97379..0c4dff3c 100644 --- a/Minecraft.Client/LivingEntityRenderer.cpp +++ b/Minecraft.Client/LivingEntityRenderer.cpp @@ -66,7 +66,7 @@ void LivingEntityRenderer::render(shared_ptr _mob, double x, double y, d glDisable(GL_CULL_FACE); 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; resModel->attackTime = getAttackAnim(mob, a); @@ -263,7 +263,7 @@ void LivingEntityRenderer::renderModel(shared_ptr mob, float wp, f Model *resModel; 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; bindTexture(mob); @@ -341,7 +341,7 @@ void LivingEntityRenderer::renderArrows(shared_ptr mob, float a) Model *resModel; 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; int arrowCount = mob->getArrowCount(); diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp index eefaa225..b04df80e 100644 --- a/Minecraft.Client/PlayerRenderer.cpp +++ b/Minecraft.Client/PlayerRenderer.cpp @@ -169,7 +169,7 @@ void PlayerRenderer::render(shared_ptr _mob, double x, double y, double if(mob->hasInvisiblePrivilege()) return; 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; shared_ptr item = mob->inventory->getSelected(); @@ -276,7 +276,7 @@ void PlayerRenderer::additionalRendering(shared_ptr _mob, float a) HumanoidModel *resModel; 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; shared_ptr headGear = mob->inventory->getArmor(3); @@ -525,7 +525,7 @@ void PlayerRenderer::renderHand() HumanoidModel *resModel; 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; float brightness = 1;