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

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

1 files changed, 12 insertions, 6 deletions

diff --git a/Minecraft.Client/TntRenderer.cpp b/Minecraft.Client/TntRenderer.cpp
index 3bb7484f..52e2877d 100644
--- a/Minecraft.Client/TntRenderer.cpp
+++ b/Minecraft.Client/TntRenderer.cpp
@@ -1,12 +1,13 @@
 #include "stdafx.h"
 #include "TntRenderer.h"
+#include "TextureAtlas.h"
 #include "TileRenderer.h"
 #include "..\Minecraft.World\net.minecraft.world.entity.item.h"
 #include "..\Minecraft.World\net.minecraft.world.level.tile.h"
 
 TntRenderer::TntRenderer()
 {
-	tileRenderer = new TileRenderer();
+	renderer = new TileRenderer();
 	this->shadowRadius = 0.5f;
 }
 
@@ -29,10 +30,10 @@ void TntRenderer::render(shared_ptr<Entity> _tnt, double x, double y, double z,
     }
 
     float br = (1 - ((tnt->life - a + 1) / 100.0f)) * 0.8f;
-    bindTexture(TN_TERRAIN);	// 4J was L"/terrain.png"
+    bindTexture(tnt);
 	// 4J - change brought forward from 1.8.2
 	float brightness = SharedConstants::TEXTURE_LIGHTING ? 1.0f : tnt->getBrightness(a);
-    tileRenderer->renderTile(Tile::tnt, 0, brightness);
+    renderer->renderTile(Tile::tnt, 0, brightness);
     if (tnt->life / 5 % 2 == 0)
 	{
         glDisable(GL_TEXTURE_2D);
@@ -40,13 +41,18 @@ void TntRenderer::render(shared_ptr<Entity> _tnt, double x, double y, double z,
         glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
         glColor4f(1, 1, 1, br);
-		tileRenderer->setColor = false;					// 4J added so that renderTile doesn't set its own colour here
-        tileRenderer->renderTile(Tile::tnt, 0, 1);
-		tileRenderer->setColor = true;					// 4J added so that renderTile doesn't set its own colour here
+		renderer->setColor = false;					// 4J added so that renderTile doesn't set its own colour here
+        renderer->renderTile(Tile::tnt, 0, 1);
+		renderer->setColor = true;					// 4J added so that renderTile doesn't set its own colour here
         glColor4f(1, 1, 1, 1);
         glDisable(GL_BLEND);
         glEnable(GL_LIGHTING);
         glEnable(GL_TEXTURE_2D);
     }
     glPopMatrix();
+}
+
+ResourceLocation *TntRenderer::getTextureLocation(shared_ptr<Entity> mob)
+{
+    return &TextureAtlas::LOCATION_BLOCKS;
 }
\ No newline at end of file