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

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

1 files changed, 11 insertions, 9 deletions

diff --git a/Minecraft.Client/ExperienceOrbRenderer.cpp b/Minecraft.Client/ExperienceOrbRenderer.cpp
index 1771f833..c0eae756 100644
--- a/Minecraft.Client/ExperienceOrbRenderer.cpp
+++ b/Minecraft.Client/ExperienceOrbRenderer.cpp
@@ -8,17 +8,14 @@
 #include "..\Minecraft.World\Mth.h"
 #include "..\Minecraft.World\JavaMath.h"
 
+ResourceLocation ExperienceOrbRenderer::XP_ORB_LOCATION = ResourceLocation(TN_ITEM_EXPERIENCE_ORB);
+
 ExperienceOrbRenderer::ExperienceOrbRenderer()
 {
-	// 4J In class Java initialisors
-	tileRenderer = new TileRenderer();
-	setColor = true;
-
-	this->shadowRadius = 0.15f;
-	this->shadowStrength = 0.75f;
+	shadowRadius = 0.15f;
+	shadowStrength = 0.75f;
 }
 
-
 void ExperienceOrbRenderer::render(shared_ptr<Entity> _orb, double x, double y, double z, float rot, float a)
 {
 	shared_ptr<ExperienceOrb> orb = dynamic_pointer_cast<ExperienceOrb>(_orb);
@@ -26,8 +23,7 @@ void ExperienceOrbRenderer::render(shared_ptr<Entity> _orb, double x, double y,
 	glTranslatef((float) x, (float) y, (float) z);
 
 	int icon = orb->getIcon();
-	bindTexture(TN_ITEM_EXPERIENCE_ORB);	// 4J was L"/item/xporb.png"
-	Tesselator *t = Tesselator::getInstance();
+	bindTexture(orb);	// 4J was L"/item/xporb.png"
 
 	float u0 = ((icon % 4) * 16 + 0) / 64.0f;
 	float u1 = ((icon % 4) * 16 + 16) / 64.0f;
@@ -62,6 +58,7 @@ void ExperienceOrbRenderer::render(shared_ptr<Entity> _orb, double x, double y,
 	glRotatef(-entityRenderDispatcher->playerRotX, 1, 0, 0);
 	float s = 0.3f;
 	glScalef(s, s, s);
+	Tesselator *t = Tesselator::getInstance();
 	t->begin();
 	t->color(col, 128);
 	t->normal(0, 1, 0);
@@ -76,6 +73,11 @@ void ExperienceOrbRenderer::render(shared_ptr<Entity> _orb, double x, double y,
 	glPopMatrix();
 }
 
+ResourceLocation *ExperienceOrbRenderer::getTextureLocation(shared_ptr<Entity> mob)
+{
+    return &XP_ORB_LOCATION;
+}
+
 void ExperienceOrbRenderer::blit(int x, int y, int sx, int sy, int w, int h)
 {
 	float blitOffset = 0;