LegacyConsole/GabsPuNs-Project_Zenith_Main
3
0
Fork 0
mirror of https://github.com/GabsPuNs/Project-Zenith-Main.git synced 2026-06-05 09:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU24

Browse Source
This commit is contained in:
GabsPuNs
2026-05-14 21:52:21 -04:00
parent 1b2f5c6fe8
commit f8a2d644f5
291 changed files with 7363 additions and 18368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
Minecraft.World/Recipes.cpp
View File

@@ -51,39 +51,35 @@ Recipes::Recipes()
pFireworksRecipes = new FireworksRecipe();
addShapedRecipy(new ItemInstance(Tile::wood, 4, LogTile::OAK_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::wood, 4, 0), //
L"sczg",
L"#", //
L'#', new ItemInstance(Tile::treeTrunk, 1, LogTile::OAK_TRUNK),
L'#', new ItemInstance(Tile::treeTrunk, 1, 0),
L'S');
// TU9 - adding coloured wood
addShapedRecipy(new ItemInstance(Tile::wood, 4, LogTile::BIRCH_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::BIRCH_TRUNK), //
L"sczg",
L"#", //
L'#', new ItemInstance(Tile::treeTrunk, 1, LogTile::BIRCH_TRUNK),
L'#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::wood, 4, LogTile::DARK_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::DARK_TRUNK), //
L"sczg",
L"#", //
L'#', new ItemInstance(Tile::treeTrunk, 1, LogTile::DARK_TRUNK),
L'#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::wood, 4, LogTile::JUNGLE_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::JUNGLE_TRUNK), //
L"sczg",
L"#", //
L'#', new ItemInstance(Tile::treeTrunk, 1, LogTile::JUNGLE_TRUNK),
L'#', new ItemInstance(Tile::treeTrunk, 1, TreeTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// Tile::newTreeTrunk (LogTile::ACACIA_TRUNK and LogTile::DARK_OAK_TRUNK)
#endif
addShapedRecipy(new ItemInstance(Item::stick, 4), //
L"ssctg",
L"#", //
@@ -135,87 +131,21 @@ Recipes::Recipes()
L'S');
addShapedRecipy(new ItemInstance(Tile::fenceGate, 1), //
L"ssciczg",
L"sscictg",
L"#W#", //
L"#W#", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::OAK_TRUNK),
L'S');
L'#', Item::stick, L'W', Tile::wood,
L'S');
addShapedRecipy(new ItemInstance(Tile::birchFenceGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
addShapedRecipy(new ItemInstance(Tile::fence, 2), //
L"sscig",
L"###", //
L"###", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::spruceFenceGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::jungleFenceGate, 1), //
L"ssciczg",
L"#W#", //
L"#W#", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// Tile::acaciaFenceGate
// Tile::darkOakFenceGate
#endif
addShapedRecipy(new ItemInstance(Tile::fence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::OAK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::birchFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::spruceFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::jungleFence, 3), //
L"ssciczg",
L"W#W", //
L"W#W", //
L'#', Item::stick,
L'W', new ItemInstance(Tile::wood, 1, LogTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// Tile::acaciaFence
// Tile::darkOakFence
#endif
addShapedRecipy(new ItemInstance(Tile::netherFence, 6), //
L"ssctg",
L"###", //
@@ -248,48 +178,16 @@ Recipes::Recipes()
L'#', Tile::mossyCobblestone,
L'S');
addShapedRecipy(new ItemInstance(Item::door_wood, 3), //
L"sssczg",
addShapedRecipy(new ItemInstance(Item::door_wood, 1), //
L"sssctg",
L"##", //
L"##", //
L"##", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::OAK_TRUNK),
L'#', Tile::wood,
L'S');
addShapedRecipy(new ItemInstance(Item::door_birch, 3), //
L"sssczg",
L"##", //
L"##", //
L"##", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Item::door_spruce, 3), //
L"sssczg",
L"##", //
L"##", //
L"##", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Item::door_jungle, 3), //
L"sssczg",
L"##", //
L"##", //
L"##", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// Item::door_acacia
// Item::door_dark_oak
#endif
addShapedRecipy(new ItemInstance(Item::door_iron, 3), //
addShapedRecipy(new ItemInstance(Item::door_iron, 1), //
L"ssscig",
L"##", //
L"##", //
@@ -304,7 +202,7 @@ Recipes::Recipes()
L"## ", //
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::OAK_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, 0),
L'S');
addShapedRecipy(new ItemInstance(Tile::trapdoor, 2), //
@@ -314,15 +212,6 @@ Recipes::Recipes()
L'#', Tile::wood,
L'S');
addShapedRecipy(new ItemInstance(Tile::iron_trapdoor, 1), //
L"sscig",
L"##", //
L"##", //
L'#', Item::ironIngot,
L'S');
addShapedRecipy(new ItemInstance(Tile::stairs_stone, 4), //
L"sssctg",
L"# ", //
@@ -374,7 +263,7 @@ Recipes::Recipes()
L"## ", //
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::BIRCH_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::woodStairsDark, 4), //
@@ -383,7 +272,7 @@ Recipes::Recipes()
L"## ", //
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::DARK_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::woodStairsJungle, 4), //
@@ -392,14 +281,9 @@ Recipes::Recipes()
L"## ", //
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::JUNGLE_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// LogTile::ACACIA_TRUNK
// LogTile::DARK_OAK_TRUNK
#endif
addShapedRecipy(new ItemInstance(Tile::stairs_quartz, 4), //
L"sssctg",
L"# ", //
@@ -512,39 +396,37 @@ Recipes::Recipes()
L'#', Tile::quartzBlock,
L'S');
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, LogTile::OAK_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, 0), //
L"sczg",
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::OAK_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, 0),
L'S');
// TU9 - adding wood slabs
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, LogTile::BIRCH_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::BIRCH_TRUNK), //
L"sczg",
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::BIRCH_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, LogTile::DARK_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::DARK_TRUNK), //
L"sczg",
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::DARK_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK),
L'S');
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, LogTile::JUNGLE_TRUNK), //
addShapedRecipy(new ItemInstance(Tile::woodSlabHalf, 6, TreeTile::JUNGLE_TRUNK), //
L"sczg",
L"###", //
L'#', new ItemInstance(Tile::wood, 1, LogTile::JUNGLE_TRUNK),
L'#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK),
L'S');
#if TO_BE_IMPLEMENTED // TU31
// LogTile::ACACIA_TRUNK and LogTile::DARK_OAK_TRUNK
#endif
@@ -1371,7 +1253,7 @@ shared_ptr<ItemInstance> Recipes::getItemFor(shared_ptr<CraftingContainer> craft
int count = 0;
shared_ptr<ItemInstance> first = nullptr;
shared_ptr<ItemInstance> second = nullptr;
for (unsigned int i = 0; i < craftSlots->getContainerSize(); i++)
for (int i = 0; i < craftSlots->getContainerSize(); i++)
{
shared_ptr<ItemInstance> item = craftSlots->getItem(i);
if (item != nullptr)