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

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

1 files changed, 77 insertions, 0 deletions

diff --git a/Minecraft.World/RotatedPillarTile.cpp b/Minecraft.World/RotatedPillarTile.cpp
new file mode 100644
index 00000000..a4b7d931
--- /dev/null
+++ b/Minecraft.World/RotatedPillarTile.cpp
@@ -0,0 +1,77 @@
+#include "stdafx.h"
+#include "net.minecraft.h"
+#include "RotatedPillarTile.h"
+
+RotatedPillarTile::RotatedPillarTile(int id, Material *material) : Tile(id, material)
+{
+}
+
+int RotatedPillarTile::getRenderShape()
+{
+	return Tile::SHAPE_TREE;
+}
+
+int RotatedPillarTile::getPlacedOnFaceDataValue(Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, int itemValue)
+{
+	int type = itemValue & MASK_TYPE;
+	int facing = 0;
+
+	switch (face)
+	{
+	case Facing::NORTH:
+	case Facing::SOUTH:
+		facing = FACING_Z;
+		break;
+	case Facing::EAST:
+	case Facing::WEST:
+		facing = FACING_X;
+		break;
+	case Facing::UP:
+	case Facing::DOWN:
+		facing = FACING_Y;
+		break;
+	}
+
+	return type | facing;
+}
+
+Icon *RotatedPillarTile::getTexture(int face, int data)
+{
+	int dir = data & MASK_FACING;
+	int type = data & MASK_TYPE;
+
+	if (dir == FACING_Y && (face == Facing::UP || face == Facing::DOWN))
+	{
+		return getTopTexture(type);
+	}
+	else if (dir == FACING_X && (face == Facing::EAST || face == Facing::WEST))
+	{
+		return getTopTexture(type);
+	}
+	else if (dir == FACING_Z && (face == Facing::NORTH || face == Facing::SOUTH))
+	{
+		return getTopTexture(type);
+	}
+
+	return getTypeTexture(type);
+}
+
+Icon *RotatedPillarTile::getTopTexture(int type)
+{
+	return iconTop;
+}
+
+int RotatedPillarTile::getSpawnResourcesAuxValue(int data)
+{
+	return data & MASK_TYPE;
+}
+
+int RotatedPillarTile::getType(int data)
+{
+	return data & MASK_TYPE;
+}
+
+shared_ptr<ItemInstance> RotatedPillarTile::getSilkTouchItemInstance(int data)
+{
+	return shared_ptr<ItemInstance>( new ItemInstance(id, 1, getType(data)) );
+}
\ No newline at end of file