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

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

1 files changed, 78 insertions, 0 deletions

diff --git a/Minecraft.World/FlatLayerInfo.cpp b/Minecraft.World/FlatLayerInfo.cpp
new file mode 100644
index 00000000..4a4d79dd
--- /dev/null
+++ b/Minecraft.World/FlatLayerInfo.cpp
@@ -0,0 +1,78 @@
+#include "stdafx.h"
+
+#include "FlatLayerInfo.h"
+
+void FlatLayerInfo::_init(int height, int id)
+{
+	this->height = height;
+	this->id = id;
+	data = 0;
+	start = 0;
+}
+
+FlatLayerInfo::FlatLayerInfo(int height, int id)
+{
+	_init(height, id);
+}
+
+FlatLayerInfo::FlatLayerInfo(int height, int id, int data)
+{
+	_init(height, id);
+	this->data = data;
+}
+
+int FlatLayerInfo::getHeight()
+{
+	return height;
+}
+
+void FlatLayerInfo::setHeight(int height)
+{
+	this->height = height;
+}
+
+int FlatLayerInfo::getId()
+{
+	return id;
+}
+
+void FlatLayerInfo::setId(int id)
+{
+	this->id = id;
+}
+
+int FlatLayerInfo::getData()
+{
+	return data;
+}
+
+void FlatLayerInfo::setData(int data)
+{
+	this->data = data;
+}
+
+int FlatLayerInfo::getStart()
+{
+	return start;
+}
+
+void FlatLayerInfo::setStart(int start)
+{
+	this->start = start;
+}
+
+wstring FlatLayerInfo::toString()
+{
+	wstring result = _toString<int>(id);
+
+	if (height > 1)
+	{
+		result = _toString<int>(height) + L"x" + result;
+	}
+	if (data > 0)
+	{
+		result += L":" + _toString<int>(data);
+	}
+
+	return result;
+}
\ No newline at end of file