feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 48 insertions, 2 deletions

diff --git a/Minecraft.World/ScatteredFeaturePieces.h b/Minecraft.World/ScatteredFeaturePieces.h
index 08ab92ba..5fb334df 100644
--- a/Minecraft.World/ScatteredFeaturePieces.h
+++ b/Minecraft.World/ScatteredFeaturePieces.h
@@ -4,6 +4,9 @@
 
 class ScatteredFeaturePieces
 {
+public:
+	static void loadStatic();
+
 private:
 	class ScatteredFeaturePiece : public StructurePiece
 	{
@@ -14,8 +17,11 @@ private:
 
 		int heightPosition;
 
+		ScatteredFeaturePiece();
 		ScatteredFeaturePiece(Random *random, int west, int floor, int north, int width, int height, int depth);
 
+		virtual void addAdditonalSaveData(CompoundTag *tag);
+		virtual void readAdditonalSaveData(CompoundTag *tag);
 		bool updateAverageGroundHeight(Level *level, BoundingBox *chunkBB, int offset);
 	};
 
@@ -23,14 +29,23 @@ public:
 	class DesertPyramidPiece : public ScatteredFeaturePiece
 	{
 	public:
-		static const int TREASURE_ITEMS_COUNT = 6;
+		static StructurePiece *Create() { return new DesertPyramidPiece(); }
+		virtual EStructurePiece GetType() { return eStructurePiece_DesertPyramidPiece; }
+
+	public:
+		static const int TREASURE_ITEMS_COUNT = 10;
 	private:
 		bool hasPlacedChest[4];
 		static WeighedTreasure *treasureItems[TREASURE_ITEMS_COUNT];
 
 	public:
+		DesertPyramidPiece();
 		DesertPyramidPiece(Random *random, int west, int north);
 
+	protected:
+		virtual void addAdditonalSaveData(CompoundTag *tag);
+		virtual void readAdditonalSaveData(CompoundTag *tag);
+
 		bool postProcess(Level *level, Random *random, BoundingBox *chunkBB);
 
 	};
@@ -38,7 +53,11 @@ public:
 	class JunglePyramidPiece : public ScatteredFeaturePiece
 	{
 	public:
-		static const int TREASURE_ITEMS_COUNT = 6;
+		static StructurePiece *Create() { return new JunglePyramidPiece(); }
+		virtual EStructurePiece GetType() { return eStructurePiece_JunglePyramidPiece; }
+
+	public:
+		static const int TREASURE_ITEMS_COUNT = 10;
 		static const int DISPENSER_ITEMS_COUNT = 1;
 	private:
 		bool placedMainChest;
@@ -50,8 +69,14 @@ public:
 		static WeighedTreasure *dispenserItems[DISPENSER_ITEMS_COUNT];
 
 	public:
+		JunglePyramidPiece();
 		JunglePyramidPiece(Random *random, int west, int north);
 
+	protected:
+		virtual void addAdditonalSaveData(CompoundTag *tag);
+		virtual void readAdditonalSaveData(CompoundTag *tag);
+
+	public:
 		bool postProcess(Level *level, Random *random, BoundingBox *chunkBB);
 
 	private:
@@ -64,4 +89,25 @@ public:
 		static MossStoneSelector stoneSelector;
 
 	};
+
+	class SwamplandHut : public ScatteredFeaturePiece
+	{
+	public:
+		static StructurePiece *Create() { return new SwamplandHut(); }
+		virtual EStructurePiece GetType() { return eStructurePiece_SwamplandHut; }
+
+	private:
+		bool spawnedWitch;
+
+	public:
+		SwamplandHut();
+		SwamplandHut(Random *random, int west, int north);
+
+	protected:
+		virtual void addAdditonalSaveData(CompoundTag *tag);
+		virtual void readAdditonalSaveData(CompoundTag *tag);
+
+	public:
+		bool postProcess(Level *level, Random *random, BoundingBox *chunkBB);
+	};
 };
\ No newline at end of file