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

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

1 files changed, 4 insertions, 3 deletions

diff --git a/Minecraft.Client/Model.h b/Minecraft.Client/Model.h
index e4161d0c..5a4b6f2e 100644
--- a/Minecraft.Client/Model.h
+++ b/Minecraft.Client/Model.h
@@ -5,6 +5,7 @@ using namespace std;
 class Mob;
 class ModelPart;
 class TexOffs;
+class LivingEntity;
 
 
 class  Model
@@ -20,9 +21,9 @@ public:
 
 	Model();		// 4J added
 	virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled) {}
-	virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim=0) {}
-	virtual void prepareMobModel(shared_ptr<Mob> mob, float time, float r, float a) {}
-	virtual ModelPart *getRandomCube(Random random) {return cubes.at(random.nextInt((int)cubes.size()));}
+	virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim=0) {}
+	virtual void prepareMobModel(shared_ptr<LivingEntity> mob, float time, float r, float a) {}
+	virtual ModelPart *getRandomModelPart(Random random) {return cubes.at(random.nextInt((int)cubes.size()));}
 	virtual ModelPart * AddOrRetrievePart(SKIN_BOX *pBox) { return NULL;}
 
 	void setMapTex(wstring id, int x, int y);