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

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

1 files changed, 24 insertions, 6 deletions

diff --git a/Minecraft.World/StructureStart.h b/Minecraft.World/StructureStart.h
index e035f564..72035367 100644
--- a/Minecraft.World/StructureStart.h
+++ b/Minecraft.World/StructureStart.h
@@ -2,24 +2,42 @@
 class StructurePiece;
 class BoundingBox;
 
+#include "StructureFeatureIO.h"
+
 class StructureStart
 {
+public:
+	list<StructurePiece *> pieces;
 
 protected:
-	list<StructurePiece *> pieces;
-    BoundingBox *boundingBox;
+	BoundingBox *boundingBox;
+
+private:
+	int chunkX, chunkZ;
 
-    StructureStart();
 public:
+	StructureStart();
+	StructureStart(int x, int z);
 	~StructureStart();
 	BoundingBox *getBoundingBox();
-    list<StructurePiece *> *getPieces();
-    void postProcess(Level *level, Random *random, BoundingBox *chunkBB);
+	list<StructurePiece *> *getPieces();
+	void postProcess(Level *level, Random *random, BoundingBox *chunkBB);
 protected:
 	void calculateBoundingBox();
-    void moveBelowSeaLevel(Level *level, Random *random, int offset);
+
+public:
+	virtual CompoundTag *createTag(int chunkX, int chunkZ);
+	virtual void addAdditonalSaveData(CompoundTag *tag);
+	virtual void load(Level *level, CompoundTag *tag);
+	virtual void readAdditonalSaveData(CompoundTag *tag);
+
+protected:
+	void moveBelowSeaLevel(Level *level, Random *random, int offset);
 	void moveInsideHeights(Level *level, Random *random, int lowestAllowed, int highestAllowed);
 public:
 	bool isValid();
+	int getChunkX();
+	int getChunkZ();
 
+	virtual EStructureStart GetType() = 0;
 };