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

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
+21 -34
View File
@@ -1,6 +1,8 @@
#include "stdafx.h"
#include "CustomHeadLayer.h"
#include "ModelPart.h"
#include "SkullTileRenderer.h"
#include "TileRenderer.h"
#include "../Minecraft.World/ItemInstance.h"
#include "../Minecraft.World/Item.h"
#include "../Minecraft.World/Tile.h"
@@ -11,7 +13,8 @@ CustomHeadLayer::CustomHeadLayer(ModelPart* headPart)
{
}
int CustomHeadLayer::colorsOnDamage() {
int CustomHeadLayer::colorsOnDamage()
{
return 1;
}
@@ -20,59 +23,43 @@ void CustomHeadLayer::render(shared_ptr<LivingEntity> mob,
float headRot, float headRotX,
float scale, bool useCompiled)
{
ItemInstanceArray slots = mob->getEquipmentSlots();
if (slots.length < 5) return;
shared_ptr<ItemInstance> helmet = slots[4];
if (!helmet) return;
Item* item = helmet->getItem();
if (!item) return;
bool hasHatLayer = false;
if (mob->instanceof(eTYPE_PLAYER)) {
_SkinAdjustments adj;
mob->getSkinAdjustments(&adj);
hasHatLayer = (adj.data[0] & 0x100) != 0;
}
glPushMatrix();
headPart->translateTo(0.0625f);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
int itemId = item->id;
int itemId = item->id;
if (itemId == Tile::skull_Id) {
glScalef(1.1875f, -1.1875f, -1.1875f);
if (hasHatLayer)
glTranslatef(0.0f, 0.0625f, 0.0f);
} else if (itemId < 0x100) {
glTranslatef(0.0f, -0.25f, 0.0f);
glRotatef(180.0f, 0.0f, 1.0f, 0.0f);
glScalef(0.625f, -0.625f, -0.625f);
if (hasHatLayer)
glTranslatef(0.0f, 0.1875f, 0.0f);
glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
if (itemId > 0 && itemId < Tile::TILE_NUM_COUNT && Tile::tiles[itemId]) {
}
if (itemId == Tile::skull_Id) {
if (!SkullTileRenderer::instance) { glPopMatrix(); return; }
glScalef(1.1875f, -1.1875f, -1.1875f);
glTranslatef(-0.5f, 0.0f, -0.5f);
int skullType = helmet->getAuxValue() & 0xF;
wstring extra = helmet->hasTag() ? helmet->getTag()->getString(L"SkullOwner") : L"";
SkullTileRenderer::instance->renderSkull(0.0f, 0.0f, 0.0f, -1, 180.0f, skullType, extra);
} else if (itemId < 0x100) {
glTranslatef(0.0f, -0.25f, 0.0f);
glRotatef(180.0f, 0.0f, 1.0f, 0.0f);
glScalef(0.625f, 0.625f, 0.625f);
glRotatef(90.0f, 0.0f, 1.0f, 0.0f);
if (itemId > 0 && itemId < Tile::TILE_NUM_COUNT && Tile::tiles[itemId]) {
TileRenderer tr;
tr.renderTile(Tile::tiles[itemId], helmet->getAuxValue(), 1.0f, 1.0f, useCompiled);
}
}
glPopMatrix();
}