fix: compilation error for server

This commit is contained in:
Lord_Cambion
2026-04-18 12:59:21 +02:00
parent f2cfbafc26
commit e46404ae38
6 changed files with 142 additions and 70 deletions
+41 -28
View File
@@ -1,15 +1,19 @@
#include "stdafx.h"
#include "CustomHeadLayer.h"
#include "LivingEntityRenderer.h"
#include "ModelPart.h"
#include "SkullTileRenderer.h"
#include "TileRenderer.h"
#include "EntityRenderDispatcher.h"
#include "../Minecraft.World/ItemInstance.h"
#include "../Minecraft.World/Item.h"
#include "../Minecraft.World/Tile.h"
#include "../Minecraft.World/SkullItem.h"
#include "../Minecraft.World/SkullTileEntity.h"
#include "../Minecraft.World/LivingEntity.h"
CustomHeadLayer::CustomHeadLayer(ModelPart* headPart)
: headPart(headPart)
CustomHeadLayer::CustomHeadLayer(ModelPart* headPart, LivingEntityRenderer* parentRenderer)
: headPart(headPart), parentRenderer(parentRenderer)
{
}
@@ -23,43 +27,52 @@ 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 (mob->instanceof(eTYPE_PLAYER)) return;
if (!headPart) return;
shared_ptr<ItemInstance> helmet = mob->getArmor(3);
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;
}
if (dynamic_cast<SkullItem*>(item)) return;
if (item->id >= 256) return;
EntityRenderDispatcher* dispatcher = parentRenderer ? parentRenderer->entityRenderDispatcher : nullptr;
glPushMatrix();
headPart->translateTo(0.0625f);
headPart->translateTo(1.0f / 16.0f);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
int itemId = item->id;
if (item->id > 0
&& item->id < Tile::TILE_NUM_COUNT
&& Tile::tiles[item->id] != nullptr
&& TileRenderer::canRender(Tile::tiles[item->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);
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);
tr.renderTile(Tile::tiles[item->id], helmet->getAuxValue(), 1.0f, 1.0f, useCompiled);
glPopMatrix();
return;
}
if (dispatcher && dispatcher->itemInHandRenderer)
{
dispatcher->itemInHandRenderer->renderItem(mob, helmet, 0);
}
}
glPopMatrix();
}