From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: 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>
---
 Minecraft.World/FoodRecipies.cpp | 62 ++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

(limited to 'Minecraft.World/FoodRecipies.cpp')

diff --git a/Minecraft.World/FoodRecipies.cpp b/Minecraft.World/FoodRecipies.cpp
index 1497cd41..e78700f4 100644
--- a/Minecraft.World/FoodRecipies.cpp
+++ b/Minecraft.World/FoodRecipies.cpp
@@ -14,38 +14,31 @@ void FoodRecipies::addRecipes(Recipes *r)
 		L"###", //
 		L"#X#", //
 		L"###", //
-		L'#', Item::goldNugget, L'X', Item::apple,
+		L'#', Item::goldIngot, L'X', Item::apple,
+		L'F');
+
+	r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 1), //
+		L"sssctcig",
+		L"###", //
+		L"#X#", //
+		L"###", //
+		L'#', Tile::goldBlock, L'X', Item::apple,
+		L'F');
+
+	r->addShapedRecipy(new ItemInstance(Item::speckledMelon, 1), //
+		L"ssscicig",
+		L"###", //
+		L"#X#", //
+		L"###", //
+
+		L'#', Item::goldNugget, L'X', Item::melon,
 		L'F');
 	
-	// 4J-PB - Moving the mushroom stew shaped->shapeless forward from 1.9, so it will not need the crafting table
 	r->addShapelessRecipy(new ItemInstance(Item::mushroomStew), 
 		L"ttig", 
-		Tile::mushroom1, Tile::mushroom2, Item::bowl,
+		Tile::mushroom_brown, Tile::mushroom_red, Item::bowl,
 		L'F');
-
-	/*r->addShapedRecipy(new ItemInstance(Item::mushroomStew), //
-				L"sssctctcig",
-                L"Y", //
-                L"X", //
-                L"#", //
-
-                L'X', Tile::mushroom1,
-                L'Y', Tile::mushroom2,
-                L'#', Item::bowl,
-				L'F');*/
-
-	// 4J-PB - removing for the xbox game - we already have it above
-// 	r->addShapedRecipy(new ItemInstance(Item::mushroomStew), //
-// 				L"sssctctcig",
-//                 L"Y", //
-//                 L"X", //
-//                 L"#", //
-// 
-//                 L'X', Tile::mushroom2,
-//                 L'Y', Tile::mushroom1,
-//                 L'#', Item::bowl,
-// 				L'F');
-//         
+      
 	r->addShapedRecipy(new ItemInstance(Item::cookie, 8), //
 				L"sczcig",
                 L"#X#", //
@@ -82,14 +75,6 @@ void FoodRecipies::addRecipes(Recipes *r)
 		Tile::pumpkin, Item::sugar, Item::egg,
 		L'F');
 
-	r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 1), //
-		L"sssctcig",
-		L"###", //
-		L"#X#", //
-		L"###", //
-		L'#', Tile::goldBlock, L'X', Item::apple,
-		L'F');
-
 	r->addShapedRecipy(new ItemInstance(Item::carrotGolden, 1, 0), //
 		L"ssscicig",
 		L"###", //
@@ -101,12 +86,7 @@ void FoodRecipies::addRecipes(Recipes *r)
 
 	r->addShapelessRecipy(new ItemInstance(Item::fermentedSpiderEye), //
 		L"itig",
-		Item::spiderEye, Tile::mushroom1, Item::sugar,
-		L'F');
-
-	r->addShapelessRecipy(new ItemInstance(Item::speckledMelon), //
-		L"iig",
-		Item::melon, Item::goldNugget,
+		Item::spiderEye, Tile::mushroom_brown, Item::sugar,
 		L'F');
 
 	r->addShapelessRecipy(new ItemInstance(Item::blazePowder, 2), //
-- 
cgit v1.2.3