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

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

1 files changed, 54 insertions, 0 deletions

diff --git a/Minecraft.World/StainedGlassBlock.cpp b/Minecraft.World/StainedGlassBlock.cpp
new file mode 100644
index 00000000..3fae3d46
--- /dev/null
+++ b/Minecraft.World/StainedGlassBlock.cpp
@@ -0,0 +1,54 @@
+#include "stdafx.h"
+#include "net.minecraft.world.item.h"
+#include "net.minecraft.world.h"
+#include "StainedGlassBlock.h"
+
+Icon *StainedGlassBlock::ICONS[StainedGlassBlock::ICONS_LENGTH];
+
+StainedGlassBlock::StainedGlassBlock(int id, Material *material) : HalfTransparentTile(id, L"glass", material, false)
+{
+}
+
+Icon *StainedGlassBlock::getTexture(int face, int data)
+{
+	return ICONS[data % ICONS_LENGTH];
+}
+
+int StainedGlassBlock::getSpawnResourcesAuxValue(int data)
+{
+	return data;
+}
+
+int StainedGlassBlock::getItemAuxValueForBlockData(int data)
+{
+	return (~data & 0xf);
+}
+
+
+int StainedGlassBlock::getRenderLayer()
+{
+	return 1;
+}
+
+void StainedGlassBlock::registerIcons(IconRegister *iconRegister)
+{
+	for (int i = 0; i < ICONS_LENGTH; i++)
+	{
+		ICONS[i] = iconRegister->registerIcon(getIconName() + L"_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]);
+	}
+}
+
+int StainedGlassBlock::getResourceCount(Random *random) 
+{
+	return 0;
+}
+
+bool StainedGlassBlock::isSilkTouchable()
+{
+	return true;
+}
+
+bool StainedGlassBlock::isCubeShaped()
+{
+	return false;
+}