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, 29 insertions, 29 deletions

diff --git a/Minecraft.World/HugeMushroomTile.cpp b/Minecraft.World/HugeMushroomTile.cpp
index 9b8344c0..e96cfd1f 100644
--- a/Minecraft.World/HugeMushroomTile.cpp
+++ b/Minecraft.World/HugeMushroomTile.cpp
@@ -2,13 +2,13 @@
 #include "net.minecraft.world.h"
 #include "HugeMushroomTile.h"
 
-const wstring HugeMushroomTile::TEXTURE_STEM = L"mushroom_skin_stem";
-const wstring HugeMushroomTile::TEXTURE_INSIDE = L"mushroom_inside";
-const wstring HugeMushroomTile::TEXTURE_TYPE[] = {L"mushroom_skin_brown", L"mushroom_skin_red"};
+const wstring HugeMushroomTile::TEXTURE_STEM = L"skin_stem";
+const wstring HugeMushroomTile::TEXTURE_INSIDE = L"inside";
+const wstring HugeMushroomTile::TEXTURE_TYPE[] = {L"skin_brown", L"skin_red"};
 
 HugeMushroomTile::HugeMushroomTile(int id, Material *material, int type) : Tile(id, material)
 {
-    this->type = type;
+	this->type = type;
 	icons = NULL;
 	iconStem = NULL;
 	iconInside = NULL;
@@ -16,45 +16,45 @@ HugeMushroomTile::HugeMushroomTile(int id, Material *material, int type) : Tile(
 
 Icon *HugeMushroomTile::getTexture(int face, int data)
 {
-    // 123
-    // 456 10
-    // 789
-    if (data == 10 && face > 1) return iconStem;
-    if (data >= 1 && data <= 9 && face == 1) return icons[type];
-    if (data >= 1 && data <= 3 && face == 2) return icons[type];
-    if (data >= 7 && data <= 9 && face == 3) return icons[type];
+	// 123
+	// 456 10
+	// 789
+	if (data == 10 && face > 1) return iconStem;
+	if (data >= 1 && data <= 9 && face == 1) return icons[type];
+	if (data >= 1 && data <= 3 && face == 2) return icons[type];
+	if (data >= 7 && data <= 9 && face == 3) return icons[type];
 
-    if ((data == 1 || data == 4 || data == 7) && face == 4) return icons[type];
-    if ((data == 3 || data == 6 || data == 9) && face == 5) return icons[type];
+	if ((data == 1 || data == 4 || data == 7) && face == 4) return icons[type];
+	if ((data == 3 || data == 6 || data == 9) && face == 5) return icons[type];
 
-    // two special cases requested by rhodox (painterly pack)
-    if (data == 14)
+	// two special cases requested by rhodox (painterly pack)
+	if (data == 14)
 	{
-        return icons[type];
-    }
-    if (data == 15)
+		return icons[type];
+	}
+	if (data == 15)
 	{
-        return iconStem;
-    }
+		return iconStem;
+	}
 
-    return iconInside;
+	return iconInside;
 }
 
 int HugeMushroomTile::getResourceCount(Random *random)
 {
-    int count = random->nextInt(10) - 7;
-    if (count < 0) count = 0;
-    return count;
+	int count = random->nextInt(10) - 7;
+	if (count < 0) count = 0;
+	return count;
 }
 
 int HugeMushroomTile::getResource(int data, Random *random, int playerBonusLevel)
 {
-	return Tile::mushroom1_Id + type;
+	return Tile::mushroom_brown_Id + type;
 }
 
 int HugeMushroomTile::cloneTileId(Level *level, int x, int y, int z)
 {
-	return Tile::mushroom1_Id + type;
+	return Tile::mushroom_brown_Id + type;
 }
 
 void HugeMushroomTile::registerIcons(IconRegister *iconRegister)
@@ -63,9 +63,9 @@ void HugeMushroomTile::registerIcons(IconRegister *iconRegister)
 
 	for (int i = 0; i < HUGE_MUSHROOM_TEXTURE_COUNT; i++)
 	{
-		icons[i] = iconRegister->registerIcon(TEXTURE_TYPE[i]);
+		icons[i] = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_TYPE[i]);
 	}
 
-	iconInside = iconRegister->registerIcon(TEXTURE_INSIDE);
-	iconStem = iconRegister->registerIcon(TEXTURE_STEM);
+	iconInside = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_INSIDE);
+	iconStem = iconRegister->registerIcon(getIconName() + L"_" + TEXTURE_STEM);
 }
\ No newline at end of file