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

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

1 files changed, 26 insertions, 0 deletions

diff --git a/Minecraft.World/FlatLayerInfo.h b/Minecraft.World/FlatLayerInfo.h
new file mode 100644
index 00000000..68096720
--- /dev/null
+++ b/Minecraft.World/FlatLayerInfo.h
@@ -0,0 +1,26 @@
+#pragma once
+
+class FlatLayerInfo
+{
+private:
+	int height;
+	int id;
+	int data;
+	int start;
+
+	void _init(int height, int id);
+
+public:
+	FlatLayerInfo(int height, int id);
+	FlatLayerInfo(int height, int id, int data);
+
+	int getHeight();
+	void setHeight(int height);
+	int getId();
+	void setId(int id);
+	int getData();
+	void setData(int data);
+	int getStart();
+	void setStart(int start);
+	wstring toString();
+};
\ No newline at end of file