Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 20 insertions, 20 deletions

diff --git a/Minecraft.Client/VillagerModel.cpp b/Minecraft.Client/VillagerModel.cpp
index 8885484d..669637af 100644
--- a/Minecraft.Client/VillagerModel.cpp
+++ b/Minecraft.Client/VillagerModel.cpp
@@ -4,16 +4,16 @@
 #include "ModelPart.h"
 
 
-void VillagerModel::_init(float g, float yOffset)
+void VillagerModel::_init(float g, float yOffset, int xTexSize, int yTexSize)
 {
-	int xTexSize = 64;
-	int yTexSize = 64;
-
 	head = (new ModelPart(this))->setTexSize(xTexSize, yTexSize);
 	head->setPos(0, 0 + yOffset, 0);
 	head->texOffs(0, 0)->addBox(-4, -10, -4, 8, 10, 8, g);
-	//        head.texOffs(32, 0).addBox(-4, -10, -4, 8, 12, 8, g + 0.5f);
-	head->texOffs(24, 0)->addBox(-1, -3, -6, 2, 4, 2, g);
+
+	nose = (new ModelPart(this))->setTexSize(xTexSize, yTexSize);
+	nose->setPos(0, yOffset - 2, 0);
+	nose->texOffs(24, 0)->addBox(-1, -1, -6, 2, 4, 2, g);
+	head->addChild(nose);
 
 	body = (new ModelPart(this))->setTexSize(xTexSize, yTexSize);
 	body->setPos(0, 0 + yOffset, 0);
@@ -47,17 +47,17 @@ void VillagerModel::_init(float g, float yOffset)
 
 VillagerModel::VillagerModel(float g) : Model()
 {
-	_init(g, 0);
+	_init(g, 0, 64, 64);
 }
 
-VillagerModel::VillagerModel(float g, float yOffset) : Model()
+VillagerModel::VillagerModel(float g, float yOffset, int xTexSize, int yTexSize) : Model()
 {
-	_init(g,yOffset);
+	_init(g, yOffset, xTexSize, yTexSize);
 }
 
 void VillagerModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled) 
 {
-    setupAnim(time, r, bob, yRot, xRot, scale);
+	setupAnim(time, r, bob, yRot, xRot, scale, entity);
 
 	head->render(scale,usecompiled);
 	body->render(scale,usecompiled);
@@ -66,18 +66,18 @@ void VillagerModel::render(shared_ptr<Entity> entity, float time, float r, float
 	arms->render(scale,usecompiled);
 }
 
-void VillagerModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void VillagerModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
 {
 	head->yRot = yRot / (float) (180 / PI);
 	head->xRot = xRot / (float) (180 / PI);
-		
-    arms->y = 3;
-    arms->z = -1;
-    arms->xRot = -0.75f;
-		
-    leg0->xRot = ((float) Mth::cos(time * 0.6662f) * 1.4f) * r * 0.5f;
-    leg1->xRot = ((float) Mth::cos(time * 0.6662f + PI) * 1.4f) * r * 0.5f;
-    leg0->yRot = 0;
-    leg1->yRot = 0;
+
+	arms->y = 3;
+	arms->z = -1;
+	arms->xRot = -0.75f;
+
+	leg0->xRot = ((float) Mth::cos(time * 0.6662f) * 1.4f) * r * 0.5f;
+	leg1->xRot = ((float) Mth::cos(time * 0.6662f + PI) * 1.4f) * r * 0.5f;
+	leg0->yRot = 0;
+	leg1->yRot = 0;
 }