diff --git a/Minecraft.Client/ClientConstants.cpp b/Minecraft.Client/ClientConstants.cpp index d1d80aa9..627f8fea 100644 --- a/Minecraft.Client/ClientConstants.cpp +++ b/Minecraft.Client/ClientConstants.cpp @@ -2,4 +2,4 @@ #include "ClientConstants.h" const wstring ClientConstants::VERSION_STRING = wstring(L"Minecraft LCE ") + VER_FILEVERSION_STR_W;//+ SharedConstants::VERSION_STRING; -const wstring ClientConstants::BRANCH_STRING = VER_BRANCHVERSION_STR_W; +//const wstring ClientConstants::BRANCH_STRING = VER_BRANCHVERSION_STR_W; diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index a0c0ebdd..868d34cd 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -57,10 +57,14 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::wood_Id,TreeTile::DARK_TRUNK) ITEM_AUX(Tile::wood_Id,TreeTile::BIRCH_TRUNK) ITEM_AUX(Tile::wood_Id,TreeTile::JUNGLE_TRUNK) + ITEM_AUX(Tile::wood_Id, TreeTile::ACACIA_TRUNK) + ITEM_AUX(Tile::wood_Id, TreeTile::DARK_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, 0) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::DARK_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK) ITEM_AUX(Tile::treeTrunk_Id, TreeTile::JUNGLE_TRUNK) + ITEM_AUX(Tile::treeTrunk_Id, TreeTile::ACACIA_TRUNK) + ITEM_AUX(Tile::treeTrunk_Id, TreeTile::DARK_TRUNK) ITEM(Tile::gravel_Id) ITEM(Tile::redBrick_Id) ITEM(Tile::mossyCobblestone_Id) @@ -72,6 +76,14 @@ void IUIScene_CreativeMenu::staticCtor() ITEM(Tile::soulsand_Id) ITEM(Tile::glowstone_Id) ITEM(Tile::fence_Id) + + // TU25 + ITEM(Tile::spruceFence_Id) + ITEM(Tile::birchFence_Id) + ITEM(Tile::jungleFence_Id) + ITEM(Tile::acaciaFence_Id) + ITEM(Tile::darkFence_Id) + ITEM(Tile::netherFence_Id) ITEM(Tile::ironFence_Id) ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_NORMAL) @@ -89,17 +101,40 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_CHISELED) ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_LINES_Y) ITEM(Tile::trapdoor_Id) + ITEM(Tile::iron_trapdoor_Id) + ITEM(Tile::fenceGate_Id) + + // TU25 + ITEM(Tile::spruceGate_Id) + ITEM(Tile::birchGate_Id) + ITEM(Tile::jungleGate_Id) + ITEM(Tile::acaciaGate_Id) + ITEM(Tile::darkGate_Id) + ITEM(Item::door_wood_Id) ITEM(Item::door_iron_Id) + + // TU25 + ITEM(Item::door_spruce_Id) + ITEM(Item::door_birch_Id) + ITEM(Item::door_jungle_Id) + ITEM(Item::door_acacia_Id) + ITEM(Item::door_dark_Id) + ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::STONE_SLAB) ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::SAND_SLAB) // AP - changed oak slab to be wood because it wouldn't burn // ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::WOOD_SLAB) ITEM_AUX(Tile::woodSlabHalf_Id,0) - ITEM_AUX(Tile::woodSlabHalf_Id,TreeTile::DARK_TRUNK) + ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::SPRUCE_TRUNK) ITEM_AUX(Tile::woodSlabHalf_Id,TreeTile::BIRCH_TRUNK) ITEM_AUX(Tile::woodSlabHalf_Id,TreeTile::JUNGLE_TRUNK) + + // TU25 -- added acacia and dark oak + ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::ACACIA_TRUNK) + ITEM_AUX(Tile::woodSlabHalf_Id, TreeTile::DARK_TRUNK) + ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::COBBLESTONE_SLAB) ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::BRICK_SLAB) ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::SMOOTHBRICK_SLAB) @@ -109,6 +144,8 @@ void IUIScene_CreativeMenu::staticCtor() ITEM(Tile::stairs_birchwood_Id) ITEM(Tile::stairs_sprucewood_Id) ITEM(Tile::stairs_junglewood_Id) + ITEM(Tile::stairs_acaciawood_Id) + ITEM(Tile::stairs_darkwood_Id) ITEM(Tile::stairs_stone_Id) ITEM(Tile::stairs_bricks_Id) ITEM(Tile::stairs_stoneBrick_Id)