neoStudiosLCE/neoLegacy
1
0
Fork 0
mirror of https://git.neolegacy.dev/neoStudiosLCE/neoLegacy.git synced 2026-07-15 18:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: armorstand according to wiki + wobble animation + head renderer

Browse Source 
Armor stands are not damaged by cacti but can be broken by arrows. An armor stand destroyed by an explosion or a firework does not drop as an item. Armor stands in water and lava at the same time are not consumed by the lava.
This commit is contained in:
Lord_Cambion
2026-04-18 12:26:25 +02:00
parent 22953367f4
commit f2cfbafc26
9 changed files with 280 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

285
Minecraft.Client/ArmorStandRenderer.cpp
View File

@@ -1,27 +1,29 @@
#include "stdafx.h"
#include "HumanoidMobRenderer.h"
#include "ArmorStandRenderer.h"
#include "ArmorStandModel.h"
#include "ArmorStandArmorModel.h"
#include "HumanoidModel.h"
#include "ItemInHandLayer.h"
#include "ArmorStandModel.h"
#include "CustomHeadLayer.h"
#include "Textures.h"
#include "HumanoidMobRenderer.h"
#include "../Minecraft.World/ArmorStand.h"
#include "../Minecraft.World/ArmorItem.h"
#include "../Minecraft.World/Tile.h"
#include "../Minecraft.World/Facing.h"
#include <cmath>
#include "EntityRenderDispatcher.h"
#include "SkullTileRenderer.h"
#include "PlayerRenderer.h"
#include "../Minecraft.World/SkullItem.h"
#include "../Minecraft.World/SkullTileEntity.h"
static const float DEG_TO_RAD = 3.14159265f / 180.0f;
ResourceLocation ArmorStandRenderer::LOC_ARMOR_STAND =
ResourceLocation(TN_MOB_ARMORSTAND);
ResourceLocation ArmorStandRenderer::LOC_ARMOR_STAND = ResourceLocation(TN_MOB_ARMORSTAND);
ArmorStandRenderer::ArmorStandArmorLayer::ArmorStandArmorLayer(
LivingEntityRenderer* renderer)
ArmorStandRenderer::ArmorStandArmorLayer::ArmorStandArmorLayer(LivingEntityRenderer* renderer)
: HumanoidArmorLayer(renderer)
{
delete armorModel1;
delete armorModel2;
armorModel1 = new ArmorStandArmorModel(0.5f);
@@ -36,26 +38,15 @@ void ArmorStandRenderer::ArmorStandArmorLayer::createArmorModels()
armorModel2 = new ArmorStandArmorModel(1.0f);
}
ArmorStandRenderer::ArmorStandRenderer()
: LivingEntityRenderer(new ArmorStandModel(0.0f), 0.0f)
{
addLayer(new ArmorStandArmorLayer(this));
addLayer(new ItemInHandLayer(this));
armorLayer = new ArmorStandArmorLayer(this);
ArmorStandModel* m = static_cast<ArmorStandModel*>(getModel());
addLayer(new CustomHeadLayer(m->head));
headLayer = m ? new CustomHeadLayer(m->head) : nullptr;
}
ArmorStandRenderer::~ArmorStandRenderer()
{
}
ArmorStandRenderer::~ArmorStandRenderer() {}
ResourceLocation* ArmorStandRenderer::getTextureLocation(shared_ptr<Entity> entity)
{
@@ -64,29 +55,39 @@ ResourceLocation* ArmorStandRenderer::getTextureLocation(shared_ptr<Entity> enti
bool ArmorStandRenderer::shouldShowName(shared_ptr<LivingEntity> entity)
{
if (!entity) return false;
return entity->isCustomNameVisible();
}
void ArmorStandRenderer::setupRotations(shared_ptr<LivingEntity> mob,
float bob, float bodyRot, float a)
float bob, float bodyRot, float a)
{
shared_ptr<ArmorStand> stand = dynamic_pointer_cast<ArmorStand>(mob);
glRotatef(180.0f - bodyRot, 0.0f, 1.0f, 0.0f);
if (stand)
{
long long ticksSinceHit = (long long)stand->tickCount - stand->lastHit;
if (ticksSinceHit >= 0 && ticksSinceHit < 5)
{
float wobble = (float)(ticksSinceHit + a) / 5.0f;
float angle = (float)stand->hurtDir * sinf(wobble * 3.14159265f) * 3.0f;
glRotatef(angle, 0.0f, 0.0f, 1.0f);
}
}
}
void ArmorStandRenderer::render(shared_ptr<Entity> entity,
double x, double y, double z,
float rot, float a)
double x, double y, double z,
float rot, float a)
{
LivingEntityRenderer::render(entity, x, y, z, rot, a);
}
void ArmorStandRenderer::renderModel(shared_ptr<LivingEntity> mob,
float wp, float ws, float bob,
float headRotMinusBodyRot,
float headRotx, float scale)
float wp, float ws, float bob,
float headRotMinusBodyRot,
float headRotx, float scale)
{
shared_ptr<ArmorStand> stand = dynamic_pointer_cast<ArmorStand>(mob);
if (!stand) return;
@@ -94,7 +95,6 @@ void ArmorStandRenderer::renderModel(shared_ptr<LivingEntity> mob,
ArmorStandModel* m = static_cast<ArmorStandModel*>(getModel());
if (!m) return;
Rotations h = stand->getHeadPose();
Rotations b = stand->getBodyPose();
Rotations la = stand->getLeftArmPose();
@@ -102,120 +102,151 @@ void ArmorStandRenderer::renderModel(shared_ptr<LivingEntity> mob,
Rotations ll = stand->getLeftLegPose();
Rotations rl = stand->getRightLegPose();
m->setupPose(
h.getX() * DEG_TO_RAD, h.getY() * DEG_TO_RAD, h.getZ() * DEG_TO_RAD,
b.getX() * DEG_TO_RAD, b.getY() * DEG_TO_RAD, b.getZ() * DEG_TO_RAD,
la.getX() * DEG_TO_RAD, la.getY() * DEG_TO_RAD, la.getZ() * DEG_TO_RAD,
ra.getX() * DEG_TO_RAD, ra.getY() * DEG_TO_RAD, ra.getZ() * DEG_TO_RAD,
ll.getX() * DEG_TO_RAD, ll.getY() * DEG_TO_RAD, ll.getZ() * DEG_TO_RAD,
rl.getX() * DEG_TO_RAD, rl.getY() * DEG_TO_RAD, rl.getZ() * DEG_TO_RAD
h.x * DEG_TO_RAD, h.y * DEG_TO_RAD, h.z * DEG_TO_RAD,
b.x * DEG_TO_RAD, b.y * DEG_TO_RAD, b.z * DEG_TO_RAD,
la.x * DEG_TO_RAD, la.y * DEG_TO_RAD, la.z * DEG_TO_RAD,
ra.x * DEG_TO_RAD, ra.y * DEG_TO_RAD, ra.z * DEG_TO_RAD,
ll.x * DEG_TO_RAD, ll.y * DEG_TO_RAD, ll.z * DEG_TO_RAD,
rl.x * DEG_TO_RAD, rl.y * DEG_TO_RAD, rl.z * DEG_TO_RAD
);
ArmorStandArmorLayer* al = getArmorLayer();
if (al)
if (armorLayer)
{
auto applyPose = [&](HumanoidModel* am)
{
if (!am) return;
am->head->xRot = h.getX() * DEG_TO_RAD;
am->head->yRot = h.getY() * DEG_TO_RAD;
am->head->zRot = h.getZ() * DEG_TO_RAD;
if (am->hair) {
am->hair->xRot = h.getX() * DEG_TO_RAD;
am->hair->yRot = h.getY() * DEG_TO_RAD;
am->hair->zRot = h.getZ() * DEG_TO_RAD;
}
am->body->xRot = b.getX() * DEG_TO_RAD;
am->body->yRot = b.getY() * DEG_TO_RAD;
am->body->zRot = b.getZ() * DEG_TO_RAD;
am->arm1->xRot = la.getX() * DEG_TO_RAD;
am->arm1->yRot = la.getY() * DEG_TO_RAD;
am->arm1->zRot = la.getZ() * DEG_TO_RAD;
am->arm0->xRot = ra.getX() * DEG_TO_RAD;
am->arm0->yRot = ra.getY() * DEG_TO_RAD;
am->arm0->zRot = ra.getZ() * DEG_TO_RAD;
am->leg0->xRot = rl.getX() * DEG_TO_RAD;
am->leg0->yRot = rl.getY() * DEG_TO_RAD;
am->leg0->zRot = rl.getZ() * DEG_TO_RAD;
am->leg1->xRot = ll.getX() * DEG_TO_RAD;
am->leg1->yRot = ll.getY() * DEG_TO_RAD;
am->leg1->zRot = ll.getZ() * DEG_TO_RAD;
am->head->xRot = h.x * DEG_TO_RAD; am->head->yRot = h.y * DEG_TO_RAD; am->head->zRot = h.z * DEG_TO_RAD;
if (am->hair) { am->hair->xRot = h.x * DEG_TO_RAD; am->hair->yRot = h.y * DEG_TO_RAD; am->hair->zRot = h.z * DEG_TO_RAD; }
am->body->xRot = b.x * DEG_TO_RAD; am->body->yRot = b.y * DEG_TO_RAD; am->body->zRot = b.z * DEG_TO_RAD;
am->arm1->xRot = la.x * DEG_TO_RAD; am->arm1->yRot = la.y * DEG_TO_RAD; am->arm1->zRot = la.z * DEG_TO_RAD;
am->arm0->xRot = ra.x * DEG_TO_RAD; am->arm0->yRot = ra.y * DEG_TO_RAD; am->arm0->zRot = ra.z * DEG_TO_RAD;
am->leg0->xRot = rl.x * DEG_TO_RAD; am->leg0->yRot = rl.y * DEG_TO_RAD; am->leg0->zRot = rl.z * DEG_TO_RAD;
am->leg1->xRot = ll.x * DEG_TO_RAD; am->leg1->yRot = ll.y * DEG_TO_RAD; am->leg1->zRot = ll.z * DEG_TO_RAD;
};
applyPose(static_cast<HumanoidModel*>(al->armorModel1));
applyPose(static_cast<HumanoidModel*>(al->armorModel2));
applyPose(static_cast<HumanoidModel*>(armorLayer->armorModel1));
applyPose(static_cast<HumanoidModel*>(armorLayer->armorModel2));
}
LivingEntityRenderer::renderModel(mob, wp, ws, bob,
headRotMinusBodyRot, headRotx, scale);
LivingEntityRenderer::renderModel(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale);
for (size_t i = 0; i < renderLayers.size(); ++i) {
if (renderLayers[i]) {
renderLayers[i]->render(mob, wp, ws, bob, headRotMinusBodyRot, headRotx, scale, true);
}
if (headLayer)
{
float fScale = 1.0f / 16.0f;
float bodyRot = mob->yBodyRotO + (mob->yBodyRot - mob->yBodyRotO) * 0.0f;
float headRot = mob->yHeadRotO + (mob->yHeadRot - mob->yHeadRotO) * 0.0f;
float headRotX = mob->xRotO + (mob->xRot - mob->xRotO) * 0.0f;
headLayer->render(mob, wp, ws, bob, headRot - bodyRot, headRotX, fScale, true);
}
}
void ArmorStandRenderer::additionalRendering(shared_ptr<LivingEntity> mob, float a)
{
shared_ptr<ItemInstance> headGear = mob->getArmor(3);
if (!headGear) return;
if ((mob->getAnimOverrideBitmask() & (1 << HumanoidModel::eAnim_DontRenderArmour)) != 0) return;
if (headGear->getItem()->id >= 256) return;
ArmorStandModel* m = static_cast<ArmorStandModel*>(getModel());
if (!m || !m->head) return;
glPushMatrix();
m->head->translateTo(1.0f / 16.0f);
if (Tile::tiles[headGear->id] != nullptr && TileRenderer::canRender(Tile::tiles[headGear->id]->getRenderShape()))
{
float s = 10.0f / 16.0f;
glTranslatef(0.0f, -4.0f / 16.0f, 0.0f);
glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
glScalef(s, -s, s);
}
this->entityRenderDispatcher->itemInHandRenderer->renderItem(mob, headGear, 0);
glPopMatrix();
}
int ArmorStandRenderer::prepareArmor(shared_ptr<LivingEntity> mob, int layer, float a)
{
if (!armorLayer) return -1;
shared_ptr<ItemInstance> itemInstance = mob->getArmor(3 - layer);
if (itemInstance != nullptr)
if (!itemInstance) return -1;
Item* item = itemInstance->getItem();
SkullItem* skullItem = dynamic_cast<SkullItem*>(item);
if (skullItem && layer == 0)
{
Item *item = itemInstance->getItem();
ArmorItem *armorItem = dynamic_cast<ArmorItem *>(item);
if (armorItem != nullptr)
HumanoidModel* am = armorLayer->getArmorModel(layer);
switch (itemInstance->getAuxValue())
{
bindTexture(HumanoidMobRenderer::getArmorLocation(armorItem, layer));
HumanoidModel *am = armorLayer->getArmorModel(layer);
am->head->visible = (layer == 0);
if (am->hair) am->hair->visible = (layer == 0);
am->body->visible = (layer == 1 || layer == 2);
am->arm0->visible = (layer == 1);
am->arm1->visible = (layer == 1);
am->leg0->visible = (layer == 2 || layer == 3);
am->leg1->visible = (layer == 2 || layer == 3);
setArmor(am);
am->attackTime = model->attackTime;
am->riding = model->riding;
am->young = mob->isBaby();
if (armorItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH)
{
int color = armorItem->getColor(itemInstance);
float red = static_cast<float>((color >> 16) & 0xFF) / 255.0f;
float green = static_cast<float>((color >> 8) & 0xFF) / 255.0f;
float blue = static_cast<float>(color & 0xFF) / 255.0f;
glColor3f(red, green, blue);
if (itemInstance->isEnchanted()) return 0x1f;
return 0x10;
}
glColor3f(1.0f, 1.0f, 1.0f);
if (itemInstance->isEnchanted()) return 15;
return 1;
case SkullTileEntity::TYPE_WITHER:
bindTexture(&PlayerRenderer::WITHER_SKELETON_LOCATION);
break;
case SkullTileEntity::TYPE_ZOMBIE:
bindTexture(&PlayerRenderer::ZOMBIE_LOCATION);
break;
case SkullTileEntity::TYPE_CREEPER:
bindTexture(&PlayerRenderer::CREEPER_LOCATION);
break;
case SkullTileEntity::TYPE_CHAR:
bindTexture(&PlayerRenderer::DEFAULT_LOCATION);
break;
case SkullTileEntity::TYPE_SKELETON:
default:
bindTexture(&PlayerRenderer::SKELETON_LOCATION);
break;
}
am->head->visible = true;
if (am->hair) am->hair->visible = false;
am->body->visible = false;
am->arm0->visible = false;
am->arm1->visible = false;
am->leg0->visible = false;
am->leg1->visible = false;
setArmor(am);
am->attackTime = model->attackTime;
am->riding = model->riding;
am->young = mob->isBaby();
return 1;
}
return -1;
}
ArmorItem* armorItem = dynamic_cast<ArmorItem*>(item);
if (!armorItem) return -1;
bindTexture(HumanoidMobRenderer::getArmorLocation(armorItem, layer));
HumanoidModel* am = armorLayer->getArmorModel(layer);
am->head->visible = (layer == 0);
if (am->hair) am->hair->visible = (layer == 0);
am->body->visible = (layer == 1 || layer == 2);
am->arm0->visible = (layer == 1);
am->arm1->visible = (layer == 1);
am->leg0->visible = (layer == 2 || layer == 3);
am->leg1->visible = (layer == 2 || layer == 3);
setArmor(am);
am->attackTime = model->attackTime;
am->riding = model->riding;
am->young = mob->isBaby();
if (armorItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH)
{
int color = armorItem->getColor(itemInstance);
float red = static_cast<float>((color >> 16) & 0xFF) / 255.0f;
float green = static_cast<float>((color >> 8) & 0xFF) / 255.0f;
float blue = static_cast<float>(color & 0xFF) / 255.0f;
glColor3f(red, green, blue);
if (itemInstance->isEnchanted()) return 0x1f;
return 0x10;
}
glColor3f(1.0f, 1.0f, 1.0f);
if (itemInstance->isEnchanted()) return 15;
return 1;
}