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

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

1 files changed, 5 insertions, 4 deletions

diff --git a/Minecraft.Client/SilverfishRenderer.h b/Minecraft.Client/SilverfishRenderer.h
index c1df4505..23c899bb 100644
--- a/Minecraft.Client/SilverfishRenderer.h
+++ b/Minecraft.Client/SilverfishRenderer.h
@@ -1,5 +1,4 @@
 #pragma once
-
 #include "MobRenderer.h"
 
 class Silverfish;
@@ -8,16 +7,18 @@ class SilverfishRenderer : public MobRenderer
 {
 private:
 	//int modelVersion;
+	static ResourceLocation SILVERFISH_LOCATION;
 
 public:
 	SilverfishRenderer();
 
 protected:
-	float getFlipDegrees(shared_ptr<Silverfish> spider);
+	float getFlipDegrees(shared_ptr<LivingEntity> spider);
 
 public:
-	void render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a);
+	virtual void render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a);
+	virtual ResourceLocation *getTextureLocation(shared_ptr<Entity> mob);
 
 protected:
-	int prepareArmor(shared_ptr<Mob> _silverfish, int layer, float a);
+	virtual int prepareArmor(shared_ptr<LivingEntity> _silverfish, int layer, float a);
 };