diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp index ee6b7771..8fcfc3b9 100644 --- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp @@ -788,12 +788,6 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int hayBlockItems[] = {Tile::hayBlock_Id}; if(!isHintCompleted(e_Tutorial_Hint_HayBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_HayBlock, this, hayBlockItems, 1 ) ); - int clayHardenedItems[] = {Tile::clayHardened_Id}; - if(!isHintCompleted(e_Tutorial_Hint_ClayHardened)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardened, this, clayHardenedItems, 1 ) ); - - int clayHardenedColoredItems[] = {Tile::clayHardened_colored_Id}; - if(!isHintCompleted(e_Tutorial_Hint_ClayHardenedColored)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardenedColored, this, clayHardenedColoredItems, 1 ) ); - int coalBlockItems[] = {Tile::coalBlock_Id}; if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) ); diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index b6f8f071..34c35381 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -116,24 +116,6 @@ void IUIScene_CreativeMenu::staticCtor() ITEM(Tile::stairs_sandstone_Id) ITEM(Tile::stairs_quartz_Id) - ITEM(Tile::clayHardened_Id) - ITEM_AUX(Tile::clayHardened_colored_Id,14) // Red - ITEM_AUX(Tile::clayHardened_colored_Id,1) // Orange - ITEM_AUX(Tile::clayHardened_colored_Id,4) // Yellow - ITEM_AUX(Tile::clayHardened_colored_Id,5) // Lime - ITEM_AUX(Tile::clayHardened_colored_Id,3) // Light Blue - ITEM_AUX(Tile::clayHardened_colored_Id,9) // Cyan - ITEM_AUX(Tile::clayHardened_colored_Id,11) // Blue - ITEM_AUX(Tile::clayHardened_colored_Id,10) // Purple - ITEM_AUX(Tile::clayHardened_colored_Id,2) // Magenta - ITEM_AUX(Tile::clayHardened_colored_Id,6) // Pink - ITEM_AUX(Tile::clayHardened_colored_Id,0) // White - ITEM_AUX(Tile::clayHardened_colored_Id,8) // Light Gray - ITEM_AUX(Tile::clayHardened_colored_Id,7) // Gray - ITEM_AUX(Tile::clayHardened_colored_Id,15) // Black - ITEM_AUX(Tile::clayHardened_colored_Id,13) // Green - ITEM_AUX(Tile::clayHardened_colored_Id,12) // Brown - // Decoration DEF(eCreativeInventory_Decoration) ITEM_AUX(Item::skull_Id,SkullTileEntity::TYPE_SKELETON) diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index 4662d604..c71370ef 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -7,35 +7,6 @@ void ClothDyeRecipes::addRecipes(Recipes *r) { - // recipes for converting cloth to colored cloth using dye - for (int i = 0; i < 16; i++) - { - r->addShapelessRecipy(new ItemInstance(Tile::wool, 1, ColoredTile::getItemAuxValueForTileData(i)), // - L"zzg", - new ItemInstance(Item::dye_powder, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D'); - r->addShapedRecipy(new ItemInstance(Tile::clayHardened_colored, 8, ColoredTile::getItemAuxValueForTileData(i)), // - L"sssczczg", - L"###", - L"#X#", - L"###", - L'#', new ItemInstance(Tile::clayHardened), - L'X', new ItemInstance(Item::dye_powder, 1, i),L'D'); - -//#if 0 -// r->addShapedRecipy(new ItemInstance(Tile::stained_glass, 8, ColoredTile::getItemAuxValueForTileData(i)), // -// L"sssczczg", -// L"###", -// L"#X#", -// L"###", -// L'#', new ItemInstance(Tile::glass), -// L'X', new ItemInstance(Item::dye_powder, 1, i), L'D'); -// r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, i), // -// L"ssczg", -// L"###", -// L"###", -// L'#', new ItemInstance(Tile::stained_glass, 1, i), L'D'); -//#endif - } // some dye recipes r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), diff --git a/Minecraft.World/FurnaceRecipes.cpp b/Minecraft.World/FurnaceRecipes.cpp index f0a4c770..a5cf7549 100644 --- a/Minecraft.World/FurnaceRecipes.cpp +++ b/Minecraft.World/FurnaceRecipes.cpp @@ -27,7 +27,6 @@ FurnaceRecipes::FurnaceRecipes() addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f); addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone), .1f); addFurnaceRecipy(Item::clay_Id, new ItemInstance(Item::brick), .3f); - addFurnaceRecipy(Tile::clay_Id, new ItemInstance(Tile::clayHardened), .35f); addFurnaceRecipy(Tile::cactus_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), .2f); addFurnaceRecipy(Tile::treeTrunk_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f); addFurnaceRecipy(Tile::emeraldOre_Id, new ItemInstance(Item::emerald), 1); diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp index f0ffe491..840e3844 100644 --- a/Minecraft.World/Tile.cpp +++ b/Minecraft.World/Tile.cpp @@ -211,11 +211,9 @@ Tile *Tile::quartzBlock = nullptr; Tile *Tile::stairs_quartz = nullptr; Tile *Tile::activatorRail = nullptr; Tile *Tile::dropper = nullptr; -Tile *Tile::clayHardened_colored = nullptr; Tile *Tile::hayBlock = nullptr; Tile *Tile::woolCarpet = nullptr; -Tile *Tile::clayHardened = nullptr; Tile *Tile::coalBlock = nullptr; DWORD Tile::tlsIdxShape = TlsAlloc(); @@ -436,17 +434,14 @@ void Tile::staticCtor() Tile::stairs_quartz = (new StairTile(156, Tile::quartzBlock, QuartzBlockTile::TYPE_DEFAULT)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_quartz)->setIconName(L"stairsQuartz")->setDescriptionId(IDS_TILE_STAIRS_QUARTZ)->setUseDescriptionId(IDS_DESC_STAIRS); Tile::activatorRail = (new PoweredRailTile(157)) ->setDestroyTime(0.7f)->setSoundType(SOUND_METAL)->setIconName(L"rail_activator")->setDescriptionId(IDS_TILE_ACTIVATOR_RAIL)->setUseDescriptionId(IDS_DESC_ACTIVATOR_RAIL); Tile::dropper = (new DropperTile(158)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_redstoneContainer, Item::eMaterial_undefined)->setDestroyTime(3.5f)->setSoundType(SOUND_STONE)->setIconName(L"dropper")->setDescriptionId(IDS_TILE_DROPPER)->setUseDescriptionId(IDS_DESC_DROPPER); - Tile::clayHardened_colored = (new ColoredTile(159, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay, Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay_stained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY); Tile::hayBlock = (new HayBlockTile(170)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_wheat)->setDestroyTime(0.5f)->setSoundType(SOUND_GRASS)->setIconName(L"hay_block")->setDescriptionId(IDS_TILE_HAY)->setUseDescriptionId(IDS_DESC_HAY); Tile::woolCarpet = (new WoolCarpetTile(171)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_carpet, Item::eMaterial_cloth)->setDestroyTime(0.1f)->setSoundType(SOUND_CLOTH)->setIconName(L"woolCarpet")->setLightBlock(0)->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET); - Tile::clayHardened = (new Tile(172, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay, Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay")->setDescriptionId(IDS_TILE_HARDENED_CLAY)->setUseDescriptionId(IDS_DESC_HARDENED_CLAY); Tile::coalBlock = (new Tile(173, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_coal)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"coal_block")->setDescriptionId(IDS_TILE_COAL)->setUseDescriptionId(IDS_DESC_COAL_BLOCK); // Special cases for certain items since they can have different icons Item::items[wool_Id] = ( new WoolTileItem(Tile::wool_Id- 256) )->setIconName(L"cloth")->setDescriptionId(IDS_TILE_CLOTH)->setUseDescriptionId(IDS_DESC_WOOL); - Item::items[clayHardened_colored_Id]= ( new WoolTileItem(Tile::clayHardened_colored_Id - 256))->setIconName(L"clayHardenedStained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY); Item::items[woolCarpet_Id] = ( new WoolTileItem(Tile::woolCarpet_Id - 256))->setIconName(L"woolCarpet")->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET); Item::items[treeTrunk_Id] = ( new MultiTextureTileItem(Tile::treeTrunk_Id - 256, treeTrunk, (int *)TreeTile::TREE_NAMES, 4) )->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG); Item::items[wood_Id] = ( new MultiTextureTileItem(Tile::wood_Id - 256, Tile::wood, (int *)WoodTile::WOOD_NAMES, 4, IDS_TILE_PLANKS))->setIconName(L"wood")->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS)->setUseDescriptionId(IDS_DESC_LOG); // <- TODO diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index 307c4106..8ce62765 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -357,12 +357,10 @@ public: static const int stairs_quartz_Id = 156; static const int activatorRail_Id = 157; static const int dropper_Id = 158; - static const int clayHardened_colored_Id = 159; static const int stained_glass_pane_Id = 160; static const int hayBlock_Id = 170; static const int woolCarpet_Id = 171; - static const int clayHardened_Id = 172; static const int coalBlock_Id = 173; @@ -533,12 +531,10 @@ public: static Tile *stairs_quartz; static Tile *activatorRail; static Tile *dropper; - static Tile *clayHardened_colored; static Tile *stained_glass_pane; static Tile *hayBlock; static Tile *woolCarpet; - static Tile *clayHardened; static Tile *coalBlock; static void staticCtor(); diff --git a/Minecraft.World/WoolTileItem.cpp b/Minecraft.World/WoolTileItem.cpp index e1ff8be6..a3cfdaef 100644 --- a/Minecraft.World/WoolTileItem.cpp +++ b/Minecraft.World/WoolTileItem.cpp @@ -143,8 +143,6 @@ unsigned int WoolTileItem::getDescriptionId(shared_ptr instance) return GLASS_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; case Tile::stained_glass_pane_Id: return GLASS_PANE_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; - case Tile::clayHardened_colored_Id: - return CLAY_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; case Tile::woolCarpet_Id: return CARPET_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; case Tile::wool_Id: