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

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

1 files changed, 52 insertions, 0 deletions

diff --git a/Minecraft.World/StainedGlassPaneBlock.cpp b/Minecraft.World/StainedGlassPaneBlock.cpp
new file mode 100644
index 00000000..086d8ae5
--- /dev/null
+++ b/Minecraft.World/StainedGlassPaneBlock.cpp
@@ -0,0 +1,52 @@
+#include "stdafx.h"
+#include "net.minecraft.world.h"
+#include "net.minecraft.world.item.h"
+#include "StainedGlassPaneBlock.h"
+
+Icon *StainedGlassPaneBlock::ICONS[StainedGlassPaneBlock::ICONS_COUNT];
+Icon *StainedGlassPaneBlock::EDGE_ICONS[StainedGlassPaneBlock::ICONS_COUNT];
+
+StainedGlassPaneBlock::StainedGlassPaneBlock(int id) : ThinFenceTile(id, L"glass", L"glass_pane_top", Material::glass, false)
+{
+}
+
+Icon *StainedGlassPaneBlock::getIconTexture(int face, int data)
+{
+	return ICONS[data % ICONS_COUNT];
+}
+
+Icon *StainedGlassPaneBlock::getEdgeTexture(int data)
+{
+	return EDGE_ICONS[~data & 0xF];
+}
+
+Icon *StainedGlassPaneBlock::getTexture(int face, int data)
+{
+	return getIconTexture(face, ~data & 0xf);
+}
+
+int StainedGlassPaneBlock::getSpawnResourcesAuxValue(int data)
+{
+	return data;
+}
+
+int StainedGlassPaneBlock::getItemAuxValueForBlockData(int data)
+{
+	return (data & 0xf);
+}
+
+
+int StainedGlassPaneBlock::getRenderLayer()
+{
+	return 1;
+}
+
+void StainedGlassPaneBlock::registerIcons(IconRegister *iconRegister)
+{
+	ThinFenceTile::registerIcons(iconRegister);
+	for (int i = 0; i < ICONS_COUNT; i++)
+	{
+		ICONS[i] = iconRegister->registerIcon(getIconName() + L"_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]);
+		EDGE_ICONS[i] = iconRegister->registerIcon(getIconName() + L"_pane_top_" + DyePowderItem::COLOR_TEXTURES[getItemAuxValueForBlockData(i)]);
+	}
+}
\ No newline at end of file