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

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

1 files changed, 24 insertions, 0 deletions

diff --git a/Minecraft.World/RandomScatteredLargeFeature.h b/Minecraft.World/RandomScatteredLargeFeature.h
index b7d9fc06..b5d46ce8 100644
--- a/Minecraft.World/RandomScatteredLargeFeature.h
+++ b/Minecraft.World/RandomScatteredLargeFeature.h
@@ -6,17 +6,41 @@
 class RandomScatteredLargeFeature : public StructureFeature
 {
 public:
+	static const wstring OPTION_SPACING;
+
 	static void staticCtor();
 	static vector<Biome *> allowedBiomes;
+
+private:
+	vector<Biome::MobSpawnerData *> swamphutEnemies;
+	int spacing;
+	int minSeparation;
+
+	void _init();
+
+public:
 	RandomScatteredLargeFeature();
+	RandomScatteredLargeFeature(unordered_map<wstring, wstring> options);
+
+	wstring getFeatureName();
 
 protected:
 	virtual bool isFeatureChunk(int x, int z, bool bIsSuperflat=false);
 	StructureStart *createStructureStart(int x, int z);
 
+public:
 	class ScatteredFeatureStart : public StructureStart
 	{
 	public:
+		static StructureStart *Create() { return new ScatteredFeatureStart(); }
+		virtual EStructureStart GetType() { return eStructureStart_ScatteredFeatureStart; }
+
+	public:
+		ScatteredFeatureStart();
 		ScatteredFeatureStart(Level *level, Random *random, int chunkX, int chunkZ);
 	};
+
+public:
+	bool isSwamphut(int cellX, int cellY, int cellZ);
+	vector<Biome::MobSpawnerData *> *getSwamphutEnemies();
 };
\ No newline at end of file