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

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

1 files changed, 16 insertions, 8 deletions

diff --git a/Minecraft.Client/MushroomCowRenderer.cpp b/Minecraft.Client/MushroomCowRenderer.cpp
index 688fab5c..b5f9ba9f 100644
--- a/Minecraft.Client/MushroomCowRenderer.cpp
+++ b/Minecraft.Client/MushroomCowRenderer.cpp
@@ -1,9 +1,12 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "QuadrupedModel.h"
 #include "ModelPart.h"
 #include "MushroomCowRenderer.h"
+#include "TextureAtlas.h"
+#include "QuadrupedModel.h"
+#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+
+ResourceLocation MushroomCowRenderer::MOOSHROOM_LOCATION = ResourceLocation(TN_MOB_RED_COW);
 
 MushroomCowRenderer::MushroomCowRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
 {
@@ -19,23 +22,23 @@ void MushroomCowRenderer::render(shared_ptr<Entity> _mob, double x, double y, do
 	MobRenderer::render(_mob, x, y, z, rot, a);
 }
 
-void MushroomCowRenderer::additionalRendering(shared_ptr<Mob> _mob, float a)
+void MushroomCowRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
 {
 	// 4J - original version used generics and thus had an input parameter of type MushroomCow rather than shared_ptr<Mob>  we have here - 
 	// do some casting around instead
 	shared_ptr<MushroomCow> mob = dynamic_pointer_cast<MushroomCow>(_mob);
 	MobRenderer::additionalRendering(mob, a);
 	if (mob->isBaby()) return;
-	bindTexture(TN_TERRAIN); // 4J was "/terrain.png"
+	bindTexture(&TextureAtlas::LOCATION_BLOCKS); // 4J was "/terrain.png"
 	glEnable(GL_CULL_FACE);
 	glPushMatrix();
 	glScalef(1, -1, 1);
 	glTranslatef(0.2f, 0.4f, 0.5f);
 	glRotatef(42, 0, 1, 0);
-	tileRenderer->renderTile(Tile::mushroom2, 0, 1);
+	tileRenderer->renderTile(Tile::mushroom_red, 0, 1);
 	glTranslatef(0.1f, 0, -0.6f);
 	glRotatef(42, 0, 1, 0);
-	tileRenderer->renderTile(Tile::mushroom2, 0, 1);
+	tileRenderer->renderTile(Tile::mushroom_red, 0, 1);
 	glPopMatrix();
 
 	glPushMatrix();
@@ -43,8 +46,13 @@ void MushroomCowRenderer::additionalRendering(shared_ptr<Mob> _mob, float a)
 	glScalef(1, -1, 1);
 	glTranslatef(0, 0.75f, -0.2f);
 	glRotatef(12, 0, 1, 0);
-	tileRenderer->renderTile(Tile::mushroom2, 0, 1);
+	tileRenderer->renderTile(Tile::mushroom_red, 0, 1);
 	glPopMatrix();
 
 	glDisable(GL_CULL_FACE);
+}
+
+ResourceLocation *MushroomCowRenderer::getTextureLocation(shared_ptr<Entity> mob)
+{
+    return &MOOSHROOM_LOCATION;
 }
\ No newline at end of file