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

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

1 files changed, 18 insertions, 11 deletions

diff --git a/Minecraft.World/MultiTextureTileItem.cpp b/Minecraft.World/MultiTextureTileItem.cpp
index a41a896f..88343275 100644
--- a/Minecraft.World/MultiTextureTileItem.cpp
+++ b/Minecraft.World/MultiTextureTileItem.cpp
@@ -1,14 +1,24 @@
 #include "stdafx.h"
 #include "Tile.h"
 #include "MultiTextureTileItem.h"
+#include "net.minecraft.world.item.crafting.h"
 
 
-MultiTextureTileItem::MultiTextureTileItem(int id, Tile *parentTile, int *nameExtensions, int iLength) : TileItem(id)
+MultiTextureTileItem::MultiTextureTileItem(int id, Tile *parentTile, int *nameExtensions, int iLength, int anyValueName) : TileItem(id)
 {
 	this->parentTile = parentTile;
 	this->nameExtensions = nameExtensions;
 	this->m_iNameExtensionsLength=iLength;
 
+	if(anyValueName != -1)
+	{
+		m_anyValueName = anyValueName;
+	}
+	else
+	{
+		m_anyValueName = nameExtensions[0];
+	}
+
 	setMaxDamage(0);
 	setStackedByData(true);
 }
@@ -29,18 +39,15 @@ unsigned int MultiTextureTileItem::getDescriptionId(int iData)
 	{
 		iData = 0;
 	}
-	//return super.getDescriptionId() + "." + nameExtensions[auxValue];
 	return nameExtensions[iData];
 }
 
 unsigned int MultiTextureTileItem::getDescriptionId(shared_ptr<ItemInstance> instance) 
 {
-		int auxValue = instance->getAuxValue();
-		if (auxValue < 0 || auxValue >= m_iNameExtensionsLength) 
-		{
-			auxValue = 0;
-		}
-		//return super.getDescriptionId() + "." + nameExtensions[auxValue];
-		return nameExtensions[auxValue];
-}
-
+	int auxValue = instance->getAuxValue();
+	if (auxValue == Recipes::ANY_AUX_VALUE || auxValue < 0 || auxValue >= m_iNameExtensionsLength) 
+	{
+		return m_anyValueName;
+	}
+	return nameExtensions[auxValue];
+}
\ No newline at end of file