mirror of
https://git.neolegacy.dev/neoStudiosLCE/neoLegacy.git
synced 2026-11-21 17:23:56 +01:00
TU46 Test content and patches
TU46 Test content, added missing commits by amending commit and cherry-picking to new branch, ready for iggy guis and tu46 bug fixes
This commit is contained in:
1 parent
8d6b69f599
commit
ff562d1644
497 files changed
+11187
-771
No files matched your search
@@ -5,9 +5,12 @@
|
||||
|
||||
ResourceLocation SkeletonRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON);
|
||||
ResourceLocation SkeletonRenderer::WITHER_SKELETON_LOCATION = ResourceLocation(TN_MOB_WITHER_SKELETON);
|
||||
ResourceLocation SkeletonRenderer::STRAY_LOCATION = ResourceLocation(TN_MOB_STRAY);
|
||||
ResourceLocation SkeletonRenderer::STRAY_CLOTHES_LOCATION = ResourceLocation(TN_MOB_STRAY_OVERLAY);
|
||||
|
||||
SkeletonRenderer::SkeletonRenderer() : HumanoidMobRenderer(new SkeletonModel(), .5f)
|
||||
{
|
||||
strayClothesModel = new SkeletonModel(0.25f);
|
||||
}
|
||||
|
||||
void SkeletonRenderer::scale(shared_ptr<LivingEntity> mob, float a)
|
||||
@@ -31,5 +34,28 @@ ResourceLocation *SkeletonRenderer::getTextureLocation(shared_ptr<Entity> entity
|
||||
{
|
||||
return &WITHER_SKELETON_LOCATION;
|
||||
}
|
||||
if (skeleton->getSkeletonType() == Skeleton::TYPE_STRAY)
|
||||
{
|
||||
return &STRAY_LOCATION;
|
||||
}
|
||||
return &SKELETON_LOCATION;
|
||||
}
|
||||
}
|
||||
void SkeletonRenderer::renderModel(shared_ptr<LivingEntity> mob, float wp, float ws, float bob, float headRotMinusBodyRot, float headRotx, float scale)
|
||||
{
|
||||
HumanoidMobRenderer::renderModel(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale);
|
||||
|
||||
shared_ptr<Skeleton> skeleton = dynamic_pointer_cast<Skeleton>(mob);
|
||||
if (skeleton == nullptr || skeleton->getSkeletonType() != Skeleton::TYPE_STRAY || mob->isInvisible()) return;
|
||||
|
||||
HumanoidModel *body = static_cast<HumanoidModel *>(resModel);
|
||||
strayClothesModel->attackTime = body->attackTime;
|
||||
strayClothesModel->riding = body->riding;
|
||||
strayClothesModel->young = body->young;
|
||||
strayClothesModel->holdingLeftHand = body->holdingLeftHand;
|
||||
strayClothesModel->holdingRightHand = body->holdingRightHand;
|
||||
strayClothesModel->sneaking = body->sneaking;
|
||||
strayClothesModel->bowAndArrow = body->bowAndArrow;
|
||||
|
||||
bindTexture(&STRAY_CLOTHES_LOCATION);
|
||||
strayClothesModel->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
|
||||
}
|
||||
Reference in new issue
Block a user