From 3268f0aafc388ef3e1e90bcdc6a78f4357cbff9b Mon Sep 17 00:00:00 2001
From: iProgramInCpp <iprogramincpp@gmail.com>
Date: Sat, 5 Aug 2023 12:03:17 +0300
Subject: [PATCH] * Flip the tiles by 90 degrees * Fix stairs rendering

This fixes bad lighting on the sand, but tiles are "mirrored" from their look in gui_blocks.png. But this is an overall better state :)
---
 source/Minecraft.cpp                           |  2 ++
 source/client/renderer/TileRenderer.cpp        |  6 +++---
 source/client/renderer/entity/ItemRenderer.cpp |  1 +
 windows_vs/minecraftcpp.vcxproj.filters        | 12 ++++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/source/Minecraft.cpp b/source/Minecraft.cpp
index 7fa8a39..6d66b12 100644
--- a/source/Minecraft.cpp
+++ b/source/Minecraft.cpp
@@ -513,6 +513,8 @@ void Minecraft::tick()
 			_levelGenerated();
 		}
 
+		SandTile::instaFall = false;
+
 		if (m_pLevel && !field_288)
 		{
 			m_pGameRenderer->tick();
diff --git a/source/client/renderer/TileRenderer.cpp b/source/client/renderer/TileRenderer.cpp
index a218a7f..1aad547 100644
--- a/source/client/renderer/TileRenderer.cpp
+++ b/source/client/renderer/TileRenderer.cpp
@@ -2308,10 +2308,10 @@ void TileRenderer::renderTile(Tile* tile, int data RENDER_TILE_ARG_PATCH)
 		renderFaceUp  (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YNEG, data));
 		SHADE_IF_NEEDED(1.0f);
 		renderFaceDown(tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_YPOS, data));
-		SHADE_IF_NEEDED(0.6f);
+		SHADE_IF_NEEDED(0.8f);
 		renderNorth   (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZNEG, data));
 		renderSouth   (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_ZPOS, data));
-		SHADE_IF_NEEDED(0.8f);
+		SHADE_IF_NEEDED(0.6f);
 		renderWest    (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XNEG, data));
 		renderEast    (tile, 0.0f, 0.0f, 0.0f, tile->getTexture(DIR_XPOS, data));
 		SHADE_IF_NEEDED(1.0f);
@@ -2356,7 +2356,7 @@ void TileRenderer::renderTile(Tile* tile, int data RENDER_TILE_ARG_PATCH)
 		t.addOffset(-0.5f, -0.5f, -0.5f);
 		for (int i = 0; i < 2; i++)
 		{
-			if (i)
+			if (!i)
 				tile->setShape(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f);
 			else
 				tile->setShape(0.0f, 0.0f, 0.5f, 1.0f, 0.5f, 1.0f);
diff --git a/source/client/renderer/entity/ItemRenderer.cpp b/source/client/renderer/entity/ItemRenderer.cpp
index 903cc6f..f4b03f3 100644
--- a/source/client/renderer/entity/ItemRenderer.cpp
+++ b/source/client/renderer/entity/ItemRenderer.cpp
@@ -239,6 +239,7 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, ItemInstance* i
 		glScalef(10, 10, 10);
 		glRotatef(210.0f, 1.0f, 0.0f, 0.0f);
 		glRotatef(45.0f, 0.0f, 1.0f, 0.0f);
+		glRotatef(-90.0f, 0.0f, 1.0f, 0.0f);
 
 		#ifdef ENH_SHADE_HELD_TILES
 		#	define PARM_HACK , 1
diff --git a/windows_vs/minecraftcpp.vcxproj.filters b/windows_vs/minecraftcpp.vcxproj.filters
index c41c174..8eb10ff 100644
--- a/windows_vs/minecraftcpp.vcxproj.filters
+++ b/windows_vs/minecraftcpp.vcxproj.filters
@@ -1074,12 +1074,6 @@
     <ClCompile Include="..\source\World\Renderer\ItemSpriteRenderer.cpp">
       <Filter>Source Files\World\Renderer\Entity</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\World\Tile\Sapling.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\World\Tile\SpongeTile.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\World\Tile\BookshelfTile.cpp">
       <Filter>Source Files\World\Tile</Filter>
     </ClCompile>
@@ -1098,6 +1092,12 @@
     <ClCompile Include="..\source\World\Generator\OreFeature.cpp">
       <Filter>Source Files\World\Generator\Features</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\World\Tile\Sapling.cpp">
+      <Filter>Source Files\World\Tile</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\World\Tile\SpongeTile.cpp">
+      <Filter>Source Files\World\Tile</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\Options.hpp">