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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/Minecraft.Client/Font.h b/Minecraft.Client/Font.h
index b6ad555d..18d9bf91 100644
--- a/Minecraft.Client/Font.h
+++ b/Minecraft.Client/Font.h
@@ -1,7 +1,9 @@
 #pragma once
+
 class IntBuffer;
 class Options;
 class Textures;
+class ResourceLocation;
 
 class Font
 {
@@ -26,11 +28,11 @@ private:
 	int m_rows; // Number of rows in font sheet
 	int m_charWidth; // Maximum character width
 	int m_charHeight; // Maximum character height
-	TEXTURE_NAME m_textureName; // Texture
+	ResourceLocation *m_textureLocation; // Texture
 	std::map<int, int> m_charMap;
 
 public:
-    Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, TEXTURE_NAME textureName, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = NULL);
+    Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, ResourceLocation *textureLocation, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[] = NULL);
 #ifndef _XBOX
 	// 4J Stu - This dtor clashes with one in xui! We never delete these anyway so take it out for now. Can go back when we have got rid of XUI
 	~Font();