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

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

1 files changed, 5 insertions, 3 deletions

diff --git a/Minecraft.Client/TileEntityRenderer.h b/Minecraft.Client/TileEntityRenderer.h
index b7d08b86..b3bafb9d 100644
--- a/Minecraft.Client/TileEntityRenderer.h
+++ b/Minecraft.Client/TileEntityRenderer.h
@@ -1,5 +1,7 @@
 #pragma once
 #include "Textures.h"
+#include "ResourceLocation.h"
+
 class TileEntityRenderDispatcher;
 class TileEntity;
 class Level;
@@ -10,11 +12,11 @@ class TileEntityRenderer
 protected:
 	TileEntityRenderDispatcher *tileEntityRenderDispatcher;
 public:
-	virtual void render(shared_ptr<TileEntity> entity, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled) = 0;		// 4J added setColor param and alpha and useCompiled
+	virtual void render(shared_ptr<TileEntity> entity, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled) = 0;		// 4J added setColor param, alpha and useCompiled
 	virtual void onNewLevel(Level *level) {}
 protected:
-	void bindTexture(int resourceName);		// 4J - changed from wstring to int
-    void bindTexture(const wstring& urlTexture, int backupTexture);	// 4J - changed from wstring to int
+	void bindTexture(ResourceLocation *location);		// 4J - changed from wstring to int
+    void bindTexture(const wstring& urlTexture, ResourceLocation *location);	// 4J - changed from wstring to int
 private:
 	Level *getLevel();
 public: