Merge newer commits from PR MCLCE#1453

Author: ZomkaDEV

Minecraft.Client/HumanoidModel.cpp

@@ -109,6 +109,7 @@ ModelPart * HumanoidModel::AddOrRetrievePart(SKIN_BOX *pBox)
 		pNewBox = new ModelPart(this, static_cast<int>(pBox->fU), static_cast<int>(pBox->fV));
 		pNewBox->visible=false;
 		if (pBox->fM > 0) pNewBox->bMirror = true; // check if this box has the mirror flag
+		if (pBox->fA > 0) pNewBox->hideWithHelmet = true; // check if this box has the "hide when helmet" is worn flag
 		pNewBox->addHumanoidBox(pBox->fX, pBox->fY, pBox->fZ, pBox->fW, pBox->fH, pBox->fD, scale);
 		// 4J-PB - don't compile here, since the lighting isn't set up. It'll be compiled on first use.
 		//pNewBox->compile(1.0f/16.0f);	

Minecraft.Client/ModelPart.cpp

@@ -13,6 +13,7 @@ void ModelPart::_init()
 	compiled=false;
 	bMirror = false;
 	visible = true;
+	hideWithHelmet = false;
 	neverRender = false;
 	x=y=z = 0.0f;
 	xRot=yRot=zRot = 0.0f;

Minecraft.Client/ModelPart.h

@@ -16,6 +16,7 @@ class ModelPart
 	float xRot, yRot, zRot;
 	bool bMirror;
 	bool visible;
+	bool hideWithHelmet;
 	bool neverRender;
     vector <Cube *> cubes;
     vector <ModelPart *> children;

Minecraft.Client/PlayerRenderer.cpp

@@ -258,7 +258,9 @@ void PlayerRenderer::render(shared_ptr<Entity> _mob, double x, double y, double
 	{
 		for(ModelPart *pModelPart : *pAdditionalModelParts)
 		{
-			pModelPart->visible=true;
+			shared_ptr<ItemInstance> itemInstance = mob->inventory->getArmor(3);
+			if (itemInstance == nullptr || !pModelPart->hideWithHelmet)
+				pModelPart->visible=true;
 		}
 	}