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

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

1 files changed, 11 insertions, 5 deletions

diff --git a/Minecraft.Client/ItemInHandRenderer.h b/Minecraft.Client/ItemInHandRenderer.h
index dee51a7f..b5d840a2 100644
--- a/Minecraft.Client/ItemInHandRenderer.h
+++ b/Minecraft.Client/ItemInHandRenderer.h
@@ -3,19 +3,25 @@
 class Minecraft;
 class ItemInstance;
 class Minimap;
-class Mob;
+class LivingEntity;
 class TileRenderer;
 class Tesselator;
 
 class ItemInHandRenderer
 {
+public:
+	// 4J - made these public
+	static ResourceLocation ENCHANT_GLINT_LOCATION;
+    static ResourceLocation MAP_BACKGROUND_LOCATION;
+    static ResourceLocation UNDERWATER_LOCATION;
+
 private:
-	Minecraft *mc;
+	Minecraft *minecraft;
     shared_ptr<ItemInstance> selectedItem;
     float height;
     float oHeight;
     TileRenderer *tileRenderer;
-	static int list, listGlint;
+	static int listItem, listGlint, listTerrain;
 
 public:
 	// 4J Stu - Made public so we can use it from ItemFramRenderer
@@ -23,8 +29,8 @@ public:
 
 public:
 	ItemInHandRenderer(Minecraft *mc, bool optimisedMinimap = true); // 4J Added optimisedMinimap param
-    void renderItem(shared_ptr<Mob> mob, shared_ptr<ItemInstance> item, int layer, bool setColor = true);	// 4J added setColor parameter
-	static void renderItem3D(Tesselator *t, float u0, float v0, float u1, float v1, int width, int height, float depth, bool isGlint);	// 4J added isGlint parameter
+    void renderItem(shared_ptr<LivingEntity> mob, shared_ptr<ItemInstance> item, int layer, bool setColor = true);	// 4J added setColor parameter
+	static void renderItem3D(Tesselator *t, float u0, float v0, float u1, float v1, int width, int height, float depth, bool isGlint, bool isTerrain);	// 4J added isGlint and isTerrain parameter
 public:
     void render(float a);
     void renderScreenEffect(float a);