Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Minecraft.Client/VillagerRenderer.cpp
View File

@@ -3,12 +3,19 @@
#include "VillagerModel.h"
#include "VillagerRenderer.h"
ResourceLocation VillagerRenderer::VILLAGER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_VILLAGER);
ResourceLocation VillagerRenderer::VILLAGER_FARMER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_FARMER);
ResourceLocation VillagerRenderer::VILLAGER_LIBRARIAN_LOCATION = ResourceLocation(TN_MOB_VILLAGER_LIBRARIAN);
ResourceLocation VillagerRenderer::VILLAGER_PRIEST_LOCATION = ResourceLocation(TN_MOB_VILLAGER_PRIEST);
ResourceLocation VillagerRenderer::VILLAGER_SMITH_LOCATION = ResourceLocation(TN_MOB_VILLAGER_SMITH);
ResourceLocation VillagerRenderer::VILLAGER_BUTCHER_LOCATION = ResourceLocation(TN_MOB_VILLAGER_BUTCHER);
VillagerRenderer::VillagerRenderer() : MobRenderer(new VillagerModel(0), 0.5f)
{
villagerModel = (VillagerModel *) model;
}
int VillagerRenderer::prepareArmor(shared_ptr<Mob> villager, int layer, float a)
int VillagerRenderer::prepareArmor(shared_ptr<LivingEntity> villager, int layer, float a)
{
return -1;
}
@@ -18,16 +25,33 @@ void VillagerRenderer::render(shared_ptr<Entity> mob, double x, double y, double
MobRenderer::render(mob, x, y, z, rot, a);
}
void VillagerRenderer::renderName(shared_ptr<Mob> mob, double x, double y, double z)
ResourceLocation *VillagerRenderer::getTextureLocation(shared_ptr<Entity> _mob)
{
shared_ptr<Villager> mob = dynamic_pointer_cast<Villager>(_mob);
switch (mob->getProfession())
{
case Villager::PROFESSION_FARMER:
return &VILLAGER_FARMER_LOCATION;
case Villager::PROFESSION_LIBRARIAN:
return &VILLAGER_LIBRARIAN_LOCATION;
case Villager::PROFESSION_PRIEST:
return &VILLAGER_PRIEST_LOCATION;
case Villager::PROFESSION_SMITH:
return &VILLAGER_SMITH_LOCATION;
case Villager::PROFESSION_BUTCHER:
return &VILLAGER_BUTCHER_LOCATION;
default:
return &VILLAGER_LOCATION;
}
}
void VillagerRenderer::additionalRendering(shared_ptr<Mob> mob, float a)
void VillagerRenderer::additionalRendering(shared_ptr<LivingEntity> mob, float a)
{
MobRenderer::additionalRendering(mob, a);
}
void VillagerRenderer::scale(shared_ptr<Mob> _mob, float a)
void VillagerRenderer::scale(shared_ptr<LivingEntity> _mob, float a)
{
// 4J - original version used generics and thus had an input parameter of type Blaze rather than shared_ptr<Entity> we have here -
// do some casting around instead