From a252e60b93975192437162e3da05cba08c84e246 Mon Sep 17 00:00:00 2001 From: SevenToaster509 Date: Tue, 14 Apr 2026 19:32:14 +0100 Subject: [PATCH] Fix: Recipes Gate/Fence Recipes - wrong amount and broken Book and Quill Recipe - wrongly positioned --- Minecraft.World/Item.cpp | 4 ++- Minecraft.World/Recipes.cpp | 54 ++++++++++++++++++++----------------- Minecraft.World/TreeTile.h | 1 + 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp index 3d72b78a..46a52f19 100644 --- a/Minecraft.World/Item.cpp +++ b/Minecraft.World/Item.cpp @@ -484,7 +484,9 @@ void Item::staticCtor() // TU14 //Item::writingBook = (new WritingBookItem(130))->setIcon(11, 11)->setDescriptionId("writingBook"); //Item::writtenBook = (new WrittenBookItem(131))->setIcon(12, 11)->setDescriptionId("writtenBook"); - Item::writingBook = (new WritingBookItem(130))->setIconName(L"writingBook")->setDescriptionId(IDS_ITEM_WRITINGBOOK)->setUseDescriptionId(IDS_DESC_WRITINGBOOK)->setMaxStackSize(1); + //Item::book = ( new BookItem(84) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"book")->setDescriptionId(IDS_ITEM_BOOK)->setUseDescriptionId(IDS_DESC_BOOK); + //->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book) + Item::writingBook = (new WritingBookItem(130))->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"writingBook")->setDescriptionId(IDS_ITEM_WRITINGBOOK)->setUseDescriptionId(IDS_DESC_WRITINGBOOK)->setMaxStackSize(1); Item::writtenBook = (new WrittenBookItem(131))->setIconName(L"writtenBook")->setDescriptionId(IDS_ITEM_WRITTENBOOK)->setUseDescriptionId(IDS_DESC_WRITTENBOOK)->setMaxStackSize(1); Item::emerald = (new Item(132)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_emerald)->setIconName(L"emerald")->setDescriptionId(IDS_ITEM_EMERALD)->setUseDescriptionId(IDS_DESC_EMERALD); diff --git a/Minecraft.World/Recipes.cpp b/Minecraft.World/Recipes.cpp index 514b0b47..ba7e407c 100644 --- a/Minecraft.World/Recipes.cpp +++ b/Minecraft.World/Recipes.cpp @@ -145,52 +145,58 @@ Recipes::Recipes() L'#', Item::stick, L'S'); - addShapedRecipy(new ItemInstance(Tile::fence, 2), // + addShapedRecipy(new ItemInstance(Tile::fence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, 0), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::OAK_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::fence, 2), // + addShapedRecipy(new ItemInstance(Tile::birchFence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::spruceFence, 2), // + addShapedRecipy(new ItemInstance(Tile::spruceFence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::jungleFence, 2), // + addShapedRecipy(new ItemInstance(Tile::jungleFence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::acaciaFence, 2), // + addShapedRecipy(new ItemInstance(Tile::acaciaFence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::darkFence, 2), // + addShapedRecipy(new ItemInstance(Tile::darkFence, 3), // L"ssciczg", L"W#W", // L"W#W", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), + L'#', Item::stick, + L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); addShapedRecipy(new ItemInstance(Tile::cobbleWall, 6, WallTile::TYPE_NORMAL), // @@ -225,52 +231,52 @@ Recipes::Recipes() L'#', Item::ironIngot, L'S'); - addShapedRecipy(new ItemInstance(Tile::fenceGate, 2), // + addShapedRecipy(new ItemInstance(Tile::fenceGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, 0), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, 0), L'S'); - addShapedRecipy(new ItemInstance(Tile::birchGate, 2), // + addShapedRecipy(new ItemInstance(Tile::birchGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::spruceGate, 2), // + addShapedRecipy(new ItemInstance(Tile::spruceGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::jungleGate, 2), // + addShapedRecipy(new ItemInstance(Tile::jungleGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::acaciaGate, 2), // + addShapedRecipy(new ItemInstance(Tile::acaciaGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Tile::darkGate, 2), // + addShapedRecipy(new ItemInstance(Tile::darkGate, 1), // L"ssciczg", L"#W#", // L"#W#", // - L'#', Item::stick, "W", new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), + L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); addShapedRecipy(new ItemInstance(Item::door_wood, 3), // diff --git a/Minecraft.World/TreeTile.h b/Minecraft.World/TreeTile.h index a372e249..f227e80a 100644 --- a/Minecraft.World/TreeTile.h +++ b/Minecraft.World/TreeTile.h @@ -10,6 +10,7 @@ class TreeTile : public RotatedPillarTile friend class Tile; friend class ChunkRebuildData; public: + static const int OAK_TRUNK = 0; static const int SPRUCE_TRUNK = 1; // this needs to be changed to spruce... static const int BIRCH_TRUNK = 2; static const int JUNGLE_TRUNK = 3;