diff --git a/CMakeLists.txt b/CMakeLists.txt index 5623ed4a..7475103c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,11 +234,15 @@ if(TARGET Minecraft.Server) add_dependencies(Minecraft.Server GenerateStringIdLookup) endif() +# item.h takes priority as some tile.h blocks are not meant to be accessed +# for example: the wheat 'block' (stage 1 wheat crop) is NOT supposed to override the normal wheat item set(_item_map_inputs + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/Item.h" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/Tile.h" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.World/Item.h" ) +string(REPLACE ";" "\\;" _item_map_inputs "${_item_map_inputs}") + #neo: added ItemNameMap generation add_custom_command( OUTPUT "${CMAKE_BINARY_DIR}/generated/ItemNameMap.h" diff --git a/Minecraft.Client/BeaconRenderer.cpp b/Minecraft.Client/BeaconRenderer.cpp index 2922a336..a17f116e 100644 --- a/Minecraft.Client/BeaconRenderer.cpp +++ b/Minecraft.Client/BeaconRenderer.cpp @@ -88,7 +88,7 @@ void BeaconRenderer::render(shared_ptr _beacon, double x, double y, segments.push_back({curR, curG, curB, 1}); } - else if (tileID == 0 || tileID == Tile::glass_Id || tileID == Tile::thinGlass_Id) { + else if (tileID == 0 || tileID == Tile::glass_Id || tileID == Tile::glass_pane_Id) { if (segments.empty()) { segments.push_back({1.0f, 1.0f, 1.0f, 1}); } else { diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index 83ff3175..f0b08a04 100644 --- a/Minecraft.Client/Chunk.cpp +++ b/Minecraft.Client/Chunk.cpp @@ -282,15 +282,15 @@ void Chunk::rebuild() // Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already // been determined to meet this criteria themselves and have a tile of 255 set. - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; tileId = tileIds[ offset + ( ( ( xx - 1 ) << 11 ) | ( ( zz + 0 ) << 7 ) | ( indexY + 0 )) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; tileId = tileIds[ offset + ( ( ( xx + 1 ) << 11 ) | ( ( zz + 0 ) << 7 ) | ( indexY + 0 )) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; tileId = tileIds[ offset + ( ( ( xx + 0 ) << 11 ) | ( ( zz - 1 ) << 7 ) | ( indexY + 0 )) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; tileId = tileIds[ offset + ( ( ( xx + 0 ) << 11 ) | ( ( zz + 1 ) << 7 ) | ( indexY + 0 )) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; // Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible // if they are surrounded on sides other than the bottom if( yy > 0 ) @@ -303,7 +303,7 @@ void Chunk::rebuild() yMinusOneOffset = Level::COMPRESSED_CHUNK_SECTION_TILES; } tileId = tileIds[ yMinusOneOffset + ( ( ( xx + 0 ) << 11 ) | ( ( zz + 0 ) << 7 ) | indexYMinusOne ) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; } int indexYPlusOne = yy + 1; int yPlusOneOffset = 0; @@ -313,7 +313,7 @@ void Chunk::rebuild() yPlusOneOffset = Level::COMPRESSED_CHUNK_SECTION_TILES; } tileId = tileIds[ yPlusOneOffset + ( ( ( xx + 0 ) << 11 ) | ( ( zz + 0 ) << 7 ) | indexYPlusOne ) ]; - if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::unbreakable_Id ) || ( tileId == 255) ) ) continue; + if( !( ( tileId == Tile::stone_Id ) || ( tileId == Tile::dirt_Id ) || ( tileId == Tile::bedrock_Id ) || ( tileId == 255) ) ) continue; // This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255. tileIds[ offset + ( ( ( xx + 0 ) << 11 ) | ( ( zz + 0 ) << 7 ) | ( indexY + 0 ) ) ] = 0xff; diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index d0f97cee..d23d5011 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -706,7 +706,7 @@ void ClientConnection::handleAddEntity(shared_ptr packet) if (packet->type == AddEntityPacket::ENDER_CRYSTAL) e = shared_ptr( new EnderCrystal(level, x, y, z) ); if (packet->type == AddEntityPacket::FALLING_SAND) e = shared_ptr( new FallingTile(level, x, y, z, Tile::sand->id) ); if (packet->type == AddEntityPacket::FALLING_GRAVEL) e = shared_ptr( new FallingTile(level, x, y, z, Tile::gravel->id) ); - if (packet->type == AddEntityPacket::FALLING_EGG) e = shared_ptr( new FallingTile(level, x, y, z, Tile::dragonEgg_Id) ); + if (packet->type == AddEntityPacket::FALLING_EGG) e = shared_ptr( new FallingTile(level, x, y, z, Tile::dragon_egg_Id) ); */ @@ -1342,11 +1342,11 @@ void ClientConnection::handleChunkTilesUpdate(shared_ptr // Don't bother setting this to dirty if it isn't going to visually change - we get a lot of // water changing from static to dynamic for instance - if(!( ( ( prevTile == Tile::water_Id ) && ( tile == Tile::calmWater_Id ) ) || - ( ( prevTile == Tile::calmWater_Id ) && ( tile == Tile::water_Id ) ) || - ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::calmLava_Id ) ) || - ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::calmLava_Id ) ) || - ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::lava_Id ) ) ) ) + if(!( ( ( prevTile == Tile::flowing_water_Id ) && ( tile == Tile::water_Id ) ) || + ( ( prevTile == Tile::water_Id ) && ( tile == Tile::flowing_water_Id ) ) || + ( ( prevTile == Tile::flowing_lava_Id ) && ( tile == Tile::lava_Id ) ) || + ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::lava_Id ) ) || + ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::flowing_lava_Id ) ) ) ) { dimensionLevel->setTilesDirty(x + xo, y, z + zo, x + xo, y, z + zo); } @@ -3160,10 +3160,10 @@ void ClientConnection::handleContainerOpen(shared_ptr packe break; case ContainerOpenPacket::BREWING_STAND: { - shared_ptr brewingStand = std::make_shared(); - if (packet->customName) brewingStand->setCustomName(packet->title); + shared_ptr brewing_stand = std::make_shared(); + if (packet->customName) brewing_stand->setCustomName(packet->title); - if( player->openBrewingStand(brewingStand)) + if( player->openBrewingStand(brewing_stand)) { player->containerMenu->containerId = packet->containerId; } diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp index 0157be0b..43a4b759 100644 --- a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp +++ b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp @@ -50,9 +50,9 @@ bool AddEnchantmentRuleDefinition::enchantItem(shared_ptr item) { // 4J-JEV: Ripped code from enchantmenthelpers // Maybe we want to add an addEnchantment method to EnchantmentHelpers - if (item->id == Item::enchantedBook_Id) + if (item->id == Item::enchanted_book_Id) { - Item::enchantedBook->addEnchantment( item, new EnchantmentInstance(m_enchantmentId, m_enchantmentLevel) ); + Item::enchanted_book->addEnchantment( item, new EnchantmentInstance(m_enchantmentId, m_enchantmentLevel) ); } else if (item->isEnchantable()) { diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp index 83e3d294..ce6ef69b 100644 --- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp +++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp @@ -7,7 +7,7 @@ XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner() { - m_tile = Tile::mobSpawner_Id; + m_tile = Tile::mob_spawner_Id; m_entityId = L"Pig"; } diff --git a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp index e3faa4d4..6ef13419 100644 --- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp @@ -75,7 +75,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) int mineMappings[] = {MINECRAFT_ACTION_ACTION}; addTask(e_Tutorial_State_Gameplay, new ControllerTask( this, IDS_TUTORIAL_TASK_MINE, false, true, mineMappings, 1) ); - addTask(e_Tutorial_State_Gameplay, new PickupTask( Tile::treeTrunk_Id, 4, -1, this, IDS_TUTORIAL_TASK_CHOP_WOOD ) ); + addTask(e_Tutorial_State_Gameplay, new PickupTask( Tile::log_Id, 4, -1, this, IDS_TUTORIAL_TASK_CHOP_WOOD ) ); int scrollMappings[] = {MINECRAFT_ACTION_LEFT_SCROLL,MINECRAFT_ACTION_RIGHT_SCROLL}; //int scrollMappings[] = {ACTION_MENU_LEFT_SCROLL,ACTION_MENU_RIGHT_SCROLL}; @@ -92,9 +92,9 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_Gameplay, new InfoTask(this, IDS_TUTORIAL_TASK_FOOD_BAR_FEED, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) ); // While they should only eat the item we give them, includ the ability to complete this task with different items - int foodItems[] = {Item::mushroomStew_Id, Item::apple_Id, Item::bread_Id, Item::porkChop_raw_Id, Item::porkChop_cooked_Id, - Item::apple_gold_Id, Item::fish_raw_Id, Item::fish_cooked_Id, Item::cookie_Id, Item::beef_cooked_Id, - Item::beef_raw_Id, Item::chicken_cooked_Id, Item::chicken_raw_Id, Item::melon_Id, Item::rotten_flesh_Id}; + int foodItems[] = {Item::mushroom_stew_Id, Item::apple_Id, Item::bread_Id, Item::porkchop_Id, Item::cooked_porkchop_Id, + Item::golden_apple_Id, Item::fish_Id, Item::cooked_fish_Id, Item::cookie_Id, Item::cooked_beef_Id, + Item::beef_Id, Item::cooked_chicken_Id, Item::chicken_Id, Item::melon_block_Id, Item::rotten_flesh_Id}; addTask(e_Tutorial_State_Gameplay, new CompleteUsingItemTask(this, IDS_TUTORIAL_TASK_FOOD_BAR_EAT_STEAK, foodItems, 15, true) ); int crftMappings[] = {MINECRAFT_ACTION_CRAFTING}; @@ -103,13 +103,13 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_Gameplay, new ProgressFlagTask( &m_progressFlags, FULL_TUTORIAL_PROGRESS_2_X_2_Crafting, ProgressFlagTask::e_Progress_Set_Flag, this ) ); addTask(e_Tutorial_State_Gameplay, new StateChangeTask( e_Tutorial_State_2x2Crafting_Menu, this) ); - addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::wood_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_PLANKS) ); - addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::workBench_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE) ); + addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::planks_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_PLANKS) ); + addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::crafting_table_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE) ); //int useMappings[] = {MINECRAFT_ACTION_USE}; //addTask(e_Tutorial_State_Gameplay, new ControllerTask( this, IDS_TUTORIAL_TASK_USE, false, false, useMappings, 1) ); addTask(e_Tutorial_State_Gameplay, new InfoTask(this, IDS_TUTORIAL_TASK_USE, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) ); - addTask(e_Tutorial_State_Gameplay, new UseItemTask( Tile::workBench_Id, this, IDS_TUTORIAL_TASK_PLACE_WORKBENCH, true ) ); + addTask(e_Tutorial_State_Gameplay, new UseItemTask( Tile::crafting_table_Id, this, IDS_TUTORIAL_TASK_PLACE_WORKBENCH, true ) ); addTask(e_Tutorial_State_Gameplay, new InfoTask(this, IDS_TUTORIAL_TASK_NIGHT_DANGER, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) ); addTask(e_Tutorial_State_Gameplay, new InfoTask(this, IDS_TUTORIAL_TASK_NEARBY_SHELTER, IDS_TUTORIAL_PROMPT_PRESS_A_TO_CONTINUE, true, ACTION_MENU_A) ); @@ -121,22 +121,22 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) // START OF FULL TUTORIAL - addTask(e_Tutorial_State_Gameplay, new UseTileTask( Tile::workBench_Id, this, IDS_TUTORIAL_TASK_OPEN_WORKBENCH, false ) ); + addTask(e_Tutorial_State_Gameplay, new UseTileTask( Tile::crafting_table_Id, this, IDS_TUTORIAL_TASK_OPEN_WORKBENCH, false ) ); addTask(e_Tutorial_State_Gameplay, new ProgressFlagTask( &m_progressFlags, FULL_TUTORIAL_PROGRESS_3_X_3_Crafting, ProgressFlagTask::e_Progress_Set_Flag, this ) ); addTask(e_Tutorial_State_Gameplay, new StateChangeTask( e_Tutorial_State_3x3Crafting_Menu, this) ); addTask(e_Tutorial_State_Gameplay, new CraftTask( Item::stick->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_STICKS) ); - int shovelItems[] = {Item::shovel_wood->id, Item::shovel_stone->id, Item::shovel_iron->id, Item::shovel_gold->id, Item::shovel_diamond->id}; + int shovelItems[] = {Item::wooden_shovel->id, Item::stone_shovel->id, Item::iron_shovel->id, Item::golden_shovel->id, Item::diamond_shovel->id}; int shovelAuxVals[] = {-1,-1,-1,-1,-1}; addTask(e_Tutorial_State_Gameplay, new CraftTask( shovelItems, shovelAuxVals, 5, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_SHOVEL) ); - int hatchetItems[] = {Item::hatchet_wood->id, Item::hatchet_stone->id, Item::hatchet_iron->id, Item::hatchet_gold->id, Item::hatchet_diamond->id}; + int hatchetItems[] = {Item::wooden_axe->id, Item::stone_axe->id, Item::iron_axe->id, Item::golden_axe->id, Item::diamond_axe->id}; int hatchetAuxVals[] = {-1,-1,-1,-1,-1}; addTask(e_Tutorial_State_Gameplay, new CraftTask( hatchetItems, hatchetAuxVals, 5, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_HATCHET) ); - int pickaxeItems[] = {Item::pickAxe_wood->id, Item::pickAxe_stone->id, Item::pickAxe_iron->id, Item::pickAxe_gold->id, Item::pickAxe_diamond->id}; + int pickaxeItems[] = {Item::wooden_pickaxe->id, Item::stone_pickaxe->id, Item::iron_pickaxe->id, Item::golden_pickaxe->id, Item::diamond_pickaxe->id}; int pickaxeAuxVals[] = {-1,-1,-1,-1,-1}; addTask(e_Tutorial_State_Gameplay, new CraftTask( pickaxeItems, pickaxeAuxVals, 5, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_PICKAXE) ); @@ -150,8 +150,8 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_Gameplay, new StateChangeTask( e_Tutorial_State_Furnace_Menu, this) ); addTask(e_Tutorial_State_Gameplay, new CraftTask( Item::coal->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CHARCOAL) ); addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::glass_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_GLASS) ); - addTask(e_Tutorial_State_Gameplay, new CraftTask( Item::door_wood->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR) ); - addTask(e_Tutorial_State_Gameplay, new UseItemTask(Item::door_wood->id, this, IDS_TUTORIAL_TASK_PLACE_DOOR) ); + addTask(e_Tutorial_State_Gameplay, new CraftTask( Item::wooden_door->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR) ); + addTask(e_Tutorial_State_Gameplay, new UseItemTask(Item::wooden_door->id, this, IDS_TUTORIAL_TASK_PLACE_DOOR) ); addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::torch_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_TORCH) ); if(app.getGameRuleDefinitions() != nullptr) @@ -201,12 +201,12 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_2x2Crafting_Menu, new FullTutorialActiveTask( this, e_Tutorial_Completion_Complete_State) ); - addTask(e_Tutorial_State_2x2Crafting_Menu, new CraftTask( Tile::wood_Id, -1, 1, this, IDS_TUTORIAL_TASK_CRAFT_CREATE_PLANKS) ); + addTask(e_Tutorial_State_2x2Crafting_Menu, new CraftTask( Tile::planks_Id, -1, 1, this, IDS_TUTORIAL_TASK_CRAFT_CREATE_PLANKS) ); ProcedureCompoundTask *workbenchCompound = new ProcedureCompoundTask( this ); workbenchCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_STRUCTURES, Recipy::eGroupType_Structure) ); - workbenchCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_CRAFTING_TABLE, Tile::workBench_Id) ); - workbenchCompound->AddTask( new CraftTask( Tile::workBench_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE) ); + workbenchCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_CRAFTING_TABLE, Tile::crafting_table_Id) ); + workbenchCompound->AddTask( new CraftTask( Tile::crafting_table_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_CRAFTING_TABLE) ); addTask(e_Tutorial_State_2x2Crafting_Menu, workbenchCompound ); addTask(e_Tutorial_State_2x2Crafting_Menu, new InfoTask(this, IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_TABLE, -1, false, ACTION_MENU_B) ); @@ -219,7 +219,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) ProcedureCompoundTask *shovelCompound = new ProcedureCompoundTask( this ); shovelCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_TOOLS, Recipy::eGroupType_Tool) ); - shovelCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_WOODEN_SHOVEL, Item::shovel_wood->id) ); + shovelCompound->AddTask( new XuiCraftingTask( this, IDS_TUTORIAL_TASK_CRAFT_SELECT_WOODEN_SHOVEL, Item::wooden_shovel->id) ); shovelCompound->AddTask( new CraftTask( shovelItems, shovelAuxVals, 5, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_SHOVEL) ); addTask(e_Tutorial_State_3x3Crafting_Menu, shovelCompound ); addTask(e_Tutorial_State_3x3Crafting_Menu, new CraftTask( hatchetItems, hatchetAuxVals, 5, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_HATCHET) ); @@ -234,7 +234,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_3x3Crafting_Menu, new InfoTask(this, IDS_TUTORIAL_TASK_CRAFT_EXIT_AND_PLACE_FURNACE, -1, false, ACTION_MENU_B) ); // No need to block here, as it's fine if the player wants to do this out of order - addTask(e_Tutorial_State_3x3Crafting_Menu, new CraftTask( Item::door_wood->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR) ); + addTask(e_Tutorial_State_3x3Crafting_Menu, new CraftTask( Item::wooden_door->id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_WOODEN_DOOR) ); addTask(e_Tutorial_State_3x3Crafting_Menu, new CraftTask( Tile::torch_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_TORCH) ); /* @@ -445,7 +445,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) addTask(e_Tutorial_State_Brewing, new ChoiceTask(this, IDS_TUTORIAL_TASK_BREWING_OVERVIEW, IDS_TUTORIAL_PROMPT_BREWING_OVERVIEW, true, ACTION_MENU_A, ACTION_MENU_B, e_Tutorial_Completion_Complete_State_Gameplay_Constraints, eTelemetryTutorial_Brewing) ); ProcedureCompoundTask *fillWaterBottleTask = new ProcedureCompoundTask( this ); - fillWaterBottleTask->AddTask( new PickupTask( Item::glassBottle_Id, 1, -1, this, IDS_TUTORIAL_TASK_BREWING_GET_GLASS_BOTTLE ) ); + fillWaterBottleTask->AddTask( new PickupTask( Item::glass_bottle_Id, 1, -1, this, IDS_TUTORIAL_TASK_BREWING_GET_GLASS_BOTTLE ) ); fillWaterBottleTask->AddTask( new PickupTask( Item::potion_Id, 1, 0, this, IDS_TUTORIAL_TASK_BREWING_FILL_GLASS_BOTTLE ) ); addTask(e_Tutorial_State_Brewing, fillWaterBottleTask); diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp index ee6b7771..70ce40f6 100644 --- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp @@ -405,19 +405,19 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int stoneItems[] = {Tile::cobblestone_Id}; if(!isHintCompleted(e_Tutorial_Hint_Stone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone, this, stoneItems, 1 ) ); - int plankItems[] = {Tile::wood_Id}; + int plankItems[] = {Tile::planks_Id}; if(!isHintCompleted(e_Tutorial_Hint_Planks)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Planks, this, plankItems, 1 ) ); int saplingItems[] = {Tile::sapling_Id}; if(!isHintCompleted(e_Tutorial_Hint_Sapling)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Sapling, this, saplingItems, 1 ) ); - int unbreakableItems[] = {Tile::unbreakable_Id}; + int unbreakableItems[] = {Tile::bedrock_Id}; if(!isHintCompleted(e_Tutorial_Hint_Unbreakable)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Unbreakable, this, unbreakableItems, 1 ) ); - int waterItems[] = {Tile::water_Id, Tile::calmWater_Id}; + int waterItems[] = {Tile::flowing_water_Id, Tile::water_Id}; if(!isHintCompleted(e_Tutorial_Hint_Water)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Water, this, waterItems, 2 ) ); - int lavaItems[] = {Tile::lava_Id, Tile::calmLava_Id}; + int lavaItems[] = {Tile::flowing_lava_Id, Tile::lava_Id}; if(!isHintCompleted(e_Tutorial_Hint_Lava)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Lava, this, lavaItems, 2 ) ); int sandItems[] = {Tile::sand_Id}; @@ -426,16 +426,16 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int gravelItems[] = {Tile::gravel_Id}; if(!isHintCompleted(e_Tutorial_Hint_Gravel)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Gravel, this, gravelItems, 1 ) ); - int goldOreItems[] = {Tile::goldOre_Id}; + int goldOreItems[] = {Tile::gold_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Gold_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Gold_Ore, this, goldOreItems, 1 ) ); - int ironOreItems[] = {Tile::ironOre_Id}; + int ironOreItems[] = {Tile::iron_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Iron_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Iron_Ore, this, ironOreItems, 1 ) ); - int coalOreItems[] = {Tile::coalOre_Id}; + int coalOreItems[] = {Tile::coal_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Coal_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Coal_Ore, this, coalOreItems, 1 ) ); - int treeTrunkItems[] = {Tile::treeTrunk_Id}; + int treeTrunkItems[] = {Tile::log_Id}; if(!isHintCompleted(e_Tutorial_Hint_Tree_Trunk)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tree_Trunk, this, treeTrunkItems, 1 ) ); int leavesItems[] = {Tile::leaves_Id}; @@ -444,16 +444,16 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int glassItems[] = {Tile::glass_Id}; if(!isHintCompleted(e_Tutorial_Hint_Glass)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Glass, this, glassItems, 1 ) ); - int lapisOreItems[] = {Tile::lapisOre_Id}; + int lapisOreItems[] = {Tile::lapis_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Lapis_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Lapis_Ore, this, lapisOreItems, 1 ) ); - int lapisBlockItems[] = {Tile::lapisBlock_Id}; + int lapisBlockItems[] = {Tile::lapis_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Lapis_Block)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Lapis_Block, this, lapisBlockItems, 1 ) ); int dispenserItems[] = {Tile::dispenser_Id}; if(!isHintCompleted(e_Tutorial_Hint_Dispenser)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Dispenser, this, dispenserItems, 1 ) ); - int sandstoneItems[] = {Tile::sandStone_Id}; + int sandstoneItems[] = {Tile::sandstone_Id}; if(!isHintCompleted(e_Tutorial_Hint_Sandstone)) { addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Sandstone, this, sandstoneItems, 1, -1, SandStoneTile::TYPE_DEFAULT ) ); @@ -464,10 +464,10 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int noteBlockItems[] = {Tile::noteblock_Id}; if(!isHintCompleted(e_Tutorial_Hint_Note_Block)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Note_Block, this, noteBlockItems, 1 ) ); - int poweredRailItems[] = {Tile::goldenRail_Id}; + int poweredRailItems[] = {Tile::golden_rail_Id}; if(!isHintCompleted(e_Tutorial_Hint_Powered_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Powered_Rail, this, poweredRailItems, 1 ) ); - int detectorRailItems[] = {Tile::detectorRail_Id}; + int detectorRailItems[] = {Tile::detector_rail_Id}; if(!isHintCompleted(e_Tutorial_Hint_Detector_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Detector_Rail, this, detectorRailItems, 1 ) ); int tallGrassItems[] = {Tile::tallgrass_Id}; @@ -481,19 +481,19 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int woolItems[] = {Tile::wool_Id}; if(!isHintCompleted(e_Tutorial_Hint_Wool)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Wool, this, woolItems, 1 ) ); - int flowerItems[] = {Tile::flower_Id, Tile::rose_Id}; + int flowerItems[] = {Tile::yellow_flower_Id, Tile::red_flower_Id}; if(!isHintCompleted(e_Tutorial_Hint_Flower)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Flower, this, flowerItems, 2 ) ); int mushroomItems[] = {Tile::mushroom_brown_Id, Tile::mushroom_red_Id}; if(!isHintCompleted(e_Tutorial_Hint_Mushroom)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Mushroom, this, mushroomItems, 2 ) ); - int goldBlockItems[] = {Tile::goldBlock_Id}; + int goldBlockItems[] = {Tile::gold_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Gold_Block)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Gold_Block, this, goldBlockItems, 1 ) ); - int ironBlockItems[] = {Tile::ironBlock_Id}; + int ironBlockItems[] = {Tile::iron_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Iron_Block)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Iron_Block, this, ironBlockItems, 1 ) ); - int stoneSlabItems[] = {Tile::stoneSlabHalf_Id, Tile::stoneSlab_Id}; + int stoneSlabItems[] = {Tile::stone_slab_Id, Tile::double_stone_slab_Id}; if(!isHintCompleted(e_Tutorial_Hint_Stone_Slab)) { addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone_Slab, this, stoneSlabItems, 2, -1, StoneSlabTile::STONE_SLAB ) ); @@ -506,14 +506,14 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone_Slab, this, stoneSlabItems, 2, -1, StoneSlabTile::QUARTZ_SLAB ) ); } - int woodSlabItems[] = {Tile::woodSlabHalf_Id, Tile::woodSlab_Id}; + int woodSlabItems[] = {Tile::wooden_slab_Id, Tile::double_wooden_slab_Id}; if(!isHintCompleted(e_Tutorial_Hint_Stone_Slab)) { addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone_Slab, this, woodSlabItems, 2, -1, TreeTile::BIRCH_TRUNK ) ); addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone_Slab, this, woodSlabItems, 2, -1, TreeTile::DARK_TRUNK ) ); } - int redBrickItems[] = {Tile::redBrick_Id}; + int redBrickItems[] = {Tile::brick_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Red_Brick)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Red_Brick, this, redBrickItems, 1 ) ); int tntItems[] = {Tile::tnt_Id}; @@ -522,7 +522,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int bookshelfItems[] = {Tile::bookshelf_Id}; if(!isHintCompleted(e_Tutorial_Hint_Bookshelf)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Bookshelf, this, bookshelfItems, 1 ) ); - int mossStoneItems[] = {Tile::mossyCobblestone_Id}; + int mossStoneItems[] = {Tile::mossy_cobblestone_Id}; if(!isHintCompleted(e_Tutorial_Hint_Moss_Stone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Moss_Stone, this, mossStoneItems, 1 ) ); int obsidianItems[] = {Tile::obsidian_Id}; @@ -531,22 +531,22 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int torchItems[] = {Tile::torch_Id}; if(!isHintCompleted(e_Tutorial_Hint_Torch)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Torch, this, torchItems, 1 ) ); - int mobSpawnerItems[] = {Tile::mobSpawner_Id}; + int mobSpawnerItems[] = {Tile::mob_spawner_Id}; if(!isHintCompleted(e_Tutorial_Hint_MobSpawner)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_MobSpawner, this, mobSpawnerItems, 1 ) ); int chestItems[] = {Tile::chest_Id}; if(!isHintCompleted(e_Tutorial_Hint_Chest)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Chest, this, chestItems, 1 ) ); - int redstoneItems[] = {Tile::redStoneDust_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Redstone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Redstone, this, redstoneItems, 1, Item::redStone_Id ) ); + int redstoneItems[] = {Tile::redstone_wire_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Redstone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Redstone, this, redstoneItems, 1, Item::redstone_Id ) ); - int diamondOreItems[] = {Tile::diamondOre_Id}; + int diamondOreItems[] = {Tile::diamond_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Diamond_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Diamond_Ore, this, diamondOreItems, 1 ) ); - int diamondBlockItems[] = {Tile::diamondBlock_Id}; + int diamondBlockItems[] = {Tile::diamond_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Diamond_Block)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Diamond_Block, this, diamondBlockItems, 1 ) ); - int craftingTableItems[] = {Tile::workBench_Id}; + int craftingTableItems[] = {Tile::crafting_table_Id}; if(!isHintCompleted(e_Tutorial_Hint_Crafting_Table)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Crafting_Table, this, craftingTableItems, 1 ) ); int cropsItems[] = {Tile::wheat_Id}; @@ -555,19 +555,19 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int farmlandItems[] = {Tile::farmland_Id}; if(!isHintCompleted(e_Tutorial_Hint_Farmland)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Farmland, this, farmlandItems, 1 ) ); - int furnaceItems[] = {Tile::furnace_Id, Tile::furnace_lit_Id}; + int furnaceItems[] = {Tile::furnace_Id, Tile::lit_furnace_Id}; if(!isHintCompleted(e_Tutorial_Hint_Furnace)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Furnace, this, furnaceItems, 2 ) ); - int signItems[] = {Tile::sign_Id, Tile::wallSign_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Sign)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Sign, this, signItems, 2, Item::sign_Id ) ); + int signItems[] = {Tile::standing_sign_Id, Tile::wall_standing_sign_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Sign)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Sign, this, signItems, 2, Item::standing_sign_Id ) ); - int doorWoodItems[] = {Tile::door_wood_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Door_Wood)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Door_Wood, this, doorWoodItems, 1, Item::door_wood->id ) ); + int doorWoodItems[] = {Tile::wooden_door_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Door_Wood)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Door_Wood, this, doorWoodItems, 1, Item::wooden_door->id ) ); int ladderItems[] = {Tile::ladder_Id}; if(!isHintCompleted(e_Tutorial_Hint_Ladder)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Ladder, this, ladderItems, 1 ) ); - int stairsStoneItems[] = {Tile::stairs_stone_Id,Tile::stairs_bricks_Id,Tile::stairs_stoneBrick_Id,Tile::stairs_wood_Id,Tile::stairs_sprucewood_Id,Tile::stairs_birchwood_Id,Tile::stairs_netherBricks_Id,Tile::stairs_sandstone_Id,Tile::stairs_quartz_Id}; + int stairsStoneItems[] = {Tile::stone_stairs_Id,Tile::brick_stairs_Id,Tile::stone_brick_stairs_Id,Tile::oak_stairs_Id,Tile::spruce_stairs_Id,Tile::birch_stairs_Id,Tile::nether_brick_stairs_Id,Tile::sandstone_stairs_Id,Tile::quartz_stairs_Id}; if(!isHintCompleted(e_Tutorial_Hint_Stairs_Stone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stairs_Stone, this, stairsStoneItems, 9 ) ); int railItems[] = {Tile::rail_Id}; @@ -576,19 +576,19 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int leverItems[] = {Tile::lever_Id}; if(!isHintCompleted(e_Tutorial_Hint_Lever)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Lever, this, leverItems, 1 ) ); - int pressurePlateItems[] = {Tile::pressurePlate_stone_Id, Tile::pressurePlate_wood_Id}; + int pressurePlateItems[] = {Tile::stone_pressure_plate_Id, Tile::wooden_pressure_plate_Id}; if(!isHintCompleted(e_Tutorial_Hint_PressurePlate)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_PressurePlate, this, pressurePlateItems, 2 ) ); - int doorIronItems[] = {Tile::door_iron_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Door_Iron)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Door_Iron, this, doorIronItems, 1, Item::door_iron->id ) ); + int doorIronItems[] = {Tile::iron_door_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Door_Iron)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Door_Iron, this, doorIronItems, 1, Item::iron_door->id ) ); - int redstoneOreItems[] = {Tile::redStoneOre_Id, Tile::redStoneOre_lit_Id}; + int redstoneOreItems[] = {Tile::redstone_ore_Id, Tile::lit_redstone_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_Redstone_Ore)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Redstone_Ore, this, redstoneOreItems, 2 ) ); - int redstoneTorchItems[] = {Tile::redstoneTorch_off_Id, Tile::redstoneTorch_on_Id}; + int redstoneTorchItems[] = {Tile::unlit_redstone_torch_Id, Tile::redstone_torch_Id}; if(!isHintCompleted(e_Tutorial_Hint_Redstone_Torch)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Redstone_Torch, this, redstoneTorchItems, 2 ) ); - int buttonItems[] = {Tile::button_stone_Id, Tile::button_wood_Id}; + int buttonItems[] = {Tile::stone_button_Id, Tile::wooden_button_Id}; if(!isHintCompleted(e_Tutorial_Hint_Button)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Button, this, buttonItems, 2 ) ); int snowItems[] = {Tile::snow_Id}; @@ -612,134 +612,134 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int pumpkinItems[] = {Tile::pumpkin_Id}; if(!isHintCompleted(e_Tutorial_Hint_Pumpkin)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Pumpkin, this, pumpkinItems, 1, -1, -1, 0 ) ); - int hellRockItems[] = {Tile::netherRack_Id}; + int hellRockItems[] = {Tile::netherrack_Id}; if(!isHintCompleted(e_Tutorial_Hint_Hell_Rock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Hell_Rock, this, hellRockItems, 1 ) ); - int hellSandItems[] = {Tile::soulsand_Id}; + int hellSandItems[] = {Tile::soul_sand_Id}; if(!isHintCompleted(e_Tutorial_Hint_Hell_Sand)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Hell_Sand, this, hellSandItems, 1 ) ); int glowstoneItems[] = {Tile::glowstone_Id}; if(!isHintCompleted(e_Tutorial_Hint_Glowstone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Glowstone, this, glowstoneItems, 1 ) ); - int portalItems[] = {Tile::portalTile_Id}; + int portalItems[] = {Tile::portal_Id}; if(!isHintCompleted(e_Tutorial_Hint_Portal)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Portal, this, portalItems, 1 ) ); - int pumpkinLitItems[] = {Tile::litPumpkin_Id}; + int pumpkinLitItems[] = {Tile::lit_pumpkin_Id}; if(!isHintCompleted(e_Tutorial_Hint_Pumpkin_Lit)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Pumpkin_Lit, this, pumpkinLitItems, 1, -1, -1, 0 ) ); int cakeItems[] = {Tile::cake_Id}; if(!isHintCompleted(e_Tutorial_Hint_Cake)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Cake, this, cakeItems, 1 ) ); - int redstoneRepeaterItems[] = {Tile::diode_on_Id, Tile::diode_off_Id}; + int redstoneRepeaterItems[] = {Tile::powered_repeater_Id, Tile::unpowered_repeater_Id}; if(!isHintCompleted(e_Tutorial_Hint_Redstone_Repeater)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Redstone_Repeater, this, redstoneRepeaterItems, 2, Item::repeater_Id ) ); int trapdoorItems[] = {Tile::trapdoor_Id}; if(!isHintCompleted(e_Tutorial_Hint_Trapdoor)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Trapdoor, this, trapdoorItems, 1 ) ); - int pistonItems[] = {Tile::pistonBase_Id}; + int pistonItems[] = {Tile::piston_Id}; if(!isHintCompleted(e_Tutorial_Hint_Piston)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Piston, this, pistonItems, 1 ) ); - int stickyPistonItems[] = {Tile::pistonStickyBase_Id}; + int stickyPistonItems[] = {Tile::sticky_piston_Id}; if(!isHintCompleted(e_Tutorial_Hint_Sticky_Piston)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Sticky_Piston, this, stickyPistonItems, 1 ) ); - int monsterStoneEggItems[] = {Tile::monsterStoneEgg_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Monster_Stone_Egg)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Monster_Stone_Egg, this, monsterStoneEggItems, 1 ) ); + int monster_eggItems[] = {Tile::monster_egg_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Monster_Stone_Egg)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Monster_Stone_Egg, this, monster_eggItems, 1 ) ); - int stoneBrickSmoothItems[] = {Tile::stoneBrick_Id}; + int stoneBrickSmoothItems[] = {Tile::stonebrick_Id}; if(!isHintCompleted(e_Tutorial_Hint_Stone_Brick_Smooth)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Stone_Brick_Smooth, this, stoneBrickSmoothItems, 1 ) ); - int hugeMushroomItems[] = {Tile::hugeMushroom_brown_Id,Tile::hugeMushroom_red_Id}; + int hugeMushroomItems[] = {Tile::brown_mushroom_block_Id,Tile::red_mushroom_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Huge_Mushroom)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Huge_Mushroom, this, hugeMushroomItems, 2 ) ); - int ironFenceItems[] = {Tile::ironFence_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Iron_Fence)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Iron_Fence, this, ironFenceItems, 1 ) ); + int iron_barsItems[] = {Tile::iron_bars_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Iron_Fence)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Iron_Fence, this, iron_barsItems, 1 ) ); - int thisGlassItems[] = {Tile::thinGlass_Id}; + int thisGlassItems[] = {Tile::glass_pane_Id}; if(!isHintCompleted(e_Tutorial_Hint_Thin_Glass)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Thin_Glass, this, thisGlassItems, 1 ) ); - int melonItems[] = {Tile::melon_Id}; + int melonItems[] = {Tile::melon_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_Melon)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Melon, this, melonItems, 1 ) ); int vineItems[] = {Tile::vine_Id}; if(!isHintCompleted(e_Tutorial_Hint_Vine)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Vine, this, vineItems, 1 ) ); - int fenceGateItems[] = {Tile::fenceGate_Id}; + int fenceGateItems[] = {Tile::fence_gate_Id}; if(!isHintCompleted(e_Tutorial_Hint_Fence_Gate)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Fence_Gate, this, fenceGateItems, 1 ) ); - int mycelItems[] = {Tile::mycel_Id}; + int mycelItems[] = {Tile::mycelium_Id}; if(!isHintCompleted(e_Tutorial_Hint_Mycel)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Mycel, this, mycelItems, 1 ) ); - int waterLilyItems[] = {Tile::waterLily_Id}; + int waterLilyItems[] = {Tile::waterlily_Id}; if(!isHintCompleted(e_Tutorial_Hint_Water_Lily)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Water_Lily, this, waterLilyItems, 1 ) ); - int netherBrickItems[] = {Tile::netherBrick_Id}; + int netherBrickItems[] = {Tile::nether_brick_Id}; if(!isHintCompleted(e_Tutorial_Hint_Nether_Brick)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Nether_Brick, this, netherBrickItems, 1 ) ); - int netherFenceItems[] = {Tile::netherFence_Id}; + int netherFenceItems[] = {Tile::nether_brick_fence_Id}; if(!isHintCompleted(e_Tutorial_Hint_Nether_Fence)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Nether_Fence, this, netherFenceItems, 1 ) ); - int netherStalkItems[] = {Tile::netherStalk_Id}; + int netherStalkItems[] = {Tile::nether_wart_Id}; if(!isHintCompleted(e_Tutorial_Hint_Nether_Stalk)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Nether_Stalk, this, netherStalkItems, 1 ) ); - int enchantTableItems[] = {Tile::enchantTable_Id}; + int enchantTableItems[] = {Tile::enchanting_table_Id}; if(!isHintCompleted(e_Tutorial_Hint_Enchant_Table)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Enchant_Table, this, enchantTableItems, 1 ) ); - int brewingStandItems[] = {Tile::brewingStand_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Brewing_Stand)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Brewing_Stand, this, brewingStandItems, 1, Item::brewingStand_Id ) ); + int brewingStandItems[] = {Tile::brewing_stand_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Brewing_Stand)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Brewing_Stand, this, brewingStandItems, 1, Item::brewing_stand_Id ) ); int cauldronItems[] = {Tile::cauldron_Id}; if(!isHintCompleted(e_Tutorial_Hint_Cauldron)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Cauldron, this, cauldronItems, 1, Item::cauldron_Id ) ); - int endPortalItems[] = {Tile::endPortalTile_Id}; + int endPortalItems[] = {Tile::end_portal_Id}; if(!isHintCompleted(e_Tutorial_Hint_End_Portal)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_End_Portal, this, endPortalItems, 1, -2 ) ); - int endPortalFrameItems[] = {Tile::endPortalFrameTile_Id}; + int endPortalFrameItems[] = {Tile::end_portal_frame_Id}; if(!isHintCompleted(e_Tutorial_Hint_End_Portal_Frame)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_End_Portal_Frame, this, endPortalFrameItems, 1 ) ); - int whiteStoneItems[] = {Tile::endStone_Id}; + int whiteStoneItems[] = {Tile::end_stone_Id}; if(!isHintCompleted(e_Tutorial_Hint_White_Stone)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_White_Stone, this, whiteStoneItems, 1 ) ); - int dragonEggItems[] = {Tile::dragonEgg_Id}; + int dragonEggItems[] = {Tile::dragon_egg_Id}; if(!isHintCompleted(e_Tutorial_Hint_Dragon_Egg)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Dragon_Egg, this, dragonEggItems, 1 ) ); - int redstoneLampItems[] = {Tile::redstoneLight_Id, Tile::redstoneLight_lit_Id}; + int redstoneLampItems[] = {Tile::redstone_lamp_Id, Tile::lit_redstone_lamp_Id}; if(!isHintCompleted(e_Tutorial_Hint_RedstoneLamp)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_RedstoneLamp, this, redstoneLampItems, 2 ) ); int cocoaItems[] = {Tile::cocoa_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Cocoa)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Cocoa, this, cocoaItems, 1, Item::dye_powder_Id, -1, DyePowderItem::BROWN) ); + if(!isHintCompleted(e_Tutorial_Hint_Cocoa)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Cocoa, this, cocoaItems, 1, Item::dye_Id, -1, DyePowderItem::BROWN) ); - int emeraldOreItems[] = {Tile::emeraldOre_Id}; + int emeraldOreItems[] = {Tile::emerald_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_EmeraldOre)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_EmeraldOre, this, emeraldOreItems, 1 ) ); - int emeraldBlockItems[] = {Tile::emeraldBlock_Id}; + int emeraldBlockItems[] = {Tile::emerald_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_EmeraldBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_EmeraldBlock, this, emeraldBlockItems, 1 ) ); - int enderChestItems[] = {Tile::enderChest_Id}; + int enderChestItems[] = {Tile::ender_chest_Id}; if(!isHintCompleted(e_Tutorial_Hint_EnderChest)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_EnderChest, this, enderChestItems, 1 ) ); - int tripwireSourceItems[] = {Tile::tripWireSource_Id}; + int tripwireSourceItems[] = {Tile::tripwire_hook_Id}; if(!isHintCompleted(e_Tutorial_Hint_TripwireSource)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_TripwireSource, this, tripwireSourceItems, 1 ) ); - int tripwireItems[] = {Tile::tripWire_Id}; + int tripwireItems[] = {Tile::tripwire_Id}; if(!isHintCompleted(e_Tutorial_Hint_Tripwire)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Tripwire, this, tripwireItems, 1, Item::string_Id ) ); - int cobblestoneWallItems[] = {Tile::cobbleWall_Id}; + int cobblestoneWallItems[] = {Tile::cobblestone_wall_Id}; if(!isHintCompleted(e_Tutorial_Hint_CobblestoneWall)) { addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CobblestoneWall, this, cobblestoneWallItems, 1, -1, WallTile::TYPE_NORMAL ) ); addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CobblestoneWall, this, cobblestoneWallItems, 1, -1, WallTile::TYPE_MOSSY ) ); } - int flowerpotItems[] = {Tile::flowerPot_Id}; - if(!isHintCompleted(e_Tutorial_Hint_Flowerpot)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Flowerpot, this, flowerpotItems, 1, Item::flowerPot_Id ) ); + int flowerpotItems[] = {Tile::flower_pot_Id}; + if(!isHintCompleted(e_Tutorial_Hint_Flowerpot)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Flowerpot, this, flowerpotItems, 1, Item::flower_pot_Id ) ); int anvilItems[] = {Tile::anvil_Id}; if(!isHintCompleted(e_Tutorial_Hint_Anvil)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Anvil, this, anvilItems, 1 ) ); - int quartzOreItems[] = {Tile::netherQuartz_Id}; + int quartzOreItems[] = {Tile::quartz_ore_Id}; if(!isHintCompleted(e_Tutorial_Hint_QuartzOre)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_QuartzOre, this, quartzOreItems, 1 ) ); - int quartzBlockItems[] = {Tile::quartzBlock_Id}; + int quartzBlockItems[] = {Tile::quartz_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_QuartzBlock)) { addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_QuartzBlock, this, quartzBlockItems, 1, -1, QuartzBlockTile::TYPE_DEFAULT ) ); @@ -749,7 +749,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_QuartzBlock, this, quartzBlockItems, 1, -1, QuartzBlockTile::TYPE_LINES_Z ) ); } - int carpetItems[] = {Tile::woolCarpet_Id}; + int carpetItems[] = {Tile::carpet_Id}; if(!isHintCompleted(e_Tutorial_Hint_WoolCarpet)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_WoolCarpet, this, carpetItems, 1 ) ); int potatoItems[] = {Tile::potatoes_Id}; @@ -758,19 +758,19 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int carrotItems[] = {Tile::carrots_Id}; if(!isHintCompleted(e_Tutorial_Hint_Carrot)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Carrot, this, carrotItems, 1, -1, -1, 7 ) ); - int commandBlockItems[] = {Tile::commandBlock_Id}; + int commandBlockItems[] = {Tile::command_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_CommandBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CommandBlock, this, commandBlockItems, 1 ) ); int beaconItems[] = {Tile::beacon_Id}; if(!isHintCompleted(e_Tutorial_Hint_Beacon)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Beacon, this, beaconItems, 1 ) ); - int activatorRailItems[] = {Tile::activatorRail_Id}; + int activatorRailItems[] = {Tile::activator_rail_Id}; if(!isHintCompleted(e_Tutorial_Hint_Activator_Rail)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Activator_Rail, this, activatorRailItems, 1 ) ); - int redstoneBlockItems[] = {Tile::redstoneBlock_Id}; + int redstoneBlockItems[] = {Tile::redstone_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_RedstoneBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_RedstoneBlock, this, redstoneBlockItems, 1 ) ); - int daylightDetectorItems[] = {Tile::daylightDetector_Id}; + int daylightDetectorItems[] = {Tile::daylight_detector_Id}; if(!isHintCompleted(e_Tutorial_Hint_DaylightDetector)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_DaylightDetector, this, daylightDetectorItems, 1 ) ); int dropperItems[] = {Tile::dropper_Id}; @@ -779,22 +779,22 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) int hopperItems[] = {Tile::hopper_Id}; if(!isHintCompleted(e_Tutorial_Hint_Hopper)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Hopper, this, hopperItems, 1 ) ); - int comparatorItems[] = {Tile::comparator_off_Id, Tile::comparator_on_Id}; + int comparatorItems[] = {Tile::unpowered_comparator_Id, Tile::powered_comparator_Id}; if(!isHintCompleted(e_Tutorial_Hint_Comparator)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Comparator, this, comparatorItems, 2, Item::comparator_Id ) ); int trappedChestItems[] = {Tile::chest_trap_Id}; if(!isHintCompleted(e_Tutorial_Hint_ChestTrap)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ChestTrap, this, trappedChestItems, 1 ) ); - int hayBlockItems[] = {Tile::hayBlock_Id}; + int hayBlockItems[] = {Tile::hay_block_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}; + int clayHardenedItems[] = {Tile::hardened_clay_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}; + int clayHardenedColoredItems[] = {Tile::stained_hardened_clay_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}; + int coalBlockItems[] = {Tile::coal_block_Id}; if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) ); /* @@ -833,13 +833,13 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad ) /* * ITEM HINTS */ - int shovelItems[] = {Item::shovel_wood->id, Item::shovel_stone->id, Item::shovel_iron->id, Item::shovel_gold->id, Item::shovel_diamond->id}; + int shovelItems[] = {Item::wooden_shovel->id, Item::stone_shovel->id, Item::iron_shovel->id, Item::golden_shovel->id, Item::diamond_shovel->id}; if(!isHintCompleted(e_Tutorial_Hint_Item_Shovel)) addHint(e_Tutorial_State_Gameplay, new DiggerItemHint(e_Tutorial_Hint_Item_Shovel, this, IDS_TUTORIAL_HINT_DIGGER_ITEM_SHOVEL, shovelItems, 5) ); - int hatchetItems[] = {Item::hatchet_wood->id, Item::hatchet_stone->id, Item::hatchet_iron->id, Item::hatchet_gold->id, Item::hatchet_diamond->id}; + int hatchetItems[] = {Item::wooden_axe->id, Item::stone_axe->id, Item::iron_axe->id, Item::golden_axe->id, Item::diamond_axe->id}; if(!isHintCompleted(e_Tutorial_Hint_Item_Hatchet)) addHint(e_Tutorial_State_Gameplay, new DiggerItemHint(e_Tutorial_Hint_Item_Hatchet, this, IDS_TUTORIAL_HINT_DIGGER_ITEM_HATCHET, hatchetItems, 5 ) ); - int pickaxeItems[] = {Item::pickAxe_wood->id, Item::pickAxe_stone->id, Item::pickAxe_iron->id, Item::pickAxe_gold->id, Item::pickAxe_diamond->id}; + int pickaxeItems[] = {Item::wooden_pickaxe->id, Item::stone_pickaxe->id, Item::iron_pickaxe->id, Item::golden_pickaxe->id, Item::diamond_pickaxe->id}; if(!isHintCompleted(e_Tutorial_Hint_Item_Pickaxe)) addHint(e_Tutorial_State_Gameplay, new DiggerItemHint(e_Tutorial_Hint_Item_Pickaxe, this, IDS_TUTORIAL_HINT_DIGGER_ITEM_PICKAXE, pickaxeItems, 5 ) ); /* @@ -1993,7 +1993,7 @@ void Tutorial::onSelectedItemChanged(shared_ptr item) { switch(item->id) { - case Item::fishingRod_Id: + case Item::fishing_rod_Id: changeTutorialState(e_Tutorial_State_Fishing); break; default: diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp index a61edb05..18ed185f 100644 --- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp @@ -1242,37 +1242,37 @@ void IUIScene_AbstractContainerMenu::onMouseTick() switch(iId) { case Item::bow_Id: - case Item::sword_wood_Id: - case Item::sword_stone_Id: - case Item::sword_iron_Id: - case Item::sword_diamond_Id: + case Item::wooden_sword_Id: + case Item::stone_sword_Id: + case Item::iron_sword_Id: + case Item::diamond_sword_Id: buttonY=eToolTipQuickMoveWeapon; break; - case Item::helmet_leather_Id: - case Item::chestplate_leather_Id: - case Item::leggings_leather_Id: - case Item::boots_leather_Id: + case Item::leather_helmet_Id: + case Item::leather_chestplate_Id: + case Item::leather_leggings_Id: + case Item::leather_boots_Id: - case Item::helmet_chain_Id: - case Item::chestplate_chain_Id: - case Item::leggings_chain_Id: - case Item::boots_chain_Id: + case Item::chainmail_helmet_Id: + case Item::chainmail_chestplate_Id: + case Item::chainmail_leggings_Id: + case Item::chainmail_boots_Id: - case Item::helmet_iron_Id: - case Item::chestplate_iron_Id: - case Item::leggings_iron_Id: - case Item::boots_iron_Id: + case Item::iron_helmet_Id: + case Item::iron_chestplate_Id: + case Item::iron_leggings_Id: + case Item::iron_boots_Id: - case Item::helmet_diamond_Id: - case Item::chestplate_diamond_Id: - case Item::leggings_diamond_Id: - case Item::boots_diamond_Id: + case Item::diamond_helmet_Id: + case Item::diamond_chestplate_Id: + case Item::diamond_leggings_Id: + case Item::diamond_boots_Id: - case Item::helmet_gold_Id: - case Item::chestplate_gold_Id: - case Item::leggings_gold_Id: - case Item::boots_gold_Id: + case Item::golden_helmet_Id: + case Item::golden_chestplate_Id: + case Item::golden_leggings_Id: + case Item::golden_boots_Id: case Item::elytra_Id: diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp index c43a1433..b9664c9d 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp @@ -269,7 +269,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) //pMinecraft->soundEngine->playUI( L"random.pop", 1.0f, 1.0f); ui.PlayUISFX(eSFX_Craft); - if(pTempItemInst->id != Item::fireworksCharge_Id && pTempItemInst->id != Item::fireworks_Id) + if(pTempItemInst->id != Item::firework_charge_Id && pTempItemInst->id != Item::fireworks_Id) { // and remove those resources from your inventory for(int i=0;iid ) { - case Tile::workBench_Id: m_pPlayer->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); break; - case Item::pickAxe_wood_Id: m_pPlayer->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); break; + case Tile::crafting_table_Id: m_pPlayer->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); break; + case Item::wooden_pickaxe_Id: m_pPlayer->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); break; case Tile::furnace_Id: m_pPlayer->awardStat(GenericStats::buildFurnace(), GenericStats::param_buildFurnace()); break; - //case Item::hoe_wood_Id: m_pPlayer->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break; + //case Item::wooden_hoe_Id: m_pPlayer->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break; case Item::bread_Id: m_pPlayer->awardStat(GenericStats::makeBread(), GenericStats::param_makeBread()); break; case Item::cake_Id: m_pPlayer->awardStat(GenericStats::bakeCake(), GenericStats::param_bakeCake()); break; - case Item::pickAxe_stone_Id: m_pPlayer->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); break; - //case Item::sword_wood_Id: m_pPlayer->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break; + case Item::stone_pickaxe_Id: m_pPlayer->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); break; + //case Item::wooden_sword_Id: m_pPlayer->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break; case Tile::dispenser_Id: m_pPlayer->awardStat(GenericStats::dispenseWithThis(), GenericStats::param_dispenseWithThis()); break; - case Tile::enchantTable_Id: m_pPlayer->awardStat(GenericStats::enchantments(), GenericStats::param_enchantments()); break; + case Tile::enchanting_table_Id: m_pPlayer->awardStat(GenericStats::enchantments(), GenericStats::param_enchantments()); break; case Tile::bookshelf_Id: m_pPlayer->awardStat(GenericStats::bookcase(), GenericStats::param_bookcase()); break; } switch (pTempItemInst->getItem()->getBaseItemType()) { @@ -1088,7 +1088,7 @@ void IUIScene_CraftingMenu::DisplayIngredients() { idescID=IDS_ANY_WOOL; } - else if((pTempItemInst->id==Item::fireworksCharge_Id) && (id==Item::dye_powder_Id)) + else if((pTempItemInst->id==Item::firework_charge_Id) && (id==Item::dye_Id)) { idescID=IDS_ITEM_DYE_POWDER; iAuxVal = 1; @@ -1158,7 +1158,7 @@ void IUIScene_CraftingMenu::DisplayIngredients() { iAuxVal = 0xFF; } - else if( pTempItemInst->id==Item::fireworksCharge_Id && id == Item::dye_powder_Id) + else if( pTempItemInst->id==Item::firework_charge_Id && id == Item::dye_Id) { iAuxVal = 1; } diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 4ddbd620..579b5d76 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -34,9 +34,9 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::dirt_Id, 0) ITEM(Tile::cobblestone_Id) ITEM(Tile::sand_Id) - ITEM(Tile::sandStone_Id) - ITEM_AUX(Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE) - ITEM_AUX(Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS) + ITEM(Tile::sandstone_Id) + ITEM_AUX(Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE) + ITEM_AUX(Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS) ITEM_AUX(Tile::sand_Id, SandTile::RED_SAND) ITEM(Tile::red_sandstone_Id) ITEM_AUX(Tile::red_sandstone_Id, RedSandStoneTile::TYPE_SMOOTHSIDE) @@ -47,150 +47,150 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::stone_Id, StoneTile::POLISHED_ANDESITE) ITEM_AUX(Tile::stone_Id, StoneTile::DIORITE) ITEM_AUX(Tile::stone_Id, StoneTile::POLISHED_DIORITE) - ITEM(Tile::coalBlock_Id) - ITEM(Tile::goldBlock_Id) - ITEM(Tile::ironBlock_Id) - ITEM(Tile::lapisBlock_Id) - ITEM(Tile::diamondBlock_Id) - ITEM(Tile::emeraldBlock_Id) - ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_DEFAULT) - ITEM(Tile::coalOre_Id) - ITEM(Tile::lapisOre_Id) - ITEM(Tile::diamondOre_Id) - ITEM(Tile::redStoneOre_Id) - ITEM(Tile::ironOre_Id) - ITEM(Tile::goldOre_Id) - ITEM(Tile::emeraldOre_Id) - ITEM(Tile::netherQuartz_Id) - ITEM(Tile::unbreakable_Id) - ITEM_AUX(Tile::wood_Id,0) - ITEM_AUX(Tile::wood_Id,TreeTile::SPRUCE_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::SPRUCE_TRUNK) - ITEM_AUX(Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK) - ITEM_AUX(Tile::treeTrunk_Id, TreeTile::JUNGLE_TRUNK) - ITEM_AUX(Tile::tree2Trunk_Id, TreeTile2::ACACIA_TRUNK) - ITEM_AUX(Tile::tree2Trunk_Id, TreeTile2::DARK_TRUNK) + ITEM(Tile::coal_block_Id) + ITEM(Tile::gold_block_Id) + ITEM(Tile::iron_block_Id) + ITEM(Tile::lapis_block_Id) + ITEM(Tile::diamond_block_Id) + ITEM(Tile::emerald_block_Id) + ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_DEFAULT) + ITEM(Tile::coal_ore_Id) + ITEM(Tile::lapis_ore_Id) + ITEM(Tile::diamond_ore_Id) + ITEM(Tile::redstone_ore_Id) + ITEM(Tile::iron_ore_Id) + ITEM(Tile::gold_ore_Id) + ITEM(Tile::emerald_ore_Id) + ITEM(Tile::quartz_ore_Id) + ITEM(Tile::bedrock_Id) + ITEM_AUX(Tile::planks_Id,0) + ITEM_AUX(Tile::planks_Id,TreeTile::SPRUCE_TRUNK) + ITEM_AUX(Tile::planks_Id,TreeTile::BIRCH_TRUNK) + ITEM_AUX(Tile::planks_Id,TreeTile::JUNGLE_TRUNK) + ITEM_AUX(Tile::planks_Id, TreeTile::ACACIA_TRUNK) + ITEM_AUX(Tile::planks_Id, TreeTile::DARK_TRUNK) + ITEM_AUX(Tile::log_Id, 0) + ITEM_AUX(Tile::log_Id, TreeTile::SPRUCE_TRUNK) + ITEM_AUX(Tile::log_Id, TreeTile::BIRCH_TRUNK) + ITEM_AUX(Tile::log_Id, TreeTile::JUNGLE_TRUNK) + ITEM_AUX(Tile::log2_Id, TreeTile2::ACACIA_TRUNK) + ITEM_AUX(Tile::log2_Id, TreeTile2::DARK_TRUNK) ITEM(Tile::gravel_Id) - ITEM(Tile::redBrick_Id) - ITEM(Tile::mossyCobblestone_Id) + ITEM(Tile::brick_block_Id) + ITEM(Tile::mossy_cobblestone_Id) ITEM(Tile::obsidian_Id) ITEM(Tile::clay) ITEM(Tile::ice_Id) - ITEM(Tile::packedIce_Id) + ITEM(Tile::packed_ice_Id) ITEM(Tile::snow_Id) - ITEM(Tile::netherRack_Id) - ITEM(Tile::soulsand_Id) + ITEM(Tile::netherrack_Id) + ITEM(Tile::soul_sand_Id) ITEM(Tile::glowstone_Id) - ITEM(Tile::seaLantern_Id) + ITEM(Tile::sea_lantern_Id) ITEM_AUX(Tile::prismarine_Id, PrismarineTile::TYPE_DEFAULT) ITEM_AUX(Tile::prismarine_Id, PrismarineTile::TYPE_BRICKS) ITEM_AUX(Tile::prismarine_Id, PrismarineTile::TYPE_DARK) 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::spruce_fence_Id) + ITEM(Tile::birch_fence_Id) + ITEM(Tile::jungle_fence_Id) + ITEM(Tile::acacia_fence_Id) + ITEM(Tile::dark_oak_fence_Id) - ITEM(Tile::netherFence_Id) - ITEM(Tile::ironFence_Id) - ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_NORMAL) - ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_MOSSY) - ITEM_AUX(Tile::stoneBrick_Id,SmoothStoneBrickTile::TYPE_DEFAULT) - ITEM_AUX(Tile::stoneBrick_Id,SmoothStoneBrickTile::TYPE_MOSSY) - ITEM_AUX(Tile::stoneBrick_Id,SmoothStoneBrickTile::TYPE_CRACKED) - ITEM_AUX(Tile::stoneBrick_Id,SmoothStoneBrickTile::TYPE_DETAIL) - ITEM_AUX(Tile::monsterStoneEgg_Id,StoneMonsterTile::HOST_ROCK) - ITEM_AUX(Tile::monsterStoneEgg_Id,StoneMonsterTile::HOST_COBBLE) - ITEM_AUX(Tile::monsterStoneEgg_Id,StoneMonsterTile::HOST_STONEBRICK) - ITEM(Tile::mycel_Id) + ITEM(Tile::nether_brick_fence_Id) + ITEM(Tile::iron_bars_Id) + ITEM_AUX(Tile::cobblestone_wall_Id, WallTile::TYPE_NORMAL) + ITEM_AUX(Tile::cobblestone_wall_Id, WallTile::TYPE_MOSSY) + ITEM_AUX(Tile::stonebrick_Id,SmoothStoneBrickTile::TYPE_DEFAULT) + ITEM_AUX(Tile::stonebrick_Id,SmoothStoneBrickTile::TYPE_MOSSY) + ITEM_AUX(Tile::stonebrick_Id,SmoothStoneBrickTile::TYPE_CRACKED) + ITEM_AUX(Tile::stonebrick_Id,SmoothStoneBrickTile::TYPE_DETAIL) + ITEM_AUX(Tile::monster_egg_Id,StoneMonsterTile::HOST_ROCK) + ITEM_AUX(Tile::monster_egg_Id,StoneMonsterTile::HOST_COBBLE) + ITEM_AUX(Tile::monster_egg_Id,StoneMonsterTile::HOST_STONEBRICK) + ITEM(Tile::mycelium_Id) ITEM_AUX(Tile::dirt_Id, DirtTile::COARSE_DIRT) ITEM_AUX(Tile::dirt_Id, DirtTile::PODZOL) - ITEM(Tile::netherBrick_Id) - ITEM(Tile::endStone_Id) - ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_CHISELED) - ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_LINES_Y) + ITEM(Tile::nether_brick_Id) + ITEM(Tile::end_stone_Id) + ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_CHISELED) + ITEM_AUX(Tile::quartz_block_Id,QuartzBlockTile::TYPE_LINES_Y) ITEM(Tile::trapdoor_Id) ITEM(Tile::iron_trapdoor_Id) - ITEM(Tile::fenceGate_Id) + ITEM(Tile::fence_gate_Id) // TU25 - ITEM(Tile::spruceGate_Id) - ITEM(Tile::birchGate_Id) - ITEM(Tile::jungleGate_Id) - ITEM(Tile::acaciaGate_Id) - ITEM(Tile::darkGate_Id) + ITEM(Tile::spruce_fence_gate_Id) + ITEM(Tile::birch_fence_gate_Id) + ITEM(Tile::jungle_fence_gate_Id) + ITEM(Tile::acacia_fence_gate_Id) + ITEM(Tile::dark_oak_fence_gate_Id) - ITEM(Item::door_wood_Id) - ITEM(Item::door_iron_Id) + ITEM(Item::wooden_door_Id) + ITEM(Item::iron_door_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(Item::spruce_door_Id) + ITEM(Item::birch_door_Id) + ITEM(Item::jungle_door_Id) + ITEM(Item::acacia_door_Id) + ITEM(Item::dark_oak_door_Id) - ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::STONE_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::SAND_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::STONE_SLAB) + ITEM_AUX(Tile::stone_slab_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::SPRUCE_TRUNK) - ITEM_AUX(Tile::woodSlabHalf_Id,TreeTile::BIRCH_TRUNK) - ITEM_AUX(Tile::woodSlabHalf_Id,TreeTile::JUNGLE_TRUNK) +// ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::WOOD_SLAB) + ITEM_AUX(Tile::wooden_slab_Id,0) + ITEM_AUX(Tile::wooden_slab_Id, TreeTile::SPRUCE_TRUNK) + ITEM_AUX(Tile::wooden_slab_Id,TreeTile::BIRCH_TRUNK) + ITEM_AUX(Tile::wooden_slab_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::wooden_slab_Id, TreeTile::ACACIA_TRUNK) + ITEM_AUX(Tile::wooden_slab_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) - ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::NETHERBRICK_SLAB) - ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::QUARTZ_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::COBBLESTONE_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::BRICK_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::SMOOTHBRICK_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::NETHERBRICK_SLAB) + ITEM_AUX(Tile::stone_slab_Id,StoneSlabTile::QUARTZ_SLAB) ITEM_AUX(Tile::stone_slab2_Id ,StoneSlabTile2::RED_SANDSTONE_SLAB) - ITEM(Tile::stairs_wood_Id) - 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) - ITEM(Tile::stairs_netherBricks_Id) - ITEM(Tile::stairs_sandstone_Id) + ITEM(Tile::oak_stairs_Id) + ITEM(Tile::birch_stairs_Id) + ITEM(Tile::spruce_stairs_Id) + ITEM(Tile::jungle_stairs_Id) + ITEM(Tile::acacia_stairs_Id) + ITEM(Tile::dark_oak_stairs_Id) + ITEM(Tile::stone_stairs_Id) + ITEM(Tile::brick_stairs_Id) + ITEM(Tile::stone_brick_stairs_Id) + ITEM(Tile::nether_brick_stairs_Id) + ITEM(Tile::sandstone_stairs_Id) ITEM(Tile::stairs_red_sandstone) - ITEM(Tile::stairs_quartz_Id) + ITEM(Tile::quartz_stairs_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 + ITEM(Tile::hardened_clay_Id) + ITEM_AUX(Tile::stained_hardened_clay_Id,14) // Red + ITEM_AUX(Tile::stained_hardened_clay_Id,1) // Orange + ITEM_AUX(Tile::stained_hardened_clay_Id,4) // Yellow + ITEM_AUX(Tile::stained_hardened_clay_Id,5) // Lime + ITEM_AUX(Tile::stained_hardened_clay_Id,3) // Light Blue + ITEM_AUX(Tile::stained_hardened_clay_Id,9) // Cyan + ITEM_AUX(Tile::stained_hardened_clay_Id,11) // Blue + ITEM_AUX(Tile::stained_hardened_clay_Id,10) // Purple + ITEM_AUX(Tile::stained_hardened_clay_Id,2) // Magenta + ITEM_AUX(Tile::stained_hardened_clay_Id,6) // Pink + ITEM_AUX(Tile::stained_hardened_clay_Id,0) // White + ITEM_AUX(Tile::stained_hardened_clay_Id,8) // Light Gray + ITEM_AUX(Tile::stained_hardened_clay_Id,7) // Gray + ITEM_AUX(Tile::stained_hardened_clay_Id,15) // Black + ITEM_AUX(Tile::stained_hardened_clay_Id,13) // Green + ITEM_AUX(Tile::stained_hardened_clay_Id,12) // Brown // Decoration DEF(eCreativeInventory_Decoration) @@ -201,9 +201,9 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Item::skull_Id,SkullTileEntity::TYPE_CREEPER) ITEM_AUX(Tile::sponge_Id, 0) // dry sponge ITEM_AUX(Tile::sponge_Id, 1) // wet sponge - ITEM(Tile::melon_Id) + ITEM(Tile::melon_block_Id) ITEM(Tile::pumpkin_Id) - ITEM(Tile::litPumpkin_Id) + ITEM(Tile::lit_pumpkin_Id) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_DEFAULT) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_EVERGREEN) ITEM_AUX(Tile::sapling_Id, Sapling::TYPE_BIRCH) @@ -217,42 +217,42 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::leaves2_Id, LeafTile2::ACACIA_LEAF) ITEM_AUX(Tile::leaves2_Id, LeafTile2::DARK_OAK_LEAF) ITEM(Tile::vine) - ITEM(Tile::waterLily_Id) + ITEM(Tile::waterlily_Id) ITEM(Tile::torch_Id) ITEM_AUX(Tile::tallgrass_Id, TallGrass::DEAD_SHRUB) ITEM_AUX(Tile::tallgrass_Id, TallGrass::TALL_GRASS) ITEM_AUX(Tile::tallgrass_Id, TallGrass::FERN) - ITEM(Tile::deadBush_Id) - ITEM(Tile::flower_Id) - ITEM(Tile::rose_Id) - ITEM_AUX(Tile::rose_Id, Rose::BLUE_ORCHID) - ITEM_AUX(Tile::rose_Id, Rose::ALLIUM) - ITEM_AUX(Tile::rose_Id, Rose::AZURE_BLUET) - ITEM_AUX(Tile::rose_Id, Rose::RED_TULIP) - ITEM_AUX(Tile::rose_Id, Rose::ORANGE_TULIP) - ITEM_AUX(Tile::rose_Id, Rose::WHITE_TULIP) - ITEM_AUX(Tile::rose_Id, Rose::PINK_TULIP) - ITEM_AUX(Tile::rose_Id, Rose::OXEYE_DAISY) + ITEM(Tile::deadbush_Id) + ITEM(Tile::yellow_flower_Id) + ITEM(Tile::red_flower_Id) + ITEM_AUX(Tile::red_flower_Id, Rose::BLUE_ORCHID) + ITEM_AUX(Tile::red_flower_Id, Rose::ALLIUM) + ITEM_AUX(Tile::red_flower_Id, Rose::AZURE_BLUET) + ITEM_AUX(Tile::red_flower_Id, Rose::RED_TULIP) + ITEM_AUX(Tile::red_flower_Id, Rose::ORANGE_TULIP) + ITEM_AUX(Tile::red_flower_Id, Rose::WHITE_TULIP) + ITEM_AUX(Tile::red_flower_Id, Rose::PINK_TULIP) + ITEM_AUX(Tile::red_flower_Id, Rose::OXEYE_DAISY) // SUNFLOWER LOCATION - ITEM_AUX(Tile::tallgrass2_Id, TallGrass2::LILAC) - ITEM_AUX(Tile::tallgrass2_Id, TallGrass2::TALL_GRASS) - ITEM_AUX(Tile::tallgrass2_Id, TallGrass2::LARGE_FERN) - ITEM_AUX(Tile::tallgrass2_Id, TallGrass2::ROSE_BUSH) - ITEM_AUX(Tile::tallgrass2_Id, TallGrass2::PEONY) + ITEM_AUX(Tile::double_plant_Id, TallGrass2::LILAC) + ITEM_AUX(Tile::double_plant_Id, TallGrass2::TALL_GRASS) + ITEM_AUX(Tile::double_plant_Id, TallGrass2::LARGE_FERN) + ITEM_AUX(Tile::double_plant_Id, TallGrass2::ROSE_BUSH) + ITEM_AUX(Tile::double_plant_Id, TallGrass2::PEONY) ITEM(Tile::mushroom_brown_Id) ITEM(Tile::mushroom_red_Id) ITEM(Tile::cactus_Id) - ITEM(Tile::topSnow_Id) + ITEM(Tile::snow_layer_Id) // 4J-PB - Already got sugar cane in Materials ITEM_11(Tile::reeds_Id) ITEM(Tile::web_Id) - ITEM(Tile::thinGlass_Id) + ITEM(Tile::glass_pane_Id) ITEM(Tile::glass_Id) ITEM(Item::painting_Id) - ITEM(Item::itemFrame_Id) - ITEM(Item::sign_Id) + ITEM(Item::item_frame_Id) + ITEM(Item::standing_sign_Id) ITEM(Tile::bookshelf_Id) - ITEM(Item::flowerPot_Id) - ITEM(Tile::hayBlock_Id) + ITEM(Item::flower_pot_Id) + ITEM(Tile::hay_block_Id) ITEM_AUX(Tile::wool_Id,14) // Red ITEM_AUX(Tile::wool_Id,1) // Orange ITEM_AUX(Tile::wool_Id,4) // Yellow @@ -270,22 +270,22 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::wool_Id,13) // Green ITEM_AUX(Tile::wool_Id,12) // Brown - ITEM_AUX(Tile::woolCarpet_Id,14) // Red - ITEM_AUX(Tile::woolCarpet_Id,1) // Orange - ITEM_AUX(Tile::woolCarpet_Id,4) // Yellow - ITEM_AUX(Tile::woolCarpet_Id,5) // Lime - ITEM_AUX(Tile::woolCarpet_Id,3) // Light Blue - ITEM_AUX(Tile::woolCarpet_Id,9) // Cyan - ITEM_AUX(Tile::woolCarpet_Id,11) // Blue - ITEM_AUX(Tile::woolCarpet_Id,10) // Purple - ITEM_AUX(Tile::woolCarpet_Id,2) // Magenta - ITEM_AUX(Tile::woolCarpet_Id,6) // Pink - ITEM_AUX(Tile::woolCarpet_Id,0) // White - ITEM_AUX(Tile::woolCarpet_Id,8) // Light Gray - ITEM_AUX(Tile::woolCarpet_Id,7) // Gray - ITEM_AUX(Tile::woolCarpet_Id,15) // Black - ITEM_AUX(Tile::woolCarpet_Id,13) // Green - ITEM_AUX(Tile::woolCarpet_Id,12) // Brown + ITEM_AUX(Tile::carpet_Id,14) // Red + ITEM_AUX(Tile::carpet_Id,1) // Orange + ITEM_AUX(Tile::carpet_Id,4) // Yellow + ITEM_AUX(Tile::carpet_Id,5) // Lime + ITEM_AUX(Tile::carpet_Id,3) // Light Blue + ITEM_AUX(Tile::carpet_Id,9) // Cyan + ITEM_AUX(Tile::carpet_Id,11) // Blue + ITEM_AUX(Tile::carpet_Id,10) // Purple + ITEM_AUX(Tile::carpet_Id,2) // Magenta + ITEM_AUX(Tile::carpet_Id,6) // Pink + ITEM_AUX(Tile::carpet_Id,0) // White + ITEM_AUX(Tile::carpet_Id,8) // Light Gray + ITEM_AUX(Tile::carpet_Id,7) // Gray + ITEM_AUX(Tile::carpet_Id,15) // Black + ITEM_AUX(Tile::carpet_Id,13) // Green + ITEM_AUX(Tile::carpet_Id,12) // Brown ITEM_AUX(Tile::stained_glass_Id,14) // Red ITEM_AUX(Tile::stained_glass_Id,1) // Orange @@ -347,40 +347,40 @@ void IUIScene_CreativeMenu::staticCtor() DEF(eCreativeInventory_Redstone) ITEM(Tile::dispenser_Id) ITEM(Tile::noteblock_Id) - ITEM(Tile::pistonBase_Id) - ITEM(Tile::pistonStickyBase_Id) + ITEM(Tile::piston_Id) + ITEM(Tile::sticky_piston_Id) ITEM(Tile::tnt_Id) ITEM(Tile::lever_Id) - ITEM(Tile::button_stone_Id) - ITEM(Tile::button_wood_Id) - ITEM(Tile::pressurePlate_stone_Id) - ITEM(Tile::pressurePlate_wood_Id) - ITEM(Item::redStone_Id) - ITEM(Tile::redstoneBlock_Id) - ITEM(Tile::redstoneTorch_on_Id) + ITEM(Tile::stone_button_Id) + ITEM(Tile::wooden_button_Id) + ITEM(Tile::stone_pressure_plate_Id) + ITEM(Tile::wooden_pressure_plate_Id) + ITEM(Item::redstone_Id) + ITEM(Tile::redstone_block_Id) + ITEM(Tile::redstone_torch_Id) ITEM(Item::repeater_Id) - ITEM(Tile::redstoneLight_Id) - ITEM(Tile::tripWireSource_Id) - ITEM(Tile::daylightDetector_Id) + ITEM(Tile::redstone_lamp_Id) + ITEM(Tile::tripwire_hook_Id) + ITEM(Tile::daylight_detector_Id) ITEM(Tile::dropper_Id) ITEM(Tile::hopper_Id) ITEM(Item::comparator_Id) ITEM(Tile::chest_trap_Id) - ITEM(Tile::weightedPlate_heavy_Id) - ITEM(Tile::weightedPlate_light_Id) + ITEM(Tile::heavy_weighted_pressure_plate_Id) + ITEM(Tile::light_weighted_pressure_plate_Id) // Transport DEF(eCreativeInventory_Transport) ITEM(Tile::rail_Id) - ITEM(Tile::goldenRail_Id) - ITEM(Tile::detectorRail_Id) - ITEM(Tile::activatorRail_Id) + ITEM(Tile::golden_rail_Id) + ITEM(Tile::detector_rail_Id) + ITEM(Tile::activator_rail_Id) ITEM(Tile::ladder_Id) ITEM(Item::minecart_Id) - ITEM(Item::minecart_chest_Id) - ITEM(Item::minecart_furnace_Id) - ITEM(Item::minecart_hopper_Id) - ITEM(Item::minecart_tnt_Id) + ITEM(Item::chest_minecart_Id) + ITEM(Item::furnace_minecart_Id) + ITEM(Item::hopper_minecart_Id) + ITEM(Item::tnt_minecart_Id) ITEM(Item::saddle_Id) ITEM(Item::boat_Id) ITEM(Item::elytra_Id) @@ -388,76 +388,76 @@ void IUIScene_CreativeMenu::staticCtor() // Miscellaneous DEF(eCreativeInventory_Misc) ITEM(Tile::chest_Id) - ITEM(Tile::enderChest_Id) - ITEM(Tile::workBench_Id) + ITEM(Tile::ender_chest_Id) + ITEM(Tile::crafting_table_Id) ITEM(Tile::furnace_Id) - ITEM(Item::brewingStand_Id) - ITEM(Tile::enchantTable_Id) + ITEM(Item::brewing_stand_Id) + ITEM(Tile::enchanting_table_Id) ITEM(Tile::beacon_Id) - ITEM(Tile::endPortalFrameTile_Id) + ITEM(Tile::end_portal_frame_Id) ITEM(Tile::jukebox_Id) ITEM(Tile::anvil_Id); ITEM(Item::bed_Id) - ITEM(Item::bucket_empty_Id) - ITEM(Item::bucket_lava_Id) - ITEM(Item::bucket_water_Id) - ITEM(Item::bucket_milk_Id) + ITEM(Item::bucket_Id) + ITEM(Item::lava_bucket_Id) + ITEM(Item::water_bucket_Id) + ITEM(Item::milk_bucket_Id) ITEM(Item::cauldron_Id) - ITEM(Item::snowBall_Id) + ITEM(Item::snowball_Id) ITEM(Item::paper_Id) ITEM(Item::book_Id) //TU25 - ITEM(Item::writingBook_Id) + ITEM(Item::writable_book_Id) - ITEM(Item::enderPearl_Id) - ITEM(Item::eyeOfEnder_Id) - ITEM(Item::nameTag_Id) - ITEM(Item::netherStar_Id) - ITEM_AUX(Item::spawnEgg_Id, 50); // Creeper - ITEM_AUX(Item::spawnEgg_Id, 51); // Skeleton - ITEM_AUX(Item::spawnEgg_Id, 52); // Spider - ITEM_AUX(Item::spawnEgg_Id, 54); // Zombie - ITEM_AUX(Item::spawnEgg_Id, 55); // Slime - ITEM_AUX(Item::spawnEgg_Id, 56); // Ghast - ITEM_AUX(Item::spawnEgg_Id, 57); // Zombie Pigman - ITEM_AUX(Item::spawnEgg_Id, 58); // Enderman - ITEM_AUX(Item::spawnEgg_Id, 59); // Cave Spider - ITEM_AUX(Item::spawnEgg_Id, 60); // Silverfish - ITEM_AUX(Item::spawnEgg_Id, 61); // Blaze - ITEM_AUX(Item::spawnEgg_Id, 62); // Magma Cube - ITEM_AUX(Item::spawnEgg_Id, 65); // Bat - ITEM_AUX(Item::spawnEgg_Id, 66); // Witch + ITEM(Item::ender_pearl_Id) + ITEM(Item::eye_of_ender_Id) + ITEM(Item::name_tag_Id) + ITEM(Item::nether_star_Id) + ITEM_AUX(Item::spawn_egg_Id, 50); // Creeper + ITEM_AUX(Item::spawn_egg_Id, 51); // Skeleton + ITEM_AUX(Item::spawn_egg_Id, 52); // Spider + ITEM_AUX(Item::spawn_egg_Id, 54); // Zombie + ITEM_AUX(Item::spawn_egg_Id, 55); // Slime + ITEM_AUX(Item::spawn_egg_Id, 56); // Ghast + ITEM_AUX(Item::spawn_egg_Id, 57); // Zombie Pigman + ITEM_AUX(Item::spawn_egg_Id, 58); // Enderman + ITEM_AUX(Item::spawn_egg_Id, 59); // Cave Spider + ITEM_AUX(Item::spawn_egg_Id, 60); // Silverfish + ITEM_AUX(Item::spawn_egg_Id, 61); // Blaze + ITEM_AUX(Item::spawn_egg_Id, 62); // Magma Cube + ITEM_AUX(Item::spawn_egg_Id, 65); // Bat + ITEM_AUX(Item::spawn_egg_Id, 66); // Witch - ITEM_AUX(Item::spawnEgg_Id, 67); // Endermite - ITEM_AUX(Item::spawnEgg_Id, 68); // Guardian - ITEM_AUX(Item::spawnEgg_Id, 4); // Elder Guardian - ITEM_AUX(Item::spawnEgg_Id, 90); // Pig - ITEM_AUX(Item::spawnEgg_Id, 91); // Sheep - ITEM_AUX(Item::spawnEgg_Id, 92); // Cow - ITEM_AUX(Item::spawnEgg_Id, 93); // Chicken - ITEM_AUX(Item::spawnEgg_Id, 94); // Squid - ITEM_AUX(Item::spawnEgg_Id, 95); // Wolf - ITEM_AUX(Item::spawnEgg_Id, 96); // Mooshroom - ITEM_AUX(Item::spawnEgg_Id, 98); // Ozelot - ITEM_AUX(Item::spawnEgg_Id, 100); // Horse + ITEM_AUX(Item::spawn_egg_Id, 67); // Endermite + ITEM_AUX(Item::spawn_egg_Id, 68); // Guardian + ITEM_AUX(Item::spawn_egg_Id, 4); // Elder Guardian + ITEM_AUX(Item::spawn_egg_Id, 90); // Pig + ITEM_AUX(Item::spawn_egg_Id, 91); // Sheep + ITEM_AUX(Item::spawn_egg_Id, 92); // Cow + ITEM_AUX(Item::spawn_egg_Id, 93); // Chicken + ITEM_AUX(Item::spawn_egg_Id, 94); // Squid + ITEM_AUX(Item::spawn_egg_Id, 95); // Wolf + ITEM_AUX(Item::spawn_egg_Id, 96); // Mooshroom + ITEM_AUX(Item::spawn_egg_Id, 98); // Ozelot + ITEM_AUX(Item::spawn_egg_Id, 100); // Horse - ITEM_AUX(Item::spawnEgg_Id, 100 | ((EntityHorse::TYPE_DONKEY + 1) << 12) ); // Donkey - ITEM_AUX(Item::spawnEgg_Id, 100 | ((EntityHorse::TYPE_MULE + 1) << 12)); // Mule - ITEM_AUX(Item::spawnEgg_Id, 120); // Villager - ITEM_AUX(Item::spawnEgg_Id, 101); // Rabbit Brown - ITEM(Item::record_01_Id) - ITEM(Item::record_02_Id) - ITEM(Item::record_03_Id) - ITEM(Item::record_04_Id) - ITEM(Item::record_05_Id) - ITEM(Item::record_06_Id) - ITEM(Item::record_07_Id) - ITEM(Item::record_08_Id) - ITEM(Item::record_09_Id) - ITEM(Item::record_10_Id) + ITEM_AUX(Item::spawn_egg_Id, 100 | ((EntityHorse::TYPE_DONKEY + 1) << 12) ); // Donkey + ITEM_AUX(Item::spawn_egg_Id, 100 | ((EntityHorse::TYPE_MULE + 1) << 12)); // Mule + ITEM_AUX(Item::spawn_egg_Id, 120); // Villager + ITEM_AUX(Item::spawn_egg_Id, 101); // Rabbit Brown + ITEM(Item::record_13_Id) + ITEM(Item::record_cat_Id) + ITEM(Item::record_blocks_Id) + ITEM(Item::record_chirp_Id) + ITEM(Item::record_far_Id) + ITEM(Item::record_mall_Id) + ITEM(Item::record_mellohi_Id) + ITEM(Item::record_stal_Id) + ITEM(Item::record_strad_Id) + ITEM(Item::record_ward_Id) ITEM(Item::record_11_Id) - ITEM(Item::record_12_Id) + ITEM(Item::record_wait_Id) BuildFirework(list, FireworksItem::TYPE_SMALL, DyePowderItem::LIGHT_BLUE, 1, true, false); BuildFirework(list, FireworksItem::TYPE_CREEPER, DyePowderItem::GREEN, 2, false, false); @@ -469,119 +469,119 @@ void IUIScene_CreativeMenu::staticCtor() DEF(eCreativeInventory_ArtToolsMisc) if(app.DebugSettingsOn()) { - ITEM_AUX(Item::spawnEgg_Id, 100 | ((EntityHorse::TYPE_SKELETON + 1) << 12)); // Skeleton - ITEM_AUX(Item::spawnEgg_Id, 100 | ((EntityHorse::TYPE_UNDEAD + 1) << 12)); // Zombie - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_BLACK + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_RED + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 98 | ((Ocelot::TYPE_SIAMESE + 1) << 12)); - ITEM_AUX(Item::spawnEgg_Id, 52 | (2 << 12)); // Spider-Jockey - ITEM_AUX(Item::spawnEgg_Id, 63); // Enderdragon + ITEM_AUX(Item::spawn_egg_Id, 100 | ((EntityHorse::TYPE_SKELETON + 1) << 12)); // Skeleton + ITEM_AUX(Item::spawn_egg_Id, 100 | ((EntityHorse::TYPE_UNDEAD + 1) << 12)); // Zombie + ITEM_AUX(Item::spawn_egg_Id, 98 | ((Ocelot::TYPE_BLACK + 1) << 12)); + ITEM_AUX(Item::spawn_egg_Id, 98 | ((Ocelot::TYPE_RED + 1) << 12)); + ITEM_AUX(Item::spawn_egg_Id, 98 | ((Ocelot::TYPE_SIAMESE + 1) << 12)); + ITEM_AUX(Item::spawn_egg_Id, 52 | (2 << 12)); // Spider-Jockey + ITEM_AUX(Item::spawn_egg_Id, 63); // Enderdragon } // Food DEF(eCreativeInventory_Food) ITEM(Item::apple_Id) - ITEM(Item::apple_gold_Id) - ITEM_AUX(Item::apple_gold_Id,1) // Enchanted - ITEM(Item::melon_Id) - ITEM(Item::mushroomStew_Id) - ITEM(Item::rabbitStew_Id) + ITEM(Item::golden_apple_Id) + ITEM_AUX(Item::golden_apple_Id,1) // Enchanted + ITEM(Item::melon_block_Id) + ITEM(Item::mushroom_stew_Id) + ITEM(Item::rabbit_stew_Id) ITEM(Item::bread_Id) ITEM(Item::cake_Id) ITEM(Item::cookie_Id) - ITEM(Item::fish_cooked_Id) - ITEM(Item::fish_raw_Id) + ITEM(Item::cooked_fish_Id) + ITEM(Item::fish_Id) - ITEM_AUX(Item::fish_cooked_Id, 1) - ITEM_AUX(Item::fish_raw_Id, 1) - ITEM_AUX(Item::fish_raw_Id, 2) - ITEM_AUX(Item::fish_raw_Id, 3) + ITEM_AUX(Item::cooked_fish_Id, 1) + ITEM_AUX(Item::fish_Id, 1) + ITEM_AUX(Item::fish_Id, 2) + ITEM_AUX(Item::fish_Id, 3) - ITEM(Item::porkChop_cooked_Id) - ITEM(Item::porkChop_raw_Id) - ITEM(Item::beef_cooked_Id) - ITEM(Item::beef_raw_Id) - ITEM(Item::chicken_raw_Id) - ITEM(Item::chicken_cooked_Id) - ITEM(Item::mutton_raw_Id) - ITEM(Item::mutton_cooked_Id) - ITEM(Item::rabbit_raw_Id) - ITEM(Item::rabbit_cooked_Id) + ITEM(Item::cooked_porkchop_Id) + ITEM(Item::porkchop_Id) + ITEM(Item::cooked_beef_Id) + ITEM(Item::beef_Id) + ITEM(Item::chicken_Id) + ITEM(Item::cooked_chicken_Id) + ITEM(Item::mutton_Id) + ITEM(Item::cooked_mutton_Id) + ITEM(Item::rabbit_Id) + ITEM(Item::cooked_rabbit_Id) ITEM(Item::rotten_flesh_Id) - ITEM(Item::spiderEye_Id) + ITEM(Item::spider_eye_Id) ITEM(Item::potato_Id) - ITEM(Item::potatoBaked_Id) - ITEM(Item::potatoPoisonous_Id) - ITEM(Item::carrots_Id) - ITEM(Item::carrotGolden_Id) - ITEM(Item::pumpkinPie_Id) + ITEM(Item::baked_potato_Id) + ITEM(Item::poisonous_potato_Id) + ITEM(Item::carrot_Id) + ITEM(Item::golden_carrot_Id) + ITEM(Item::pumpkin_pie_Id) // Tools, Armour and Weapons (Complete) DEF(eCreativeInventory_ToolsArmourWeapons) ITEM(Item::compass_Id) - ITEM(Item::helmet_leather_Id) - ITEM(Item::chestplate_leather_Id) - ITEM(Item::leggings_leather_Id) - ITEM(Item::boots_leather_Id) - ITEM(Item::sword_wood_Id) - ITEM(Item::shovel_wood_Id) - ITEM(Item::pickAxe_wood_Id) - ITEM(Item::hatchet_wood_Id) - ITEM(Item::hoe_wood_Id) + ITEM(Item::leather_helmet_Id) + ITEM(Item::leather_chestplate_Id) + ITEM(Item::leather_leggings_Id) + ITEM(Item::leather_boots_Id) + ITEM(Item::wooden_sword_Id) + ITEM(Item::wooden_shovel_Id) + ITEM(Item::wooden_pickaxe_Id) + ITEM(Item::wooden_axe_Id) + ITEM(Item::wooden_hoe_Id) - ITEM(Item::emptyMap_Id) - ITEM(Item::helmet_chain_Id) - ITEM(Item::chestplate_chain_Id) - ITEM(Item::leggings_chain_Id) - ITEM(Item::boots_chain_Id) - ITEM(Item::sword_stone_Id) - ITEM(Item::shovel_stone_Id) - ITEM(Item::pickAxe_stone_Id) - ITEM(Item::hatchet_stone_Id) - ITEM(Item::hoe_stone_Id) + ITEM(Item::map_Id) + ITEM(Item::chainmail_helmet_Id) + ITEM(Item::chainmail_chestplate_Id) + ITEM(Item::chainmail_leggings_Id) + ITEM(Item::chainmail_boots_Id) + ITEM(Item::stone_sword_Id) + ITEM(Item::stone_shovel_Id) + ITEM(Item::stone_pickaxe_Id) + ITEM(Item::stone_axe_Id) + ITEM(Item::stone_hoe_Id) ITEM(Item::bow_Id) - ITEM(Item::helmet_iron_Id) - ITEM(Item::chestplate_iron_Id) - ITEM(Item::leggings_iron_Id) - ITEM(Item::boots_iron_Id) - ITEM(Item::sword_iron_Id) - ITEM(Item::shovel_iron_Id) - ITEM(Item::pickAxe_iron_Id) - ITEM(Item::hatchet_iron_Id) - ITEM(Item::hoe_iron_Id) + ITEM(Item::iron_helmet_Id) + ITEM(Item::iron_chestplate_Id) + ITEM(Item::iron_leggings_Id) + ITEM(Item::iron_boots_Id) + ITEM(Item::iron_sword_Id) + ITEM(Item::iron_shovel_Id) + ITEM(Item::iron_pickaxe_Id) + ITEM(Item::iron_axe_Id) + ITEM(Item::iron_hoe_Id) ITEM(Item::arrow_Id) - ITEM(Item::helmet_gold_Id) - ITEM(Item::chestplate_gold_Id) - ITEM(Item::leggings_gold_Id) - ITEM(Item::boots_gold_Id) - ITEM(Item::sword_gold_Id) - ITEM(Item::shovel_gold_Id) - ITEM(Item::pickAxe_gold_Id) - ITEM(Item::hatchet_gold_Id) - ITEM(Item::hoe_gold_Id) + ITEM(Item::golden_helmet_Id) + ITEM(Item::golden_chestplate_Id) + ITEM(Item::golden_leggings_Id) + ITEM(Item::golden_boots_Id) + ITEM(Item::golden_sword_Id) + ITEM(Item::golden_shovel_Id) + ITEM(Item::golden_pickaxe_Id) + ITEM(Item::golden_axe_Id) + ITEM(Item::golden_hoe_Id) - ITEM(Item::flintAndSteel_Id) - ITEM(Item::helmet_diamond_Id) - ITEM(Item::chestplate_diamond_Id) - ITEM(Item::leggings_diamond_Id) - ITEM(Item::boots_diamond_Id) - ITEM(Item::sword_diamond_Id) - ITEM(Item::shovel_diamond_Id) - ITEM(Item::pickAxe_diamond_Id) - ITEM(Item::hatchet_diamond_Id) - ITEM(Item::hoe_diamond_Id) + ITEM(Item::flint_and_steel_Id) + ITEM(Item::diamond_helmet_Id) + ITEM(Item::diamond_chestplate_Id) + ITEM(Item::diamond_leggings_Id) + ITEM(Item::diamond_boots_Id) + ITEM(Item::diamond_sword_Id) + ITEM(Item::diamond_shovel_Id) + ITEM(Item::diamond_pickaxe_Id) + ITEM(Item::diamond_axe_Id) + ITEM(Item::diamond_hoe_Id) - ITEM(Item::fireball_Id) + ITEM(Item::fire_charge_Id) ITEM(Item::clock_Id) ITEM(Item::shears_Id) - ITEM(Item::fishingRod_Id) - ITEM(Item::carrotOnAStick_Id) + ITEM(Item::fishing_rod_Id) + ITEM(Item::carrot_on_a_stick_Id) ITEM(Item::lead_Id) - ITEM(Item::horseArmorDiamond_Id) - ITEM(Item::horseArmorGold_Id) - ITEM(Item::horseArmorMetal_Id) + ITEM(Item::diamond_horse_armor_Id) + ITEM(Item::golden_horse_armor_Id) + ITEM(Item::iron_horse_armor_Id) ITEM(Item::armor_stand_Id) @@ -591,13 +591,13 @@ void IUIScene_CreativeMenu::staticCtor() { Enchantment *enchantment = Enchantment::enchantments[i]; if (enchantment == nullptr || enchantment->category == nullptr) continue; - list->push_back(Item::enchantedBook->createForEnchantment(new EnchantmentInstance(enchantment, enchantment->getMaxLevel()))); + list->push_back(Item::enchanted_book->createForEnchantment(new EnchantmentInstance(enchantment, enchantment->getMaxLevel()))); } #ifndef _CONTENT_PACKAGE if(app.DebugSettingsOn()) { - shared_ptr debugSword = std::make_shared(Item::sword_diamond_Id, 1, 0); + shared_ptr debugSword = std::make_shared(Item::diamond_sword_Id, 1, 0); debugSword->enchant( Enchantment::damageBonus, 50 ); debugSword->setHoverName(L"Sword of Debug"); list->push_back(debugSword); @@ -610,11 +610,11 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Item::coal_Id,1) ITEM(Item::diamond_Id) ITEM(Item::emerald_Id) - ITEM(Item::ironIngot_Id) - ITEM(Item::goldIngot_Id) - ITEM(Item::netherQuartz_Id) + ITEM(Item::iron_ingot_Id) + ITEM(Item::gold_ingot_Id) + ITEM(Item::quartz_Id) ITEM(Item::brick_Id) - ITEM(Item::netherbrick_Id) + ITEM(Item::nether_brick_Id) ITEM(Item::stick_Id) ITEM(Item::bowl_Id) ITEM(Item::bone_Id) @@ -625,49 +625,49 @@ void IUIScene_CreativeMenu::staticCtor() ITEM(Item::rabbit_hide_Id) ITEM(Item::gunpowder_Id) ITEM(Item::clay_Id) - ITEM(Item::yellowDust_Id) - ITEM(Item::prismarine_cystal_Id) + ITEM(Item::glowstone_dust_Id) + ITEM(Item::prismarine_crystals_Id) ITEM(Item::prismarine_shard_Id) - ITEM(Item::seeds_wheat_Id) - ITEM(Item::seeds_melon_Id) - ITEM(Item::seeds_pumpkin_Id) + ITEM(Item::wheat_seeds_Id) + ITEM(Item::melon_seeds_Id) + ITEM(Item::pumpkin_seeds_Id) ITEM(Item::wheat_Id) ITEM(Item::reeds_Id) ITEM(Item::egg_Id) ITEM(Item::sugar_Id) - ITEM(Item::slimeBall_Id) - ITEM(Item::blazeRod_Id) - ITEM(Item::goldNugget_Id) + ITEM(Item::slime_ball_Id) + ITEM(Item::blaze_rod_Id) + ITEM(Item::gold_nugget_Id) ITEM(Item::netherwart_seeds_Id) - ITEM_AUX(Item::dye_powder_Id,1) // Red - ITEM_AUX(Item::dye_powder_Id,14) // Orange - ITEM_AUX(Item::dye_powder_Id,11) // Yellow - ITEM_AUX(Item::dye_powder_Id,10) // Lime - ITEM_AUX(Item::dye_powder_Id,12) // Light Blue - ITEM_AUX(Item::dye_powder_Id,6) // Cyan - ITEM_AUX(Item::dye_powder_Id,4) // Blue - ITEM_AUX(Item::dye_powder_Id,5) // Purple - ITEM_AUX(Item::dye_powder_Id,13) // Magenta - ITEM_AUX(Item::dye_powder_Id,9) // Pink - ITEM_AUX(Item::dye_powder_Id,15) // Bone Meal - ITEM_AUX(Item::dye_powder_Id,7) // Light gray - ITEM_AUX(Item::dye_powder_Id,8) // Gray - ITEM_AUX(Item::dye_powder_Id,0) // black (ink sac) - ITEM_AUX(Item::dye_powder_Id,2) // Green - ITEM_AUX(Item::dye_powder_Id,3) // Brown + ITEM_AUX(Item::dye_Id,1) // Red + ITEM_AUX(Item::dye_Id,14) // Orange + ITEM_AUX(Item::dye_Id,11) // Yellow + ITEM_AUX(Item::dye_Id,10) // Lime + ITEM_AUX(Item::dye_Id,12) // Light Blue + ITEM_AUX(Item::dye_Id,6) // Cyan + ITEM_AUX(Item::dye_Id,4) // Blue + ITEM_AUX(Item::dye_Id,5) // Purple + ITEM_AUX(Item::dye_Id,13) // Magenta + ITEM_AUX(Item::dye_Id,9) // Pink + ITEM_AUX(Item::dye_Id,15) // Bone Meal + ITEM_AUX(Item::dye_Id,7) // Light gray + ITEM_AUX(Item::dye_Id,8) // Gray + ITEM_AUX(Item::dye_Id,0) // black (ink sac) + ITEM_AUX(Item::dye_Id,2) // Green + ITEM_AUX(Item::dye_Id,3) // Brown // Brewing (TODO) DEF(eCreativeInventory_Brewing) - ITEM(Item::expBottle_Id) + ITEM(Item::experience_bottle_Id) // 4J Stu - Anything else added here also needs to be added to the key handler below - ITEM(Item::ghastTear_Id) - ITEM(Item::fermentedSpiderEye_Id) - ITEM(Item::blazePowder_Id) - ITEM(Item::magmaCream_Id) - ITEM(Item::speckledMelon_Id) - ITEM(Item::rabbits_foot_Id) - ITEM(Item::glassBottle_Id) + ITEM(Item::ghast_tear_Id) + ITEM(Item::fermented_spider_eye_Id) + ITEM(Item::blaze_powder_Id) + ITEM(Item::magma_cream_Id) + ITEM(Item::speckled_melon_block_Id) + ITEM(Item::rabbit_foot_Id) + ITEM(Item::glass_bottle_Id) ITEM_AUX(Item::potion_Id,0) // Water bottle //ITEM_AUX(Item::potion_Id,MACRO_MAKEPOTION_AUXVAL(0, 0, MASK_TYPE_AWKWARD)) // Awkward Potion diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp index 40fcad55..826b2238 100644 --- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp +++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp @@ -251,7 +251,7 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, // remove any icon text else if(temp.find(L"{*CraftingTableIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Tile::workBench_Id, 1, 0); + m_iconItem = std::make_shared(Tile::crafting_table_Id, 1, 0); } else if(temp.find(L"{*SticksIcon*}")!=wstring::npos) { @@ -259,19 +259,19 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, } else if(temp.find(L"{*PlanksIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Tile::wood_Id, 1, 0); + m_iconItem = std::make_shared(Tile::planks_Id, 1, 0); } else if(temp.find(L"{*WoodenShovelIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::shovel_wood_Id, 1, 0); + m_iconItem = std::make_shared(Item::wooden_shovel_Id, 1, 0); } else if(temp.find(L"{*WoodenHatchetIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::hatchet_wood_Id, 1, 0); + m_iconItem = std::make_shared(Item::wooden_axe_Id, 1, 0); } else if(temp.find(L"{*WoodenPickaxeIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::pickAxe_wood_Id, 1, 0); + m_iconItem = std::make_shared(Item::wooden_pickaxe_Id, 1, 0); } else if(temp.find(L"{*FurnaceIcon*}")!=wstring::npos) { @@ -279,7 +279,7 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, } else if(temp.find(L"{*WoodenDoorIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::door_wood, 1, 0); + m_iconItem = std::make_shared(Item::wooden_door, 1, 0); } else if(temp.find(L"{*TorchIcon*}")!=wstring::npos) { @@ -291,11 +291,11 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, } else if(temp.find(L"{*FishingRodIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::fishingRod_Id, 1, 0); + m_iconItem = std::make_shared(Item::fishing_rod_Id, 1, 0); } else if(temp.find(L"{*FishIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Item::fish_raw_Id, 1, 0); + m_iconItem = std::make_shared(Item::fish_Id, 1, 0); } else if(temp.find(L"{*MinecartIcon*}")!=wstring::npos) { @@ -307,7 +307,7 @@ wstring UIComponent_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, } else if(temp.find(L"{*PoweredRailIcon*}")!=wstring::npos) { - m_iconItem = std::make_shared(Tile::goldenRail_Id, 1, 0); + m_iconItem = std::make_shared(Tile::golden_rail_Id, 1, 0); } else if(temp.find(L"{*StructuresIcon*}")!=wstring::npos) { diff --git a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp index ee8f6ade..1f905670 100644 --- a/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_BeaconMenu.cpp @@ -342,10 +342,10 @@ void UIScene_BeaconMenu::customDraw(IggyCustomDrawCallbackRegion *region) item = std::make_shared(Item::diamond); break; case 2: - item = std::make_shared(Item::goldIngot); + item = std::make_shared(Item::gold_ingot); break; case 3: - item = std::make_shared(Item::ironIngot); + item = std::make_shared(Item::iron_ingot); break; default: assert(false); diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp index 57f11f45..7272ecfd 100644 --- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp @@ -13,7 +13,7 @@ const int UIScene_LeaderboardsMenu::TitleIcons[UIScene_LeaderboardsMenu::NUM_LEA { {UIControl_LeaderboardList::e_ICON_TYPE_WALKED, UIControl_LeaderboardList::e_ICON_TYPE_FALLEN, Item::minecart_Id, Item::boat_Id, -1}, {Tile::dirt_Id, Tile::cobblestone_Id, Tile::sand_Id, Tile::stone_Id, Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id}, - {Item::egg_Id, Item::wheat_Id, Tile::mushroom_brown_Id, Tile::reeds_Id, Item::bucket_milk_Id, Tile::pumpkin_Id, -1}, + {Item::egg_Id, Item::wheat_Id, Tile::mushroom_brown_Id, Tile::reeds_Id, Item::milk_bucket_Id, Tile::pumpkin_Id, -1}, {UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIE, UIControl_LeaderboardList::e_ICON_TYPE_SKELETON, UIControl_LeaderboardList::e_ICON_TYPE_CREEPER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDER, UIControl_LeaderboardList::e_ICON_TYPE_SPIDERJOKEY, UIControl_LeaderboardList::e_ICON_TYPE_ZOMBIEPIGMAN, UIControl_LeaderboardList::e_ICON_TYPE_SLIME}, }; const UIScene_LeaderboardsMenu::LeaderboardDescriptor UIScene_LeaderboardsMenu::LEADERBOARD_DESCRIPTORS[UIScene_LeaderboardsMenu::NUM_LEADERBOARDS][4] = { diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp index aea3c92f..0d914c8c 100644 --- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp +++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp @@ -34,7 +34,7 @@ LPCWSTR CScene_Leaderboards::m_TextColumnNameA[7]= const int CScene_Leaderboards::TitleIcons[CScene_Leaderboards::NUM_LEADERBOARDS][7] = { { XZP_ICON_WALKED, XZP_ICON_FALLEN, Item::minecart_Id, Item::boat_Id, nullptr }, - { Tile::dirt_Id, Tile::stoneBrick_Id, Tile::sand_Id, Tile::rock_Id, Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id }, + { Tile::dirt_Id, Tile::stonebrick_Id, Tile::sand_Id, Tile::rock_Id, Tile::gravel_Id, Tile::clay_Id, Tile::obsidian_Id }, { Item::egg_Id, Item::wheat_Id, Tile::mushroom1_Id, Tile::reeds_Id, Item::milk_Id, Tile::pumpkin_Id, nullptr }, { XZP_ICON_ZOMBIE, XZP_ICON_SKELETON, XZP_ICON_CREEPER, XZP_ICON_SPIDER, XZP_ICON_SPIDERJOCKEY, XZP_ICON_ZOMBIEPIGMAN, XZP_ICON_SLIME }, }; diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp index 0be89d4c..c56ac063 100644 --- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp +++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp @@ -390,7 +390,7 @@ wstring CScene_TutorialPopup::_SetIcon(int icon, int iAuxVal, bool isFoil, LPCWS } else if(temp.find(L"{*PoweredRailIcon*}")!=wstring::npos) { - m_pCraftingPic->SetIcon(m_iPad, Tile::goldenRail_Id,0,1,10,31,false); + m_pCraftingPic->SetIcon(m_iPad, Tile::golden_rail_Id,0,1,10,31,false); } else if(temp.find(L"{*StructuresIcon*}")!=wstring::npos) { diff --git a/Minecraft.Client/DispenserBootstrap.h b/Minecraft.Client/DispenserBootstrap.h index 84dde91a..80020ed6 100644 --- a/Minecraft.Client/DispenserBootstrap.h +++ b/Minecraft.Client/DispenserBootstrap.h @@ -11,19 +11,19 @@ public: { DispenserTile::REGISTRY.add(Item::arrow, new ArrowDispenseBehavior()); DispenserTile::REGISTRY.add(Item::egg, new EggDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::snowBall, new SnowballDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::expBottle, new ExpBottleDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::snowball, new SnowballDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::experience_bottle, new ExpBottleDispenseBehavior()); DispenserTile::REGISTRY.add(Item::potion, new PotionDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::spawnEgg, new SpawnEggDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::spawn_egg, new SpawnEggDispenseBehavior()); DispenserTile::REGISTRY.add(Item::fireworks, new FireworksDispenseBehavior()); DispenserTile::REGISTRY.add(Item::fireball, new FireballDispenseBehavior()); DispenserTile::REGISTRY.add(Item::boat, new BoatDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::bucket_lava, new FilledBucketDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::bucket_water, new FilledBucketDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::bucket_empty, new EmptyBucketDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::flintAndSteel, new FlintAndSteelDispenseBehavior()); - DispenserTile::REGISTRY.add(Item::dye_powder, new DyeDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::lava_bucket, new FilledBucketDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::water_bucket, new FilledBucketDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::bucket, new EmptyBucketDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::flint_and_steel, new FlintAndSteelDispenseBehavior()); + DispenserTile::REGISTRY.add(Item::dye, new DyeDispenseBehavior()); DispenserTile::REGISTRY.add(Item::items[Tile::tnt_Id], new TntDispenseBehavior()); } }; \ No newline at end of file diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp index 07259162..b9210005 100644 --- a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp +++ b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp @@ -135,14 +135,14 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize() sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup, Tile::dirt_Id); // works sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::milk_Id); // works. sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Tile::dirt_Id); // works. - sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::porkChop_cooked_Id); // BROKEN! (ach 'Pork Chop' configured incorrectly) + sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::cooked_porkchop_Id); // BROKEN! (ach 'Pork Chop' configured incorrectly) sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::cake_Id); // works. (ach 'The Lie' configured incorrectly) sp->addArgs(DsItemEvent::eAcquisitionMethod_Bought, Item::emerald_Id); // fixed (+ach) - sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::ironIngot_Id); // works. (+ach 'Acquired Hardware') - sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup, Item::fish_raw_Id); // works. (+ach 'Delicious Fish') - sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::fish_cooked_Id); // works. (+ach 'Delicious Fish') - sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::sign_Id); - sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::flowerPot_Id); // FIXING! + sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::iron_ingot_Id); // works. (+ach 'Acquired Hardware') + sp->addArgs(DsItemEvent::eAcquisitionMethod_Pickedup, Item::fish_Id); // works. (+ach 'Delicious Fish') + sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::cooked_fish_Id); // works. (+ach 'Delicious Fish') + sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::standing_sign_Id); + sp->addArgs(DsItemEvent::eAcquisitionMethod_Crafted, Item::flower_pot_Id); // FIXING! out->m_stats.push_back(sp); sp = new StatParam(L"McItemAcquired.DifficultyLevelId.*.AcquisitionMethodId.*.ItemId.*"); @@ -153,21 +153,21 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize() sp = new StatParam(L"McItemUsed.ItemId.*.ItemAux.*"); //sp->addArgs(Item::apple_Id, 0); //sp->addArgs(Item::cake_Id, 0); - sp->addArgs(Item::beef_raw_Id, 0); // works - sp->addArgs(Item::porkChop_cooked_Id, 0); // works + sp->addArgs(Item::beef_Id, 0); // works + sp->addArgs(Item::cooked_porkchop_Id, 0); // works out->m_stats.push_back(sp); sp = new StatParam(L"MinHungerWhenEaten.ItemId.*"); //sp->addArgs(Item::apple_Id); //sp->addArgs(Item::cake_Id); - sp->addArgs(Item::beef_raw_Id); // works + sp->addArgs(Item::beef_Id); // works sp->addArgs(Item::rotten_flesh_Id); // works (+ach IronBelly) out->m_stats.push_back(sp); sp = new StatParam(L"BlockBroken.BlockId.*"); sp->addArgs( Tile::dirt_Id ); sp->addArgs( Tile::rock_Id ); - sp->addArgs( Tile::emeraldOre_Id ); + sp->addArgs( Tile::emerald_ore_Id ); out->m_stats.push_back(sp); sp = new StatParam(L"BlockBroken.BlockId.*.BlockAux.*"); @@ -188,21 +188,21 @@ DurangoStatsDebugger *DurangoStatsDebugger::Initialize() sp = new StatParam(L"BlockPlaced.BlockId.*"); sp->addArgs( Tile::dirt_Id ); - sp->addArgs( Tile::stoneBrick_Id ); + sp->addArgs( Tile::stonebrick_Id ); sp->addArgs( Tile::sand_Id ); // works - sp->addArgs( Tile::sign_Id ); // fixed - sp->addArgs( Tile::wallSign_Id ); // fixed + sp->addArgs( Tile::standing_sign_Id ); // fixed + sp->addArgs( Tile::wall_standing_sign_Id ); // fixed out->m_stats.push_back(sp); sp = new StatParam(L"MobKilled.KillTypeId.*.EnemyRoleId.*.PlayerWeaponId.*"); // BROKEN! sp->addArgs( /*MELEE*/ 0, ioid_Cow, 0 ); - sp->addArgs( /*MELEE*/ 0, ioid_Cow, Item::sword_stone_Id ); - sp->addArgs( /*MELEE*/ 0, ioid_Pig, Item::sword_stone_Id ); + sp->addArgs( /*MELEE*/ 0, ioid_Cow, Item::stone_sword_Id ); + sp->addArgs( /*MELEE*/ 0, ioid_Pig, Item::stone_sword_Id ); out->m_stats.push_back(sp); sp = new StatParam(L"MaxKillDistance.KillTypeId.*.EnemyRoleId.*.PlayerWeaponId.*"); // BROKEN! - sp->addArgs( /*MELEE*/ 0, ioid_Cow, Item::sword_stone_Id ); - sp->addArgs( /*MELEE*/ 0, ioid_Pig, Item::sword_stone_Id ); + sp->addArgs( /*MELEE*/ 0, ioid_Cow, Item::stone_sword_Id ); + sp->addArgs( /*MELEE*/ 0, ioid_Pig, Item::stone_sword_Id ); sp->addArgs( /*RANGE*/ 1, ioid_Creeper, ioid_Arrow ); // FIXING! out->m_stats.push_back(sp); diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp index 95a806f0..accda0f7 100644 --- a/Minecraft.Client/EntityRenderDispatcher.cpp +++ b/Minecraft.Client/EntityRenderDispatcher.cpp @@ -149,12 +149,12 @@ EntityRenderDispatcher::EntityRenderDispatcher() renderers[eTYPE_ITEM_FRAME] = new ItemFrameRenderer(); renderers[eTYPE_LEASHFENCEKNOT] = new LeashKnotRenderer(); renderers[eTYPE_ARROW] = new ArrowRenderer(); - renderers[eTYPE_SNOWBALL] = new ItemSpriteRenderer(Item::snowBall); - renderers[eTYPE_THROWNENDERPEARL] = new ItemSpriteRenderer(Item::enderPearl); - renderers[eTYPE_EYEOFENDERSIGNAL] = new ItemSpriteRenderer(Item::eyeOfEnder); + renderers[eTYPE_SNOWBALL] = new ItemSpriteRenderer(Item::snowball); + renderers[eTYPE_THROWNENDERPEARL] = new ItemSpriteRenderer(Item::ender_pearl); + renderers[eTYPE_EYEOFENDERSIGNAL] = new ItemSpriteRenderer(Item::eye_of_ender); renderers[eTYPE_THROWNEGG] = new ItemSpriteRenderer(Item::egg); renderers[eTYPE_THROWNPOTION] = new ItemSpriteRenderer(Item::potion, PotionBrewing::THROWABLE_MASK); - renderers[eTYPE_THROWNEXPBOTTLE] = new ItemSpriteRenderer(Item::expBottle); + renderers[eTYPE_THROWNEXPBOTTLE] = new ItemSpriteRenderer(Item::experience_bottle); renderers[eTYPE_FIREWORKS_ROCKET] = new ItemSpriteRenderer(Item::fireworks); renderers[eTYPE_LARGE_FIREBALL] = new FireballRenderer(2.0f); renderers[eTYPE_SMALL_FIREBALL] = new FireballRenderer(0.5f); diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp index d54801d3..2b598d9d 100644 --- a/Minecraft.Client/EntityTileRenderer.cpp +++ b/Minecraft.Client/EntityTileRenderer.cpp @@ -15,7 +15,7 @@ EntityTileRenderer::EntityTileRenderer() void EntityTileRenderer::render(Tile *tile, int data, float brightness, float alpha, bool setColor, bool useCompiled) { - if (tile->id == Tile::enderChest_Id) + if (tile->id == Tile::ender_chest_Id) { TileEntityRenderDispatcher::instance->render(enderChest, 0, 0, 0, 0, setColor, alpha, useCompiled); } diff --git a/Minecraft.Client/FishingHookRenderer.cpp b/Minecraft.Client/FishingHookRenderer.cpp index a9b0d91a..29d443ff 100644 --- a/Minecraft.Client/FishingHookRenderer.cpp +++ b/Minecraft.Client/FishingHookRenderer.cpp @@ -67,7 +67,7 @@ void FishingHookRenderer::render(shared_ptr _hook, double x, double y, d if (ownerPlayer != nullptr) { shared_ptr selected = ownerPlayer->inventory->getSelected(); - if (selected == nullptr || selected->id != Item::fishingRod_Id) + if (selected == nullptr || selected->id != Item::fishing_rod_Id) { handDir = -handDir; } diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 6a42ed5a..731eb480 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -1183,7 +1183,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) std::wstring decoded = BlockStateDecoderRegistry::decode(tid, st.value); if (decoded.empty()) { - if (tid == Tile::door_wood_Id || tid == Tile::door_iron_Id || tid == Tile::spruce_door_Id || tid == Tile::birch_door_Id || tid == Tile::jungle_door_Id || tid == Tile::acacia_door_Id || tid == Tile::dark_oak_door_Id) { + if (tid == Tile::wooden_door_Id || tid == Tile::iron_door_Id || tid == Tile::spruce_door_Id || tid == Tile::birch_door_Id || tid == Tile::jungle_door_Id || tid == Tile::acacia_door_Id || tid == Tile::dark_oak_door_Id) { decoded = BlockStateDecoder::doorPropsToString(BlockStateDecoder::decodeDoor(st.value)); } } diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp index 7ea382a2..daa6622d 100644 --- a/Minecraft.Client/LevelRenderer.cpp +++ b/Minecraft.Client/LevelRenderer.cpp @@ -2821,9 +2821,9 @@ else if (name== L"footstep") mc->particleEngine->add(shared_ptrparticleEngine->add(shared_ptr( new SplashParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); else if (name== L"largesmoke") mc->particleEngine->add(shared_ptr( new SmokeParticle(level[playerIndex], x, y, z, xa, ya, za, 2.5f) ) ); else if (name== L"reddust") mc->particleEngine->add(shared_ptr( new RedDustParticle(level[playerIndex], x, y, z, (float) xa, (float) ya, (float) za) ) ); -else if (name== L"snowballpoof") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::snowBall) ) ); +else if (name== L"snowballpoof") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::snowball) ) ); else if (name== L"snowshovel") mc->particleEngine->add(shared_ptr( new SnowShovelParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); -else if (name== L"slime") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::slimeBall)) ) ; +else if (name== L"slime") mc->particleEngine->add(shared_ptr( new BreakingItemParticle(level[playerIndex], x, y, z, Item::slime_ball)) ) ; else if (name== L"heart") mc->particleEngine->add(shared_ptr( new HeartParticle(level[playerIndex], x, y, z, xa, ya, za) ) ); } */ @@ -3048,7 +3048,7 @@ shared_ptr LevelRenderer::addParticleInternal(ePARTICLE_TYPE eParticle particle = std::make_shared(lev, x, y, z, static_cast(xa), static_cast(ya), static_cast(za)); break; case eParticleType_snowballpoof: - particle = std::make_shared(lev, x, y, z, Item::snowBall, textures); + particle = std::make_shared(lev, x, y, z, Item::snowball, textures); break; case eParticleType_dripWater: particle = std::make_shared(lev, x, y, z, Material::water); @@ -3060,7 +3060,7 @@ shared_ptr LevelRenderer::addParticleInternal(ePARTICLE_TYPE eParticle particle = std::make_shared(lev, x, y, z, xa, ya, za); break; case eParticleType_slime: - particle = std::make_shared(lev, x, y, z, Item::slimeBall, textures); + particle = std::make_shared(lev, x, y, z, Item::slime_ball, textures); break; case eParticleType_heart: particle = std::make_shared(lev, x, y, z, xa, ya, za); @@ -3341,7 +3341,7 @@ void LevelRenderer::levelEvent(shared_ptr source, int type, int x, int y double yp = y; double zp = z + 0.5; - ePARTICLE_TYPE particle = PARTICLE_ICONCRACK(Item::eyeOfEnder->id,0); + ePARTICLE_TYPE particle = PARTICLE_ICONCRACK(Item::eye_of_ender->id,0); for (int i = 0; i < 8; i++) { addParticle(particle, xp, yp, zp, random->nextGaussian() * 0.15, random->nextDouble() * 0.2, random->nextGaussian() * .15); @@ -4018,7 +4018,7 @@ int LevelRenderer::checkAllPresentChunks(bool *faultFound) for( int cz = 4; cz <= 12; cz++ ) { int t0 = levelChunk->getTile(cx, 0, cz); - if( ( t0 != Tile::unbreakable_Id ) && (t0 != Tile::dirt_Id) ) + if( ( t0 != Tile::bedrock_Id ) && (t0 != Tile::dirt_Id) ) { *faultFound = true; } diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index 91ed1ec2..a3ce657e 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -752,11 +752,11 @@ bool LocalPlayer::openFurnace(shared_ptr furnace) return success; } -bool LocalPlayer::openBrewingStand(shared_ptr brewingStand) +bool LocalPlayer::openBrewingStand(shared_ptr brewing_stand) { - bool success = app.LoadBrewingStandMenu(GetXboxPad(),inventory, brewingStand); + bool success = app.LoadBrewingStandMenu(GetXboxPad(),inventory, brewing_stand); if( success ) ui.PlayUISFX(eSFX_Press); - //minecraft.setScreen(new BrewingStandScreen(inventory, brewingStand)); + //minecraft.setScreen(new BrewingStandScreen(inventory, brewing_stand)); return success; } @@ -978,26 +978,26 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param) // MOAR TOOLS { Stat *toolStats[4][5]; - toolStats[0][0] = GenericStats::itemsCrafted(Item::shovel_wood->id); - toolStats[0][1] = GenericStats::itemsCrafted(Item::shovel_stone->id); - toolStats[0][2] = GenericStats::itemsCrafted(Item::shovel_iron->id); - toolStats[0][3] = GenericStats::itemsCrafted(Item::shovel_diamond->id); - toolStats[0][4] = GenericStats::itemsCrafted(Item::shovel_gold->id); - toolStats[1][0] = GenericStats::itemsCrafted(Item::pickAxe_wood->id); - toolStats[1][1] = GenericStats::itemsCrafted(Item::pickAxe_stone->id); - toolStats[1][2] = GenericStats::itemsCrafted(Item::pickAxe_iron->id); - toolStats[1][3] = GenericStats::itemsCrafted(Item::pickAxe_diamond->id); - toolStats[1][4] = GenericStats::itemsCrafted(Item::pickAxe_gold->id); - toolStats[2][0] = GenericStats::itemsCrafted(Item::hatchet_wood->id); - toolStats[2][1] = GenericStats::itemsCrafted(Item::hatchet_stone->id); - toolStats[2][2] = GenericStats::itemsCrafted(Item::hatchet_iron->id); - toolStats[2][3] = GenericStats::itemsCrafted(Item::hatchet_diamond->id); - toolStats[2][4] = GenericStats::itemsCrafted(Item::hatchet_gold->id); - toolStats[3][0] = GenericStats::itemsCrafted(Item::hoe_wood->id); - toolStats[3][1] = GenericStats::itemsCrafted(Item::hoe_stone->id); - toolStats[3][2] = GenericStats::itemsCrafted(Item::hoe_iron->id); - toolStats[3][3] = GenericStats::itemsCrafted(Item::hoe_diamond->id); - toolStats[3][4] = GenericStats::itemsCrafted(Item::hoe_gold->id); + toolStats[0][0] = GenericStats::itemsCrafted(Item::wooden_shovel->id); + toolStats[0][1] = GenericStats::itemsCrafted(Item::stone_shovel->id); + toolStats[0][2] = GenericStats::itemsCrafted(Item::iron_shovel->id); + toolStats[0][3] = GenericStats::itemsCrafted(Item::diamond_shovel->id); + toolStats[0][4] = GenericStats::itemsCrafted(Item::golden_shovel->id); + toolStats[1][0] = GenericStats::itemsCrafted(Item::wooden_pickaxe->id); + toolStats[1][1] = GenericStats::itemsCrafted(Item::stone_pickaxe->id); + toolStats[1][2] = GenericStats::itemsCrafted(Item::iron_pickaxe->id); + toolStats[1][3] = GenericStats::itemsCrafted(Item::diamond_pickaxe->id); + toolStats[1][4] = GenericStats::itemsCrafted(Item::golden_pickaxe->id); + toolStats[2][0] = GenericStats::itemsCrafted(Item::wooden_axe->id); + toolStats[2][1] = GenericStats::itemsCrafted(Item::stone_axe->id); + toolStats[2][2] = GenericStats::itemsCrafted(Item::iron_axe->id); + toolStats[2][3] = GenericStats::itemsCrafted(Item::diamond_axe->id); + toolStats[2][4] = GenericStats::itemsCrafted(Item::golden_axe->id); + toolStats[3][0] = GenericStats::itemsCrafted(Item::wooden_hoe->id); + toolStats[3][1] = GenericStats::itemsCrafted(Item::stone_hoe->id); + toolStats[3][2] = GenericStats::itemsCrafted(Item::iron_hoe->id); + toolStats[3][3] = GenericStats::itemsCrafted(Item::diamond_hoe->id); + toolStats[3][4] = GenericStats::itemsCrafted(Item::golden_hoe->id); bool justCraftedTool = false; for (int i=0; i<4; i++) @@ -1063,8 +1063,8 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param) // AWARD : Porkchop, cook and eat a porkchop. { Stat *cookPorkchop, *eatPorkchop; - cookPorkchop = GenericStats::itemsSmelted(Item::porkChop_cooked_Id); - eatPorkchop = GenericStats::itemsUsed(Item::porkChop_cooked_Id); + cookPorkchop = GenericStats::itemsSmelted(Item::cooked_porkchop_Id); + eatPorkchop = GenericStats::itemsUsed(Item::cooked_porkchop_Id); if ( stat == cookPorkchop || stat == eatPorkchop ) { @@ -1111,7 +1111,7 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param) // AWARD : The Haggler, Acquire 30 emeralds. { Stat *emeraldMined, *emeraldBought; - emeraldMined = GenericStats::blocksMined(Tile::emeraldOre_Id); + emeraldMined = GenericStats::blocksMined(Tile::emerald_ore_Id); emeraldBought = GenericStats::itemsBought(Item::emerald_Id); if ( stat == emeraldMined || stat == emeraldBought ) @@ -1134,8 +1134,8 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param) // AWARD : Pot Planter, craft and place a flowerpot. { Stat *craftFlowerpot, *placeFlowerpot; - craftFlowerpot = GenericStats::itemsCrafted(Item::flowerPot_Id); - placeFlowerpot = GenericStats::blocksPlaced(Tile::flowerPot_Id); + craftFlowerpot = GenericStats::itemsCrafted(Item::flower_pot_Id); + placeFlowerpot = GenericStats::blocksPlaced(Tile::flower_pot_Id); if ( stat == craftFlowerpot || stat == placeFlowerpot ) { @@ -1149,9 +1149,9 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param) // AWARD : It's a Sign, craft and place a sign. { Stat *craftSign, *placeWallsign, *placeSignpost; - craftSign = GenericStats::itemsCrafted(Item::sign_Id); - placeWallsign = GenericStats::blocksPlaced(Tile::wallSign_Id); - placeSignpost = GenericStats::blocksPlaced(Tile::sign_Id); + craftSign = GenericStats::itemsCrafted(Item::standing_sign_Id); + placeWallsign = GenericStats::blocksPlaced(Tile::wall_standing_sign_Id); + placeSignpost = GenericStats::blocksPlaced(Tile::standing_sign_Id); if ( stat == craftSign || stat == placeWallsign || stat == placeSignpost ) { @@ -1642,7 +1642,7 @@ bool LocalPlayer::handleMouseClick(int button) { // If I have an empty bucket in my hand, it's going to be filled with milk, so turn off mayUse shared_ptr item = inventory->getSelected(); - if(item && (item->id==Item::bucket_empty_Id)) + if(item && (item->id==Item::bucket_Id)) { mayUse=false; } @@ -1720,7 +1720,7 @@ void LocalPlayer::updateRichPresence() if((m_iPad!=-1)/* && !ui.GetMenuDisplayed(m_iPad)*/ ) { shared_ptr selectedItem = inventory->getSelected(); - if(selectedItem != nullptr && selectedItem->id == Item::fishingRod_Id) + if(selectedItem != nullptr && selectedItem->id == Item::fishing_rod_Id) { app.SetRichPresenceContext(m_iPad,CONTEXT_GAME_STATE_FISHING); } diff --git a/Minecraft.Client/LocalPlayer.h b/Minecraft.Client/LocalPlayer.h index b50dda75..f2d06878 100644 --- a/Minecraft.Client/LocalPlayer.h +++ b/Minecraft.Client/LocalPlayer.h @@ -120,7 +120,7 @@ public: virtual bool startEnchanting(int x, int y, int z, const wstring &name); // 4J added bool return virtual bool startRepairing(int x, int y, int z); virtual bool openFurnace(shared_ptr furnace); // 4J added bool return - virtual bool openBrewingStand(shared_ptr brewingStand); // 4J added bool return + virtual bool openBrewingStand(shared_ptr brewing_stand); // 4J added bool return virtual bool openBeacon(shared_ptr beacon); // 4J added bool return virtual bool openTrap(shared_ptr trap); // 4J added bool return virtual bool openTrading(shared_ptr traderTarget, const wstring &name); diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index 0095e3cc..149f2728 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -2572,28 +2572,28 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch (itemInstance->getItem()->id) { // food - case Item::potatoBaked_Id: + case Item::baked_potato_Id: case Item::potato_Id: - case Item::pumpkinPie_Id: - case Item::potatoPoisonous_Id: - case Item::carrotGolden_Id: - case Item::carrots_Id: - case Item::mushroomStew_Id: + case Item::pumpkin_pie_Id: + case Item::poisonous_potato_Id: + case Item::golden_carrot_Id: + case Item::carrot_Id: + case Item::mushroom_stew_Id: case Item::apple_Id: case Item::bread_Id: - case Item::porkChop_raw_Id: - case Item::porkChop_cooked_Id: - case Item::apple_gold_Id: - case Item::fish_raw_Id: - case Item::fish_cooked_Id: + case Item::porkchop_Id: + case Item::cooked_porkchop_Id: + case Item::golden_apple_Id: + case Item::fish_Id: + case Item::cooked_fish_Id: case Item::cookie_Id: - case Item::beef_cooked_Id: - case Item::beef_raw_Id: - case Item::chicken_cooked_Id: - case Item::chicken_raw_Id: - case Item::melon_Id: + case Item::cooked_beef_Id: + case Item::beef_Id: + case Item::cooked_chicken_Id: + case Item::chicken_Id: + case Item::melon_block_Id: case Item::rotten_flesh_Id: - case Item::spiderEye_Id: + case Item::spider_eye_Id: // Check that we are actually hungry so will eat this item { FoodItem *food = static_cast(itemInstance->getItem()); @@ -2604,17 +2604,17 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Item::bucket_milk_Id: + case Item::milk_bucket_Id: *piUse=IDS_TOOLTIPS_DRINK; break; - case Item::fishingRod_Id: // use - case Item::emptyMap_Id: + case Item::fishing_rod_Id: // use + case Item::map_Id: *piUse=IDS_TOOLTIPS_USE; break; case Item::egg_Id: // throw - case Item::snowBall_Id: + case Item::snowball_Id: *piUse=IDS_TOOLTIPS_THROW; break; @@ -2626,26 +2626,26 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Item::sword_wood_Id: - case Item::sword_stone_Id: - case Item::sword_iron_Id: - case Item::sword_diamond_Id: - case Item::sword_gold_Id: + case Item::wooden_sword_Id: + case Item::stone_sword_Id: + case Item::iron_sword_Id: + case Item::diamond_sword_Id: + case Item::golden_sword_Id: *piUse=IDS_TOOLTIPS_BLOCK; break; - case Item::bucket_empty_Id: - case Item::glassBottle_Id: + case Item::bucket_Id: + case Item::glass_bottle_Id: if (bUseItem) *piUse=IDS_TOOLTIPS_COLLECT; break; - case Item::bucket_lava_Id: - case Item::bucket_water_Id: + case Item::lava_bucket_Id: + case Item::water_bucket_Id: *piUse=IDS_TOOLTIPS_EMPTY; break; case Item::boat_Id: - case Tile::waterLily_Id: + case Tile::waterlily_Id: if (bUseItem) *piUse=IDS_TOOLTIPS_PLACE; break; @@ -2657,11 +2657,11 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Item::enderPearl_Id: + case Item::ender_pearl_Id: if (bUseItem) *piUse=IDS_TOOLTIPS_THROW; break; - case Item::eyeOfEnder_Id: + case Item::eye_of_ender_Id: // This will only work if there is a stronghold in this dimension if ( bUseItem && (level->dimension->id==0) && level->getLevelData()->getHasStronghold() ) { @@ -2669,35 +2669,35 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Item::expBottle_Id: + case Item::experience_bottle_Id: if (bUseItem) *piUse=IDS_TOOLTIPS_THROW; break; - case Item::writingBook_Id: + case Item::writable_book_Id: *piUse = IDS_TOOLTIPS_OPEN; break; - case Item::writtenBook_Id: + case Item::written_book_Id: *piUse = IDS_TOOLTIPS_READ; break; - case Item::helmet_leather_Id: - case Item::helmet_chain_Id: - case Item::helmet_iron_Id: - case Item::helmet_gold_Id: - case Item::helmet_diamond_Id: - case Item::chestplate_leather_Id: - case Item::chestplate_chain_Id: - case Item::chestplate_iron_Id: - case Item::chestplate_gold_Id: - case Item::chestplate_diamond_Id: - case Item::leggings_leather_Id: - case Item::leggings_chain_Id: - case Item::leggings_iron_Id: - case Item::leggings_gold_Id: - case Item::leggings_diamond_Id: - case Item::boots_leather_Id: - case Item::boots_chain_Id: - case Item::boots_iron_Id: - case Item::boots_gold_Id: - case Item::boots_diamond_Id: + case Item::leather_helmet_Id: + case Item::chainmail_helmet_Id: + case Item::iron_helmet_Id: + case Item::golden_helmet_Id: + case Item::diamond_helmet_Id: + case Item::leather_chestplate_Id: + case Item::chainmail_chestplate_Id: + case Item::iron_chestplate_Id: + case Item::golden_chestplate_Id: + case Item::diamond_chestplate_Id: + case Item::leather_leggings_Id: + case Item::chainmail_leggings_Id: + case Item::iron_leggings_Id: + case Item::golden_leggings_Id: + case Item::diamond_leggings_Id: + case Item::leather_boots_Id: + case Item::chainmail_boots_Id: + case Item::iron_boots_Id: + case Item::golden_boots_Id: + case Item::diamond_boots_Id: *piUse = IDS_TOOLTIPS_EQUIP; break; } @@ -2742,26 +2742,26 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) case Tile::cactus_Id: case Tile::sapling_Id: case Tile::reeds_Id: - case Tile::flower_Id: - case Tile::rose_Id: + case Tile::yellow_flower_Id: + case Tile::red_flower_Id: *piUse=IDS_TOOLTIPS_PLANT; break; // Things to USE - case Item::hoe_wood_Id: - case Item::hoe_stone_Id: - case Item::hoe_iron_Id: - case Item::hoe_diamond_Id: - case Item::hoe_gold_Id: + case Item::wooden_hoe_Id: + case Item::stone_hoe_Id: + case Item::iron_hoe_Id: + case Item::diamond_hoe_Id: + case Item::golden_hoe_Id: *piUse=IDS_TOOLTIPS_TILL; break; - case Item::seeds_wheat_Id: + case Item::wheat_seeds_Id: case Item::netherwart_seeds_Id: *piUse=IDS_TOOLTIPS_PLANT; break; - case Item::dye_powder_Id: + case Item::dye_Id: // bonemeal grows various plants if (itemInstance->getAuxValue() == DyePowderItem::WHITE) { @@ -2772,8 +2772,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) case Tile::grass_Id: case Tile::mushroom_brown_Id: case Tile::mushroom_red_Id: - case Tile::melonStem_Id: - case Tile::pumpkinStem_Id: + case Tile::melon_stem_Id: + case Tile::pumpkin_stem_Id: case Tile::carrots_Id: case Tile::potatoes_Id: *piUse=IDS_TOOLTIPS_GROW; @@ -2786,8 +2786,8 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) *piUse=IDS_TOOLTIPS_HANG; break; - case Item::flintAndSteel_Id: - case Item::fireball_Id: + case Item::flint_and_steel_Id: + case Item::fire_charge_Id: *piUse=IDS_TOOLTIPS_IGNITE; break; @@ -2808,18 +2808,18 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch(iTileID) { case Tile::anvil_Id: - case Tile::enchantTable_Id: - case Tile::brewingStand_Id: - case Tile::workBench_Id: + case Tile::enchanting_table_Id: + case Tile::brewing_stand_Id: + case Tile::crafting_table_Id: case Tile::furnace_Id: - case Tile::furnace_lit_Id: - case Tile::door_wood_Id: + case Tile::lit_furnace_Id: + case Tile::wooden_door_Id: case Tile::dispenser_Id: case Tile::lever_Id: - case Tile::button_stone_Id: - case Tile::button_wood_Id: + case Tile::stone_button_Id: + case Tile::wooden_button_Id: case Tile::trapdoor_Id: - case Tile::fenceGate_Id: + case Tile::fence_gate_Id: case Tile::beacon_Id: *piAction=IDS_TOOLTIPS_MINE; *piUse=IDS_TOOLTIPS_USE; @@ -2830,7 +2830,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) *piUse = (Tile::chest->getContainer(level,x,y,z) != nullptr) ? IDS_TOOLTIPS_OPEN : -1; break; - case Tile::enderChest_Id: + case Tile::ender_chest_Id: case Tile::chest_trap_Id: case Tile::dropper_Id: case Tile::hopper_Id: @@ -2838,9 +2838,9 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) *piAction=IDS_TOOLTIPS_MINE; break; - case Tile::activatorRail_Id: - case Tile::goldenRail_Id: - case Tile::detectorRail_Id: + case Tile::activator_rail_Id: + case Tile::golden_rail_Id: + case Tile::detector_rail_Id: case Tile::rail_Id: if (bUseItemOn) *piUse=IDS_TOOLTIPS_PLACE; *piAction=IDS_TOOLTIPS_MINE; @@ -2858,7 +2858,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) *piUse=IDS_TOOLTIPS_CHANGEPITCH; break; - case Tile::sign_Id: + case Tile::standing_sign_Id: *piAction=IDS_TOOLTIPS_MINE; break; @@ -2868,7 +2868,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { int iID=itemInstance->getItem()->id; int currentData = level->getData(x, y, z); - if ((iID==Item::glassBottle_Id) && (currentData > 0)) + if ((iID==Item::glass_bottle_Id) && (currentData > 0)) { *piUse=IDS_TOOLTIPS_COLLECT; } @@ -2899,7 +2899,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) if (!bUseItemOn && itemInstance!=nullptr) { int iID=itemInstance->getItem()->id; - if ( (iID>=Item::record_01_Id) && (iID<=Item::record_12_Id) ) + if ( (iID>=Item::record_13_Id) && (iID<=Item::record_wait_Id) ) { *piUse=IDS_TOOLTIPS_PLAY; } @@ -2915,7 +2915,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Tile::flowerPot_Id: + case Tile::flower_pot_Id: if ( !bUseItemOn && (itemInstance != nullptr) && (iData == 0) ) { int iID = itemInstance->getItem()->id; @@ -2923,13 +2923,13 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { switch(iID) { - case Tile::flower_Id: - case Tile::rose_Id: + case Tile::yellow_flower_Id: + case Tile::red_flower_Id: case Tile::sapling_Id: case Tile::mushroom_brown_Id: case Tile::mushroom_red_Id: case Tile::cactus_Id: - case Tile::deadBush_Id: + case Tile::deadbush_Id: *piUse=IDS_TOOLTIPS_PLANT; break; @@ -2942,24 +2942,24 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) *piAction=IDS_TOOLTIPS_MINE; break; - case Tile::comparator_off_Id: - case Tile::comparator_on_Id: + case Tile::unpowered_comparator_Id: + case Tile::powered_comparator_Id: *piUse=IDS_TOOLTIPS_USE; *piAction=IDS_TOOLTIPS_MINE; break; - case Tile::diode_off_Id: - case Tile::diode_on_Id: + case Tile::unpowered_repeater_Id: + case Tile::powered_repeater_Id: *piUse=IDS_TOOLTIPS_USE; *piAction=IDS_TOOLTIPS_MINE; break; - case Tile::redStoneOre_Id: + case Tile::redstone_ore_Id: if (bUseItemOn) *piUse=IDS_TOOLTIPS_USE; *piAction=IDS_TOOLTIPS_MINE; break; - case Tile::door_iron_Id: + case Tile::iron_door_Id: if(*piUse==IDS_TOOLTIPS_PLACE) { *piUse = -1; @@ -3006,7 +3006,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch(heldItemId) { - case Item::nameTag_Id: + case Item::name_tag_Id: *piUse=IDS_TOOLTIPS_NAME; break; @@ -3043,13 +3043,13 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch (heldItemId) { // Things to USE - case Item::nameTag_Id: + case Item::name_tag_Id: *piUse=IDS_TOOLTIPS_NAME; break; case Item::lead_Id: if (!animal->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH; break; - case Item::bucket_empty_Id: + case Item::bucket_Id: *piUse=IDS_TOOLTIPS_MILK; break; default: @@ -3082,7 +3082,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch(heldItemId) { // Things to USE - case Item::nameTag_Id: + case Item::name_tag_Id: *piUse=IDS_TOOLTIPS_NAME; break; @@ -3091,7 +3091,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) break; case Item::bowl_Id: - case Item::bucket_empty_Id: // You can milk a mooshroom with either a bowl (mushroom soup) or a bucket (milk)! + case Item::bucket_Id: // You can milk a mooshroom with either a bowl (mushroom soup) or a bucket (milk)! *piUse=IDS_TOOLTIPS_MILK; break; case Item::shears_Id: @@ -3157,7 +3157,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch(heldItemId) { - case Item::nameTag_Id: + case Item::name_tag_Id: *piUse=IDS_TOOLTIPS_NAME; break; @@ -3165,7 +3165,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) if (!sheep->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH; break; - case Item::dye_powder_Id: + case Item::dye_Id: { // convert to tile-based color value (0 is white instead of black) int newColor = ColoredTile::getTileDataForItemAuxValue(heldItem->getAuxValue()); @@ -3217,7 +3217,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!pig->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH; } - else if (heldItemId == Item::nameTag_Id) + else if (heldItemId == Item::name_tag_Id) { *piUse = IDS_TOOLTIPS_NAME; }*/ @@ -3264,7 +3264,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) switch(heldItemId) { - case Item::nameTag_Id: + case Item::name_tag_Id: *piUse=IDS_TOOLTIPS_NAME; break; @@ -3290,10 +3290,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) } break; - case Item::enderPearl_Id: + case Item::ender_pearl_Id: // Use is throw, so don't change the tips for the wolf break; - case Item::dye_powder_Id: + case Item::dye_Id: if (wolf->isTame()) { if (ColoredTile::getTileDataForItemAuxValue(heldItem->getAuxValue()) != wolf->getCollarColor()) @@ -3360,7 +3360,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!ocelot->isLeashed()) *piUse = IDS_TOOLTIPS_LEASH; } - else if (heldItemId == Item::nameTag_Id) + else if (heldItemId == Item::name_tag_Id) { *piUse = IDS_TOOLTIPS_NAME; } @@ -3455,10 +3455,10 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) case eTYPE_ZOMBIE: { shared_ptr zomb = dynamic_pointer_cast(hitResult->entity); - static GoldenAppleItem *goldapple = static_cast(Item::apple_gold); + static GoldenAppleItem *goldapple = static_cast(Item::golden_apple); //zomb->hasEffect(MobEffect::weakness) - not present on client. - if ( zomb->isVillager() && zomb->isWeakened() && (heldItemId == Item::apple_gold_Id) && !goldapple->isFoil(heldItem) ) + if ( zomb->isVillager() && zomb->isWeakened() && (heldItemId == Item::golden_apple_Id) && !goldapple->isFoil(heldItem) ) { *piUse=IDS_TOOLTIPS_CURE; } @@ -3477,18 +3477,18 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) case Item::wheat_Id: case Item::sugar_Id: case Item::bread_Id: - case Tile::hayBlock_Id: + case Tile::hay_block_Id: case Item::apple_Id: heldItemIsFood = true; break; - case Item::carrotGolden_Id: - case Item::apple_gold_Id: + case Item::golden_carrot_Id: + case Item::golden_apple_Id: heldItemIsLove = true; heldItemIsFood = true; break; - case Item::horseArmorDiamond_Id: - case Item::horseArmorGold_Id: - case Item::horseArmorMetal_Id: + case Item::diamond_horse_armor_Id: + case Item::golden_horse_armor_Id: + case Item::iron_horse_armor_Id: heldItemIsArmour = true; break; } @@ -3501,7 +3501,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!horse->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH; } - else if (heldItemId == Item::nameTag_Id) + else if (heldItemId == Item::name_tag_Id) { *piUse = IDS_TOOLTIPS_NAME; } @@ -3591,7 +3591,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) { if (!mob->isLeashed()) *piUse=IDS_TOOLTIPS_LEASH; } - else if (heldItemId == Item::nameTag_Id) + else if (heldItemId == Item::name_tag_Id) { *piUse=IDS_TOOLTIPS_NAME; } @@ -3916,7 +3916,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures) app.LoadCreativeMenu(iPad,player); } // 4J-PB - Microsoft request that we use the 3x3 crafting if someone presses X while at the workbench - else if ((hitResult!=nullptr) && (hitResult->type == HitResult::TILE) && (level->getTile(hitResult->x, hitResult->y, hitResult->z) == Tile::workBench_Id)) + else if ((hitResult!=nullptr) && (hitResult->type == HitResult::TILE) && (level->getTile(hitResult->x, hitResult->y, hitResult->z) == Tile::crafting_table_Id)) { //ui.PlayUISFX(eSFX_Press); //app.LoadXuiCrafting3x3Menu(iPad,player,hitResult->x, hitResult->y, hitResult->z); diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp index 302ff119..19792432 100644 --- a/Minecraft.Client/MultiPlayerChunkCache.cpp +++ b/Minecraft.Client/MultiPlayerChunkCache.cpp @@ -47,7 +47,7 @@ MultiPlayerChunkCache::MultiPlayerChunkCache(Level *level) { unsigned char tileId = 0; if( y <= ( level->getSeaLevel() - 10 ) ) tileId = Tile::stone_Id; - else if( y < level->getSeaLevel() ) tileId = Tile::calmWater_Id; + else if( y < level->getSeaLevel() ) tileId = Tile::water_Id; bytes[x << 11 | z << 7 | y] = tileId; } diff --git a/Minecraft.Client/MultiPlayerLevel.cpp b/Minecraft.Client/MultiPlayerLevel.cpp index b719b550..709756be 100644 --- a/Minecraft.Client/MultiPlayerLevel.cpp +++ b/Minecraft.Client/MultiPlayerLevel.cpp @@ -589,11 +589,11 @@ bool MultiPlayerLevel::doSetTileAndData(int x, int y, int z, int tile, int data) // water changing from static to dynamic for instance. Note that this is only called from a client connection, // and so the thing being notified of any update through tileUpdated is the renderer int prevTile = getTile(x, y, z); - bool visuallyImportant = (!( ( ( prevTile == Tile::water_Id ) && ( tile == Tile::calmWater_Id ) ) || - ( ( prevTile == Tile::calmWater_Id ) && ( tile == Tile::water_Id ) ) || - ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::calmLava_Id ) ) || - ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::calmLava_Id ) ) || - ( ( prevTile == Tile::calmLava_Id ) && ( tile == Tile::lava_Id ) ) ) ); + bool visuallyImportant = (!( ( ( prevTile == Tile::flowing_water_Id ) && ( tile == Tile::water_Id ) ) || + ( ( prevTile == Tile::water_Id ) && ( tile == Tile::flowing_water_Id ) ) || + ( ( prevTile == Tile::flowing_lava_Id ) && ( tile == Tile::lava_Id ) ) || + ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::lava_Id ) ) || + ( ( prevTile == Tile::lava_Id ) && ( tile == Tile::flowing_lava_Id ) ) ) ); // If we're the host, need to tell the renderer for updates even if they don't change things as the host // might have been sharing data and so set it already, but the renderer won't know to update if( (Level::setTileAndData(x, y, z, tile, data, Tile::UPDATE_ALL) || g_NetworkManager.IsHost() ) ) diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BookshelfTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BookshelfTile_SPU.h index 6a320a5f..9d7319e6 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BookshelfTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BookshelfTile_SPU.h @@ -11,7 +11,7 @@ public: virtual Icon_SPU *getTexture(int face, int data) { if (face == Facing::UP || face == Facing::DOWN) - return TileRef_SPU(wood_Id)->getTexture(face); + return TileRef_SPU(planks_Id)->getTexture(face); return Tile_SPU::getTexture(face, data); } }; \ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h index 1009396c..4888ee1a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h @@ -10,8 +10,8 @@ public: Icon_SPU *getTexture(int face, int data) { - if(id == Tile_SPU::button_wood_Id) - return TileRef_SPU(wood_Id)->getTexture(Facing::UP); + if(id == Tile_SPU::wooden_button_Id) + return TileRef_SPU(planks_Id)->getTexture(Facing::UP); else return TileRef_SPU(rock_Id)->getTexture(Facing::UP); } diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp index da45996a..54bbbb7a 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp @@ -89,30 +89,30 @@ void ChunkRebuildData::disableUnseenTiles() // Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already // been determined to meet this criteria themselves and have a tile of 255 set. - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; tileID = getTile(iX-1, iY, iZ); flags = getFlags(iX-1, iY, iZ); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; tileID = getTile(iX+1, iY, iZ); flags = getFlags(iX+1, iY, iZ); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; tileID = getTile(iX, iY, iZ-1); flags = getFlags(iX, iY, iZ-1); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; tileID = getTile(iX, iY, iZ+1); flags = getFlags(iX, iY, iZ+1); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; // Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible // if they are surrounded on sides other than the bottom if( iY > 0 ) { tileID = getTile(iX, iY-1, iZ); flags = getFlags(iX, iY-1, iZ); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; } tileID = getTile(iX, iY+1, iZ); flags = getFlags(iX, iY+1, iZ); - if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue; + if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue; // This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255. setFlag(iX, iY, iZ, e_flag_NoRender); @@ -148,11 +148,11 @@ void ChunkRebuildData::buildMaterials() buildMaterial(Material_SPU::air_Id, Material::air); buildMaterial(Material_SPU::grass_Id, Material::grass); buildMaterial(Material_SPU::dirt_Id, Material::dirt); - buildMaterial(Material_SPU::wood_Id, Material::wood); + buildMaterial(Material_SPU::planks_Id, Material::wood); buildMaterial(Material_SPU::stone_Id, Material::stone); buildMaterial(Material_SPU::metal_Id, Material::metal); - buildMaterial(Material_SPU::water_Id, Material::water); - buildMaterial(Material_SPU::lava_Id, Material::lava); + buildMaterial(Material_SPU::flowing_water_Id, Material::water); + buildMaterial(Material_SPU::flowing_lava_Id, Material::lava); buildMaterial(Material_SPU::leaves_Id, Material::leaves); buildMaterial(Material_SPU::plant_Id, Material::plant); buildMaterial(Material_SPU::replaceable_plant_Id, Material::replaceable_plant); @@ -166,7 +166,7 @@ void ChunkRebuildData::buildMaterials() buildMaterial(Material_SPU::explosive_Id, Material::explosive); buildMaterial(Material_SPU::coral_Id, Material::coral); buildMaterial(Material_SPU::ice_Id, Material::ice); - buildMaterial(Material_SPU::topSnow_Id, Material::topSnow); + buildMaterial(Material_SPU::snow_layer_Id, Material::topSnow); buildMaterial(Material_SPU::snow_Id, Material::snow); buildMaterial(Material_SPU::cactus_Id, Material::cactus); buildMaterial(Material_SPU::clay_Id, Material::clay); @@ -186,11 +186,11 @@ int ChunkRebuildData::getMaterialID(Tile* pTile) if(m == Material::air) return Material_SPU::air_Id; if(m == Material::grass) return Material_SPU::grass_Id; if(m == Material::dirt) return Material_SPU::dirt_Id; - if(m == Material::wood) return Material_SPU::wood_Id; + if(m == Material::wood) return Material_SPU::planks_Id; if(m == Material::stone) return Material_SPU::stone_Id; if(m == Material::metal) return Material_SPU::metal_Id; - if(m == Material::water) return Material_SPU::water_Id; - if(m == Material::lava) return Material_SPU::lava_Id; + if(m == Material::water) return Material_SPU::flowing_water_Id; + if(m == Material::lava) return Material_SPU::flowing_lava_Id; if(m == Material::leaves) return Material_SPU::leaves_Id; if(m == Material::plant) return Material_SPU::plant_Id; if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id; @@ -204,7 +204,7 @@ int ChunkRebuildData::getMaterialID(Tile* pTile) if(m == Material::explosive) return Material_SPU::explosive_Id; if(m == Material::coral) return Material_SPU::coral_Id; if(m == Material::ice) return Material_SPU::ice_Id; - if(m == Material::topSnow) return Material_SPU::topSnow_Id; + if(m == Material::topSnow) return Material_SPU::snow_layer_Id; if(m == Material::snow) return Material_SPU::snow_Id; if(m == Material::cactus) return Material_SPU::cactus_Id; if(m == Material::clay) return Material_SPU::clay_Id; @@ -269,8 +269,8 @@ void ChunkRebuildData::createTileData() setIconSPUFromIcon(&m_tileData.grass_iconSideOverlay, Tile::grass->iconSideOverlay); // ThinFence - setIconSPUFromIcon(&m_tileData.ironFence_EdgeTexture, static_cast(Tile::ironFence)->getEdgeTexture()); - setIconSPUFromIcon(&m_tileData.thinGlass_EdgeTexture, static_cast(Tile::thinGlass)->getEdgeTexture()); + setIconSPUFromIcon(&m_tileData.iron_bars_EdgeTexture, static_cast(Tile::iron_bars)->getEdgeTexture()); + setIconSPUFromIcon(&m_tileData.glass_pane_EdgeTexture, static_cast(Tile::glass_pane)->getEdgeTexture()); //FarmTile setIconSPUFromIcon(&m_tileData.farmTile_Dry, static_cast(Tile::farmland)->iconDry); @@ -279,7 +279,7 @@ void ChunkRebuildData::createTileData() // DoorTile for(int i=0;i<8; i++) { - setIconSPUFromIcon(&m_tileData.doorTile_Icons[i], static_cast(Tile::door_wood)->icons[i]); + setIconSPUFromIcon(&m_tileData.doorTile_Icons[i], static_cast(Tile::wooden_door)->icons[i]); // we're not supporting flipped icons, so manually flip here if(i>=4) m_tileData.doorTile_Icons[i].flipHorizontal(); @@ -830,11 +830,11 @@ int ChunkRebuildData::getRawBrightness(int x, int y, int z, bool propagate) int id = getTile(x, y, z); switch(id) { - case Tile_SPU::stoneSlabHalf_Id: - case Tile_SPU::woodSlabHalf_Id: + case Tile_SPU::stone_slab_Id: + case Tile_SPU::wooden_slab_Id: case Tile_SPU::farmland_Id: - case Tile_SPU::stairs_stone_Id: - case Tile_SPU::stairs_wood_Id: + case Tile_SPU::stone_stairs_Id: + case Tile_SPU::oak_stairs_Id: { int br = getRawBrightness(x, y + 1, z, false); int br1 = getRawBrightness(x + 1, y, z, false); diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h index 131bd490..2a3bd43c 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h @@ -19,7 +19,7 @@ public: // down is used by the torch tesselator if (face == Facing::DOWN) { - if (id==diode_on_Id) + if (id==powered_repeater_Id) { return TileRef_SPU(notGate_on_Id)->getTexture(face); } @@ -30,7 +30,7 @@ public: return icon(); } // edge of stone half-step - return TileRef_SPU(stoneSlab_Id)->getTexture(Facing::UP); + return TileRef_SPU(double_stone_slab_Id)->getTexture(Facing::UP); } virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face) { diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceGateTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceGateTile_SPU.h index 5e99cc32..715dceee 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceGateTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceGateTile_SPU.h @@ -9,7 +9,7 @@ private: public: FenceGateTile_SPU(int id) : Tile_SPU(id) {} - Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(wood_Id)->getTexture(face); } + Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(planks_Id)->getTexture(face); } static int getDirection(int data) { return (data & DIRECTION_MASK); } virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = nullptr) // 4J added forceData, forceEntity param // Brought forward from 1.2.3 diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp index 63c206d1..1e7b90fc 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp @@ -54,7 +54,7 @@ int FenceTile_SPU::getRenderShape() bool FenceTile_SPU::connectsTo(ChunkRebuildData *level, int x, int y, int z) { int tile = level->getTile(x, y, z); - if (tile == id || tile == Tile_SPU::fenceGate_Id) + if (tile == id || tile == Tile_SPU::fence_gate_Id) { return true; } diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h index 1be5377e..46f2e9ff 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h @@ -20,15 +20,15 @@ public: int id = level->getTile(x, y, z); switch (id) { - case Tile_SPU::wood_Id: - case Tile_SPU::woodSlab_Id: - case Tile_SPU::woodSlabHalf_Id: + case Tile_SPU::planks_Id: + case Tile_SPU::double_wooden_slab_Id: + case Tile_SPU::wooden_slab_Id: case Tile_SPU::fence_Id: - case Tile_SPU::stairs_wood_Id: - case Tile_SPU::stairs_birchwood_Id: - case Tile_SPU::stairs_sprucewood_Id: - case Tile_SPU::stairs_junglewood_Id: - case Tile_SPU::treeTrunk_Id: + case Tile_SPU::oak_stairs_Id: + case Tile_SPU::birch_stairs_Id: + case Tile_SPU::spruce_stairs_Id: + case Tile_SPU::jungle_stairs_Id: + case Tile_SPU::log_Id: case Tile_SPU::leaves_Id: case Tile_SPU::bookshelf_Id: case Tile_SPU::tnt_Id: diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FurnaceTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FurnaceTile_SPU.h index 5d677b44..1aeab4ec 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FurnaceTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FurnaceTile_SPU.h @@ -14,7 +14,7 @@ public: if (face != data) return icon(); if(id == furnace_Id) return &ms_pTileData->furnaceTile_iconFront; - else //furnace_lit_Id + else //lit_furnace_Id return &ms_pTileData->furnaceTile_iconFront_lit; } }; \ No newline at end of file diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp index 833025ad..746682f4 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp @@ -21,7 +21,7 @@ Icon_SPU *GrassTile_SPU::getTexture(ChunkRebuildData *level, int x, int y, int z if (face == Facing::UP) return &ms_pTileData->grass_iconTop; if (face == Facing::DOWN) return TileRef_SPU(dirt_Id)->getTexture(face); Material_SPU *above = level->getMaterial(x, y + 1, z); - if (above->getID() == Material_SPU::topSnow_Id || above->getID() == Material_SPU::snow_Id) + if (above->getID() == Material_SPU::snow_layer_Id || above->getID() == Material_SPU::snow_Id) return &ms_pTileData->grass_iconSnowSide; else return icon(); diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HalfSlabTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HalfSlabTile_SPU.cpp index 1dba9757..1cc89162 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HalfSlabTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HalfSlabTile_SPU.cpp @@ -71,7 +71,7 @@ bool HalfSlabTile_SPU::shouldRenderFace(ChunkRebuildData *level, int x, int y, i bool HalfSlabTile_SPU::isHalfSlab(int tileId) { - return tileId == Tile_SPU::stoneSlabHalf_Id || tileId == Tile_SPU::woodSlabHalf_Id; + return tileId == Tile_SPU::stone_slab_Id || tileId == Tile_SPU::wooden_slab_Id; } diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp index 57b39c4d..a3f4bab6 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp @@ -24,7 +24,7 @@ int LiquidTile_SPU::getColor(ChunkRebuildData *level, int x, int y, int z) int LiquidTile_SPU::getColor(ChunkRebuildData *level, int x, int y, int z, int d) { // MGH - TODO - if (getMaterial()->getID() == Material_SPU::water_Id) + if (getMaterial()->getID() == Material_SPU::flowing_water_Id) { // Biome b = level.getBiomeSource().getBiome(x, z); // return b.waterColor; @@ -62,16 +62,16 @@ Icon_SPU *LiquidTile_SPU::getTexture(int face, int data) { if (face == Facing::DOWN || face == Facing::UP) { - if(id == water_Id || id == calmWater_Id) + if(id == flowing_water_Id || id == water_Id) return &ms_pTileData->liquidTile_iconWaterStill; - else //(id == lava_Id || id == calmLava_Id) + else //(id == flowing_lava_Id || id == lava_Id) return &ms_pTileData->liquidTile_iconLavaStill; } else { - if(id == water_Id || id == calmWater_Id) + if(id == flowing_water_Id || id == water_Id) return &ms_pTileData->liquidTile_iconWaterFlow; - else //(id == lava_Id || id == calmLava_Id) + else //(id == flowing_lava_Id || id == lava_Id) return &ms_pTileData->liquidTile_iconLavaFlow; } } @@ -201,21 +201,21 @@ float LiquidTile_SPU::getBrightness(ChunkRebuildData *level, int x, int y, int z int LiquidTile_SPU::getRenderLayer() { - return getMaterial()->getID() == Material_SPU::water_Id ? 1 : 0; + return getMaterial()->getID() == Material_SPU::flowing_water_Id ? 1 : 0; } double LiquidTile_SPU::getSlopeAngle(ChunkRebuildData *level, int x, int y, int z, Material_SPU *m) { Vec3_SPU flow = Vec3_SPU(0,0,0); - if (m->getID() == Material_SPU::water_Id) + if (m->getID() == Material_SPU::flowing_water_Id) { - TileRef_SPU tRef(Tile_SPU::water_Id); + TileRef_SPU tRef(Tile_SPU::flowing_water_Id); flow = static_cast(tRef.getPtr())->getFlow(level, x, y, z); } - if (m->getID() == Material_SPU::lava_Id) + if (m->getID() == Material_SPU::flowing_lava_Id) { - TileRef_SPU tRef(Tile_SPU::lava_Id); + TileRef_SPU tRef(Tile_SPU::flowing_lava_Id); flow = static_cast(tRef.getPtr())->getFlow(level, x, y, z); } if (flow.x == 0 && flow.z == 0) return -1000; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h index e7cf34b8..180f4cdc 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h @@ -10,11 +10,11 @@ public: static const int air_Id = 0; static const int grass_Id = 1; static const int dirt_Id = 2; - static const int wood_Id = 3; + static const int planks_Id = 3; static const int stone_Id = 4; static const int metal_Id = 5; - static const int water_Id = 6; - static const int lava_Id = 7; + static const int flowing_water_Id = 6; + static const int flowing_lava_Id = 7; static const int leaves_Id = 8; static const int plant_Id = 9; static const int replaceable_plant_Id = 10; @@ -27,7 +27,7 @@ public: static const int explosive_Id = 17; static const int coral_Id = 18; static const int ice_Id = 19; - static const int topSnow_Id = 20; + static const int snow_layer_Id = 20; static const int snow_Id = 21; static const int cactus_Id = 22; static const int clay_Id = 23; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/MycelTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/MycelTile_SPU.h index 999bdf49..17adaea3 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/MycelTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/MycelTile_SPU.h @@ -17,7 +17,7 @@ public: if (face == Facing::UP) return &ms_pTileData->mycelTile_iconTop; if (face == Facing::DOWN) return TileRef_SPU(dirt_Id)->getTexture(face); Material_SPU *above = level->getMaterial(x, y + 1, z); - if (above->getID() == Material_SPU::topSnow_Id || above->getID() == Material_SPU::snow_Id) + if (above->getID() == Material_SPU::snow_layer_Id || above->getID() == Material_SPU::snow_Id) return &ms_pTileData->mycelTile_iconSnowSide; else return icon(); diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PumpkinTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PumpkinTile_SPU.h index 9e248e23..52ba3163 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PumpkinTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PumpkinTile_SPU.h @@ -17,7 +17,7 @@ public: if (face == Facing::DOWN) return &ms_pTileData->pumpkinTile_iconTop; Icon_SPU* iconFace = &ms_pTileData->pumpkinTile_iconFace; - if(id == litPumpkin_Id) + if(id == lit_pumpkin_Id) iconFace = &ms_pTileData->pumpkinTile_iconFaceLit; if (data == DIR_NORTH && face == Facing::NORTH) return iconFace; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h index 2f8639d4..279d51cf 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h @@ -25,7 +25,7 @@ public: { bool usesDataBit = false; Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn; - if(id == goldenRail_Id) + if(id == golden_rail_Id) { usesDataBit = true; iconTurn = &ms_pTileData->railTile_iconTurnGolden; @@ -33,7 +33,7 @@ public: if (usesDataBit) { -// if (id == Tile::goldenRail_Id) +// if (id == Tile::golden_rail_Id) // { if ((data & RAIL_DATA_BIT) == 0) { @@ -51,7 +51,7 @@ public: virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; } bool isUsesDataBit() { - if(id == goldenRail_Id || id == detectorRail_Id) + if(id == golden_rail_Id || id == detector_rail_Id) return true; return false; } diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RedStoneDustTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RedStoneDustTile_SPU.h index 218cbd64..3b1e7006 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RedStoneDustTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RedStoneDustTile_SPU.h @@ -32,9 +32,9 @@ public: static bool shouldConnectTo(ChunkRebuildData *level, int x, int y, int z, int direction) { int t = level->getTile(x, y, z); - if (t == Tile_SPU::redStoneDust_Id) return true; + if (t == Tile_SPU::redstone_wire_Id) return true; if (t == 0) return false; - if (t == Tile_SPU::diode_off_Id || t == Tile_SPU::diode_on_Id) + if (t == Tile_SPU::unpowered_repeater_Id || t == Tile_SPU::powered_repeater_Id) { int data = level->getData(x, y, z); return direction == (data & DiodeTile_SPU::DIRECTION_MASK) || direction == Direction::DIRECTION_OPPOSITE[data & DiodeTile_SPU::DIRECTION_MASK]; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SignTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SignTile_SPU.h index 74bdb95d..101a1f7c 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SignTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SignTile_SPU.h @@ -9,13 +9,13 @@ public: SignTile_SPU(int id) : EntityTile_SPU(id) {} bool onGround() { - if(id == wallSign_Id) + if(id == wall_standing_sign_Id) return false; - // sign_Id + // standing_sign_Id return true; } - Icon_SPU *getTexture(int face, int data){ return TileRef_SPU(wood_Id)->getTexture(face); } + Icon_SPU *getTexture(int face, int data){ return TileRef_SPU(planks_Id)->getTexture(face); } void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = nullptr) // 4J added forceData, forceEntity param { if (onGround()) return; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp index 5bdbdf4a..deb47953 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp @@ -36,14 +36,14 @@ bool StairTile_SPU::isStairs(int id) { switch(id) { - case Tile_SPU::stairs_wood_Id: - case Tile_SPU::stairs_stone_Id: - case Tile_SPU::stairs_bricks_Id: - case Tile_SPU::stairs_stoneBrickSmooth_Id: - case Tile_SPU::stairs_netherBricks_Id: - case Tile_SPU::stairs_sandstone_Id: - case Tile_SPU::stairs_sprucewood_Id: - case Tile_SPU::stairs_birchwood_Id: + case Tile_SPU::oak_stairs_Id: + case Tile_SPU::stone_stairs_Id: + case Tile_SPU::brick_stairs_Id: + case Tile_SPU::stone_brick_stairsSmooth_Id: + case Tile_SPU::nether_brick_stairs_Id: + case Tile_SPU::sandstone_stairs_Id: + case Tile_SPU::spruce_stairs_Id: + case Tile_SPU::birch_stairs_Id: return true; default: return false; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StemTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StemTile_SPU.h index 4923e862..ec86d220 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StemTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StemTile_SPU.h @@ -45,8 +45,8 @@ public: int getConnectDir(ChunkRebuildData *level, int x, int y, int z) { int fruitID = pumpkin_Id; - if(id == melonStem_Id) - fruitID = melon_Id; + if(id == melon_stem_Id) + fruitID = melon_block_Id; int d = level->getData(x, y, z); if (d < 7) return -1; diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h index 75675eda..141d7547 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h @@ -21,7 +21,7 @@ public: { if (data == HOST_COBBLE) { - return TileRef_SPU(stoneBrick_Id)->getTexture(face); + return TileRef_SPU(stonebrick_Id)->getTexture(face); } if (data == HOST_STONEBRICK) { diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h index 1c0b2799..f34421b8 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h @@ -37,19 +37,19 @@ public: return &ms_pTileData->stoneSlab_iconSide; break; case SAND_SLAB: - return TileRef_SPU(sandStone_Id)->getTexture(face); //Tile::sandStone->getTexture(face); + return TileRef_SPU(sandstone_Id)->getTexture(face); //Tile::sandStone->getTexture(face); case WOOD_SLAB: - return TileRef_SPU(wood_Id)->getTexture(face); //Tile::wood->getTexture(face); + return TileRef_SPU(planks_Id)->getTexture(face); //Tile::wood->getTexture(face); case COBBLESTONE_SLAB: - return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face); + return TileRef_SPU(stonebrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face); case BRICK_SLAB: - return TileRef_SPU(redBrick_Id)->getTexture(face); //Tile::redBrick->getTexture(face); + return TileRef_SPU(brick_block_Id)->getTexture(face); //Tile::redBrick->getTexture(face); case SMOOTHBRICK_SLAB: return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT); case NETHERBRICK_SLAB: - return TileRef_SPU(netherBrick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP); + return TileRef_SPU(nether_brick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP); case QUARTZ_SLAB: - return TileRef_SPU(quartzBlock_Id)->getTexture(face); //Tile::quartzBlock->getTexture(face); + return TileRef_SPU(quartz_block_Id)->getTexture(face); //Tile::quartzBlock->getTexture(face); } diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp index 9e7d30de..09575957 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp @@ -67,10 +67,10 @@ void ThinFenceTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z Icon_SPU *ThinFenceTile_SPU::getEdgeTexture() { - if(id == Tile_SPU::ironFence_Id) - return &ms_pTileData->ironFence_EdgeTexture; - if(id == Tile_SPU::thinGlass_Id) - return &ms_pTileData->thinGlass_EdgeTexture; + if(id == Tile_SPU::iron_bars_Id) + return &ms_pTileData->iron_bars_EdgeTexture; + if(id == Tile_SPU::glass_pane_Id) + return &ms_pTileData->glass_pane_EdgeTexture; #ifndef SN_TARGET_PS3_SPU assert(0); #endif diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp index 166e03dc..90358ff7 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -799,7 +799,7 @@ skipUseItemOn: // beside a piston and then performing an action on the side of it facing a piston, the following line of code will send a TileUpdatePacket containing the change to pistonMovingPiece_Id // to the client, and this packet is received before the piston retract action happens - when the piston retract then occurs, it doesn't work properly because the piston tile // isn't what it is expecting. - if( level->getTile(x,y,z) != Tile::pistonMovingPiece_Id ) + if( level->getTile(x,y,z) != Tile::piston_extension_Id ) { player->connection->send(std::make_shared(x, y, z, level)); } @@ -2391,7 +2391,7 @@ void PlayerConnection::handleCustomPayload(shared_ptr custo // make sure the sent item is the currently carried item shared_ptr carried = player->inventory->getSelected(); - if (sentItem != nullptr && sentItem->id == Item::writingBook_Id && sentItem->id == carried->id) + if (sentItem != nullptr && sentItem->id == Item::writable_book_Id && sentItem->id == carried->id) { player->inventory->setItem(player->inventory->selected, sentItem); } @@ -2410,7 +2410,7 @@ void PlayerConnection::handleCustomPayload(shared_ptr custo // make sure the sent item is the currently carried item shared_ptr carried = player->inventory->getSelected(); - if (sentItem != nullptr && sentItem->id == Item::writingBook_Id && sentItem->id == carried->id) + if (sentItem != nullptr && sentItem->id == Item::writable_book_Id && sentItem->id == carried->id) { sentItem->setHoverName(sentItem->tag->getString(L"title")); sentItem->id = 387; @@ -2586,7 +2586,7 @@ void PlayerConnection::handleCraftItem(shared_ptr packet) player->drop(pTempItemInst); } } - else if (pTempItemInst->id == Item::fireworksCharge_Id || pTempItemInst->id == Item::fireworks_Id) + else if (pTempItemInst->id == Item::firework_charge_Id || pTempItemInst->id == Item::fireworks_Id) { CraftingMenu *menu = static_cast(player->containerMenu); player->openFireworks(menu->getX(), menu->getY(), menu->getZ() ); @@ -2676,16 +2676,16 @@ void PlayerConnection::handleCraftItem(shared_ptr packet) // handle achievements switch(pTempItemInst->id) { - case Tile::workBench_Id: player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); break; - case Item::pickAxe_wood_Id: player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); break; + case Tile::crafting_table_Id: player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); break; + case Item::wooden_pickaxe_Id: player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); break; case Tile::furnace_Id: player->awardStat(GenericStats::buildFurnace(), GenericStats::param_buildFurnace()); break; - //case Item::hoe_wood_Id: player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break; + //case Item::wooden_hoe_Id: player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); break; case Item::bread_Id: player->awardStat(GenericStats::makeBread(), GenericStats::param_makeBread()); break; case Item::cake_Id: player->awardStat(GenericStats::bakeCake(), GenericStats::param_bakeCake()); break; - case Item::pickAxe_stone_Id: player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); break; - //case Item::sword_wood_Id: player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break; + case Item::stone_pickaxe_Id: player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); break; + //case Item::wooden_sword_Id: player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); break; case Tile::dispenser_Id: player->awardStat(GenericStats::dispenseWithThis(), GenericStats::param_dispenseWithThis()); break; - case Tile::enchantTable_Id: player->awardStat(GenericStats::enchantments(), GenericStats::param_enchantments()); break; + case Tile::enchanting_table_Id: player->awardStat(GenericStats::enchantments(), GenericStats::param_enchantments()); break; case Tile::bookshelf_Id: player->awardStat(GenericStats::bookcase(), GenericStats::param_bookcase()); break; } switch (pTempItemInst->getItem()->getBaseItemType()) { diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp index 8814401d..ebab50d2 100644 --- a/Minecraft.Client/PlayerList.cpp +++ b/Minecraft.Client/PlayerList.cpp @@ -215,7 +215,7 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr int centreZC = 0; #endif // 4J Added - Give every player a map the first time they join a server - player->inventory->setItem( 9, std::make_shared(Item::emptyMap_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale))); + player->inventory->setItem( 9, std::make_shared(Item::map_Id, 1, level->getAuxValueForMap(player->getXuid(), 0, centreXC, centreZC, mapScale))); Random* r = new Random(); player->enchantmentSeed = r->nextInt(1000000); //Randomise enchantment seed upon joining server if(app.getGameRuleDefinitions() != nullptr) diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp index 6247483a..6a0224e2 100644 --- a/Minecraft.Client/PreStitchedTextureMap.cpp +++ b/Minecraft.Client/PreStitchedTextureMap.cpp @@ -244,7 +244,7 @@ void PreStitchedTextureMap::makeTextureAnimated(TexturePack *texturePack, Stitch StitchedTexture *PreStitchedTextureMap::getTexture(const wstring &name) { #ifndef _CONTENT_PACKAGE - app.DebugPrintf("Not implemented!\n"); + app.DebugPrintf("Not implemented: getTexture('%ls')\n", name.c_str()); DEBUG_BREAK(); #endif return nullptr; @@ -337,7 +337,7 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(0, 2, L"helmetIron") ADD_ICON(0, 3, L"helmetDiamond") ADD_ICON(0, 4, L"helmetGold") - ADD_ICON(0, 5, L"flintAndSteel") + ADD_ICON(0, 5, L"flint_and_steel") ADD_ICON(0, 6, L"flint") ADD_ICON(0, 7, L"coal") ADD_ICON(0, 8, L"string") @@ -405,11 +405,11 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(4, 2, L"swordIron") ADD_ICON(4, 3, L"swordDiamond") ADD_ICON(4, 4, L"swordGold") - ADD_ICON(4, 5, L"fishingRod_uncast") + ADD_ICON(4, 5, L"fishing_rod_uncast") ADD_ICON(4, 6, L"clock") ADD_ICON(4, 7, L"bowl") - ADD_ICON(4, 8, L"mushroomStew") - ADD_ICON(4, 9, L"yellowDust") + ADD_ICON(4, 8, L"mushroom_stew") + ADD_ICON(4, 9, L"glowstone_dust") ADD_ICON(4, 10, L"bucket") ADD_ICON(4, 11, L"bucketWater") ADD_ICON(4, 12, L"bucketLava") @@ -422,7 +422,7 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(5, 2, L"shovelIron") ADD_ICON(5, 3, L"shovelDiamond") ADD_ICON(5, 4, L"shovelGold") - ADD_ICON(5, 5, L"fishingRod_cast") + ADD_ICON(5, 5, L"fishing_rod_cast") ADD_ICON(5, 6, L"diode") ADD_ICON(5, 7, L"porkchopRaw") ADD_ICON(5, 8, L"porkchopCooked") @@ -440,13 +440,13 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(6, 3, L"pickaxeDiamond") ADD_ICON(6, 4, L"pickaxeGold") ADD_ICON(6, 5, L"bow_pull_0") - ADD_ICON(6, 6, L"carrotOnAStick") + ADD_ICON(6, 6, L"carrot_on_a_stick") ADD_ICON(6, 7, L"leather") ADD_ICON(6, 8, L"saddle") ADD_ICON(6, 9, L"beefRaw") ADD_ICON(6, 10, L"beefCooked") - ADD_ICON(6, 11, L"enderPearl") - ADD_ICON(6, 12, L"blazeRod") + ADD_ICON(6, 11, L"ender_pearl") + ADD_ICON(6, 12, L"blaze_rod") ADD_ICON(6, 13, L"melon") ADD_ICON(6, 14, L"dyePowder_green") ADD_ICON(6, 15, L"dyePowder_lime") @@ -457,13 +457,13 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(7, 3, L"hatchetDiamond") ADD_ICON(7, 4, L"hatchetGold") ADD_ICON(7, 5, L"bow_pull_1") - ADD_ICON(7, 6, L"potatoBaked") + ADD_ICON(7, 6, L"baked_potato") ADD_ICON(7, 7, L"potato") ADD_ICON(7, 8, L"carrots") ADD_ICON(7, 9, L"chickenRaw") ADD_ICON(7, 10, L"chickenCooked") - ADD_ICON(7, 11, L"ghastTear") - ADD_ICON(7, 12, L"goldNugget") + ADD_ICON(7, 11, L"ghast_tear") + ADD_ICON(7, 12, L"gold_nugget") ADD_ICON(7, 13, L"netherStalkSeeds") ADD_ICON(7, 14, L"dyePowder_brown") ADD_ICON(7, 15, L"dyePowder_yellow") @@ -474,12 +474,12 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(8, 3, L"hoeDiamond") ADD_ICON(8, 4, L"hoeGold") ADD_ICON(8, 5, L"bow_pull_2") - ADD_ICON(8, 6, L"potatoPoisonous") + ADD_ICON(8, 6, L"poisonous_potato") ADD_ICON(8, 7, L"minecart") ADD_ICON(8, 8, L"boat") - ADD_ICON(8, 9, L"speckledMelon") - ADD_ICON(8, 10, L"fermentedSpiderEye") - ADD_ICON(8, 11, L"spiderEye") + ADD_ICON(8, 9, L"speckled_melon") + ADD_ICON(8, 10, L"fermented_spider_eye") + ADD_ICON(8, 11, L"spider_eye") ADD_ICON(8, 12, L"potion") ADD_ICON(8, 12, L"glassBottle") // Same as potion ADD_ICON(8, 13, L"potion_contents") @@ -490,16 +490,16 @@ void PreStitchedTextureMap::loadUVs() //ADD_ICON(9, 1, L"unused") ADD_ICON(9, 2, L"iron_horse_armor") ADD_ICON(9, 3, L"diamond_horse_armor") - ADD_ICON(9, 4, L"gold_horse_armor") + ADD_ICON(9, 4, L"golden_horse_armor") ADD_ICON(9, 5, L"comparator") - ADD_ICON(9, 6, L"carrotGolden") - ADD_ICON(9, 7, L"minecart_chest") - ADD_ICON(9, 8, L"pumpkinPie") + ADD_ICON(9, 6, L"golden_carrot") + ADD_ICON(9, 7, L"chest_minecart") + ADD_ICON(9, 8, L"pumpkin_pie") ADD_ICON(9, 9, L"monsterPlacer") ADD_ICON(9, 10, L"potion_splash") - ADD_ICON(9, 11, L"eyeOfEnder") + ADD_ICON(9, 11, L"eye_of_ender") ADD_ICON(9, 12, L"cauldron") - ADD_ICON(9, 13, L"blazePowder") + ADD_ICON(9, 13, L"blaze_powder") ADD_ICON(9, 14, L"dyePowder_purple") ADD_ICON(9, 15, L"dyePowder_magenta") @@ -510,13 +510,13 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(10, 4, L"lead") ADD_ICON(10, 5, L"netherbrick") ADD_ICON(10, 6, L"clownfish") - ADD_ICON(10, 7, L"minecart_furnace") + ADD_ICON(10, 7, L"furnace_minecart") ADD_ICON(10, 8, L"charcoal") ADD_ICON(10, 9, L"monsterPlacer_overlay") ADD_ICON(10, 10, L"ruby") - ADD_ICON(10, 11, L"expBottle") - ADD_ICON(10, 12, L"brewingStand") - ADD_ICON(10, 13, L"magmaCream") + ADD_ICON(10, 11, L"experience_bottle") + ADD_ICON(10, 12, L"brewing_stand") + ADD_ICON(10, 13, L"magma_cream") ADD_ICON(10, 14, L"dyePowder_cyan") ADD_ICON(10, 15, L"dyePowder_orange") @@ -524,13 +524,13 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(11, 4, L"muttonRaw") ADD_ICON(11, 5, L"rabbitRaw") ADD_ICON(11, 6, L"pufferfish") - ADD_ICON(11, 7, L"minecart_hopper") + ADD_ICON(11, 7, L"hopper_minecart") ADD_ICON(11, 8, L"hopper") ADD_ICON(11, 9, L"nether_star") ADD_ICON(11, 10, L"emerald") - ADD_ICON(11, 11, L"writingBook") - ADD_ICON(11, 12, L"writtenBook") - ADD_ICON(11, 13, L"flowerPot") + ADD_ICON(11, 11, L"writable_book") + ADD_ICON(11, 12, L"written_book") + ADD_ICON(11, 13, L"flower_pot") ADD_ICON(11, 14, L"dyePowder_silver") ADD_ICON(11, 15, L"dyePowder_white") @@ -541,7 +541,7 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(12, 4, L"muttonCooked") ADD_ICON(12, 5, L"rabbitCooked") ADD_ICON(12, 6, L"salmonRaw") - ADD_ICON(12, 7, L"minecart_tnt") + ADD_ICON(12, 7, L"tnt_minecart") ADD_ICON(12, 8, L"armorStand") ADD_ICON(12, 9, L"fireworks") ADD_ICON(12, 10, L"fireworks_charge") @@ -549,14 +549,14 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(12, 12, L"netherquartz") ADD_ICON(12, 13, L"map_empty") ADD_ICON(12, 14, L"frame") - ADD_ICON(12, 15, L"enchantedBook") + ADD_ICON(12, 15, L"enchanted_book") ADD_ICON(13, 0, L"doorAcacia") ADD_ICON(13, 1, L"doorBirch") ADD_ICON(13, 2, L"doorDark") ADD_ICON(13, 3, L"doorJungle") ADD_ICON(13, 4, L"doorSpruce") - ADD_ICON(13, 5, L"rabbitStew") + ADD_ICON(13, 5, L"rabbit_stew") ADD_ICON(13, 6, L"salmonCooked") @@ -749,8 +749,8 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(4, 15, L"sapling_birch"); ADD_ICON(5, 0, L"torch_on"); - ADD_ICON(5, 1, L"door_wood_upper"); - ADD_ICON(5, 2, L"door_iron_upper"); + ADD_ICON(5, 1, L"wooden_door_upper"); + ADD_ICON(5, 2, L"iron_door_upper"); ADD_ICON(5, 3, L"ladder"); ADD_ICON(5, 4, L"trapdoor"); ADD_ICON(5, 5, L"iron_bars"); @@ -766,8 +766,8 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(5, 15, L"crops_7"); ADD_ICON(6, 0, L"lever"); - ADD_ICON(6, 1, L"door_wood_lower"); - ADD_ICON(6, 2, L"door_iron_lower"); + ADD_ICON(6, 1, L"wooden_door_lower"); + ADD_ICON(6, 2, L"iron_door_lower"); ADD_ICON(6, 3, L"redstone_torch_on"); ADD_ICON(6, 4, L"stonebrick_mossy"); ADD_ICON(6, 5, L"stonebrick_cracked"); @@ -1039,11 +1039,11 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(22, 15, L"red_sandstone_smooth"); - ADD_ICON(23, 0, L"door_acacia_upper"); - ADD_ICON(23, 1, L"door_birch_upper"); - ADD_ICON(23, 2, L"door_dark_upper"); - ADD_ICON(23, 3, L"door_jungle_upper"); - ADD_ICON(23, 4, L"door_spruce_upper"); + ADD_ICON(23, 0, L"acacia_door_upper"); + ADD_ICON(23, 1, L"birch_door_upper"); + ADD_ICON(23, 2, L"dark_oak_door_upper"); + ADD_ICON(23, 3, L"jungle_door_upper"); + ADD_ICON(23, 4, L"spruce_door_upper"); ADD_ICON(23, 13, L"sea_lantern"); ADD_ICON(22, 13, L"prismarine"); ADD_ICON(21, 13, L"prismarine_dark"); @@ -1054,11 +1054,11 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(23, 14, L"inverted_daylight_detector"); ADD_ICON(23, 15, L"iron_trapdoor"); - ADD_ICON(24, 0, L"door_acacia_lower"); - ADD_ICON(24, 1, L"door_birch_lower"); - ADD_ICON(24, 2, L"door_dark_lower"); - ADD_ICON(24, 3, L"door_jungle_lower"); - ADD_ICON(24, 4, L"door_spruce_lower"); + ADD_ICON(24, 0, L"acacia_door_lower"); + ADD_ICON(24, 1, L"birch_door_lower"); + ADD_ICON(24, 2, L"dark_oak_door_lower"); + ADD_ICON(24, 3, L"jungle_door_lower"); + ADD_ICON(24, 4, L"spruce_door_lower"); ADD_ICON(21, 1, L"tallgrass2_tall_grass_lower"); ADD_ICON(20, 1, L"tallgrass2_tall_grass_upper"); diff --git a/Minecraft.Client/ServerChunkCache.cpp b/Minecraft.Client/ServerChunkCache.cpp index 6262512a..ac73f0f0 100644 --- a/Minecraft.Client/ServerChunkCache.cpp +++ b/Minecraft.Client/ServerChunkCache.cpp @@ -325,7 +325,7 @@ void ServerChunkCache::updateOverwriteHellChunk(LevelChunk* origChunk, LevelChun for(int y=0;y<256;y++) { int playerTile = playerChunk->getTile(x,y,z); - if(playerTile == Tile::unbreakable_Id) // if the tile is still unbreakable, the player hasn't changed it, so we can replace with the source + if(playerTile == Tile::bedrock_Id) // if the tile is still unbreakable, the player hasn't changed it, so we can replace with the source playerChunk->setTileAndData(x, y, z, origChunk->getTile(x,y,z), origChunk->getData(x,y,z)); } } diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp index 507bfbc7..754a1c25 100644 --- a/Minecraft.Client/ServerLevel.cpp +++ b/Minecraft.Client/ServerLevel.cpp @@ -77,12 +77,12 @@ void ServerLevel::staticCtor() RANDOM_BONUS_ITEMS = WeighedTreasureArray(20); RANDOM_BONUS_ITEMS[0] = new WeighedTreasure(Item::stick_Id, 0, 1, 3, 10); - RANDOM_BONUS_ITEMS[1] = new WeighedTreasure(Tile::wood_Id, 0, 1, 3, 10); - RANDOM_BONUS_ITEMS[2] = new WeighedTreasure(Tile::treeTrunk_Id, 0, 1, 3, 10); - RANDOM_BONUS_ITEMS[3] = new WeighedTreasure(Item::hatchet_stone_Id, 0, 1, 1, 3); - RANDOM_BONUS_ITEMS[4] = new WeighedTreasure(Item::hatchet_wood_Id, 0, 1, 1, 5); - RANDOM_BONUS_ITEMS[5] = new WeighedTreasure(Item::pickAxe_stone_Id, 0, 1, 1, 3); - RANDOM_BONUS_ITEMS[6] = new WeighedTreasure(Item::pickAxe_wood_Id, 0, 1, 1, 5); + RANDOM_BONUS_ITEMS[1] = new WeighedTreasure(Tile::planks_Id, 0, 1, 3, 10); + RANDOM_BONUS_ITEMS[2] = new WeighedTreasure(Tile::log_Id, 0, 1, 3, 10); + RANDOM_BONUS_ITEMS[3] = new WeighedTreasure(Item::stone_axe_Id, 0, 1, 1, 3); + RANDOM_BONUS_ITEMS[4] = new WeighedTreasure(Item::wooden_axe_Id, 0, 1, 1, 5); + RANDOM_BONUS_ITEMS[5] = new WeighedTreasure(Item::stone_pickaxe_Id, 0, 1, 1, 3); + RANDOM_BONUS_ITEMS[6] = new WeighedTreasure(Item::wooden_pickaxe_Id, 0, 1, 1, 5); RANDOM_BONUS_ITEMS[7] = new WeighedTreasure(Item::apple_Id, 0, 2, 3, 5); RANDOM_BONUS_ITEMS[8] = new WeighedTreasure(Item::bread_Id, 0, 2, 3, 3); // 4J-PB - new items @@ -90,12 +90,12 @@ void ServerLevel::staticCtor() RANDOM_BONUS_ITEMS[10] = new WeighedTreasure(Tile::sapling_Id, 1, 4, 4, 2); RANDOM_BONUS_ITEMS[11] = new WeighedTreasure(Tile::sapling_Id, 2, 4, 4, 2); RANDOM_BONUS_ITEMS[12] = new WeighedTreasure(Tile::sapling_Id, 3, 4, 4, 4); - RANDOM_BONUS_ITEMS[13] = new WeighedTreasure(Item::seeds_melon_Id, 0, 1, 2, 3); - RANDOM_BONUS_ITEMS[14] = new WeighedTreasure(Item::seeds_pumpkin_Id, 0, 1, 2, 3); + RANDOM_BONUS_ITEMS[13] = new WeighedTreasure(Item::melon_seeds_Id, 0, 1, 2, 3); + RANDOM_BONUS_ITEMS[14] = new WeighedTreasure(Item::pumpkin_seeds_Id, 0, 1, 2, 3); RANDOM_BONUS_ITEMS[15] = new WeighedTreasure(Tile::cactus_Id, 0, 1, 2, 3); - RANDOM_BONUS_ITEMS[16] = new WeighedTreasure(Item::dye_powder_Id, DyePowderItem::BROWN, 1, 2, 2); + RANDOM_BONUS_ITEMS[16] = new WeighedTreasure(Item::dye_Id, DyePowderItem::BROWN, 1, 2, 2); RANDOM_BONUS_ITEMS[17] = new WeighedTreasure(Item::potato_Id, 0, 1, 2, 3); - RANDOM_BONUS_ITEMS[18] = new WeighedTreasure(Item::carrots_Id, 0, 1, 2, 3); + RANDOM_BONUS_ITEMS[18] = new WeighedTreasure(Item::carrot_Id, 0, 1, 2, 3); RANDOM_BONUS_ITEMS[19] = new WeighedTreasure(Tile::mushroom_brown_Id, 0, 1, 2, 2); }; @@ -590,9 +590,9 @@ void ServerLevel::tickTiles() if (isRaining() && shouldSnow(x + xo, yy, z + zo)) { #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) - if (!FourKitBridge::FireBlockForm(dimension->id, x + xo, yy, z + zo, Tile::topSnow_Id, 0)) + if (!FourKitBridge::FireBlockForm(dimension->id, x + xo, yy, z + zo, Tile::snow_layer_Id, 0)) #endif - setTileAndUpdate(x + xo, yy, z + zo, Tile::topSnow_Id); + setTileAndUpdate(x + xo, yy, z + zo, Tile::snow_layer_Id); } if (isRaining()) { @@ -892,7 +892,7 @@ bool ServerLevel::mayInteract(shared_ptr player, int xt, int yt, int zt, // We'll need to do this in a future update // 4J-PB - Let's allow water near the spawn point, but not lava - if(content!=Tile::lava_Id) + if(content!=Tile::flowing_lava_Id) { // allow this to be used return true; @@ -1646,13 +1646,13 @@ int ServerLevel::runUpdate(void* lpParam) if( m_updateTileCount[iLev] >= MAX_UPDATES ) break; // 4J Stu - Grass and Lava ticks currently take up the majority of all tile updates, so I am limiting them - if( (id == Tile::grass_Id && grassTicks >= MAX_GRASS_TICKS) || (id == Tile::calmLava_Id && lavaTicks >= MAX_LAVA_TICKS) ) continue; + if( (id == Tile::grass_Id && grassTicks >= MAX_GRASS_TICKS) || (id == Tile::lava_Id && lavaTicks >= MAX_LAVA_TICKS) ) continue; // 4J Stu - Added shouldTileTick as some tiles won't even do anything if they are set to tick and use up one of our updates if (Tile::tiles[id] != nullptr && Tile::tiles[id]->isTicking() && Tile::tiles[id]->shouldTileTick(m_level[iLev],x + (cx * 16), y, z + (cz * 16) ) ) { if(id == Tile::grass_Id) ++grassTicks; - else if(id == Tile::calmLava_Id) ++lavaTicks; + else if(id == Tile::lava_Id) ++lavaTicks; m_updateTileX[iLev][m_updateTileCount[iLev]] = x + (cx * 16); m_updateTileY[iLev][m_updateTileCount[iLev]] = y; m_updateTileZ[iLev][m_updateTileCount[iLev]] = z + (cz * 16); diff --git a/Minecraft.Client/ServerPlayer.cpp b/Minecraft.Client/ServerPlayer.cpp index 04f5691c..5f8c5e48 100644 --- a/Minecraft.Client/ServerPlayer.cpp +++ b/Minecraft.Client/ServerPlayer.cpp @@ -245,8 +245,8 @@ ServerPlayer::ServerPlayer(MinecraftServer *server, Level *level, const wstring& waterDepth = 0; int yw = yy2; while( ( yw < 128 ) && - (( level->getTile(xx2,yw,zz2) == Tile::water_Id ) || - ( level->getTile(xx2,yw,zz2) == Tile::calmWater_Id )) ) + (( level->getTile(xx2,yw,zz2) == Tile::flowing_water_Id ) || + ( level->getTile(xx2,yw,zz2) == Tile::water_Id )) ) { yw++; waterDepth++; @@ -1463,22 +1463,22 @@ bool ServerPlayer::openTrap(shared_ptr trap) return true; } -bool ServerPlayer::openBrewingStand(shared_ptr brewingStand) +bool ServerPlayer::openBrewingStand(shared_ptr brewing_stand) { if(containerMenu == inventoryMenu) { nextContainerCounter(); - containerMenu = new BrewingStandMenu(inventory, brewingStand); + containerMenu = new BrewingStandMenu(inventory, brewing_stand); containerMenu->containerId = containerCounter; containerMenu->addSlotListener(this); #if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD) - if (FourKitBridge::FireInventoryOpen(entityId, ContainerOpenPacket::BREWING_STAND, brewingStand->getCustomName(), brewingStand->getContainerSize())) + if (FourKitBridge::FireInventoryOpen(entityId, ContainerOpenPacket::BREWING_STAND, brewing_stand->getCustomName(), brewing_stand->getContainerSize())) { doCloseContainer(); return true; } #endif - connection->send(std::make_shared(containerCounter, ContainerOpenPacket::BREWING_STAND, brewingStand->getCustomName(), brewingStand->getContainerSize(), brewingStand->hasCustomName())); + connection->send(std::make_shared(containerCounter, ContainerOpenPacket::BREWING_STAND, brewing_stand->getCustomName(), brewing_stand->getContainerSize(), brewing_stand->hasCustomName())); refreshContainer(containerMenu); } else diff --git a/Minecraft.Client/ServerPlayer.h b/Minecraft.Client/ServerPlayer.h index 12022b48..b14f5f0a 100644 --- a/Minecraft.Client/ServerPlayer.h +++ b/Minecraft.Client/ServerPlayer.h @@ -107,7 +107,7 @@ public: virtual bool openHopper(shared_ptr container); virtual bool openFurnace(shared_ptr furnace); // 4J added bool return virtual bool openTrap(shared_ptr trap); // 4J added bool return - virtual bool openBrewingStand(shared_ptr brewingStand); // 4J added bool return + virtual bool openBrewingStand(shared_ptr brewing_stand); // 4J added bool return virtual bool openBeacon(shared_ptr beacon); virtual bool openTrading(shared_ptr traderTarget, const wstring &name); // 4J added bool return virtual bool openHorseInventory(shared_ptr horse, shared_ptr container); diff --git a/Minecraft.Client/ServerPlayerGameMode.cpp b/Minecraft.Client/ServerPlayerGameMode.cpp index 35e75705..28a2a836 100644 --- a/Minecraft.Client/ServerPlayerGameMode.cpp +++ b/Minecraft.Client/ServerPlayerGameMode.cpp @@ -265,19 +265,19 @@ bool ServerPlayerGameMode::destroyBlock(int x, int y, int z) if (!EnchantmentHelper::hasSilkTouch(player)) { // (SYLV)todo: shouldnt we get these values from the actual blocks? - if (t == Tile::coalOre_Id) + if (t == Tile::coal_ore_Id) eventExp = Mth::nextInt(level->random, 0, 2); - else if (t == Tile::diamondOre_Id) + else if (t == Tile::diamond_ore_Id) eventExp = Mth::nextInt(level->random, 3, 7); - else if (t == Tile::emeraldOre_Id) + else if (t == Tile::emerald_ore_Id) eventExp = Mth::nextInt(level->random, 3, 7); - else if (t == Tile::lapisOre_Id) + else if (t == Tile::lapis_ore_Id) eventExp = Mth::nextInt(level->random, 2, 5); - else if (t == Tile::netherQuartz_Id) + else if (t == Tile::quartz_ore_Id) eventExp = Mth::nextInt(level->random, 2, 5); - else if (t == Tile::redStoneOre_Id || t == Tile::redStoneOre_lit_Id) + else if (t == Tile::redstone_ore_Id || t == Tile::lit_redstone_ore_Id) eventExp = 1 + level->random->nextInt(5); - else if (t == Tile::mobSpawner_Id) + else if (t == Tile::mob_spawner_Id) eventExp = 15 + level->random->nextInt(15) + level->random->nextInt(15); } } diff --git a/Minecraft.Client/SurvivalMode.cpp b/Minecraft.Client/SurvivalMode.cpp index 317af52d..e58ee42a 100644 --- a/Minecraft.Client/SurvivalMode.cpp +++ b/Minecraft.Client/SurvivalMode.cpp @@ -174,10 +174,10 @@ void SurvivalMode::initLevel(Level *level) shared_ptr SurvivalMode::createPlayer(Level *level) { shared_ptr player = GameMode::createPlayer(level); - // player.inventory.add(new ItemInstance(Item.pickAxe_diamond)); - // player.inventory.add(new ItemInstance(Item.hatchet_diamond)); + // player.inventory.add(new ItemInstance(Item.diamond_pickaxe)); + // player.inventory.add(new ItemInstance(Item.diamond_axe)); // player.inventory.add(new ItemInstance(Tile.torch, 64)); - // player.inventory.add(new ItemInstance(Item.porkChop_cooked, 4)); + // player.inventory.add(new ItemInstance(Item.cooked_porkchop, 4)); // player.inventory.add(new ItemInstance(Item.bow, 1)); // player.inventory.add(new ItemInstance(Item.arrow, 64)); return player; diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp index 0dc19eb9..86566440 100644 --- a/Minecraft.Client/TileRenderer.cpp +++ b/Minecraft.Client/TileRenderer.cpp @@ -108,7 +108,7 @@ int TileRenderer::getLightColor( Tile *tt, LevelSource *level, int x, int y, int { // Don't use the cache for liquid tiles, as they are the only type that seem to have their own implementation of getLightColor that actually is important. // Without this we get patches of dark water where their lighting value is 0, it needs to pull in light from the tile above to work - if( ( tt->id >= Tile::water_Id ) && ( tt->id <= Tile::calmLava_Id ) ) return tt->getLightColor(level, x, y, z); + if( ( tt->id >= Tile::flowing_water_Id ) && ( tt->id <= Tile::lava_Id ) ) return tt->getLightColor(level, x, y, z); if( cache[id] & cache_getLightColor_valid ) return cache[id] & cache_getLightColor_mask; @@ -297,8 +297,8 @@ bool TileRenderer::tesselateInWorld( Tile* tt, int x, int y, int z, int forceDat // these block types can take advantage of a faster version of shouldRenderFace // there are others but this is an easy check which covers the majority // Note: This now covers rock, grass, dirt, stoneBrice, wood, sapling, unbreakable, sand, gravel, goldOre, ironOre, coalOre, treeTrunk - if( ( tt->id <= Tile::unbreakable_Id ) || - ( ( tt->id >= Tile::sand_Id ) && ( tt->id <= Tile::treeTrunk_Id ) ) ) + if( ( tt->id <= Tile::bedrock_Id ) || + ( ( tt->id >= Tile::sand_Id ) && ( tt->id <= Tile::log_Id ) ) ) { faceFlags = tt->getFaceFlags( level, x, y, z ); } @@ -2893,7 +2893,7 @@ bool TileRenderer::tesselateDustInWorld( Tile* tt, int x, int y, int z ) { const float yStretch = .35f / 16.0f; - if ( level->isSolidBlockingTile( x - 1, y, z ) && level->getTile( x - 1, y + 1, z ) == Tile::redStoneDust_Id ) + if ( level->isSolidBlockingTile( x - 1, y, z ) && level->getTile( x - 1, y + 1, z ) == Tile::redstone_wire_Id ) { t->color( br * red, br * green, br * blue ); t->vertexUV( ( float )( x + dustOffset ), ( float )( y + 1 + yStretch ), static_cast(z + 1), lineTexture->getU1(true), lineTexture->getV0(true) ); @@ -2907,7 +2907,7 @@ bool TileRenderer::tesselateDustInWorld( Tile* tt, int x, int y, int z ) t->vertexUV( ( float )( x + overlayOffset ), static_cast(y + 0), static_cast(z + 0), lineTextureOverlay->getU0(true), lineTextureOverlay->getV1(true) ); t->vertexUV( ( float )( x + overlayOffset ), ( float )( y + 1 + yStretch ), static_cast(z + 0), lineTextureOverlay->getU1(true), lineTextureOverlay->getV1(true) ); } - if ( level->isSolidBlockingTile( x + 1, y, z ) && level->getTile( x + 1, y + 1, z ) == Tile::redStoneDust_Id ) + if ( level->isSolidBlockingTile( x + 1, y, z ) && level->getTile( x + 1, y + 1, z ) == Tile::redstone_wire_Id ) { t->color( br * red, br * green, br * blue ); t->vertexUV( ( float )( x + 1 - dustOffset ), static_cast(y + 0), static_cast(z + 1), lineTexture->getU0(true), lineTexture->getV1(true) ); @@ -2921,7 +2921,7 @@ bool TileRenderer::tesselateDustInWorld( Tile* tt, int x, int y, int z ) t->vertexUV( ( float )( x + 1 - overlayOffset ), ( float )( y + 1 + yStretch ), static_cast(z + 0), lineTextureOverlay->getU1(true), lineTextureOverlay->getV0(true) ); t->vertexUV( ( float )( x + 1 - overlayOffset ), static_cast(y + 0), static_cast(z + 0), lineTextureOverlay->getU0(true), lineTextureOverlay->getV0(true) ); } - if ( level->isSolidBlockingTile( x, y, z - 1 ) && level->getTile( x, y + 1, z - 1 ) == Tile::redStoneDust_Id ) + if ( level->isSolidBlockingTile( x, y, z - 1 ) && level->getTile( x, y + 1, z - 1 ) == Tile::redstone_wire_Id ) { t->color( br * red, br * green, br * blue ); t->vertexUV( static_cast(x + 1), static_cast(y + 0), ( float )( z + dustOffset ), lineTexture->getU0(true), lineTexture->getV1(true) ); @@ -2935,7 +2935,7 @@ bool TileRenderer::tesselateDustInWorld( Tile* tt, int x, int y, int z ) t->vertexUV( static_cast(x + 0), ( float )( y + 1 + yStretch ), ( float )( z + overlayOffset ), lineTextureOverlay->getU1(true), lineTextureOverlay->getV0(true) ); t->vertexUV( static_cast(x + 0), static_cast(y + 0), ( float )( z + overlayOffset ), lineTextureOverlay->getU0(true), lineTextureOverlay->getV0(true) ); } - if ( level->isSolidBlockingTile( x, y, z + 1 ) && level->getTile( x, y + 1, z + 1 ) == Tile::redStoneDust_Id ) + if ( level->isSolidBlockingTile( x, y, z + 1 ) && level->getTile( x, y + 1, z + 1 ) == Tile::redstone_wire_Id ) { t->color( br * red, br * green, br * blue ); t->vertexUV( static_cast(x + 1), ( float )( y + 1 + yStretch ), ( float )( z + 1 - dustOffset ), lineTexture->getU1(true), lineTexture->getV0(true) ); @@ -6572,8 +6572,8 @@ bool TileRenderer::tesselateFenceGateInWorld(FenceGateTile *tt, int x, int y, in float h20 = 5 / 16.0f; float h21 = 16 / 16.0f; - if (((direction == Direction::NORTH || direction == Direction::SOUTH) && level->getTile(x - 1, y, z) == Tile::cobbleWall_Id && level->getTile(x + 1, y, z) == Tile::cobbleWall_Id) - || ((direction == Direction::EAST || direction == Direction::WEST) && level->getTile(x, y, z - 1) == Tile::cobbleWall_Id && level->getTile(x, y, z + 1) == Tile::cobbleWall_Id)) + if (((direction == Direction::NORTH || direction == Direction::SOUTH) && level->getTile(x - 1, y, z) == Tile::cobblestone_wall_Id && level->getTile(x + 1, y, z) == Tile::cobblestone_wall_Id) + || ((direction == Direction::EAST || direction == Direction::WEST) && level->getTile(x, y, z - 1) == Tile::cobblestone_wall_Id && level->getTile(x, y, z + 1) == Tile::cobblestone_wall_Id)) { h00 -= 3.0f / 16.0f; h01 -= 3.0f / 16.0f; diff --git a/Minecraft.Client/Windows64Media/loc/itemId.json b/Minecraft.Client/Windows64Media/loc/itemId.json deleted file mode 100644 index f6224f5c..00000000 --- a/Minecraft.Client/Windows64Media/loc/itemId.json +++ /dev/null @@ -1,482 +0,0 @@ -{ - "minecraft:stone": 1, - "minecraft:grass": 2, - "minecraft:dirt": 3, - "minecraft:cobblestone": 4, - "minecraft:planks": 5, - "minecraft:sapling": 6, - "minecraft:bedrock": 7, - "minecraft:flowing_water": 8, - "minecraft:water": 9, - "minecraft:flowing_lava": 10, - "minecraft:lava": 11, - "minecraft:sand": 12, - "minecraft:gravel": 13, - "minecraft:gold_ore": 14, - "minecraft:iron_ore": 15, - "minecraft:coal_ore": 16, - "minecraft:log": 17, - "minecraft:leaves": 18, - "minecraft:sponge": 19, - "minecraft:glass": 20, - "minecraft:lapis_ore": 21, - "minecraft:lapis_block": 22, - "minecraft:dispenser": 23, - "minecraft:sandstone": 24, - "minecraft:noteblock": 25, - "minecraft:bed": 26, - "minecraft:golden_rail": 27, - "minecraft:detector_rail": 28, - "minecraft:sticky_piston": 29, - "minecraft:web": 30, - "minecraft:tallgrass": 31, - "minecraft:deadbush": 32, - "minecraft:piston": 33, - "minecraft:piston_head": 34, - "minecraft:wool": 35, - "minecraft:piston_extension": 36, - "minecraft:yellow_flower": 37, - "minecraft:red_flower": 38, - "minecraft:brown_mushroom": 39, - "minecraft:red_mushroom": 40, - "minecraft:gold_block": 41, - "minecraft:iron_block": 42, - "minecraft:double_stone_slab": 43, - "minecraft:stone_slab": 44, - "minecraft:brick_block": 45, - "minecraft:tnt": 46, - "minecraft:bookshelf": 47, - "minecraft:mossy_cobblestone": 48, - "minecraft:obsidian": 49, - "minecraft:torch": 50, - "minecraft:fire": 51, - "minecraft:mob_spawner": 52, - "minecraft:oak_stairs": 53, - "minecraft:chest": 54, - "minecraft:redstone_wire": 55, - "minecraft:diamond_ore": 56, - "minecraft:diamond_block": 57, - "minecraft:crafting_table": 58, - "minecraft:wheat": 59, - "minecraft:farmland": 60, - "minecraft:furnace": 61, - "minecraft:lit_furnace": 62, - "minecraft:standing_sign": 63, - "minecraft:wooden_door": 64, - "minecraft:ladder": 65, - "minecraft:rail": 66, - "minecraft:stone_stairs": 67, - "minecraft:wall_sign": 68, - "minecraft:lever": 69, - "minecraft:stone_pressure_plate": 70, - "minecraft:iron_door": 71, - "minecraft:wooden_pressure_plate": 72, - "minecraft:redstone_ore": 73, - "minecraft:lit_redstone_ore": 74, - "minecraft:unlit_redstone_torch": 75, - "minecraft:redstone_torch": 76, - "minecraft:stone_button": 77, - "minecraft:snow_layer": 78, - "minecraft:ice": 79, - "minecraft:snow": 80, - "minecraft:cactus": 81, - "minecraft:clay": 82, - "minecraft:reeds": 83, - "minecraft:jukebox": 84, - "minecraft:fence": 85, - "minecraft:pumpkin": 86, - "minecraft:netherrack": 87, - "minecraft:soul_sand": 88, - "minecraft:glowstone": 89, - "minecraft:portal": 90, - "minecraft:lit_pumpkin": 91, - "minecraft:cake": 92, - "minecraft:unpowered_repeater": 93, - "minecraft:powered_repeater": 94, - "minecraft:stained_glass": 95, - "minecraft:trapdoor": 96, - "minecraft:monster_egg": 97, - "minecraft:stonebrick": 98, - "minecraft:brown_mushroom_block": 99, - "minecraft:red_mushroom_block": 100, - "minecraft:iron_bars": 101, - "minecraft:glass_pane": 102, - "minecraft:melon_block": 103, - "minecraft:pumpkin_stem": 104, - "minecraft:melon_stem": 105, - "minecraft:vine": 106, - "minecraft:fence_gate": 107, - "minecraft:brick_stairs": 108, - "minecraft:stone_brick_stairs": 109, - "minecraft:mycelium": 110, - "minecraft:waterlily": 111, - "minecraft:nether_brick": 112, - "minecraft:nether_brick_fence": 113, - "minecraft:nether_brick_stairs": 114, - "minecraft:nether_wart": 115, - "minecraft:enchanting_table": 116, - "minecraft:brewing_stand": 117, - "minecraft:cauldron": 118, - "minecraft:end_portal": 119, - "minecraft:end_portal_frame": 120, - "minecraft:end_stone": 121, - "minecraft:dragon_egg": 122, - "minecraft:redstone_lamp": 123, - "minecraft:lit_redstone_lamp": 124, - "minecraft:double_wooden_slab": 125, - "minecraft:wooden_slab": 126, - "minecraft:cocoa": 127, - "minecraft:sandstone_stairs": 128, - "minecraft:emerald_ore": 129, - "minecraft:ender_chest": 130, - "minecraft:tripwire_hook": 131, - "minecraft:tripwire": 132, - "minecraft:emerald_block": 133, - "minecraft:spruce_stairs": 134, - "minecraft:birch_stairs": 135, - "minecraft:jungle_stairs": 136, - "minecraft:beacon": 138, - "minecraft:cobblestone_wall": 139, - "minecraft:flower_pot": 140, - "minecraft:carrots": 141, - "minecraft:potatoes": 142, - "minecraft:wooden_button": 143, - "minecraft:skull": 144, - "minecraft:anvil": 145, - "minecraft:trapped_chest": 146, - "minecraft:light_weighted_pressure_plate": 147, - "minecraft:heavy_weighted_pressure_plate": 148, - "minecraft:unpowered_comparator": 149, - "minecraft:powered_comparator": 150, - "minecraft:daylight_detector": 151, - "minecraft:redstone_block": 152, - "minecraft:quartz_ore": 153, - "minecraft:hopper": 154, - "minecraft:quartz_block": 155, - "minecraft:quartz_stairs": 156, - "minecraft:activator_rail": 157, - "minecraft:dropper": 158, - "minecraft:stained_hardened_clay": 159, - "minecraft:stained_glass_pane": 160, - "minecraft:leaves2": 161, - "minecraft:log2": 162, - "minecraft:acacia_stairs": 163, - "minecraft:dark_oak_stairs": 164, - "minecraft:slime": 165, - "minecraft:barrier": 166, - "minecraft:iron_trapdoor": 167, - "minecraft:prismarine": 168, - "minecraft:sea_lantern": 169, - "minecraft:hay_block": 170, - "minecraft:carpet": 171, - "minecraft:hardened_clay": 172, - "minecraft:coal_block": 173, - "minecraft:packed_ice": 174, - "minecraft:double_plant": 175, - "minecraft:standing_banner": 176, - "minecraft:wall_banner": 177, - "minecraft:daylight_detector_inverted": 178, - "minecraft:red_sandstone": 179, - "minecraft:red_sandstone_stairs": 180, - "minecraft:double_stone_slab2": 181, - "minecraft:stone_slab2": 182, - "minecraft:spruce_fence_gate": 183, - "minecraft:birch_fence_gate": 184, - "minecraft:jungle_fence_gate": 185, - "minecraft:dark_oak_fence_gate": 186, - "minecraft:acacia_fence_gate": 187, - "minecraft:spruce_fence": 188, - "minecraft:birch_fence": 189, - "minecraft:jungle_fence": 190, - "minecraft:dark_oak_fence": 191, - "minecraft:acacia_fence": 192, - "minecraft:spruce_door": 193, - "minecraft:birch_door": 194, - "minecraft:jungle_door": 195, - "minecraft:acacia_door": 196, - "minecraft:dark_oak_door": 197, - "minecraft:end_rod": 198, - "minecraft:chorus_plant": 199, - "minecraft:chorus_flower": 200, - "minecraft:purpur_block": 201, - "minecraft:purpur_pillar": 202, - "minecraft:purpur_stairs": 203, - "minecraft:purpur_double_slab": 204, - "minecraft:purpur_slab": 205, - "minecraft:end_bricks": 206, - "minecraft:beetroots": 207, - "minecraft:grass_path": 208, - "minecraft:end_gateway": 209, - "minecraft:frosted_ice": 212, - "minecraft:magma": 213, - "minecraft:nether_wart_block": 214, - "minecraft:red_nether_brick": 215, - "minecraft:bone_block": 216, - "minecraft:structure_void": 217, - "minecraft:observer": 218, - "minecraft:white_shulker_box": 219, - "minecraft:orange_shulker_box": 220, - "minecraft:magenta_shulker_box": 221, - "minecraft:light_blue_shulker_box": 222, - "minecraft:yellow_shulker_box": 223, - "minecraft:lime_shulker_box": 224, - "minecraft:pink_shulker_box": 225, - "minecraft:gray_shulker_box": 226, - "minecraft:silver_shulker_box": 227, - "minecraft:cyan_shulker_box": 228, - "minecraft:purple_shulker_box": 229, - "minecraft:blue_shulker_box": 230, - "minecraft:brown_shulker_box": 231, - "minecraft:green_shulker_box": 232, - "minecraft:red_shulker_box": 233, - "minecraft:black_shulker_box": 234, - "minecraft:white_glazed_terracotta": 235, - "minecraft:orange_glazed_terracotta": 236, - "minecraft:magenta_glazed_terracotta": 237, - "minecraft:light_blue_glazed_terracotta": 238, - "minecraft:yellow_glazed_terracotta": 239, - "minecraft:lime_glazed_terracotta": 240, - "minecraft:pink_glazed_terracotta": 241, - "minecraft:gray_glazed_terracotta": 242, - "minecraft:silver_glazed_terracotta": 243, - "minecraft:cyan_glazed_terracotta": 244, - "minecraft:purple_glazed_terracotta": 245, - "minecraft:blue_glazed_terracotta": 246, - "minecraft:brown_glazed_terracotta": 247, - "minecraft:green_glazed_terracotta": 248, - "minecraft:red_glazed_terracotta": 249, - "minecraft:black_glazed_terracotta": 250, - "minecraft:concrete": 251, - "minecraft:concrete_powder": 252, - "minecraft:structure_block": 255, - "minecraft:iron_shovel": 256, - "minecraft:iron_pickaxe": 257, - "minecraft:iron_axe": 258, - "minecraft:flint_and_steel": 259, - "minecraft:apple": 260, - "minecraft:bow": 261, - "minecraft:arrow": 262, - "minecraft:coal": 263, - "minecraft:diamond": 264, - "minecraft:iron_ingot": 265, - "minecraft:gold_ingot": 266, - "minecraft:iron_sword": 267, - "minecraft:wooden_sword": 268, - "minecraft:wooden_shovel": 269, - "minecraft:wooden_pickaxe": 270, - "minecraft:wooden_axe": 271, - "minecraft:stone_sword": 272, - "minecraft:stone_shovel": 273, - "minecraft:stone_pickaxe": 274, - "minecraft:stone_axe": 275, - "minecraft:diamond_sword": 276, - "minecraft:diamond_shovel": 277, - "minecraft:diamond_pickaxe": 278, - "minecraft:diamond_axe": 279, - "minecraft:stick": 280, - "minecraft:bowl": 281, - "minecraft:mushroom_stew": 282, - "minecraft:golden_sword": 283, - "minecraft:golden_shovel": 284, - "minecraft:golden_pickaxe": 285, - "minecraft:golden_axe": 286, - "minecraft:string": 287, - "minecraft:feather": 288, - "minecraft:gunpowder": 289, - "minecraft:wooden_hoe": 290, - "minecraft:stone_hoe": 291, - "minecraft:iron_hoe": 292, - "minecraft:diamond_hoe": 293, - "minecraft:golden_hoe": 294, - "minecraft:wheat_seeds": 295, - "minecraft:wheat": 296, - "minecraft:bread": 297, - "minecraft:leather_helmet": 298, - "minecraft:leather_chestplate": 299, - "minecraft:leather_leggings": 300, - "minecraft:leather_boots": 301, - "minecraft:chainmail_helmet": 302, - "minecraft:chainmail_chestplate": 303, - "minecraft:chainmail_leggings": 304, - "minecraft:chainmail_boots": 305, - "minecraft:iron_helmet": 306, - "minecraft:iron_chestplate": 307, - "minecraft:iron_leggings": 308, - "minecraft:iron_boots": 309, - "minecraft:diamond_helmet": 310, - "minecraft:diamond_chestplate": 311, - "minecraft:diamond_leggings": 312, - "minecraft:diamond_boots": 313, - "minecraft:golden_helmet": 314, - "minecraft:golden_chestplate": 315, - "minecraft:golden_leggings": 316, - "minecraft:golden_boots": 317, - "minecraft:flint": 318, - "minecraft:porkchop": 319, - "minecraft:cooked_porkchop": 320, - "minecraft:painting": 321, - "minecraft:golden_apple": 322, - "minecraft:sign": 323, - "minecraft:wooden_door": 324, - "minecraft:bucket": 325, - "minecraft:water_bucket": 326, - "minecraft:lava_bucket": 327, - "minecraft:minecart": 328, - "minecraft:saddle": 329, - "minecraft:iron_door": 330, - "minecraft:redstone": 331, - "minecraft:snowball": 332, - "minecraft:boat": 333, - "minecraft:leather": 334, - "minecraft:milk_bucket": 335, - "minecraft:brick": 336, - "minecraft:clay_ball": 337, - "minecraft:reeds": 338, - "minecraft:paper": 339, - "minecraft:book": 340, - "minecraft:slime_ball": 341, - "minecraft:chest_minecart": 342, - "minecraft:furnace_minecart": 343, - "minecraft:egg": 344, - "minecraft:compass": 345, - "minecraft:fishing_rod": 346, - "minecraft:clock": 347, - "minecraft:glowstone_dust": 348, - "minecraft:fish": 349, - "minecraft:cooked_fish": 350, - "minecraft:dye": 351, - "minecraft:bone": 352, - "minecraft:sugar": 353, - "minecraft:cake": 354, - "minecraft:bed": 355, - "minecraft:repeater": 356, - "minecraft:cookie": 357, - "minecraft:filled_map": 358, - "minecraft:shears": 359, - "minecraft:melon": 360, - "minecraft:pumpkin_seeds": 361, - "minecraft:melon_seeds": 362, - "minecraft:beef": 363, - "minecraft:cooked_beef": 364, - "minecraft:chicken": 365, - "minecraft:cooked_chicken": 366, - "minecraft:rotten_flesh": 367, - "minecraft:ender_pearl": 368, - "minecraft:blaze_rod": 369, - "minecraft:ghast_tear": 370, - "minecraft:gold_nugget": 371, - "minecraft:nether_wart": 372, - "minecraft:potion": 373, - "minecraft:glass_bottle": 374, - "minecraft:spider_eye": 375, - "minecraft:fermented_spider_eye": 376, - "minecraft:blaze_powder": 377, - "minecraft:magma_cream": 378, - "minecraft:brewing_stand": 379, - "minecraft:cauldron": 380, - "minecraft:ender_eye": 381, - "minecraft:speckled_melon": 382, - "minecraft:spawn_egg": 383, - "minecraft:experience_bottle": 384, - "minecraft:fire_charge": 385, - "minecraft:writable_book": 386, - "minecraft:written_book": 387, - "minecraft:emerald": 388, - "minecraft:item_frame": 389, - "minecraft:flower_pot": 390, - "minecraft:carrot": 391, - "minecraft:potato": 392, - "minecraft:baked_potato": 393, - "minecraft:poisonous_potato": 394, - "minecraft:map": 395, - "minecraft:golden_carrot": 396, - "minecraft:skull": 397, - "minecraft:carrot_on_a_stick": 398, - "minecraft:nether_star": 399, - "minecraft:pumpkin_pie": 400, - "minecraft:fireworks": 401, - "minecraft:firework_charge": 402, - "minecraft:enchanted_book": 403, - "minecraft:comparator": 404, - "minecraft:netherbrick": 405, - "minecraft:quartz": 406, - "minecraft:tnt_minecart": 407, - "minecraft:hopper_minecart": 408, - "minecraft:prismarine_shard": 409, - "minecraft:prismarine_crystals": 410, - "minecraft:rabbit": 411, - "minecraft:cooked_rabbit": 412, - "minecraft:rabbit_stew": 413, - "minecraft:rabbit_foot": 414, - "minecraft:rabbit_hide": 415, - "minecraft:armor_stand": 416, - "minecraft:iron_horse_armor": 417, - "minecraft:golden_horse_armor": 418, - "minecraft:diamond_horse_armor": 419, - "minecraft:lead": 420, - "minecraft:name_tag": 421, - "minecraft:command_block_minecart": 422, - "minecraft:mutton": 423, - "minecraft:cooked_mutton": 424, - "minecraft:banner": 425, - "minecraft:end_crystal": 426, - "minecraft:spruce_door": 427, - "minecraft:birch_door": 428, - "minecraft:jungle_door": 429, - "minecraft:acacia_door": 430, - "minecraft:dark_oak_door": 431, - "minecraft:chorus_fruit": 432, - "minecraft:chorus_fruit_popped": 433, - "minecraft:beetroot": 434, - "minecraft:beetroot_seeds": 435, - "minecraft:beetroot_soup": 436, - "minecraft:dragon_breath": 437, - "minecraft:splash_potion": 438, - "minecraft:spectral_arrow": 439, - "minecraft:tipped_arrow": 440, - "minecraft:lingering_potion": 441, - "minecraft:shield": 442, - "minecraft:elytra": 443, - "minecraft:spruce_boat": 444, - "minecraft:birch_boat": 445, - "minecraft:jungle_boat": 446, - "minecraft:acacia_boat": 447, - "minecraft:dark_oak_boat": 448, - "minecraft:totem_of_undying": 449, - "minecraft:shulker_shell": 450, - "minecraft:iron_nugget": 452, - "minecraft:leather_horse_armor": 453, - "minecraft:trident": 454, - "minecraft:turtle_shell_piece": 455, - "minecraft:turtle_helmet": 456, - "minecraft:kelp": 457, - "minecraft:dried_kelp": 458, - "minecraft:fish_bucket": 459, - "minecraft:salmon_bucket": 460, - "minecraft:puffer_bucket": 461, - "minecraft:tropical_bucket": 462, - "minecraft:nautilus_core": 463, - "minecraft:nautilus": 464, - "minecraft:phantom_membrane": 465, - "minecraft:sign_spruce": 466, - "minecraft:sign_birch": 467, - "minecraft:sign_acacia": 468, - "minecraft:sign_jungle": 469, - "minecraft:sign_dark_oak": 470, - "minecraft:crossbow": 471, - "minecraft:banner_pattern": 472, - "minecraft:sweet_berries": 473, - "minecraft:debug_fourj_item": 2255, - "minecraft:record_13": 2256, - "minecraft:record_cat": 2257, - "minecraft:record_blocks": 2258, - "minecraft:record_chirp": 2259, - "minecraft:record_far": 2260, - "minecraft:record_mall": 2261, - "minecraft:record_mellohi": 2262, - "minecraft:record_stal": 2263, - "minecraft:record_strad": 2264, - "minecraft:record_ward": 2265, - "minecraft:record_11": 2266, - "minecraft:record_wait": 2267 -} diff --git a/Minecraft.World/AbstractTreeFeature.h b/Minecraft.World/AbstractTreeFeature.h index 37703e55..e6d37e10 100644 --- a/Minecraft.World/AbstractTreeFeature.h +++ b/Minecraft.World/AbstractTreeFeature.h @@ -15,11 +15,11 @@ public: return tile == 0 || tile == Tile::leaves_Id || tile == Tile::leaves2_Id - || tile == Tile::treeTrunk_Id - || tile == Tile::tree2Trunk_Id + || tile == Tile::log_Id + || tile == Tile::log2_Id || tile == Tile::vine_Id || tile == Tile::tallgrass_Id - || tile == Tile::flower_Id; + || tile == Tile::yellow_flower_Id; } void setDirtAt(Level* level, int x, int y, int z) diff --git a/Minecraft.World/Achievements.cpp b/Minecraft.World/Achievements.cpp index c130c032..6773678c 100644 --- a/Minecraft.World/Achievements.cpp +++ b/Minecraft.World/Achievements.cpp @@ -38,7 +38,7 @@ Achievement *Achievements::snipeSkeleton = nullptr; Achievement *Achievements::diamonds = nullptr; //Achievement *Achievements::portal = nullptr; Achievement *Achievements::ghast = nullptr; -Achievement *Achievements::blazeRod = nullptr; +Achievement *Achievements::blaze_rod = nullptr; Achievement *Achievements::potion = nullptr; Achievement *Achievements::theEnd = nullptr; Achievement *Achievements::winGame = nullptr; @@ -92,16 +92,16 @@ void Achievements::staticCtor() Achievements::openInventory = (new Achievement(eAward_TakingInventory, L"openInventory", 0, 0, Item::book, nullptr, "001", IDS_ACHIEVE_NAME_TAKING_INVENTORY, IDS_ACHIEVE_DESC_TAKING_INVENTORY))->setAwardLocallyOnly()->postConstruct(); Achievements::mineWood = (new Achievement(eAward_GettingWood, L"mineWood", 2, 1, Tile::treeTrunk, (Achievement *) openInventory, "002", IDS_ACHIEVE_NAME_GETTING_WOOD, IDS_ACHIEVE_DESC_GETTING_WOOD))->postConstruct(); Achievements::buildWorkbench = (new Achievement(eAward_Benchmarking, L"buildWorkBench", 4, -1, Tile::workBench, (Achievement *) mineWood, "003", IDS_ACHIEVE_NAME_BENCHMARKING, IDS_ACHIEVE_DESC_BENCHMARKING))->postConstruct(); - Achievements::buildPickaxe = (new Achievement(eAward_TimeToMine, L"buildPickaxe", 4, 2, Item::pickAxe_wood, (Achievement *) buildWorkbench, "004", IDS_ACHIEVE_NAME_TIME_TO_MINE, IDS_ACHIEVE_DESC_TIME_TO_MINE))->postConstruct(); + Achievements::buildPickaxe = (new Achievement(eAward_TimeToMine, L"buildPickaxe", 4, 2, Item::wooden_pickaxe, (Achievement *) buildWorkbench, "004", IDS_ACHIEVE_NAME_TIME_TO_MINE, IDS_ACHIEVE_DESC_TIME_TO_MINE))->postConstruct(); Achievements::buildFurnace = (new Achievement(eAward_HotTopic, L"buildFurnace", 3, 4, Tile::furnace_lit, (Achievement *) buildPickaxe, "005", IDS_ACHIEVE_NAME_HOT_TOPIC, IDS_ACHIEVE_DESC_HOT_TOPIC))->postConstruct(); - Achievements::acquireIron = (new Achievement(eAward_AquireHardware, L"acquireIron", 1, 4, Item::ironIngot, (Achievement *) buildFurnace, "006", IDS_ACHIEVE_NAME_ACQUIRE_HARDWARE, IDS_ACHIEVE_DESC_ACQUIRE_HARDWARE))->postConstruct(); - Achievements::buildHoe = (new Achievement(eAward_TimeToFarm, L"buildHoe", 2, -3, Item::hoe_wood, (Achievement *) buildWorkbench, "007", IDS_ACHIEVE_NAME_TIME_TO_FARM, IDS_ACHIEVE_DESC_TIME_TO_FARM))->postConstruct(); + Achievements::acquireIron = (new Achievement(eAward_AquireHardware, L"acquireIron", 1, 4, Item::iron_ingot, (Achievement *) buildFurnace, "006", IDS_ACHIEVE_NAME_ACQUIRE_HARDWARE, IDS_ACHIEVE_DESC_ACQUIRE_HARDWARE))->postConstruct(); + Achievements::buildHoe = (new Achievement(eAward_TimeToFarm, L"buildHoe", 2, -3, Item::wooden_hoe, (Achievement *) buildWorkbench, "007", IDS_ACHIEVE_NAME_TIME_TO_FARM, IDS_ACHIEVE_DESC_TIME_TO_FARM))->postConstruct(); Achievements::makeBread = (new Achievement(eAward_BakeBread, L"makeBread", -1, -3, Item::bread, (Achievement *) buildHoe, "008", IDS_ACHIEVE_NAME_BAKE_BREAD, IDS_ACHIEVE_DESC_BAKE_BREAD))->postConstruct(); Achievements::bakeCake = (new Achievement(eAward_TheLie, L"bakeCake", 0, -5, Item::cake, (Achievement *) buildHoe, "009", IDS_ACHIEVE_NAME_THE_LIE, IDS_ACHIEVE_DESC_THE_LIE))->postConstruct(); - Achievements::buildBetterPickaxe = (new Achievement(eAward_GettingAnUpgrade, L"buildBetterPickaxe", 6, 2, Item::pickAxe_stone, (Achievement *) buildPickaxe, "010", IDS_ACHIEVE_NAME_GETTING_AN_UPGRADE, IDS_ACHIEVE_DESC_GETTING_AN_UPGRADE))->postConstruct(); - Achievements::cookFish = (new Achievement(eAward_DeliciousFish, L"cookFish", 2, 6, Item::fish_cooked, (Achievement *) buildFurnace, "011", IDS_ACHIEVE_NAME_DELICIOUS_FISH, IDS_ACHIEVE_DESC_DELICIOUS_FISH))->postConstruct(); + Achievements::buildBetterPickaxe = (new Achievement(eAward_GettingAnUpgrade, L"buildBetterPickaxe", 6, 2, Item::stone_pickaxe, (Achievement *) buildPickaxe, "010", IDS_ACHIEVE_NAME_GETTING_AN_UPGRADE, IDS_ACHIEVE_DESC_GETTING_AN_UPGRADE))->postConstruct(); + Achievements::cookFish = (new Achievement(eAward_DeliciousFish, L"cookFish", 2, 6, Item::cooked_fish, (Achievement *) buildFurnace, "011", IDS_ACHIEVE_NAME_DELICIOUS_FISH, IDS_ACHIEVE_DESC_DELICIOUS_FISH))->postConstruct(); Achievements::onARail = (new Achievement(eAward_OnARail, L"onARail", 2, 3, Tile::rail, (Achievement *) acquireIron, "012", IDS_ACHIEVE_NAME_ON_A_RAIL, IDS_ACHIEVE_DESC_ON_A_RAIL))->setGolden()->postConstruct(); - Achievements::buildSword = (new Achievement(eAward_TimeToStrike, L"buildSword", 6, -1, Item::sword_wood, (Achievement *) buildWorkbench, "013", IDS_ACHIEVE_NAME_TIME_TO_STRIKE, IDS_ACHIEVE_DESC_TIME_TO_STRIKE))->postConstruct(); + Achievements::buildSword = (new Achievement(eAward_TimeToStrike, L"buildSword", 6, -1, Item::wooden_sword, (Achievement *) buildWorkbench, "013", IDS_ACHIEVE_NAME_TIME_TO_STRIKE, IDS_ACHIEVE_DESC_TIME_TO_STRIKE))->postConstruct(); Achievements::killEnemy = (new Achievement(eAward_MonsterHunter, L"killEnemy", 8, -1, Item::bone, (Achievement *) buildSword, "014", IDS_ACHIEVE_NAME_MONSTER_HUNTER, IDS_ACHIEVE_DESC_MONSTER_HUNTER))->postConstruct(); Achievements::killCow = (new Achievement(eAward_CowTipper, L"killCow", 7, -3, Item::leather, (Achievement *) buildSword, "015", IDS_ACHIEVE_NAME_COW_TIPPER, IDS_ACHIEVE_DESC_COW_TIPPER))->postConstruct(); Achievements::flyPig = (new Achievement(eAward_WhenPigsFly, L"flyPig", 8, -4, Item::saddle, (Achievement *) killCow, "016", IDS_ACHIEVE_NAME_WHEN_PIGS_FLY, IDS_ACHIEVE_DESC_WHEN_PIGS_FLY))->setGolden()->postConstruct(); @@ -138,18 +138,18 @@ void Achievements::staticCtor() // 4J Stu - These added in 1.0.1, but do not map to any Xbox achievements Achievements::diamonds = (new Achievement(eAward_diamonds, L"diamonds", -1, 5, Item::diamond, (Achievement *) acquireIron, "022", IDS_ACHIEVE_NAME_DIAMONDS, IDS_ACHIEVE_DESC_DIAMONDS) )->postConstruct(); //Achievements::portal = (new Achievement(eAward_portal, L"portal", -1, 7, Tile::obsidian, (Achievement *)diamonds) )->postConstruct(); - Achievements::ghast = (new Achievement(eAward_ghast, L"ghast", -4, 8, Item::ghastTear, (Achievement *)ghast, "023", IDS_ACHIEVE_NAME_GHAST, IDS_ACHIEVE_DESC_GHAST) )->setGolden()->postConstruct(); - Achievements::blazeRod = (new Achievement(eAward_blazeRod, L"blazeRod", 0, 9, Item::blazeRod, (Achievement *)blazeRod, "024", IDS_ACHIEVE_NAME_BLAZEROD, IDS_ACHIEVE_DESC_BLAZEROD) )->postConstruct(); + Achievements::ghast = (new Achievement(eAward_ghast, L"ghast", -4, 8, Item::ghast_tear, (Achievement *)ghast, "023", IDS_ACHIEVE_NAME_GHAST, IDS_ACHIEVE_DESC_GHAST) )->setGolden()->postConstruct(); + Achievements::blaze_rod = (new Achievement(eAward_blazeRod, L"blaze_rod", 0, 9, Item::blaze_rod, (Achievement *)blaze_rod, "024", IDS_ACHIEVE_NAME_BLAZEROD, IDS_ACHIEVE_DESC_BLAZEROD) )->postConstruct(); Achievements::potion = (new Achievement(eAward_potion, L"potion", 2, 8, Item::potion, (Achievement *)potion, "025", IDS_ACHIEVE_NAME_POTION, IDS_ACHIEVE_DESC_POTION) )->postConstruct(); - Achievements::theEnd = (new Achievement(eAward_theEnd, L"theEnd", 3, 10, Item::eyeOfEnder, (Achievement *)theEnd, "026", IDS_ACHIEVE_NAME_THE_END, IDS_ACHIEVE_DESC_THE_END) )->setGolden()->postConstruct(); + Achievements::theEnd = (new Achievement(eAward_theEnd, L"theEnd", 3, 10, Item::eye_of_ender, (Achievement *)theEnd, "026", IDS_ACHIEVE_NAME_THE_END, IDS_ACHIEVE_DESC_THE_END) )->setGolden()->postConstruct(); Achievements::winGame = (new Achievement(eAward_winGame, L"theEnd2", 4, 13, Tile::dragonEgg, (Achievement *)winGame, "027", IDS_ACHIEVE_NAME_WINGAME, IDS_ACHIEVE_DESC_WINGAME) )->setGolden()->postConstruct(); Achievements::enchantments = (new Achievement(eAward_enchantments, L"enchantments", -4, 4, Tile::enchantTable, (Achievement *)enchantments, "028", IDS_ACHIEVE_NAME_ENCHANTMENTS, IDS_ACHIEVE_DESC_ENCHANTMENTS) )->postConstruct(); - // Achievements::overkill = (new Achievement(eAward_overkill, L"overkill", -4, 1, Item::sword_diamond, (Achievement *)enchantments) )->setGolden()->postConstruct(); + // Achievements::overkill = (new Achievement(eAward_overkill, L"overkill", -4, 1, Item::diamond_sword, (Achievement *)enchantments) )->setGolden()->postConstruct(); // Achievements::bookcase = (new Achievement(eAward_bookcase, L"bookcase", -3, 6, Tile::bookshelf, (Achievement *)enchantments) )->postConstruct(); #endif - Achievements::overkill = (new Achievement(eAward_overkill, L"overkill", -4,1, Item::sword_diamond, (Achievement *)enchantments, "029", IDS_ACHIEVE_NAME_OVERKILL, IDS_ACHIEVE_DESC_OVERKILL) )->setGolden()->postConstruct(); + Achievements::overkill = (new Achievement(eAward_overkill, L"overkill", -4,1, Item::diamond_sword, (Achievement *)enchantments, "029", IDS_ACHIEVE_NAME_OVERKILL, IDS_ACHIEVE_DESC_OVERKILL) )->setGolden()->postConstruct(); Achievements::bookcase = (new Achievement(eAward_bookcase, L"bookcase", -3,6, Tile::bookshelf, (Achievement *)enchantments, "030", IDS_ACHIEVE_NAME_BOOKCASE, IDS_ACHIEVE_DESC_BOOKCASE) )->postConstruct(); Achievements::adventuringTime = (new Achievement(eAward_adventuringTime, L"adventuringTime", 0,0, Tile::bookshelf, (Achievement*) nullptr, "031", IDS_ACHIEVE_NAME_ADVENTURING_TIME, IDS_ACHIEVE_DESC_ADVENTURING_TIME) )->setAwardLocallyOnly()->postConstruct(); diff --git a/Minecraft.World/Achievements.h b/Minecraft.World/Achievements.h index f2ff0e73..31e8b47a 100644 --- a/Minecraft.World/Achievements.h +++ b/Minecraft.World/Achievements.h @@ -42,7 +42,7 @@ public: static Achievement *diamonds; //static Achievement *portal; //4J-JEV: Whats this? static Achievement *ghast; - static Achievement *blazeRod; + static Achievement *blaze_rod; static Achievement *potion; static Achievement *theEnd; static Achievement *winGame; diff --git a/Minecraft.World/AgableMob.cpp b/Minecraft.World/AgableMob.cpp index 892a14e5..1f587745 100644 --- a/Minecraft.World/AgableMob.cpp +++ b/Minecraft.World/AgableMob.cpp @@ -17,7 +17,7 @@ bool AgableMob::mobInteract(shared_ptr player) { shared_ptr item = player->inventory->getSelected(); - if (item != nullptr && item->id == Item::spawnEgg_Id) + if (item != nullptr && item->id == Item::spawn_egg_Id) { if (!level->isClientSide) { diff --git a/Minecraft.World/AnvilMenu.cpp b/Minecraft.World/AnvilMenu.cpp index 78d72daf..1affd424 100644 --- a/Minecraft.World/AnvilMenu.cpp +++ b/Minecraft.World/AnvilMenu.cpp @@ -78,7 +78,7 @@ void AnvilMenu::createResult() if (addition != nullptr) { - usingBook = addition->id == Item::enchantedBook_Id && Item::enchantedBook->getEnchantments(addition)->size() > 0; + usingBook = addition->id == Item::enchanted_book_Id && Item::enchanted_book->getEnchantments(addition)->size() > 0; if (result->isDamageableItem() && Item::items[result->id]->isValidRepairItem(input, addition)) { @@ -147,7 +147,7 @@ void AnvilMenu::createResult() int extra = level - current; bool compatible = enchantment->canEnchant(input); - if (player->abilities.instabuild || input->id == EnchantedBookItem::enchantedBook_Id) compatible = true; + if (player->abilities.instabuild || input->id == EnchantedBookItem::enchanted_book_Id) compatible = true; for (auto& it2 : *enchantments) { diff --git a/Minecraft.World/ArmorDyeRecipe.cpp b/Minecraft.World/ArmorDyeRecipe.cpp index d4581182..fa2568c7 100644 --- a/Minecraft.World/ArmorDyeRecipe.cpp +++ b/Minecraft.World/ArmorDyeRecipe.cpp @@ -27,7 +27,7 @@ bool ArmorDyeRecipe::matches(shared_ptr craftSlots, Level *le return false; } } - else if (item->id == Item::dye_powder_Id) + else if (item->id == Item::dye_Id) { dyes.push_back(item); } @@ -83,7 +83,7 @@ shared_ptr ArmorDyeRecipe::assembleDyedArmor(shared_ptrid == Item::dye_powder_Id) + else if (item->id == Item::dye_Id) { int tileData = ColoredTile::getTileDataForItemAuxValue(item->getAuxValue()); int red = static_cast(Sheep::COLOR[tileData][0] * 0xFF); diff --git a/Minecraft.World/ArmorItem.cpp b/Minecraft.World/ArmorItem.cpp index 1850c202..e92c6695 100644 --- a/Minecraft.World/ArmorItem.cpp +++ b/Minecraft.World/ArmorItem.cpp @@ -107,15 +107,15 @@ int _ArmorMaterial::getTierItemId() const } else if (this == CHAIN) { - return Item::ironIngot_Id; + return Item::iron_ingot_Id; } else if (this == GOLD) { - return Item::goldIngot_Id; + return Item::gold_ingot_Id; } else if (this == IRON) { - return Item::ironIngot_Id; + return Item::iron_ingot_Id; } else if (this == DIAMOND) { @@ -289,13 +289,13 @@ Icon *ArmorItem::getEmptyIcon(int slot) switch (slot) { case 0: - return Item::helmet_diamond->iconEmpty; + return Item::diamond_helmet->iconEmpty; case 1: - return Item::chestplate_diamond->iconEmpty; + return Item::diamond_chestplate->iconEmpty; case 2: - return Item::leggings_diamond->iconEmpty; + return Item::diamond_leggings->iconEmpty; case 3: - return Item::boots_diamond->iconEmpty; + return Item::diamond_boots->iconEmpty; } return nullptr; diff --git a/Minecraft.World/ArmorRecipes.cpp b/Minecraft.World/ArmorRecipes.cpp index 0717e694..07fae9cd 100644 --- a/Minecraft.World/ArmorRecipes.cpp +++ b/Minecraft.World/ArmorRecipes.cpp @@ -30,11 +30,11 @@ wstring ArmorRecipes::shapes[][4] = /* ArmorRecipes::map[5] = { - {Item::leather, Tile::fire, Item::ironIngot, Item::diamond, Item::goldIngot}, - {Item::helmet_cloth, Item::helmet_chain, Item::helmet_iron, Item::helmet_diamond, Item::helmet_gold}, - {Item::chestplate_cloth, Item::chestplate_chain, Item::chestplate_iron, Item::chestplate_diamond, Item::chestplate_gold}, - {Item::leggings_cloth, Item::leggings_chain, Item::leggings_iron, Item::leggings_diamond, Item::leggings_gold}, - {Item::boots_cloth, Item::boots_chain, Item::boots_iron, Item::boots_diamond, Item::boots_gold}, + {Item::leather, Tile::fire, Item::iron_ingot, Item::diamond, Item::gold_ingot}, + {Item::helmet_cloth, Item::chainmail_helmet, Item::iron_helmet, Item::diamond_helmet, Item::golden_helmet}, + {Item::chestplate_cloth, Item::chainmail_chestplate, Item::iron_chestplate, Item::diamond_chestplate, Item::golden_chestplate}, + {Item::leggings_cloth, Item::chainmail_leggings, Item::iron_leggings, Item::diamond_leggings, Item::golden_leggings}, + {Item::boots_cloth, Item::chainmail_boots, Item::iron_boots, Item::diamond_boots, Item::golden_boots}, }; */ @@ -45,33 +45,33 @@ void ArmorRecipes::_init() // 4J-PB - removing the chain armour, since we show all possible recipes in the xbox game, and it's not one you can make ADD_OBJECT(map[0],Item::leather); // ADD_OBJECT(map[0],Tile::fire); - ADD_OBJECT(map[0],Item::ironIngot); + ADD_OBJECT(map[0],Item::iron_ingot); ADD_OBJECT(map[0],Item::diamond); - ADD_OBJECT(map[0],Item::goldIngot); + ADD_OBJECT(map[0],Item::gold_ingot); - ADD_OBJECT(map[1],Item::helmet_leather); -// ADD_OBJECT(map[1],Item::helmet_chain); - ADD_OBJECT(map[1],Item::helmet_iron); - ADD_OBJECT(map[1],Item::helmet_diamond); - ADD_OBJECT(map[1],Item::helmet_gold); + ADD_OBJECT(map[1],Item::leather_helmet); +// ADD_OBJECT(map[1],Item::chainmail_helmet); + ADD_OBJECT(map[1],Item::iron_helmet); + ADD_OBJECT(map[1],Item::diamond_helmet); + ADD_OBJECT(map[1],Item::golden_helmet); - ADD_OBJECT(map[2],Item::chestplate_leather); -// ADD_OBJECT(map[2],Item::chestplate_chain); - ADD_OBJECT(map[2],Item::chestplate_iron); - ADD_OBJECT(map[2],Item::chestplate_diamond); - ADD_OBJECT(map[2],Item::chestplate_gold); + ADD_OBJECT(map[2],Item::leather_chestplate); +// ADD_OBJECT(map[2],Item::chainmail_chestplate); + ADD_OBJECT(map[2],Item::iron_chestplate); + ADD_OBJECT(map[2],Item::diamond_chestplate); + ADD_OBJECT(map[2],Item::golden_chestplate); - ADD_OBJECT(map[3],Item::leggings_leather); -// ADD_OBJECT(map[3],Item::leggings_chain); - ADD_OBJECT(map[3],Item::leggings_iron); - ADD_OBJECT(map[3],Item::leggings_diamond); - ADD_OBJECT(map[3],Item::leggings_gold); + ADD_OBJECT(map[3],Item::leather_leggings); +// ADD_OBJECT(map[3],Item::chainmail_leggings); + ADD_OBJECT(map[3],Item::iron_leggings); + ADD_OBJECT(map[3],Item::diamond_leggings); + ADD_OBJECT(map[3],Item::golden_leggings); - ADD_OBJECT(map[4],Item::boots_leather); -// ADD_OBJECT(map[4],Item::boots_chain); - ADD_OBJECT(map[4],Item::boots_iron); - ADD_OBJECT(map[4],Item::boots_diamond); - ADD_OBJECT(map[4],Item::boots_gold); + ADD_OBJECT(map[4],Item::leather_boots); +// ADD_OBJECT(map[4],Item::chainmail_boots); + ADD_OBJECT(map[4],Item::iron_boots); + ADD_OBJECT(map[4],Item::diamond_boots); + ADD_OBJECT(map[4],Item::golden_boots); } // 4J-PB added for quick equip in the inventory @@ -79,37 +79,37 @@ ArmorRecipes::_eArmorType ArmorRecipes::GetArmorType(int iId) { switch(iId) { - case Item::helmet_leather_Id: - case Item::helmet_chain_Id: - case Item::helmet_iron_Id: - case Item::helmet_diamond_Id: - case Item::helmet_gold_Id: + case Item::leather_helmet_Id: + case Item::chainmail_helmet_Id: + case Item::iron_helmet_Id: + case Item::diamond_helmet_Id: + case Item::golden_helmet_Id: return eArmorType_Helmet; break; - case Item::chestplate_leather_Id: - case Item::chestplate_chain_Id: - case Item::chestplate_iron_Id: - case Item::chestplate_diamond_Id: - case Item::chestplate_gold_Id: + case Item::leather_chestplate_Id: + case Item::chainmail_chestplate_Id: + case Item::iron_chestplate_Id: + case Item::diamond_chestplate_Id: + case Item::golden_chestplate_Id: case Item::elytra_Id: return eArmorType_Chestplate; break; - case Item::leggings_leather_Id: - case Item::leggings_chain_Id: - case Item::leggings_iron_Id: - case Item::leggings_diamond_Id: - case Item::leggings_gold_Id: + case Item::leather_leggings_Id: + case Item::chainmail_leggings_Id: + case Item::iron_leggings_Id: + case Item::diamond_leggings_Id: + case Item::golden_leggings_Id: return eArmorType_Leggings; break; - case Item::boots_leather_Id: - case Item::boots_chain_Id: - case Item::boots_iron_Id: - case Item::boots_diamond_Id: - case Item::boots_gold_Id: + case Item::leather_boots_Id: + case Item::chainmail_boots_Id: + case Item::iron_boots_Id: + case Item::diamond_boots_Id: + case Item::golden_boots_Id: return eArmorType_Boots; break; } diff --git a/Minecraft.World/BaseRailTile.cpp b/Minecraft.World/BaseRailTile.cpp index d1297362..bcafc7d0 100644 --- a/Minecraft.World/BaseRailTile.cpp +++ b/Minecraft.World/BaseRailTile.cpp @@ -381,7 +381,7 @@ bool BaseRailTile::isRail(Level *level, int x, int y, int z) bool BaseRailTile::isRail(int id) { - return id == Tile::rail_Id || id == Tile::goldenRail_Id || id == Tile::detectorRail_Id || id == Tile::activatorRail_Id; + return id == Tile::rail_Id || id == Tile::golden_rail_Id || id == Tile::detector_rail_Id || id == Tile::activator_rail_Id; } BaseRailTile::BaseRailTile(int id, bool usesDataBit) : Tile(id, Material::decoration, isSolidRender()) diff --git a/Minecraft.World/BasicTree.cpp b/Minecraft.World/BasicTree.cpp index fc08a5f7..60fe5f08 100644 --- a/Minecraft.World/BasicTree.cpp +++ b/Minecraft.World/BasicTree.cpp @@ -342,18 +342,18 @@ void BasicTree::makeTrunk() int z = origin[2]; int startCoord[] = { x, startY, z }; int endCoord[] = { x, topY, z }; - limb(startCoord, endCoord, Tile::treeTrunk_Id); + limb(startCoord, endCoord, Tile::log_Id); if (trunkWidth == 2) { startCoord[0] += 1; endCoord[0] += 1; - limb(startCoord, endCoord, Tile::treeTrunk_Id); + limb(startCoord, endCoord, Tile::log_Id); startCoord[2] += 1; endCoord[2] += 1; - limb(startCoord, endCoord, Tile::treeTrunk_Id); + limb(startCoord, endCoord, Tile::log_Id); startCoord[0] += -1; endCoord[0] += -1; - limb(startCoord, endCoord, Tile::treeTrunk_Id); + limb(startCoord, endCoord, Tile::log_Id); } } @@ -373,7 +373,7 @@ void BasicTree::makeBranches() int localY = baseCoord[1] - origin[1]; if (trimBranches(localY)) { - limb(baseCoord, endCoord, Tile::treeTrunk_Id); + limb(baseCoord, endCoord, Tile::log_Id); } idx++; } diff --git a/Minecraft.World/BeaconMenu.cpp b/Minecraft.World/BeaconMenu.cpp index f88ded24..ab63639e 100644 --- a/Minecraft.World/BeaconMenu.cpp +++ b/Minecraft.World/BeaconMenu.cpp @@ -152,7 +152,7 @@ bool BeaconMenu::PaymentSlot::mayPlace(shared_ptr item) { if (item != nullptr) { - return (item->id == Item::emerald_Id || item->id == Item::diamond_Id || item->id == Item::goldIngot_Id || item->id == Item::ironIngot_Id); + return (item->id == Item::emerald_Id || item->id == Item::diamond_Id || item->id == Item::gold_ingot_Id || item->id == Item::iron_ingot_Id); } return false; } diff --git a/Minecraft.World/BeaconTileEntity.cpp b/Minecraft.World/BeaconTileEntity.cpp index 633930f4..5207fe28 100644 --- a/Minecraft.World/BeaconTileEntity.cpp +++ b/Minecraft.World/BeaconTileEntity.cpp @@ -131,7 +131,7 @@ void BeaconTileEntity::updateShape() for (int lz = z - step; lz <= z + step; lz++) { int tile = level->getTile(lx, ly, lz); - if (tile != Tile::emeraldBlock_Id && tile != Tile::goldBlock_Id && tile != Tile::diamondBlock_Id && tile != Tile::ironBlock_Id) + if (tile != Tile::emerald_block_Id && tile != Tile::gold_block_Id && tile != Tile::diamond_block_Id && tile != Tile::iron_block_Id) { isOk = false; break; @@ -373,5 +373,5 @@ void BeaconTileEntity::stopOpen() bool BeaconTileEntity::canPlaceItem(int slot, shared_ptr item) { - return (item->id == Item::emerald_Id || item->id == Item::diamond_Id || item->id == Item::goldIngot_Id || item->id == Item::ironIngot_Id); + return (item->id == Item::emerald_Id || item->id == Item::diamond_Id || item->id == Item::gold_ingot_Id || item->id == Item::iron_ingot_Id); } \ No newline at end of file diff --git a/Minecraft.World/Biome.cpp b/Minecraft.World/Biome.cpp index f35769db..1ce86752 100644 --- a/Minecraft.World/Biome.cpp +++ b/Minecraft.World/Biome.cpp @@ -410,7 +410,7 @@ void Biome::buildSurfaceAtDefault(Level *level, Random *random, byte* chunkBlock if (y <= 1 + random->nextInt(2)) { - chunkBlocks[index] = static_cast(Tile::unbreakable_Id); + chunkBlocks[index] = static_cast(Tile::bedrock_Id); continue; } @@ -444,7 +444,7 @@ void Biome::buildSurfaceAtDefault(Level *level, Random *random, byte* chunkBlock if (this->getTemperature(x, y, z) < 0.15f) topState = static_cast(Tile::ice_Id); else - topState = static_cast(Tile::calmWater_Id); + topState = static_cast(Tile::water_Id); topStateData = 0; } @@ -482,7 +482,7 @@ void Biome::buildSurfaceAtDefault(Level *level, Random *random, byte* chunkBlock } else { - fillerState = static_cast(Tile::sandStone_Id); + fillerState = static_cast(Tile::sandstone_Id); fillerStateData = 0; } } @@ -542,9 +542,9 @@ Feature *Biome::getFlowerFeature(Random *random, int x, int y, int z) if (random->nextInt(3) > 0) { - return new FlowerFeature(Tile::flower_Id); + return new FlowerFeature(Tile::yellow_flower_Id); } - return new FlowerFeature(Tile::rose_Id); + return new FlowerFeature(Tile::red_flower_Id); } int Biome::getRandomDoublePlantType(Random *random) diff --git a/Minecraft.World/BiomeDecorator.cpp b/Minecraft.World/BiomeDecorator.cpp index f6577572..4f586d57 100644 --- a/Minecraft.World/BiomeDecorator.cpp +++ b/Minecraft.World/BiomeDecorator.cpp @@ -49,19 +49,19 @@ void BiomeDecorator::_init() gravelFeature = new SandFeature(6, Tile::gravel_Id); dirtOreFeature = new OreFeature(Tile::dirt_Id, 32); gravelOreFeature = new OreFeature(Tile::gravel_Id, 32); - coalOreFeature = new OreFeature(Tile::coalOre_Id, 16); - ironOreFeature = new OreFeature(Tile::ironOre_Id, 8); - goldOreFeature = new OreFeature(Tile::goldOre_Id, 8); - redStoneOreFeature = new OreFeature(Tile::redStoneOre_Id, 7); - diamondOreFeature = new OreFeature(Tile::diamondOre_Id, 7); - lapisOreFeature = new OreFeature(Tile::lapisOre_Id, 6); + coalOreFeature = new OreFeature(Tile::coal_ore_Id, 16); + ironOreFeature = new OreFeature(Tile::iron_ore_Id, 8); + goldOreFeature = new OreFeature(Tile::gold_ore_Id, 8); + redStoneOreFeature = new OreFeature(Tile::redstone_ore_Id, 7); + diamondOreFeature = new OreFeature(Tile::diamond_ore_Id, 7); + lapisOreFeature = new OreFeature(Tile::lapis_ore_Id, 6); graniteOreFeature = new OreFeature(Tile::stone_Id, StoneTile::GRANITE, 33); dioriteOreFeature = new OreFeature(Tile::stone_Id, StoneTile::DIORITE, 33); andesiteOreFeature = new OreFeature(Tile::stone_Id, StoneTile::ANDESITE, 33); - yellowFlowerFeature = new FlowerFeature(Tile::flower_Id); - roseFlowerFeature = new FlowerFeature(Tile::rose_Id); + yellowFlowerFeature = new FlowerFeature(Tile::yellow_flower_Id); + roseFlowerFeature = new FlowerFeature(Tile::red_flower_Id); brownMushroomFeature = new FlowerFeature(Tile::mushroom_brown_Id); redMushroomFeature = new FlowerFeature(Tile::mushroom_red_Id); hugeMushroomFeature = new HugeMushroomFeature(); @@ -69,14 +69,14 @@ void BiomeDecorator::_init() cactusFeature = new CactusFeature(); waterlilyFeature = new WaterlilyFeature(); - blueOrchidFeature = new FlowerFeature(Tile::rose_Id, Rose::BLUE_ORCHID); - alliumFeature = new FlowerFeature(Tile::rose_Id, Rose::ALLIUM); - azureBluetFeature = new FlowerFeature(Tile::rose_Id, Rose::AZURE_BLUET); - oxeyeDaisyFeature = new FlowerFeature(Tile::rose_Id, Rose::OXEYE_DAISY); - tulipRedFeature = new FlowerFeature(Tile::rose_Id, Rose::RED_TULIP); - tulipOrangeFeature = new FlowerFeature(Tile::rose_Id, Rose::ORANGE_TULIP); - tulipWhiteFeature = new FlowerFeature(Tile::rose_Id, Rose::WHITE_TULIP); - tulipPinkFeature = new FlowerFeature(Tile::rose_Id, Rose::PINK_TULIP); + blueOrchidFeature = new FlowerFeature(Tile::red_flower_Id, Rose::BLUE_ORCHID); + alliumFeature = new FlowerFeature(Tile::red_flower_Id, Rose::ALLIUM); + azureBluetFeature = new FlowerFeature(Tile::red_flower_Id, Rose::AZURE_BLUET); + oxeyeDaisyFeature = new FlowerFeature(Tile::red_flower_Id, Rose::OXEYE_DAISY); + tulipRedFeature = new FlowerFeature(Tile::red_flower_Id, Rose::RED_TULIP); + tulipOrangeFeature = new FlowerFeature(Tile::red_flower_Id, Rose::ORANGE_TULIP); + tulipWhiteFeature = new FlowerFeature(Tile::red_flower_Id, Rose::WHITE_TULIP); + tulipPinkFeature = new FlowerFeature(Tile::red_flower_Id, Rose::PINK_TULIP); doublePlantFeature = new DoublePlantFeature(false); @@ -241,7 +241,7 @@ void BiomeDecorator::decorate() PIXBeginNamedEvent(0,"Decorate bush/waterlily/mushroom/reeds/pumpkins/cactuses"); DeadBushFeature *deadBushFeature = nullptr; - if(deadBushCount > 0) deadBushFeature = new DeadBushFeature(Tile::deadBush_Id); + if(deadBushCount > 0) deadBushFeature = new DeadBushFeature(Tile::deadbush_Id); for (int i = 0; i < deadBushCount; i++) { int x = xo + random->nextInt(16) + 8; @@ -335,7 +335,7 @@ void BiomeDecorator::decorate() if( liquids ) { - SpringFeature *waterSpringFeature = new SpringFeature(Tile::water_Id); + SpringFeature *waterSpringFeature = new SpringFeature(Tile::flowing_water_Id); for (int i = 0; i < 50; i++) { int x = xo + random->nextInt(16) + 8; @@ -345,7 +345,7 @@ void BiomeDecorator::decorate() } delete waterSpringFeature; - SpringFeature *lavaSpringFeature = new SpringFeature(Tile::lava_Id); + SpringFeature *lavaSpringFeature = new SpringFeature(Tile::flowing_lava_Id); for (int i = 0; i < 20; i++) { int x = xo + random->nextInt(16) + 8; diff --git a/Minecraft.World/BirchFeature.cpp b/Minecraft.World/BirchFeature.cpp index 7a1d0f7a..413c9b2d 100644 --- a/Minecraft.World/BirchFeature.cpp +++ b/Minecraft.World/BirchFeature.cpp @@ -84,7 +84,7 @@ bool BirchFeature::place(Level *level, Random *random, int x, int y, int z) for (int hh = 0; hh < treeHeight; hh++) { int t = level->getTile(x, y + hh, z); - if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, TreeTile::BIRCH_TRUNK); + if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::log_Id, TreeTile::BIRCH_TRUNK); } return true; } \ No newline at end of file diff --git a/Minecraft.World/Blaze.cpp b/Minecraft.World/Blaze.cpp index c76d4e04..e80c164f 100644 --- a/Minecraft.World/Blaze.cpp +++ b/Minecraft.World/Blaze.cpp @@ -174,7 +174,7 @@ void Blaze::causeFallDamage(float distance) int Blaze::getDeathLoot() { - return Item::blazeRod_Id; + return Item::blaze_rod_Id; } bool Blaze::isOnFire() @@ -189,13 +189,13 @@ void Blaze::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) int count = random->nextInt(2 + playerBonusLevel); for (int i = 0; i < count; i++) { - spawnAtLocation(Item::blazeRod_Id, 1); + spawnAtLocation(Item::blaze_rod_Id, 1); } // 4J-PB - added to the XBLA version due to our limited amount of glowstone in the Nether - drop 0-2 glowstone dust count = random->nextInt(3 + playerBonusLevel); for (int i = 0; i < count; i++) { - spawnAtLocation(Item::yellowDust_Id, 1); + spawnAtLocation(Item::glowstone_dust_Id, 1); } } } diff --git a/Minecraft.World/BlockStateDecoder.cpp b/Minecraft.World/BlockStateDecoder.cpp index 20e9ba9d..0c6e081b 100644 --- a/Minecraft.World/BlockStateDecoder.cpp +++ b/Minecraft.World/BlockStateDecoder.cpp @@ -167,7 +167,7 @@ static std::wstring tallGrassPropsToString(int composite) return ss.str(); } -static std::wstring tallGrass2PropsToString(int composite) +static std::wstring double_plantPropsToString(int composite) { int type = composite & 0x7; bool upper = (composite & TallGrass2::UPPER_BIT) != 0; @@ -436,7 +436,7 @@ static std::wstring fenceGatePropsToString(int composite) static std::wstring slabTypeToString(int tileId, int type) { - if (tileId == Tile::woodSlab_Id || tileId == Tile::woodSlabHalf_Id) + if (tileId == Tile::double_wooden_slab_Id || tileId == Tile::wooden_slab_Id) { static const std::wstring typeNames[] = { L"oak", L"spruce", L"birch", L"jungle", L"acacia", L"dark_oak" }; return (type >= 0 && type < 6) ? typeNames[type] : L"unknown"; @@ -460,7 +460,7 @@ static std::wstring slabPropsToString(int tileId, int composite) bool top = (composite & HalfSlabTile::TOP_SLOT_BIT) != 0; std::wstringstream ss; ss << L"type: " << slabTypeToString(tileId, type); - if (tileId == Tile::woodSlabHalf_Id || tileId == Tile::stoneSlabHalf_Id || tileId == Tile::stone_slab2_Id) + if (tileId == Tile::wooden_slab_Id || tileId == Tile::stone_slab_Id || tileId == Tile::stone_slab2_Id) { ss << L"\n"; ss << L"half: " << (top ? L"top" : L"bottom"); @@ -584,7 +584,7 @@ static std::wstring logBlockPropsToString(int tileId, int composite) std::wstring axis = axisToString(composite); std::wstring typeName; - if (tileId == Tile::treeTrunk_Id) + if (tileId == Tile::log_Id) { static const std::wstring typeNames[] = { L"oak", L"spruce", L"birch", L"jungle" }; typeName = (type >= 0 && type < 4) ? typeNames[type] : L"unknown"; @@ -633,8 +633,8 @@ static bool registerDoorDecoder() DecoderFn fn = [](int composite)->std::wstring { return BlockStateDecoder::doorPropsToString(BlockStateDecoder::decodeDoor(composite)); }; - registerDecoder(Tile::door_wood_Id, fn); - registerDecoder(Tile::door_iron_Id, fn); + registerDecoder(Tile::wooden_door_Id, fn); + registerDecoder(Tile::iron_door_Id, fn); registerDecoder(Tile::spruce_door_Id, fn); registerDecoder(Tile::birch_door_Id, fn); registerDecoder(Tile::jungle_door_Id, fn); @@ -665,19 +665,19 @@ static bool registerStairDecoder() return ss.str(); }; - registerDecoder(Tile::stairs_wood_Id, fn); - registerDecoder(Tile::stairs_stone_Id, fn); - registerDecoder(Tile::stairs_bricks_Id, fn); - registerDecoder(Tile::stairs_stoneBrick_Id, fn); - registerDecoder(Tile::stairs_netherBricks_Id, fn); - registerDecoder(Tile::stairs_sandstone_Id, fn); - registerDecoder(Tile::stairs_sprucewood_Id, fn); - registerDecoder(Tile::stairs_birchwood_Id, fn); - registerDecoder(Tile::stairs_junglewood_Id, fn); - registerDecoder(Tile::stairs_quartz_Id, fn); - registerDecoder(Tile::stairs_acaciawood_Id, fn); - registerDecoder(Tile::stairs_darkwood_Id, fn); - registerDecoder(Tile::stairs_red_sandstone_Id, fn); + registerDecoder(Tile::oak_stairs_Id, fn); + registerDecoder(Tile::stone_stairs_Id, fn); + registerDecoder(Tile::brick_stairs_Id, fn); + registerDecoder(Tile::stone_brick_stairs_Id, fn); + registerDecoder(Tile::nether_brick_stairs_Id, fn); + registerDecoder(Tile::sandstone_stairs_Id, fn); + registerDecoder(Tile::spruce_stairs_Id, fn); + registerDecoder(Tile::birch_stairs_Id, fn); + registerDecoder(Tile::jungle_stairs_Id, fn); + registerDecoder(Tile::quartz_stairs_Id, fn); + registerDecoder(Tile::acacia_stairs_Id, fn); + registerDecoder(Tile::dark_oak_stairs_Id, fn); + registerDecoder(Tile::red_sandstone_stairs_Id, fn); return true; } @@ -694,88 +694,88 @@ static bool registerPlantDecoders() registerDecoder(Tile::carrots_Id, ageDecoder); registerDecoder(Tile::potatoes_Id, ageDecoder); registerDecoder(Tile::cactus_Id, ageDecoder); - registerDecoder(Tile::netherStalk_Id, ageDecoder); + registerDecoder(Tile::nether_wart_Id, ageDecoder); registerDecoder(Tile::reeds_Id, ageDecoder); registerDecoder(Tile::bed_Id, [](int composite)->std::wstring { return bedPropsToString(composite); }); registerDecoder(Tile::rail_Id, [](int composite)->std::wstring { return railPropsToString(composite, false); }); - registerDecoder(Tile::goldenRail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); - registerDecoder(Tile::detectorRail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); - registerDecoder(Tile::activatorRail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); + registerDecoder(Tile::golden_rail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); + registerDecoder(Tile::detector_rail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); + registerDecoder(Tile::activator_rail_Id, [](int composite)->std::wstring { return railPropsToString(composite, true); }); registerDecoder(Tile::dispenser_Id, [](int composite)->std::wstring { return dispenserPropsToString(composite); }); registerDecoder(Tile::dropper_Id, [](int composite)->std::wstring { return dispenserPropsToString(composite); }); registerDecoder(Tile::tnt_Id, [](int composite)->std::wstring { return tntPropsToString(composite); }); registerDecoder(Tile::cake_Id, [](int composite)->std::wstring { return cakePropsToString(composite); }); - registerDecoder(Tile::pressurePlate_stone_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); - registerDecoder(Tile::pressurePlate_wood_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); - registerDecoder(Tile::weightedPlate_light_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); - registerDecoder(Tile::weightedPlate_heavy_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); + registerDecoder(Tile::stone_pressure_plate_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); + registerDecoder(Tile::wooden_pressure_plate_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); + registerDecoder(Tile::light_weighted_pressure_plate_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); + registerDecoder(Tile::heavy_weighted_pressure_plate_Id, [](int composite)->std::wstring { return pressurePlatePropsToString(composite); }); registerDecoder(Tile::farmland_Id, [](int composite)->std::wstring { return farmPropsToString(composite); }); registerDecoder(Tile::cocoa_Id, [](int composite)->std::wstring { return cocoaPropsToString(composite); }); - registerDecoder(Tile::brewingStand_Id, [](int composite)->std::wstring { return brewingStandPropsToString(composite); }); + registerDecoder(Tile::brewing_stand_Id, [](int composite)->std::wstring { return brewingStandPropsToString(composite); }); registerDecoder(Tile::fire_Id, [](int composite)->std::wstring { return firePropsToString(composite); }); - registerDecoder(Tile::button_stone_Id, [](int composite)->std::wstring { return buttonPropsToString(composite); }); - registerDecoder(Tile::button_wood_Id, [](int composite)->std::wstring { return buttonPropsToString(composite); }); - registerDecoder(Tile::pumpkinStem_Id, [](int composite)->std::wstring { return stemPropsToString(composite); }); - registerDecoder(Tile::melonStem_Id, [](int composite)->std::wstring { return stemPropsToString(composite); }); + registerDecoder(Tile::stone_button_Id, [](int composite)->std::wstring { return buttonPropsToString(composite); }); + registerDecoder(Tile::wooden_button_Id, [](int composite)->std::wstring { return buttonPropsToString(composite); }); + registerDecoder(Tile::pumpkin_stem_Id, [](int composite)->std::wstring { return stemPropsToString(composite); }); + registerDecoder(Tile::melon_stem_Id, [](int composite)->std::wstring { return stemPropsToString(composite); }); registerDecoder(Tile::vine_Id, [](int composite)->std::wstring { return vinePropsToString(composite); }); - registerDecoder(Tile::flowerPot_Id, [](int composite)->std::wstring { return flowerPotPropsToString(composite); }); + registerDecoder(Tile::flower_pot_Id, [](int composite)->std::wstring { return flowerPotPropsToString(composite); }); registerDecoder(Tile::sapling_Id, [](int composite)->std::wstring { return saplingPropsToString(composite); }); registerDecoder(Tile::tallgrass_Id, [](int composite)->std::wstring { return tallGrassPropsToString(composite); }); - registerDecoder(Tile::tallgrass2_Id, [](int composite)->std::wstring { return tallGrass2PropsToString(composite); }); + registerDecoder(Tile::double_plant_Id, [](int composite)->std::wstring { return double_plantPropsToString(composite); }); registerDecoder(Tile::fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::netherFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::spruceFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::birchFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::jungleFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::darkFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::acaciaFence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); - registerDecoder(Tile::stoneSlab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::stoneSlab_Id, composite); }); - registerDecoder(Tile::stoneSlabHalf_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::stoneSlabHalf_Id, composite); }); - registerDecoder(Tile::woodSlab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::woodSlab_Id, composite); }); - registerDecoder(Tile::woodSlabHalf_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::woodSlabHalf_Id, composite); }); + registerDecoder(Tile::nether_brick_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::spruce_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::birch_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::jungle_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::dark_oak_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::acacia_fence_Id, [](int composite)->std::wstring { return fencePropsToString(composite); }); + registerDecoder(Tile::double_stone_slab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::double_stone_slab_Id, composite); }); + registerDecoder(Tile::stone_slab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::stone_slab_Id, composite); }); + registerDecoder(Tile::double_wooden_slab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::double_wooden_slab_Id, composite); }); + registerDecoder(Tile::wooden_slab_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::wooden_slab_Id, composite); }); registerDecoder(Tile::double_stone_slab2_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::double_stone_slab2_Id, composite); }); registerDecoder(Tile::stone_slab2_Id, [](int composite)->std::wstring { return slabPropsToString(Tile::stone_slab2_Id, composite); }); registerDecoder(Tile::trapdoor_Id, [](int composite)->std::wstring { return trapDoorPropsToString(composite); }); registerDecoder(Tile::iron_trapdoor_Id, [](int composite)->std::wstring { return trapDoorPropsToString(composite); }); - registerDecoder(Tile::tripWire_Id, [](int composite)->std::wstring { return tripWirePropsToString(composite); }); - registerDecoder(Tile::tripWireSource_Id, [](int composite)->std::wstring { return tripWireSourcePropsToString(composite); }); - registerDecoder(Tile::hayBlock_Id, [](int composite)->std::wstring { return hayBlockPropsToString(composite); }); - registerDecoder(Tile::treeTrunk_Id, [](int composite)->std::wstring { return logBlockPropsToString(Tile::treeTrunk_Id, composite); }); - registerDecoder(Tile::tree2Trunk_Id, [](int composite)->std::wstring { return logBlockPropsToString(Tile::tree2Trunk_Id, composite); }); + registerDecoder(Tile::tripwire_Id, [](int composite)->std::wstring { return tripWirePropsToString(composite); }); + registerDecoder(Tile::tripwire_hook_Id, [](int composite)->std::wstring { return tripWireSourcePropsToString(composite); }); + registerDecoder(Tile::hay_block_Id, [](int composite)->std::wstring { return hayBlockPropsToString(composite); }); + registerDecoder(Tile::log_Id, [](int composite)->std::wstring { return logBlockPropsToString(Tile::log_Id, composite); }); + registerDecoder(Tile::log2_Id, [](int composite)->std::wstring { return logBlockPropsToString(Tile::log2_Id, composite); }); registerDecoder(Tile::lever_Id, [](int composite)->std::wstring { return leverPropsToString(composite); }); - registerDecoder(Tile::pistonBase_Id, [](int composite)->std::wstring { return pistonBasePropsToString(composite); }); - registerDecoder(Tile::pistonStickyBase_Id, [](int composite)->std::wstring { return pistonBasePropsToString(composite); }); - registerDecoder(Tile::pistonExtensionPiece_Id, [](int composite)->std::wstring { return pistonExtensionPropsToString(composite); }); - registerDecoder(Tile::endPortalFrameTile_Id, [](int composite)->std::wstring { return endPortalFramePropsToString(composite); }); - registerDecoder(Tile::diode_off_Id, [](int composite)->std::wstring { return repeaterPropsToString(composite, false); }); - registerDecoder(Tile::diode_on_Id, [](int composite)->std::wstring { return repeaterPropsToString(composite, true); }); - registerDecoder(Tile::comparator_off_Id, [](int composite)->std::wstring { return comparatorPropsToString(composite); }); - registerDecoder(Tile::comparator_on_Id, [](int composite)->std::wstring { return comparatorPropsToString(composite); }); - registerDecoder(Tile::redStoneDust_Id, [](int composite)->std::wstring { return redstoneDustPropsToString(composite); }); - registerDecoder(Tile::hugeMushroom_brown_Id, [](int composite)->std::wstring { return hugeMushroomPropsToString(composite); }); - registerDecoder(Tile::hugeMushroom_red_Id, [](int composite)->std::wstring { return hugeMushroomPropsToString(composite); }); + registerDecoder(Tile::piston_Id, [](int composite)->std::wstring { return pistonBasePropsToString(composite); }); + registerDecoder(Tile::sticky_piston_Id, [](int composite)->std::wstring { return pistonBasePropsToString(composite); }); + registerDecoder(Tile::piston_head_Id, [](int composite)->std::wstring { return pistonExtensionPropsToString(composite); }); + registerDecoder(Tile::end_portal_frame_Id, [](int composite)->std::wstring { return endPortalFramePropsToString(composite); }); + registerDecoder(Tile::unpowered_repeater_Id, [](int composite)->std::wstring { return repeaterPropsToString(composite, false); }); + registerDecoder(Tile::powered_repeater_Id, [](int composite)->std::wstring { return repeaterPropsToString(composite, true); }); + registerDecoder(Tile::unpowered_comparator_Id, [](int composite)->std::wstring { return comparatorPropsToString(composite); }); + registerDecoder(Tile::powered_comparator_Id, [](int composite)->std::wstring { return comparatorPropsToString(composite); }); + registerDecoder(Tile::redstone_wire_Id, [](int composite)->std::wstring { return redstoneDustPropsToString(composite); }); + registerDecoder(Tile::brown_mushroom_block_Id, [](int composite)->std::wstring { return hugeMushroomPropsToString(composite); }); + registerDecoder(Tile::red_mushroom_block_Id, [](int composite)->std::wstring { return hugeMushroomPropsToString(composite); }); registerDecoder(Tile::hopper_Id, [](int composite)->std::wstring { return hopperPropsToString(composite); }); registerDecoder(Tile::jukebox_Id, [](int composite)->std::wstring { return jukeboxPropsToString(composite); }); - registerDecoder(Tile::fenceGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::spruceGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::birchGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::jungleGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::darkGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::acaciaGate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); - registerDecoder(Tile::daylightDetector_Id, [](int composite)->std::wstring { return daylightDetectorPropsToString(composite, false); }); - registerDecoder(Tile::invertedDaylightDetector_Id, [](int composite)->std::wstring { return daylightDetectorPropsToString(composite, true); }); + registerDecoder(Tile::fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::spruce_fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::birch_fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::jungle_fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::dark_oak_fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::acacia_fence_gate_Id, [](int composite)->std::wstring { return fenceGatePropsToString(composite); }); + registerDecoder(Tile::daylight_detector_Id, [](int composite)->std::wstring { return daylightDetectorPropsToString(composite, false); }); + registerDecoder(Tile::daylight_detector_inverted_Id, [](int composite)->std::wstring { return daylightDetectorPropsToString(composite, true); }); registerDecoder(Tile::snow_Id, [](int composite)->std::wstring { return snowPropsToString(composite); }); - registerDecoder(Tile::topSnow_Id, [](int composite)->std::wstring { return snowPropsToString(composite); }); + registerDecoder(Tile::snow_layer_Id, [](int composite)->std::wstring { return snowPropsToString(composite); }); registerDecoder(Tile::cauldron_Id, [](int composite)->std::wstring { return cauldronPropsToString(composite); }); registerDecoder(Tile::torch_Id, [](int composite)->std::wstring { return torchPropsToString(composite); }); registerDecoder(Tile::furnace_Id, [](int composite)->std::wstring { return furnacePropsToString(composite); }); - registerDecoder(Tile::furnace_lit_Id, [](int composite)->std::wstring { return furnacePropsToString(composite); }); - registerDecoder(Tile::redStoneOre_Id, [](int composite)->std::wstring { return redstoneOrePropsToString(composite); }); - registerDecoder(Tile::redStoneOre_lit_Id, [](int composite)->std::wstring { return redstoneOrePropsToString(composite); }); - registerDecoder(Tile::redstoneTorch_off_Id, [](int composite)->std::wstring { return redstoneTorchPropsToString(composite); }); - registerDecoder(Tile::redstoneTorch_on_Id, [](int composite)->std::wstring { return redstoneTorchPropsToString(composite); }); - registerDecoder(Tile::redstoneLight_Id, [](int composite)->std::wstring { return redlightPropsToString(composite); }); - registerDecoder(Tile::redstoneLight_lit_Id, [](int composite)->std::wstring { return redlightPropsToString(composite); }); + registerDecoder(Tile::lit_furnace_Id, [](int composite)->std::wstring { return furnacePropsToString(composite); }); + registerDecoder(Tile::redstone_ore_Id, [](int composite)->std::wstring { return redstoneOrePropsToString(composite); }); + registerDecoder(Tile::lit_redstone_ore_Id, [](int composite)->std::wstring { return redstoneOrePropsToString(composite); }); + registerDecoder(Tile::unlit_redstone_torch_Id, [](int composite)->std::wstring { return redstoneTorchPropsToString(composite); }); + registerDecoder(Tile::redstone_torch_Id, [](int composite)->std::wstring { return redstoneTorchPropsToString(composite); }); + registerDecoder(Tile::redstone_lamp_Id, [](int composite)->std::wstring { return redlightPropsToString(composite); }); + registerDecoder(Tile::lit_redstone_lamp_Id, [](int composite)->std::wstring { return redlightPropsToString(composite); }); return true; } diff --git a/Minecraft.World/Boat.cpp b/Minecraft.World/Boat.cpp index 8cb14e1e..3d5ac6e7 100644 --- a/Minecraft.World/Boat.cpp +++ b/Minecraft.World/Boat.cpp @@ -337,7 +337,7 @@ void Boat::tick() remove(); for (int i = 0; i < 3; i++) { - spawnAtLocation(Tile::wood_Id, 1, 0); + spawnAtLocation(Tile::planks_Id, 1, 0); } for (int i = 0; i < 2; i++) { @@ -395,11 +395,11 @@ void Boat::tick() int yy = Mth::floor(y) + j; int tile = level->getTile(xx, yy, zz); - if (tile == Tile::topSnow_Id) + if (tile == Tile::snow_layer_Id) { level->removeTile(xx, yy, zz); } - else if (tile == Tile::waterLily_Id) + else if (tile == Tile::waterlily_Id) { level->destroyTile(xx, yy, zz, true); } diff --git a/Minecraft.World/BoatItem.cpp b/Minecraft.World/BoatItem.cpp index 5cf2cd38..5ae7f744 100644 --- a/Minecraft.World/BoatItem.cpp +++ b/Minecraft.World/BoatItem.cpp @@ -104,7 +104,7 @@ shared_ptr BoatItem::use(shared_ptr itemInstance, Le int yt = hr->y; int zt = hr->z; - if (level->getTile(xt, yt, zt) == Tile::topSnow_Id) yt--; + if (level->getTile(xt, yt, zt) == Tile::snow_layer_Id) yt--; if( level->countInstanceOf(eTYPE_BOAT, true) < Level::MAX_XBOX_BOATS ) // 4J - added limit { shared_ptr boat = std::make_shared(level, xt + 0.5f, yt + 1.0f, zt + 0.5f); diff --git a/Minecraft.World/BrewingStandMenu.cpp b/Minecraft.World/BrewingStandMenu.cpp index d705f220..0bb9aff9 100644 --- a/Minecraft.World/BrewingStandMenu.cpp +++ b/Minecraft.World/BrewingStandMenu.cpp @@ -225,7 +225,7 @@ bool BrewingStandMenu::PotionSlot::mayCombine(shared_ptr second) bool BrewingStandMenu::PotionSlot::mayPlaceItem(shared_ptr item) { - return item != nullptr && (item->id == Item::potion_Id || item->id == Item::glassBottle_Id); + return item != nullptr && (item->id == Item::potion_Id || item->id == Item::glass_bottle_Id); } BrewingStandMenu::IngredientsSlot::IngredientsSlot(shared_ptr container, int slot, int x, int y) : Slot(container, slot, x ,y) @@ -249,7 +249,7 @@ bool BrewingStandMenu::IngredientsSlot::mayPlace(shared_ptr item) } else { - return Item::items[item->id]->hasPotionBrewingFormula() || item->id == Item::netherwart_seeds_Id || item->id == Item::bucket_water_Id; + return Item::items[item->id]->hasPotionBrewingFormula() || item->id == Item::netherwart_seeds_Id || item->id == Item::water_bucket_Id; } } return false; diff --git a/Minecraft.World/BrewingStandTile.cpp b/Minecraft.World/BrewingStandTile.cpp index 24cd1fe2..f66166d5 100644 --- a/Minecraft.World/BrewingStandTile.cpp +++ b/Minecraft.World/BrewingStandTile.cpp @@ -149,12 +149,12 @@ void BrewingStandTile::onRemove(Level *level, int x, int y, int z, int id, int d int BrewingStandTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::brewingStand_Id; + return Item::brewing_stand_Id; } int BrewingStandTile::cloneTileId(Level *level, int x, int y, int z) { - return Item::brewingStand_Id; + return Item::brewing_stand_Id; } bool BrewingStandTile::hasAnalogOutputSignal() diff --git a/Minecraft.World/BrewingStandTileEntity.cpp b/Minecraft.World/BrewingStandTileEntity.cpp index 3d081bae..0e7d2972 100644 --- a/Minecraft.World/BrewingStandTileEntity.cpp +++ b/Minecraft.World/BrewingStandTileEntity.cpp @@ -156,11 +156,11 @@ bool BrewingStandTileEntity::isBrewable() } else { - if (!Item::items[ingredient->id]->hasPotionBrewingFormula() && ingredient->id != Item::bucket_water_Id && ingredient->id != Item::netherwart_seeds_Id) + if (!Item::items[ingredient->id]->hasPotionBrewingFormula() && ingredient->id != Item::water_bucket_Id && ingredient->id != Item::netherwart_seeds_Id) { return false; } - bool isWater = ingredient->id == Item::bucket_water_Id; + bool isWater = ingredient->id == Item::water_bucket_Id; // at least one destination potion must have a result bool oneResult = false; @@ -176,7 +176,7 @@ bool BrewingStandTileEntity::isBrewable() break; } } - else if (isWater && items[dest] != nullptr && items[dest]->id == Item::glassBottle_Id) + else if (isWater && items[dest] != nullptr && items[dest]->id == Item::glass_bottle_Id) { oneResult = true; break; @@ -242,7 +242,7 @@ void BrewingStandTileEntity::doBrew() } else { - bool isWater = ingredient->id == Item::bucket_water_Id; + bool isWater = ingredient->id == Item::water_bucket_Id; for (int dest = 0; dest < 3; dest++) { @@ -252,7 +252,7 @@ void BrewingStandTileEntity::doBrew() int newBrew = NORMALISE_POTION_AUXVAL( applyIngredient(currentBrew, ingredient) ); items[dest]->setAuxValue(newBrew); } - else if (isWater && items[dest] != nullptr && items[dest]->id == Item::glassBottle_Id) + else if (isWater && items[dest] != nullptr && items[dest]->id == Item::glass_bottle_Id) { items[dest] = std::make_shared(Item::potion); } @@ -283,7 +283,7 @@ int BrewingStandTileEntity::applyIngredient(int currentBrew, shared_ptrid == Item::bucket_water_Id) + if (ingredient->id == Item::water_bucket_Id) { return PotionBrewing::applyBrew(currentBrew, PotionBrewing::MOD_WATER); } @@ -428,11 +428,11 @@ bool BrewingStandTileEntity::canPlaceItem(int slot, shared_ptr ite } else { - return Item::items[item->id]->hasPotionBrewingFormula() || item->id == Item::netherwart_seeds_Id || item->id == Item::bucket_water_Id; + return Item::items[item->id]->hasPotionBrewingFormula() || item->id == Item::netherwart_seeds_Id || item->id == Item::water_bucket_Id; } } - return item->id == Item::potion_Id || item->id == Item::glassBottle_Id; + return item->id == Item::potion_Id || item->id == Item::glass_bottle_Id; } void BrewingStandTileEntity::setBrewTime(int value) diff --git a/Minecraft.World/BucketItem.cpp b/Minecraft.World/BucketItem.cpp index f195e4fc..6af2831c 100644 --- a/Minecraft.World/BucketItem.cpp +++ b/Minecraft.World/BucketItem.cpp @@ -141,13 +141,13 @@ shared_ptr BucketItem::use(shared_ptr itemInstance, if (--itemInstance->count <= 0) { - return std::make_shared(Item::bucket_water); + return std::make_shared(Item::water_bucket); } else { - if (!player->inventory->add(std::make_shared(Item::bucket_water))) + if (!player->inventory->add(std::make_shared(Item::water_bucket))) { - player->drop(std::make_shared(Item::bucket_water_Id, 1, 0)); + player->drop(std::make_shared(Item::water_bucket_Id, 1, 0)); } return itemInstance; } @@ -168,13 +168,13 @@ shared_ptr BucketItem::use(shared_ptr itemInstance, } if (--itemInstance->count <= 0) { - return std::make_shared(Item::bucket_lava); + return std::make_shared(Item::lava_bucket); } else { - if (!player->inventory->add(std::make_shared(Item::bucket_lava))) + if (!player->inventory->add(std::make_shared(Item::lava_bucket))) { - player->drop(std::make_shared(Item::bucket_lava_Id, 1, 0)); + player->drop(std::make_shared(Item::lava_bucket_Id, 1, 0)); } return itemInstance; } @@ -183,7 +183,7 @@ shared_ptr BucketItem::use(shared_ptr itemInstance, else if (content < 0) { delete hr; - return std::make_shared(Item::bucket_empty); + return std::make_shared(Item::bucket); } else { @@ -199,7 +199,7 @@ shared_ptr BucketItem::use(shared_ptr itemInstance, if (emptyBucket(level, xt, yt, zt) && !player->abilities.instabuild) { - return std::make_shared(Item::bucket_empty); + return std::make_shared(Item::bucket); } } @@ -217,7 +217,7 @@ bool BucketItem::emptyBucket(Level *level, int xt, int yt, int zt) if (level->isEmptyTile(xt, yt, zt) || nonSolid) { - if (level->dimension->ultraWarm && content == Tile::water_Id) + if (level->dimension->ultraWarm && content == Tile::flowing_water_Id) { level->playSound(xt + 0.5f, yt + 0.5f, zt + 0.5f, eSoundType_RANDOM_FIZZ, 0.5f, 2.6f + (level->random->nextFloat() - level->random->nextFloat()) * 0.8f); diff --git a/Minecraft.World/ButtonTile.cpp b/Minecraft.World/ButtonTile.cpp index e6624a3c..76107cde 100644 --- a/Minecraft.World/ButtonTile.cpp +++ b/Minecraft.World/ButtonTile.cpp @@ -41,7 +41,7 @@ Tile::BlockState ButtonTile::getBlockState(LevelSource *level, int x, int y, int Icon *ButtonTile::getTexture(int face, int data) { - if(id == Tile::button_wood_Id) return Tile::wood->getTexture(Facing::UP); + if(id == Tile::wooden_button_Id) return Tile::wood->getTexture(Facing::UP); else return Tile::stone->getTexture(Facing::UP); } diff --git a/Minecraft.World/CanyonFeature.cpp b/Minecraft.World/CanyonFeature.cpp index d25def53..7645ada1 100644 --- a/Minecraft.World/CanyonFeature.cpp +++ b/Minecraft.World/CanyonFeature.cpp @@ -107,7 +107,7 @@ void CanyonFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArray bloc { int p = (xx * 16 + zz) * Level::genDepth + yy; if (yy < 0 || yy >= Level::genDepth) continue; - if (blocks[p] == Tile::water_Id || blocks[p] == Tile::calmWater_Id) + if (blocks[p] == Tile::flowing_water_Id || blocks[p] == Tile::water_Id) { detectedWater = true; } @@ -141,7 +141,7 @@ void CanyonFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArray bloc { if (yy < 10) { - blocks[p] = static_cast(Tile::lava_Id); + blocks[p] = static_cast(Tile::flowing_lava_Id); } else { diff --git a/Minecraft.World/CarrotOnAStickItem.cpp b/Minecraft.World/CarrotOnAStickItem.cpp index cc39196c..f8b48bee 100644 --- a/Minecraft.World/CarrotOnAStickItem.cpp +++ b/Minecraft.World/CarrotOnAStickItem.cpp @@ -35,7 +35,7 @@ shared_ptr CarrotOnAStickItem::use(shared_ptr itemIn if (itemInstance->count == 0) { - shared_ptr replacement = std::make_shared(Item::fishingRod); + shared_ptr replacement = std::make_shared(Item::fishing_rod); replacement->setTag(itemInstance->tag); return replacement; } diff --git a/Minecraft.World/CarrotTile.cpp b/Minecraft.World/CarrotTile.cpp index 8841e199..a59cbd71 100644 --- a/Minecraft.World/CarrotTile.cpp +++ b/Minecraft.World/CarrotTile.cpp @@ -25,12 +25,12 @@ Icon *CarrotTile::getTexture(int face, int data) int CarrotTile::getBaseSeedId() { - return Item::carrots_Id; + return Item::carrot_Id; } int CarrotTile::getBasePlantId() { - return Item::carrots_Id; + return Item::carrot_Id; } void CarrotTile::registerIcons(IconRegister *iconRegister) diff --git a/Minecraft.World/CauldronTile.cpp b/Minecraft.World/CauldronTile.cpp index 64df67f6..826aea5d 100644 --- a/Minecraft.World/CauldronTile.cpp +++ b/Minecraft.World/CauldronTile.cpp @@ -149,13 +149,13 @@ bool CauldronTile::use(Level *level, int x, int y, int z, shared_ptr pla int currentData = level->getData(x, y, z); int fillLevel = getFillLevel(currentData); - if (item->id == Item::bucket_water_Id) + if (item->id == Item::water_bucket_Id) { if (fillLevel < 3) { if (!player->abilities.instabuild) { - player->inventory->setItem(player->inventory->selected, std::make_shared(Item::bucket_empty)); + player->inventory->setItem(player->inventory->selected, std::make_shared(Item::bucket)); } level->setData(x, y, z, 3, Tile::UPDATE_CLIENTS); @@ -163,7 +163,7 @@ bool CauldronTile::use(Level *level, int x, int y, int z, shared_ptr pla } return true; } - else if (item->id == Item::glassBottle_Id) + else if (item->id == Item::glass_bottle_Id) { if (fillLevel > 0) { diff --git a/Minecraft.World/Chicken.cpp b/Minecraft.World/Chicken.cpp index b5a831ef..1af53bda 100644 --- a/Minecraft.World/Chicken.cpp +++ b/Minecraft.World/Chicken.cpp @@ -37,7 +37,7 @@ Chicken::Chicken(Level *level) : Animal( level ) goalSelector.addGoal(0, new FloatGoal(this)); goalSelector.addGoal(1, new PanicGoal(this, 1.4)); goalSelector.addGoal(2, new BreedGoal(this, 1.0)); - goalSelector.addGoal(3, new TemptGoal(this, 1.0, Item::seeds_wheat_Id, false)); + goalSelector.addGoal(3, new TemptGoal(this, 1.0, Item::wheat_seeds_Id, false)); goalSelector.addGoal(4, new FollowParentGoal(this, 1.1)); goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0)); goalSelector.addGoal(6, new LookAtPlayerGoal(this, typeid(Player), 6)); @@ -131,11 +131,11 @@ void Chicken::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) // and some meat if (this->isOnFire()) { - spawnAtLocation(Item::chicken_cooked_Id, 1); + spawnAtLocation(Item::cooked_chicken_Id, 1); } else { - spawnAtLocation(Item::chicken_raw_Id, 1); + spawnAtLocation(Item::chicken_Id, 1); } } @@ -168,5 +168,5 @@ shared_ptr Chicken::getBreedOffspring(shared_ptr target) bool Chicken::isFood(shared_ptr itemInstance) { - return (itemInstance->id == Item::seeds_wheat_Id) || (itemInstance->id == Item::netherwart_seeds_Id) || (itemInstance->id == Item::seeds_melon_Id) || (itemInstance->id == Item::seeds_pumpkin_Id); + return (itemInstance->id == Item::wheat_seeds_Id) || (itemInstance->id == Item::netherwart_seeds_Id) || (itemInstance->id == Item::melon_seeds_Id) || (itemInstance->id == Item::pumpkin_seeds_Id); } diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index 4662d604..859710ee 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -12,14 +12,14 @@ void ClothDyeRecipes::addRecipes(Recipes *r) { 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)), // + new ItemInstance(Item::dye, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D'); + r->addShapedRecipy(new ItemInstance(Tile::stained_hardened_clay, 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'); + L'X', new ItemInstance(Item::dye, 1, i),L'D'); //#if 0 // r->addShapedRecipy(new ItemInstance(Tile::stained_glass, 8, ColoredTile::getItemAuxValueForTileData(i)), // @@ -28,7 +28,7 @@ void ClothDyeRecipes::addRecipes(Recipes *r) // L"#X#", // L"###", // L'#', new ItemInstance(Tile::glass), -// L'X', new ItemInstance(Item::dye_powder, 1, i), L'D'); +// L'X', new ItemInstance(Item::dye, 1, i), L'D'); // r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, i), // // L"ssczg", // L"###", @@ -38,81 +38,81 @@ void ClothDyeRecipes::addRecipes(Recipes *r) } // some dye recipes - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::YELLOW), L"tg", Tile::flower,L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED), + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::RED), L"tg", Tile::rose,L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE), + r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::WHITE), L"ig", Item::bone,L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::PINK), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::RED), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::ORANGE), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::RED), + new ItemInstance(Item::dye, 1, DyePowderItem::YELLOW),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIME), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::LIME), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::GREEN), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::GRAY), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::GRAY), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLACK), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::SILVER), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::SILVER), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::GRAY), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::GRAY), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::SILVER), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::SILVER), // L"zzzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLACK), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::LIGHT_BLUE), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::CYAN), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::CYAN), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye, 1, DyePowderItem::GREEN),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PURPLE), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::PURPLE), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye, 1, DyePowderItem::RED),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 2, DyePowderItem::MAGENTA), // L"zzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::PURPLE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::PURPLE), + new ItemInstance(Item::dye, 1, DyePowderItem::PINK),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::MAGENTA), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 3, DyePowderItem::MAGENTA), // L"zzzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye, 1, DyePowderItem::RED), + new ItemInstance(Item::dye, 1, DyePowderItem::PINK),L'D'); - r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 4, DyePowderItem::MAGENTA), // + r->addShapelessRecipy(new ItemInstance(Item::dye, 4, DyePowderItem::MAGENTA), // L"zzzzg", - new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), - new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), + new ItemInstance(Item::dye, 1, DyePowderItem::RED), + new ItemInstance(Item::dye, 1, DyePowderItem::RED), + new ItemInstance(Item::dye, 1, DyePowderItem::WHITE),L'D'); for (int i = 0; i < 16; i++) { diff --git a/Minecraft.World/ClothTileItem.cpp b/Minecraft.World/ClothTileItem.cpp index 35f3bb96..e60213da 100644 --- a/Minecraft.World/ClothTileItem.cpp +++ b/Minecraft.World/ClothTileItem.cpp @@ -63,6 +63,6 @@ int ClothTileItem::getLevelDataForAuxValue(int auxValue) unsigned int ClothTileItem::getDescriptionId(shared_ptr instance) { - if(getTileId() == Tile::woolCarpet_Id) return CARPET_COLOR_DESCS[ClothTile::getTileDataForItemAuxValue(instance->getAuxValue())]; + if(getTileId() == Tile::carpet_Id) return CARPET_COLOR_DESCS[ClothTile::getTileDataForItemAuxValue(instance->getAuxValue())]; else return COLOR_DESCS[ClothTile::getTileDataForItemAuxValue(instance->getAuxValue())]; } diff --git a/Minecraft.World/CocoaTile.cpp b/Minecraft.World/CocoaTile.cpp index ddb10067..5385e99a 100644 --- a/Minecraft.World/CocoaTile.cpp +++ b/Minecraft.World/CocoaTile.cpp @@ -88,7 +88,7 @@ bool CocoaTile::canSurvive(Level *level, int x, int y, int z) z += Direction::STEP_Z[dir]; int attachedTo = level->getTile(x, y, z); - return attachedTo == Tile::treeTrunk_Id && TreeTile::getWoodType(level->getData(x, y, z)) == TreeTile::JUNGLE_TRUNK; + return attachedTo == Tile::log_Id && TreeTile::getWoodType(level->getData(x, y, z)) == TreeTile::JUNGLE_TRUNK; } int CocoaTile::getRenderShape() @@ -185,13 +185,13 @@ void CocoaTile::spawnResources(Level *level, int x, int y, int z, int data, floa } for (int i = 0; i < count; i++) { - popResource(level, x, y, z, std::make_shared(Item::dye_powder, 1, DyePowderItem::BROWN)); + popResource(level, x, y, z, std::make_shared(Item::dye, 1, DyePowderItem::BROWN)); } } int CocoaTile::cloneTileId(Level *level, int x, int y, int z) { - return Item::dye_powder_Id; + return Item::dye_Id; } int CocoaTile::cloneTileData(Level *level, int x, int y, int z) diff --git a/Minecraft.World/CommonStats.cpp b/Minecraft.World/CommonStats.cpp index 44d6577c..408074a6 100644 --- a/Minecraft.World/CommonStats.cpp +++ b/Minecraft.World/CommonStats.cpp @@ -109,9 +109,9 @@ Stat *CommonStats::get_itemsUsed(int itemId) { #if (defined _EXTENDED_ACHIEVEMENTS) && (!defined _XBOX_ONE) // 4J-JEV: I've done the same thing here, we can't place these items anyway. - if (itemId == Item::porkChop_cooked_Id) return Stats::blocksPlaced[itemId]; + if (itemId == Item::cooked_porkchop_Id) return Stats::blocksPlaced[itemId]; #endif - if (itemId == Item::porkChop_cooked_Id) return Stats::blocksPlaced[itemId]; + if (itemId == Item::cooked_porkchop_Id) return Stats::blocksPlaced[itemId]; else return nullptr; //return nullptr; } @@ -176,7 +176,7 @@ Stat *CommonStats::get_achievement(eAward achievementId) case eAward_diamonds: return (Stat *) Achievements::diamonds; //case eAward_portal: return (Stat *) nullptr; // TODO case eAward_ghast: return (Stat *) Achievements::ghast; - case eAward_blazeRod: return (Stat *) Achievements::blazeRod; + case eAward_blazeRod: return (Stat *) Achievements::blaze_rod; case eAward_potion: return (Stat *) Achievements::potion; case eAward_theEnd: return (Stat *) Achievements::theEnd; case eAward_winGame: return (Stat *) Achievements::winGame; diff --git a/Minecraft.World/ControlledByPlayerGoal.cpp b/Minecraft.World/ControlledByPlayerGoal.cpp index c5203e6e..d379191c 100644 --- a/Minecraft.World/ControlledByPlayerGoal.cpp +++ b/Minecraft.World/ControlledByPlayerGoal.cpp @@ -117,13 +117,13 @@ void ControlledByPlayerGoal::tick() { shared_ptr carriedItem = player->getCarriedItem(); - if (carriedItem != nullptr && carriedItem->id == Item::carrotOnAStick_Id) + if (carriedItem != nullptr && carriedItem->id == Item::carrot_on_a_stick_Id) { carriedItem->hurtAndBreak(1, player); if (carriedItem->count == 0) { - shared_ptr replacement = std::make_shared(Item::fishingRod); + shared_ptr replacement = std::make_shared(Item::fishing_rod); replacement->setTag(carriedItem->tag); player->inventory->items[player->inventory->selected] = replacement; } diff --git a/Minecraft.World/Cow.cpp b/Minecraft.World/Cow.cpp index 2ecae481..86620892 100644 --- a/Minecraft.World/Cow.cpp +++ b/Minecraft.World/Cow.cpp @@ -94,11 +94,11 @@ void Cow::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { if (isOnFire()) { - spawnAtLocation(Item::beef_cooked_Id, 1); + spawnAtLocation(Item::cooked_beef_Id, 1); } else { - spawnAtLocation(Item::beef_raw_Id, 1); + spawnAtLocation(Item::beef_Id, 1); } } } @@ -106,17 +106,17 @@ void Cow::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) bool Cow::mobInteract(shared_ptr player) { shared_ptr item = player->inventory->getSelected(); - if (item != nullptr && item->id == Item::bucket_empty->id && !player->abilities.instabuild) + if (item != nullptr && item->id == Item::bucket->id && !player->abilities.instabuild) { player->awardStat(GenericStats::cowsMilked(),GenericStats::param_cowsMilked()); if (item->count-- == 0) { - player->inventory->setItem(player->inventory->selected, std::make_shared(Item::bucket_milk)); + player->inventory->setItem(player->inventory->selected, std::make_shared(Item::milk_bucket)); } - else if (!player->inventory->add(std::make_shared(Item::bucket_milk))) + else if (!player->inventory->add(std::make_shared(Item::milk_bucket))) { - player->drop(std::make_shared(Item::bucket_milk)); + player->drop(std::make_shared(Item::milk_bucket)); } return true; diff --git a/Minecraft.World/CraftingMenu.cpp b/Minecraft.World/CraftingMenu.cpp index 88631a63..078032f3 100644 --- a/Minecraft.World/CraftingMenu.cpp +++ b/Minecraft.World/CraftingMenu.cpp @@ -65,7 +65,7 @@ void CraftingMenu::removed(shared_ptr player) bool CraftingMenu::stillValid(shared_ptr player) { - if (level->getTile(x, y, z) != Tile::workBench_Id) return false; + if (level->getTile(x, y, z) != Tile::crafting_table_Id) return false; if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false; return true; } diff --git a/Minecraft.World/Creeper.cpp b/Minecraft.World/Creeper.cpp index dde58894..3b4c8442 100644 --- a/Minecraft.World/Creeper.cpp +++ b/Minecraft.World/Creeper.cpp @@ -144,7 +144,7 @@ void Creeper::die(DamageSource *source) if ( source->getEntity() != nullptr && source->getEntity()->instanceof(eTYPE_SKELETON) ) { - int recordId = Item::record_01_Id + random->nextInt(Item::record_12_Id - Item::record_01_Id + 1); + int recordId = Item::record_13_Id + random->nextInt(Item::record_wait_Id - Item::record_13_Id + 1); spawnAtLocation(recordId, 1); } diff --git a/Minecraft.World/CropTile.cpp b/Minecraft.World/CropTile.cpp index e02f4efe..1c84cc0b 100644 --- a/Minecraft.World/CropTile.cpp +++ b/Minecraft.World/CropTile.cpp @@ -144,7 +144,7 @@ int CropTile::getRenderShape() int CropTile::getBaseSeedId() { - return Item::seeds_wheat_Id; + return Item::wheat_seeds_Id; } int CropTile::getBasePlantId() diff --git a/Minecraft.World/CustomLevelSource.cpp b/Minecraft.World/CustomLevelSource.cpp index de6923e8..ae38f192 100644 --- a/Minecraft.World/CustomLevelSource.cpp +++ b/Minecraft.World/CustomLevelSource.cpp @@ -211,7 +211,7 @@ void CustomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks) } else if (yc * CHUNK_HEIGHT + y < waterHeight) { - tileId = static_cast(Tile::calmWater_Id); + tileId = static_cast(Tile::water_Id); } // 4J - more extra code to make sure that the column at the edge of the world is just water & rock, to match the infinite sea that @@ -221,7 +221,7 @@ void CustomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks) { // This matches code in MultiPlayerChunkCache that makes the geometry which continues at the edge of the world if( yc * CHUNK_HEIGHT + y <= ( level->getSeaLevel() - 10 ) ) tileId = Tile::stone_Id; - else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::calmWater_Id; + else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::water_Id; } int indexY = (yc * CHUNK_HEIGHT + y); @@ -293,7 +293,7 @@ void CustomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks, Bi if (y <= 1 + random->nextInt(2)) // 4J - changed to make the bedrock not have bits you can get stuck in // if (y <= 0 + random->nextInt(5)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); } else { @@ -325,7 +325,7 @@ void CustomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks, Bi if (y < waterHeight && top == 0) { if (temp < 0.15f) top = static_cast(Tile::ice_Id); - else top = static_cast(Tile::calmWater_Id); + else top = static_cast(Tile::water_Id); } run = runDepth; @@ -342,7 +342,7 @@ void CustomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks, Bi if (run == 0 && material == Tile::sand_Id) { run = random->nextInt(4); - material = static_cast(Tile::sandStone_Id); + material = static_cast(Tile::sandstone_Id); } } } @@ -452,10 +452,10 @@ void CustomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) if (level->getHeightmap(xp - 1, zp) > 0 || level->getHeightmap(xp + 1, zp) > 0 || level->getHeightmap(xp, zp - 1) > 0 || level->getHeightmap(xp, zp + 1) > 0) { bool hadWater = false; - if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::calmWater_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::calmWater_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::calmWater_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::calmWater_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::water_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::water_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::water_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::water_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; if (hadWater) { for (int x2 = -5; x2 <= 5; x2++) @@ -467,7 +467,7 @@ void CustomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) if (d <= 5) { d = 6 - d; - if (level->getTile(xp + x2, y, zp + z2) == Tile::calmWater_Id) + if (level->getTile(xp + x2, y, zp + z2) == Tile::water_Id) { int od = level->getData(xp + x2, y, zp + z2); if (od < 7 && od < d) @@ -480,10 +480,10 @@ void CustomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) } if (hadWater) { - level->setTileAndData(xp, y, zp, Tile::calmWater_Id, 7, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y, zp, Tile::water_Id, 7, Tile::UPDATE_CLIENTS); for (int y2 = 0; y2 < y; y2++) { - level->setTileAndData(xp, y2, zp, Tile::calmWater_Id, 8, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y2, zp, Tile::water_Id, 8, Tile::UPDATE_CLIENTS); } } } @@ -534,7 +534,7 @@ void CustomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int y = pprandom->nextInt(Level::maxBuildHeight); int z = zo + pprandom->nextInt(16) + 8; - LakeFeature *calmWater = new LakeFeature(Tile::calmWater_Id); + LakeFeature *calmWater = new LakeFeature(Tile::water_Id); calmWater->place(level, pprandom, x, y, z); delete calmWater; } @@ -548,7 +548,7 @@ void CustomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int z = zo + pprandom->nextInt(16) + 8; if (y < level->seaLevel || pprandom->nextInt(10) == 0) { - LakeFeature *calmLava = new LakeFeature(Tile::calmLava_Id); + LakeFeature *calmLava = new LakeFeature(Tile::lava_Id); calmLava->place(level, pprandom, x, y, z); delete calmLava; } @@ -592,7 +592,7 @@ void CustomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) } if (level->shouldSnow(x + xo, y, z + zo)) { - level->setTileAndData(x + xo, y, z + zo, Tile::topSnow_Id,0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + xo, y, z + zo, Tile::snow_layer_Id,0, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/DaylightDetectorTile.cpp b/Minecraft.World/DaylightDetectorTile.cpp index 8e9bc2da..4c072ae3 100644 --- a/Minecraft.World/DaylightDetectorTile.cpp +++ b/Minecraft.World/DaylightDetectorTile.cpp @@ -116,9 +116,9 @@ bool DaylightDetectorTile::use(Level *level, int x, int y, int z, shared_ptrgetData(x, y, z); if (inverted) - level->setTileAndData(x, y, z, Tile::daylightDetector_Id, data, Tile::UPDATE_INVISIBLE); + level->setTileAndData(x, y, z, Tile::daylight_detector_Id, data, Tile::UPDATE_INVISIBLE); else - level->setTileAndData(x, y, z, Tile::invertedDaylightDetector_Id, data, Tile::UPDATE_INVISIBLE); + level->setTileAndData(x, y, z, Tile::daylight_detector_inverted_Id, data, Tile::UPDATE_INVISIBLE); updateSignalStrength(level, x, y, z); } diff --git a/Minecraft.World/DesertWellFeature.cpp b/Minecraft.World/DesertWellFeature.cpp index 62e19bb8..b5892468 100644 --- a/Minecraft.World/DesertWellFeature.cpp +++ b/Minecraft.World/DesertWellFeature.cpp @@ -33,17 +33,17 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z) { for (int oz = -2; oz <= 2; oz++) { - level->setTileAndData(x + ox, y + oy, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + ox, y + oy, z + oz, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); } } } // place water cross - level->setTileAndData(x, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x - 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x + 1, y, z, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y, z - 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y, z + 1, Tile::water_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::flowing_water_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x - 1, y, z, Tile::flowing_water_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + 1, y, z, Tile::flowing_water_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z - 1, Tile::flowing_water_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z + 1, Tile::flowing_water_Id, 0, Tile::UPDATE_CLIENTS); // place "fence" for (int ox = -2; ox <= 2; ox++) @@ -52,14 +52,14 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z) { if (ox == -2 || ox == 2 || oz == -2 || oz == 2) { - level->setTileAndData(x + ox, y + 1, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + ox, y + 1, z + oz, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); } } } - level->setTileAndData(x + 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); - level->setTileAndData(x - 2, y + 1, z, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y + 1, z + 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); - level->setTileAndData(x, y + 1, z - 2, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + 2, y + 1, z, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); + level->setTileAndData(x - 2, y + 1, z, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y + 1, z + 2, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y + 1, z - 2, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); // place roof for (int ox = -1; ox <= 1; ox++) @@ -68,11 +68,11 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z) { if (ox == 0 && oz == 0) { - level->setTileAndData(x + ox, y + 4, z + oz, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + ox, y + 4, z + oz, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); } else { - level->setTileAndData(x + ox, y + 4, z + oz, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + ox, y + 4, z + oz, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, Tile::UPDATE_CLIENTS); } } } @@ -80,10 +80,10 @@ bool DesertWellFeature::place(Level *level, Random *random, int x, int y, int z) // place pillars for (int oy = 1; oy <= 3; oy++) { - level->setTileAndData(x - 1, y + oy, z - 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x - 1, y + oy, z + 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x + 1, y + oy, z - 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(x + 1, y + oy, z + 1, Tile::sandStone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x - 1, y + oy, z - 1, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x - 1, y + oy, z + 1, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + 1, y + oy, z - 1, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + 1, y + oy, z + 1, Tile::sandstone_Id, 0, Tile::UPDATE_CLIENTS); } return true; diff --git a/Minecraft.World/DiodeTile.cpp b/Minecraft.World/DiodeTile.cpp index b40a5af5..0c88fc0a 100644 --- a/Minecraft.World/DiodeTile.cpp +++ b/Minecraft.World/DiodeTile.cpp @@ -191,7 +191,7 @@ int DiodeTile::getInputSignal(Level *level, int x, int y, int z, int data) int input = level->getSignal(xx, y, zz, Direction::DIRECTION_FACING[dir]); if (input >= Redstone::SIGNAL_MAX) return input; - return max(input, level->getTile(xx, y, zz) == Tile::redStoneDust_Id ? level->getData(xx, y, zz) : Redstone::SIGNAL_NONE); + return max(input, level->getTile(xx, y, zz) == Tile::redstone_wire_Id ? level->getData(xx, y, zz) : Redstone::SIGNAL_NONE); } int DiodeTile::getAlternateSignal(LevelSource *level, int x, int y, int z, int data) @@ -217,7 +217,7 @@ int DiodeTile::getAlternateSignalAt(LevelSource *level, int x, int y, int z, int if (isAlternateInput(tile)) { - if (tile == Tile::redStoneDust_Id) + if (tile == Tile::redstone_wire_Id) { return level->getData(x, y, z); } @@ -309,7 +309,7 @@ int DiodeTile::getOutputSignal(LevelSource *level, int x, int y, int z, int data bool DiodeTile::isDiode(int id) { - return Tile::diode_off->isSameDiode(id) || Tile::comparator_off->isSameDiode(id); + return Tile::unpowered_repeater->isSameDiode(id) || Tile::comparator_off->isSameDiode(id); } bool DiodeTile::isSameDiode(int id) diff --git a/Minecraft.World/DoorInteractGoal.cpp b/Minecraft.World/DoorInteractGoal.cpp index 45805744..97fdf823 100644 --- a/Minecraft.World/DoorInteractGoal.cpp +++ b/Minecraft.World/DoorInteractGoal.cpp @@ -68,6 +68,6 @@ void DoorInteractGoal::tick() DoorTile *DoorInteractGoal::getDoorTile(int x, int y, int z) { int tileId = mob->level->getTile(x, y, z); - if (tileId != Tile::door_wood_Id) return nullptr; + if (tileId != Tile::wooden_door_Id) return nullptr; return static_cast(Tile::tiles[tileId]); } \ No newline at end of file diff --git a/Minecraft.World/DoorItem.cpp b/Minecraft.World/DoorItem.cpp index 7406a2fd..8171ecc1 100644 --- a/Minecraft.World/DoorItem.cpp +++ b/Minecraft.World/DoorItem.cpp @@ -26,13 +26,13 @@ bool DoorItem::useOn(shared_ptr instance, shared_ptr playe Tile *tile; - if (doorType == L"doorWood") tile = Tile::door_wood; - else if (doorType == L"doorIron") tile = Tile::door_iron; - else if (doorType == L"doorSpruce") tile = Tile::door_spruce; - else if (doorType == L"doorBirch") tile = Tile::door_birch; - else if (doorType == L"doorJungle") tile = Tile::door_jungle; - else if (doorType == L"doorAcacia") tile = Tile::door_acacia; - else if (doorType == L"doorDark") tile = Tile::door_dark; + if (doorType == L"doorWood") tile = Tile::wooden_door; + else if (doorType == L"doorIron") tile = Tile::iron_door; + else if (doorType == L"doorSpruce") tile = Tile::spruce_door; + else if (doorType == L"doorBirch") tile = Tile::birch_door; + else if (doorType == L"doorJungle") tile = Tile::jungle_door; + else if (doorType == L"doorAcacia") tile = Tile::acacia_door; + else if (doorType == L"doorDark") tile = Tile::dark_oak_door; if (!player->mayUseItemAt(x, y, z, face, instance) || !player->mayUseItemAt(x, y + 1, z, face, instance)) return false; if (!tile->mayPlace(level, x, y, z)) return false; diff --git a/Minecraft.World/DoorTile.cpp b/Minecraft.World/DoorTile.cpp index 8e351572..bc73f64e 100644 --- a/Minecraft.World/DoorTile.cpp +++ b/Minecraft.World/DoorTile.cpp @@ -9,13 +9,13 @@ #include "net.minecraft.h" static std::map doorItemMap = { - { L"doorWood", Item::door_wood_Id }, - { L"doorIron", Item::door_iron_Id }, - { L"doorSpruce", Item::door_spruce_Id }, - { L"doorBirch", Item::door_birch_Id }, - { L"doorJungle", Item::door_jungle_Id }, - { L"doorAcacia", Item::door_acacia_Id }, - { L"doorDark", Item::door_dark_Id } + { L"doorWood", Item::wooden_door_Id }, + { L"doorIron", Item::iron_door_Id }, + { L"doorSpruce", Item::spruce_door_Id }, + { L"doorBirch", Item::birch_door_Id }, + { L"doorJungle", Item::jungle_door_Id }, + { L"doorAcacia", Item::acacia_door_Id }, + { L"doorDark", Item::dark_oak_door_Id } }; DoorTile::DoorTile(int id, Material *material, const wstring& doorType) : Tile(id, material,isSolidRender()) @@ -180,7 +180,7 @@ void DoorTile::attack(Level *level, int x, int y, int z, shared_ptr play // 4J-PB - Adding a TestUse for tooltip display bool DoorTile::TestUse() { - return id == Tile::door_wood_Id; + return id == Tile::wooden_door_Id; } bool DoorTile::use(Level *level, int x, int y, int z, shared_ptr player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param diff --git a/Minecraft.World/DoublePlantFeature.cpp b/Minecraft.World/DoublePlantFeature.cpp index 7c5a9f6f..506610fa 100644 --- a/Minecraft.World/DoublePlantFeature.cpp +++ b/Minecraft.World/DoublePlantFeature.cpp @@ -30,11 +30,11 @@ bool DoublePlantFeature::place(Level* level, Random* rand, int x, int y, int z) if (level->getTile(bx, by + 1, bz) != 0) continue; - if (!static_cast(Tile::tiles[Tile::tallgrass2_Id])->mayPlace(level, bx, by, bz)) continue; + if (!static_cast(Tile::tiles[Tile::double_plant_Id])->mayPlace(level, bx, by, bz)) continue; - level->setTileAndData(bx, by, bz, Tile::tallgrass2_Id, m_plantType, 0); - level->setTileAndData(bx, by + 1, bz, Tile::tallgrass2_Id, TallGrass2::UPPER_BIT | m_plantType, 0); + level->setTileAndData(bx, by, bz, Tile::double_plant_Id, m_plantType, 0); + level->setTileAndData(bx, by + 1, bz, Tile::double_plant_Id, TallGrass2::UPPER_BIT | m_plantType, 0); placed = true; } diff --git a/Minecraft.World/DungeonFeature.cpp b/Minecraft.World/DungeonFeature.cpp index 8c9abbe5..0941ee9a 100644 --- a/Minecraft.World/DungeonFeature.cpp +++ b/Minecraft.World/DungeonFeature.cpp @@ -110,7 +110,7 @@ void DungeonFeature::addTunnel(int xOffs, int zOffs, byteArray blocks, double xC { int p = (xx * 16 + zz) * Level::genDepth + yy; if (yy < 0 || yy >= Level::genDepth) continue; - if (blocks[p] == Tile::water_Id || blocks[p] == Tile::calmWater_Id) + if (blocks[p] == Tile::flowing_water_Id || blocks[p] == Tile::water_Id) { detectedWater = true; } @@ -142,7 +142,7 @@ void DungeonFeature::addTunnel(int xOffs, int zOffs, byteArray blocks, double xC { if (yy < 10) { - blocks[p] = static_cast(Tile::lava_Id); + blocks[p] = static_cast(Tile::flowing_lava_Id); } else { diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp index 776927cb..97a0e79b 100644 --- a/Minecraft.World/DurangoStats.cpp +++ b/Minecraft.World/DurangoStats.cpp @@ -55,7 +55,7 @@ bool DsItemEvent::onLeaderboard(ELeaderboardId leaderboard, eAcquisitionMethod m switch (param->itemId) { case Tile::dirt_Id: - case Tile::stoneBrick_Id: + case Tile::stonebrick_Id: case Tile::sand_Id: case Tile::stone_Id: case Tile::gravel_Id: @@ -92,13 +92,13 @@ int DsItemEvent::mergeIds(int itemId) case Tile::farmland_Id: return Tile::dirt_Id; - case Tile::redstoneLight_Id: - case Tile::redstoneLight_lit_Id: - return Tile::redstoneLight_Id; + case Tile::redstone_lamp_Id: + case Tile::lit_redstone_lamp_Id: + return Tile::redstone_lamp_Id; - case Tile::redStoneOre_Id: - case Tile::redStoneOre_lit_Id: - return Tile::redStoneOre_Id; + case Tile::redstone_ore_Id: + case Tile::lit_redstone_ore_Id: + return Tile::redstone_ore_Id; } } @@ -769,7 +769,7 @@ Stat* DurangoStats::get_pigOneM() Stat *DurangoStats::get_cowsMilked() { - return get_itemsCrafted(Item::bucket_milk_Id); + return get_itemsCrafted(Item::milk_bucket_Id); } Stat* DurangoStats::get_killMob() @@ -828,14 +828,14 @@ Stat* DurangoStats::get_itemsCrafted(int itemId) { // 4J-JEV: These items can be crafted trivially to and from their block equivalents, // 'Acquire Hardware' also relies on 'Count_Crafted(IronIngot) == Count_Forged(IronIngot)" on the Stats server. - case Item::ironIngot_Id: - case Item::goldIngot_Id: + case Item::iron_ingot_Id: + case Item::gold_ingot_Id: case Item::diamond_Id: - case Item::redStone_Id: + case Item::redstone_Id: case Item::emerald_Id: return nullptr; - case Item::dye_powder_Id: + case Item::dye_Id: default: return (Stat*) itemsAcquired; } @@ -930,7 +930,7 @@ byteArray DurangoStats::getParam_pigOneM(int distance) byteArray DurangoStats::getParam_cowsMilked() { - return DsItemEvent::createParamBlob(DsItemEvent::eAcquisitionMethod_Crafted, Item::bucket_milk_Id, 0, 1); + return DsItemEvent::createParamBlob(DsItemEvent::eAcquisitionMethod_Crafted, Item::milk_bucket_Id, 0, 1); } byteArray DurangoStats::getParam_blocksPlaced(int blockId, int data, int count) diff --git a/Minecraft.World/DyePowderItem.cpp b/Minecraft.World/DyePowderItem.cpp index c857d782..e4a87ddb 100644 --- a/Minecraft.World/DyePowderItem.cpp +++ b/Minecraft.World/DyePowderItem.cpp @@ -144,7 +144,7 @@ bool DyePowderItem::useOn(shared_ptr itemInstance, shared_ptrgetTile(x, y, z); int data = level->getData(x, y, z); - if (tile == Tile::treeTrunk_Id && TreeTile::getWoodType(data) == TreeTile::JUNGLE_TRUNK) + if (tile == Tile::log_Id && TreeTile::getWoodType(data) == TreeTile::JUNGLE_TRUNK) { if (face == 0) return false; if (face == 1) return false; @@ -208,7 +208,7 @@ bool DyePowderItem::growCrop(shared_ptr itemInstance, Level *level } return true; } - else if (tile == Tile::melonStem_Id || tile == Tile::pumpkinStem_Id) + else if (tile == Tile::melon_stem_Id || tile == Tile::pumpkin_stem_Id) { if (level->getData(x, y, z) == 7) return false; if(!bTestUseOnOnly) @@ -296,11 +296,11 @@ bool DyePowderItem::growCrop(shared_ptr itemInstance, Level *level } else if (random->nextInt(3) != 0) { - if (Tile::flower->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::flower_Id); + if (Tile::flower->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::yellow_flower_Id); } else { - if (Tile::rose->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::rose_Id); + if (Tile::rose->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::red_flower_Id); } } diff --git a/Minecraft.World/EnchantmentHelper.cpp b/Minecraft.World/EnchantmentHelper.cpp index bdb4aa76..e02299b3 100644 --- a/Minecraft.World/EnchantmentHelper.cpp +++ b/Minecraft.World/EnchantmentHelper.cpp @@ -36,7 +36,7 @@ int EnchantmentHelper::getEnchantmentLevel(int enchantmentId, shared_ptr *EnchantmentHelper::getEnchantments(shared_ptr item) { unordered_map *result = new unordered_map(); - ListTag *list = item->id == Item::enchantedBook_Id ? Item::enchantedBook->getEnchantments(item) : item->getEnchantmentTags(); + ListTag *list = item->id == Item::enchanted_book_Id ? Item::enchanted_book->getEnchantments(item) : item->getEnchantmentTags(); if (list != nullptr) { @@ -67,15 +67,15 @@ void EnchantmentHelper::setEnchantments(unordered_map *enchantments, s list->add(tag); - if (item->id == Item::enchantedBook_Id) + if (item->id == Item::enchanted_book_Id) { - Item::enchantedBook->addEnchantment(item, new EnchantmentInstance(id, it.second)); + Item::enchanted_book->addEnchantment(item, new EnchantmentInstance(id, it.second)); } } if (list->size() > 0) { - if (item->id != Item::enchantedBook_Id) + if (item->id != Item::enchanted_book_Id) { item->addTagElement(L"ench", list); } @@ -304,7 +304,7 @@ shared_ptr EnchantmentHelper::enchantItem(Random *random, shared_p vector *newEnchantment = EnchantmentHelper::selectEnchantment(random, itemInstance, enchantmentCost); bool isBook = itemInstance->id == Item::book_Id; - if (isBook) itemInstance->id = Item::enchantedBook_Id; + if (isBook) itemInstance->id = Item::enchanted_book_Id; if ( newEnchantment ) { @@ -314,7 +314,7 @@ shared_ptr EnchantmentHelper::enchantItem(Random *random, shared_p { if (isBook) { - Item::enchantedBook->addEnchantment(itemInstance, e); + Item::enchanted_book->addEnchantment(itemInstance, e); } else { diff --git a/Minecraft.World/EnchantmentMenu.cpp b/Minecraft.World/EnchantmentMenu.cpp index 1536bc31..04cf5218 100644 --- a/Minecraft.World/EnchantmentMenu.cpp +++ b/Minecraft.World/EnchantmentMenu.cpp @@ -238,7 +238,7 @@ bool EnchantmentMenu::clickMenuButton(shared_ptr player, int i) { player->giveExperienceLevels(-(i + 1)); - if (isBook) item->id = Item::enchantedBook_Id; + if (isBook) item->id = Item::enchanted_book_Id; int randomIndex = isBook ? random.nextInt(newEnchantment->size()) : -1; for (int index = 0; index < newEnchantment->size(); index++) @@ -246,7 +246,7 @@ bool EnchantmentMenu::clickMenuButton(shared_ptr player, int i) EnchantmentInstance* e = newEnchantment->at(index); if (isBook) { - Item::enchantedBook->addEnchantment(item, e); + Item::enchanted_book->addEnchantment(item, e); en = true; } else @@ -327,7 +327,7 @@ void EnchantmentMenu::removed(shared_ptr player) bool EnchantmentMenu::stillValid(shared_ptr player) { - if (level->getTile(x, y, z) != Tile::enchantTable_Id) return false; + if (level->getTile(x, y, z) != Tile::enchanting_table_Id) return false; if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false; return true; } diff --git a/Minecraft.World/EndPodiumFeature.cpp b/Minecraft.World/EndPodiumFeature.cpp index 7cf742fa..a3b08d60 100644 --- a/Minecraft.World/EndPodiumFeature.cpp +++ b/Minecraft.World/EndPodiumFeature.cpp @@ -33,8 +33,8 @@ bool EndPodiumFeature::place(Level *level, Random *random, int x, int y, int z) } else { - //level->setTile(xx, yy, zz, Tile::unbreakable_Id); - placeBlock(level, xx, yy, zz, Tile::unbreakable_Id, 0); + //level->setTile(xx, yy, zz, Tile::bedrock_Id); + placeBlock(level, xx, yy, zz, Tile::bedrock_Id, 0); } } else if (yy > y) @@ -46,8 +46,8 @@ bool EndPodiumFeature::place(Level *level, Random *random, int x, int y, int z) { if (d > r - 1 - 0.5) { - //level->setTile(xx, yy, zz, Tile::unbreakable_Id); - placeBlock(level, xx, yy, zz, Tile::unbreakable_Id, 0); + //level->setTile(xx, yy, zz, Tile::bedrock_Id); + placeBlock(level, xx, yy, zz, Tile::bedrock_Id, 0); } } } @@ -55,15 +55,15 @@ bool EndPodiumFeature::place(Level *level, Random *random, int x, int y, int z) } } - placeBlock(level,x, y + 0, z, Tile::unbreakable_Id, 0); - placeBlock(level,x, y + 1, z, Tile::unbreakable_Id, 0); - placeBlock(level,x, y + 2, z, Tile::unbreakable_Id, 0); + placeBlock(level,x, y + 0, z, Tile::bedrock_Id, 0); + placeBlock(level,x, y + 1, z, Tile::bedrock_Id, 0); + placeBlock(level,x, y + 2, z, Tile::bedrock_Id, 0); placeBlock(level,x - 1, y + 2, z, Tile::torch_Id, 0); placeBlock(level,x + 1, y + 2, z, Tile::torch_Id, 0); placeBlock(level,x, y + 2, z - 1, Tile::torch_Id, 0); placeBlock(level,x, y + 2, z + 1, Tile::torch_Id, 0); - placeBlock(level,x, y + 3, z, Tile::unbreakable_Id, 0); - //placeBlock(level,x, y + 4, z, Tile::dragonEgg_Id, 0); + placeBlock(level,x, y + 3, z, Tile::bedrock_Id, 0); + //placeBlock(level,x, y + 4, z, Tile::dragon_egg_Id, 0); // 4J-PB - The podium can be floating with nothing under it, so put some whiteStone under it if this is the case for (int yy = y - 5; yy < y - 1; yy++) @@ -74,7 +74,7 @@ bool EndPodiumFeature::place(Level *level, Random *random, int x, int y, int z) { if(level->isEmptyTile(xx,yy,zz)) { - placeBlock(level, xx, yy, zz, Tile::endStone_Id, 0); + placeBlock(level, xx, yy, zz, Tile::end_stone_Id, 0); } } } diff --git a/Minecraft.World/EnderChestTileEntity.cpp b/Minecraft.World/EnderChestTileEntity.cpp index 1ad682ae..457119e7 100644 --- a/Minecraft.World/EnderChestTileEntity.cpp +++ b/Minecraft.World/EnderChestTileEntity.cpp @@ -16,7 +16,7 @@ void EnderChestTileEntity::tick() if (++tickInterval % 20 * 4 == 0) { - level->tileEvent(x, y, z, Tile::enderChest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); + level->tileEvent(x, y, z, Tile::ender_chest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); } oOpenness = openness; @@ -74,13 +74,13 @@ void EnderChestTileEntity::setRemoved() void EnderChestTileEntity::startOpen() { openCount++; - level->tileEvent(x, y, z, Tile::enderChest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); + level->tileEvent(x, y, z, Tile::ender_chest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); } void EnderChestTileEntity::stopOpen() { openCount--; - level->tileEvent(x, y, z, Tile::enderChest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); + level->tileEvent(x, y, z, Tile::ender_chest_Id, ChestTile::EVENT_SET_OPEN_COUNT, openCount); } bool EnderChestTileEntity::stillValid(shared_ptr player) diff --git a/Minecraft.World/EnderDragon.cpp b/Minecraft.World/EnderDragon.cpp index e9cc670f..b31b65fe 100644 --- a/Minecraft.World/EnderDragon.cpp +++ b/Minecraft.World/EnderDragon.cpp @@ -1088,7 +1088,7 @@ bool EnderDragon::checkWalls(AABB *bb) { } - else if (t == Tile::obsidian_Id || t == Tile::endStone_Id || t == Tile::unbreakable_Id || !level->getGameRules()->getBoolean(GameRules::RULE_MOBGRIEFING)) + else if (t == Tile::obsidian_Id || t == Tile::end_stone_Id || t == Tile::bedrock_Id || !level->getGameRules()->getBoolean(GameRules::RULE_MOBGRIEFING)) { hitWall = true; } @@ -1268,7 +1268,7 @@ void EnderDragon::spawnExitPortal(int x, int z) } else { - level->setTileAndUpdate(xx, yy, zz, Tile::unbreakable_Id); + level->setTileAndUpdate(xx, yy, zz, Tile::bedrock_Id); } } else if (yy > y) @@ -1279,11 +1279,11 @@ void EnderDragon::spawnExitPortal(int x, int z) { if (d > r - 1 - 0.5) { - level->setTileAndUpdate(xx, yy, zz, Tile::unbreakable_Id); + level->setTileAndUpdate(xx, yy, zz, Tile::bedrock_Id); } else { - level->setTileAndUpdate(xx, yy, zz, Tile::endPortalTile_Id); + level->setTileAndUpdate(xx, yy, zz, Tile::end_portal_Id); } } } @@ -1291,15 +1291,15 @@ void EnderDragon::spawnExitPortal(int x, int z) } } - level->setTileAndUpdate(x, y + 0, z, Tile::unbreakable_Id); - level->setTileAndUpdate(x, y + 1, z, Tile::unbreakable_Id); - level->setTileAndUpdate(x, y + 2, z, Tile::unbreakable_Id); + level->setTileAndUpdate(x, y + 0, z, Tile::bedrock_Id); + level->setTileAndUpdate(x, y + 1, z, Tile::bedrock_Id); + level->setTileAndUpdate(x, y + 2, z, Tile::bedrock_Id); level->setTileAndUpdate(x - 1, y + 2, z, Tile::torch_Id); level->setTileAndUpdate(x + 1, y + 2, z, Tile::torch_Id); level->setTileAndUpdate(x, y + 2, z - 1, Tile::torch_Id); level->setTileAndUpdate(x, y + 2, z + 1, Tile::torch_Id); - level->setTileAndUpdate(x, y + 3, z, Tile::unbreakable_Id); - level->setTileAndUpdate(x, y + 4, z, Tile::dragonEgg_Id); + level->setTileAndUpdate(x, y + 3, z, Tile::bedrock_Id); + level->setTileAndUpdate(x, y + 4, z, Tile::dragon_egg_Id); // 4J-PB - The podium can be floating with nothing under it, so put some whiteStone under it if this is the case for (int yy = y - 5; yy < y - 1; yy++) @@ -1310,7 +1310,7 @@ void EnderDragon::spawnExitPortal(int x, int z) { if(level->isEmptyTile(xx,yy,zz)) { - level->setTileAndUpdate(xx, yy, zz, Tile::endStone_Id); + level->setTileAndUpdate(xx, yy, zz, Tile::end_stone_Id); } } } diff --git a/Minecraft.World/EnderEyeItem.cpp b/Minecraft.World/EnderEyeItem.cpp index 25b16d05..6027c368 100644 --- a/Minecraft.World/EnderEyeItem.cpp +++ b/Minecraft.World/EnderEyeItem.cpp @@ -18,12 +18,12 @@ bool EnderEyeItem::useOn(shared_ptr instance, shared_ptr p int targetType = level->getTile(x, y, z); int targetData = level->getData(x, y, z); - if (player->mayUseItemAt(x, y, z, face, instance) && targetType == Tile::endPortalFrameTile_Id && !TheEndPortalFrameTile::hasEye(targetData)) + if (player->mayUseItemAt(x, y, z, face, instance) && targetType == Tile::end_portal_frame_Id && !TheEndPortalFrameTile::hasEye(targetData)) { if(bTestUseOnOnly) return true; if (level->isClientSide) return true; level->setData(x, y, z, targetData + TheEndPortalFrameTile::EYE_BIT, Tile::UPDATE_CLIENTS); - level->updateNeighbourForOutputSignal(x, y, z, Tile::endPortalFrameTile_Id); + level->updateNeighbourForOutputSignal(x, y, z, Tile::end_portal_frame_Id); instance->count--; for (int i = 0; i < 16; i++) @@ -53,7 +53,7 @@ bool EnderEyeItem::useOn(shared_ptr instance, shared_ptr p int testZ = z + Direction::STEP_Z[rightHandDirection] * offset; int tile = level->getTile(testX, y, testZ); - if (tile == Tile::endPortalFrameTile->id) + if (tile == Tile::end_portal_frame->id) { int data = level->getData(testX, y, testZ); if (!TheEndPortalFrameTile::hasEye(data)) @@ -84,7 +84,7 @@ bool EnderEyeItem::useOn(shared_ptr instance, shared_ptr p int tile = level->getTile(testX, y, testZ); int data = level->getData(testX, y, testZ); - if (tile != Tile::endPortalFrameTile_Id || !TheEndPortalFrameTile::hasEye(data)) + if (tile != Tile::end_portal_frame_Id || !TheEndPortalFrameTile::hasEye(data)) { valid = false; break; @@ -102,7 +102,7 @@ bool EnderEyeItem::useOn(shared_ptr instance, shared_ptr p int tile = level->getTile(testX, y, testZ); int data = level->getData(testX, y, testZ); - if (tile != Tile::endPortalFrameTile_Id || !TheEndPortalFrameTile::hasEye(data)) + if (tile != Tile::end_portal_frame_Id || !TheEndPortalFrameTile::hasEye(data)) { valid = false; break; @@ -122,7 +122,7 @@ bool EnderEyeItem::useOn(shared_ptr instance, shared_ptr p targetX += Direction::STEP_X[direction] * pz; targetZ += Direction::STEP_Z[direction] * pz; - level->setTileAndData(targetX, y, targetZ, Tile::endPortalTile_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(targetX, y, targetZ, Tile::end_portal_Id, 0, Tile::UPDATE_CLIENTS); } } } @@ -140,7 +140,7 @@ bool EnderEyeItem::TestUse(shared_ptr itemInstance, Level *level, { int tile = level->getTile(hr->x, hr->y, hr->z); delete hr; - if (tile == Tile::endPortalFrameTile_Id) + if (tile == Tile::end_portal_frame_Id) { return false; } @@ -193,7 +193,7 @@ shared_ptr EnderEyeItem::use(shared_ptr instance, Le { int tile = level->getTile(hr->x, hr->y, hr->z); delete hr; - if (tile == Tile::endPortalFrameTile_Id) + if (tile == Tile::end_portal_frame_Id) { return instance; } diff --git a/Minecraft.World/EnderMan.cpp b/Minecraft.World/EnderMan.cpp index 108c5a90..7c69f3c4 100644 --- a/Minecraft.World/EnderMan.cpp +++ b/Minecraft.World/EnderMan.cpp @@ -27,16 +27,16 @@ void EnderMan::staticCtor() MAY_TAKE[Tile::dirt_Id] = true; MAY_TAKE[Tile::sand_Id] = true; MAY_TAKE[Tile::gravel_Id] = true; - MAY_TAKE[Tile::flower_Id] = true; - MAY_TAKE[Tile::rose_Id] = true; + MAY_TAKE[Tile::yellow_flower_Id] = true; + MAY_TAKE[Tile::red_flower_Id] = true; MAY_TAKE[Tile::mushroom_brown_Id] = true; MAY_TAKE[Tile::mushroom_red_Id] = true; MAY_TAKE[Tile::tnt_Id] = true; MAY_TAKE[Tile::cactus_Id] = true; MAY_TAKE[Tile::clay_Id] = true; MAY_TAKE[Tile::pumpkin_Id] = true; - MAY_TAKE[Tile::melon_Id] = true; - MAY_TAKE[Tile::mycel_Id] = true; + MAY_TAKE[Tile::melon_block_Id] = true; + MAY_TAKE[Tile::mycelium_Id] = true; } EnderMan::EnderMan(Level *level) : Monster( level ) @@ -392,7 +392,7 @@ int EnderMan::getDeathSound() int EnderMan::getDeathLoot() { - return Item::enderPearl_Id; + return Item::ender_pearl_Id; } void EnderMan::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) diff --git a/Minecraft.World/Entity.cpp b/Minecraft.World/Entity.cpp index a275448d..88f06855 100644 --- a/Minecraft.World/Entity.cpp +++ b/Minecraft.World/Entity.cpp @@ -1011,7 +1011,7 @@ void Entity::playStepSound(int xt, int yt, int zt, int t) } } - if (level->getTile(xt, yt + 1, zt) == Tile::topSnow_Id) + if (level->getTile(xt, yt + 1, zt) == Tile::snow_layer_Id) { soundType = Tile::topSnow->soundType; playSound(soundType->getStepSound(), soundType->getVolume() * 0.15f, soundType->getPitch()); diff --git a/Minecraft.World/EntityHorse.cpp b/Minecraft.World/EntityHorse.cpp index 0c840d60..949fd455 100644 --- a/Minecraft.World/EntityHorse.cpp +++ b/Minecraft.World/EntityHorse.cpp @@ -263,15 +263,15 @@ int EntityHorse::getArmorTypeForItem(shared_ptr armorItem) { return ARMOR_NONE; } - if (armorItem->id == Item::horseArmorMetal_Id) + if (armorItem->id == Item::iron_horse_armor_Id) { return ARMOR_IRON; } - else if (armorItem->id == Item::horseArmorGold_Id) + else if (armorItem->id == Item::golden_horse_armor_Id) { return ARMOR_GOLD; } - else if (armorItem->id == Item::horseArmorDiamond_Id) + else if (armorItem->id == Item::diamond_horse_armor_Id) { return ARMOR_DIAMOND; } @@ -668,7 +668,7 @@ int EntityHorse::getMadSound() void EntityHorse::playStepSound(int xt, int yt, int zt, int t) { const Tile::SoundType *soundType = Tile::tiles[t]->soundType; - if (level->getTile(xt, yt + 1, zt) == Tile::topSnow_Id) + if (level->getTile(xt, yt + 1, zt) == Tile::snow_layer_Id) { soundType = Tile::topSnow->soundType; } @@ -815,7 +815,7 @@ bool EntityHorse::mobInteract(shared_ptr player) { shared_ptr itemstack = player->inventory->getSelected(); - if (itemstack != nullptr && itemstack->id == Item::spawnEgg_Id) + if (itemstack != nullptr && itemstack->id == Item::spawn_egg_Id) { return Animal::mobInteract(player); } @@ -848,15 +848,15 @@ bool EntityHorse::mobInteract(shared_ptr player) { int armorType = -1; - if (itemstack->id == Item::horseArmorMetal_Id) + if (itemstack->id == Item::iron_horse_armor_Id) { armorType = ARMOR_IRON; } - else if (itemstack->id == Item::horseArmorGold_Id) + else if (itemstack->id == Item::golden_horse_armor_Id) { armorType = ARMOR_GOLD; } - else if (itemstack->id == Item::horseArmorDiamond_Id) + else if (itemstack->id == Item::diamond_horse_armor_Id) { armorType = ARMOR_DIAMOND; } @@ -897,7 +897,7 @@ bool EntityHorse::mobInteract(shared_ptr player) _ageUp = 180; temper = 3; } - else if (itemstack->id == Tile::hayBlock_Id) + else if (itemstack->id == Tile::hay_block_Id) { _heal = 20; _ageUp = 180; @@ -908,7 +908,7 @@ bool EntityHorse::mobInteract(shared_ptr player) _ageUp = 60; temper = 3; } - else if (itemstack->id == Item::carrotGolden_Id) + else if (itemstack->id == Item::golden_carrot_Id) { _heal = 4; _ageUp = 60; @@ -919,7 +919,7 @@ bool EntityHorse::mobInteract(shared_ptr player) setInLove(); } } - else if (itemstack->id == Item::apple_gold_Id) + else if (itemstack->id == Item::golden_apple_Id) { _heal = 10; _ageUp = 240; @@ -1836,7 +1836,7 @@ EntityHorse::HorseGroupData::HorseGroupData(int type, int variant) bool EntityHorse::isHorseArmor(int itemId) { - return itemId == Item::horseArmorMetal_Id || itemId == Item::horseArmorGold_Id || itemId == Item::horseArmorDiamond_Id; + return itemId == Item::iron_horse_armor_Id || itemId == Item::golden_horse_armor_Id || itemId == Item::diamond_horse_armor_Id; } bool EntityHorse::onLadder() diff --git a/Minecraft.World/ExtremeHillsBiome.cpp b/Minecraft.World/ExtremeHillsBiome.cpp index 87be6845..2720cb91 100644 --- a/Minecraft.World/ExtremeHillsBiome.cpp +++ b/Minecraft.World/ExtremeHillsBiome.cpp @@ -15,7 +15,7 @@ ExtremeHillsBiome::ExtremeHillsBiome(int id) : ExtremeHillsBiome(id, false) ExtremeHillsBiome::ExtremeHillsBiome(int id, bool extraTrees) : Biome(id) { - silverfishFeature = new OreFeature(Tile::monsterStoneEgg_Id, 9); + silverfishFeature = new OreFeature(Tile::monster_egg_Id, 9); taigaFeature = new SpruceFeature(false); @@ -61,7 +61,7 @@ void ExtremeHillsBiome::decorate(Level* level, Random* random, int xo, int zo) int tile = level->getTile(x, y, z); if (tile == Tile::stone_Id) { - level->setTileAndData(x, y, z, Tile::emeraldOre_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::emerald_ore_Id, 0, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/EyeOfEnderSignal.cpp b/Minecraft.World/EyeOfEnderSignal.cpp index ca76b272..37ac6c37 100644 --- a/Minecraft.World/EyeOfEnderSignal.cpp +++ b/Minecraft.World/EyeOfEnderSignal.cpp @@ -163,7 +163,7 @@ void EyeOfEnderSignal::tick() remove(); if (surviveAfterDeath) { - level->addEntity(std::make_shared(level, x, y, z, shared_ptr(new ItemInstance(Item::eyeOfEnder)))); + level->addEntity(std::make_shared(level, x, y, z, shared_ptr(new ItemInstance(Item::eye_of_ender)))); } else { diff --git a/Minecraft.World/FallingTile.cpp b/Minecraft.World/FallingTile.cpp index 0ff776fd..7e793c31 100644 --- a/Minecraft.World/FallingTile.cpp +++ b/Minecraft.World/FallingTile.cpp @@ -126,7 +126,7 @@ void FallingTile::tick() zd *= 0.7f; yd *= -0.5f; - if (level->getTile(xt, yt, zt) != Tile::pistonMovingPiece_Id) + if (level->getTile(xt, yt, zt) != Tile::piston_extension_Id) { remove(); if (!cancelDrop && level->mayPlace(tile, xt, yt, zt, true, 1, nullptr, nullptr) && !HeavyTile::isFree(level, xt, yt - 1, zt) && level->setTileAndData(xt, yt, zt, tile, data, Tile::UPDATE_ALL)) diff --git a/Minecraft.World/FarmTile.cpp b/Minecraft.World/FarmTile.cpp index 66aff7d9..608b6ebd 100644 --- a/Minecraft.World/FarmTile.cpp +++ b/Minecraft.World/FarmTile.cpp @@ -131,7 +131,7 @@ bool FarmTile::isUnderCrops(Level *level, int x, int y, int z) for (int zz = z - r; zz <= z + r; zz++) { int tile = level->getTile(xx, y + 1, zz); - if (tile == Tile::wheat_Id || tile == Tile::melonStem_Id || tile == Tile::pumpkinStem_Id || tile == Tile::potatoes_Id || tile == Tile::carrots_Id) + if (tile == Tile::wheat_Id || tile == Tile::melon_stem_Id || tile == Tile::pumpkin_stem_Id || tile == Tile::potatoes_Id || tile == Tile::carrots_Id) { return true; } diff --git a/Minecraft.World/FenceGateTile.cpp b/Minecraft.World/FenceGateTile.cpp index 2caf2711..39584442 100644 --- a/Minecraft.World/FenceGateTile.cpp +++ b/Minecraft.World/FenceGateTile.cpp @@ -43,13 +43,13 @@ Tile::BlockState FenceGateTile::getBlockState(LevelSource *level, int x, int y, { int westTile = level->getTile(x - 1, y, z); int eastTile = level->getTile(x + 1, y, z); - inWall = (westTile == Tile::cobbleWall_Id) || (eastTile == Tile::cobbleWall_Id); + inWall = (westTile == Tile::cobblestone_wall_Id) || (eastTile == Tile::cobblestone_wall_Id); } else { int northTile = level->getTile(x, y, z - 1); int southTile = level->getTile(x, y, z + 1); - inWall = (northTile == Tile::cobbleWall_Id) || (southTile == Tile::cobbleWall_Id); + inWall = (northTile == Tile::cobblestone_wall_Id) || (southTile == Tile::cobblestone_wall_Id); } if (inWall) @@ -78,13 +78,13 @@ void FenceGateTile::fillVirtualBlockStateProperties(Tile::BlockState *state, Lev { int westTile = level->getTile(x - 1, y, z); int eastTile = level->getTile(x + 1, y, z); - inWall = (westTile == Tile::cobbleWall_Id) || (eastTile == Tile::cobbleWall_Id); + inWall = (westTile == Tile::cobblestone_wall_Id) || (eastTile == Tile::cobblestone_wall_Id); } else { int northTile = level->getTile(x, y, z - 1); int southTile = level->getTile(x, y, z + 1); - inWall = (northTile == Tile::cobbleWall_Id) || (southTile == Tile::cobbleWall_Id); + inWall = (northTile == Tile::cobblestone_wall_Id) || (southTile == Tile::cobblestone_wall_Id); } if (inWall) diff --git a/Minecraft.World/FenceTile.cpp b/Minecraft.World/FenceTile.cpp index e5e3ca2c..33c32aa8 100644 --- a/Minecraft.World/FenceTile.cpp +++ b/Minecraft.World/FenceTile.cpp @@ -42,8 +42,8 @@ Tile::BlockState FenceTile::getBlockState(LevelSource *level, int x, int y, int } static const int fences[] = { - Tile::fence_Id, Tile::netherFence_Id, Tile::spruceFence_Id, - Tile::birchFence_Id, Tile::jungleFence_Id, Tile::acaciaFence_Id, Tile::darkFence_Id + Tile::fence_Id, Tile::nether_brick_fence_Id, Tile::spruce_fence_Id, + Tile::birch_fence_Id, Tile::jungle_fence_Id, Tile::acacia_fence_Id, Tile::dark_oak_fence_Id }; void FenceTile::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr source) diff --git a/Minecraft.World/FireTile.cpp b/Minecraft.World/FireTile.cpp index e7b81e4a..dd06f353 100644 --- a/Minecraft.World/FireTile.cpp +++ b/Minecraft.World/FireTile.cpp @@ -75,25 +75,25 @@ Tile::BlockState FireTile::getBlockState(LevelSource *level, int x, int y, int z void FireTile::init() { - setFlammable(Tile::wood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::woodSlab_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::woodSlabHalf_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::planks_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::double_wooden_slab_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::wooden_slab_Id, FLAME_HARD, BURN_MEDIUM); setFlammable(Tile::fence_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_wood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_birchwood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_sprucewood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_junglewood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_acaciawood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::stairs_darkwood_Id, FLAME_HARD, BURN_MEDIUM); - setFlammable(Tile::treeTrunk_Id, FLAME_HARD, BURN_HARD); + setFlammable(Tile::oak_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::birch_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::spruce_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::jungle_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::acacia_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::dark_oak_stairs_Id, FLAME_HARD, BURN_MEDIUM); + setFlammable(Tile::log_Id, FLAME_HARD, BURN_HARD); setFlammable(Tile::leaves_Id, FLAME_EASY, BURN_EASY); setFlammable(Tile::bookshelf_Id, FLAME_EASY, BURN_MEDIUM); setFlammable(Tile::tnt_Id, FLAME_MEDIUM, BURN_INSTANT); setFlammable(Tile::tallgrass_Id, FLAME_INSTANT, BURN_INSTANT); setFlammable(Tile::wool_Id, FLAME_EASY, BURN_EASY); setFlammable(Tile::vine_Id, FLAME_MEDIUM, BURN_INSTANT); - setFlammable(Tile::coalBlock_Id, FLAME_HARD, BURN_HARD); - setFlammable(Tile::hayBlock_Id, FLAME_INSTANT, BURN_MEDIUM); + setFlammable(Tile::coal_block_Id, FLAME_HARD, BURN_HARD); + setFlammable(Tile::hay_block_Id, FLAME_INSTANT, BURN_MEDIUM); } void FireTile::setFlammable(int id, int flame, int burn) @@ -158,10 +158,10 @@ void FireTile::tick(Level *level, int x, int y, int z, Random *random) } - bool infiniBurn = level->getTile(x, y - 1, z) == Tile::netherRack_Id; + bool infiniBurn = level->getTile(x, y - 1, z) == Tile::netherrack_Id; if (level->dimension->id == 1) // 4J - was == instanceof TheEndDimension { - if (level->getTile(x, y - 1, z) == Tile::unbreakable_Id) infiniBurn = true; + if (level->getTile(x, y - 1, z) == Tile::bedrock_Id) infiniBurn = true; } if (!mayPlace(level, x, y, z)) diff --git a/Minecraft.World/FireworksRecipe.cpp b/Minecraft.World/FireworksRecipe.cpp index c4a9ca80..c2a29be1 100644 --- a/Minecraft.World/FireworksRecipe.cpp +++ b/Minecraft.World/FireworksRecipe.cpp @@ -66,11 +66,11 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l { sulphurCount++; } - else if (item->id == Item::fireworksCharge_Id) + else if (item->id == Item::firework_charge_Id) { chargeCount++; } - else if (item->id == Item::dye_powder_Id) + else if (item->id == Item::dye_Id) { colorCount++; } @@ -78,7 +78,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l { paperCount++; } - else if (item->id == Item::yellowDust_Id) + else if (item->id == Item::glowstone_dust_Id) { // glowstone dust gives flickering chargeComponents++; @@ -88,7 +88,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l // diamonds give trails chargeComponents++; } - else if (item->id == Item::fireball_Id) + else if (item->id == Item::fire_charge_Id) { // fireball gives larger explosion typeComponents++; @@ -98,7 +98,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l // burst typeComponents++; } - else if (item->id == Item::goldNugget_Id) + else if (item->id == Item::gold_nugget_Id) { // star typeComponents++; @@ -135,7 +135,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l for (int slot = 0; slot < craftSlots->getContainerSize(); slot++) { shared_ptr item = craftSlots->getItem(slot); - if (item == nullptr || item->id != Item::fireworksCharge_Id) continue; + if (item == nullptr || item->id != Item::firework_charge_Id) continue; if (item->hasTag() && item->getTag()->contains(FireworksItem::TAG_EXPLOSION)) { @@ -156,7 +156,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l if (sulphurCount == 1 && paperCount == 0 && chargeCount == 0 && colorCount > 0 && typeComponents <= 1) { - resultItem = std::make_shared(Item::fireworksCharge); + resultItem = std::make_shared(Item::firework_charge); CompoundTag *itemTag = new CompoundTag(); CompoundTag *expTag = new CompoundTag(FireworksItem::TAG_EXPLOSION); @@ -168,11 +168,11 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l shared_ptr item = craftSlots->getItem(slot); if (item == nullptr) continue; - if (item->id == Item::dye_powder_Id) + if (item->id == Item::dye_Id) { colors.push_back(DyePowderItem::COLOR_RGB[item->getAuxValue()]); } - else if (item->id == Item::yellowDust_Id) + else if (item->id == Item::glowstone_dust_Id) { // glowstone dust gives flickering expTag->putBoolean(FireworksItem::TAG_E_FLICKER, true); @@ -182,7 +182,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l // diamonds give trails expTag->putBoolean(FireworksItem::TAG_E_TRAIL, true); } - else if (item->id == Item::fireball_Id) + else if (item->id == Item::fire_charge_Id) { type = FireworksItem::TYPE_BIG; } @@ -190,7 +190,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l { type = FireworksItem::TYPE_BURST; } - else if (item->id == Item::goldNugget_Id) + else if (item->id == Item::gold_nugget_Id) { type = FireworksItem::TYPE_STAR; } @@ -224,11 +224,11 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l shared_ptr item = craftSlots->getItem(slot); if (item == nullptr) continue; - if (item->id == Item::dye_powder_Id) + if (item->id == Item::dye_Id) { colors.push_back(DyePowderItem::COLOR_RGB[item->getAuxValue()]); } - else if (item->id == Item::fireworksCharge_Id) + else if (item->id == Item::firework_charge_Id) { resultItem = item->copy(); resultItem->count = 1; @@ -310,11 +310,11 @@ void FireworksRecipe::updatePossibleRecipes(shared_ptr craftS { sulphurCount++; } - else if (item->id == Item::fireworksCharge_Id) + else if (item->id == Item::firework_charge_Id) { chargeCount++; } - else if (item->id == Item::dye_powder_Id) + else if (item->id == Item::dye_Id) { colorCount++; } @@ -322,7 +322,7 @@ void FireworksRecipe::updatePossibleRecipes(shared_ptr craftS { paperCount++; } - else if (item->id == Item::yellowDust_Id) + else if (item->id == Item::glowstone_dust_Id) { // glowstone dust gives flickering chargeComponents++; @@ -332,7 +332,7 @@ void FireworksRecipe::updatePossibleRecipes(shared_ptr craftS // diamonds give trails chargeComponents++; } - else if (item->id == Item::fireball_Id) + else if (item->id == Item::fire_charge_Id) { // fireball gives larger explosion typeComponents++; @@ -342,7 +342,7 @@ void FireworksRecipe::updatePossibleRecipes(shared_ptr craftS // burst typeComponents++; } - else if (item->id == Item::goldNugget_Id) + else if (item->id == Item::gold_nugget_Id) { // star typeComponents++; @@ -389,28 +389,28 @@ bool FireworksRecipe::isValidIngredient(shared_ptr item, bool fire case Item::gunpowder_Id: valid = firework || charge; break; - case Item::fireworksCharge_Id: + case Item::firework_charge_Id: valid = firework || fade; break; - case Item::dye_powder_Id: + case Item::dye_Id: valid = charge || fade; break; case Item::paper_Id: valid = firework; break; - case Item::yellowDust_Id: + case Item::glowstone_dust_Id: valid = charge; break; case Item::diamond_Id: valid = charge; break; - case Item::fireball_Id: + case Item::fire_charge_Id: valid = charge; break; case Item::feather_Id: valid = charge; break; - case Item::goldNugget_Id: + case Item::gold_nugget_Id: valid = charge; break; case Item::skull_Id: diff --git a/Minecraft.World/FishingHelper.cpp b/Minecraft.World/FishingHelper.cpp index 518b76d0..3418b271 100644 --- a/Minecraft.World/FishingHelper.cpp +++ b/Minecraft.World/FishingHelper.cpp @@ -17,27 +17,27 @@ FishingHelper::FishingHelper() : fishingFishArray(4), fishingJunkArray(11), fish { fishingTreasuresArray[0] = new CatchWeighedItem(Item::bow_Id, 1, 0, 1); fishingTreasuresArray[1] = new CatchWeighedItem(Item::book_Id, 1, 0, 1); - fishingTreasuresArray[2] = new CatchWeighedItem(Item::fishingRod_Id, 1, 0, 1); - fishingTreasuresArray[3] = new CatchWeighedItem(Item::nameTag_Id, 1, 0, 1); + fishingTreasuresArray[2] = new CatchWeighedItem(Item::fishing_rod_Id, 1, 0, 1); + fishingTreasuresArray[3] = new CatchWeighedItem(Item::name_tag_Id, 1, 0, 1); fishingTreasuresArray[4] = new CatchWeighedItem(Item::saddle_Id, 1, 0, 1); - fishingTreasuresArray[5] = new CatchWeighedItem(Tile::waterLily_Id, 1, 0, 1); + fishingTreasuresArray[5] = new CatchWeighedItem(Tile::waterlily_Id, 1, 0, 1); - fishingFishArray[0] = new CatchWeighedItem(Item::fish_raw_Id, 1, 0, 60); // Fish - fishingFishArray[1] = new CatchWeighedItem(Item::fish_raw_Id, 1, 1, 25); // Salmon - fishingFishArray[2] = new CatchWeighedItem(Item::fish_raw_Id, 1, 2, 2); // Clownfish - fishingFishArray[3] = new CatchWeighedItem(Item::fish_raw_Id, 1, 3, 13); // Pufferfish + fishingFishArray[0] = new CatchWeighedItem(Item::fish_Id, 1, 0, 60); // Fish + fishingFishArray[1] = new CatchWeighedItem(Item::fish_Id, 1, 1, 25); // Salmon + fishingFishArray[2] = new CatchWeighedItem(Item::fish_Id, 1, 2, 2); // Clownfish + fishingFishArray[3] = new CatchWeighedItem(Item::fish_Id, 1, 3, 13); // Pufferfish fishingJunkArray[0] = new CatchWeighedItem(Item::leather_Id, 1, 0, 10); fishingJunkArray[1] = new CatchWeighedItem(Item::bone_Id, 1, 0, 10); fishingJunkArray[2] = new CatchWeighedItem(Item::potion_Id, 1, 0, 10); // Water bottle fishingJunkArray[3] = new CatchWeighedItem(Item::bowl_Id, 1, 0, 10); - fishingJunkArray[4] = new CatchWeighedItem(Item::boots_leather_Id, 1, 0, 10); + fishingJunkArray[4] = new CatchWeighedItem(Item::leather_boots_Id, 1, 0, 10); fishingJunkArray[5] = new CatchWeighedItem(Item::rotten_flesh_Id, 1, 0, 10); - fishingJunkArray[6] = new CatchWeighedItem(Tile::tripWireSource_Id, 1, 0, 10); + fishingJunkArray[6] = new CatchWeighedItem(Tile::tripwire_hook_Id, 1, 0, 10); fishingJunkArray[7] = new CatchWeighedItem(Item::stick_Id, 1, 0, 5); fishingJunkArray[8] = new CatchWeighedItem(Item::string_Id, 1, 0, 5); - fishingJunkArray[9] = new CatchWeighedItem(Item::fishingRod_Id, 1, 0, 2); - fishingJunkArray[10] = new CatchWeighedItem(Item::dye_powder_Id, 10, 0, 1); // 10 ink sacs + fishingJunkArray[9] = new CatchWeighedItem(Item::fishing_rod_Id, 1, 0, 2); + fishingJunkArray[10] = new CatchWeighedItem(Item::dye_Id, 10, 0, 1); // 10 ink sacs } CatchType FishingHelper::getRandCatchType(int luckLevel, int lureLevel, Random* random) @@ -85,10 +85,10 @@ std::shared_ptr FishingHelper::handleCatch(CatchWeighedItem* weigh weighedCatch->getItemId(), weighedCatch->getCount(), weighedCatch->getAuxValue() ); - if ((itemInstance->id == Item::fishingRod_Id && catchType == CatchType::JUNK) || (itemInstance->id == Item::boots_leather_Id)) { + if ((itemInstance->id == Item::fishing_rod_Id && catchType == CatchType::JUNK) || (itemInstance->id == Item::leather_boots_Id)) { itemInstance->setAuxValue((int) ((double) itemInstance->getMaxDamage() * ((double) random->nextInt(901) + 100.0) / 1000.0)); // 10% to 100% damage } - else if (itemInstance->id == Item::fishingRod_Id && catchType == CatchType::TREASURE) { + else if (itemInstance->id == Item::fishing_rod_Id && catchType == CatchType::TREASURE) { itemInstance->setAuxValue((int)((double) itemInstance->getMaxDamage() * ((double)random->nextInt(251) / 1000.0))); // 0% to 25% damage EnchantmentHelper::enchantItem(random, itemInstance, 30); } diff --git a/Minecraft.World/FishingHook.cpp b/Minecraft.World/FishingHook.cpp index a95fd8d9..c3b07232 100644 --- a/Minecraft.World/FishingHook.cpp +++ b/Minecraft.World/FishingHook.cpp @@ -116,10 +116,10 @@ FishingHook::FishingHook(Level *level, std::shared_ptr mob) : Entity( l void FishingHook::getEnchantLevels() { if (this->owner == nullptr) return; - std::shared_ptr fishingRod = owner->getSelectedItem(); + std::shared_ptr fishing_rod = owner->getSelectedItem(); // TODO; Account for luck effect once implemented. - this->luckLevel = EnchantmentHelper::getEnchantmentLevel(65, fishingRod); // Luck of the sea - this->lureLevel = EnchantmentHelper::getEnchantmentLevel(64, fishingRod); // Lure + this->luckLevel = EnchantmentHelper::getEnchantmentLevel(65, fishing_rod); // Luck of the sea + this->lureLevel = EnchantmentHelper::getEnchantmentLevel(64, fishing_rod); // Lure } void FishingHook::defineSynchedData() @@ -215,7 +215,7 @@ void FishingHook::tick() if (this->previousItem == nullptr) { this->previousItem = selectedItem; } - if (owner->removed || !owner->isAlive() || selectedItem == nullptr || selectedItem->getItem() != Item::fishingRod || distanceToSqr(owner) > 32 * 32 || selectedItem != this->previousItem) + if (owner->removed || !owner->isAlive() || selectedItem == nullptr || selectedItem->getItem() != Item::fishing_rod || distanceToSqr(owner) > 32 * 32 || selectedItem != this->previousItem) { remove(); owner->fishing = nullptr; diff --git a/Minecraft.World/FlatGeneratorInfo.cpp b/Minecraft.World/FlatGeneratorInfo.cpp index c983fd2c..d2650891 100644 --- a/Minecraft.World/FlatGeneratorInfo.cpp +++ b/Minecraft.World/FlatGeneratorInfo.cpp @@ -239,7 +239,7 @@ FlatGeneratorInfo *FlatGeneratorInfo::getDefault() FlatGeneratorInfo *result = new FlatGeneratorInfo(); result->setBiome(Biome::plains->id); - result->getLayers()->push_back(new FlatLayerInfo(1, Tile::unbreakable_Id)); + result->getLayers()->push_back(new FlatLayerInfo(1, Tile::bedrock_Id)); result->getLayers()->push_back(new FlatLayerInfo(2, Tile::dirt_Id)); result->getLayers()->push_back(new FlatLayerInfo(1, Tile::grass_Id)); result->updateLayers(); diff --git a/Minecraft.World/FlatLevelSource.cpp b/Minecraft.World/FlatLevelSource.cpp index 9ea1ed36..e7300cee 100644 --- a/Minecraft.World/FlatLevelSource.cpp +++ b/Minecraft.World/FlatLevelSource.cpp @@ -45,7 +45,7 @@ void FlatLevelSource::prepareHeights(byteArray blocks) int block = 0; if (yc == 0) { - block = Tile::unbreakable_Id; + block = Tile::bedrock_Id; } else if (yc <= 2) { diff --git a/Minecraft.World/FlowerPotTile.cpp b/Minecraft.World/FlowerPotTile.cpp index d76df3a9..2d7ef0a6 100644 --- a/Minecraft.World/FlowerPotTile.cpp +++ b/Minecraft.World/FlowerPotTile.cpp @@ -90,7 +90,7 @@ int FlowerPotTile::cloneTileId(Level *level, int x, int y, int z) if (item == nullptr) { - return Item::flowerPot_Id; + return Item::flower_pot_Id; } else { @@ -104,7 +104,7 @@ int FlowerPotTile::cloneTileData(Level *level, int x, int y, int z) if (item == nullptr) { - return Item::flowerPot_Id; + return Item::flower_pot_Id; } else { @@ -145,7 +145,7 @@ void FlowerPotTile::spawnResources(Level *level, int x, int y, int z, int data, int FlowerPotTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::flowerPot_Id; + return Item::flower_pot_Id; } shared_ptr FlowerPotTile::getItemFromType(int type) @@ -183,12 +183,12 @@ int FlowerPotTile::getTypeFromItem(shared_ptr item) { int id = item->getItem()->id; - if (id == Tile::rose_Id) return TYPE_FLOWER_RED; - if (id == Tile::flower_Id) return TYPE_FLOWER_YELLOW; + if (id == Tile::red_flower_Id) return TYPE_FLOWER_RED; + if (id == Tile::yellow_flower_Id) return TYPE_FLOWER_YELLOW; if (id == Tile::cactus_Id) return TYPE_CACTUS; if (id == Tile::mushroom_brown_Id) return TYPE_MUSHROOM_BROWN; if (id == Tile::mushroom_red_Id) return TYPE_MUSHROOM_RED; - if (id == Tile::deadBush_Id) return TYPE_DEAD_BUSH; + if (id == Tile::deadbush_Id) return TYPE_DEAD_BUSH; if (id == Tile::sapling_Id) { diff --git a/Minecraft.World/FoodItem.cpp b/Minecraft.World/FoodItem.cpp index 557404cb..9a9affe6 100644 --- a/Minecraft.World/FoodItem.cpp +++ b/Minecraft.World/FoodItem.cpp @@ -74,7 +74,7 @@ shared_ptr FoodItem::use(shared_ptr instance, Level // 4J : WESTY : Other award ... eating cooked pork chop. // 4J-JEV: This is just for an avatar award on the xbox. #ifdef _XBOX - if ( instance->getItem() == Item::porkChop_cooked ) + if ( instance->getItem() == Item::cooked_porkchop ) { player->awardStat(GenericStats::eatPorkChop(),GenericStats::param_eatPorkChop()); } diff --git a/Minecraft.World/FoodRecipies.cpp b/Minecraft.World/FoodRecipies.cpp index 0aeccc59..cb53b271 100644 --- a/Minecraft.World/FoodRecipies.cpp +++ b/Minecraft.World/FoodRecipies.cpp @@ -9,15 +9,15 @@ void FoodRecipies::addRecipes(Recipes *r) { // 4J-JEV: Bumped up in the list to avoid a colision with the title. - r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 0), // + r->addShapedRecipy(new ItemInstance(Item::golden_apple, 1, 0), // L"ssscicig", L"###", // L"#X#", // L"###", // - L'#', Item::goldIngot, L'X', Item::apple, + L'#', Item::gold_ingot, L'X', Item::apple, L'F'); - r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 1), // + r->addShapedRecipy(new ItemInstance(Item::golden_apple, 1, 1), // L"sssctcig", L"###", // L"#X#", // @@ -25,38 +25,38 @@ void FoodRecipies::addRecipes(Recipes *r) L'#', Tile::goldBlock, L'X', Item::apple, L'F'); - r->addShapedRecipy(new ItemInstance(Item::speckledMelon, 1), // + r->addShapedRecipy(new ItemInstance(Item::speckled_melon, 1), // L"ssscicig", L"###", // L"#X#", // L"###", // - L'#', Item::goldNugget, L'X', Item::melon, + L'#', Item::gold_nugget, L'X', Item::melon, L'F'); - r->addShapelessRecipy(new ItemInstance(Item::mushroomStew), + r->addShapelessRecipy(new ItemInstance(Item::mushroom_stew), L"ttig", Tile::mushroom_brown, Tile::mushroom_red, Item::bowl, L'F'); - r->addShapedRecipy(new ItemInstance(Item::rabbitStew), + r->addShapedRecipy(new ItemInstance(Item::rabbit_stew), L"ssscicictcicig", L" 1 ",//s L"2X3",//s L" 4 ",//s - L'1', Item::rabbit_cooked, // ci + L'1', Item::cooked_rabbit, // ci L'2', Item::carrots, // ci L'3', Tile::mushroom_brown, // ct L'X', Item::potato, // ci L'4', Item::bowl, // ci L'F'); - r->addShapedRecipy(new ItemInstance(Item::rabbitStew), + r->addShapedRecipy(new ItemInstance(Item::rabbit_stew), L"ssscicictcicig", L" 1 ",//s L"2X3",//s L" 4 ",//s - L'1', Item::rabbit_cooked, // ci + L'1', Item::cooked_rabbit, // ci L'2', Item::carrots, // ci L'3', Tile::mushroom_red, // ct L'X', Item::potato, // ci @@ -69,7 +69,7 @@ void FoodRecipies::addRecipes(Recipes *r) L"sczcig", L"#X#", // - L'X', new ItemInstance(Item::dye_powder, 1, DyePowderItem::BROWN), + L'X', new ItemInstance(Item::dye, 1, DyePowderItem::BROWN), L'#', Item::wheat, L'F'); @@ -96,33 +96,33 @@ void FoodRecipies::addRecipes(Recipes *r) L'M', Tile::pumpkin, L'F'); - r->addShapelessRecipy(new ItemInstance(Item::pumpkinPie), // + r->addShapelessRecipy(new ItemInstance(Item::pumpkin_pie), // L"tiig", Tile::pumpkin, Item::sugar, Item::egg, L'F'); - r->addShapedRecipy(new ItemInstance(Item::carrotGolden, 1, 0), // + r->addShapedRecipy(new ItemInstance(Item::golden_carrot, 1, 0), // L"ssscicig", L"###", // L"#X#", // L"###", // - L'#', Item::goldNugget, L'X', Item::carrots, + L'#', Item::gold_nugget, L'X', Item::carrots, L'F'); - r->addShapelessRecipy(new ItemInstance(Item::fermentedSpiderEye), // + r->addShapelessRecipy(new ItemInstance(Item::fermented_spider_eye), // L"itig", - Item::spiderEye, Tile::mushroom_brown, Item::sugar, + Item::spider_eye, Tile::mushroom_brown, Item::sugar, L'F'); - r->addShapelessRecipy(new ItemInstance(Item::blazePowder, 2), // + r->addShapelessRecipy(new ItemInstance(Item::blaze_powder, 2), // L"ig", - Item::blazeRod, + Item::blaze_rod, L'F'); - r->addShapelessRecipy(new ItemInstance(Item::magmaCream), // + r->addShapelessRecipy(new ItemInstance(Item::magma_cream), // L"iig", - Item::blazePowder, Item::slimeBall, + Item::blaze_powder, Item::slime_ball, L'F'); } diff --git a/Minecraft.World/ForestBiome.cpp b/Minecraft.World/ForestBiome.cpp index f7d9b2a5..5f3f403f 100644 --- a/Minecraft.World/ForestBiome.cpp +++ b/Minecraft.World/ForestBiome.cpp @@ -268,15 +268,15 @@ Feature* ForestBiome::getFlowerFeature(Random* random, int x, int y, int z) int fType = random->nextInt(9); switch (fType) { - case 0: return new FlowerFeature(Tile::flower_Id, 0); - case 1: return new FlowerFeature(Tile::rose_Id, 0); - case 2: return new FlowerFeature(Tile::rose_Id, Rose::ALLIUM); - case 3: return new FlowerFeature(Tile::rose_Id, Rose::AZURE_BLUET); - case 4: return new FlowerFeature(Tile::rose_Id, Rose::RED_TULIP); - case 5: return new FlowerFeature(Tile::rose_Id, Rose::ORANGE_TULIP); - case 6: return new FlowerFeature(Tile::rose_Id, Rose::WHITE_TULIP); - case 7: return new FlowerFeature(Tile::rose_Id, Rose::PINK_TULIP); - case 8: return new FlowerFeature(Tile::rose_Id, Rose::OXEYE_DAISY); + case 0: return new FlowerFeature(Tile::yellow_flower_Id, 0); + case 1: return new FlowerFeature(Tile::red_flower_Id, 0); + case 2: return new FlowerFeature(Tile::red_flower_Id, Rose::ALLIUM); + case 3: return new FlowerFeature(Tile::red_flower_Id, Rose::AZURE_BLUET); + case 4: return new FlowerFeature(Tile::red_flower_Id, Rose::RED_TULIP); + case 5: return new FlowerFeature(Tile::red_flower_Id, Rose::ORANGE_TULIP); + case 6: return new FlowerFeature(Tile::red_flower_Id, Rose::WHITE_TULIP); + case 7: return new FlowerFeature(Tile::red_flower_Id, Rose::PINK_TULIP); + case 8: return new FlowerFeature(Tile::red_flower_Id, Rose::OXEYE_DAISY); } } else if (biomeType == 2 || biomeType == 3) diff --git a/Minecraft.World/FurnaceRecipes.cpp b/Minecraft.World/FurnaceRecipes.cpp index 48ba4b16..afffd8c8 100644 --- a/Minecraft.World/FurnaceRecipes.cpp +++ b/Minecraft.World/FurnaceRecipes.cpp @@ -18,36 +18,36 @@ FurnaceRecipes *FurnaceRecipes::getInstance() FurnaceRecipes::FurnaceRecipes() { - addFurnaceRecipy(Tile::ironOre_Id, new ItemInstance(Item::ironIngot), .7f); - addFurnaceRecipy(Tile::goldOre_Id, new ItemInstance(Item::goldIngot), 1); - addFurnaceRecipy(Tile::diamondOre_Id, new ItemInstance(Item::diamond), 1); + addFurnaceRecipy(Tile::iron_ore_Id, new ItemInstance(Item::iron_ingot), .7f); + addFurnaceRecipy(Tile::gold_ore_Id, new ItemInstance(Item::gold_ingot), 1); + addFurnaceRecipy(Tile::diamond_ore_Id, new ItemInstance(Item::diamond), 1); addFurnaceRecipy(Tile::sand_Id, new ItemInstance(Tile::glass), .1f); - addFurnaceRecipy(Item::porkChop_raw_Id, new ItemInstance(Item::porkChop_cooked), .35f); - addFurnaceRecipy(Item::beef_raw_Id, new ItemInstance(Item::beef_cooked), .35f); - addFurnaceRecipy(Item::rabbit_raw_Id, new ItemInstance(Item::rabbit_cooked), .35f); - addFurnaceRecipy(Item::mutton_raw_Id, new ItemInstance(Item::mutton_cooked), .35f); - addFurnaceRecipy(Item::chicken_raw_Id, new ItemInstance(Item::chicken_cooked), .35f); - addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f); - addFurnaceRecipy(new ItemInstance(Item::fish_raw, 1, 1), new ItemInstance(Item::fish_cooked, 1, 1), .35f); // salmon + addFurnaceRecipy(Item::porkchop_Id, new ItemInstance(Item::cooked_porkchop), .35f); + addFurnaceRecipy(Item::beef_Id, new ItemInstance(Item::cooked_beef), .35f); + addFurnaceRecipy(Item::rabbit_Id, new ItemInstance(Item::cooked_rabbit), .35f); + addFurnaceRecipy(Item::mutton_Id, new ItemInstance(Item::cooked_mutton), .35f); + addFurnaceRecipy(Item::chicken_Id, new ItemInstance(Item::cooked_chicken), .35f); + addFurnaceRecipy(Item::fish_Id, new ItemInstance(Item::cooked_fish), .35f); + addFurnaceRecipy(new ItemInstance(Item::raw_fish, 1, 1), new ItemInstance(Item::cooked_fish, 1, 1), .35f); // salmon addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone, 1, 0), .1f); - addFurnaceRecipy(Tile::stoneBrick_Id, new ItemInstance(Tile::stoneBrick, 1 , SmoothStoneBrickTile::TYPE_CRACKED), .1f); + addFurnaceRecipy(Tile::stonebrick_Id, new ItemInstance(Tile::stoneBrick, 1 , SmoothStoneBrickTile::TYPE_CRACKED), .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); - addFurnaceRecipy(Item::potato_Id, new ItemInstance(Item::potatoBaked), .35f); - addFurnaceRecipy(Tile::netherRack_Id, new ItemInstance(Item::netherbrick), .1f); + addFurnaceRecipy(Tile::cactus_Id, new ItemInstance(Item::dye, 1, DyePowderItem::GREEN), .2f); + addFurnaceRecipy(Tile::log_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f); + addFurnaceRecipy(Tile::emerald_ore_Id, new ItemInstance(Item::emerald), 1); + addFurnaceRecipy(Item::potato_Id, new ItemInstance(Item::baked_potato), .35f); + addFurnaceRecipy(Tile::netherrack_Id, new ItemInstance(Item::netherbrick), .1f); addFurnaceRecipy(new ItemInstance(Tile::sponge, 1, 1), new ItemInstance(Tile::sponge, 1, 0), .15f); // special silk touch related recipes: - addFurnaceRecipy(Tile::coalOre_Id, new ItemInstance(Item::coal), .1f); - addFurnaceRecipy(Tile::redStoneOre_Id, new ItemInstance(Item::redStone), .7f); - addFurnaceRecipy(Tile::lapisOre_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE), .2f); - addFurnaceRecipy(Tile::netherQuartz_Id, new ItemInstance(Item::netherQuartz), .2f); + addFurnaceRecipy(Tile::coal_ore_Id, new ItemInstance(Item::coal), .1f); + addFurnaceRecipy(Tile::redstone_ore_Id, new ItemInstance(Item::redstone), .7f); + addFurnaceRecipy(Tile::lapis_ore_Id, new ItemInstance(Item::dye, 1, DyePowderItem::BLUE), .2f); + addFurnaceRecipy(Tile::quartz_ore_Id, new ItemInstance(Item::nether_quartz), .2f); - addFurnaceRecipy(Tile::tree2Trunk_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f); + addFurnaceRecipy(Tile::log2_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f); } void FurnaceRecipes::addFurnaceRecipy(int itemId, ItemInstance *result, float value) diff --git a/Minecraft.World/FurnaceResultSlot.cpp b/Minecraft.World/FurnaceResultSlot.cpp index 4ddcc726..a81ebfc6 100644 --- a/Minecraft.World/FurnaceResultSlot.cpp +++ b/Minecraft.World/FurnaceResultSlot.cpp @@ -85,9 +85,9 @@ void FurnaceResultSlot::checkTakeAchievements(shared_ptr carried) GenericStats::param_itemsSmelted(carried->id, carried->getAuxValue(), removeCount) ); } - if (carried->id == Item::ironIngot_Id) player->awardStat(GenericStats::acquireIron(), GenericStats::param_acquireIron()); - if (carried->id == Item::fish_cooked_Id) player->awardStat(GenericStats::cookFish(), GenericStats::param_cookFish()); - //if (carried->id == Item::porkChop_cooked_Id) GenericStats::itemsCrafted(Item::porkChop_cooked_Id); + if (carried->id == Item::iron_ingot_Id) player->awardStat(GenericStats::acquireIron(), GenericStats::param_acquireIron()); + if (carried->id == Item::cooked_fish_Id) player->awardStat(GenericStats::cookFish(), GenericStats::param_cookFish()); + //if (carried->id == Item::cooked_porkchop_Id) GenericStats::itemsCrafted(Item::cooked_porkchop_Id); removeCount = 0; } diff --git a/Minecraft.World/FurnaceTile.cpp b/Minecraft.World/FurnaceTile.cpp index d8856f4e..37fda9b4 100644 --- a/Minecraft.World/FurnaceTile.cpp +++ b/Minecraft.World/FurnaceTile.cpp @@ -127,7 +127,7 @@ void FurnaceTile::setLit(bool lit, Level *level, int x, int y, int z) shared_ptr te = level->getTileEntity(x, y, z); noDrop = true; - if (lit) level->setTileAndUpdate(x, y, z, Tile::furnace_lit_Id); + if (lit) level->setTileAndUpdate(x, y, z, Tile::lit_furnace_Id); else level->setTileAndUpdate(x, y, z, Tile::furnace_Id); noDrop = false; diff --git a/Minecraft.World/FurnaceTileEntity.cpp b/Minecraft.World/FurnaceTileEntity.cpp index b4f394f2..76f27ba2 100644 --- a/Minecraft.World/FurnaceTileEntity.cpp +++ b/Minecraft.World/FurnaceTileEntity.cpp @@ -320,11 +320,11 @@ int FurnaceTileEntity::getBurnDuration(shared_ptr itemInstance) if (id == Item::coal->id) return BURN_INTERVAL * 8; - if (id == Item::bucket_lava->id) return BURN_INTERVAL * 100; + if (id == Item::lava_bucket->id) return BURN_INTERVAL * 100; if (id == Tile::sapling_Id) return BURN_INTERVAL / 2; - if (id == Item::blazeRod_Id) return BURN_INTERVAL * 12; + if (id == Item::blaze_rod_Id) return BURN_INTERVAL * 12; return 0; } @@ -387,7 +387,7 @@ bool FurnaceTileEntity::canTakeItemThroughFace(int slot, shared_ptrid != Item::bucket_empty_Id) return false; + if (item->id != Item::bucket_Id) return false; } return true; diff --git a/Minecraft.World/GenericStats.cpp b/Minecraft.World/GenericStats.cpp index d507c675..0c9260c9 100644 --- a/Minecraft.World/GenericStats.cpp +++ b/Minecraft.World/GenericStats.cpp @@ -836,7 +836,7 @@ byteArray GenericStats::param_itemsSmelted(int id, int aux, int count) byteArray GenericStats::param_itemsUsed(shared_ptr plr, shared_ptr itm) { if ((plr != nullptr) && (itm != nullptr)) { - if (itm->id == Item::porkChop_cooked_Id) return instance->param_eatPorkChop(); + if (itm->id == Item::cooked_porkchop_Id) return instance->param_eatPorkChop(); return instance->getParam_itemsUsed(plr, itm); } else return instance->getParam_noArgs(); diff --git a/Minecraft.World/Ghast.cpp b/Minecraft.World/Ghast.cpp index d333f861..7a4963ba 100644 --- a/Minecraft.World/Ghast.cpp +++ b/Minecraft.World/Ghast.cpp @@ -225,7 +225,7 @@ void Ghast::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) int count = random->nextInt(2) + random->nextInt(1 + playerBonusLevel); for (int i = 0; i < count; i++) { - spawnAtLocation(Item::ghastTear_Id, 1); + spawnAtLocation(Item::ghast_tear_Id, 1); } count = random->nextInt(3) + random->nextInt(1 + playerBonusLevel); for (int i = 0; i < count; i++) diff --git a/Minecraft.World/GlowstoneTile.cpp b/Minecraft.World/GlowstoneTile.cpp index 5add7c25..180c6a46 100644 --- a/Minecraft.World/GlowstoneTile.cpp +++ b/Minecraft.World/GlowstoneTile.cpp @@ -18,5 +18,5 @@ int Glowstonetile::getResourceCount(Random *random) int Glowstonetile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::yellowDust->id; + return Item::glowstone_dust->id; } \ No newline at end of file diff --git a/Minecraft.World/GroundBushFeature.cpp b/Minecraft.World/GroundBushFeature.cpp index 88b7f733..0458c5f0 100644 --- a/Minecraft.World/GroundBushFeature.cpp +++ b/Minecraft.World/GroundBushFeature.cpp @@ -20,7 +20,7 @@ bool GroundBushFeature::place(Level *level, Random *random, int x, int y, int z) if (tile == Tile::dirt_Id || tile == Tile::grass_Id) { y++; - placeBlock(level, x, y, z, Tile::treeTrunk_Id, trunkTileType); + placeBlock(level, x, y, z, Tile::log_Id, trunkTileType); for (int yy = y; yy <= y + 2; yy++) { diff --git a/Minecraft.World/HangingEntityItem.cpp b/Minecraft.World/HangingEntityItem.cpp index 51f4d3cb..ddb09497 100644 --- a/Minecraft.World/HangingEntityItem.cpp +++ b/Minecraft.World/HangingEntityItem.cpp @@ -43,7 +43,7 @@ bool HangingEntityItem::useOn(shared_ptr instance, shared_ptrawardStat(GenericStats::blocksPlaced(Item::painting_Id), GenericStats::param_blocksPlaced(Item::painting_Id,instance->getAuxValue(),1)); - else if (eType==eTYPE_ITEM_FRAME) player->awardStat(GenericStats::blocksPlaced(Item::itemFrame_Id), GenericStats::param_blocksPlaced(Item::itemFrame_Id,instance->getAuxValue(),1)); + else if (eType==eTYPE_ITEM_FRAME) player->awardStat(GenericStats::blocksPlaced(Item::item_frame_Id), GenericStats::param_blocksPlaced(Item::item_frame_Id,instance->getAuxValue(),1)); instance->count--; } diff --git a/Minecraft.World/HellFireFeature.cpp b/Minecraft.World/HellFireFeature.cpp index 4b32134c..1432a428 100644 --- a/Minecraft.World/HellFireFeature.cpp +++ b/Minecraft.World/HellFireFeature.cpp @@ -11,7 +11,7 @@ bool HellFireFeature::place(Level *level, Random *random, int x, int y, int z) int y2 = y + random->nextInt(4) - random->nextInt(4); int z2 = z + random->nextInt(8) - random->nextInt(8); if (!level->isEmptyTile(x2, y2, z2)) continue; - if (level->getTile(x2, y2 - 1, z2) != Tile::netherRack_Id) continue; + if (level->getTile(x2, y2 - 1, z2) != Tile::netherrack_Id) continue; level->setTileAndData(x2, y2, z2, Tile::fire_Id, 0, Tile::UPDATE_CLIENTS); } diff --git a/Minecraft.World/HellFlatLevelSource.cpp b/Minecraft.World/HellFlatLevelSource.cpp index c4ba062c..17c33930 100644 --- a/Minecraft.World/HellFlatLevelSource.cpp +++ b/Minecraft.World/HellFlatLevelSource.cpp @@ -35,7 +35,7 @@ void HellFlatLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks) int block = 0; if ( (yc <= 6) || ( yc >= 121 ) ) { - block = Tile::netherRack_Id; + block = Tile::netherrack_Id; } blocks[xc << 11 | zc << 7 | yc] = static_cast(block); @@ -60,7 +60,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks) { if( z - random->nextInt( 4 ) <= 0 || xOffs < -(m_XZSize/2) ) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -68,7 +68,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks) { if( x - random->nextInt( 4 ) <= 0 || zOffs < -(m_XZSize/2)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -76,7 +76,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks) { if( z + random->nextInt(4) >= 15 || xOffs > (m_XZSize/2)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -84,7 +84,7 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks) { if( x + random->nextInt(4) >= 15 || zOffs > (m_XZSize/2) ) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -93,11 +93,11 @@ void HellFlatLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks) if (y >= Level::genDepthMinusOne - random->nextInt(5)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); } else if (y <= 0 + random->nextInt(5)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); } } } diff --git a/Minecraft.World/HellPortalFeature.cpp b/Minecraft.World/HellPortalFeature.cpp index 66485578..c41711f3 100644 --- a/Minecraft.World/HellPortalFeature.cpp +++ b/Minecraft.World/HellPortalFeature.cpp @@ -6,7 +6,7 @@ bool HellPortalFeature::place(Level *level, Random *random, int x, int y, int z) { if (!level->isEmptyTile(x, y, z)) return false; - if (level->getTile(x, y + 1, z) != Tile::netherRack_Id) return false; + if (level->getTile(x, y + 1, z) != Tile::netherrack_Id) return false; level->setTileAndData(x, y, z, Tile::glowstone_Id, 0, Tile::UPDATE_CLIENTS); for (int i = 0; i < 1500; i++) diff --git a/Minecraft.World/HellRandomLevelSource.cpp b/Minecraft.World/HellRandomLevelSource.cpp index 26127dde..ac8f952a 100644 --- a/Minecraft.World/HellRandomLevelSource.cpp +++ b/Minecraft.World/HellRandomLevelSource.cpp @@ -97,11 +97,11 @@ void HellRandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray block int tileId = 0; if (yc * CHUNK_HEIGHT + y < waterHeight) { - tileId = Tile::calmLava_Id; + tileId = Tile::lava_Id; } if (val > 0) { - tileId = Tile::netherRack_Id; + tileId = Tile::netherrack_Id; } blocks[offs] = static_cast(tileId); @@ -147,8 +147,8 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks int run = -1; - byte top = (byte) Tile::netherRack_Id; - byte material = (byte) Tile::netherRack_Id; + byte top = (byte) Tile::netherrack_Id; + byte material = (byte) Tile::netherrack_Id; for (int y = Level::genDepthMinusOne; y >= 0; y--) { @@ -160,7 +160,7 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks { if( z - random->nextInt( 4 ) <= 0 || xOffs < -(m_XZSize/2) ) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -168,7 +168,7 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks { if( x - random->nextInt( 4 ) <= 0 || zOffs < -(m_XZSize/2)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -176,7 +176,7 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks { if( z + random->nextInt(4) >= 15 || xOffs > (m_XZSize/2)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -184,7 +184,7 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks { if( x + random->nextInt(4) >= 15 || zOffs > (m_XZSize/2) ) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); blockSet = true; } } @@ -193,7 +193,7 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks if (y >= Level::genDepthMinusOne - random->nextInt(5) || y <= 0 + random->nextInt(5)) { - blocks[offs] = static_cast(Tile::unbreakable_Id); + blocks[offs] = static_cast(Tile::bedrock_Id); } else { @@ -203,27 +203,27 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks { run = -1; } - else if (old == Tile::netherRack_Id) + else if (old == Tile::netherrack_Id) { if (run == -1) { if (runDepth <= 0) { top = 0; - material = static_cast(Tile::netherRack_Id); + material = static_cast(Tile::netherrack_Id); } else if (y >= waterHeight - 4 && y <= waterHeight + 1) { - top = static_cast(Tile::netherRack_Id); - material = static_cast(Tile::netherRack_Id); + top = static_cast(Tile::netherrack_Id); + material = static_cast(Tile::netherrack_Id); if (gravel) top = static_cast(Tile::gravel_Id); - if (gravel) material = static_cast(Tile::netherRack_Id); + if (gravel) material = static_cast(Tile::netherrack_Id); if (sand) { // 4J Stu - Make some nether wart spawn outside of the nether fortresses if(random->nextInt(16) == 0) { - top = static_cast(Tile::netherStalk_Id); + top = static_cast(Tile::nether_wart_Id); // Place the nether wart on top of the soul sand y += 1; @@ -234,13 +234,13 @@ void HellRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray blocks } else { - top = static_cast(Tile::soulsand_Id); + top = static_cast(Tile::soul_sand_Id); } } - if (sand) material = static_cast(Tile::soulsand_Id); + if (sand) material = static_cast(Tile::soul_sand_Id); } - if (y < waterHeight && top == 0) top = static_cast(Tile::calmLava_Id); + if (y < waterHeight && top == 0) top = static_cast(Tile::lava_Id); run = runDepth; // 4J Stu - If sand, then allow adding nether wart at heights below the water level @@ -441,7 +441,7 @@ void HellRandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int x = xo + pprandom->nextInt(16) + 8; int y = pprandom->nextInt(Level::genDepth - 8) + 4; int z = zo + pprandom->nextInt(16) + 8; - HellSpringFeature(Tile::lava_Id, false).place(level, pprandom, x, y, z); + HellSpringFeature(Tile::flowing_lava_Id, false).place(level, pprandom, x, y, z); } int count = pprandom->nextInt(pprandom->nextInt(10) + 1) + 1; @@ -487,7 +487,7 @@ void HellRandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) FlowerFeature(Tile::mushroom_red_Id).place(level, pprandom, x, y, z); } - OreFeature quartzFeature(Tile::netherQuartz_Id, 13, Tile::netherRack_Id); + OreFeature quartzFeature(Tile::quartz_ore_Id, 13, Tile::netherrack_Id); for (int i = 0; i < 16; i++) { int x = xo + pprandom->nextInt(16); @@ -501,7 +501,7 @@ void HellRandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int x = xo + random->nextInt(16); int y = random->nextInt(Level::genDepth - 20) + 10; int z = zo + random->nextInt(16); - HellSpringFeature hellSpringFeature(Tile::lava_Id, true); + HellSpringFeature hellSpringFeature(Tile::flowing_lava_Id, true); hellSpringFeature.place(level, random, x, y, z); } @@ -540,7 +540,7 @@ vector *HellRandomLevelSource::getMobsAt(MobCategory *m { return netherBridgeFeature->getBridgeEnemies(); } - if ((netherBridgeFeature->isInsideBoundingFeature(x, y, z) && level->getTile(x, y - 1, z) == Tile::netherBrick_Id)) + if ((netherBridgeFeature->isInsideBoundingFeature(x, y, z) && level->getTile(x, y - 1, z) == Tile::nether_brick_Id)) { return netherBridgeFeature->getBridgeEnemies(); } diff --git a/Minecraft.World/HellSpringFeature.cpp b/Minecraft.World/HellSpringFeature.cpp index 1b62b9b2..1467e789 100644 --- a/Minecraft.World/HellSpringFeature.cpp +++ b/Minecraft.World/HellSpringFeature.cpp @@ -11,17 +11,17 @@ HellSpringFeature::HellSpringFeature(int tile, bool insideRock) bool HellSpringFeature::place(Level *level, Random *random, int x, int y, int z) { - if (level->getTile(x, y + 1, z) != Tile::netherRack_Id) return false; - if (level->getTile(x, y - 1, z) != Tile::netherRack_Id) return false; + if (level->getTile(x, y + 1, z) != Tile::netherrack_Id) return false; + if (level->getTile(x, y - 1, z) != Tile::netherrack_Id) return false; - if (level->getTile(x, y, z) != 0 && level->getTile(x, y, z) != Tile::netherRack_Id) return false; + if (level->getTile(x, y, z) != 0 && level->getTile(x, y, z) != Tile::netherrack_Id) return false; int rockCount = 0; - if (level->getTile(x - 1, y, z) == Tile::netherRack_Id) rockCount++; - if (level->getTile(x + 1, y, z) == Tile::netherRack_Id) rockCount++; - if (level->getTile(x, y, z - 1) == Tile::netherRack_Id) rockCount++; - if (level->getTile(x, y, z + 1) == Tile::netherRack_Id) rockCount++; - if (level->getTile(x, y - 1, z) == Tile::netherRack_Id) rockCount++; + if (level->getTile(x - 1, y, z) == Tile::netherrack_Id) rockCount++; + if (level->getTile(x + 1, y, z) == Tile::netherrack_Id) rockCount++; + if (level->getTile(x, y, z - 1) == Tile::netherrack_Id) rockCount++; + if (level->getTile(x, y, z + 1) == Tile::netherrack_Id) rockCount++; + if (level->getTile(x, y - 1, z) == Tile::netherrack_Id) rockCount++; int holeCount = 0; if (level->isEmptyTile(x - 1, y, z)) holeCount++; diff --git a/Minecraft.World/HoeItem.cpp b/Minecraft.World/HoeItem.cpp index a160f486..c6855cf5 100644 --- a/Minecraft.World/HoeItem.cpp +++ b/Minecraft.World/HoeItem.cpp @@ -21,7 +21,7 @@ bool HoeItem::useOn(shared_ptr instance, shared_ptr player int targetType = level->getTile(x, y, z); int above = level->getTile(x, y + 1, z); - if (face != 0 && above == 0 && (targetType == Tile::grass_Id || targetType == Tile::dirt_Id || targetType == Tile::mycel_Id)) + if (face != 0 && above == 0 && (targetType == Tile::grass_Id || targetType == Tile::dirt_Id || targetType == Tile::mycelium_Id)) { if(!bTestUseOnOnly) { diff --git a/Minecraft.World/HouseFeature.cpp b/Minecraft.World/HouseFeature.cpp index b6bba5a5..ebe3c81b 100644 --- a/Minecraft.World/HouseFeature.cpp +++ b/Minecraft.World/HouseFeature.cpp @@ -41,7 +41,7 @@ bool HouseFeature::place(Level *level, Random *random, int x, int y, int z) } else { - if (t == Tile::cobblestone_Id || t == Tile::mossyCobblestone_Id) return false; + if (t == Tile::cobblestone_Id || t == Tile::mossy_cobblestone_Id) return false; } } @@ -101,14 +101,14 @@ bool HouseFeature::place(Level *level, Random *random, int x, int y, int z) int material = -1; if (yy == y0 + h - 1) { - material = Tile::wood_Id; + material = Tile::planks_Id; } else if (xx >= xx0 && xx <= xx1 && zz >= zz0 && zz <= zz1) { material = 0; if (yy == y0 - 1 || yy == y0 + h - 1 || xx == xx0 || zz == zz0 || xx == xx1 || zz == zz1) { - if (yy <= y0 + random->nextInt(3)) material = Tile::mossyCobblestone_Id; + if (yy <= y0 + random->nextInt(3)) material = Tile::mossy_cobblestone_Id; else material = Tile::cobblestone_Id; } } @@ -137,7 +137,7 @@ bool HouseFeature::place(Level *level, Random *random, int x, int y, int z) if (doorSide == 1) dir = 2; if (doorSide == 3) dir = 3; - DoorItem::place(level, xx, y0, zz, dir, Tile::door_wood); + DoorItem::place(level, xx, y0, zz, dir, Tile::wooden_door); } for (int i = 0; i < (w * 2 + d * 2) * 3; i++) diff --git a/Minecraft.World/HugeMushroomFeature.cpp b/Minecraft.World/HugeMushroomFeature.cpp index a4025019..97c59305 100644 --- a/Minecraft.World/HugeMushroomFeature.cpp +++ b/Minecraft.World/HugeMushroomFeature.cpp @@ -46,7 +46,7 @@ bool HugeMushroomFeature::place(Level *level, Random *random, int x, int y, int } int belowTile = level->getTile(x, y - 1, z); - if (belowTile != Tile::dirt_Id && belowTile != Tile::grass_Id && belowTile != Tile::mycel_Id) + if (belowTile != Tile::dirt_Id && belowTile != Tile::grass_Id && belowTile != Tile::mycelium_Id) { return false; } @@ -91,7 +91,7 @@ bool HugeMushroomFeature::place(Level *level, Random *random, int x, int y, int if (data == 5 && yy < y + treeHeight) data = 0; if (data != 0 || y >= y + treeHeight - 1) { - if (!Tile::solid[level->getTile(xx, yy, zz)]) placeBlock(level, xx, yy, zz, Tile::hugeMushroom_brown_Id + type, data); + if (!Tile::solid[level->getTile(xx, yy, zz)]) placeBlock(level, xx, yy, zz, Tile::brown_mushroom_block_Id + type, data); } } } @@ -99,7 +99,7 @@ bool HugeMushroomFeature::place(Level *level, Random *random, int x, int y, int for (int hh = 0; hh < treeHeight; hh++) { int t = level->getTile(x, y + hh, z); - if (!Tile::solid[t]) placeBlock(level, x, y + hh, z, Tile::hugeMushroom_brown_Id + type, 10); + if (!Tile::solid[t]) placeBlock(level, x, y + hh, z, Tile::brown_mushroom_block_Id + type, 10); } return true; } diff --git a/Minecraft.World/IceSpikeFeature.cpp b/Minecraft.World/IceSpikeFeature.cpp index 87c6a016..4861d915 100644 --- a/Minecraft.World/IceSpikeFeature.cpp +++ b/Minecraft.World/IceSpikeFeature.cpp @@ -54,7 +54,7 @@ bool IceSpikeFeature::place(Level *level, Random *random, int x, int y, int z) if (level->isEmptyTile(x + ix, y + k, z + iz) || currentTile == Tile::dirt_Id || currentTile == Tile::snow_Id || currentTile == Tile::ice_Id) { - level->setTileAndData(x + ix, y + k, z + iz, Tile::packedIce_Id, 0, 3); + level->setTileAndData(x + ix, y + k, z + iz, Tile::packed_ice_Id, 0, 3); } @@ -64,7 +64,7 @@ bool IceSpikeFeature::place(Level *level, Random *random, int x, int y, int z) if (level->isEmptyTile(x + ix, y - k, z + iz) || currentTile == Tile::dirt_Id || currentTile == Tile::snow_Id || currentTile == Tile::ice_Id) { - level->setTileAndData(x + ix, y - k, z + iz, Tile::packedIce_Id, 0, 3); + level->setTileAndData(x + ix, y - k, z + iz, Tile::packed_ice_Id, 0, 3); } } } @@ -90,12 +90,12 @@ bool IceSpikeFeature::place(Level *level, Random *random, int x, int y, int z) { int t = level->getTile(x + rx, curY, z + rz); if (!level->isEmptyTile(x + rx, curY, z + rz) && t != Tile::dirt_Id && - t != Tile::snow_Id && t != Tile::ice_Id && t != Tile::packedIce_Id) + t != Tile::snow_Id && t != Tile::ice_Id && t != Tile::packed_ice_Id) { break; } - level->setTileAndData(x + rx, curY, z + rz, Tile::packedIce_Id, 0, 3); + level->setTileAndData(x + rx, curY, z + rz, Tile::packed_ice_Id, 0, 3); curY--; depthCounter--; if (depthCounter <= 0) diff --git a/Minecraft.World/IceTile.cpp b/Minecraft.World/IceTile.cpp index 60e16291..773c61c3 100644 --- a/Minecraft.World/IceTile.cpp +++ b/Minecraft.World/IceTile.cpp @@ -48,7 +48,7 @@ void IceTile::playerDestroy(Level *level, shared_ptr player, int x, int Material *below = level->getMaterial(x, y - 1, z); if (below->blocksMotion() || below->isLiquid()) { - level->setTileAndUpdate(x, y, z, Tile::water_Id); + level->setTileAndUpdate(x, y, z, Tile::flowing_water_Id); } } } @@ -68,7 +68,7 @@ void IceTile::tick(Level *level, int x, int y, int z, Random *random) return; } this->spawnResources(level, x, y, z, level->getData(x, y, z), 0); - level->setTileAndUpdate(x, y, z, Tile::calmWater_Id); + level->setTileAndUpdate(x, y, z, Tile::water_Id); } } diff --git a/Minecraft.World/InventoryMenu.cpp b/Minecraft.World/InventoryMenu.cpp index 28b69694..70f574d7 100644 --- a/Minecraft.World/InventoryMenu.cpp +++ b/Minecraft.World/InventoryMenu.cpp @@ -236,7 +236,7 @@ shared_ptr InventoryMenu::clicked(int slotIndex, int buttonNum, in shared_ptr out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player, looped); - static int ironItems[4] = {Item::helmet_iron_Id,Item::chestplate_iron_Id,Item::leggings_iron_Id,Item::boots_iron_Id}; + static int ironItems[4] = {Item::iron_helmet_Id,Item::iron_chestplate_Id,Item::iron_leggings_Id,Item::iron_boots_Id}; for (int i = ARMOR_SLOT_START; i < ARMOR_SLOT_END; i++) { Slot *slot = slots.at(i); diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp index f46a57e3..27437a21 100644 --- a/Minecraft.World/Item.cpp +++ b/Minecraft.World/Item.cpp @@ -35,123 +35,123 @@ Random *Item::random = new Random(); ItemArray Item::items = ItemArray( ITEM_NUM_COUNT ); -Item *Item::shovel_iron = nullptr; -Item *Item::pickAxe_iron = nullptr; -Item *Item::hatchet_iron = nullptr; -Item *Item::flintAndSteel = nullptr; +Item *Item::iron_shovel = nullptr; +Item *Item::iron_pickaxe = nullptr; +Item *Item::iron_axe = nullptr; +Item *Item::flint_and_steel = nullptr; Item *Item::apple = nullptr; BowItem *Item::bow = nullptr; Item *Item::arrow = nullptr; Item *Item::coal = nullptr; Item *Item::diamond = nullptr; -Item *Item::ironIngot = nullptr; -Item *Item::goldIngot = nullptr; -Item *Item::sword_iron = nullptr; +Item *Item::iron_ingot = nullptr; +Item *Item::gold_ingot = nullptr; +Item *Item::iron_sword = nullptr; -Item *Item::sword_wood = nullptr; -Item *Item::shovel_wood = nullptr; -Item *Item::pickAxe_wood = nullptr; -Item *Item::hatchet_wood = nullptr; +Item *Item::wooden_sword = nullptr; +Item *Item::wooden_shovel = nullptr; +Item *Item::wooden_pickaxe = nullptr; +Item *Item::wooden_axe = nullptr; -Item *Item::sword_stone = nullptr; -Item *Item::shovel_stone = nullptr; -Item *Item::pickAxe_stone = nullptr; -Item *Item::hatchet_stone = nullptr; +Item *Item::stone_sword = nullptr; +Item *Item::stone_shovel = nullptr; +Item *Item::stone_pickaxe = nullptr; +Item *Item::stone_axe = nullptr; -Item *Item::sword_diamond = nullptr; -Item *Item::shovel_diamond = nullptr; -Item *Item::pickAxe_diamond = nullptr; -Item *Item::hatchet_diamond = nullptr; +Item *Item::diamond_sword = nullptr; +Item *Item::diamond_shovel = nullptr; +Item *Item::diamond_pickaxe = nullptr; +Item *Item::diamond_axe = nullptr; Item *Item::stick = nullptr; Item *Item::bowl = nullptr; -Item *Item::mushroomStew = nullptr; +Item *Item::mushroom_stew = nullptr; -Item *Item::sword_gold = nullptr; -Item *Item::shovel_gold = nullptr; -Item *Item::pickAxe_gold = nullptr; -Item *Item::hatchet_gold = nullptr; +Item *Item::golden_sword = nullptr; +Item *Item::golden_shovel = nullptr; +Item *Item::golden_pickaxe = nullptr; +Item *Item::golden_axe = nullptr; Item *Item::string = nullptr; Item *Item::feather = nullptr; Item *Item::gunpowder = nullptr; -Item *Item::hoe_wood = nullptr; -Item *Item::hoe_stone = nullptr; -Item *Item::hoe_iron = nullptr; -Item *Item::hoe_diamond = nullptr; -Item *Item::hoe_gold = nullptr; +Item *Item::wooden_hoe = nullptr; +Item *Item::stone_hoe = nullptr; +Item *Item::iron_hoe = nullptr; +Item *Item::diamond_hoe = nullptr; +Item *Item::golden_hoe = nullptr; -Item *Item::seeds_wheat = nullptr; +Item *Item::wheat_seeds = nullptr; Item *Item::wheat = nullptr; Item *Item::bread = nullptr; -ArmorItem *Item::helmet_leather = nullptr; -ArmorItem *Item::chestplate_leather = nullptr; -ArmorItem *Item::leggings_leather = nullptr; -ArmorItem *Item::boots_leather = nullptr; +ArmorItem *Item::leather_helmet = nullptr; +ArmorItem *Item::leather_chestplate = nullptr; +ArmorItem *Item::leather_leggings = nullptr; +ArmorItem *Item::leather_boots = nullptr; -ArmorItem *Item::helmet_chain = nullptr; -ArmorItem *Item::chestplate_chain = nullptr; -ArmorItem *Item::leggings_chain = nullptr; -ArmorItem *Item::boots_chain = nullptr; +ArmorItem *Item::chainmail_helmet = nullptr; +ArmorItem *Item::chainmail_chestplate = nullptr; +ArmorItem *Item::chainmail_leggings = nullptr; +ArmorItem *Item::chainmail_boots = nullptr; -ArmorItem *Item::helmet_iron = nullptr; -ArmorItem *Item::chestplate_iron = nullptr; -ArmorItem *Item::leggings_iron = nullptr; -ArmorItem *Item::boots_iron = nullptr; +ArmorItem *Item::iron_helmet = nullptr; +ArmorItem *Item::iron_chestplate = nullptr; +ArmorItem *Item::iron_leggings = nullptr; +ArmorItem *Item::iron_boots = nullptr; -ArmorItem *Item::helmet_diamond = nullptr; -ArmorItem *Item::chestplate_diamond = nullptr; -ArmorItem *Item::leggings_diamond = nullptr; -ArmorItem *Item::boots_diamond = nullptr; +ArmorItem *Item::diamond_helmet = nullptr; +ArmorItem *Item::diamond_chestplate = nullptr; +ArmorItem *Item::diamond_leggings = nullptr; +ArmorItem *Item::diamond_boots = nullptr; -ArmorItem *Item::helmet_gold = nullptr; -ArmorItem *Item::chestplate_gold = nullptr; -ArmorItem *Item::leggings_gold = nullptr; -ArmorItem *Item::boots_gold = nullptr; +ArmorItem *Item::golden_helmet = nullptr; +ArmorItem *Item::golden_chestplate = nullptr; +ArmorItem *Item::golden_leggings = nullptr; +ArmorItem *Item::golden_boots = nullptr; Item *Item::flint = nullptr; -Item *Item::porkChop_raw = nullptr; -Item *Item::porkChop_cooked = nullptr; +Item *Item::raw_porkchop = nullptr; +Item *Item::cooked_porkchop = nullptr; Item *Item::painting = nullptr; -Item *Item::apple_gold = nullptr; +Item *Item::golden_apple = nullptr; Item *Item::sign = nullptr; -Item *Item::door_wood = nullptr; +Item *Item::wooden_door = nullptr; -Item *Item::bucket_empty = nullptr; -Item *Item::bucket_water = nullptr; -Item *Item::bucket_lava = nullptr; +Item *Item::bucket = nullptr; +Item *Item::water_bucket = nullptr; +Item *Item::lava_bucket = nullptr; Item *Item::minecart = nullptr; Item *Item::saddle = nullptr; -Item *Item::door_iron = nullptr; -Item *Item::redStone = nullptr; -Item *Item::snowBall = nullptr; +Item *Item::iron_door = nullptr; +Item *Item::redstone = nullptr; +Item *Item::snowball = nullptr; Item *Item::boat = nullptr; Item *Item::leather = nullptr; -Item *Item::bucket_milk = nullptr; +Item *Item::milk_bucket = nullptr; Item *Item::brick = nullptr; Item *Item::clay = nullptr; Item *Item::reeds = nullptr; Item *Item::paper = nullptr; Item *Item::book = nullptr; -Item *Item::slimeBall = nullptr; -Item *Item::minecart_chest = nullptr; -Item *Item::minecart_furnace = nullptr; +Item *Item::slime_ball = nullptr; +Item *Item::chest_minecart = nullptr; +Item *Item::furnace_minecart = nullptr; Item *Item::egg = nullptr; Item *Item::compass = nullptr; -FishingRodItem *Item::fishingRod = nullptr; +FishingRodItem *Item::fishing_rod = nullptr; Item *Item::clock = nullptr; -Item *Item::yellowDust = nullptr; -Item *Item::fish_raw = nullptr; -Item *Item::fish_cooked = nullptr; +Item *Item::glowstone_dust = nullptr; +Item *Item::raw_fish = nullptr; +Item *Item::cooked_fish = nullptr; -Item *Item::dye_powder = nullptr; +Item *Item::dye = nullptr; Item *Item::bone = nullptr; Item *Item::sugar = nullptr; Item *Item::cake = nullptr; @@ -183,32 +183,32 @@ Item *Item::melon = nullptr; Item *Item::seeds_pumpkin = nullptr; Item *Item::seeds_melon = nullptr; -Item *Item::beef_raw = nullptr; -Item *Item::beef_cooked = nullptr; -Item *Item::chicken_raw = nullptr; -Item *Item::chicken_cooked = nullptr; +Item *Item::raw_beef = nullptr; +Item *Item::cooked_beef = nullptr; +Item *Item::raw_chicken = nullptr; +Item *Item::cooked_chicken = nullptr; Item *Item::rotten_flesh = nullptr; -Item *Item::enderPearl = nullptr; +Item *Item::ender_pearl = nullptr; -Item *Item::blazeRod = nullptr; -Item *Item::ghastTear = nullptr; -Item *Item::goldNugget = nullptr; +Item *Item::blaze_rod = nullptr; +Item *Item::ghast_tear = nullptr; +Item *Item::gold_nugget = nullptr; Item *Item::netherwart_seeds = nullptr; PotionItem *Item::potion = nullptr; Item *Item::glassBottle = nullptr; -Item *Item::spiderEye = nullptr; -Item *Item::fermentedSpiderEye = nullptr; -Item *Item::blazePowder = nullptr; -Item *Item::magmaCream = nullptr; -Item *Item::brewingStand = nullptr; +Item *Item::spider_eye = nullptr; +Item *Item::fermented_spider_eye = nullptr; +Item *Item::blaze_powder = nullptr; +Item *Item::magma_cream = nullptr; +Item *Item::brewing_stand = nullptr; Item *Item::cauldron = nullptr; -Item *Item::eyeOfEnder = nullptr; -Item *Item::speckledMelon = nullptr; +Item *Item::eye_of_ender = nullptr; +Item *Item::speckled_melon = nullptr; -Item *Item::spawnEgg = nullptr; +Item *Item::spawn_egg = nullptr; -Item *Item::expBottle = nullptr; +Item *Item::experience_bottle = nullptr; // TU9 Item *Item::fireball = nullptr; @@ -218,57 +218,57 @@ Item *Item::skull = nullptr; // TU14 -Item *Item::writingBook = nullptr; -Item *Item::writtenBook = nullptr; +Item *Item::writable_book = nullptr; +Item *Item::written_book = nullptr; Item *Item::emerald = nullptr; -Item *Item::flowerPot = nullptr; +Item *Item::flower_pot = nullptr; Item *Item::carrots = nullptr; Item *Item::potato = nullptr; -Item *Item::potatoBaked = nullptr; -Item *Item::potatoPoisonous = nullptr; +Item *Item::baked_potato = nullptr; +Item *Item::poisonous_potato = nullptr; -EmptyMapItem *Item::emptyMap = nullptr; +EmptyMapItem *Item::empty_map = nullptr; -Item *Item::carrotGolden = nullptr; +Item *Item::golden_carrot = nullptr; -Item *Item::carrotOnAStick = nullptr; -Item *Item::netherStar = nullptr; -Item *Item::pumpkinPie = nullptr; +Item *Item::carrot_on_a_stick = nullptr; +Item *Item::nether_star = nullptr; +Item *Item::pumpkin_pie = nullptr; Item *Item::fireworks = nullptr; -Item *Item::fireworksCharge = nullptr; +Item *Item::firework_charge = nullptr; -EnchantedBookItem *Item::enchantedBook = nullptr; +EnchantedBookItem *Item::enchanted_book = nullptr; Item *Item::comparator = nullptr; Item *Item::netherbrick = nullptr; -Item *Item::netherQuartz = nullptr; -Item *Item::minecart_tnt = nullptr; -Item *Item::minecart_hopper = nullptr; +Item *Item::nether_quartz = nullptr; +Item *Item::tnt_minecart = nullptr; +Item *Item::hopper_minecart = nullptr; -Item *Item::horseArmorMetal = nullptr; -Item *Item::horseArmorGold = nullptr; -Item *Item::horseArmorDiamond = nullptr; +Item *Item::iron_horse_armor = nullptr; +Item *Item::golden_horse_armor = nullptr; +Item *Item::diamond_horse_armor = nullptr; Item *Item::lead = nullptr; -Item *Item::nameTag = nullptr; +Item *Item::name_tag = nullptr; -Item* Item::door_spruce = nullptr; -Item* Item::door_birch = nullptr; -Item* Item::door_jungle = nullptr; -Item* Item::door_acacia = nullptr; -Item* Item::door_dark = nullptr; +Item* Item::spruce_door = nullptr; +Item* Item::birch_door = nullptr; +Item* Item::jungle_door = nullptr; +Item* Item::acacia_door = nullptr; +Item* Item::dark_oak_door = nullptr; //TU31 -Item* Item::mutton_raw = nullptr; -Item* Item::mutton_cooked = nullptr; -Item* Item::rabbit_raw = nullptr; -Item* Item::rabbit_cooked = nullptr; -Item* Item::rabbits_foot = nullptr; +Item* Item::raw_mutton = nullptr; +Item* Item::cooked_mutton = nullptr; +Item* Item::raw_rabbit = nullptr; +Item* Item::cooked_rabbit = nullptr; +Item* Item::rabbit_foot = nullptr; Item* Item::rabbit_hide = nullptr; Item* Item::armor_stand = nullptr; -Item* Item::rabbitStew = nullptr; +Item* Item::rabbit_stew = nullptr; Item* Item::prismarine_crystal = nullptr; Item* Item::prismarine_shard = nullptr; @@ -277,75 +277,75 @@ Item* Item::elytra = nullptr; void Item::staticCtor() { - Item::sword_wood = ( new WeaponItem(12, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_wood) ->setIconName(L"swordWood")->setDescriptionId(IDS_ITEM_SWORD_WOOD)->setUseDescriptionId(IDS_DESC_SWORD); - Item::sword_stone = ( new WeaponItem(16, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_stone) ->setIconName(L"swordStone")->setDescriptionId(IDS_ITEM_SWORD_STONE)->setUseDescriptionId(IDS_DESC_SWORD); - Item::sword_iron = ( new WeaponItem(11, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_iron) ->setIconName(L"swordIron")->setDescriptionId(IDS_ITEM_SWORD_IRON)->setUseDescriptionId(IDS_DESC_SWORD); - Item::sword_diamond = ( new WeaponItem(20, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_diamond) ->setIconName(L"swordDiamond")->setDescriptionId(IDS_ITEM_SWORD_DIAMOND)->setUseDescriptionId(IDS_DESC_SWORD); - Item::sword_gold = ( new WeaponItem(27, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_gold) ->setIconName(L"swordGold")->setDescriptionId(IDS_ITEM_SWORD_GOLD)->setUseDescriptionId(IDS_DESC_SWORD); + Item::wooden_sword = ( new WeaponItem(12, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_wood) ->setIconName(L"swordWood")->setDescriptionId(IDS_ITEM_SWORD_WOOD)->setUseDescriptionId(IDS_DESC_SWORD); + Item::stone_sword = ( new WeaponItem(16, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_stone) ->setIconName(L"swordStone")->setDescriptionId(IDS_ITEM_SWORD_STONE)->setUseDescriptionId(IDS_DESC_SWORD); + Item::iron_sword = ( new WeaponItem(11, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_iron) ->setIconName(L"swordIron")->setDescriptionId(IDS_ITEM_SWORD_IRON)->setUseDescriptionId(IDS_DESC_SWORD); + Item::diamond_sword = ( new WeaponItem(20, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_diamond) ->setIconName(L"swordDiamond")->setDescriptionId(IDS_ITEM_SWORD_DIAMOND)->setUseDescriptionId(IDS_DESC_SWORD); + Item::golden_sword = ( new WeaponItem(27, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_gold) ->setIconName(L"swordGold")->setDescriptionId(IDS_ITEM_SWORD_GOLD)->setUseDescriptionId(IDS_DESC_SWORD); - Item::shovel_wood = ( new ShovelItem(13, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_wood) ->setIconName(L"shovelWood")->setDescriptionId(IDS_ITEM_SHOVEL_WOOD)->setUseDescriptionId(IDS_DESC_SHOVEL); - Item::shovel_stone = ( new ShovelItem(17, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_stone) ->setIconName(L"shovelStone")->setDescriptionId(IDS_ITEM_SHOVEL_STONE)->setUseDescriptionId(IDS_DESC_SHOVEL); - Item::shovel_iron = ( new ShovelItem(0, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_iron) ->setIconName(L"shovelIron")->setDescriptionId(IDS_ITEM_SHOVEL_IRON)->setUseDescriptionId(IDS_DESC_SHOVEL); - Item::shovel_diamond = ( new ShovelItem(21, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_diamond) ->setIconName(L"shovelDiamond")->setDescriptionId(IDS_ITEM_SHOVEL_DIAMOND)->setUseDescriptionId(IDS_DESC_SHOVEL); - Item::shovel_gold = ( new ShovelItem(28, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_gold) ->setIconName(L"shovelGold")->setDescriptionId(IDS_ITEM_SHOVEL_GOLD)->setUseDescriptionId(IDS_DESC_SHOVEL); + Item::wooden_shovel = ( new ShovelItem(13, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_wood) ->setIconName(L"shovelWood")->setDescriptionId(IDS_ITEM_SHOVEL_WOOD)->setUseDescriptionId(IDS_DESC_SHOVEL); + Item::stone_shovel = ( new ShovelItem(17, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_stone) ->setIconName(L"shovelStone")->setDescriptionId(IDS_ITEM_SHOVEL_STONE)->setUseDescriptionId(IDS_DESC_SHOVEL); + Item::iron_shovel = ( new ShovelItem(0, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_iron) ->setIconName(L"shovelIron")->setDescriptionId(IDS_ITEM_SHOVEL_IRON)->setUseDescriptionId(IDS_DESC_SHOVEL); + Item::diamond_shovel = ( new ShovelItem(21, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_diamond) ->setIconName(L"shovelDiamond")->setDescriptionId(IDS_ITEM_SHOVEL_DIAMOND)->setUseDescriptionId(IDS_DESC_SHOVEL); + Item::golden_shovel = ( new ShovelItem(28, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_gold) ->setIconName(L"shovelGold")->setDescriptionId(IDS_ITEM_SHOVEL_GOLD)->setUseDescriptionId(IDS_DESC_SHOVEL); - Item::pickAxe_wood = ( new PickaxeItem(14, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_wood) ->setIconName(L"pickaxeWood")->setDescriptionId(IDS_ITEM_PICKAXE_WOOD)->setUseDescriptionId(IDS_DESC_PICKAXE); - Item::pickAxe_stone = ( new PickaxeItem(18, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_stone) ->setIconName(L"pickaxeStone")->setDescriptionId(IDS_ITEM_PICKAXE_STONE)->setUseDescriptionId(IDS_DESC_PICKAXE); - Item::pickAxe_iron = ( new PickaxeItem(1, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_iron) ->setIconName(L"pickaxeIron")->setDescriptionId(IDS_ITEM_PICKAXE_IRON)->setUseDescriptionId(IDS_DESC_PICKAXE); - Item::pickAxe_diamond = ( new PickaxeItem(22, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_diamond) ->setIconName(L"pickaxeDiamond")->setDescriptionId(IDS_ITEM_PICKAXE_DIAMOND)->setUseDescriptionId(IDS_DESC_PICKAXE); - Item::pickAxe_gold = ( new PickaxeItem(29, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_gold) ->setIconName(L"pickaxeGold")->setDescriptionId(IDS_ITEM_PICKAXE_GOLD)->setUseDescriptionId(IDS_DESC_PICKAXE); + Item::wooden_pickaxe = ( new PickaxeItem(14, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_wood) ->setIconName(L"pickaxeWood")->setDescriptionId(IDS_ITEM_PICKAXE_WOOD)->setUseDescriptionId(IDS_DESC_PICKAXE); + Item::stone_pickaxe = ( new PickaxeItem(18, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_stone) ->setIconName(L"pickaxeStone")->setDescriptionId(IDS_ITEM_PICKAXE_STONE)->setUseDescriptionId(IDS_DESC_PICKAXE); + Item::iron_pickaxe = ( new PickaxeItem(1, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_iron) ->setIconName(L"pickaxeIron")->setDescriptionId(IDS_ITEM_PICKAXE_IRON)->setUseDescriptionId(IDS_DESC_PICKAXE); + Item::diamond_pickaxe = ( new PickaxeItem(22, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_diamond) ->setIconName(L"pickaxeDiamond")->setDescriptionId(IDS_ITEM_PICKAXE_DIAMOND)->setUseDescriptionId(IDS_DESC_PICKAXE); + Item::golden_pickaxe = ( new PickaxeItem(29, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_gold) ->setIconName(L"pickaxeGold")->setDescriptionId(IDS_ITEM_PICKAXE_GOLD)->setUseDescriptionId(IDS_DESC_PICKAXE); - Item::hatchet_wood = ( new HatchetItem(15, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_wood) ->setIconName(L"hatchetWood")->setDescriptionId(IDS_ITEM_HATCHET_WOOD)->setUseDescriptionId(IDS_DESC_HATCHET); - Item::hatchet_stone = ( new HatchetItem(19, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_stone) ->setIconName(L"hatchetStone")->setDescriptionId(IDS_ITEM_HATCHET_STONE)->setUseDescriptionId(IDS_DESC_HATCHET); - Item::hatchet_iron = ( new HatchetItem(2, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_iron) ->setIconName(L"hatchetIron")->setDescriptionId(IDS_ITEM_HATCHET_IRON)->setUseDescriptionId(IDS_DESC_HATCHET); - Item::hatchet_diamond = ( new HatchetItem(23, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_diamond) ->setIconName(L"hatchetDiamond")->setDescriptionId(IDS_ITEM_HATCHET_DIAMOND)->setUseDescriptionId(IDS_DESC_HATCHET); - Item::hatchet_gold = ( new HatchetItem(30, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_gold) ->setIconName(L"hatchetGold")->setDescriptionId(IDS_ITEM_HATCHET_GOLD)->setUseDescriptionId(IDS_DESC_HATCHET); + Item::wooden_axe = ( new HatchetItem(15, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_wood) ->setIconName(L"hatchetWood")->setDescriptionId(IDS_ITEM_HATCHET_WOOD)->setUseDescriptionId(IDS_DESC_HATCHET); + Item::stone_axe = ( new HatchetItem(19, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_stone) ->setIconName(L"hatchetStone")->setDescriptionId(IDS_ITEM_HATCHET_STONE)->setUseDescriptionId(IDS_DESC_HATCHET); + Item::iron_axe = ( new HatchetItem(2, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_iron) ->setIconName(L"hatchetIron")->setDescriptionId(IDS_ITEM_HATCHET_IRON)->setUseDescriptionId(IDS_DESC_HATCHET); + Item::diamond_axe = ( new HatchetItem(23, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_diamond) ->setIconName(L"hatchetDiamond")->setDescriptionId(IDS_ITEM_HATCHET_DIAMOND)->setUseDescriptionId(IDS_DESC_HATCHET); + Item::golden_axe = ( new HatchetItem(30, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_gold) ->setIconName(L"hatchetGold")->setDescriptionId(IDS_ITEM_HATCHET_GOLD)->setUseDescriptionId(IDS_DESC_HATCHET); - Item::hoe_wood = ( new HoeItem(34, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_wood) ->setIconName(L"hoeWood")->setDescriptionId(IDS_ITEM_HOE_WOOD)->setUseDescriptionId(IDS_DESC_HOE); - Item::hoe_stone = ( new HoeItem(35, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_stone) ->setIconName(L"hoeStone")->setDescriptionId(IDS_ITEM_HOE_STONE)->setUseDescriptionId(IDS_DESC_HOE); - Item::hoe_iron = ( new HoeItem(36, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_iron) ->setIconName(L"hoeIron")->setDescriptionId(IDS_ITEM_HOE_IRON)->setUseDescriptionId(IDS_DESC_HOE); - Item::hoe_diamond = ( new HoeItem(37, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_diamond) ->setIconName(L"hoeDiamond")->setDescriptionId(IDS_ITEM_HOE_DIAMOND)->setUseDescriptionId(IDS_DESC_HOE); - Item::hoe_gold = ( new HoeItem(38, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_gold) ->setIconName(L"hoeGold")->setDescriptionId(IDS_ITEM_HOE_GOLD)->setUseDescriptionId(IDS_DESC_HOE); + Item::wooden_hoe = ( new HoeItem(34, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_wood) ->setIconName(L"hoeWood")->setDescriptionId(IDS_ITEM_HOE_WOOD)->setUseDescriptionId(IDS_DESC_HOE); + Item::stone_hoe = ( new HoeItem(35, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_stone) ->setIconName(L"hoeStone")->setDescriptionId(IDS_ITEM_HOE_STONE)->setUseDescriptionId(IDS_DESC_HOE); + Item::iron_hoe = ( new HoeItem(36, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_iron) ->setIconName(L"hoeIron")->setDescriptionId(IDS_ITEM_HOE_IRON)->setUseDescriptionId(IDS_DESC_HOE); + Item::diamond_hoe = ( new HoeItem(37, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_diamond) ->setIconName(L"hoeDiamond")->setDescriptionId(IDS_ITEM_HOE_DIAMOND)->setUseDescriptionId(IDS_DESC_HOE); + Item::golden_hoe = ( new HoeItem(38, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_gold) ->setIconName(L"hoeGold")->setDescriptionId(IDS_ITEM_HOE_GOLD)->setUseDescriptionId(IDS_DESC_HOE); - Item::door_wood = ( new DoorItem(68, Material::wood, L"doorWood"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorWood")->setDescriptionId(IDS_ITEM_DOOR_WOOD)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::door_iron = ( new DoorItem(74, Material::metal, L"doorIron"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_iron)->setIconName(L"doorIron")->setDescriptionId(IDS_ITEM_DOOR_IRON)->setUseDescriptionId(IDS_DESC_DOOR_IRON); + Item::wooden_door = ( new DoorItem(68, Material::wood, L"doorWood"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorWood")->setDescriptionId(IDS_ITEM_DOOR_WOOD)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::iron_door = ( new DoorItem(74, Material::metal, L"doorIron"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_iron)->setIconName(L"doorIron")->setDescriptionId(IDS_ITEM_DOOR_IRON)->setUseDescriptionId(IDS_DESC_DOOR_IRON); - Item::helmet_leather = static_cast((new ArmorItem(42, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_cloth)->setIconName(L"helmetCloth")->setDescriptionId(IDS_ITEM_HELMET_CLOTH)->setUseDescriptionId(IDS_DESC_HELMET_LEATHER)); - Item::helmet_iron = static_cast((new ArmorItem(50, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_iron)->setIconName(L"helmetIron")->setDescriptionId(IDS_ITEM_HELMET_IRON)->setUseDescriptionId(IDS_DESC_HELMET_IRON)); - Item::helmet_diamond = static_cast((new ArmorItem(54, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_diamond)->setIconName(L"helmetDiamond")->setDescriptionId(IDS_ITEM_HELMET_DIAMOND)->setUseDescriptionId(IDS_DESC_HELMET_DIAMOND)); - Item::helmet_gold = static_cast((new ArmorItem(58, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_gold)->setIconName(L"helmetGold")->setDescriptionId(IDS_ITEM_HELMET_GOLD)->setUseDescriptionId(IDS_DESC_HELMET_GOLD)); + Item::leather_helmet = static_cast((new ArmorItem(42, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_cloth)->setIconName(L"helmetCloth")->setDescriptionId(IDS_ITEM_HELMET_CLOTH)->setUseDescriptionId(IDS_DESC_HELMET_LEATHER)); + Item::iron_helmet = static_cast((new ArmorItem(50, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_iron)->setIconName(L"helmetIron")->setDescriptionId(IDS_ITEM_HELMET_IRON)->setUseDescriptionId(IDS_DESC_HELMET_IRON)); + Item::diamond_helmet = static_cast((new ArmorItem(54, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_diamond)->setIconName(L"helmetDiamond")->setDescriptionId(IDS_ITEM_HELMET_DIAMOND)->setUseDescriptionId(IDS_DESC_HELMET_DIAMOND)); + Item::golden_helmet = static_cast((new ArmorItem(58, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_gold)->setIconName(L"helmetGold")->setDescriptionId(IDS_ITEM_HELMET_GOLD)->setUseDescriptionId(IDS_DESC_HELMET_GOLD)); - Item::chestplate_leather = static_cast((new ArmorItem(43, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_cloth)->setIconName(L"chestplateCloth")->setDescriptionId(IDS_ITEM_CHESTPLATE_CLOTH)->setUseDescriptionId(IDS_DESC_CHESTPLATE_LEATHER)); - Item::chestplate_iron = static_cast((new ArmorItem(51, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_iron)->setIconName(L"chestplateIron")->setDescriptionId(IDS_ITEM_CHESTPLATE_IRON)->setUseDescriptionId(IDS_DESC_CHESTPLATE_IRON)); - Item::chestplate_diamond = static_cast((new ArmorItem(55, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_diamond)->setIconName(L"chestplateDiamond")->setDescriptionId(IDS_ITEM_CHESTPLATE_DIAMOND)->setUseDescriptionId(IDS_DESC_CHESTPLATE_DIAMOND)); - Item::chestplate_gold = static_cast((new ArmorItem(59, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_gold)->setIconName(L"chestplateGold")->setDescriptionId(IDS_ITEM_CHESTPLATE_GOLD)->setUseDescriptionId(IDS_DESC_CHESTPLATE_GOLD)); + Item::leather_chestplate = static_cast((new ArmorItem(43, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_cloth)->setIconName(L"chestplateCloth")->setDescriptionId(IDS_ITEM_CHESTPLATE_CLOTH)->setUseDescriptionId(IDS_DESC_CHESTPLATE_LEATHER)); + Item::iron_chestplate = static_cast((new ArmorItem(51, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_iron)->setIconName(L"chestplateIron")->setDescriptionId(IDS_ITEM_CHESTPLATE_IRON)->setUseDescriptionId(IDS_DESC_CHESTPLATE_IRON)); + Item::diamond_chestplate = static_cast((new ArmorItem(55, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_diamond)->setIconName(L"chestplateDiamond")->setDescriptionId(IDS_ITEM_CHESTPLATE_DIAMOND)->setUseDescriptionId(IDS_DESC_CHESTPLATE_DIAMOND)); + Item::golden_chestplate = static_cast((new ArmorItem(59, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_gold)->setIconName(L"chestplateGold")->setDescriptionId(IDS_ITEM_CHESTPLATE_GOLD)->setUseDescriptionId(IDS_DESC_CHESTPLATE_GOLD)); - Item::leggings_leather = static_cast((new ArmorItem(44, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_cloth)->setIconName(L"leggingsCloth")->setDescriptionId(IDS_ITEM_LEGGINGS_CLOTH)->setUseDescriptionId(IDS_DESC_LEGGINGS_LEATHER)); - Item::leggings_iron = static_cast((new ArmorItem(52, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_iron)->setIconName(L"leggingsIron")->setDescriptionId(IDS_ITEM_LEGGINGS_IRON)->setUseDescriptionId(IDS_DESC_LEGGINGS_IRON)); - Item::leggings_diamond = static_cast((new ArmorItem(56, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_diamond)->setIconName(L"leggingsDiamond")->setDescriptionId(IDS_ITEM_LEGGINGS_DIAMOND)->setUseDescriptionId(IDS_DESC_LEGGINGS_DIAMOND)); - Item::leggings_gold = static_cast((new ArmorItem(60, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_gold)->setIconName(L"leggingsGold")->setDescriptionId(IDS_ITEM_LEGGINGS_GOLD)->setUseDescriptionId(IDS_DESC_LEGGINGS_GOLD)); + Item::leather_leggings = static_cast((new ArmorItem(44, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_cloth)->setIconName(L"leggingsCloth")->setDescriptionId(IDS_ITEM_LEGGINGS_CLOTH)->setUseDescriptionId(IDS_DESC_LEGGINGS_LEATHER)); + Item::iron_leggings = static_cast((new ArmorItem(52, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_iron)->setIconName(L"leggingsIron")->setDescriptionId(IDS_ITEM_LEGGINGS_IRON)->setUseDescriptionId(IDS_DESC_LEGGINGS_IRON)); + Item::diamond_leggings = static_cast((new ArmorItem(56, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_diamond)->setIconName(L"leggingsDiamond")->setDescriptionId(IDS_ITEM_LEGGINGS_DIAMOND)->setUseDescriptionId(IDS_DESC_LEGGINGS_DIAMOND)); + Item::golden_leggings = static_cast((new ArmorItem(60, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_gold)->setIconName(L"leggingsGold")->setDescriptionId(IDS_ITEM_LEGGINGS_GOLD)->setUseDescriptionId(IDS_DESC_LEGGINGS_GOLD)); - Item::helmet_chain = static_cast((new ArmorItem(46, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_chain)->setIconName(L"helmetChain")->setDescriptionId(IDS_ITEM_HELMET_CHAIN)->setUseDescriptionId(IDS_DESC_HELMET_CHAIN)); - Item::chestplate_chain = static_cast((new ArmorItem(47, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_chain)->setIconName(L"chestplateChain")->setDescriptionId(IDS_ITEM_CHESTPLATE_CHAIN)->setUseDescriptionId(IDS_DESC_CHESTPLATE_CHAIN)); - Item::leggings_chain = static_cast((new ArmorItem(48, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_chain)->setIconName(L"leggingsChain")->setDescriptionId(IDS_ITEM_LEGGINGS_CHAIN)->setUseDescriptionId(IDS_DESC_LEGGINGS_CHAIN)); - Item::boots_chain = static_cast((new ArmorItem(49, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_chain)->setIconName(L"bootsChain")->setDescriptionId(IDS_ITEM_BOOTS_CHAIN)->setUseDescriptionId(IDS_DESC_BOOTS_CHAIN)); + Item::chainmail_helmet = static_cast((new ArmorItem(46, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_chain)->setIconName(L"helmetChain")->setDescriptionId(IDS_ITEM_HELMET_CHAIN)->setUseDescriptionId(IDS_DESC_HELMET_CHAIN)); + Item::chainmail_chestplate = static_cast((new ArmorItem(47, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_chain)->setIconName(L"chestplateChain")->setDescriptionId(IDS_ITEM_CHESTPLATE_CHAIN)->setUseDescriptionId(IDS_DESC_CHESTPLATE_CHAIN)); + Item::chainmail_leggings = static_cast((new ArmorItem(48, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_chain)->setIconName(L"leggingsChain")->setDescriptionId(IDS_ITEM_LEGGINGS_CHAIN)->setUseDescriptionId(IDS_DESC_LEGGINGS_CHAIN)); + Item::chainmail_boots = static_cast((new ArmorItem(49, ArmorItem::ArmorMaterial::CHAIN, 1, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_chain)->setIconName(L"bootsChain")->setDescriptionId(IDS_ITEM_BOOTS_CHAIN)->setUseDescriptionId(IDS_DESC_BOOTS_CHAIN)); - Item::boots_leather = static_cast((new ArmorItem(45, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_cloth)->setIconName(L"bootsCloth")->setDescriptionId(IDS_ITEM_BOOTS_CLOTH)->setUseDescriptionId(IDS_DESC_BOOTS_LEATHER)); - Item::boots_iron = static_cast((new ArmorItem(53, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_iron)->setIconName(L"bootsIron")->setDescriptionId(IDS_ITEM_BOOTS_IRON)->setUseDescriptionId(IDS_DESC_BOOTS_IRON)); - Item::boots_diamond = static_cast((new ArmorItem(57, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_diamond)->setIconName(L"bootsDiamond")->setDescriptionId(IDS_ITEM_BOOTS_DIAMOND)->setUseDescriptionId(IDS_DESC_BOOTS_DIAMOND)); - Item::boots_gold = static_cast((new ArmorItem(61, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_gold)->setIconName(L"bootsGold")->setDescriptionId(IDS_ITEM_BOOTS_GOLD)->setUseDescriptionId(IDS_DESC_BOOTS_GOLD)); + Item::leather_boots = static_cast((new ArmorItem(45, ArmorItem::ArmorMaterial::CLOTH, 0, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_cloth)->setIconName(L"bootsCloth")->setDescriptionId(IDS_ITEM_BOOTS_CLOTH)->setUseDescriptionId(IDS_DESC_BOOTS_LEATHER)); + Item::iron_boots = static_cast((new ArmorItem(53, ArmorItem::ArmorMaterial::IRON, 2, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_iron)->setIconName(L"bootsIron")->setDescriptionId(IDS_ITEM_BOOTS_IRON)->setUseDescriptionId(IDS_DESC_BOOTS_IRON)); + Item::diamond_boots = static_cast((new ArmorItem(57, ArmorItem::ArmorMaterial::DIAMOND, 3, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_diamond)->setIconName(L"bootsDiamond")->setDescriptionId(IDS_ITEM_BOOTS_DIAMOND)->setUseDescriptionId(IDS_DESC_BOOTS_DIAMOND)); + Item::golden_boots = static_cast((new ArmorItem(61, ArmorItem::ArmorMaterial::GOLD, 4, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_gold)->setIconName(L"bootsGold")->setDescriptionId(IDS_ITEM_BOOTS_GOLD)->setUseDescriptionId(IDS_DESC_BOOTS_GOLD)); - Item::ironIngot = ( new Item(9) )->setIconName(L"ingotIron") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_iron)->setDescriptionId(IDS_ITEM_INGOT_IRON)->setUseDescriptionId(IDS_DESC_INGOT); - Item::goldIngot = ( new Item(10) )->setIconName(L"ingotGold") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold)->setDescriptionId(IDS_ITEM_INGOT_GOLD)->setUseDescriptionId(IDS_DESC_INGOT); + Item::iron_ingot = ( new Item(9) )->setIconName(L"ingotIron") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_iron)->setDescriptionId(IDS_ITEM_INGOT_IRON)->setUseDescriptionId(IDS_DESC_INGOT); + Item::gold_ingot = ( new Item(10) )->setIconName(L"ingotGold") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold)->setDescriptionId(IDS_ITEM_INGOT_GOLD)->setUseDescriptionId(IDS_DESC_INGOT); // 4J-PB - todo - add materials and base types to the ones below - Item::bucket_empty = ( new BucketItem(69, 0) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_water)->setIconName(L"bucket")->setDescriptionId(IDS_ITEM_BUCKET)->setUseDescriptionId(IDS_DESC_BUCKET)->setMaxStackSize(16); + Item::bucket = ( new BucketItem(69, 0) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_water)->setIconName(L"bucket")->setDescriptionId(IDS_ITEM_BUCKET)->setUseDescriptionId(IDS_DESC_BUCKET)->setMaxStackSize(16); Item::bowl = ( new Item(25) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_wood)->setIconName(L"bowl")->setDescriptionId(IDS_ITEM_BOWL)->setUseDescriptionId(IDS_DESC_BOWL)->setMaxStackSize(64); - Item::bucket_water = ( new BucketItem(70, Tile::water_Id) ) ->setIconName(L"bucketWater")->setDescriptionId(IDS_ITEM_BUCKET_WATER)->setCraftingRemainingItem(Item::bucket_empty)->setUseDescriptionId(IDS_DESC_BUCKET_WATER); - Item::bucket_lava = ( new BucketItem(71, Tile::lava_Id) ) ->setIconName(L"bucketLava")->setDescriptionId(IDS_ITEM_BUCKET_LAVA)->setCraftingRemainingItem(Item::bucket_empty)->setUseDescriptionId(IDS_DESC_BUCKET_LAVA); - Item::bucket_milk = ( new MilkBucketItem(79) )->setIconName(L"milk")->setDescriptionId(IDS_ITEM_BUCKET_MILK)->setCraftingRemainingItem(Item::bucket_empty)->setUseDescriptionId(IDS_DESC_BUCKET_MILK); + Item::water_bucket = ( new BucketItem(70, Tile::flowing_water_Id) ) ->setIconName(L"bucketWater")->setDescriptionId(IDS_ITEM_BUCKET_WATER)->setCraftingRemainingItem(Item::bucket)->setUseDescriptionId(IDS_DESC_BUCKET_WATER); + Item::lava_bucket = ( new BucketItem(71, Tile::flowing_lava_Id) ) ->setIconName(L"bucketLava")->setDescriptionId(IDS_ITEM_BUCKET_LAVA)->setCraftingRemainingItem(Item::bucket)->setUseDescriptionId(IDS_DESC_BUCKET_LAVA); + Item::milk_bucket = ( new MilkBucketItem(79) )->setIconName(L"milk")->setDescriptionId(IDS_ITEM_BUCKET_MILK)->setCraftingRemainingItem(Item::bucket)->setUseDescriptionId(IDS_DESC_BUCKET_MILK); Item::bow = static_cast((new BowItem(5))->setIconName(L"bow")->setBaseItemTypeAndMaterial(eBaseItemType_bow, eMaterial_bow)->setDescriptionId(IDS_ITEM_BOW)->setUseDescriptionId(IDS_DESC_BOW)); Item::arrow = ( new Item(6) ) ->setIconName(L"arrow")->setBaseItemTypeAndMaterial(eBaseItemType_bow, eMaterial_arrow) ->setDescriptionId(IDS_ITEM_ARROW)->setUseDescriptionId(IDS_DESC_ARROW); @@ -354,30 +354,30 @@ void Item::staticCtor() Item::clock = ( new ClockItem(91) ) ->setIconName(L"clock")->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_clock) ->setDescriptionId(IDS_ITEM_CLOCK)->setUseDescriptionId(IDS_DESC_CLOCK); Item::map = static_cast((new MapItem(102))->setIconName(L"map")->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map)->setDescriptionId(IDS_ITEM_MAP)->setUseDescriptionId(IDS_DESC_MAP)); - Item::flintAndSteel = ( new FlintAndSteelItem(3) ) ->setIconName(L"flintAndSteel")->setBaseItemTypeAndMaterial(eBaseItemType_devicetool, eMaterial_flintandsteel)->setDescriptionId(IDS_ITEM_FLINT_AND_STEEL)->setUseDescriptionId(IDS_DESC_FLINTANDSTEEL); + Item::flint_and_steel = ( new FlintAndSteelItem(3) ) ->setIconName(L"flint_and_steel")->setBaseItemTypeAndMaterial(eBaseItemType_devicetool, eMaterial_flintandsteel)->setDescriptionId(IDS_ITEM_FLINT_AND_STEEL)->setUseDescriptionId(IDS_DESC_FLINTANDSTEEL); Item::apple = ( new FoodItem(4, 4, FoodConstants::FOOD_SATURATION_LOW, false) ) ->setIconName(L"apple")->setDescriptionId(IDS_ITEM_APPLE)->setUseDescriptionId(IDS_DESC_APPLE); Item::coal = ( new CoalItem(7) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_coal)->setIconName(L"coal")->setDescriptionId(IDS_ITEM_COAL)->setUseDescriptionId(IDS_DESC_COAL); Item::diamond = ( new Item(8) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_diamond)->setIconName(L"diamond")->setDescriptionId(IDS_ITEM_DIAMOND)->setUseDescriptionId(IDS_DESC_DIAMONDS); Item::stick = ( new Item(24) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stick, Item::eMaterial_wood)->setIconName(L"stick")->handEquipped()->setDescriptionId(IDS_ITEM_STICK)->setUseDescriptionId(IDS_DESC_STICK); - Item::mushroomStew = ( new BowlFoodItem(26, 6) ) ->setIconName(L"mushroomStew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); - Item::rabbitStew = ( new BowlFoodItem(157, 10) ) ->setIconName(L"rabbitStew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); + Item::mushroom_stew = ( new BowlFoodItem(26, 6) ) ->setIconName(L"mushroom_stew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); + Item::rabbit_stew = ( new BowlFoodItem(157, 10) ) ->setIconName(L"rabbit_stew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); Item::string = ( new TilePlanterItem(31, Tile::tripWire) ) ->setIconName(L"string")->setDescriptionId(IDS_ITEM_STRING)->setUseDescriptionId(IDS_DESC_STRING); Item::feather = ( new Item(32) ) ->setIconName(L"feather")->setDescriptionId(IDS_ITEM_FEATHER)->setUseDescriptionId(IDS_DESC_FEATHER); Item::gunpowder = ( new Item(33) ) ->setIconName(L"sulphur")->setDescriptionId(IDS_ITEM_SULPHUR)->setUseDescriptionId(IDS_DESC_SULPHUR)->setPotionBrewingFormula(PotionBrewing::MOD_GUNPOWDER); - Item::seeds_wheat = ( new SeedItem(39, Tile::wheat_Id, Tile::farmland_Id) ) ->setIconName(L"seeds")->setDescriptionId(IDS_ITEM_WHEAT_SEEDS)->setUseDescriptionId(IDS_DESC_WHEAT_SEEDS); + Item::wheat_seeds = ( new SeedItem(39, Tile::wheat_Id, Tile::farmland_Id) ) ->setIconName(L"seeds")->setDescriptionId(IDS_ITEM_WHEAT_SEEDS)->setUseDescriptionId(IDS_DESC_WHEAT_SEEDS); Item::wheat = ( new Item(40) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_wheat)->setIconName(L"wheat")->setDescriptionId(IDS_ITEM_WHEAT)->setUseDescriptionId(IDS_DESC_WHEAT); Item::bread = ( new FoodItem(41, 5, FoodConstants::FOOD_SATURATION_NORMAL, false) ) ->setIconName(L"bread")->setDescriptionId(IDS_ITEM_BREAD)->setUseDescriptionId(IDS_DESC_BREAD); Item::flint = ( new Item(62) ) ->setIconName(L"flint")->setDescriptionId(IDS_ITEM_FLINT)->setUseDescriptionId(IDS_DESC_FLINT); - Item::porkChop_raw = ( new FoodItem(63, 3, FoodConstants::FOOD_SATURATION_LOW, true) ) ->setIconName(L"porkchopRaw")->setDescriptionId(IDS_ITEM_PORKCHOP_RAW)->setUseDescriptionId(IDS_DESC_PORKCHOP_RAW); - Item::porkChop_cooked = ( new FoodItem(64, 8, FoodConstants::FOOD_SATURATION_GOOD, true) ) ->setIconName(L"porkchopCooked")->setDescriptionId(IDS_ITEM_PORKCHOP_COOKED)->setUseDescriptionId(IDS_DESC_PORKCHOP_COOKED); + Item::raw_porkchop = ( new FoodItem(63, 3, FoodConstants::FOOD_SATURATION_LOW, true) ) ->setIconName(L"porkchopRaw")->setDescriptionId(IDS_ITEM_PORKCHOP_RAW)->setUseDescriptionId(IDS_DESC_PORKCHOP_RAW); + Item::cooked_porkchop = ( new FoodItem(64, 8, FoodConstants::FOOD_SATURATION_GOOD, true) ) ->setIconName(L"porkchopCooked")->setDescriptionId(IDS_ITEM_PORKCHOP_COOKED)->setUseDescriptionId(IDS_DESC_PORKCHOP_COOKED); Item::painting = ( new HangingEntityItem(65,eTYPE_PAINTING) ) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, eMaterial_cloth)->setIconName(L"painting")->setDescriptionId(IDS_ITEM_PAINTING)->setUseDescriptionId(IDS_DESC_PICTURE); - Item::apple_gold = ( new GoldenAppleItem(66, 4, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false) )->setCanAlwaysEat()->setEatEffect(MobEffect::regeneration->id, 5, 1, 1.0f) + Item::golden_apple = ( new GoldenAppleItem(66, 4, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false) )->setCanAlwaysEat()->setEatEffect(MobEffect::regeneration->id, 5, 1, 1.0f) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit,eMaterial_apple)->setIconName(L"appleGold")->setDescriptionId(IDS_ITEM_APPLE_GOLD);//->setUseDescriptionId(IDS_DESC_GOLDENAPPLE); Item::sign = ( new SignItem(67) ) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem, eMaterial_wood)->setIconName(L"sign")->setDescriptionId(IDS_ITEM_SIGN)->setUseDescriptionId(IDS_DESC_SIGN); @@ -386,8 +386,8 @@ void Item::staticCtor() Item::minecart = ( new MinecartItem(72, Minecart::TYPE_RIDEABLE) ) ->setIconName(L"minecart")->setDescriptionId(IDS_ITEM_MINECART)->setUseDescriptionId(IDS_DESC_MINECART); Item::saddle = ( new SaddleItem(73) ) ->setIconName(L"saddle")->setDescriptionId(IDS_ITEM_SADDLE)->setUseDescriptionId(IDS_DESC_SADDLE); - Item::redStone = ( new RedStoneItem(75) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_redstone)->setIconName(L"redstone")->setDescriptionId(IDS_ITEM_REDSTONE)->setUseDescriptionId(IDS_DESC_REDSTONE_DUST)->setPotionBrewingFormula(PotionBrewing::MOD_REDSTONE); - Item::snowBall = ( new SnowballItem(76) ) ->setIconName(L"snowball")->setDescriptionId(IDS_ITEM_SNOWBALL)->setUseDescriptionId(IDS_DESC_SNOWBALL); + Item::redstone = ( new RedStoneItem(75) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_redstone)->setIconName(L"redstone")->setDescriptionId(IDS_ITEM_REDSTONE)->setUseDescriptionId(IDS_DESC_REDSTONE_DUST)->setPotionBrewingFormula(PotionBrewing::MOD_REDSTONE); + Item::snowball = ( new SnowballItem(76) ) ->setIconName(L"snowball")->setDescriptionId(IDS_ITEM_SNOWBALL)->setUseDescriptionId(IDS_DESC_SNOWBALL); Item::boat = ( new BoatItem(77) ) ->setIconName(L"boat")->setDescriptionId(IDS_ITEM_BOAT)->setUseDescriptionId(IDS_DESC_BOAT); @@ -397,16 +397,16 @@ void Item::staticCtor() Item::reeds = ( new TilePlanterItem(82, Tile::reeds) ) ->setIconName(L"reeds")->setDescriptionId(IDS_ITEM_REEDS)->setUseDescriptionId(IDS_DESC_REEDS); Item::paper = ( new Item(83) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_paper)->setIconName(L"paper")->setDescriptionId(IDS_ITEM_PAPER)->setUseDescriptionId(IDS_DESC_PAPER); Item::book = ( new BookItem(84) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"book")->setDescriptionId(IDS_ITEM_BOOK)->setUseDescriptionId(IDS_DESC_BOOK); - Item::slimeBall = ( new Item(85) ) ->setIconName(L"slimeball")->setDescriptionId(IDS_ITEM_SLIMEBALL)->setUseDescriptionId(IDS_DESC_SLIMEBALL); - Item::minecart_chest = ( new MinecartItem(86, Minecart::TYPE_CHEST) ) ->setIconName(L"minecart_chest")->setDescriptionId(IDS_ITEM_MINECART_CHEST)->setUseDescriptionId(IDS_DESC_MINECARTWITHCHEST); - Item::minecart_furnace = ( new MinecartItem(87, Minecart::TYPE_FURNACE) )->setIconName(L"minecart_furnace")->setDescriptionId(IDS_ITEM_MINECART_FURNACE)->setUseDescriptionId(IDS_DESC_MINECARTWITHFURNACE); + Item::slime_ball = ( new Item(85) ) ->setIconName(L"slimeball")->setDescriptionId(IDS_ITEM_SLIMEBALL)->setUseDescriptionId(IDS_DESC_SLIMEBALL); + Item::chest_minecart = ( new MinecartItem(86, Minecart::TYPE_CHEST) ) ->setIconName(L"chest_minecart")->setDescriptionId(IDS_ITEM_MINECART_CHEST)->setUseDescriptionId(IDS_DESC_MINECARTWITHCHEST); + Item::furnace_minecart = ( new MinecartItem(87, Minecart::TYPE_FURNACE) )->setIconName(L"furnace_minecart")->setDescriptionId(IDS_ITEM_MINECART_FURNACE)->setUseDescriptionId(IDS_DESC_MINECARTWITHFURNACE); Item::egg = ( new EggItem(88) ) ->setIconName(L"egg")->setDescriptionId(IDS_ITEM_EGG)->setUseDescriptionId(IDS_DESC_EGG); - Item::fishingRod = static_cast((new FishingRodItem(90))->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_wood)->setIconName(L"fishingRod")->setDescriptionId(IDS_ITEM_FISHING_ROD)->setUseDescriptionId(IDS_DESC_FISHINGROD)); - Item::yellowDust = ( new Item(92) ) ->setIconName(L"yellowDust")->setDescriptionId(IDS_ITEM_YELLOW_DUST)->setUseDescriptionId(IDS_DESC_YELLOW_DUST)->setPotionBrewingFormula(PotionBrewing::MOD_GLOWSTONE); - Item::fish_raw = ( new FishFoodItem(93, false) ) ->setIconName(L"fishRaw")->setDescriptionId(IDS_ITEM_FISH_RAW)->setUseDescriptionId(IDS_DESC_FISH_RAW)->setStackedByData(true)->setPotionBrewingFormula(PotionBrewing::MOD_PUFFERFISH); - Item::fish_cooked = (new FishFoodItem(94, true)) ->setIconName(L"fishCooked")->setDescriptionId(IDS_ITEM_FISH_COOKED)->setUseDescriptionId(IDS_DESC_FISH_COOKED)->setStackedByData(true); + Item::fishing_rod = static_cast((new FishingRodItem(90))->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_wood)->setIconName(L"fishing_rod")->setDescriptionId(IDS_ITEM_FISHING_ROD)->setUseDescriptionId(IDS_DESC_FISHINGROD)); + Item::glowstone_dust = ( new Item(92) ) ->setIconName(L"glowstone_dust")->setDescriptionId(IDS_ITEM_YELLOW_DUST)->setUseDescriptionId(IDS_DESC_YELLOW_DUST)->setPotionBrewingFormula(PotionBrewing::MOD_GLOWSTONE); + Item::raw_fish = ( new FishFoodItem(93, false) ) ->setIconName(L"fishRaw")->setDescriptionId(IDS_ITEM_FISH_RAW)->setUseDescriptionId(IDS_DESC_FISH_RAW)->setStackedByData(true)->setPotionBrewingFormula(PotionBrewing::MOD_PUFFERFISH); + Item::cooked_fish = (new FishFoodItem(94, true)) ->setIconName(L"fishCooked")->setDescriptionId(IDS_ITEM_FISH_COOKED)->setUseDescriptionId(IDS_DESC_FISH_COOKED)->setStackedByData(true); - Item::dye_powder = ( new DyePowderItem(95) ) ->setBaseItemTypeAndMaterial(eBaseItemType_dyepowder, eMaterial_dye)->setIconName(L"dyePowder")->setDescriptionId(IDS_ITEM_DYE_POWDER)->setUseDescriptionId(-1); + Item::dye = ( new DyePowderItem(95) ) ->setBaseItemTypeAndMaterial(eBaseItemType_dyepowder, eMaterial_dye)->setIconName(L"dyePowder")->setDescriptionId(IDS_ITEM_DYE_POWDER)->setUseDescriptionId(-1); Item::bone = ( new Item(96) ) ->setIconName(L"bone")->setDescriptionId(IDS_ITEM_BONE)->handEquipped()->setUseDescriptionId(IDS_DESC_BONE); Item::sugar = ( new Item(97) ) ->setIconName(L"sugar")->setDescriptionId(IDS_ITEM_SUGAR)->setUseDescriptionId(IDS_DESC_SUGAR)->setPotionBrewingFormula(PotionBrewing::MOD_SUGAR); @@ -416,7 +416,7 @@ void Item::staticCtor() Item::bed = ( new BedItem(99) ) ->setMaxStackSize(1)->setIconName(L"bed")->setDescriptionId(IDS_ITEM_BED)->setUseDescriptionId(IDS_DESC_BED); - Item::repeater = ( new TilePlanterItem(100, static_cast(Tile::diode_off)) ) ->setIconName(L"diode")->setDescriptionId(IDS_ITEM_DIODE)->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER); + Item::repeater = ( new TilePlanterItem(100, static_cast(Tile::unpowered_repeater)) ) ->setIconName(L"diode")->setDescriptionId(IDS_ITEM_DIODE)->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER); Item::cookie = ( new FoodItem(101, 2, FoodConstants::FOOD_SATURATION_POOR, false) ) ->setIconName(L"cookie")->setDescriptionId(IDS_ITEM_COOKIE)->setUseDescriptionId(IDS_DESC_COOKIE); @@ -424,41 +424,41 @@ void Item::staticCtor() Item::melon = (new FoodItem(104, 2, FoodConstants::FOOD_SATURATION_LOW, false)) ->setIconName(L"melon")->setDescriptionId(IDS_ITEM_MELON_SLICE)->setUseDescriptionId(IDS_DESC_MELON_SLICE); - Item::seeds_pumpkin = (new SeedItem(105, Tile::pumpkinStem_Id, Tile::farmland_Id)) ->setIconName(L"seeds_pumpkin")->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_pumpkin)->setDescriptionId(IDS_ITEM_PUMPKIN_SEEDS)->setUseDescriptionId(IDS_DESC_PUMPKIN_SEEDS); - Item::seeds_melon = (new SeedItem(106, Tile::melonStem_Id, Tile::farmland_Id)) ->setIconName(L"seeds_melon")->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_melon)->setDescriptionId(IDS_ITEM_MELON_SEEDS)->setUseDescriptionId(IDS_DESC_MELON_SEEDS); + Item::seeds_pumpkin = (new SeedItem(105, Tile::pumpkin_stem_Id, Tile::farmland_Id)) ->setIconName(L"seeds_pumpkin")->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_pumpkin)->setDescriptionId(IDS_ITEM_PUMPKIN_SEEDS)->setUseDescriptionId(IDS_DESC_PUMPKIN_SEEDS); + Item::seeds_melon = (new SeedItem(106, Tile::melon_stem_Id, Tile::farmland_Id)) ->setIconName(L"seeds_melon")->setBaseItemTypeAndMaterial(eBaseItemType_seed, eMaterial_melon)->setDescriptionId(IDS_ITEM_MELON_SEEDS)->setUseDescriptionId(IDS_DESC_MELON_SEEDS); - Item::beef_raw = (new FoodItem(107, 3, FoodConstants::FOOD_SATURATION_LOW, true)) ->setIconName(L"beefRaw")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW); - Item::beef_cooked = (new FoodItem(108, 8, FoodConstants::FOOD_SATURATION_GOOD, true))->setIconName(L"beefCooked")->setDescriptionId(IDS_ITEM_BEEF_COOKED)->setUseDescriptionId(IDS_DESC_BEEF_COOKED); - Item::chicken_raw = (new FoodItem(109, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setEatEffect(MobEffect::hunger->id, 30, 0, .3f)->setIconName(L"chickenRaw")->setDescriptionId(IDS_ITEM_CHICKEN_RAW)->setUseDescriptionId(IDS_DESC_CHICKEN_RAW); - Item::chicken_cooked = (new FoodItem(110, 6, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"chickenCooked")->setDescriptionId(IDS_ITEM_CHICKEN_COOKED)->setUseDescriptionId(IDS_DESC_CHICKEN_COOKED); + Item::raw_beef = (new FoodItem(107, 3, FoodConstants::FOOD_SATURATION_LOW, true)) ->setIconName(L"beefRaw")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW); + Item::cooked_beef = (new FoodItem(108, 8, FoodConstants::FOOD_SATURATION_GOOD, true))->setIconName(L"beefCooked")->setDescriptionId(IDS_ITEM_BEEF_COOKED)->setUseDescriptionId(IDS_DESC_BEEF_COOKED); + Item::raw_chicken = (new FoodItem(109, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setEatEffect(MobEffect::hunger->id, 30, 0, .3f)->setIconName(L"chickenRaw")->setDescriptionId(IDS_ITEM_CHICKEN_RAW)->setUseDescriptionId(IDS_DESC_CHICKEN_RAW); + Item::cooked_chicken = (new FoodItem(110, 6, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"chickenCooked")->setDescriptionId(IDS_ITEM_CHICKEN_COOKED)->setUseDescriptionId(IDS_DESC_CHICKEN_COOKED); Item::rotten_flesh = (new FoodItem(111, 4, FoodConstants::FOOD_SATURATION_POOR, true))->setEatEffect(MobEffect::hunger->id, 30, 0, .8f)->setIconName(L"rottenFlesh")->setDescriptionId(IDS_ITEM_ROTTEN_FLESH)->setUseDescriptionId(IDS_DESC_ROTTEN_FLESH); - Item::enderPearl = (new EnderpearlItem(112)) ->setIconName(L"enderPearl")->setDescriptionId(IDS_ITEM_ENDER_PEARL)->setUseDescriptionId(IDS_DESC_ENDER_PEARL); + Item::ender_pearl = (new EnderpearlItem(112)) ->setIconName(L"ender_pearl")->setDescriptionId(IDS_ITEM_ENDER_PEARL)->setUseDescriptionId(IDS_DESC_ENDER_PEARL); - Item::blazeRod = (new Item(113) ) ->setIconName(L"blazeRod")->setDescriptionId(IDS_ITEM_BLAZE_ROD)->setUseDescriptionId(IDS_DESC_BLAZE_ROD)->handEquipped(); - Item::ghastTear = (new Item(114) ) ->setIconName(L"ghastTear")->setDescriptionId(IDS_ITEM_GHAST_TEAR)->setUseDescriptionId(IDS_DESC_GHAST_TEAR)->setPotionBrewingFormula(PotionBrewing::MOD_GHASTTEARS); - Item::goldNugget = (new Item(115) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold)->setIconName(L"goldNugget")->setDescriptionId(IDS_ITEM_GOLD_NUGGET)->setUseDescriptionId(IDS_DESC_GOLD_NUGGET); + Item::blaze_rod = (new Item(113) ) ->setIconName(L"blaze_rod")->setDescriptionId(IDS_ITEM_BLAZE_ROD)->setUseDescriptionId(IDS_DESC_BLAZE_ROD)->handEquipped(); + Item::ghast_tear = (new Item(114) ) ->setIconName(L"ghast_tear")->setDescriptionId(IDS_ITEM_GHAST_TEAR)->setUseDescriptionId(IDS_DESC_GHAST_TEAR)->setPotionBrewingFormula(PotionBrewing::MOD_GHASTTEARS); + Item::gold_nugget = (new Item(115) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold)->setIconName(L"gold_nugget")->setDescriptionId(IDS_ITEM_GOLD_NUGGET)->setUseDescriptionId(IDS_DESC_GOLD_NUGGET); - Item::netherwart_seeds = (new SeedItem(116, Tile::netherStalk_Id, Tile::soulsand_Id) ) ->setIconName(L"netherStalkSeeds")->setDescriptionId(IDS_ITEM_NETHER_STALK_SEEDS)->setUseDescriptionId(IDS_DESC_NETHER_STALK_SEEDS)->setPotionBrewingFormula(PotionBrewing::MOD_NETHERWART); + Item::netherwart_seeds = (new SeedItem(116, Tile::nether_wart_Id, Tile::soul_sand_Id) ) ->setIconName(L"netherStalkSeeds")->setDescriptionId(IDS_ITEM_NETHER_STALK_SEEDS)->setUseDescriptionId(IDS_DESC_NETHER_STALK_SEEDS)->setPotionBrewingFormula(PotionBrewing::MOD_NETHERWART); Item::potion = static_cast((new PotionItem(117))->setIconName(L"potion")->setDescriptionId(IDS_ITEM_POTION)->setUseDescriptionId(IDS_DESC_POTION)); Item::glassBottle = (new BottleItem(118) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_glass)->setIconName(L"glassBottle")->setDescriptionId(IDS_ITEM_GLASS_BOTTLE)->setUseDescriptionId(IDS_DESC_GLASS_BOTTLE); - Item::spiderEye = (new FoodItem(119, 2, FoodConstants::FOOD_SATURATION_GOOD, false) ) ->setEatEffect(MobEffect::poison->id, 5, 0, 1.0f)->setIconName(L"spiderEye")->setDescriptionId(IDS_ITEM_SPIDER_EYE)->setUseDescriptionId(IDS_DESC_SPIDER_EYE)->setPotionBrewingFormula(PotionBrewing::MOD_SPIDEREYE); - Item::fermentedSpiderEye = (new Item(120) ) ->setIconName(L"fermentedSpiderEye")->setDescriptionId(IDS_ITEM_FERMENTED_SPIDER_EYE)->setUseDescriptionId(IDS_DESC_FERMENTED_SPIDER_EYE)->setPotionBrewingFormula(PotionBrewing::MOD_FERMENTEDEYE); + Item::spider_eye = (new FoodItem(119, 2, FoodConstants::FOOD_SATURATION_GOOD, false) ) ->setEatEffect(MobEffect::poison->id, 5, 0, 1.0f)->setIconName(L"spider_eye")->setDescriptionId(IDS_ITEM_SPIDER_EYE)->setUseDescriptionId(IDS_DESC_SPIDER_EYE)->setPotionBrewingFormula(PotionBrewing::MOD_SPIDEREYE); + Item::fermented_spider_eye = (new Item(120) ) ->setIconName(L"fermented_spider_eye")->setDescriptionId(IDS_ITEM_FERMENTED_SPIDER_EYE)->setUseDescriptionId(IDS_DESC_FERMENTED_SPIDER_EYE)->setPotionBrewingFormula(PotionBrewing::MOD_FERMENTEDEYE); - Item::blazePowder = (new Item(121) ) ->setIconName(L"blazePowder")->setDescriptionId(IDS_ITEM_BLAZE_POWDER)->setUseDescriptionId(IDS_DESC_BLAZE_POWDER)->setPotionBrewingFormula(PotionBrewing::MOD_BLAZEPOWDER); - Item::magmaCream = (new Item(122) ) ->setIconName(L"magmaCream")->setDescriptionId(IDS_ITEM_MAGMA_CREAM)->setUseDescriptionId(IDS_DESC_MAGMA_CREAM)->setPotionBrewingFormula(PotionBrewing::MOD_MAGMACREAM); + Item::blaze_powder = (new Item(121) ) ->setIconName(L"blaze_powder")->setDescriptionId(IDS_ITEM_BLAZE_POWDER)->setUseDescriptionId(IDS_DESC_BLAZE_POWDER)->setPotionBrewingFormula(PotionBrewing::MOD_BLAZEPOWDER); + Item::magma_cream = (new Item(122) ) ->setIconName(L"magma_cream")->setDescriptionId(IDS_ITEM_MAGMA_CREAM)->setUseDescriptionId(IDS_DESC_MAGMA_CREAM)->setPotionBrewingFormula(PotionBrewing::MOD_MAGMACREAM); - Item::brewingStand = (new TilePlanterItem(123, Tile::brewingStand) ) ->setBaseItemTypeAndMaterial(eBaseItemType_device, eMaterial_blaze)->setIconName(L"brewingStand")->setDescriptionId(IDS_ITEM_BREWING_STAND)->setUseDescriptionId(IDS_DESC_BREWING_STAND); + Item::brewing_stand = (new TilePlanterItem(123, Tile::brewingStand) ) ->setBaseItemTypeAndMaterial(eBaseItemType_device, eMaterial_blaze)->setIconName(L"brewing_stand")->setDescriptionId(IDS_ITEM_BREWING_STAND)->setUseDescriptionId(IDS_DESC_BREWING_STAND); Item::cauldron = (new TilePlanterItem(124, Tile::cauldron) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_iron)->setIconName(L"cauldron")->setDescriptionId(IDS_ITEM_CAULDRON)->setUseDescriptionId(IDS_DESC_CAULDRON); - Item::eyeOfEnder = (new EnderEyeItem(125) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_ender)->setIconName(L"eyeOfEnder")->setDescriptionId(IDS_ITEM_EYE_OF_ENDER)->setUseDescriptionId(IDS_DESC_EYE_OF_ENDER); - Item::speckledMelon = (new Item(126) ) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_melon)->setIconName(L"speckledMelon")->setDescriptionId(IDS_ITEM_SPECKLED_MELON)->setUseDescriptionId(IDS_DESC_SPECKLED_MELON)->setPotionBrewingFormula(PotionBrewing::MOD_SPECKLEDMELON); + Item::eye_of_ender = (new EnderEyeItem(125) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_ender)->setIconName(L"eye_of_ender")->setDescriptionId(IDS_ITEM_EYE_OF_ENDER)->setUseDescriptionId(IDS_DESC_EYE_OF_ENDER); + Item::speckled_melon = (new Item(126) ) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_melon)->setIconName(L"speckled_melon")->setDescriptionId(IDS_ITEM_SPECKLED_MELON)->setUseDescriptionId(IDS_DESC_SPECKLED_MELON)->setPotionBrewingFormula(PotionBrewing::MOD_SPECKLEDMELON); - Item::spawnEgg = (new SpawnEggItem(127)) ->setIconName(L"monsterPlacer")->setDescriptionId(IDS_ITEM_MONSTER_SPAWNER)->setUseDescriptionId(IDS_DESC_MONSTER_SPAWNER); + Item::spawn_egg = (new SpawnEggItem(127)) ->setIconName(L"monsterPlacer")->setDescriptionId(IDS_ITEM_MONSTER_SPAWNER)->setUseDescriptionId(IDS_DESC_MONSTER_SPAWNER); // 4J Stu - Brought this forward - Item::expBottle = (new ExperienceItem(128)) ->setIconName(L"expBottle")->setDescriptionId(IDS_ITEM_EXP_BOTTLE)->setUseDescriptionId(IDS_DESC_EXP_BOTTLE); + Item::experience_bottle = (new ExperienceItem(128)) ->setIconName(L"experience_bottle")->setDescriptionId(IDS_ITEM_EXP_BOTTLE)->setUseDescriptionId(IDS_DESC_EXP_BOTTLE); Item::record_01 = ( new RecordingItem(2000, L"13") ) ->setIconName(L"record")->setDescriptionId(IDS_ITEM_RECORD_01)->setUseDescriptionId(IDS_DESC_RECORD); Item::record_02 = ( new RecordingItem(2001, L"cat") ) ->setIconName(L"record")->setDescriptionId(IDS_ITEM_RECORD_02)->setUseDescriptionId(IDS_DESC_RECORD); @@ -485,57 +485,57 @@ void Item::staticCtor() Item::skull = (new SkullItem(141)) ->setIconName(L"skull")->setDescriptionId(IDS_ITEM_SKULL)->setUseDescriptionId(IDS_DESC_SKULL); // TU14 - //Item::writingBook = (new WritingBookItem(130))->setIcon(11, 11)->setDescriptionId("writingBook"); - //Item::writtenBook = (new WrittenBookItem(131))->setIcon(12, 11)->setDescriptionId("writtenBook"); + //Item::writable_book = (new WritingBookItem(130))->setIcon(11, 11)->setDescriptionId("writable_book"); + //Item::written_book = (new WrittenBookItem(131))->setIcon(12, 11)->setDescriptionId("written_book"); //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::writable_book = (new WritingBookItem(130))->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_book)->setIconName(L"writable_book")->setDescriptionId(IDS_ITEM_WRITINGBOOK)->setUseDescriptionId(IDS_DESC_WRITINGBOOK)->setMaxStackSize(1); + Item::written_book = (new WrittenBookItem(131))->setIconName(L"written_book")->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); - Item::flowerPot = (new TilePlanterItem(134, Tile::flowerPot)) ->setIconName(L"flowerPot")->setDescriptionId(IDS_FLOWERPOT)->setUseDescriptionId(IDS_DESC_FLOWERPOT)->setBaseItemTypeAndMaterial(eBaseItemType_decoration,eMaterial_brick); + Item::flower_pot = (new TilePlanterItem(134, Tile::flower_pot)) ->setIconName(L"flower_pot")->setDescriptionId(IDS_FLOWERPOT)->setUseDescriptionId(IDS_DESC_FLOWERPOT)->setBaseItemTypeAndMaterial(eBaseItemType_decoration,eMaterial_brick); Item::carrots = (new SeedFoodItem(135, 4, FoodConstants::FOOD_SATURATION_NORMAL, Tile::carrots_Id, Tile::farmland_Id)) ->setIconName(L"carrots")->setDescriptionId(IDS_CARROTS)->setUseDescriptionId(IDS_DESC_CARROTS); Item::potato = (new SeedFoodItem(136, 1, FoodConstants::FOOD_SATURATION_LOW, Tile::potatoes_Id, Tile::farmland_Id)) ->setIconName(L"potato")->setDescriptionId(IDS_POTATO)->setUseDescriptionId(IDS_DESC_POTATO); - Item::potatoBaked = (new FoodItem(137, 6, FoodConstants::FOOD_SATURATION_NORMAL, false)) ->setIconName(L"potatoBaked")->setDescriptionId(IDS_ITEM_POTATO_BAKED)->setUseDescriptionId(IDS_DESC_POTATO_BAKED); - Item::potatoPoisonous = (new FoodItem(138, 2, FoodConstants::FOOD_SATURATION_LOW, false)) ->setEatEffect(MobEffect::poison->id, 5, 0, .6f)->setIconName(L"potatoPoisonous")->setDescriptionId(IDS_ITEM_POTATO_POISONOUS)->setUseDescriptionId(IDS_DESC_POTATO_POISONOUS); + Item::baked_potato = (new FoodItem(137, 6, FoodConstants::FOOD_SATURATION_NORMAL, false)) ->setIconName(L"baked_potato")->setDescriptionId(IDS_ITEM_POTATO_BAKED)->setUseDescriptionId(IDS_DESC_POTATO_BAKED); + Item::poisonous_potato = (new FoodItem(138, 2, FoodConstants::FOOD_SATURATION_LOW, false)) ->setEatEffect(MobEffect::poison->id, 5, 0, .6f)->setIconName(L"poisonous_potato")->setDescriptionId(IDS_ITEM_POTATO_POISONOUS)->setUseDescriptionId(IDS_DESC_POTATO_POISONOUS); - Item::emptyMap = (EmptyMapItem*)(new EmptyMapItem(139))->setIconName(L"map_empty")->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map)->setDescriptionId(IDS_ITEM_MAP_EMPTY)->setUseDescriptionId(IDS_DESC_MAP_EMPTY); + Item::empty_map = (EmptyMapItem*)(new EmptyMapItem(139))->setIconName(L"map_empty")->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map)->setDescriptionId(IDS_ITEM_MAP_EMPTY)->setUseDescriptionId(IDS_DESC_MAP_EMPTY); - Item::carrotGolden = (new FoodItem(140, 6, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false)) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_carrot)->setIconName(L"carrotGolden")->setPotionBrewingFormula(PotionBrewing::MOD_GOLDENCARROT)->setDescriptionId(IDS_ITEM_CARROT_GOLDEN)->setUseDescriptionId(IDS_DESC_CARROT_GOLDEN); + Item::golden_carrot = (new FoodItem(140, 6, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false)) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_carrot)->setIconName(L"golden_carrot")->setPotionBrewingFormula(PotionBrewing::MOD_GOLDENCARROT)->setDescriptionId(IDS_ITEM_CARROT_GOLDEN)->setUseDescriptionId(IDS_DESC_CARROT_GOLDEN); - Item::carrotOnAStick = (new CarrotOnAStickItem(142)) ->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_carrot)->setIconName(L"carrotOnAStick")->setDescriptionId(IDS_ITEM_CARROT_ON_A_STICK)->setUseDescriptionId(IDS_DESC_CARROT_ON_A_STICK); - Item::netherStar = (new SimpleFoiledItem(143)) ->setIconName(L"nether_star")->setDescriptionId(IDS_NETHER_STAR)->setUseDescriptionId(IDS_DESC_NETHER_STAR); - Item::pumpkinPie = (new FoodItem(144, 8, FoodConstants::FOOD_SATURATION_LOW, false)) ->setIconName(L"pumpkinPie")->setDescriptionId(IDS_ITEM_PUMPKIN_PIE)->setUseDescriptionId(IDS_DESC_PUMPKIN_PIE); + Item::carrot_on_a_stick = (new CarrotOnAStickItem(142)) ->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_carrot)->setIconName(L"carrot_on_a_stick")->setDescriptionId(IDS_ITEM_CARROT_ON_A_STICK)->setUseDescriptionId(IDS_DESC_CARROT_ON_A_STICK); + Item::nether_star = (new SimpleFoiledItem(143)) ->setIconName(L"nether_star")->setDescriptionId(IDS_NETHER_STAR)->setUseDescriptionId(IDS_DESC_NETHER_STAR); + Item::pumpkin_pie = (new FoodItem(144, 8, FoodConstants::FOOD_SATURATION_LOW, false)) ->setIconName(L"pumpkin_pie")->setDescriptionId(IDS_ITEM_PUMPKIN_PIE)->setUseDescriptionId(IDS_DESC_PUMPKIN_PIE); Item::fireworks = (new FireworksItem(145)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined)->setIconName(L"fireworks")->setDescriptionId(IDS_FIREWORKS)->setUseDescriptionId(IDS_DESC_FIREWORKS); - Item::fireworksCharge = (new FireworksChargeItem(146)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined)->setIconName(L"fireworks_charge")->setDescriptionId(IDS_FIREWORKS_CHARGE)->setUseDescriptionId(IDS_DESC_FIREWORKS_CHARGE); - EnchantedBookItem::enchantedBook = static_cast((new EnchantedBookItem(147))->setMaxStackSize(1)->setIconName(L"enchantedBook")->setDescriptionId(IDS_ITEM_ENCHANTED_BOOK)->setUseDescriptionId(IDS_DESC_ENCHANTED_BOOK)); + Item::firework_charge = (new FireworksChargeItem(146)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined)->setIconName(L"fireworks_charge")->setDescriptionId(IDS_FIREWORKS_CHARGE)->setUseDescriptionId(IDS_DESC_FIREWORKS_CHARGE); + EnchantedBookItem::enchanted_book = static_cast((new EnchantedBookItem(147))->setMaxStackSize(1)->setIconName(L"enchanted_book")->setDescriptionId(IDS_ITEM_ENCHANTED_BOOK)->setUseDescriptionId(IDS_DESC_ENCHANTED_BOOK)); Item::comparator = (new TilePlanterItem(148, Tile::comparator_off)) ->setIconName(L"comparator")->setDescriptionId(IDS_ITEM_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR); Item::netherbrick = (new Item(149)) ->setIconName(L"netherbrick")->setDescriptionId(IDS_ITEM_NETHERBRICK)->setUseDescriptionId(IDS_DESC_ITEM_NETHERBRICK); - Item::netherQuartz = (new Item(150)) ->setIconName(L"netherquartz")->setDescriptionId(IDS_ITEM_NETHER_QUARTZ)->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ); - Item::minecart_tnt = (new MinecartItem(151, Minecart::TYPE_TNT)) ->setIconName(L"minecart_tnt")->setDescriptionId(IDS_ITEM_MINECART_TNT)->setUseDescriptionId(IDS_DESC_MINECART_TNT); - Item::minecart_hopper = (new MinecartItem(152, Minecart::TYPE_HOPPER)) ->setIconName(L"minecart_hopper")->setDescriptionId(IDS_ITEM_MINECART_HOPPER)->setUseDescriptionId(IDS_DESC_MINECART_HOPPER); + Item::nether_quartz = (new Item(150)) ->setIconName(L"netherquartz")->setDescriptionId(IDS_ITEM_NETHER_QUARTZ)->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ); + Item::tnt_minecart = (new MinecartItem(151, Minecart::TYPE_TNT)) ->setIconName(L"tnt_minecart")->setDescriptionId(IDS_ITEM_MINECART_TNT)->setUseDescriptionId(IDS_DESC_MINECART_TNT); + Item::hopper_minecart = (new MinecartItem(152, Minecart::TYPE_HOPPER)) ->setIconName(L"hopper_minecart")->setDescriptionId(IDS_ITEM_MINECART_HOPPER)->setUseDescriptionId(IDS_DESC_MINECART_HOPPER); - Item::horseArmorMetal = (new Item(161)) ->setIconName(L"iron_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_IRON_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_IRON_HORSE_ARMOR); - Item::horseArmorGold = (new Item(162)) ->setIconName(L"gold_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_GOLD_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_GOLD_HORSE_ARMOR); - Item::horseArmorDiamond = (new Item(163)) ->setIconName(L"diamond_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_DIAMOND_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_DIAMOND_HORSE_ARMOR); + Item::iron_horse_armor = (new Item(161)) ->setIconName(L"iron_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_IRON_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_IRON_HORSE_ARMOR); + Item::golden_horse_armor = (new Item(162)) ->setIconName(L"golden_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_GOLD_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_GOLD_HORSE_ARMOR); + Item::diamond_horse_armor = (new Item(163)) ->setIconName(L"diamond_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_DIAMOND_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_DIAMOND_HORSE_ARMOR); Item::lead = (new LeashItem(164)) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined)->setIconName(L"lead")->setDescriptionId(IDS_ITEM_LEAD)->setUseDescriptionId(IDS_DESC_LEAD); - Item::nameTag = (new NameTagItem(165)) ->setIconName(L"name_tag")->setDescriptionId(IDS_ITEM_NAME_TAG)->setUseDescriptionId(IDS_DESC_NAME_TAG); + Item::name_tag = (new NameTagItem(165)) ->setIconName(L"name_tag")->setDescriptionId(IDS_ITEM_NAME_TAG)->setUseDescriptionId(IDS_DESC_NAME_TAG); - Item::mutton_raw = (new FoodItem(167, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setIconName(L"muttonRaw")->setDescriptionId(IDS_ITEM_MUTTON_RAW)->setUseDescriptionId(IDS_DESC_MUTTON_RAW); - Item::mutton_cooked = (new FoodItem(168, 6, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"muttonCooked")->setDescriptionId(IDS_ITEM_MUTTON_COOKED)->setUseDescriptionId(IDS_DESC_MUTTON_COOKED); - Item::rabbit_raw = (new FoodItem(155, 1, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitRaw")->setDescriptionId(IDS_ITEM_RABBIT_RAW)->setUseDescriptionId(IDS_DESC_RABBIT_RAW); - Item::rabbit_cooked = (new FoodItem(156, 5, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitCooked")->setDescriptionId(IDS_ITEM_RABBIT_COOKED)->setUseDescriptionId(IDS_DESC_RABBIT_COOKED); + Item::raw_mutton = (new FoodItem(167, 2, FoodConstants::FOOD_SATURATION_LOW, true))->setIconName(L"muttonRaw")->setDescriptionId(IDS_ITEM_MUTTON_RAW)->setUseDescriptionId(IDS_DESC_MUTTON_RAW); + Item::cooked_mutton = (new FoodItem(168, 6, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"muttonCooked")->setDescriptionId(IDS_ITEM_MUTTON_COOKED)->setUseDescriptionId(IDS_DESC_MUTTON_COOKED); + Item::raw_rabbit = (new FoodItem(155, 1, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitRaw")->setDescriptionId(IDS_ITEM_RABBIT_RAW)->setUseDescriptionId(IDS_DESC_RABBIT_RAW); + Item::cooked_rabbit = (new FoodItem(156, 5, FoodConstants::FOOD_SATURATION_NORMAL, true))->setIconName(L"rabbitCooked")->setDescriptionId(IDS_ITEM_RABBIT_COOKED)->setUseDescriptionId(IDS_DESC_RABBIT_COOKED); - Item::door_spruce = (new DoorItem(171, Material::wood, L"doorSpruce"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorSpruce")->setDescriptionId(IDS_ITEM_DOOR_SPRUCE)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::door_birch = (new DoorItem(172, Material::wood, L"doorBirch"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorBirch")->setDescriptionId(IDS_ITEM_DOOR_BIRCH)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::door_jungle = (new DoorItem(173, Material::wood, L"doorJungle"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorJungle")->setDescriptionId(IDS_ITEM_DOOR_JUNGLE)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::door_acacia = (new DoorItem(174, Material::wood, L"doorAcacia"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorAcacia")->setDescriptionId(IDS_ITEM_DOOR_ACACIA)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Item::door_dark = (new DoorItem(175, Material::wood, L"doorDark"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorDark")->setDescriptionId(IDS_ITEM_DOOR_DARK)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::spruce_door = (new DoorItem(171, Material::wood, L"doorSpruce"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorSpruce")->setDescriptionId(IDS_ITEM_DOOR_SPRUCE)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::birch_door = (new DoorItem(172, Material::wood, L"doorBirch"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorBirch")->setDescriptionId(IDS_ITEM_DOOR_BIRCH)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::jungle_door = (new DoorItem(173, Material::wood, L"doorJungle"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorJungle")->setDescriptionId(IDS_ITEM_DOOR_JUNGLE)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::acacia_door = (new DoorItem(174, Material::wood, L"doorAcacia"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorAcacia")->setDescriptionId(IDS_ITEM_DOOR_ACACIA)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Item::dark_oak_door = (new DoorItem(175, Material::wood, L"doorDark"))->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorDark")->setDescriptionId(IDS_ITEM_DOOR_DARK)->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Item::rabbit_hide = ( new Item(159) ) ->setIconName(L"rabbitHide")->setDescriptionId(IDS_ITEM_RABBIT_HIDE)->setUseDescriptionId(IDS_DESC_RABBIT_HIDE); - Item::rabbits_foot = ( new Item(158) ) ->setIconName(L"rabbitsFoot")->setDescriptionId(IDS_ITEM_RABBIT_FOOT)->setUseDescriptionId(IDS_DESC_RABBIT_FOOT)->setPotionBrewingFormula(PotionBrewing::MOD_RABBITS_FOOT);; + Item::rabbit_foot = ( new Item(158) ) ->setIconName(L"rabbitsFoot")->setDescriptionId(IDS_ITEM_RABBIT_FOOT)->setUseDescriptionId(IDS_DESC_RABBIT_FOOT)->setPotionBrewingFormula(PotionBrewing::MOD_RABBITS_FOOT);; Item::armor_stand = (new ArmorStandItem(160)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem,eMaterial_cloth)->setIconName(L"armorStand")->setDescriptionId(IDS_ITEM_ARMOR_STAND)->setUseDescriptionId(IDS_DESC_ARMOR_STAND); Item::prismarine_crystal = (new Item(154))->setIconName(L"prismarineCrystal")->setDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL)->setUseDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL_DESC); @@ -592,7 +592,7 @@ int _Tier::getTierItemId() const { if (this == Tier::WOOD) { - return Tile::wood_Id; + return Tile::planks_Id; } else if (this == Tier::STONE) { @@ -600,11 +600,11 @@ int _Tier::getTierItemId() const } else if (this == Tier::GOLD) { - return Item::goldIngot_Id; + return Item::gold_ingot_Id; } else if (this == Tier::IRON) { - return Item::ironIngot_Id; + return Item::iron_ingot_Id; } else if (this == Tier::DIAMOND) { @@ -1038,103 +1038,103 @@ attrAttrModMap *Item::getDefaultAttributeModifiers() (and 4 and Vita). */ #if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__) -const int Item::shovel_iron_Id ; -const int Item::pickAxe_iron_Id ; -const int Item::hatchet_iron_Id ; -const int Item::flintAndSteel_Id ; +const int Item::iron_shovel_Id ; +const int Item::iron_pickaxe_Id ; +const int Item::iron_axe_Id ; +const int Item::flint_and_steel_Id ; const int Item::apple_Id ; const int Item::bow_Id ; const int Item::arrow_Id ; const int Item::coal_Id ; const int Item::diamond_Id ; -const int Item::ironIngot_Id ; -const int Item::goldIngot_Id ; -const int Item::sword_iron_Id ; -const int Item::sword_wood_Id ; -const int Item::shovel_wood_Id ; -const int Item::pickAxe_wood_Id ; -const int Item::hatchet_wood_Id ; -const int Item::sword_stone_Id ; -const int Item::shovel_stone_Id ; -const int Item::pickAxe_stone_Id ; -const int Item::hatchet_stone_Id ; -const int Item::sword_diamond_Id ; -const int Item::shovel_diamond_Id ; -const int Item::pickAxe_diamond_Id ; -const int Item::hatchet_diamond_Id ; +const int Item::iron_ingot_Id ; +const int Item::gold_ingot_Id ; +const int Item::iron_sword_Id ; +const int Item::wooden_sword_Id ; +const int Item::wooden_shovel_Id ; +const int Item::wooden_pickaxe_Id ; +const int Item::wooden_axe_Id ; +const int Item::stone_sword_Id ; +const int Item::stone_shovel_Id ; +const int Item::stone_pickaxe_Id ; +const int Item::stone_axe_Id ; +const int Item::diamond_sword_Id ; +const int Item::diamond_shovel_Id ; +const int Item::diamond_pickaxe_Id ; +const int Item::diamond_axe_Id ; const int Item::stick_Id ; const int Item::bowl_Id ; -const int Item::mushroomStew_Id ; -const int Item::rabbitStew_Id ; -const int Item::sword_gold_Id ; -const int Item::shovel_gold_Id ; -const int Item::pickAxe_gold_Id ; -const int Item::hatchet_gold_Id ; +const int Item::mushroom_stew_Id ; +const int Item::rabbit_stew_Id ; +const int Item::golden_sword_Id ; +const int Item::golden_shovel_Id ; +const int Item::golden_pickaxe_Id ; +const int Item::golden_axe_Id ; const int Item::string_Id ; const int Item::feather_Id ; const int Item::gunpowder_Id ; -const int Item::hoe_wood_Id ; -const int Item::hoe_stone_Id ; -const int Item::hoe_iron_Id ; -const int Item::hoe_diamond_Id ; -const int Item::hoe_gold_Id ; -const int Item::seeds_wheat_Id ; +const int Item::wooden_hoe_Id ; +const int Item::stone_hoe_Id ; +const int Item::iron_hoe_Id ; +const int Item::diamond_hoe_Id ; +const int Item::golden_hoe_Id ; +const int Item::wheat_seeds_Id ; const int Item::wheat_Id ; const int Item::bread_Id ; -const int Item::helmet_leather_Id ; -const int Item::chestplate_leather_Id ; -const int Item::leggings_leather_Id ; -const int Item::boots_leather_Id ; -const int Item::helmet_chain_Id ; -const int Item::chestplate_chain_Id ; -const int Item::leggings_chain_Id ; -const int Item::boots_chain_Id ; -const int Item::helmet_iron_Id ; -const int Item::chestplate_iron_Id ; -const int Item::leggings_iron_Id ; -const int Item::boots_iron_Id ; -const int Item::helmet_diamond_Id ; -const int Item::chestplate_diamond_Id; -const int Item::leggings_diamond_Id ; -const int Item::boots_diamond_Id ; -const int Item::helmet_gold_Id ; -const int Item::chestplate_gold_Id ; -const int Item::leggings_gold_Id ; -const int Item::boots_gold_Id ; +const int Item::leather_helmet_Id ; +const int Item::leather_chestplate_Id ; +const int Item::leather_leggings_Id ; +const int Item::leather_boots_Id ; +const int Item::chainmail_helmet_Id ; +const int Item::chainmail_chestplate_Id ; +const int Item::chainmail_leggings_Id ; +const int Item::chainmail_boots_Id ; +const int Item::iron_helmet_Id ; +const int Item::iron_chestplate_Id ; +const int Item::iron_leggings_Id ; +const int Item::iron_boots_Id ; +const int Item::diamond_helmet_Id ; +const int Item::diamond_chestplate_Id; +const int Item::diamond_leggings_Id ; +const int Item::diamond_boots_Id ; +const int Item::golden_helmet_Id ; +const int Item::golden_chestplate_Id ; +const int Item::golden_leggings_Id ; +const int Item::golden_boots_Id ; const int Item::flint_Id ; -const int Item::porkChop_raw_Id ; -const int Item::porkChop_cooked_Id ; +const int Item::porkchop_Id ; +const int Item::cooked_porkchop_Id ; const int Item::painting_Id ; -const int Item::apple_gold_Id ; -const int Item::sign_Id ; -const int Item::door_wood_Id ; -const int Item::bucket_empty_Id ; -const int Item::bucket_water_Id ; -const int Item::bucket_lava_Id ; +const int Item::golden_apple_Id ; +const int Item::standing_sign_Id ; +const int Item::wooden_door_Id ; +const int Item::bucket_Id ; +const int Item::water_bucket_Id ; +const int Item::lava_bucket_Id ; const int Item::minecart_Id ; const int Item::saddle_Id ; -const int Item::door_iron_Id ; -const int Item::redStone_Id ; -const int Item::snowBall_Id ; +const int Item::iron_door_Id ; +const int Item::redstone_Id ; +const int Item::snowball_Id ; const int Item::boat_Id ; const int Item::leather_Id ; -const int Item::bucket_milk_Id ; +const int Item::milk_bucket_Id ; const int Item::brick_Id ; const int Item::clay_Id ; const int Item::reeds_Id ; const int Item::paper_Id ; const int Item::book_Id ; -const int Item::slimeBall_Id ; -const int Item::minecart_chest_Id ; -const int Item::minecart_furnace_Id ; +const int Item::slime_ball_Id ; +const int Item::chest_minecart_Id ; +const int Item::furnace_minecart_Id ; const int Item::egg_Id ; const int Item::compass_Id ; -const int Item::fishingRod_Id ; +const int Item::fishing_rod_Id ; const int Item::clock_Id ; -const int Item::yellowDust_Id ; -const int Item::fish_raw_Id ; -const int Item::fish_cooked_Id ; -const int Item::dye_powder_Id ; +const int Item::glowstone_dust_Id ; +const int Item::fish_Id ; +const int Item::cooked_fish_Id ; +const int Item::dye_Id ; const int Item::bone_Id ; const int Item::sugar_Id ; const int Item::cake_Id ; @@ -1143,57 +1143,57 @@ const int Item::repeater_Id ; const int Item::cookie_Id ; const int Item::map_Id ; const int Item::shears_Id ; -const int Item::melon_Id ; -const int Item::seeds_pumpkin_Id ; -const int Item::seeds_melon_Id ; -const int Item::beef_raw_Id ; -const int Item::beef_cooked_Id ; -const int Item::chicken_raw_Id ; -const int Item::chicken_cooked_Id ; +const int Item::melon_block_Id ; +const int Item::pumpkin_seeds_Id ; +const int Item::melon_seeds_Id ; +const int Item::beef_Id ; +const int Item::cooked_beef_Id ; +const int Item::chicken_Id ; +const int Item::cooked_chicken_Id ; const int Item::rotten_flesh_Id ; -const int Item::enderPearl_Id ; -const int Item::blazeRod_Id ; -const int Item::ghastTear_Id ; -const int Item::goldNugget_Id ; +const int Item::ender_pearl_Id ; +const int Item::blaze_rod_Id ; +const int Item::ghast_tear_Id ; +const int Item::gold_nugget_Id ; const int Item::netherwart_seeds_Id; const int Item::potion_Id ; -const int Item::glassBottle_Id ; -const int Item::spiderEye_Id ; -const int Item::fermentedSpiderEye_Id; -const int Item::blazePowder_Id ; -const int Item::magmaCream_Id ; -const int Item::brewingStand_Id ; +const int Item::glass_bottle_Id ; +const int Item::spider_eye_Id ; +const int Item::fermented_spider_eye_Id; +const int Item::blaze_powder_Id ; +const int Item::magma_cream_Id ; +const int Item::brewing_stand_Id ; const int Item::cauldron_Id ; -const int Item::eyeOfEnder_Id ; -const int Item::speckledMelon_Id ; -const int Item::spawnEgg_Id; -const int Item::expBottle_Id ; +const int Item::eye_of_ender_Id ; +const int Item::speckled_melon_block_Id ; +const int Item::spawn_egg_Id; +const int Item::experience_bottle_Id ; const int Item::skull_Id ; -const int Item::record_01_Id ; -const int Item::record_02_Id ; -const int Item::record_03_Id ; -const int Item::record_04_Id ; -const int Item::record_05_Id ; -const int Item::record_06_Id ; -const int Item::record_07_Id ; -const int Item::record_08_Id ; -const int Item::record_09_Id ; -const int Item::record_10_Id ; +const int Item::record_13_Id ; +const int Item::record_cat_Id ; +const int Item::record_blocks_Id ; +const int Item::record_chirp_Id ; +const int Item::record_far_Id ; +const int Item::record_mall_Id ; +const int Item::record_mellohi_Id ; +const int Item::record_stal_Id ; +const int Item::record_strad_Id ; +const int Item::record_ward_Id ; const int Item::record_11_Id ; -const int Item::record_12_Id ; -const int Item::fireball_Id ; -const int Item::itemFrame_Id ; -const int Item::netherbrick_Id ; +const int Item::record_wait_Id ; +const int Item::fire_charge_Id ; +const int Item::item_frame_Id ; +const int Item::nether_brick_Id ; const int Item::emerald_Id ; -const int Item::flowerPot_Id ; -const int Item::carrots_Id ; +const int Item::flower_pot_Id ; +const int Item::carrot_Id ; const int Item::potato_Id ; -const int Item::potatoBaked_Id ; -const int Item::potatoPoisonous_Id ; -const int Item::carrotGolden_Id ; -const int Item::carrotOnAStick_Id ; -const int Item::pumpkinPie_Id ; -const int Item::enchantedBook_Id ; -const int Item::netherQuartz_Id ; +const int Item::baked_potato_Id ; +const int Item::poisonous_potato_Id ; +const int Item::golden_carrot_Id ; +const int Item::carrot_on_a_stick_Id ; +const int Item::pumpkin_pie_Id ; +const int Item::enchanted_book_Id ; +const int Item::quartz_Id ; #endif diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h index 8c474f5c..51908607 100644 --- a/Minecraft.World/Item.h +++ b/Minecraft.World/Item.h @@ -195,124 +195,124 @@ private: public: static ItemArray items; - static Item *shovel_iron; - static Item *pickAxe_iron; - static Item *hatchet_iron; - static Item *flintAndSteel; + static Item *iron_shovel; + static Item *iron_pickaxe; + static Item *iron_axe; + static Item *flint_and_steel; static Item *apple; static BowItem *bow; static Item *arrow; static Item *coal; static Item *diamond; - static Item *ironIngot; - static Item *goldIngot; - static Item *sword_iron; + static Item *iron_ingot; + static Item *gold_ingot; + static Item *iron_sword; - static Item *sword_wood; - static Item *shovel_wood; - static Item *pickAxe_wood; - static Item *hatchet_wood; + static Item *wooden_sword; + static Item *wooden_shovel; + static Item *wooden_pickaxe; + static Item *wooden_axe; - static Item *sword_stone; - static Item *shovel_stone; - static Item *pickAxe_stone; - static Item *hatchet_stone; + static Item *stone_sword; + static Item *stone_shovel; + static Item *stone_pickaxe; + static Item *stone_axe; - static Item *sword_diamond; - static Item *shovel_diamond; - static Item *pickAxe_diamond; - static Item *hatchet_diamond; + static Item *diamond_sword; + static Item *diamond_shovel; + static Item *diamond_pickaxe; + static Item *diamond_axe; static Item *stick; static Item *bowl; - static Item *mushroomStew; - static Item *rabbitStew; + static Item *mushroom_stew; + static Item *rabbit_stew; - static Item *sword_gold; - static Item *shovel_gold; - static Item *pickAxe_gold; - static Item *hatchet_gold; + static Item *golden_sword; + static Item *golden_shovel; + static Item *golden_pickaxe; + static Item *golden_axe; static Item *string; static Item *feather; static Item *gunpowder; - static Item *hoe_wood; - static Item *hoe_stone; - static Item *hoe_iron; - static Item *hoe_diamond; - static Item *hoe_gold; + static Item *wooden_hoe; + static Item *stone_hoe; + static Item *iron_hoe; + static Item *diamond_hoe; + static Item *golden_hoe; - static Item *seeds_wheat; + static Item *wheat_seeds; static Item *wheat; static Item *bread; - static ArmorItem *helmet_leather; - static ArmorItem *chestplate_leather; - static ArmorItem *leggings_leather; - static ArmorItem *boots_leather; + static ArmorItem *leather_helmet; + static ArmorItem *leather_chestplate; + static ArmorItem *leather_leggings; + static ArmorItem *leather_boots; - static ArmorItem *helmet_chain; - static ArmorItem *chestplate_chain; - static ArmorItem *leggings_chain; - static ArmorItem *boots_chain; + static ArmorItem *chainmail_helmet; + static ArmorItem *chainmail_chestplate; + static ArmorItem *chainmail_leggings; + static ArmorItem *chainmail_boots; - static ArmorItem *helmet_iron; - static ArmorItem *chestplate_iron; - static ArmorItem *leggings_iron; - static ArmorItem *boots_iron; + static ArmorItem *iron_helmet; + static ArmorItem *iron_chestplate; + static ArmorItem *iron_leggings; + static ArmorItem *iron_boots; - static ArmorItem *helmet_diamond; - static ArmorItem *chestplate_diamond; - static ArmorItem *leggings_diamond; - static ArmorItem *boots_diamond; + static ArmorItem *diamond_helmet; + static ArmorItem *diamond_chestplate; + static ArmorItem *diamond_leggings; + static ArmorItem *diamond_boots; - static ArmorItem *helmet_gold; - static ArmorItem *chestplate_gold; - static ArmorItem *leggings_gold; - static ArmorItem *boots_gold; + static ArmorItem *golden_helmet; + static ArmorItem *golden_chestplate; + static ArmorItem *golden_leggings; + static ArmorItem *golden_boots; static Item *flint; - static Item *porkChop_raw; - static Item *porkChop_cooked; + static Item *raw_porkchop; + static Item *cooked_porkchop; static Item *painting; - static Item *apple_gold; + static Item *golden_apple; static Item *sign; - static Item *door_wood; + static Item *wooden_door; - static Item *bucket_empty; - static Item *bucket_water; - static Item *bucket_lava; + static Item *bucket; + static Item *water_bucket; + static Item *lava_bucket; static Item *minecart; static Item *saddle; - static Item *door_iron; - static Item *redStone; - static Item *snowBall; + static Item *iron_door; + static Item *redstone; + static Item *snowball; static Item *boat; static Item *leather; - static Item *bucket_milk; + static Item *milk_bucket; static Item *brick; static Item *clay; static Item *reeds; static Item *paper; static Item *book; - static Item *slimeBall; - static Item *minecart_chest; - static Item *minecart_furnace; + static Item *slime_ball; + static Item *chest_minecart; + static Item *furnace_minecart; static Item *egg; static Item *compass; - static FishingRodItem *fishingRod; + static FishingRodItem *fishing_rod; static Item *clock; - static Item *yellowDust; - static Item *fish_raw; - static Item *fish_cooked; + static Item *glowstone_dust; + static Item *raw_fish; + static Item *cooked_fish; - static Item *dye_powder; + static Item *dye; static Item *bone; static Item *sugar; static Item *cake; @@ -331,37 +331,37 @@ public: static Item *seeds_pumpkin; static Item *seeds_melon; - static Item *beef_raw; - static Item *beef_cooked; - static Item *chicken_raw; - static Item *chicken_cooked; + static Item *raw_beef; + static Item *cooked_beef; + static Item *raw_chicken; + static Item *cooked_chicken; static Item *rotten_flesh; - static Item *enderPearl; + static Item *ender_pearl; - static Item *blazeRod; - static Item *ghastTear; - static Item *goldNugget; + static Item *blaze_rod; + static Item *ghast_tear; + static Item *gold_nugget; static Item *netherwart_seeds; static PotionItem *potion; static Item *glassBottle; - static Item *spiderEye; - static Item *fermentedSpiderEye; + static Item *spider_eye; + static Item *fermented_spider_eye; - static Item *blazePowder; - static Item *magmaCream; + static Item *blaze_powder; + static Item *magma_cream; - static Item *brewingStand; + static Item *brewing_stand; static Item *cauldron; - static Item *eyeOfEnder; - static Item *speckledMelon; + static Item *eye_of_ender; + static Item *speckled_melon; - static Item *spawnEgg; + static Item *spawn_egg; - static Item *expBottle; + static Item *experience_bottle; static Item *skull; @@ -383,55 +383,55 @@ public: static Item *frame; // TU14 - static Item *writingBook; - static Item *writtenBook; + static Item *writable_book; + static Item *written_book; static Item *emerald; - static Item *flowerPot; + static Item *flower_pot; static Item *carrots; static Item *potato; - static Item *potatoBaked; - static Item *potatoPoisonous; + static Item *baked_potato; + static Item *poisonous_potato; - static EmptyMapItem *emptyMap; + static EmptyMapItem *empty_map; - static Item *carrotGolden; + static Item *golden_carrot; - static Item *carrotOnAStick; - static Item *netherStar; - static Item *pumpkinPie; + static Item *carrot_on_a_stick; + static Item *nether_star; + static Item *pumpkin_pie; static Item *fireworks; - static Item *fireworksCharge; - static Item *netherQuartz; + static Item *firework_charge; + static Item *nether_quartz; static Item *comparator; static Item *netherbrick; - static EnchantedBookItem *enchantedBook; - static Item *minecart_tnt; - static Item *minecart_hopper; + static EnchantedBookItem *enchanted_book; + static Item *tnt_minecart; + static Item *hopper_minecart; - static Item *horseArmorMetal; - static Item *horseArmorGold; - static Item *horseArmorDiamond; + static Item *iron_horse_armor; + static Item *golden_horse_armor; + static Item *diamond_horse_armor; static Item *lead; - static Item *nameTag; + static Item *name_tag; // TU25 - static Item* door_spruce; - static Item* door_birch; - static Item* door_jungle; - static Item* door_acacia; - static Item* door_dark; + static Item* spruce_door; + static Item* birch_door; + static Item* jungle_door; + static Item* acacia_door; + static Item* dark_oak_door; //TU31 - static Item* mutton_raw; - static Item* mutton_cooked; - static Item* rabbit_raw; - static Item* rabbit_cooked; + static Item* raw_mutton; + static Item* cooked_mutton; + static Item* raw_rabbit; + static Item* cooked_rabbit; static Item* rabbit_hide; - static Item* rabbits_foot; + static Item* rabbit_foot; static Item* armor_stand; static Item* prismarine_crystal; @@ -439,234 +439,234 @@ public: static Item* elytra; - static const int shovel_iron_Id = 256; - static const int pickAxe_iron_Id = 257; - static const int hatchet_iron_Id = 258; - static const int flintAndSteel_Id = 259; + static const int iron_shovel_Id = 256; + static const int iron_pickaxe_Id = 257; + static const int iron_axe_Id = 258; + static const int flint_and_steel_Id = 259; static const int apple_Id = 260; static const int bow_Id = 261; static const int arrow_Id = 262; static const int coal_Id = 263; static const int diamond_Id = 264; - static const int ironIngot_Id = 265; - static const int goldIngot_Id = 266; - static const int sword_iron_Id = 267; - static const int sword_wood_Id = 268; - static const int shovel_wood_Id = 269; - static const int pickAxe_wood_Id = 270; - static const int hatchet_wood_Id = 271; - static const int sword_stone_Id = 272; - static const int shovel_stone_Id = 273; - static const int pickAxe_stone_Id = 274; - static const int hatchet_stone_Id = 275; - static const int sword_diamond_Id = 276; - static const int shovel_diamond_Id = 277; - static const int pickAxe_diamond_Id = 278; - static const int hatchet_diamond_Id = 279; + static const int iron_ingot_Id = 265; + static const int gold_ingot_Id = 266; + static const int iron_sword_Id = 267; + static const int wooden_sword_Id = 268; + static const int wooden_shovel_Id = 269; + static const int wooden_pickaxe_Id = 270; + static const int wooden_axe_Id = 271; + static const int stone_sword_Id = 272; + static const int stone_shovel_Id = 273; + static const int stone_pickaxe_Id = 274; + static const int stone_axe_Id = 275; + static const int diamond_sword_Id = 276; + static const int diamond_shovel_Id = 277; + static const int diamond_pickaxe_Id = 278; + static const int diamond_axe_Id = 279; static const int stick_Id = 280; static const int bowl_Id = 281; - static const int mushroomStew_Id = 282; - static const int sword_gold_Id = 283; - static const int shovel_gold_Id = 284; - static const int pickAxe_gold_Id = 285; - static const int hatchet_gold_Id = 286; + static const int mushroom_stew_Id = 282; + static const int golden_sword_Id = 283; + static const int golden_shovel_Id = 284; + static const int golden_pickaxe_Id = 285; + static const int golden_axe_Id = 286; static const int string_Id = 287; static const int feather_Id = 288; static const int gunpowder_Id = 289; - static const int hoe_wood_Id = 290; - static const int hoe_stone_Id = 291; - static const int hoe_iron_Id = 292; - static const int hoe_diamond_Id = 293; - static const int hoe_gold_Id = 294; - static const int seeds_wheat_Id = 295; + static const int wooden_hoe_Id = 290; + static const int stone_hoe_Id = 291; + static const int iron_hoe_Id = 292; + static const int diamond_hoe_Id = 293; + static const int golden_hoe_Id = 294; + static const int wheat_seeds_Id = 295; static const int wheat_Id = 296; static const int bread_Id = 297; - static const int helmet_leather_Id = 298; - static const int chestplate_leather_Id = 299; - static const int leggings_leather_Id = 300; - static const int boots_leather_Id = 301; + static const int leather_helmet_Id = 298; + static const int leather_chestplate_Id = 299; + static const int leather_leggings_Id = 300; + static const int leather_boots_Id = 301; - static const int helmet_chain_Id = 302; - static const int chestplate_chain_Id = 303; - static const int leggings_chain_Id = 304; - static const int boots_chain_Id = 305; + static const int chainmail_helmet_Id = 302; + static const int chainmail_chestplate_Id = 303; + static const int chainmail_leggings_Id = 304; + static const int chainmail_boots_Id = 305; - static const int helmet_iron_Id = 306; - static const int chestplate_iron_Id = 307; - static const int leggings_iron_Id = 308; - static const int boots_iron_Id = 309; + static const int iron_helmet_Id = 306; + static const int iron_chestplate_Id = 307; + static const int iron_leggings_Id = 308; + static const int iron_boots_Id = 309; - static const int helmet_diamond_Id = 310; - static const int chestplate_diamond_Id = 311; - static const int leggings_diamond_Id = 312; - static const int boots_diamond_Id = 313; + static const int diamond_helmet_Id = 310; + static const int diamond_chestplate_Id = 311; + static const int diamond_leggings_Id = 312; + static const int diamond_boots_Id = 313; - static const int helmet_gold_Id = 314; - static const int chestplate_gold_Id = 315; - static const int leggings_gold_Id = 316; - static const int boots_gold_Id = 317; + static const int golden_helmet_Id = 314; + static const int golden_chestplate_Id = 315; + static const int golden_leggings_Id = 316; + static const int golden_boots_Id = 317; static const int flint_Id = 318; - static const int porkChop_raw_Id = 319; - static const int porkChop_cooked_Id = 320; + static const int porkchop_Id = 319; + static const int cooked_porkchop_Id = 320; static const int painting_Id = 321; - static const int apple_gold_Id = 322; - static const int sign_Id = 323; - static const int door_wood_Id = 324; - static const int bucket_empty_Id = 325; - static const int bucket_water_Id = 326; - static const int bucket_lava_Id = 327; + static const int golden_apple_Id = 322; + static const int standing_sign_Id = 323; + static const int wooden_door_Id = 324; + static const int bucket_Id = 325; + static const int water_bucket_Id = 326; + static const int lava_bucket_Id = 327; static const int minecart_Id = 328; static const int saddle_Id = 329; - static const int door_iron_Id = 330; - static const int redStone_Id = 331; - static const int snowBall_Id = 332; + static const int iron_door_Id = 330; + static const int redstone_Id = 331; + static const int snowball_Id = 332; static const int boat_Id = 333; static const int leather_Id = 334; - static const int bucket_milk_Id = 335; + static const int milk_bucket_Id = 335; static const int brick_Id = 336; static const int clay_Id = 337; static const int reeds_Id = 338; static const int paper_Id = 339; static const int book_Id = 340; - static const int slimeBall_Id = 341; - static const int minecart_chest_Id = 342; - static const int minecart_furnace_Id = 343; + static const int slime_ball_Id = 341; + static const int chest_minecart_Id = 342; + static const int furnace_minecart_Id = 343; static const int egg_Id = 344; static const int compass_Id = 345; - static const int fishingRod_Id = 346; + static const int fishing_rod_Id = 346; static const int clock_Id = 347; - static const int yellowDust_Id = 348; - static const int fish_raw_Id = 349; - static const int fish_cooked_Id = 350; - static const int dye_powder_Id = 351; + static const int glowstone_dust_Id = 348; + static const int fish_Id = 349; + static const int cooked_fish_Id = 350; + static const int dye_Id = 351; static const int bone_Id = 352; static const int sugar_Id = 353; static const int cake_Id = 354; static const int bed_Id = 355; static const int repeater_Id = 356; static const int cookie_Id = 357; - static const int map_Id = 358; + static const int filled_map_Id = 358; // 1.7.3 static const int shears_Id = 359; // 1.8.2 - static const int melon_Id = 360; - static const int seeds_pumpkin_Id = 361; - static const int seeds_melon_Id = 362; - static const int beef_raw_Id = 363; - static const int beef_cooked_Id = 364; - static const int chicken_raw_Id = 365; - static const int chicken_cooked_Id = 366; + static const int melon_block_Id = 360; + static const int pumpkin_seeds_Id = 361; + static const int melon_seeds_Id = 362; + static const int beef_Id = 363; + static const int cooked_beef_Id = 364; + static const int chicken_Id = 365; + static const int cooked_chicken_Id = 366; static const int rotten_flesh_Id = 367; - static const int enderPearl_Id = 368; + static const int ender_pearl_Id = 368; // 1.0.1 - static const int blazeRod_Id = 369; - static const int ghastTear_Id = 370; - static const int goldNugget_Id = 371; + static const int blaze_rod_Id = 369; + static const int ghast_tear_Id = 370; + static const int gold_nugget_Id = 371; static const int netherwart_seeds_Id = 372; static const int potion_Id = 373; - static const int glassBottle_Id = 374; - static const int spiderEye_Id = 375; - static const int fermentedSpiderEye_Id = 376; - static const int blazePowder_Id = 377; - static const int magmaCream_Id = 378; - static const int brewingStand_Id = 379; + static const int glass_bottle_Id = 374; + static const int spider_eye_Id = 375; + static const int fermented_spider_eye_Id = 376; + static const int blaze_powder_Id = 377; + static const int magma_cream_Id = 378; + static const int brewing_stand_Id = 379; static const int cauldron_Id = 380; - static const int eyeOfEnder_Id = 381; - static const int speckledMelon_Id = 382; + static const int eye_of_ender_Id = 381; + static const int speckled_melon_block_Id = 382; // 1.1 - static const int spawnEgg_Id = 383; + static const int spawn_egg_Id = 383; - static const int expBottle_Id = 384; + static const int experience_bottle_Id = 384; // TU 12 static const int skull_Id = 397; - static const int record_01_Id = 2256; - static const int record_02_Id = 2257; - static const int record_03_Id = 2258; - static const int record_04_Id = 2259; - static const int record_05_Id = 2260; - static const int record_06_Id = 2261; - static const int record_07_Id = 2262; + static const int record_13_Id = 2256; + static const int record_cat_Id = 2257; + static const int record_blocks_Id = 2258; + static const int record_chirp_Id = 2259; + static const int record_far_Id = 2260; + static const int record_mall_Id = 2261; + static const int record_mellohi_Id = 2262; // 4J-PB - this one isn't playable in the PC game, but is fine in ours - static const int record_08_Id = 2263; - static const int record_09_Id = 2264; - static const int record_10_Id = 2265; + static const int record_stal_Id = 2263; + static const int record_strad_Id = 2264; + static const int record_ward_Id = 2265; static const int record_11_Id = 2266; - static const int record_12_Id = 2267; + static const int record_wait_Id = 2267; // TU9 - static const int fireball_Id = 385; - static const int itemFrame_Id = 389; + static const int fire_charge_Id = 385; + static const int item_frame_Id = 389; // TU14 - static const int writingBook_Id = 386; - static const int writtenBook_Id = 387; + static const int writable_book_Id = 386; + static const int written_book_Id = 387; static const int emerald_Id = 388; - static const int flowerPot_Id = 390; + static const int flower_pot_Id = 390; - static const int carrots_Id = 391; + static const int carrot_Id = 391; static const int potato_Id = 392; - static const int potatoBaked_Id = 393; - static const int potatoPoisonous_Id = 394; + static const int baked_potato_Id = 393; + static const int poisonous_potato_Id = 394; - static const int emptyMap_Id = 395; + static const int map_Id = 395; - static const int carrotGolden_Id = 396; + static const int golden_carrot_Id = 396; - static const int carrotOnAStick_Id = 398; - static const int netherStar_Id = 399; - static const int pumpkinPie_Id = 400; + static const int carrot_on_a_stick_Id = 398; + static const int nether_star_Id = 399; + static const int pumpkin_pie_Id = 400; static const int fireworks_Id = 401; - static const int fireworksCharge_Id = 402; + static const int firework_charge_Id = 402; - static const int enchantedBook_Id = 403; + static const int enchanted_book_Id = 403; static const int comparator_Id = 404; - static const int netherbrick_Id = 405; - static const int netherQuartz_Id = 406; - static const int minecart_tnt_Id = 407; - static const int minecart_hopper_Id = 408; + static const int nether_brick_Id = 405; + static const int quartz_Id = 406; + static const int tnt_minecart_Id = 407; + static const int hopper_minecart_Id = 408; - static const int horseArmorMetal_Id = 417; - static const int horseArmorGold_Id = 418; - static const int horseArmorDiamond_Id = 419; + static const int iron_horse_armor_Id = 417; + static const int golden_horse_armor_Id = 418; + static const int diamond_horse_armor_Id = 419; static const int lead_Id = 420; - static const int nameTag_Id = 421; + static const int name_tag_Id = 421; // TU25 //422 command_block_minecart static const int prismarine_shard_Id = 409; - static const int prismarine_cystal_Id = 410; - static const int rabbit_raw_Id = 411; - static const int rabbit_cooked_Id = 412; - static const int rabbitStew_Id = 413; - static const int rabbits_foot_Id = 414; + static const int prismarine_crystals_Id = 410; + static const int rabbit_Id = 411; + static const int cooked_rabbit_Id = 412; + static const int rabbit_stew_Id = 413; + static const int rabbit_foot_Id = 414; static const int rabbit_hide_Id = 415; static const int armor_stand_Id = 416; - static const int mutton_raw_Id = 423; - static const int mutton_cooked_Id = 424; + static const int mutton_Id = 423; + static const int cooked_mutton_Id = 424; //425 banner //426 end_crystal - static const int door_spruce_Id = 427; - static const int door_birch_Id = 428; - static const int door_jungle_Id = 429; - static const int door_acacia_Id = 430; - static const int door_dark_Id = 431; + static const int spruce_door_Id = 427; + static const int birch_door_Id = 428; + static const int jungle_door_Id = 429; + static const int acacia_door_Id = 430; + static const int dark_oak_door_Id = 431; static const int elytra_Id = 443; diff --git a/Minecraft.World/ItemDispenseBehaviors.cpp b/Minecraft.World/ItemDispenseBehaviors.cpp index 8758dcfb..1bf90326 100644 --- a/Minecraft.World/ItemDispenseBehaviors.cpp +++ b/Minecraft.World/ItemDispenseBehaviors.cpp @@ -281,7 +281,7 @@ shared_ptr FilledBucketDispenseBehavior::execute(BlockSource *sour FacingEnum *facing = DispenserTile::getFacing(source->getData()); if (bucket->emptyBucket(source->getWorld(), sourceX + facing->getStepX(), sourceY + facing->getStepY(), sourceZ + facing->getStepZ())) { - dispensed->id = Item::bucket_empty->id; + dispensed->id = Item::bucket->id; dispensed->count = 1; outcome = ACTIVATED_ITEM; @@ -309,11 +309,11 @@ shared_ptr EmptyBucketDispenseBehavior::execute(BlockSource *sourc Item *targetType; if (Material::water == material && dataValue == 0) { - targetType = Item::bucket_water; + targetType = Item::water_bucket; } else if (Material::lava == material && dataValue == 0) { - targetType = Item::bucket_lava; + targetType = Item::lava_bucket; } else { diff --git a/Minecraft.World/ItemEntity.cpp b/Minecraft.World/ItemEntity.cpp index 4ec21a62..137cced9 100644 --- a/Minecraft.World/ItemEntity.cpp +++ b/Minecraft.World/ItemEntity.cpp @@ -197,7 +197,7 @@ bool ItemEntity::hurt(DamageSource *source, float damage) if (level->isClientSide ) return false; if (isInvulnerable()) return false; - if (getItem() != nullptr && getItem()->id == Item::netherStar_Id && source->isExplosion()) return false; + if (getItem() != nullptr && getItem()->id == Item::nether_star_Id && source->isExplosion()) return false; markHurt(); health -= damage; if (health <= 0) @@ -261,7 +261,7 @@ void ItemEntity::playerTouch(shared_ptr player) //if (item.id == Tile.treeTrunk.id) player.awardStat(Achievements.mineWood); //if (item.id == Item.leather.id) player.awardStat(Achievements.killCow); //if (item.id == Item.diamond.id) player.awardStat(Achievements.diamonds); - //if (item.id == Item.blazeRod.id) player.awardStat(Achievements.blazeRod); + //if (item.id == Item.blaze_rod.id) player.awardStat(Achievements.blaze_rod); if (item->id == Item::diamond_Id) { player->awardStat(GenericStats::diamonds(), GenericStats::param_diamonds()); @@ -277,7 +277,7 @@ void ItemEntity::playerTouch(shared_ptr player) } } - if (item->id == Item::blazeRod_Id) + if (item->id == Item::blaze_rod_Id) player->awardStat(GenericStats::blazeRod(), GenericStats::param_blazeRod()); playSound(eSoundType_RANDOM_POP, 0.2f, ((random->nextFloat() - random->nextFloat()) * 0.7f + 1.0f) * 2.0f); diff --git a/Minecraft.World/ItemInstance.cpp b/Minecraft.World/ItemInstance.cpp index eedb450a..9478057a 100644 --- a/Minecraft.World/ItemInstance.cpp +++ b/Minecraft.World/ItemInstance.cpp @@ -14,15 +14,9 @@ #include "ItemInstance.h" #include "HtmlString.h" #include "../Minecraft.Client/Common/Consoles_App.h" +#include "ItemNameMap.h" #include -#include -#include #include -#include -#include "../Minecraft.Server/vendor/nlohmann/json.hpp" - -using nlohmann::json; -namespace fs = std::filesystem; namespace { @@ -77,100 +71,17 @@ wstring ToSnakeCase(const wstring &value) return NormalizeItemNameId(out); } -void AddNameAlias(unordered_map &nameToId, const wchar_t *name, int id) -{ - nameToId[NormalizeItemNameId(name)] = id; -} - -bool TryLoadExternalItemIdAliases(unordered_map &nameToId) -{ - static bool attempted = false; - static bool loaded = false; - if (attempted) - { - return loaded; - } - attempted = true; - - // todo: convert canidatePaths to single path now that we know where the mapping file is - - // const vector candidatePaths = { - // "Common/Localization/itemId.json" - // }; - - static const string path = "Common/Localization/itemId.json"; - - app.DebugPrintf("[ItemInstance] Trying to load from: %s\n", path.c_str()); - - if (!fs::exists(path)) - { - app.DebugPrintf("[ItemInstance] File does not exist: %s\n", path.c_str()); - return false; - } - - app.DebugPrintf("[ItemInstance] File exists, reading data...\n"); - - ifstream file(path.c_str(), ios::in); - if (!file.good()) - { - app.DebugPrintf("[ItemInstance] Failed to open file: %s\n", path.c_str()); - return false; - } - try - { - json j = json::parse(file); - if (!j.is_object()) - { - app.DebugPrintf("[ItemInstance] ItemId alias JSON is not a valid object: %s\n", path.c_str()); - return false; - } - for (const auto &entry : j.items()) - { - const string &key = entry.key(); - const auto &value = entry.value(); - if (!value.is_number_integer()) - { - continue; - } - wstring wkey(key.begin(), key.end()); - nameToId[NormalizeItemNameId(wkey)] = value.get(); - } - loaded = true; - app.DebugPrintf("[ItemInstance] SUCCESS: Loaded %zu item id aliases from %s\n", j.size(), path.c_str()); - } - catch (const exception &e) - { - app.DebugPrintf("[ItemInstance] Parsing failed: %s (error: %s)\n", path.c_str(), e.what()); - return false; - } - - if (!loaded) - { - app.DebugPrintf("[ItemInstance] FAILED: No valid ItemId aliases were found.\n"); - } - - return loaded; -} - int ResolveLegacyItemIdFromStringName(const wstring &rawName) { - static unordered_map sNameToId; - static bool sInitialized = false; - - if (!sInitialized) - { - sInitialized = true; - TryLoadExternalItemIdAliases(sNameToId); - } - const wstring name = NormalizeItemNameId(rawName); - auto it = sNameToId.find(name); - if (it != sNameToId.end()) + int id = GetItemIdByName(name); + if (id >= 0) { - return it->second; + return id; } - return -1; + const wstring snakeName = ToSnakeCase(rawName); + return GetItemIdByName(snakeName); } int ParseNumericItemId(const wstring &idString, bool &parsed) @@ -281,7 +192,7 @@ shared_ptr ItemInstance::fromTag(CompoundTag *itemTag) itemInstance->load(itemTag); Item *item = itemInstance->getItem(); - if (item == nullptr) + if (item == nullptr && itemInstance->id != 0) // air is not relevant { app.DebugPrintf("[ItemInstance] Missing item while loading: id=%d count=%d damage=%d\n", itemInstance->id, itemInstance->count, itemInstance->auxValue); } @@ -416,10 +327,10 @@ void ItemInstance::load(CompoundTag *compoundTag) break; } } - else - { - app.DebugPrintf("[ItemInstance] Missing item id tag\n"); - } +// else +// { +// app.DebugPrintf("[ItemInstance] Missing item id tag\n"); +// } count = compoundTag->getByte(L"Count"); auxValue = compoundTag->getShort(L"Damage"); diff --git a/Minecraft.World/JukeboxTile.cpp b/Minecraft.World/JukeboxTile.cpp index f4098a06..db6f993d 100644 --- a/Minecraft.World/JukeboxTile.cpp +++ b/Minecraft.World/JukeboxTile.cpp @@ -189,5 +189,5 @@ bool JukeboxTile::hasAnalogOutputSignal() int JukeboxTile::getAnalogOutputSignal(Level *level, int x, int y, int z, int dir) { shared_ptr record = dynamic_pointer_cast( level->getTileEntity(x, y, z))->getRecord(); - return record == nullptr ? Redstone::SIGNAL_NONE : record->id + 1 - Item::record_01_Id; + return record == nullptr ? Redstone::SIGNAL_NONE : record->id + 1 - Item::record_13_Id; } \ No newline at end of file diff --git a/Minecraft.World/LakeFeature.cpp b/Minecraft.World/LakeFeature.cpp index a25a7ece..abdf34d7 100644 --- a/Minecraft.World/LakeFeature.cpp +++ b/Minecraft.World/LakeFeature.cpp @@ -121,7 +121,7 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z) if (level->getTile(x + xx, y + yy - 1, z + zz) == Tile::dirt_Id && level->getBrightness(LightLayer::Sky, x + xx, y + yy, z + zz) > 0) { Biome *b = level->getBiome(x + xx, z + zz); - if (b->topMaterial == Tile::mycel_Id) level->setTileAndData(x + xx, y + yy - 1, z + zz, Tile::mycel_Id, 0, Tile::UPDATE_CLIENTS); + if (b->topMaterial == Tile::mycelium_Id) level->setTileAndData(x + xx, y + yy - 1, z + zz, Tile::mycelium_Id, 0, Tile::UPDATE_CLIENTS); else level->setTileAndData(x + xx, y + yy - 1, z + zz, Tile::grass_Id, 0, Tile::UPDATE_CLIENTS); } } diff --git a/Minecraft.World/LargeCaveFeature.cpp b/Minecraft.World/LargeCaveFeature.cpp index c70f1156..e07c7bf5 100644 --- a/Minecraft.World/LargeCaveFeature.cpp +++ b/Minecraft.World/LargeCaveFeature.cpp @@ -110,7 +110,7 @@ void LargeCaveFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArray b { int p = (xx * 16 + zz) * Level::genDepth + yy; if (yy < 0 || yy >= Level::genDepth) continue; - if (blocks[p] == Tile::water_Id || blocks[p] == Tile::calmWater_Id) + if (blocks[p] == Tile::flowing_water_Id || blocks[p] == Tile::water_Id) { detectedWater = true; } @@ -144,7 +144,7 @@ void LargeCaveFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArray b { if (yy < 10) { - blocks[p] = static_cast(Tile::lava_Id); + blocks[p] = static_cast(Tile::flowing_lava_Id); } else { diff --git a/Minecraft.World/LargeHellCaveFeature.cpp b/Minecraft.World/LargeHellCaveFeature.cpp index 9472c855..bb78aff6 100644 --- a/Minecraft.World/LargeHellCaveFeature.cpp +++ b/Minecraft.World/LargeHellCaveFeature.cpp @@ -110,7 +110,7 @@ void LargeHellCaveFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArr { int p = (xx * 16 + zz) * Level::genDepth + yy; if (yy < 0 || yy >= Level::genDepth) continue; - if (blocks[p] == Tile::lava_Id || blocks[p] == Tile::calmLava_Id) + if (blocks[p] == Tile::flowing_lava_Id || blocks[p] == Tile::lava_Id) { detectedWater = true; } @@ -136,7 +136,7 @@ void LargeHellCaveFeature::addTunnel(int64_t seed, int xOffs, int zOffs, byteArr if (yd > -0.7 && xd * xd + yd * yd + zd * zd < 1) { int block = blocks[p]; - if (block == Tile::netherRack_Id || block == Tile::dirt_Id || block == Tile::grass_Id) + if (block == Tile::netherrack_Id || block == Tile::dirt_Id || block == Tile::grass_Id) { blocks[p] = static_cast(0); } diff --git a/Minecraft.World/LavaSlime.cpp b/Minecraft.World/LavaSlime.cpp index 30a87653..77ad827f 100644 --- a/Minecraft.World/LavaSlime.cpp +++ b/Minecraft.World/LavaSlime.cpp @@ -61,7 +61,7 @@ shared_ptr LavaSlime::createChild() int LavaSlime::getDeathLoot() { // 4J-PB - brought forward the magma cream drops - return Item::magmaCream_Id; + return Item::magma_cream_Id; } void LavaSlime::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) diff --git a/Minecraft.World/LeafTile.cpp b/Minecraft.World/LeafTile.cpp index 5f40d55e..2e41c092 100644 --- a/Minecraft.World/LeafTile.cpp +++ b/Minecraft.World/LeafTile.cpp @@ -137,7 +137,7 @@ void LeafTile::tick(Level *level, int x, int y, int z, Random *random) for (int yo = -r; yo <= r; yo++) { int t = level->getTile(x + xo, y + yo, z + zo); - if (t == Tile::treeTrunk_Id || t == Tile::tree2Trunk_Id) + if (t == Tile::log_Id || t == Tile::log2_Id) { checkBuffer[(xo + WO) * WW + (yo + WO) * W + (zo + WO)] = 0; } diff --git a/Minecraft.World/Level.cpp b/Minecraft.World/Level.cpp index ca03bde3..62962333 100644 --- a/Minecraft.World/Level.cpp +++ b/Minecraft.World/Level.cpp @@ -2684,7 +2684,7 @@ bool Level::containsFireTile(AABB *box) { int t = getTile(x, y, z); - if (t == Tile::fire_Id || t == Tile::lava_Id || t == Tile::calmLava_Id) return true; + if (t == Tile::fire_Id || t == Tile::flowing_lava_Id || t == Tile::lava_Id) return true; } } return false; @@ -3362,7 +3362,7 @@ bool Level::shouldFreeze(int x, int y, int z, bool checkNeighbors) if (y >= 0 && y < maxBuildHeight && getBrightness(LightLayer::Block, x, y, z) < 10) { int current = getTile(x, y, z); - if ((current == Tile::calmWater_Id || current == Tile::water_Id) && getData(x, y, z) == 0) + if ((current == Tile::water_Id || current == Tile::flowing_water_Id) && getData(x, y, z) == 0) { if (!checkNeighbors) return true; diff --git a/Minecraft.World/LightGemFeature.cpp b/Minecraft.World/LightGemFeature.cpp index 6ad1193a..09a288a8 100644 --- a/Minecraft.World/LightGemFeature.cpp +++ b/Minecraft.World/LightGemFeature.cpp @@ -6,7 +6,7 @@ bool LightGemFeature::place(Level *level, Random *random, int x, int y, int z) { if (!level->isEmptyTile(x, y, z)) return false; - if (level->getTile(x, y + 1, z) != Tile::netherRack_Id) return false; + if (level->getTile(x, y + 1, z) != Tile::netherrack_Id) return false; level->setTileAndData(x, y, z, Tile::glowstone_Id, 0, Tile::UPDATE_CLIENTS); for (int i = 0; i < 1500; i++) diff --git a/Minecraft.World/LightGemTile.cpp b/Minecraft.World/LightGemTile.cpp index 3aa7d101..e8ae28b7 100644 --- a/Minecraft.World/LightGemTile.cpp +++ b/Minecraft.World/LightGemTile.cpp @@ -18,5 +18,5 @@ int LightGemTile::getResourceCount(Random *random) int LightGemTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::yellowDust->id; + return Item::glowstone_dust->id; } \ No newline at end of file diff --git a/Minecraft.World/LiquidTileDynamic.cpp b/Minecraft.World/LiquidTileDynamic.cpp index 0394f1ef..25a8e821 100644 --- a/Minecraft.World/LiquidTileDynamic.cpp +++ b/Minecraft.World/LiquidTileDynamic.cpp @@ -315,7 +315,7 @@ bool *LiquidTileDynamic::getSpread(Level *level, int x, int y, int z) bool LiquidTileDynamic::isWaterBlocking(Level *level, int x, int y, int z) { int t = level->getTile(x, y, z); - if (t == Tile::door_wood_Id || t == Tile::door_iron_Id || t == Tile::sign_Id || t == Tile::ladder_Id || t == Tile::reeds_Id) + if (t == Tile::wooden_door_Id || t == Tile::iron_door_Id || t == Tile::standing_sign_Id || t == Tile::ladder_Id || t == Tile::reeds_Id) { return true; } diff --git a/Minecraft.World/MegaPineTreeFeature.cpp b/Minecraft.World/MegaPineTreeFeature.cpp index 59c026cd..d6aec09a 100644 --- a/Minecraft.World/MegaPineTreeFeature.cpp +++ b/Minecraft.World/MegaPineTreeFeature.cpp @@ -164,9 +164,9 @@ bool MegaPineTreeFeature::isReplaceable(int tileId) || tileId == Tile::leaves2_Id || tileId == Tile::grass_Id || tileId == Tile::dirt_Id - || tileId == Tile::treeTrunk_Id + || tileId == Tile::log_Id || tileId == Tile::sapling_Id - || tileId == Tile::deadBush_Id + || tileId == Tile::deadbush_Id || tileId == Tile::tallgrass_Id || tileId == Tile::snow_Id; } @@ -191,21 +191,21 @@ bool MegaPineTreeFeature::place(Level *level, Random *random, int x, int y, int { if (isAirLeaves(level, x, y + j, z)) { - placeBlock(level, x, y + j, z, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + placeBlock(level, x, y + j, z, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } if (j < height - 1) // 3 extra columns stop 1 short of the top { if (isAirLeaves(level, x + 1, y + j, z)) { - placeBlock(level, x + 1, y + j, z, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + placeBlock(level, x + 1, y + j, z, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } if (isAirLeaves(level, x + 1, y + j, z + 1)) { - placeBlock(level, x + 1, y + j, z + 1, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + placeBlock(level, x + 1, y + j, z + 1, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } if (isAirLeaves(level, x, y + j, z + 1)) { - placeBlock(level, x, y + j, z + 1, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + placeBlock(level, x, y + j, z + 1, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } } } diff --git a/Minecraft.World/MegaTreeFeature.cpp b/Minecraft.World/MegaTreeFeature.cpp index db4a336a..478ca61b 100644 --- a/Minecraft.World/MegaTreeFeature.cpp +++ b/Minecraft.World/MegaTreeFeature.cpp @@ -40,7 +40,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) if (yy >= 0 && yy < Level::maxBuildHeight) { int tt = level->getTile(xx, yy, zz); - if (tt != 0 && tt != Tile::leaves_Id && tt != Tile::grass_Id && tt != Tile::dirt_Id && tt != Tile::treeTrunk_Id && tt != Tile::sapling_Id) free = false; + if (tt != 0 && tt != Tile::leaves_Id && tt != Tile::grass_Id && tt != Tile::dirt_Id && tt != Tile::log_Id && tt != Tile::sapling_Id) free = false; } else { @@ -77,7 +77,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) { bx = x + static_cast(1.5f + Mth::cos(angle) * b); bz = z + static_cast(1.5f + Mth::sin(angle) * b); - placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::treeTrunk_Id, trunkType); + placeBlock(level, bx, branchHeight - 3 + b / 2, bz, Tile::log_Id, trunkType); } branchHeight -= 2 + random->nextInt(4); @@ -90,7 +90,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) int t = level->getTile(x, y + hh, z); if (t == 0 || t == Tile::leaves_Id) { - placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, trunkType); + placeBlock(level, x, y + hh, z, Tile::log_Id, trunkType); if (hh > 0) { if (random->nextInt(3) > 0 && level->isEmptyTile(x - 1, y + hh, z)) @@ -108,7 +108,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) t = level->getTile(x + 1, y + hh, z); if (t == 0 || t == Tile::leaves_Id) { - placeBlock(level, x + 1, y + hh, z, Tile::treeTrunk_Id, trunkType); + placeBlock(level, x + 1, y + hh, z, Tile::log_Id, trunkType); if (hh > 0) { if (random->nextInt(3) > 0 && level->isEmptyTile(x + 2, y + hh, z)) @@ -124,7 +124,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) t = level->getTile(x + 1, y + hh, z + 1); if (t == 0 || t == Tile::leaves_Id) { - placeBlock(level, x + 1, y + hh, z + 1, Tile::treeTrunk_Id, trunkType); + placeBlock(level, x + 1, y + hh, z + 1, Tile::log_Id, trunkType); if (hh > 0) { if (random->nextInt(3) > 0 && level->isEmptyTile(x + 2, y + hh, z + 1)) @@ -140,7 +140,7 @@ bool MegaTreeFeature::place(Level *level, Random *random, int x, int y, int z) t = level->getTile(x, y + hh, z + 1); if (t == 0 || t == Tile::leaves_Id) { - placeBlock(level, x, y + hh, z + 1, Tile::treeTrunk_Id, trunkType); + placeBlock(level, x, y + hh, z + 1, Tile::log_Id, trunkType); if (hh > 0) { if (random->nextInt(3) > 0 && level->isEmptyTile(x - 1, y + hh, z + 1)) diff --git a/Minecraft.World/MelonFeature.cpp b/Minecraft.World/MelonFeature.cpp index 0921fd09..fab3c987 100644 --- a/Minecraft.World/MelonFeature.cpp +++ b/Minecraft.World/MelonFeature.cpp @@ -14,7 +14,7 @@ bool MelonFeature::place(Level *level, Random *random, int x, int y, int z) { if (Tile::melon->mayPlace(level, x2, y2, z2)) { - level->setTileAndData(x2, y2, z2, Tile::melon_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x2, y2, z2, Tile::melon_block_Id, 0, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/MesaBiome.cpp b/Minecraft.World/MesaBiome.cpp index 0aef5182..9e8eda19 100644 --- a/Minecraft.World/MesaBiome.cpp +++ b/Minecraft.World/MesaBiome.cpp @@ -28,7 +28,7 @@ MesaBiome::MesaBiome(int id, bool mesaPlateau, bool hasTrees) : Biome(id) this->topMaterial = static_cast(Tile::sand_Id); this->topMaterialData = static_cast(SandTile::RED_SAND); - this->material = static_cast(Tile::clayHardened_colored_Id); + this->material = static_cast(Tile::stained_hardened_clay_Id); this->materialData = static_cast(orangeColoredClayState); this->lastSeed = INVALID_SEED; @@ -68,7 +68,7 @@ void MesaBiome::generateBands(int64_t seed) for (int i = 0; i < BAND_COUNT; ++i) { - clayBands[i].blockId = Tile::clayHardened_Id; + clayBands[i].blockId = Tile::hardened_clay_Id; clayBands[i].blockData = defaultHardenedClayState; } @@ -85,7 +85,7 @@ void MesaBiome::generateBands(int64_t seed) i += r.nextInt(5) + 1; if (i < BAND_COUNT) { - clayBands[i].blockId = Tile::clayHardened_colored_Id; + clayBands[i].blockId = Tile::stained_hardened_clay_Id; clayBands[i].blockData = orangeColoredClayState; } } @@ -99,7 +99,7 @@ void MesaBiome::generateBands(int64_t seed) int start = r.nextInt(BAND_COUNT); for (int k = 0; start + k < BAND_COUNT && k < len; ++k) { - clayBands[start + k].blockId = Tile::clayHardened_colored_Id; + clayBands[start + k].blockId = Tile::stained_hardened_clay_Id; clayBands[start + k].blockData = yellowColoredClayState; } } @@ -113,7 +113,7 @@ void MesaBiome::generateBands(int64_t seed) int start = r.nextInt(BAND_COUNT); for (int k = 0; start + k < BAND_COUNT && k < len; ++k) { - clayBands[start + k].blockId = Tile::clayHardened_colored_Id; + clayBands[start + k].blockId = Tile::stained_hardened_clay_Id; clayBands[start + k].blockData = brownColoredClayState; } } @@ -127,7 +127,7 @@ void MesaBiome::generateBands(int64_t seed) int start = r.nextInt(BAND_COUNT); for (int k = 0; start + k < BAND_COUNT && k < len; ++k) { - clayBands[start + k].blockId = Tile::clayHardened_colored_Id; + clayBands[start + k].blockId = Tile::stained_hardened_clay_Id; clayBands[start + k].blockData = redColoredClayState; } } @@ -141,19 +141,19 @@ void MesaBiome::generateBands(int64_t seed) cursor += r.nextInt(16) + 4; if (cursor >= BAND_COUNT) break; - clayBands[cursor].blockId = Tile::clayHardened_colored_Id; + clayBands[cursor].blockId = Tile::stained_hardened_clay_Id; clayBands[cursor].blockData = whiteColoredClayState; if (cursor > 1 && r.nextBoolean()) { - clayBands[cursor - 1].blockId = Tile::clayHardened_colored_Id; + clayBands[cursor - 1].blockId = Tile::stained_hardened_clay_Id; clayBands[cursor - 1].blockData = silverColoredClayState; } if (cursor < 63 && r.nextBoolean()) { - clayBands[cursor + 1].blockId = Tile::clayHardened_colored_Id; + clayBands[cursor + 1].blockId = Tile::stained_hardened_clay_Id; clayBands[cursor + 1].blockData = silverColoredClayState; } } @@ -164,7 +164,7 @@ void MesaBiome::generateBands(int64_t seed) BandEntry MesaBiome::getBand(int x, int y, int z) { if (!clayBandsOffsetNoise || !clayBands) - return { Tile::clayHardened_Id, 0 }; + return { Tile::hardened_clay_Id, 0 }; double noiseVal = clayBandsOffsetNoise->getValue( @@ -277,7 +277,7 @@ void MesaBiome::buildSurfaceAtDefault(Level* level, Random* random, if (y <= random->nextInt(5)) { - chunkBlocks[idx] = static_cast(Tile::unbreakable_Id); + chunkBlocks[idx] = static_cast(Tile::bedrock_Id); continue; } @@ -309,7 +309,7 @@ void MesaBiome::buildSurfaceAtDefault(Level* level, Random* random, } else { - chunkBlocks[idx] = static_cast(Tile::clayHardened_colored_Id); + chunkBlocks[idx] = static_cast(Tile::stained_hardened_clay_Id); chunkData[idx] = static_cast(BAND_ORANGE); } } @@ -339,26 +339,26 @@ void MesaBiome::buildSurfaceAtDefault(Level* level, Random* random, { if (cosFlag) { - chunkBlocks[idx] = static_cast(Tile::clayHardened_Id); + chunkBlocks[idx] = static_cast(Tile::hardened_clay_Id); } else { BandEntry band = getBand(x, y, z); chunkBlocks[idx] = static_cast(band.blockId); - if (band.blockId == Tile::clayHardened_colored_Id) + if (band.blockId == Tile::stained_hardened_clay_Id) chunkData[idx] = static_cast(band.blockData); } } else { - chunkBlocks[idx] = static_cast(Tile::clayHardened_colored_Id); + chunkBlocks[idx] = static_cast(Tile::stained_hardened_clay_Id); chunkData[idx] = static_cast(BAND_ORANGE); } } if (y < seaLevel && chunkBlocks[idx] == 0) - chunkBlocks[idx] = static_cast(Tile::calmWater_Id); + chunkBlocks[idx] = static_cast(Tile::water_Id); } else if (run > 0) { @@ -366,14 +366,14 @@ void MesaBiome::buildSurfaceAtDefault(Level* level, Random* random, if (underRedSand) { - chunkBlocks[idx] = static_cast(Tile::clayHardened_colored_Id); + chunkBlocks[idx] = static_cast(Tile::stained_hardened_clay_Id); chunkData[idx] = static_cast(BAND_ORANGE); } else { BandEntry band = getBand(x, y, z); chunkBlocks[idx] = static_cast(band.blockId); - if (band.blockId == Tile::clayHardened_colored_Id) + if (band.blockId == Tile::stained_hardened_clay_Id) chunkData[idx] = static_cast(band.blockData); } } diff --git a/Minecraft.World/MilkBucketItem.cpp b/Minecraft.World/MilkBucketItem.cpp index 8c8ea674..ee358f38 100644 --- a/Minecraft.World/MilkBucketItem.cpp +++ b/Minecraft.World/MilkBucketItem.cpp @@ -19,7 +19,7 @@ shared_ptr MilkBucketItem::useTimeDepleted(shared_ptrcount <= 0) { - return std::make_shared(Item::bucket_empty); + return std::make_shared(Item::bucket); } return instance; } diff --git a/Minecraft.World/MineShaftPieces.cpp b/Minecraft.World/MineShaftPieces.cpp index 97caf366..d81223f8 100644 --- a/Minecraft.World/MineShaftPieces.cpp +++ b/Minecraft.World/MineShaftPieces.cpp @@ -14,20 +14,20 @@ WeighedTreasureArray MineShaftPieces::smallTreasureItems;; void MineShaftPieces::staticCtor() { smallTreasureItems = WeighedTreasureArray(13); - smallTreasureItems[0] = new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10); - smallTreasureItems[1] = new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 5); - smallTreasureItems[2] = new WeighedTreasure(Item::redStone_Id, 0, 4, 9, 5); - smallTreasureItems[3] = new WeighedTreasure(Item::dye_powder_Id, DyePowderItem::BLUE, 4, 9, 5); + smallTreasureItems[0] = new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10); + smallTreasureItems[1] = new WeighedTreasure(Item::gold_ingot_Id, 0, 1, 3, 5); + smallTreasureItems[2] = new WeighedTreasure(Item::redstone_Id, 0, 4, 9, 5); + smallTreasureItems[3] = new WeighedTreasure(Item::dye_Id, DyePowderItem::BLUE, 4, 9, 5); smallTreasureItems[4] = new WeighedTreasure(Item::diamond_Id, 0, 1, 2, 3); smallTreasureItems[5] = new WeighedTreasure(Item::coal_Id, CoalItem::STONE_COAL, 3, 8, 10); smallTreasureItems[6] = new WeighedTreasure(Item::bread_Id, 0, 1, 3, 15); - smallTreasureItems[7] = new WeighedTreasure(Item::pickAxe_iron_Id, 0, 1, 1, 1); + smallTreasureItems[7] = new WeighedTreasure(Item::iron_pickaxe_Id, 0, 1, 1, 1); smallTreasureItems[8] = new WeighedTreasure(Tile::rail_Id, 0, 4, 8, 1); - smallTreasureItems[9] = new WeighedTreasure(Item::seeds_melon_Id, 0, 2, 4, 10); - smallTreasureItems[10] = new WeighedTreasure(Item::seeds_pumpkin_Id, 0, 2, 4, 10); + smallTreasureItems[9] = new WeighedTreasure(Item::melon_seeds_Id, 0, 2, 4, 10); + smallTreasureItems[10] = new WeighedTreasure(Item::pumpkin_seeds_Id, 0, 2, 4, 10); // very rare for shafts ... smallTreasureItems[11] = new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3); - smallTreasureItems[12] = new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1); + smallTreasureItems[12] = new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 1); } void MineShaftPieces::loadStatic() @@ -477,12 +477,12 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level *level, Random *rando generateBox(level, chunkBB, x1, y0, z, x1, y1 - 1, z, Tile::fence_Id, 0, false); if (random->nextInt(4) == 0) { - generateBox(level, chunkBB, x0, y1, z, x0, y1, z, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, x1, y1, z, x1, y1, z, Tile::wood_Id, 0, false); + generateBox(level, chunkBB, x0, y1, z, x0, y1, z, Tile::planks_Id, 0, false); + generateBox(level, chunkBB, x1, y1, z, x1, y1, z, Tile::planks_Id, 0, false); } else { - generateBox(level, chunkBB, x0, y1, z, x1, y1, z, Tile::wood_Id, 0, false); + generateBox(level, chunkBB, x0, y1, z, x1, y1, z, Tile::planks_Id, 0, false); } maybeGenerateBlock(level, chunkBB, random, .1f, x0, y1, z - 1, Tile::web_Id, 0); maybeGenerateBlock(level, chunkBB, random, .1f, x1, y1, z - 1, Tile::web_Id, 0); @@ -498,11 +498,11 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level *level, Random *rando if (random->nextInt(100) == 0) { - createChest(level, chunkBB, random, x1, y0, z - 1, WeighedTreasure::addToTreasure(smallTreasureItems, Item::enchantedBook->createForRandomTreasure(random)), 3 + random->nextInt(4)); + createChest(level, chunkBB, random, x1, y0, z - 1, WeighedTreasure::addToTreasure(smallTreasureItems, Item::enchanted_book->createForRandomTreasure(random)), 3 + random->nextInt(4)); } if (random->nextInt(100) == 0) { - createChest(level, chunkBB, random, x0, y0, z + 1, WeighedTreasure::addToTreasure(smallTreasureItems, Item::enchantedBook->createForRandomTreasure(random)), 3 + random->nextInt(4)); + createChest(level, chunkBB, random, x0, y0, z + 1, WeighedTreasure::addToTreasure(smallTreasureItems, Item::enchanted_book->createForRandomTreasure(random)), 3 + random->nextInt(4)); } if (spiderCorridor && !hasPlacedSpider) @@ -513,7 +513,7 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level *level, Random *rando if (chunkBB->isInside(x, y, newZ)) { hasPlacedSpider = true; - level->setTileAndData(x, y, newZ, Tile::mobSpawner_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, newZ, Tile::mob_spawner_Id, 0, Tile::UPDATE_CLIENTS); shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, newZ) ); if (entity != nullptr) entity->getSpawner()->setEntityId(L"CaveSpider"); } @@ -528,7 +528,7 @@ bool MineShaftPieces::MineShaftCorridor::postProcess(Level *level, Random *rando int block = getBlock(level, x, -1, z, chunkBB); if (block == 0) { - placeBlock(level, Tile::wood_Id, 0, x, -1, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, x, -1, z, chunkBB); } } } @@ -677,10 +677,10 @@ bool MineShaftPieces::MineShaftCrossing::postProcess(Level *level, Random *rando } // support pillars - generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, boundingBox->z0 + 1, boundingBox->x0 + 1, boundingBox->y1, boundingBox->z0 + 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, boundingBox->z1 - 1, boundingBox->x0 + 1, boundingBox->y1, boundingBox->z1 - 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, boundingBox->z0 + 1, boundingBox->x1 - 1, boundingBox->y1, boundingBox->z0 + 1, Tile::wood_Id, 0, false); - generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, boundingBox->z1 - 1, boundingBox->x1 - 1, boundingBox->y1, boundingBox->z1 - 1, Tile::wood_Id, 0, false); + generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, boundingBox->z0 + 1, boundingBox->x0 + 1, boundingBox->y1, boundingBox->z0 + 1, Tile::planks_Id, 0, false); + generateBox(level, chunkBB, boundingBox->x0 + 1, boundingBox->y0, boundingBox->z1 - 1, boundingBox->x0 + 1, boundingBox->y1, boundingBox->z1 - 1, Tile::planks_Id, 0, false); + generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, boundingBox->z0 + 1, boundingBox->x1 - 1, boundingBox->y1, boundingBox->z0 + 1, Tile::planks_Id, 0, false); + generateBox(level, chunkBB, boundingBox->x1 - 1, boundingBox->y0, boundingBox->z1 - 1, boundingBox->x1 - 1, boundingBox->y1, boundingBox->z1 - 1, Tile::planks_Id, 0, false); // prevent air floating // note: use world coordinates because the corridor hasn't defined @@ -692,7 +692,7 @@ bool MineShaftPieces::MineShaftCrossing::postProcess(Level *level, Random *rando int block = getBlock(level, x, boundingBox->y0 - 1, z, chunkBB); if (block == 0) { - placeBlock(level, Tile::wood_Id, 0, x, boundingBox->y0 - 1, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, x, boundingBox->y0 - 1, z, chunkBB); } } } diff --git a/Minecraft.World/Minecart.cpp b/Minecraft.World/Minecart.cpp index efefb7ea..faa74c5c 100644 --- a/Minecraft.World/Minecart.cpp +++ b/Minecraft.World/Minecart.cpp @@ -313,7 +313,7 @@ void Minecart::tick() int data = level->getData(xt, yt, zt); moveAlongTrack(xt, yt, zt, max, slideSpeed, tile, data); - if (tile == Tile::activatorRail_Id) + if (tile == Tile::activator_rail_Id) { activateMinecart(xt, yt, zt, (data & BaseRailTile::RAIL_DATA_BIT) != 0); } @@ -410,7 +410,7 @@ void Minecart::moveAlongTrack(int xt, int yt, int zt, double maxSpeed, double sl bool powerTrack = false; bool haltTrack = false; - if (tile == Tile::goldenRail_Id) + if (tile == Tile::golden_rail_Id) { powerTrack = (data & BaseRailTile::RAIL_DATA_BIT) != 0; haltTrack = !powerTrack; diff --git a/Minecraft.World/Mob.cpp b/Minecraft.World/Mob.cpp index 2b5dcb86..08fd01c1 100644 --- a/Minecraft.World/Mob.cpp +++ b/Minecraft.World/Mob.cpp @@ -769,29 +769,29 @@ Item *Mob::getEquipmentForSlot(int slot, int type) switch (slot) { case SLOT_HELM: - if (type == 0) return Item::helmet_leather; - if (type == 1) return Item::helmet_gold; - if (type == 2) return Item::helmet_chain; - if (type == 3) return Item::helmet_iron; - if (type == 4) return Item::helmet_diamond; + if (type == 0) return Item::leather_helmet; + if (type == 1) return Item::golden_helmet; + if (type == 2) return Item::chainmail_helmet; + if (type == 3) return Item::iron_helmet; + if (type == 4) return Item::diamond_helmet; case SLOT_CHEST: - if (type == 0) return Item::chestplate_leather; - if (type == 1) return Item::chestplate_gold; - if (type == 2) return Item::chestplate_chain; - if (type == 3) return Item::chestplate_iron; - if (type == 4) return Item::chestplate_diamond; + if (type == 0) return Item::leather_chestplate; + if (type == 1) return Item::golden_chestplate; + if (type == 2) return Item::chainmail_chestplate; + if (type == 3) return Item::iron_chestplate; + if (type == 4) return Item::diamond_chestplate; case SLOT_LEGGINGS: - if (type == 0) return Item::leggings_leather; - if (type == 1) return Item::leggings_gold; - if (type == 2) return Item::leggings_chain; - if (type == 3) return Item::leggings_iron; - if (type == 4) return Item::leggings_diamond; + if (type == 0) return Item::leather_leggings; + if (type == 1) return Item::golden_leggings; + if (type == 2) return Item::chainmail_leggings; + if (type == 3) return Item::iron_leggings; + if (type == 4) return Item::diamond_leggings; case SLOT_BOOTS: - if (type == 0) return Item::boots_leather; - if (type == 1) return Item::boots_gold; - if (type == 2) return Item::boots_chain; - if (type == 3) return Item::boots_iron; - if (type == 4) return Item::boots_diamond; + if (type == 0) return Item::leather_boots; + if (type == 1) return Item::golden_boots; + if (type == 2) return Item::chainmail_boots; + if (type == 3) return Item::iron_boots; + if (type == 4) return Item::diamond_boots; } return nullptr; diff --git a/Minecraft.World/MobSpawner.cpp b/Minecraft.World/MobSpawner.cpp index f43d9532..3afc4b3d 100644 --- a/Minecraft.World/MobSpawner.cpp +++ b/Minecraft.World/MobSpawner.cpp @@ -423,7 +423,7 @@ bool MobSpawner::isSpawnPositionOk(MobCategory *category, Level *level, int x, i { if (!level->isTopSolidBlocking(x, y - 1, z)) return false; int tt = level->getTile(x, y - 1, z); - return tt != Tile::unbreakable_Id && !level->isSolidBlockingTile(x, y, z) && !level->getMaterial(x, y, z)->isLiquid() && !level->isSolidBlockingTile(x, y + 1, z); + return tt != Tile::bedrock_Id && !level->isSolidBlockingTile(x, y, z) && !level->getMaterial(x, y, z)->isLiquid() && !level->isSolidBlockingTile(x, y + 1, z); } } diff --git a/Minecraft.World/MobSpawnerTileEntity.cpp b/Minecraft.World/MobSpawnerTileEntity.cpp index 1db58f41..1d3b02f2 100644 --- a/Minecraft.World/MobSpawnerTileEntity.cpp +++ b/Minecraft.World/MobSpawnerTileEntity.cpp @@ -11,7 +11,7 @@ MobSpawnerTileEntity::TileEntityMobSpawner::TileEntityMobSpawner(MobSpawnerTileE void MobSpawnerTileEntity::TileEntityMobSpawner::broadcastEvent(int id) { - m_parent->level->tileEvent(m_parent->x, m_parent->y, m_parent->z, Tile::mobSpawner_Id, id, 0); + m_parent->level->tileEvent(m_parent->x, m_parent->y, m_parent->z, Tile::mob_spawner_Id, id, 0); } Level *MobSpawnerTileEntity::TileEntityMobSpawner::getLevel() diff --git a/Minecraft.World/MonsterPlacerItem.cpp b/Minecraft.World/MonsterPlacerItem.cpp index f3cf2387..e20bb76b 100644 --- a/Minecraft.World/MonsterPlacerItem.cpp +++ b/Minecraft.World/MonsterPlacerItem.cpp @@ -176,11 +176,11 @@ bool MonsterPlacerItem::useOn(shared_ptr itemInstance, shared_ptr< int tile = level->getTile(x, y, z); #ifndef _CONTENT_PACKAGE - if(app.DebugSettingsOn() && tile == Tile::mobSpawner_Id) + if(app.DebugSettingsOn() && tile == Tile::mob_spawner_Id) { // 4J Stu - Force adding this as a tile update level->setTile(x,y,z,0); - level->setTile(x,y,z,Tile::mobSpawner_Id); + level->setTile(x,y,z,Tile::mob_spawner_Id); shared_ptr mste = dynamic_pointer_cast( level->getTileEntity(x,y,z) ); if(mste != NULL) { @@ -196,7 +196,7 @@ bool MonsterPlacerItem::useOn(shared_ptr itemInstance, shared_ptr< double yOff = 0; // 4J-PB - missing parentheses added - if (face == Facing::UP && (tile == Tile::fence_Id || tile == Tile::netherFence_Id)) + if (face == Facing::UP && (tile == Tile::fence_Id || tile == Tile::nether_brick_fence_Id)) { // special case yOff = .5; diff --git a/Minecraft.World/MonsterRoomFeature.cpp b/Minecraft.World/MonsterRoomFeature.cpp index e11ebcb2..a6c8ba71 100644 --- a/Minecraft.World/MonsterRoomFeature.cpp +++ b/Minecraft.World/MonsterRoomFeature.cpp @@ -10,20 +10,20 @@ WeighedTreasure *MonsterRoomFeature::monsterRoomTreasure[MonsterRoomFeature::TREASURE_ITEMS_COUNT] = { new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 4, 10), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 4, 10), new WeighedTreasure(Item::bread_Id, 0, 1, 1, 10), new WeighedTreasure(Item::wheat_Id, 0, 1, 4, 10), new WeighedTreasure(Item::gunpowder_Id, 0, 1, 4, 10), new WeighedTreasure(Item::string_Id, 0, 1, 4, 10), - new WeighedTreasure(Item::bucket_empty_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::apple_gold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::redStone_Id, 0, 1, 4, 10), - new WeighedTreasure(Item::record_01_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::record_02_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::nameTag_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 2), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::bucket_Id, 0, 1, 1, 10), + new WeighedTreasure(Item::golden_apple_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::redstone_Id, 0, 1, 4, 10), + new WeighedTreasure(Item::record_13_Id, 0, 1, 1, 10), + new WeighedTreasure(Item::record_cat_Id, 0, 1, 1, 10), + new WeighedTreasure(Item::name_tag_Id, 0, 1, 1, 10), + new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 2), + new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 1), }; bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z) @@ -74,7 +74,7 @@ bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z { if (yy == y - 1 && random->nextInt(4) != 0) { - level->setTileAndData(xx, yy, zz, Tile::mossyCobblestone_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(xx, yy, zz, Tile::mossy_cobblestone_Id, 0, Tile::UPDATE_CLIENTS); } else { @@ -108,7 +108,7 @@ bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z level->setTileAndData(xc, yc, zc, Tile::chest_Id, 0, Tile::UPDATE_CLIENTS); WeighedTreasureArray wrapperArray(monsterRoomTreasure, TREASURE_ITEMS_COUNT); - WeighedTreasureArray treasure = WeighedTreasure::addToTreasure(wrapperArray, Item::enchantedBook->createForRandomTreasure(random)); + WeighedTreasureArray treasure = WeighedTreasure::addToTreasure(wrapperArray, Item::enchanted_book->createForRandomTreasure(random)); shared_ptr chest = dynamic_pointer_cast( level->getTileEntity(xc, yc, zc) ); if (chest != nullptr ) { @@ -120,7 +120,7 @@ bool MonsterRoomFeature::place(Level *level, Random *random, int x, int y, int z } - level->setTileAndData(x, y, z, Tile::mobSpawner_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::mob_spawner_Id, 0, Tile::UPDATE_CLIENTS); shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if( entity != nullptr ) { diff --git a/Minecraft.World/Mushroom.cpp b/Minecraft.World/Mushroom.cpp index 91ba3f7a..72bcfd01 100644 --- a/Minecraft.World/Mushroom.cpp +++ b/Minecraft.World/Mushroom.cpp @@ -77,7 +77,7 @@ bool Mushroom::canSurvive(Level *level, int x, int y, int z) int below = level->getTile(x, y - 1, z); - return below == Tile::mycel_Id || (level->getDaytimeRawBrightness(x, y, z) < 13 && mayPlaceOn(below)); + return below == Tile::mycelium_Id || (level->getDaytimeRawBrightness(x, y, z) < 13 && mayPlaceOn(below)); } bool Mushroom::growTree(Level *level, int x, int y, int z, Random *random, bool naturalGrowth, int entityId) { diff --git a/Minecraft.World/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp index 6452e73d..45653285 100644 --- a/Minecraft.World/MushroomCow.cpp +++ b/Minecraft.World/MushroomCow.cpp @@ -28,11 +28,11 @@ bool MushroomCow::mobInteract(shared_ptr player) { if (item->count == 1) { - player->inventory->setItem(player->inventory->selected, std::make_shared(Item::mushroomStew)); + player->inventory->setItem(player->inventory->selected, std::make_shared(Item::mushroom_stew)); return true; } - if (player->inventory->add(std::make_shared(Item::mushroomStew)) && !player->abilities.instabuild) + if (player->inventory->add(std::make_shared(Item::mushroom_stew)) && !player->abilities.instabuild) { player->inventory->removeItem(player->inventory->selected, 1); return true; @@ -68,7 +68,7 @@ bool MushroomCow::canSpawn() int xt = Mth::floor(x); int yt = Mth::floor(bb->y0); int zt = Mth::floor(z); - return ( level->getTile(xt, yt - 1, zt) == Tile::grass_Id || level->getTile(xt, yt - 1, zt) == Tile::mycel_Id ) && level->getDaytimeRawBrightness(xt, yt, zt) > 8 && PathfinderMob::canSpawn(); + return ( level->getTile(xt, yt - 1, zt) == Tile::grass_Id || level->getTile(xt, yt - 1, zt) == Tile::mycelium_Id ) && level->getDaytimeRawBrightness(xt, yt, zt) > 8 && PathfinderMob::canSpawn(); } shared_ptr MushroomCow::getBreedOffspring(shared_ptr target) diff --git a/Minecraft.World/MushroomIslandBiome.cpp b/Minecraft.World/MushroomIslandBiome.cpp index 91bd8097..ce24f36f 100644 --- a/Minecraft.World/MushroomIslandBiome.cpp +++ b/Minecraft.World/MushroomIslandBiome.cpp @@ -13,7 +13,7 @@ MushroomIslandBiome::MushroomIslandBiome(int id) : Biome(id) decorator->mushroomCount = 1; decorator->hugeMushrooms = 1; - topMaterial = static_cast(Tile::mycel_Id); + topMaterial = static_cast(Tile::mycelium_Id); enemies.clear(); friendlies.clear(); diff --git a/Minecraft.World/NetherBridgePieces.cpp b/Minecraft.World/NetherBridgePieces.cpp index d9fbbf35..f75f67b1 100644 --- a/Minecraft.World/NetherBridgePieces.cpp +++ b/Minecraft.World/NetherBridgePieces.cpp @@ -138,16 +138,16 @@ NetherBridgePieces::NetherBridgePiece *NetherBridgePieces::findAndCreateBridgePi WeighedTreasure *NetherBridgePieces::NetherBridgePiece::fortressTreasureItems[FORTRESS_TREASURE_ITEMS_COUNT] = { new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 5), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 5), - new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 15), - new WeighedTreasure(Item::sword_gold_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::chestplate_gold_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::flintAndSteel_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 5), + new WeighedTreasure(Item::gold_ingot_Id, 0, 1, 3, 15), + new WeighedTreasure(Item::golden_sword_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::golden_chestplate_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::flint_and_steel_Id, 0, 1, 1, 5), new WeighedTreasure(Item::netherwart_seeds_Id, 0, 3, 7, 5), new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 10), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 8), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 3), + new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 8), + new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 3), }; NetherBridgePieces::NetherBridgePiece::NetherBridgePiece() @@ -326,11 +326,11 @@ void NetherBridgePieces::NetherBridgePiece::generateLightPost(Level *level, Rand if (level->isEmptyTile(worldX, worldY, worldZ) && level->isEmptyTile(worldX, worldY + 1, worldZ) && level->isEmptyTile(worldX, worldY + 2, worldZ) && level->isEmptyTile(worldX, worldY + 3, worldZ)) { - level->setTileAndData(worldX, worldY, worldZ, Tile::netherFence_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(worldX, worldY + 1, worldZ, Tile::netherFence_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(worldX, worldY + 2, worldZ, Tile::netherFence_Id, 0, Tile::UPDATE_CLIENTS); - level->setTileAndData(worldX, worldY + 3, worldZ, Tile::netherFence_Id, 0, Tile::UPDATE_CLIENTS); - placeBlock(level, Tile::netherFence_Id, 0, x + xOff, y + 3, z + zOff, chunkBB); + level->setTileAndData(worldX, worldY, worldZ, Tile::nether_brick_fence_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(worldX, worldY + 1, worldZ, Tile::nether_brick_fence_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(worldX, worldY + 2, worldZ, Tile::nether_brick_fence_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(worldX, worldY + 3, worldZ, Tile::nether_brick_fence_Id, 0, Tile::UPDATE_CLIENTS); + placeBlock(level, Tile::nether_brick_fence_Id, 0, x + xOff, y + 3, z + zOff, chunkBB); placeBlock(level, Tile::glowstone_Id, 0, x + xOff, y + 2, z + zOff, chunkBB); } } @@ -390,37 +390,37 @@ NetherBridgePieces::BridgeStraight *NetherBridgePieces::BridgeStraight::createPi bool NetherBridgePieces::BridgeStraight::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 3, 0, width - 1, 4, depth - 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 3, 0, width - 1, 4, depth - 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 1, 5, 0, 3, 7, depth - 1, 0, 0, false); // hand rails - generateBox(level, chunkBB, 0, 5, 0, 0, 5, depth - 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 5, 0, 4, 5, depth - 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 5, 0, 0, 5, depth - 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 5, 0, 4, 5, depth - 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports - generateBox(level, chunkBB, 0, 2, 0, 4, 2, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 13, 4, 2, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 15, 4, 1, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 4, 2, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 13, 4, 2, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 4, 1, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 0, 15, 4, 1, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); for (int x = 0; x <= 4; x++) { for (int z = 0; z <= 2; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, 18 - z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, 18 - z, chunkBB); } } - generateBox(level, chunkBB, 0, 1, 1, 0, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 4, 0, 4, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 14, 0, 4, 14, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 1, 17, 0, 4, 17, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 1, 1, 4, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 4, 4, 4, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 14, 4, 4, 14, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 1, 17, 4, 4, 17, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 1, 1, 0, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 3, 4, 0, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 3, 14, 0, 4, 14, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 1, 17, 0, 4, 17, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 1, 1, 4, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 3, 4, 4, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 3, 14, 4, 4, 14, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 1, 17, 4, 4, 17, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); return true; } @@ -463,32 +463,32 @@ bool NetherBridgePieces::BridgeEndFiller::postProcess(Level *level, Random *rand for (int y = 3; y <= 4; y++) { int z = selfRandom->nextInt(8); - generateBox(level, chunkBB, x, y, 0, x, y, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, x, y, 0, x, y, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } } // hand rails { int z = selfRandom->nextInt(8); - generateBox(level, chunkBB, 0, 5, 0, 0, 5, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 5, 0, 0, 5, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } { int z = selfRandom->nextInt(8); - generateBox(level, chunkBB, 4, 5, 0, 4, 5, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 5, 0, 4, 5, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } // supports for (int x = 0; x <= 4; x++) { int z = selfRandom->nextInt(5); - generateBox(level, chunkBB, x, 2, 0, x, 2, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, x, 2, 0, x, 2, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } for (int x = 0; x <= 4; x++) { for (int y = 0; y <= 1; y++) { int z = selfRandom->nextInt(3); - generateBox(level, chunkBB, x, y, 0, x, y, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, x, y, 0, x, y, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } } @@ -564,45 +564,45 @@ NetherBridgePieces::BridgeCrossing *NetherBridgePieces::BridgeCrossing::createPi bool NetherBridgePieces::BridgeCrossing::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 7, 3, 0, 11, 4, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 7, 18, 4, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 7, 3, 0, 11, 4, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 3, 7, 18, 4, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 8, 5, 0, 10, 7, 18, 0, 0, false); generateBox(level, chunkBB, 0, 5, 8, 18, 7, 10, 0, 0, false); // hand rails - generateBox(level, chunkBB, 7, 5, 0, 7, 5, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 5, 11, 7, 5, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 11, 5, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 11, 11, 5, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 7, 7, 5, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 7, 18, 5, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 11, 7, 5, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 11, 18, 5, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 7, 5, 0, 7, 5, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 7, 5, 11, 7, 5, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 0, 11, 5, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 11, 11, 5, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 5, 7, 7, 5, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 7, 18, 5, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 5, 11, 7, 5, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 11, 18, 5, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports - generateBox(level, chunkBB, 7, 2, 0, 11, 2, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 2, 13, 11, 2, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 0, 0, 11, 1, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 7, 0, 15, 11, 1, 18, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 7, 2, 0, 11, 2, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 7, 2, 13, 11, 2, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 7, 0, 0, 11, 1, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 7, 0, 15, 11, 1, 18, Tile::nether_brick_Id, Tile::nether_brick_Id, false); for (int x = 7; x <= 11; x++) { for (int z = 0; z <= 2; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, 18 - z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, 18 - z, chunkBB); } } - generateBox(level, chunkBB, 0, 2, 7, 5, 2, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 13, 2, 7, 18, 2, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 7, 3, 1, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 15, 0, 7, 18, 1, 11, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 7, 5, 2, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 13, 2, 7, 18, 2, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 0, 7, 3, 1, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 15, 0, 7, 18, 1, 11, Tile::nether_brick_Id, Tile::nether_brick_Id, false); for (int x = 0; x <= 2; x++) { for (int z = 7; z <= 11; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, 18 - x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, 18 - x, -1, z, chunkBB); } } @@ -683,35 +683,35 @@ NetherBridgePieces::RoomCrossing *NetherBridgePieces::RoomCrossing::createPiece( bool NetherBridgePieces::RoomCrossing::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 6, 7, 6, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 2, 0, 1, 6, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 6, 1, 6, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 6, 6, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 6, 6, 6, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 0, 0, 6, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 5, 0, 6, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 0, 6, 6, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 5, 6, 6, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 1, 6, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 6, 1, 6, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 2, 0, 6, 6, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 2, 6, 6, 6, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 0, 6, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 5, 0, 6, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 2, 0, 6, 6, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 2, 5, 6, 6, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // entries - generateBox(level, chunkBB, 2, 6, 0, 4, 6, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 2, 6, 6, 4, 6, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 6, 4, 5, 6, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 6, 2, 0, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 2, 0, 5, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 6, 2, 6, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 5, 2, 6, 5, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 2, 6, 0, 4, 6, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 2, 6, 6, 4, 6, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 6, 4, 5, 6, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 6, 2, 0, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 5, 2, 0, 5, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 6, 6, 2, 6, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 5, 2, 6, 5, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); for (int x = 0; x <= 6; x++) { for (int z = 0; z <= 6; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -753,42 +753,42 @@ NetherBridgePieces::StairsRoom *NetherBridgePieces::StairsRoom::createPiece(list bool NetherBridgePieces::StairsRoom::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, width - 1, 1, depth - 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 6, 10, 6, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 2, 0, 1, 8, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 6, 8, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 1, 0, 8, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 1, 6, 8, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 6, 5, 8, 6, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 1, 8, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 2, 0, 6, 8, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 1, 0, 8, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 2, 1, 6, 8, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 2, 6, 5, 8, 6, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // wall decorations - generateBox(level, chunkBB, 0, 3, 2, 0, 5, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 3, 2, 6, 5, 2, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 3, 4, 6, 5, 4, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 3, 2, 0, 5, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 6, 3, 2, 6, 5, 2, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 6, 3, 4, 6, 5, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // stair - placeBlock(level, Tile::netherBrick_Id, 0, 5, 2, 5, chunkBB); - generateBox(level, chunkBB, 4, 2, 5, 4, 3, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 3, 2, 5, 3, 4, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 2, 5, 2, 5, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 5, 1, 6, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + placeBlock(level, Tile::nether_brick_Id, 0, 5, 2, 5, chunkBB); + generateBox(level, chunkBB, 4, 2, 5, 4, 3, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 3, 2, 5, 3, 4, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 2, 5, 2, 5, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 2, 5, 1, 6, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // top floor - generateBox(level, chunkBB, 1, 7, 1, 5, 7, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 1, 7, 1, 5, 7, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); generateBox(level, chunkBB, 6, 8, 2, 6, 8, 4, 0, 0, false); // entries - generateBox(level, chunkBB, 2, 6, 0, 4, 8, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 2, 6, 0, 4, 8, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 0, 4, 5, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); for (int x = 0; x <= 6; x++) { for (int z = 0; z <= 6; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -843,26 +843,26 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random generateBox(level, chunkBB, 0, 2, 0, 6, 7, 7, 0, 0, false); // floors - generateBox(level, chunkBB, 1, 0, 0, 5, 1, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 2, 1, 5, 2, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 2, 5, 3, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 4, 3, 5, 4, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 1, 0, 0, 5, 1, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 2, 1, 5, 2, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 3, 2, 5, 3, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 4, 3, 5, 4, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // rails - generateBox(level, chunkBB, 1, 2, 0, 1, 4, 2, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 2, 0, 5, 4, 2, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 5, 2, 1, 5, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 5, 2, 5, 5, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 5, 3, 0, 5, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 5, 3, 6, 5, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 5, 8, 5, 5, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 1, 2, 0, 1, 4, 2, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 2, 0, 5, 4, 2, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 5, 2, 1, 5, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 5, 2, 5, 5, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 5, 3, 0, 5, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 5, 3, 6, 5, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 5, 8, 5, 5, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); - placeBlock(level, Tile::netherFence_Id, 0, 1, 6, 3, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 5, 6, 3, chunkBB); - generateBox(level, chunkBB, 0, 6, 3, 0, 6, 8, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 6, 6, 3, 6, 6, 8, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 1, 6, 8, 5, 7, 8, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 2, 8, 8, 4, 8, 8, Tile::netherFence_Id, Tile::netherFence_Id, false); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 1, 6, 3, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 5, 6, 3, chunkBB); + generateBox(level, chunkBB, 0, 6, 3, 0, 6, 8, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 6, 6, 3, 6, 6, 8, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 1, 6, 8, 5, 7, 8, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 2, 8, 8, 4, 8, 8, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); if (!hasPlacedMobSpawner) @@ -871,7 +871,7 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random if (chunkBB->isInside(x, y, z)) { hasPlacedMobSpawner = true; - level->setTileAndData(x, y, z, Tile::mobSpawner_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::mob_spawner_Id, 0, Tile::UPDATE_CLIENTS); shared_ptr entity = dynamic_pointer_cast( level->getTileEntity(x, y, z) ); if (entity != nullptr) entity->getSpawner()->setEntityId(L"Blaze"); } @@ -881,7 +881,7 @@ bool NetherBridgePieces::MonsterThrone::postProcess(Level *level, Random *random { for (int z = 0; z <= 6; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -923,85 +923,85 @@ NetherBridgePieces::CastleEntrance *NetherBridgePieces::CastleEntrance::createPi bool NetherBridgePieces::CastleEntrance::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 5, 0, 12, 13, 12, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // roof - generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // entrance decoration - generateBox(level, chunkBB, 5, 8, 0, 7, 8, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 5, 8, 0, 7, 8, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // wall decorations for (int i = 1; i <= 11; i += 2) { - generateBox(level, chunkBB, i, 10, 0, i, 11, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, i, 10, 12, i, 11, 12, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 10, i, 0, 11, i, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 12, 10, i, 12, 11, i, Tile::netherFence_Id, Tile::netherFence_Id, false); - placeBlock(level, Tile::netherBrick_Id, 0, i, 13, 0, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, i, 13, 12, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, 0, 13, i, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, 12, 13, i, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, i + 1, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, i + 1, 13, 12, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, i + 1, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 12, 13, i + 1, chunkBB); + generateBox(level, chunkBB, i, 10, 0, i, 11, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, i, 10, 12, i, 11, 12, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 10, i, 0, 11, i, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 12, 10, i, 12, 11, i, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + placeBlock(level, Tile::nether_brick_Id, 0, i, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, i, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, 0, 13, i, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, 12, 13, i, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, i + 1, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, i + 1, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, i + 1, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 12, 13, i + 1, chunkBB); } - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 12, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 12, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 12, 13, 0, chunkBB); // inside decorations for (int z = 3; z <= 9; z += 2) { - generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); } // supports - generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); - generateBox(level, chunkBB, 4, 0, 0, 8, 1, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 0, 9, 8, 1, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 4, 3, 1, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 0, 4, 12, 1, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 0, 0, 8, 1, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 0, 9, 8, 1, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 0, 4, 3, 1, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 9, 0, 4, 12, 1, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); for (int x = 4; x <= 8; x++) { for (int z = 0; z <= 2; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, 12 - z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, 12 - z, chunkBB); } } for (int x = 0; x <= 2; x++) { for (int z = 4; z <= 8; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, 12 - x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, 12 - x, -1, z, chunkBB); } } // lava well - generateBox(level, chunkBB, 5, 5, 5, 7, 5, 7, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 5, 5, 5, 7, 5, 7, Tile::nether_brick_Id, Tile::nether_brick_Id, false); generateBox(level, chunkBB, 6, 1, 6, 6, 4, 6, 0, 0, false); - placeBlock(level, Tile::netherBrick_Id, 0, 6, 0, 6, chunkBB); - placeBlock(level, Tile::lava_Id, 0, 6, 5, 6, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, 6, 0, 6, chunkBB); + placeBlock(level, Tile::flowing_lava_Id, 0, 6, 5, 6, chunkBB); // tick lava well int x = getWorldX(6, 6); int y = getWorldY(5); @@ -1009,7 +1009,7 @@ bool NetherBridgePieces::CastleEntrance::postProcess(Level *level, Random *rando if (chunkBB->isInside(x, y, z)) { level->setInstaTick(true); - Tile::tiles[Tile::lava_Id]->tick(level, x, y, z, random); + Tile::tiles[Tile::flowing_lava_Id]->tick(level, x, y, z, random); level->setInstaTick(false); } @@ -1053,67 +1053,67 @@ NetherBridgePieces::CastleStalkRoom *NetherBridgePieces::CastleStalkRoom::create bool NetherBridgePieces::CastleStalkRoom::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 3, 0, 12, 4, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 5, 0, 12, 13, 12, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 5, 0, 1, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 11, 5, 0, 12, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 11, 4, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 8, 5, 11, 10, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 9, 11, 7, 12, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 0, 4, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 8, 5, 0, 10, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 5, 9, 0, 7, 12, 1, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // roof - generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 2, 11, 2, 10, 12, 10, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // wall decorations for (int i = 1; i <= 11; i += 2) { - generateBox(level, chunkBB, i, 10, 0, i, 11, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, i, 10, 12, i, 11, 12, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 10, i, 0, 11, i, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 12, 10, i, 12, 11, i, Tile::netherFence_Id, Tile::netherFence_Id, false); - placeBlock(level, Tile::netherBrick_Id, 0, i, 13, 0, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, i, 13, 12, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, 0, 13, i, chunkBB); - placeBlock(level, Tile::netherBrick_Id, 0, 12, 13, i, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, i + 1, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, i + 1, 13, 12, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, i + 1, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 12, 13, i + 1, chunkBB); + generateBox(level, chunkBB, i, 10, 0, i, 11, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, i, 10, 12, i, 11, 12, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 10, i, 0, 11, i, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 12, 10, i, 12, 11, i, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + placeBlock(level, Tile::nether_brick_Id, 0, i, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, i, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, 0, 13, i, chunkBB); + placeBlock(level, Tile::nether_brick_Id, 0, 12, 13, i, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, i + 1, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, i + 1, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, i + 1, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 12, 13, i + 1, chunkBB); } - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 12, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 0, 13, 0, chunkBB); - placeBlock(level, Tile::netherFence_Id, 0, 12, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 12, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 0, 13, 0, chunkBB); + placeBlock(level, Tile::nether_brick_fence_Id, 0, 12, 13, 0, chunkBB); // inside decorations for (int z = 3; z <= 9; z += 2) { - generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 1, 7, z, 1, 8, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 11, 7, z, 11, 8, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); } // inside stair - int stairOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 3); + int stairOrientation = getOrientationData(Tile::nether_brick_stairs_Id, 3); for (int i = 0; i <= 6; i++) { int z = i + 4; for (int x = 5; x <= 7; x++) { - placeBlock(level, Tile::stairs_netherBricks_Id, stairOrientation, x, 5 + i, z, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, stairOrientation, x, 5 + i, z, chunkBB); } if (z >= 5 && z <= 8) { - generateBox(level, chunkBB, 5, 5, z, 7, i + 4, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 5, 5, z, 7, i + 4, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } else if (z >= 9 && z <= 10) { - generateBox(level, chunkBB, 5, 8, z, 7, i + 4, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 5, 8, z, 7, i + 4, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); } if (i >= 1) { @@ -1122,59 +1122,59 @@ bool NetherBridgePieces::CastleStalkRoom::postProcess(Level *level, Random *rand } for (int x = 5; x <= 7; x++) { - placeBlock(level, Tile::stairs_netherBricks_Id, stairOrientation, x, 12, 11, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, stairOrientation, x, 12, 11, chunkBB); } - generateBox(level, chunkBB, 5, 6, 7, 5, 7, 7, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 7, 6, 7, 7, 7, 7, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 5, 6, 7, 5, 7, 7, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 7, 6, 7, 7, 7, 7, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); generateBox(level, chunkBB, 5, 13, 12, 7, 13, 12, 0, 0, false); // farmland catwalks - generateBox(level, chunkBB, 2, 5, 2, 3, 5, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 9, 3, 5, 10, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 2, 5, 4, 2, 5, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 5, 2, 10, 5, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 5, 9, 10, 5, 10, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 10, 5, 4, 10, 5, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - int eastOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 0); - int westOrientation = getOrientationData(Tile::stairs_netherBricks_Id, 1); - placeBlock(level, Tile::stairs_netherBricks_Id, westOrientation, 4, 5, 2, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, westOrientation, 4, 5, 3, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, westOrientation, 4, 5, 9, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, westOrientation, 4, 5, 10, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, eastOrientation, 8, 5, 2, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, eastOrientation, 8, 5, 3, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, eastOrientation, 8, 5, 9, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, eastOrientation, 8, 5, 10, chunkBB); + generateBox(level, chunkBB, 2, 5, 2, 3, 5, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 9, 3, 5, 10, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 2, 5, 4, 2, 5, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 9, 5, 2, 10, 5, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 9, 5, 9, 10, 5, 10, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 10, 5, 4, 10, 5, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + int eastOrientation = getOrientationData(Tile::nether_brick_stairs_Id, 0); + int westOrientation = getOrientationData(Tile::nether_brick_stairs_Id, 1); + placeBlock(level, Tile::nether_brick_stairs_Id, westOrientation, 4, 5, 2, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, westOrientation, 4, 5, 3, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, westOrientation, 4, 5, 9, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, westOrientation, 4, 5, 10, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, eastOrientation, 8, 5, 2, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, eastOrientation, 8, 5, 3, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, eastOrientation, 8, 5, 9, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, eastOrientation, 8, 5, 10, chunkBB); // farmlands - generateBox(level, chunkBB, 3, 4, 4, 4, 4, 8, Tile::soulsand_Id, Tile::soulsand_Id, false); - generateBox(level, chunkBB, 8, 4, 4, 9, 4, 8, Tile::soulsand_Id, Tile::soulsand_Id, false); - generateBox(level, chunkBB, 3, 5, 4, 4, 5, 8, Tile::netherStalk_Id, Tile::netherStalk_Id, false); - generateBox(level, chunkBB, 8, 5, 4, 9, 5, 8, Tile::netherStalk_Id, Tile::netherStalk_Id, false); + generateBox(level, chunkBB, 3, 4, 4, 4, 4, 8, Tile::soul_sand_Id, Tile::soul_sand_Id, false); + generateBox(level, chunkBB, 8, 4, 4, 9, 4, 8, Tile::soul_sand_Id, Tile::soul_sand_Id, false); + generateBox(level, chunkBB, 3, 5, 4, 4, 5, 8, Tile::nether_wart_Id, Tile::nether_wart_Id, false); + generateBox(level, chunkBB, 8, 5, 4, 9, 5, 8, Tile::nether_wart_Id, Tile::nether_wart_Id, false); // supports - generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 8, 2, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 4, 12, 2, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); - generateBox(level, chunkBB, 4, 0, 0, 8, 1, 3, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 0, 9, 8, 1, 12, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 0, 4, 3, 1, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 9, 0, 4, 12, 1, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 0, 0, 8, 1, 3, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 0, 9, 8, 1, 12, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 0, 4, 3, 1, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 9, 0, 4, 12, 1, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); for (int x = 4; x <= 8; x++) { for (int z = 0; z <= 2; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, 12 - z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, 12 - z, chunkBB); } } for (int x = 0; x <= 2; x++) { for (int z = 4; z <= 8; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); - fillColumnDown(level, Tile::netherBrick_Id, 0, 12 - x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, 12 - x, -1, z, chunkBB); } } @@ -1219,27 +1219,27 @@ NetherBridgePieces::CastleSmallCorridorPiece *NetherBridgePieces::CastleSmallCor bool NetherBridgePieces::CastleSmallCorridorPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports for (int x = 0; x <= 4; x++) { for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -1283,25 +1283,25 @@ NetherBridgePieces::CastleSmallCorridorCrossingPiece *NetherBridgePieces::Castle bool NetherBridgePieces::CastleSmallCorridorCrossingPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 0, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 2, 4, 4, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 0, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 4, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 2, 4, 0, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 2, 4, 4, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports for (int x = 0; x <= 4; x++) { for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -1359,20 +1359,20 @@ NetherBridgePieces::CastleSmallCorridorRightTurnPiece *NetherBridgePieces::Castl bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); // walls - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 0, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 0, 3, 1, 0, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 3, 3, 0, 4, 3, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 4, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); - generateBox(level, chunkBB, 1, 2, 4, 4, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 4, 1, 4, 4, Tile::netherFence_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 3, 3, 4, 3, 4, 4, Tile::netherFence_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 1, 2, 4, 4, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 3, 4, 1, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 3, 3, 4, 3, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_Id, false); if (isNeedingChest) { @@ -1386,14 +1386,14 @@ bool NetherBridgePieces::CastleSmallCorridorRightTurnPiece::postProcess(Level *l } // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports for (int x = 0; x <= 4; x++) { for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -1451,20 +1451,20 @@ NetherBridgePieces::CastleSmallCorridorLeftTurnPiece *NetherBridgePieces::Castle bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 4, 1, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 4, 5, 4, 0, 0, false); // walls - generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 4, 2, 0, 4, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, 3, 1, 4, 4, 1, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, 3, 3, 4, 4, 3, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); - generateBox(level, chunkBB, 0, 2, 0, 0, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 0, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); - generateBox(level, chunkBB, 0, 2, 4, 3, 5, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 4, 1, 4, 4, Tile::netherFence_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 3, 3, 4, 3, 4, 4, Tile::netherFence_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 4, 3, 5, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 3, 4, 1, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 3, 3, 4, 3, 4, 4, Tile::nether_brick_fence_Id, Tile::nether_brick_Id, false); if (isNeedingChest) { @@ -1478,14 +1478,14 @@ bool NetherBridgePieces::CastleSmallCorridorLeftTurnPiece::postProcess(Level *le } // roof - generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 6, 0, 4, 6, 4, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // supports for (int x = 0; x <= 4; x++) { for (int z = 0; z <= 4; z++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -1527,7 +1527,7 @@ NetherBridgePieces::CastleCorridorStairsPiece *NetherBridgePieces::CastleCorrido bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // generate stairs - int stairsData = getOrientationData(Tile::stairs_netherBricks_Id, 2); + int stairsData = getOrientationData(Tile::nether_brick_stairs_Id, 2); for (int step = 0; step <= 9; step++) { int floor = max(1, 7 - step); @@ -1535,30 +1535,30 @@ bool NetherBridgePieces::CastleCorridorStairsPiece::postProcess(Level *level, Ra int z = step; // floor - generateBox(level, chunkBB, 0, 0, z, 4, floor, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, z, 4, floor, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 1, floor + 1, z, 3, roof - 1, z, 0, 0, false); if (step <= 6) { - placeBlock(level, Tile::stairs_netherBricks_Id, stairsData, 1, floor + 1, z, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, stairsData, 2, floor + 1, z, chunkBB); - placeBlock(level, Tile::stairs_netherBricks_Id, stairsData, 3, floor + 1, z, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, stairsData, 1, floor + 1, z, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, stairsData, 2, floor + 1, z, chunkBB); + placeBlock(level, Tile::nether_brick_stairs_Id, stairsData, 3, floor + 1, z, chunkBB); } // roof - generateBox(level, chunkBB, 0, roof, z, 4, roof, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, roof, z, 4, roof, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // walls - generateBox(level, chunkBB, 0, floor + 1, z, 0, roof - 1, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 4, floor + 1, z, 4, roof - 1, z, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, floor + 1, z, 0, roof - 1, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 4, floor + 1, z, 4, roof - 1, z, Tile::nether_brick_Id, Tile::nether_brick_Id, false); if ((step & 1) == 0) { - generateBox(level, chunkBB, 0, floor + 2, z, 0, floor + 3, z, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 4, floor + 2, z, 4, floor + 3, z, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, floor + 2, z, 0, floor + 3, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 4, floor + 2, z, 4, floor + 3, z, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); } // supports for (int x = 0; x <= 4; x++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } @@ -1609,42 +1609,42 @@ NetherBridgePieces::CastleCorridorTBalconyPiece *NetherBridgePieces::CastleCorri bool NetherBridgePieces::CastleCorridorTBalconyPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // floor - generateBox(level, chunkBB, 0, 0, 0, 8, 1, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 8, 1, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // room air generateBox(level, chunkBB, 0, 2, 0, 8, 5, 8, 0, 0, false); // corridor roof - generateBox(level, chunkBB, 0, 6, 0, 8, 6, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 6, 0, 8, 6, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); // inside walls - generateBox(level, chunkBB, 0, 2, 0, 2, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 2, 0, 8, 5, 0, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 0, 1, 4, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 7, 3, 0, 7, 4, 0, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 2, 0, 2, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 2, 0, 8, 5, 0, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 3, 0, 1, 4, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 7, 3, 0, 7, 4, 0, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // balcony floor - generateBox(level, chunkBB, 0, 2, 4, 8, 2, 8, Tile::netherBrick_Id, Tile::netherBrick_Id, false); + generateBox(level, chunkBB, 0, 2, 4, 8, 2, 8, Tile::nether_brick_Id, Tile::nether_brick_Id, false); generateBox(level, chunkBB, 1, 1, 4, 2, 2, 4, 0, 0, false); generateBox(level, chunkBB, 6, 1, 4, 7, 2, 4, 0, 0, false); // hand rails - generateBox(level, chunkBB, 0, 3, 8, 8, 3, 8, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 0, 3, 6, 0, 3, 7, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 8, 3, 6, 8, 3, 7, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 3, 8, 8, 3, 8, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 0, 3, 6, 0, 3, 7, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 8, 3, 6, 8, 3, 7, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // balcony walls - generateBox(level, chunkBB, 0, 3, 4, 0, 5, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 8, 3, 4, 8, 5, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 3, 5, 2, 5, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 6, 3, 5, 7, 5, 5, Tile::netherBrick_Id, Tile::netherBrick_Id, false); - generateBox(level, chunkBB, 1, 4, 5, 1, 5, 5, Tile::netherFence_Id, Tile::netherFence_Id, false); - generateBox(level, chunkBB, 7, 4, 5, 7, 5, 5, Tile::netherFence_Id, Tile::netherFence_Id, false); + generateBox(level, chunkBB, 0, 3, 4, 0, 5, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 8, 3, 4, 8, 5, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 3, 5, 2, 5, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 6, 3, 5, 7, 5, 5, Tile::nether_brick_Id, Tile::nether_brick_Id, false); + generateBox(level, chunkBB, 1, 4, 5, 1, 5, 5, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); + generateBox(level, chunkBB, 7, 4, 5, 7, 5, 5, Tile::nether_brick_fence_Id, Tile::nether_brick_fence_Id, false); // supports for (int z = 0; z <= 5; z++) { for (int x = 0; x <= 8; x++) { - fillColumnDown(level, Tile::netherBrick_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::nether_brick_Id, 0, x, -1, z, chunkBB); } } diff --git a/Minecraft.World/NetherWartTile.cpp b/Minecraft.World/NetherWartTile.cpp index ba312d26..ef04fc90 100644 --- a/Minecraft.World/NetherWartTile.cpp +++ b/Minecraft.World/NetherWartTile.cpp @@ -50,7 +50,7 @@ void NetherWartTile::updateDefaultShape() bool NetherWartTile::mayPlaceOn(int tile) { - return tile == Tile::soulsand_Id; + return tile == Tile::soul_sand_Id; } // Brought forward to fix #60073 - TU7: Content: Gameplay: Nether Warts cannot be placed next to each other in the Nether diff --git a/Minecraft.World/NotGateTile.cpp b/Minecraft.World/NotGateTile.cpp index 969778d8..caec1fb4 100644 --- a/Minecraft.World/NotGateTile.cpp +++ b/Minecraft.World/NotGateTile.cpp @@ -125,7 +125,7 @@ void NotGateTile::tick(Level *level, int x, int y, int z, Random *random) { if (neighborSignal) { - level->setTileAndData(x, y, z, Tile::redstoneTorch_off_Id, level->getData(x, y, z), Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::unlit_redstone_torch_Id, level->getData(x, y, z), Tile::UPDATE_ALL); if (isToggledTooFrequently(level, x, y, z, true)) { @@ -149,7 +149,7 @@ void NotGateTile::tick(Level *level, int x, int y, int z, Random *random) { if (!isToggledTooFrequently(level, x, y, z, false)) { - level->setTileAndData(x, y, z, Tile::redstoneTorch_on_Id, level->getData(x, y, z), Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::redstone_torch_Id, level->getData(x, y, z), Tile::UPDATE_ALL); } else { @@ -184,7 +184,7 @@ int NotGateTile::getDirectSignal(LevelSource *level, int x, int y, int z, int fa int NotGateTile::getResource(int data, Random *random, int playerBonusLevel) { - return Tile::redstoneTorch_on_Id; + return Tile::redstone_torch_Id; } bool NotGateTile::isSignalSource() @@ -226,7 +226,7 @@ void NotGateTile::animateTick(Level *level, int xt, int yt, int zt, Random *rand int NotGateTile::cloneTileId(Level *level, int x, int y, int z) { - return Tile::redstoneTorch_on_Id; + return Tile::redstone_torch_Id; } void NotGateTile::levelTimeChanged(Level *level, int64_t delta, int64_t newTime) @@ -244,5 +244,5 @@ void NotGateTile::levelTimeChanged(Level *level, int64_t delta, int64_t newTime) bool NotGateTile::isMatching(int id) { - return id == Tile::redstoneTorch_off_Id || id == Tile::redstoneTorch_on_Id; + return id == Tile::unlit_redstone_torch_Id || id == Tile::redstone_torch_Id; } \ No newline at end of file diff --git a/Minecraft.World/OceanMonumentPieces.cpp b/Minecraft.World/OceanMonumentPieces.cpp index 4cb9f536..dbad5f23 100644 --- a/Minecraft.World/OceanMonumentPieces.cpp +++ b/Minecraft.World/OceanMonumentPieces.cpp @@ -51,9 +51,9 @@ void OceanMonumentPieces::loadStatic() int OceanMonumentPieces::blockPrismarine() { return PrismarineTile::TYPE_DEFAULT; } int OceanMonumentPieces::blockPrismarineBricks() { return PrismarineTile::TYPE_BRICKS; } // meta BRICKS int OceanMonumentPieces::blockDarkPrismarine() { return PrismarineTile::TYPE_DARK; } // meta DARK -int OceanMonumentPieces::blockWater() { return Tile::water_Id; } -int OceanMonumentPieces::blockSeaLantern() { return Tile::seaLantern_Id; } -int OceanMonumentPieces::blockGoldBlock() { return Tile::goldBlock_Id; } +int OceanMonumentPieces::blockWater() { return Tile::flowing_water_Id; } +int OceanMonumentPieces::blockSeaLantern() { return Tile::sea_lantern_Id; } +int OceanMonumentPieces::blockGoldBlock() { return Tile::gold_block_Id; } int OceanMonumentPieces::blockSponge() { return Tile::sponge_Id; } int OceanMonumentPieces::blockAir() { return 0; } diff --git a/Minecraft.World/Ocelot.cpp b/Minecraft.World/Ocelot.cpp index 0e367e90..926215be 100644 --- a/Minecraft.World/Ocelot.cpp +++ b/Minecraft.World/Ocelot.cpp @@ -40,7 +40,7 @@ Ocelot::Ocelot(Level *level) : TamableAnimal(level) getNavigation()->setAvoidWater(true); goalSelector.addGoal(1, new FloatGoal(this)); goalSelector.addGoal(2, sitGoal, false); - goalSelector.addGoal(3, temptGoal = new TemptGoal(this, SNEAK_SPEED_MOD, Item::fish_raw_Id, true), false); + goalSelector.addGoal(3, temptGoal = new TemptGoal(this, SNEAK_SPEED_MOD, Item::fish_Id, true), false); goalSelector.addGoal(4, new AvoidPlayerGoal(this, typeid(Player), 16, WALK_SPEED_MOD, SPRINT_SPEED_MOD)); goalSelector.addGoal(5, new FollowOwnerGoal(this, FOLLOW_SPEED_MOD, 10, 5)); goalSelector.addGoal(6, new OcelotSitOnTileGoal(this, SPRINT_SPEED_MOD)); @@ -199,7 +199,7 @@ bool Ocelot::mobInteract(shared_ptr player) } else { - if (temptGoal->isRunning() && item != nullptr && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) + if (temptGoal->isRunning() && item != nullptr && item->id == Item::fish_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) { // 4J-PB - don't lose the fish in creative mode if (!player->abilities.instabuild) item->count--; @@ -257,7 +257,7 @@ shared_ptr Ocelot::getBreedOffspring(shared_ptr target) bool Ocelot::isFood(shared_ptr itemInstance) { - return itemInstance != nullptr && itemInstance->id == Item::fish_raw_Id; + return itemInstance != nullptr && itemInstance->id == Item::fish_Id; } bool Ocelot::canMate(shared_ptr animal) diff --git a/Minecraft.World/OcelotSitOnTileGoal.cpp b/Minecraft.World/OcelotSitOnTileGoal.cpp index 09b98650..1ecdc3fc 100644 --- a/Minecraft.World/OcelotSitOnTileGoal.cpp +++ b/Minecraft.World/OcelotSitOnTileGoal.cpp @@ -118,7 +118,7 @@ bool OcelotSitOnTileGoal::isValidTarget(Level *level, int x, int y, int z) return true; } } - else if (tile == Tile::furnace_lit_Id) + else if (tile == Tile::lit_furnace_Id) { return true; } diff --git a/Minecraft.World/OreRecipies.cpp b/Minecraft.World/OreRecipies.cpp index 387d059b..c75435d3 100644 --- a/Minecraft.World/OreRecipies.cpp +++ b/Minecraft.World/OreRecipies.cpp @@ -9,10 +9,10 @@ void OreRecipies::_init() { ADD_OBJECT(map[0],Tile::goldBlock); - ADD_OBJECT(map[0],new ItemInstance(Item::goldIngot, 9)); + ADD_OBJECT(map[0],new ItemInstance(Item::gold_ingot, 9)); ADD_OBJECT(map[1],Tile::ironBlock); - ADD_OBJECT(map[1],new ItemInstance(Item::ironIngot, 9)); + ADD_OBJECT(map[1],new ItemInstance(Item::iron_ingot, 9)); ADD_OBJECT(map[2],Tile::diamondBlock); ADD_OBJECT(map[2],new ItemInstance(Item::diamond, 9)); @@ -21,10 +21,10 @@ void OreRecipies::_init() ADD_OBJECT(map[3],new ItemInstance(Item::emerald, 9)); ADD_OBJECT(map[4],Tile::lapisBlock); - ADD_OBJECT(map[4],new ItemInstance(Item::dye_powder, 9, DyePowderItem::BLUE)); + ADD_OBJECT(map[4],new ItemInstance(Item::dye, 9, DyePowderItem::BLUE)); ADD_OBJECT(map[5],Tile::redstoneBlock); - ADD_OBJECT(map[5],new ItemInstance(Item::redStone, 9)); + ADD_OBJECT(map[5],new ItemInstance(Item::redstone, 9)); ADD_OBJECT(map[6],Tile::coalBlock); ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL)); diff --git a/Minecraft.World/OreTile.cpp b/Minecraft.World/OreTile.cpp index bd656541..25e7c7c0 100644 --- a/Minecraft.World/OreTile.cpp +++ b/Minecraft.World/OreTile.cpp @@ -9,17 +9,17 @@ OreTile::OreTile(int id) : Tile(id, Material::stone) int OreTile::getResource(int data, Random *random, int playerBonusLevel) { - if (id == Tile::coalOre_Id) return Item::coal_Id; - if (id == Tile::diamondOre_Id) return Item::diamond_Id; - if (id == Tile::lapisOre_Id) return Item::dye_powder_Id; - if (id == Tile::emeraldOre_Id) return Item::emerald_Id; - if (id == Tile::netherQuartz_Id) return Item::netherQuartz_Id; + if (id == Tile::coal_ore_Id) return Item::coal_Id; + if (id == Tile::diamond_ore_Id) return Item::diamond_Id; + if (id == Tile::lapis_ore_Id) return Item::dye_Id; + if (id == Tile::emerald_ore_Id) return Item::emerald_Id; + if (id == Tile::quartz_ore_Id) return Item::quartz_Id; return id; } int OreTile::getResourceCount(Random *random) { - if (id == Tile::lapisOre_Id) return 4 + random->nextInt(5); + if (id == Tile::lapis_ore_Id) return 4 + random->nextInt(5); return 1; } @@ -45,23 +45,23 @@ void OreTile::spawnResources(Level *level, int x, int y, int z, int data, float if (getResource(data, level->random, playerBonusLevel) != id) { int magicCount = 0; - if (id == Tile::coalOre_Id) + if (id == Tile::coal_ore_Id) { magicCount = Mth::nextInt(level->random, 0, 2); } - else if (id == Tile::diamondOre_Id) + else if (id == Tile::diamond_ore_Id) { magicCount = Mth::nextInt(level->random, 3, 7); } - else if (id == Tile::emeraldOre_Id) + else if (id == Tile::emerald_ore_Id) { magicCount = Mth::nextInt(level->random, 3, 7); } - else if (id == Tile::lapisOre_Id) + else if (id == Tile::lapis_ore_Id) { magicCount = Mth::nextInt(level->random, 2, 5); } - else if (id == Tile::netherQuartz_Id) + else if (id == Tile::quartz_ore_Id) { magicCount = Mth::nextInt(level->random, 2, 5); } @@ -72,6 +72,6 @@ void OreTile::spawnResources(Level *level, int x, int y, int z, int data, float int OreTile::getSpawnResourcesAuxValue(int data) { // lapis spawns blue dye - if (id == Tile::lapisOre_Id) return DyePowderItem::BLUE; + if (id == Tile::lapis_ore_Id) return DyePowderItem::BLUE; return 0; } \ No newline at end of file diff --git a/Minecraft.World/Ozelot.cpp b/Minecraft.World/Ozelot.cpp index a57917e0..147366e3 100644 --- a/Minecraft.World/Ozelot.cpp +++ b/Minecraft.World/Ozelot.cpp @@ -43,7 +43,7 @@ Ozelot::Ozelot(Level *level) : TamableAnimal(level) getNavigation()->setAvoidWater(true); goalSelector.addGoal(1, new FloatGoal(this)); goalSelector.addGoal(2, sitGoal, false); - goalSelector.addGoal(3, temptGoal = new TemptGoal(this, SNEAK_SPEED, Item::fish_raw_Id, true), false); + goalSelector.addGoal(3, temptGoal = new TemptGoal(this, SNEAK_SPEED, Item::fish_Id, true), false); goalSelector.addGoal(4, new AvoidPlayerGoal(this, typeid(Player), 16, WALK_SPEED, SPRINT_SPEED)); goalSelector.addGoal(5, new FollowOwnerGoal(this, FOLLOW_SPEED, 10, 5)); goalSelector.addGoal(6, new OcelotSitOnTileGoal(this, SPRINT_SPEED)); @@ -214,7 +214,7 @@ bool Ozelot::interact(shared_ptr player) } else { - if (temptGoal->isRunning() && item != NULL && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) + if (temptGoal->isRunning() && item != NULL && item->id == Item::fish_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) { // 4J-PB - don't lose the fish in creative mode if (!player->abilities.instabuild) item->count--; @@ -272,7 +272,7 @@ shared_ptr Ozelot::getBreedOffspring(shared_ptr target) bool Ozelot::isFood(shared_ptr itemInstance) { - return itemInstance != NULL && itemInstance->id == Item::fish_raw_Id; + return itemInstance != NULL && itemInstance->id == Item::fish_Id; } bool Ozelot::canMate(shared_ptr animal) diff --git a/Minecraft.World/PathFinder.cpp b/Minecraft.World/PathFinder.cpp index fbb419bb..f4983a58 100644 --- a/Minecraft.World/PathFinder.cpp +++ b/Minecraft.World/PathFinder.cpp @@ -53,7 +53,7 @@ Path *PathFinder::findPath(Entity *e, double xt, double yt, double zt, float max { startY = static_cast(e->bb->y0); int tileId = level->getTile((int) Mth::floor(e->x), startY, (int) Mth::floor(e->z)); - while (tileId == Tile::water_Id || tileId == Tile::calmWater_Id) + while (tileId == Tile::flowing_water_Id || tileId == Tile::water_Id) { ++startY; tileId = level->getTile((int) Mth::floor(e->x), startY, (int) Mth::floor(e->z)); @@ -217,12 +217,12 @@ int PathFinder::isFree(Entity *entity, int x, int y, int z, Node *size, bool avo int tileId = entity->level->getTile(xx, yy, zz); if(tileId <= 0) continue; if (tileId == Tile::trapdoor_Id) walkable = true; - else if (tileId == Tile::water_Id || tileId == Tile::calmWater_Id) + else if (tileId == Tile::flowing_water_Id || tileId == Tile::water_Id) { if (avoidWater) return TYPE_WATER; else walkable = true; } - else if (!canPassDoors && tileId == Tile::door_wood_Id) + else if (!canPassDoors && tileId == Tile::wooden_door_Id) { return TYPE_BLOCKED; } @@ -248,10 +248,10 @@ int PathFinder::isFree(Entity *entity, int x, int y, int z, Node *size, bool avo if (tile == nullptr) continue; // tu31 tutorial world fix if (tile->isPathfindable(entity->level, xx, yy, zz)) continue; - if (canOpenDoors && tileId == Tile::door_wood_Id) continue; + if (canOpenDoors && tileId == Tile::wooden_door_Id) continue; int renderShape = tile->getRenderShape(); - if (renderShape == Tile::SHAPE_FENCE || tileId == Tile::fenceGate_Id || renderShape == Tile::SHAPE_WALL) return TYPE_FENCE; + if (renderShape == Tile::SHAPE_FENCE || tileId == Tile::fence_gate_Id || renderShape == Tile::SHAPE_WALL) return TYPE_FENCE; if (tileId == Tile::trapdoor_Id) return TYPE_TRAP; Material *m = tile->material; if (m == Material::lava) diff --git a/Minecraft.World/PathNavigation.cpp b/Minecraft.World/PathNavigation.cpp index 22beaeb1..06d142cc 100644 --- a/Minecraft.World/PathNavigation.cpp +++ b/Minecraft.World/PathNavigation.cpp @@ -237,7 +237,7 @@ int PathNavigation::getSurfaceY() int surface = static_cast(mob->bb->y0); int tileId = level->getTile(Mth::floor(mob->x), surface, Mth::floor(mob->z)); int steps = 0; - while (tileId == Tile::water_Id || tileId == Tile::calmWater_Id) + while (tileId == Tile::flowing_water_Id || tileId == Tile::water_Id) { ++surface; tileId = level->getTile(Mth::floor(mob->x), surface, Mth::floor(mob->z)); diff --git a/Minecraft.World/PickaxeItem.cpp b/Minecraft.World/PickaxeItem.cpp index 1bcee6e0..1a19c0a9 100644 --- a/Minecraft.World/PickaxeItem.cpp +++ b/Minecraft.World/PickaxeItem.cpp @@ -25,7 +25,7 @@ void PickaxeItem::staticCtor() diggables.data[15] = Tile::lapisOre; diggables.data[16] = Tile::lapisBlock; diggables.data[17] = Tile::redStoneOre; - diggables.data[18] = Tile::redStoneOre_lit; + diggables.data[18] = Tile::lit_redstone_ore; diggables.data[19] = Tile::rail; diggables.data[20] = Tile::detectorRail; diggables.data[21] = Tile::goldenRail; @@ -44,7 +44,7 @@ bool PickaxeItem::canDestroySpecial(Tile *tile) if (tile == Tile::goldBlock || tile == Tile::goldOre) return tier->getLevel() >= 2; if (tile == Tile::ironBlock || tile == Tile::ironOre) return tier->getLevel() >= 1; if (tile == Tile::lapisBlock || tile == Tile::lapisOre) return tier->getLevel() >= 1; - if (tile == Tile::redStoneOre || tile == Tile::redStoneOre_lit) return tier->getLevel() >= 2; + if (tile == Tile::redStoneOre || tile == Tile::lit_redstone_ore) return tier->getLevel() >= 2; if (tile->material == Material::stone) return true; if (tile->material == Material::metal) return true; if (tile->material == Material::heavyMetal) return true; diff --git a/Minecraft.World/Pig.cpp b/Minecraft.World/Pig.cpp index 2e1d1715..38af8cab 100644 --- a/Minecraft.World/Pig.cpp +++ b/Minecraft.World/Pig.cpp @@ -34,8 +34,8 @@ Pig::Pig(Level *level) : Animal( level ) goalSelector.addGoal(1, new PanicGoal(this, 1.25)); goalSelector.addGoal(2, controlGoal = new ControlledByPlayerGoal(this, 0.3f, 0.25f)); goalSelector.addGoal(3, new BreedGoal(this, 1.0)); - goalSelector.addGoal(4, new TemptGoal(this, 1.2, Item::carrotOnAStick_Id, false)); - goalSelector.addGoal(4, new TemptGoal(this, 1.2, Item::carrots_Id, false)); + goalSelector.addGoal(4, new TemptGoal(this, 1.2, Item::carrot_on_a_stick_Id, false)); + goalSelector.addGoal(4, new TemptGoal(this, 1.2, Item::carrot_Id, false)); goalSelector.addGoal(5, new FollowParentGoal(this, 1.1)); goalSelector.addGoal(6, new RandomStrollGoal(this, 1.0)); goalSelector.addGoal(7, new LookAtPlayerGoal(this, typeid(Player), 6)); @@ -69,7 +69,7 @@ bool Pig::canBeControlledByRider() { shared_ptr item = dynamic_pointer_cast(rider.lock())->getCarriedItem(); - return item != nullptr && item->id == Item::carrotOnAStick_Id; + return item != nullptr && item->id == Item::carrot_on_a_stick_Id; } void Pig::defineSynchedData() @@ -127,8 +127,8 @@ bool Pig::mobInteract(shared_ptr player) int Pig::getDeathLoot() { - if (this->isOnFire() ) return Item::porkChop_cooked->id; - return Item::porkChop_raw_Id; + if (this->isOnFire() ) return Item::cooked_porkchop->id; + return Item::porkchop_Id; } void Pig::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) @@ -139,11 +139,11 @@ void Pig::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { if (isOnFire()) { - spawnAtLocation(Item::porkChop_cooked_Id, 1); + spawnAtLocation(Item::cooked_porkchop_Id, 1); } else { - spawnAtLocation(Item::porkChop_raw_Id, 1); + spawnAtLocation(Item::porkchop_Id, 1); } } if (hasSaddle()) spawnAtLocation(Item::saddle_Id, 1); @@ -199,7 +199,7 @@ shared_ptr Pig::getBreedOffspring(shared_ptr target) bool Pig::isFood(shared_ptr itemInstance) { - return itemInstance != nullptr && itemInstance->id == Item::carrots_Id; + return itemInstance != nullptr && itemInstance->id == Item::carrot_Id; } ControlledByPlayerGoal *Pig::getControlGoal() diff --git a/Minecraft.World/PigZombie.cpp b/Minecraft.World/PigZombie.cpp index e87d028a..b294e9a3 100644 --- a/Minecraft.World/PigZombie.cpp +++ b/Minecraft.World/PigZombie.cpp @@ -153,7 +153,7 @@ void PigZombie::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) count = random->nextInt(2 + playerBonusLevel); for (int i = 0; i < count; i++) { - spawnAtLocation(Item::goldNugget_Id, 1); + spawnAtLocation(Item::gold_nugget_Id, 1); } } @@ -164,7 +164,7 @@ bool PigZombie::mobInteract(shared_ptr player) void PigZombie::dropRareDeathLoot(int rareLootLevel) { - spawnAtLocation(Item::goldIngot_Id, 1); + spawnAtLocation(Item::gold_ingot_Id, 1); } int PigZombie::getDeathLoot() @@ -174,7 +174,7 @@ int PigZombie::getDeathLoot() void PigZombie::populateDefaultEquipmentSlots() { - setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::sword_gold)); + setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::golden_sword)); } MobGroupData *PigZombie::finalizeMobSpawn(MobGroupData *groupData, int extraData /*= 0*/) // 4J Added extraData param diff --git a/Minecraft.World/PineFeature.cpp b/Minecraft.World/PineFeature.cpp index 6ee6fd7c..4d05ef65 100644 --- a/Minecraft.World/PineFeature.cpp +++ b/Minecraft.World/PineFeature.cpp @@ -95,7 +95,7 @@ bool PineFeature::place(Level *level, Random *random, int x, int y, int z) for (int hh = 0; hh < treeHeight - 1; hh++) { int t = level->getTile(x, y + hh, z); - if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } return true; diff --git a/Minecraft.World/PistonBaseTile.cpp b/Minecraft.World/PistonBaseTile.cpp index 47e6dcec..e90ed8b0 100644 --- a/Minecraft.World/PistonBaseTile.cpp +++ b/Minecraft.World/PistonBaseTile.cpp @@ -123,7 +123,7 @@ Icon *PistonBaseTile::getTexture(const wstring &name) { if (name.compare(EDGE_TEX) == 0) return Tile::pistonBase->icon; if (name.compare(PLATFORM_TEX) == 0) return Tile::pistonBase->iconPlatform; - if (name.compare(PLATFORM_STICKY_TEX) == 0) return Tile::pistonStickyBase->iconPlatform; + if (name.compare(PLATFORM_STICKY_TEX) == 0) return Tile::sticky_piston->iconPlatform; if (name.compare(INSIDE_TEX) == 0) return Tile::pistonBase->iconInside; return nullptr; @@ -326,7 +326,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, } stopSharingIfServer(level, x, y, z); // 4J added - level->setTileAndData(x, y, z, Tile::pistonMovingPiece_Id, facing, Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::piston_extension_Id, facing, Tile::UPDATE_ALL); level->setTileEntity(x, y, z, PistonMovingPiece::newMovingPieceEntity(id, facing, facing, false, true)); PIXEndNamedEvent(); @@ -344,7 +344,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, PIXEndNamedEvent(); - if (block == Tile::pistonMovingPiece_Id) + if (block == Tile::piston_extension_Id) { PIXBeginNamedEvent(0,"Contract sticky phase B\n"); // the block two steps away is a moving piston block piece, so replace it with the real data, @@ -368,7 +368,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, PIXBeginNamedEvent(0,"Contract sticky phase C\n"); if (!pistonPiece && block > 0 && (isPushable(block, level, twoX, twoY, twoZ, false)) - && (Tile::tiles[block]->getPistonPushReaction() == Material::PUSH_NORMAL || block == Tile::pistonBase_Id || block == Tile::pistonStickyBase_Id)) + && (Tile::tiles[block]->getPistonPushReaction() == Material::PUSH_NORMAL || block == Tile::piston_Id || block == Tile::sticky_piston_Id)) { stopSharingIfServer(level, twoX, twoY, twoZ); // 4J added @@ -376,7 +376,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1, y += Facing::STEP_Y[facing]; z += Facing::STEP_Z[facing]; - level->setTileAndData(x, y, z, Tile::pistonMovingPiece_Id, blockData, Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::piston_extension_Id, blockData, Tile::UPDATE_ALL); level->setTileEntity(x, y, z, PistonMovingPiece::newMovingPieceEntity(block, blockData, facing, false, false)); ignoreUpdate(false); @@ -511,7 +511,7 @@ bool PistonBaseTile::isPushable(int block, Level *level, int cx, int cy, int cz, return false; } - if (block == Tile::pistonBase_Id || block == Tile::pistonStickyBase_Id) + if (block == Tile::piston_Id || block == Tile::sticky_piston_Id) { // special case for piston bases if (isExtended(level->getData(cx, cy, cz))) @@ -691,12 +691,12 @@ bool PistonBaseTile::createPush(Level *level, int sx, int sy, int sz, int facing if (block == id && nx == sx && ny == sy && nz == sz) { - level->setTileAndData(cx, cy, cz, Tile::pistonMovingPiece_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), Tile::UPDATE_NONE); - level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(Tile::pistonExtensionPiece_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), facing, true, false)); + level->setTileAndData(cx, cy, cz, Tile::piston_extension_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), Tile::UPDATE_NONE); + level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(Tile::piston_head_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), facing, true, false)); } else { - level->setTileAndData(cx, cy, cz, Tile::pistonMovingPiece_Id, data, Tile::UPDATE_NONE); + level->setTileAndData(cx, cy, cz, Tile::piston_extension_Id, data, Tile::UPDATE_NONE); level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false)); } tiles[count++] = block; diff --git a/Minecraft.World/PistonExtensionTile.cpp b/Minecraft.World/PistonExtensionTile.cpp index dfd46cd8..c5798c5c 100644 --- a/Minecraft.World/PistonExtensionTile.cpp +++ b/Minecraft.World/PistonExtensionTile.cpp @@ -55,7 +55,7 @@ void PistonExtensionTile::playerWillDestroy(Level *level, int x, int y, int z, i { int facing = getFacing(data); int tile = level->getTile(x - Facing::STEP_X[facing], y - Facing::STEP_Y[facing], z - Facing::STEP_Z[facing]); - if (tile == Tile::pistonBase_Id || tile == Tile::pistonStickyBase_Id) + if (tile == Tile::piston_Id || tile == Tile::sticky_piston_Id) { level->removeTile(x - Facing::STEP_X[facing], y - Facing::STEP_Y[facing], z - Facing::STEP_Z[facing]); } @@ -73,7 +73,7 @@ void PistonExtensionTile::onRemove(Level *level, int x, int y, int z, int id, in int t = level->getTile(x, y, z); - if (t == Tile::pistonBase_Id || t == Tile::pistonStickyBase_Id) + if (t == Tile::piston_Id || t == Tile::sticky_piston_Id) { data = level->getData(x, y, z); if (PistonBaseTile::isExtended(data)) @@ -229,7 +229,7 @@ void PistonExtensionTile::neighborChanged(Level *level, int x, int y, int z, int { int facing = getFacing(level->getData(x, y, z)); int tile = level->getTile(x - Facing::STEP_X[facing], y - Facing::STEP_Y[facing], z - Facing::STEP_Z[facing]); - if (tile != Tile::pistonBase_Id && tile != Tile::pistonStickyBase_Id) + if (tile != Tile::piston_Id && tile != Tile::sticky_piston_Id) { level->removeTile(x, y, z); } @@ -249,8 +249,8 @@ int PistonExtensionTile::cloneTileId(Level *level, int x, int y, int z) int data = level->getData(x, y, z); if ((data & STICKY_BIT) != 0) { - return Tile::pistonStickyBase_Id; + return Tile::sticky_piston_Id; } - return Tile::pistonBase_Id; + return Tile::piston_Id; return 0; } \ No newline at end of file diff --git a/Minecraft.World/PistonPieceEntity.cpp b/Minecraft.World/PistonPieceEntity.cpp index 08e18cbb..313d9d0a 100644 --- a/Minecraft.World/PistonPieceEntity.cpp +++ b/Minecraft.World/PistonPieceEntity.cpp @@ -145,7 +145,7 @@ void PistonPieceEntity::finalTick() progressO = progress = 1; level->removeTileEntity(x, y, z); setRemoved(); - if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id) + if (level->getTile(x, y, z) == Tile::piston_extension_Id) { level->setTileAndData(x, y, z, id, data, Tile::UPDATE_ALL); level->neighborChanged(x, y, z, id); @@ -162,7 +162,7 @@ void PistonPieceEntity::tick() moveCollidedEntities(1, 4 / 16.f); level->removeTileEntity(x, y, z); setRemoved(); - if (level->getTile(x, y, z) == Tile::pistonMovingPiece_Id) + if (level->getTile(x, y, z) == Tile::piston_extension_Id) { level->setTileAndData(x, y, z, id, data, Tile::UPDATE_ALL); level->neighborChanged(x, y, z, id); diff --git a/Minecraft.World/PlainsBiome.cpp b/Minecraft.World/PlainsBiome.cpp index 4e562099..2e5c911c 100644 --- a/Minecraft.World/PlainsBiome.cpp +++ b/Minecraft.World/PlainsBiome.cpp @@ -22,25 +22,25 @@ Feature* PlainsBiome::getFlowerFeature(Random* random, int x, int y, int z) { int j = random->nextInt(4); switch (j) { - case 0: return new FlowerFeature(Tile::rose_Id, Rose::ORANGE_TULIP); - case 1: return new FlowerFeature(Tile::rose_Id, Rose::RED_TULIP); - case 2: return new FlowerFeature(Tile::rose_Id, Rose::PINK_TULIP); - case 3: return new FlowerFeature(Tile::rose_Id, Rose::WHITE_TULIP); + case 0: return new FlowerFeature(Tile::red_flower_Id, Rose::ORANGE_TULIP); + case 1: return new FlowerFeature(Tile::red_flower_Id, Rose::RED_TULIP); + case 2: return new FlowerFeature(Tile::red_flower_Id, Rose::PINK_TULIP); + case 3: return new FlowerFeature(Tile::red_flower_Id, Rose::WHITE_TULIP); } }else if (random->nextInt(3) > 0) { int i = random->nextInt(3); if (i == 1) { - return new FlowerFeature(Tile::rose_Id,Rose::AZURE_BLUET); + return new FlowerFeature(Tile::red_flower_Id,Rose::AZURE_BLUET); } else - return new FlowerFeature(Tile::rose_Id,Rose::OXEYE_DAISY); + return new FlowerFeature(Tile::red_flower_Id,Rose::OXEYE_DAISY); } else { - return new FlowerFeature(Tile::flower_Id); + return new FlowerFeature(Tile::yellow_flower_Id); } return Biome::getFlowerFeature(random, x, y, z); diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp index 8dd4930a..a8e31d24 100644 --- a/Minecraft.World/Player.cpp +++ b/Minecraft.World/Player.cpp @@ -384,7 +384,7 @@ void Player::tick() this->drop( shared_ptr( new ItemInstance(Item::map) ) ); this->drop( shared_ptr( new ItemInstance(Item::record_01) ) ); this->drop( shared_ptr( new ItemInstance(Item::record_02) ) ); - this->drop( shared_ptr(new ItemInstance( Item::pickAxe_diamond, 1 )) ); + this->drop( shared_ptr(new ItemInstance( Item::diamond_pickaxe, 1 )) ); #endif #ifdef __PS3__ @@ -394,7 +394,7 @@ void Player::tick() // this->drop( shared_ptr( new ItemInstance(Item::map) ) ); // this->drop( shared_ptr( new ItemInstance(Item::record_01) ) ); // this->drop( shared_ptr( new ItemInstance(Item::record_02) ) ); - // this->drop( shared_ptr(new ItemInstance( Item::pickAxe_diamond, 1 )) ); + // this->drop( shared_ptr(new ItemInstance( Item::diamond_pickaxe, 1 )) ); // #endif #endif @@ -404,11 +404,11 @@ void Player::tick() this->drop( shared_ptr( new ItemInstance(Item::map) ) ); this->drop( shared_ptr( new ItemInstance(Item::record_01) ) ); this->drop( shared_ptr( new ItemInstance(Item::record_02) ) ); - this->drop( shared_ptr(new ItemInstance( Item::pickAxe_diamond, 1 )) ); + this->drop( shared_ptr(new ItemInstance( Item::diamond_pickaxe, 1 )) ); #endif #endif // 4J-PB - Throw items out at the start of the level - //this->drop( new ItemInstance( Item::pickAxe_diamond, 1 ) ); + //this->drop( new ItemInstance( Item::diamond_pickaxe, 1 ) ); //this->drop( new ItemInstance( Tile::workBench, 1 ) ); //this->drop( new ItemInstance( Tile::treeTrunk, 8 ) ); //this->drop( shared_ptr( new ItemInstance( Item::milk, 3 ) ) ); @@ -456,7 +456,7 @@ void Player::tick() // increaseXp(10); { - // ItemInstance itemInstance = new ItemInstance(Item.pickAxe_diamond); + // ItemInstance itemInstance = new ItemInstance(Item.diamond_pickaxe); // itemInstance.enchant(Enchantment.diggingBonus, 3); // inventory.add(itemInstance); } @@ -475,16 +475,16 @@ void Player::tick() int poweredCount = 0; for(int i = 10; i < 2800; ++i) { - level->setTileAndData(x+i,y-1,z-2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y,z-2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y+1,z-2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y-1,z-2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y,z-2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y+1,z-2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); level->setTileAndData(x+i,y+2,z-2,Tile::glowstone_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y+3,z-2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y+3,z-2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y-1,z-1,Tile::stoneBrick_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y-1,z-1,Tile::stonebrick_Id,0,Tile::UPDATE_CLIENTS); if(i%20 == 0) { - level->setTileAndData(x+i,y,z-1,Tile::redstoneTorch_on_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y,z-1,Tile::redstone_torch_Id,0,Tile::UPDATE_CLIENTS); poweredCount = 4; } else @@ -495,10 +495,10 @@ void Player::tick() level->setTileAndData(x+i,y+2,z-1,0,0,Tile::UPDATE_CLIENTS); level->setTileAndData(x+i,y+3,z-1,0,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y-1,z,Tile::stoneBrick_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y-1,z,Tile::stonebrick_Id,0,Tile::UPDATE_CLIENTS); if(poweredCount>0) { - level->setTileAndData(x+i,y,z,Tile::goldenRail_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y,z,Tile::golden_rail_Id,0,Tile::UPDATE_CLIENTS); --poweredCount; } else @@ -509,7 +509,7 @@ void Player::tick() level->setTileAndData(x+i,y+2,z,0,0,Tile::UPDATE_CLIENTS); level->setTileAndData(x+i,y+3,z,0,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y-1,z+1,Tile::stoneBrick_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y-1,z+1,Tile::stonebrick_Id,0,Tile::UPDATE_CLIENTS); if((i+5)%20 == 0) { level->setTileAndData(x+i,y,z+1,Tile::torch_Id,0,Tile::UPDATE_CLIENTS); @@ -522,11 +522,11 @@ void Player::tick() level->setTileAndData(x+i,y+2,z+1,0,0,Tile::UPDATE_CLIENTS); level->setTileAndData(x+i,y+3,z+1,0,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y-1,z+2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y,z+2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y+1,z+2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y-1,z+2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y,z+2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y+1,z+2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); level->setTileAndData(x+i,y+2,z+2,Tile::glowstone_Id,0,Tile::UPDATE_CLIENTS); - level->setTileAndData(x+i,y+3,z+2,Tile::quartzBlock_Id,0,Tile::UPDATE_CLIENTS); + level->setTileAndData(x+i,y+3,z+2,Tile::quartz_block_Id,0,Tile::UPDATE_CLIENTS); } madeTrack = true; } @@ -1548,7 +1548,7 @@ void Player::openTextEdit(shared_ptr sign) { } -bool Player::openBrewingStand(shared_ptr brewingStand) +bool Player::openBrewingStand(shared_ptr brewing_stand) { return true; } @@ -2494,9 +2494,9 @@ void Player::makeStuckInWeb() Icon *Player::getItemInHandIcon(shared_ptr item, int layer) { Icon *icon = LivingEntity::getItemInHandIcon(item, layer); - if (item->id == Item::fishingRod->id && fishing != nullptr) + if (item->id == Item::fishing_rod->id && fishing != nullptr) { - icon = Item::fishingRod->getEmptyIcon(); + icon = Item::fishing_rod->getEmptyIcon(); } else if (item->getItem()->hasMultipleSpriteLayers()) { @@ -3075,11 +3075,11 @@ bool Player::isAllowedToUse(Tile *tile) { switch(tile->id) { - case Tile::door_wood_Id: - case Tile::button_stone_Id: - case Tile::button_wood_Id: + case Tile::wooden_door_Id: + case Tile::stone_button_Id: + case Tile::wooden_button_Id: case Tile::lever_Id: - case Tile::fenceGate_Id: + case Tile::fence_gate_Id: case Tile::trapdoor_Id: allowed = true; break; @@ -3092,13 +3092,13 @@ bool Player::isAllowedToUse(Tile *tile) { case Tile::chest_Id: case Tile::furnace_Id: - case Tile::furnace_lit_Id: + case Tile::lit_furnace_Id: case Tile::dispenser_Id: - case Tile::brewingStand_Id: - case Tile::enchantTable_Id: - case Tile::workBench_Id: + case Tile::brewing_stand_Id: + case Tile::enchanting_table_Id: + case Tile::crafting_table_Id: case Tile::anvil_Id: - case Tile::enderChest_Id: + case Tile::ender_chest_Id: allowed = true; break; } @@ -3108,21 +3108,21 @@ bool Player::isAllowedToUse(Tile *tile) { switch(tile->id) { - case Tile::door_wood_Id: - case Tile::button_stone_Id: - case Tile::button_wood_Id: + case Tile::wooden_door_Id: + case Tile::stone_button_Id: + case Tile::wooden_button_Id: case Tile::lever_Id: - case Tile::fenceGate_Id: + case Tile::fence_gate_Id: case Tile::trapdoor_Id: case Tile::chest_Id: case Tile::furnace_Id: - case Tile::furnace_lit_Id: + case Tile::lit_furnace_Id: case Tile::dispenser_Id: - case Tile::brewingStand_Id: - case Tile::enchantTable_Id: - case Tile::workBench_Id: + case Tile::brewing_stand_Id: + case Tile::enchanting_table_Id: + case Tile::crafting_table_Id: case Tile::anvil_Id: - case Tile::enderChest_Id: + case Tile::ender_chest_Id: allowed = false; break; default: @@ -3149,28 +3149,28 @@ bool Player::isAllowedToUse(shared_ptr item) switch(item->id) { // food - case Item::mushroomStew_Id: + case Item::mushroom_stew_Id: case Item::apple_Id: case Item::bread_Id: - case Item::porkChop_raw_Id: - case Item::porkChop_cooked_Id: - case Item::apple_gold_Id: - case Item::fish_raw_Id: - case Item::fish_cooked_Id: + case Item::porkchop_Id: + case Item::cooked_porkchop_Id: + case Item::golden_apple_Id: + case Item::fish_Id: + case Item::cooked_fish_Id: case Item::cookie_Id: - case Item::beef_cooked_Id: - case Item::beef_raw_Id: - case Item::chicken_cooked_Id: - case Item::chicken_raw_Id: - case Item::melon_Id: + case Item::cooked_beef_Id: + case Item::beef_Id: + case Item::cooked_chicken_Id: + case Item::chicken_Id: + case Item::melon_block_Id: case Item::rotten_flesh_Id: // bow case Item::bow_Id: - case Item::sword_diamond_Id: - case Item::sword_gold_Id: - case Item::sword_iron_Id: - case Item::sword_stone_Id: - case Item::sword_wood_Id: + case Item::diamond_sword_Id: + case Item::golden_sword_Id: + case Item::iron_sword_Id: + case Item::stone_sword_Id: + case Item::wooden_sword_Id: allowed = true; break; } diff --git a/Minecraft.World/Player.h b/Minecraft.World/Player.h index 61413adc..d6067be6 100644 --- a/Minecraft.World/Player.h +++ b/Minecraft.World/Player.h @@ -279,7 +279,7 @@ public: virtual bool openFurnace(shared_ptr container); // 4J - added bool return virtual bool openTrap(shared_ptr container); // 4J - added bool return virtual void openTextEdit(shared_ptr sign); - virtual bool openBrewingStand(shared_ptr brewingStand); // 4J - added bool return + virtual bool openBrewingStand(shared_ptr brewing_stand); // 4J - added bool return virtual bool openBeacon(shared_ptr beacon); virtual bool openTrading(shared_ptr traderTarget, const wstring &name); // 4J - added bool return virtual void openItemInstanceGui(shared_ptr itemInstance, shared_ptr player); diff --git a/Minecraft.World/PortalForcer.cpp b/Minecraft.World/PortalForcer.cpp index 049e2d36..cf6956c9 100644 --- a/Minecraft.World/PortalForcer.cpp +++ b/Minecraft.World/PortalForcer.cpp @@ -118,9 +118,9 @@ bool PortalForcer::findPortal(shared_ptr e, double xOriginal, double yOr double zd = (z + 0.5) - e->z; for (int y = level->getHeight() - 1; y >= 0; y--) { - if (level->getTile(x, y, z) == Tile::portalTile_Id) + if (level->getTile(x, y, z) == Tile::portal_Id) { - while (level->getTile(x, y - 1, z) == Tile::portalTile_Id) + while (level->getTile(x, y - 1, z) == Tile::portal_Id) { y--; } @@ -166,10 +166,10 @@ bool PortalForcer::findPortal(shared_ptr e, double xOriginal, double yOr double zt = z + 0.5; int dir = Direction::UNDEFINED; - if (level->getTile(x - 1, y, z) == Tile::portalTile_Id) dir = Direction::NORTH; - if (level->getTile(x + 1, y, z) == Tile::portalTile_Id) dir = Direction::SOUTH; - if (level->getTile(x, y, z - 1) == Tile::portalTile_Id) dir = Direction::EAST; - if (level->getTile(x, y, z + 1) == Tile::portalTile_Id) dir = Direction::WEST; + if (level->getTile(x - 1, y, z) == Tile::portal_Id) dir = Direction::NORTH; + if (level->getTile(x + 1, y, z) == Tile::portal_Id) dir = Direction::SOUTH; + if (level->getTile(x, y, z - 1) == Tile::portal_Id) dir = Direction::EAST; + if (level->getTile(x, y, z + 1) == Tile::portal_Id) dir = Direction::WEST; int originalDir = e->getPortalEntranceDir(); @@ -491,7 +491,7 @@ next_second: continue; int zt = z + (s - 1) * za; bool border = s == 0 || s == 3 || h == -1 || h == 3; - level->setTileAndData(xt, yt, zt, border ? Tile::obsidian_Id : Tile::portalTile_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(xt, yt, zt, border ? Tile::obsidian_Id : Tile::portal_Id, 0, Tile::UPDATE_CLIENTS); } } diff --git a/Minecraft.World/PortalTile.cpp b/Minecraft.World/PortalTile.cpp index e7e76a08..0e3925ef 100644 --- a/Minecraft.World/PortalTile.cpp +++ b/Minecraft.World/PortalTile.cpp @@ -94,7 +94,7 @@ bool PortalTile::validPortalFrame(Level* level, int x, int y, int z, int xd, int { for (int yy = 0; yy < 3; yy++) { - level->setTileAndData(x + xd * xx, y + yy, z + zd * xx, Tile::portalTile_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + xd * xx, y + yy, z + zd * xx, Tile::portal_Id, 0, Tile::UPDATE_CLIENTS); } } diff --git a/Minecraft.World/PotatoTile.cpp b/Minecraft.World/PotatoTile.cpp index 351c8c98..77eed3c6 100644 --- a/Minecraft.World/PotatoTile.cpp +++ b/Minecraft.World/PotatoTile.cpp @@ -46,7 +46,7 @@ void PotatoTile::spawnResources(Level *level, int x, int y, int z, int data, flo { if (level->random->nextInt(50) == 0) { - popResource(level, x, y, z, std::make_shared(Item::potatoPoisonous)); + popResource(level, x, y, z, std::make_shared(Item::poisonous_potato)); } } } diff --git a/Minecraft.World/PumpkinTile.cpp b/Minecraft.World/PumpkinTile.cpp index da11001d..ac159fb0 100644 --- a/Minecraft.World/PumpkinTile.cpp +++ b/Minecraft.World/PumpkinTile.cpp @@ -69,10 +69,10 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z) level->addParticle(eParticleType_snowshovel, x + level->random->nextDouble(), y - 2 + level->random->nextDouble() * 2.5, z + level->random->nextDouble(), 0, 0, 0); } } - else if (level->getTile(x, y - 1, z) == Tile::ironBlock_Id && level->getTile(x, y - 2, z) == Tile::ironBlock_Id) + else if (level->getTile(x, y - 1, z) == Tile::iron_block_Id && level->getTile(x, y - 2, z) == Tile::iron_block_Id) { - bool xArms = level->getTile(x - 1, y - 1, z) == Tile::ironBlock_Id && level->getTile(x + 1, y - 1, z) == Tile::ironBlock_Id; - bool zArms = level->getTile(x, y - 1, z - 1) == Tile::ironBlock_Id && level->getTile(x, y - 1, z + 1) == Tile::ironBlock_Id; + bool xArms = level->getTile(x - 1, y - 1, z) == Tile::iron_block_Id && level->getTile(x + 1, y - 1, z) == Tile::iron_block_Id; + bool zArms = level->getTile(x, y - 1, z - 1) == Tile::iron_block_Id && level->getTile(x, y - 1, z + 1) == Tile::iron_block_Id; if (xArms || zArms) { if (!level->isClientSide) @@ -122,23 +122,23 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z) { // If we can't spawn it, at least give the resources back Tile::spawnResources(level, x, y, z, level->getData(x, y, z), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z, level->getData(x, y - 1, z), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 2, z, level->getData(x, y - 2, z), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x, y - 1, z, level->getData(x, y - 1, z), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x, y - 2, z, level->getData(x, y - 2, z), 0); level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS); if(xArms) { - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x - 1, y - 1, z, level->getData(x - 1, y - 1, z), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x + 1, y - 1, z, level->getData(x + 1, y - 1, z), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x - 1, y - 1, z, level->getData(x - 1, y - 1, z), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x + 1, y - 1, z, level->getData(x + 1, y - 1, z), 0); level->setTileAndData(x - 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x + 1, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS); } else { - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z - 1, level->getData(x, y - 1, z - 1), 0); - Tile::tiles[Tile::ironBlock_Id]->spawnResources(level, x, y - 1, z + 1, level->getData(x, y - 1, z + 1), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x, y - 1, z - 1, level->getData(x, y - 1, z - 1), 0); + Tile::tiles[Tile::iron_block_Id]->spawnResources(level, x, y - 1, z + 1, level->getData(x, y - 1, z + 1), 0); level->setTileAndData(x, y - 1, z - 1, 0, 0, Tile::UPDATE_CLIENTS); level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS); } diff --git a/Minecraft.World/Rabbit.cpp b/Minecraft.World/Rabbit.cpp index 19d6fabd..6505a860 100644 --- a/Minecraft.World/Rabbit.cpp +++ b/Minecraft.World/Rabbit.cpp @@ -35,7 +35,7 @@ Rabbit::Rabbit(Level *level) : Animal(level) goalSelector.addGoal(1, new FloatGoal(this)); goalSelector.addGoal(2, new PanicGoal(this, 1.2f)); goalSelector.addGoal(3, new BreedGoal(this, 0.8f)); - goalSelector.addGoal(4, new TemptGoal(this, 1.0f, Item::carrots_Id, false)); + goalSelector.addGoal(4, new TemptGoal(this, 1.0f, Item::carrot_Id, false)); goalSelector.addGoal(5, new FollowParentGoal(this, 1.1f)); goalSelector.addGoal(6, new RandomStrollGoal(this, 0.6f)); goalSelector.addGoal(7, new LookAtPlayerGoal(this, typeid(Player), 10.0f)); @@ -73,7 +73,7 @@ bool Rabbit::useNewAi() { void Rabbit::dropDeathLoot(bool wasKilledByPlayer, int lootingLevel) { int meatCount = random->nextInt(2) + random->nextInt(lootingLevel + 1); - int meatId = isOnFire() ? Item::rabbit_cooked_Id : Item::rabbit_raw_Id; + int meatId = isOnFire() ? Item::cooked_rabbit_Id : Item::rabbit_Id; spawnAtLocation(meatId, meatCount); @@ -83,7 +83,7 @@ void Rabbit::dropDeathLoot(bool wasKilledByPlayer, int lootingLevel) { float footChance = 0.10f + (0.03f * lootingLevel); if (wasKilledByPlayer && random->nextFloat() < footChance) { - spawnAtLocation(Item::rabbits_foot_Id, 1); + spawnAtLocation(Item::rabbit_foot_Id, 1); } } @@ -121,7 +121,7 @@ bool Rabbit::isFood(shared_ptr item) { int id = item->getItem()->id; - return id == Item::carrots_Id || id == Item::carrots_Id || id == Item::carrotGolden_Id; + return id == Item::carrot_Id || id == Item::carrot_Id || id == Item::golden_carrot_Id; } shared_ptr Rabbit::getBreedOffspring(shared_ptr target) { diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp index 1a24ad06..aa6ae9e0 100644 --- a/Minecraft.World/RandomLevelSource.cpp +++ b/Minecraft.World/RandomLevelSource.cpp @@ -326,7 +326,7 @@ void RandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks) } else if (yc * CHUNK_HEIGHT + y < waterHeight) { - tileId = static_cast(Tile::calmWater_Id); + tileId = static_cast(Tile::water_Id); } // 4J - more extra code to make sure that the column at the edge of the world is just water & rock, to match the infinite sea that @@ -336,7 +336,7 @@ void RandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArray blocks) { // This matches code in MultiPlayerChunkCache that makes the geometry which continues at the edge of the world if( yc * CHUNK_HEIGHT + y <= ( level->getSeaLevel() - 10 ) ) tileId = Tile::stone_Id; - else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::calmWater_Id; + else if( yc * CHUNK_HEIGHT + y < level->getSeaLevel() ) tileId = Tile::water_Id; } blocks[offs += step] = tileId; @@ -668,10 +668,10 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) if (level->getHeightmap(xp - 1, zp) > 0 || level->getHeightmap(xp + 1, zp) > 0 || level->getHeightmap(xp, zp - 1) > 0 || level->getHeightmap(xp, zp + 1) > 0) { bool hadWater = false; - if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::calmWater_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::calmWater_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::calmWater_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::calmWater_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::water_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::water_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::water_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::water_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; if (hadWater) { for (int x2 = -5; x2 <= 5; x2++) @@ -683,7 +683,7 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) if (d <= 5) { d = 6 - d; - if (level->getTile(xp + x2, y, zp + z2) == Tile::calmWater_Id) + if (level->getTile(xp + x2, y, zp + z2) == Tile::water_Id) { int od = level->getData(xp + x2, y, zp + z2); if (od < 7 && od < d) @@ -696,10 +696,10 @@ void RandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, int zt) } if (hadWater) { - level->setTileAndData(xp, y, zp, Tile::calmWater_Id, 7, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y, zp, Tile::water_Id, 7, Tile::UPDATE_CLIENTS); for (int y2 = 0; y2 < y; y2++) { - level->setTileAndData(xp, y2, zp, Tile::calmWater_Id, 8, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y2, zp, Tile::water_Id, 8, Tile::UPDATE_CLIENTS); } } } @@ -751,7 +751,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int y = pprandom->nextInt(Level::genDepth); int z = zo + pprandom->nextInt(16) + 8; - LakeFeature calmWater(Tile::calmWater_Id); + LakeFeature calmWater(Tile::water_Id); calmWater.place(level, pprandom, x, y, z); } } @@ -765,7 +765,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) int z = zo + pprandom->nextInt(16) + 8; if (y < level->seaLevel || pprandom->nextInt(10) == 0) { - LakeFeature calmLava(Tile::calmLava_Id); + LakeFeature calmLava(Tile::lava_Id); calmLava.place(level, pprandom, x, y, z); } } @@ -810,7 +810,7 @@ void RandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt) } if (level->shouldSnow(x + xo, y, z + zo)) { - level->setTileAndData(x + xo, y, z + zo, Tile::topSnow_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x + xo, y, z + zo, Tile::snow_layer_Id, 0, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/Recipes.cpp b/Minecraft.World/Recipes.cpp index 2eedf59f..4bc9a397 100644 --- a/Minecraft.World/Recipes.cpp +++ b/Minecraft.World/Recipes.cpp @@ -85,14 +85,14 @@ Recipes::Recipes() L"sczg", L"#", // - L'#', new ItemInstance(Tile::tree2Trunk, 1, TreeTile2::ACACIA_TRUNK), + L'#', new ItemInstance(Tile::log2, 1, TreeTile2::ACACIA_TRUNK), L'S'); addShapedRecipy(new ItemInstance(Tile::wood, 4, TreeTile::DARK_TRUNK), // L"sczg", L"#", // - L'#', new ItemInstance(Tile::tree2Trunk, 1, TreeTile2::DARK_TRUNK), + L'#', new ItemInstance(Tile::log2, 1, TreeTile2::DARK_TRUNK), L'S'); addShapedRecipy(new ItemInstance(Item::stick, 4), // @@ -132,7 +132,7 @@ Recipes::Recipes() L" i ", // L"iii", // - L'I', Tile::ironBlock, L'i', Item::ironIngot, + L'I', Tile::ironBlock, L'i', Item::iron_ingot, L'S'); // 4J Stu - Reordered for crafting menu @@ -223,12 +223,12 @@ Recipes::Recipes() L'#', Tile::netherBrick, L'S'); - addShapedRecipy(new ItemInstance(Tile::ironFence, 16), // + addShapedRecipy(new ItemInstance(Tile::iron_bars, 16), // L"sscig", L"###", // L"###", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'S'); addShapedRecipy(new ItemInstance(Tile::fenceGate, 1), // @@ -279,7 +279,7 @@ Recipes::Recipes() L'#', Item::stick, L'W', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_wood, 3), // + addShapedRecipy(new ItemInstance(Item::wooden_door, 3), // L"sssczg", L"##", // L"##", // @@ -288,7 +288,7 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, 0), L'S'); - addShapedRecipy(new ItemInstance(Item::door_birch, 3), // + addShapedRecipy(new ItemInstance(Item::birch_door, 3), // L"sssczg", L"##", // L"##", // @@ -297,7 +297,7 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, TreeTile::BIRCH_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_spruce, 3), // + addShapedRecipy(new ItemInstance(Item::spruce_door, 3), // L"sssczg", L"##", // L"##", // @@ -306,7 +306,7 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, TreeTile::SPRUCE_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_jungle, 3), // + addShapedRecipy(new ItemInstance(Item::jungle_door, 3), // L"sssczg", L"##", // L"##", // @@ -315,7 +315,7 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, TreeTile::JUNGLE_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_acacia, 3), // + addShapedRecipy(new ItemInstance(Item::acacia_door, 3), // L"sssczg", L"##", // L"##", // @@ -324,7 +324,7 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, TreeTile::ACACIA_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_dark, 3), // + addShapedRecipy(new ItemInstance(Item::dark_oak_door, 3), // L"sssczg", L"##", // L"##", // @@ -333,13 +333,13 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::wood, 1, TreeTile::DARK_TRUNK), L'S'); - addShapedRecipy(new ItemInstance(Item::door_iron, 3), // + addShapedRecipy(new ItemInstance(Item::iron_door, 3), // L"ssscig", L"##", // L"##", // L"##", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'S'); addShapedRecipy(new ItemInstance(Tile::trapdoor, 2), // @@ -355,7 +355,7 @@ Recipes::Recipes() L"##", // L"##", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'S'); addShapedRecipy(new ItemInstance(Tile::stairs_wood, 4), // @@ -385,7 +385,7 @@ Recipes::Recipes() L'#', Tile::redBrick, L'S'); - addShapedRecipy(new ItemInstance(Tile::stairs_stoneBrickSmooth, 4), // + addShapedRecipy(new ItemInstance(Tile::stone_brick_stairsSmooth, 4), // L"sssctg", L"# ", // L"## ", // @@ -394,7 +394,7 @@ Recipes::Recipes() L'#', Tile::stoneBrick, L'S'); - addShapedRecipy(new ItemInstance(Tile::stairs_netherBricks, 4), // + addShapedRecipy(new ItemInstance(Tile::nether_brick_stairs, 4), // L"sssctg", L"# ", // L"## ", // @@ -486,7 +486,7 @@ Recipes::Recipes() L"##", // L"##", // - L'#', Item::snowBall, + L'#', Item::snowball, L'S'); addShapedRecipy(new ItemInstance(Tile::prismarine, 1), // @@ -513,7 +513,7 @@ Recipes::Recipes() L"#X#", // L"###", // - L'#', Item::prismarine_shard, L'X', new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), + L'#', Item::prismarine_shard, L'X', new ItemInstance(Item::dye, 1, DyePowderItem::BLACK), L'S'); addShapedRecipy(new ItemInstance(Tile::topSnow, 6), // @@ -667,7 +667,7 @@ Recipes::Recipes() L"BEB", // L"CCC", // - L'A', Item::bucket_milk,// + L'A', Item::milk_bucket,// L'B', Item::sugar,// L'C', Item::wheat, L'E', Item::egg, L'F'); @@ -685,7 +685,7 @@ Recipes::Recipes() L"X#X", // L"X X", // - L'X', Item::ironIngot,// + L'X', Item::iron_ingot,// L'#', Item::stick, L'V'); @@ -695,8 +695,8 @@ Recipes::Recipes() L"X#X", // L"XRX", // - L'X', Item::goldIngot,// - L'R', Item::redStone,// + L'X', Item::gold_ingot,// + L'R', Item::redstone,// L'#', Item::stick, L'V'); @@ -706,7 +706,7 @@ Recipes::Recipes() L"X#X", // L"XSX", // - L'X', Item::ironIngot,// + L'X', Item::iron_ingot,// L'#', Tile::redstoneTorch_on,// L'S', Item::stick, L'V'); @@ -717,8 +717,8 @@ Recipes::Recipes() L"X#X", // L"XRX", // - L'X', Item::ironIngot,// - L'R', Item::redStone,// + L'X', Item::iron_ingot,// + L'R', Item::redstone,// L'#', Tile::pressurePlate_stone, L'V'); @@ -727,10 +727,10 @@ Recipes::Recipes() L"# #", // L"###", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'V'); - addShapedRecipy(new ItemInstance(Item::minecart_chest, 1), // + addShapedRecipy(new ItemInstance(Item::chest_minecart, 1), // L"ssctcig", L"A", // L"B", // @@ -738,7 +738,7 @@ Recipes::Recipes() L'A', Tile::chest, L'B', Item::minecart, L'V'); - addShapedRecipy(new ItemInstance(Item::minecart_furnace, 1), // + addShapedRecipy(new ItemInstance(Item::furnace_minecart, 1), // L"ssctcig", L"A", // L"B", // @@ -746,7 +746,7 @@ Recipes::Recipes() L'A', Tile::furnace, L'B', Item::minecart, L'V'); - addShapedRecipy(new ItemInstance(Item::minecart_tnt, 1), // + addShapedRecipy(new ItemInstance(Item::tnt_minecart, 1), // L"ssctcig", L"A", // L"B", // @@ -754,7 +754,7 @@ Recipes::Recipes() L'A', Tile::tnt, L'B', Item::minecart, L'V'); - addShapedRecipy(new ItemInstance(Item::minecart_hopper, 1), // + addShapedRecipy(new ItemInstance(Item::hopper_minecart, 1), // L"ssctcig", L"A", // L"B", // @@ -770,7 +770,7 @@ Recipes::Recipes() L'#', Tile::wood, L'V'); - addShapedRecipy(new ItemInstance((Item *)Item::fishingRod, 1), // + addShapedRecipy(new ItemInstance((Item *)Item::fishing_rod, 1), // L"ssscicig", L" #", // L" #X", // @@ -779,20 +779,20 @@ Recipes::Recipes() L'#', Item::stick, L'X', Item::string, L'T'); - addShapedRecipy(new ItemInstance(Item::carrotOnAStick, 1), // + addShapedRecipy(new ItemInstance(Item::carrot_on_a_stick, 1), // L"sscicig", L"# ", // L" X", // - L'#', Item::fishingRod, L'X', Item::carrots, + L'#', Item::fishing_rod, L'X', Item::carrots, L'T')->keepTag(); - addShapedRecipy(new ItemInstance(Item::flintAndSteel, 1), // + addShapedRecipy(new ItemInstance(Item::flint_and_steel, 1), // L"sscicig", L"A ", // L" B", // - L'A', Item::ironIngot, L'B', Item::flint, + L'A', Item::iron_ingot, L'B', Item::flint, L'T'); addShapedRecipy(new ItemInstance(Item::bread, 1), // @@ -826,12 +826,12 @@ Recipes::Recipes() pWeaponRecipies->addRecipes(this); - addShapedRecipy(new ItemInstance(Item::bucket_empty, 1), // + addShapedRecipy(new ItemInstance(Item::bucket, 1), // L"sscig", L"# #", // L" # ", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'T'); addShapedRecipy(new ItemInstance(Item::bowl, 4), // @@ -875,7 +875,7 @@ Recipes::Recipes() L"##", // L"##", // - L'#', Item::yellowDust, + L'#', Item::glowstone_dust, L'T'); addShapedRecipy(new ItemInstance(Tile::quartzBlock, 1), // @@ -883,7 +883,7 @@ Recipes::Recipes() L"##", // L"##", // - L'#', Item::netherQuartz, + L'#', Item::nether_quartz, L'S'); addShapedRecipy(new ItemInstance(Tile::lever, 1), // @@ -900,7 +900,7 @@ Recipes::Recipes() L"S", // L"#", // - L'#', Tile::wood, L'S', Item::stick, L'I', Item::ironIngot, + L'#', Tile::wood, L'S', Item::stick, L'I', Item::iron_ingot, L'M'); addShapedRecipy(new ItemInstance(Tile::redstoneTorch_on, 1), // @@ -908,7 +908,7 @@ Recipes::Recipes() L"X", // L"#", // - L'#', Item::stick, L'X', Item::redStone, + L'#', Item::stick, L'X', Item::redstone, L'M'); addShapedRecipy(new ItemInstance(Item::repeater, 1), // @@ -916,7 +916,7 @@ Recipes::Recipes() L"#X#", // L"III", // - L'#', Tile::redstoneTorch_on, L'X', Item::redStone, L'I', new ItemInstance(Tile::stone, 1, 0), + L'#', Tile::redstoneTorch_on, L'X', Item::redstone, L'I', new ItemInstance(Tile::stone, 1, 0), L'M'); addShapedRecipy(new ItemInstance(Item::comparator, 1), // @@ -925,7 +925,7 @@ Recipes::Recipes() L"#X#", // L"III", // - L'#', Tile::redstoneTorch_on, L'X', Item::netherQuartz, L'I', new ItemInstance(Tile::stone, 1, 0), + L'#', Tile::redstoneTorch_on, L'X', Item::nether_quartz, L'I', new ItemInstance(Tile::stone, 1, 0), L'M'); addShapedRecipy(new ItemInstance(Tile::daylightDetector), @@ -934,7 +934,7 @@ Recipes::Recipes() L"QQQ", L"WWW", - L'G', Tile::glass, L'Q', Item::netherQuartz, L'W', Tile::woodSlabHalf, + L'G', Tile::glass, L'Q', Item::nether_quartz, L'W', Tile::woodSlabHalf, L'M'); addShapedRecipy(new ItemInstance(Tile::hopper), @@ -943,7 +943,7 @@ Recipes::Recipes() L"ICI", // L" I ", // - L'I', Item::ironIngot, L'C', Tile::chest, + L'I', Item::iron_ingot, L'C', Tile::chest, L'M'); addShapedRecipy(new ItemInstance(Item::clock, 1), // @@ -951,22 +951,22 @@ Recipes::Recipes() L" # ", // L"#X#", // L" # ", // - L'#', Item::goldIngot, L'X', Item::redStone, + L'#', Item::gold_ingot, L'X', Item::redstone, L'T'); - addShapelessRecipy(new ItemInstance(Item::eyeOfEnder, 1), // + addShapelessRecipy(new ItemInstance(Item::eye_of_ender, 1), // L"iig", - Item::enderPearl, Item::blazePowder, + Item::ender_pearl, Item::blaze_powder, L'T'); addShapelessRecipy(new ItemInstance(Item::fireball, 3), // L"iiig", - Item::gunpowder, Item::blazePowder,Item::coal, + Item::gunpowder, Item::blaze_powder,Item::coal, L'T'); addShapelessRecipy(new ItemInstance(Item::fireball, 3), // L"iizg", - Item::gunpowder, Item::blazePowder,new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), + Item::gunpowder, Item::blaze_powder,new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), L'T'); addShapedRecipy(new ItemInstance(Item::lead, 2), // @@ -975,7 +975,7 @@ Recipes::Recipes() L"~O ", // L" ~", // - L'~', Item::string, L'O', Item::slimeBall, + L'~', Item::string, L'O', Item::slime_ball, L'T'); @@ -985,10 +985,10 @@ Recipes::Recipes() L"#X#", // L" # ", // - L'#', Item::ironIngot, L'X', Item::redStone, + L'#', Item::iron_ingot, L'X', Item::redstone, L'T'); - addShapedRecipy(new ItemInstance((Item*)Item::emptyMap, 1), // + addShapedRecipy(new ItemInstance((Item*)Item::empty_map, 1), // L"ssscicig", L"###", // L"#X#", // @@ -1023,18 +1023,18 @@ Recipes::Recipes() L'#', new ItemInstance(Tile::stone, 1, 0), L'M'); - addShapedRecipy(new ItemInstance(Tile::weightedPlate_heavy, 1), // + addShapedRecipy(new ItemInstance(Tile::heavy_weighted_pressure_plate, 1), // L"scig", L"##", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'M'); - addShapedRecipy(new ItemInstance(Tile::weightedPlate_light, 1), // + addShapedRecipy(new ItemInstance(Tile::light_weighted_pressure_plate, 1), // L"scig", L"##", // - L'#', Item::goldIngot, + L'#', Item::gold_ingot, L'M'); addShapedRecipy(new ItemInstance(Tile::dispenser, 1), // @@ -1042,7 +1042,7 @@ Recipes::Recipes() L"###", // L"#X#", // L"#R#", // - L'#', Tile::cobblestone, L'X', Item::bow, L'R', Item::redStone, + L'#', Tile::cobblestone, L'X', Item::bow, L'R', Item::redstone, L'M'); addShapedRecipy(new ItemInstance(Tile::dropper, 1), // @@ -1051,7 +1051,7 @@ Recipes::Recipes() L"# #", // L"#R#", // - L'#', Tile::cobblestone, L'R', Item::redStone, + L'#', Tile::cobblestone, L'R', Item::redstone, L'M'); addShapedRecipy(new ItemInstance(Item::cauldron, 1), // @@ -1060,15 +1060,15 @@ Recipes::Recipes() L"# #", // L"###", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'T'); - addShapedRecipy(new ItemInstance(Item::brewingStand, 1), // + addShapedRecipy(new ItemInstance(Item::brewing_stand, 1), // L"ssctcig", L" B ", // L"###", // - L'#', Tile::cobblestone, L'B', Item::blazeRod, + L'#', Tile::cobblestone, L'B', Item::blaze_rod, L'S'); @@ -1080,7 +1080,7 @@ Recipes::Recipes() L'A', Tile::pumpkin, L'B', Tile::torch, L'T'); - addShapedRecipy(new ItemInstance(Item::flowerPot, 1), // + addShapedRecipy(new ItemInstance(Item::flower_pot, 1), // L"sscig", L"# #", // L" # ", // @@ -1131,15 +1131,15 @@ Recipes::Recipes() Item::leather, L'D'); - addShapelessRecipy(new ItemInstance(Item::writingBook, 1), + addShapelessRecipy(new ItemInstance(Item::writable_book, 1), L"iiig", Item::book, Item::feather, - ItemInstance(Item::dye_powder, 1, DyePowderItem::BLACK), + ItemInstance(Item::dye, 1, DyePowderItem::BLACK), L'D'); - //addShapelessRecipy(new ItemInstance(Item.writingBook, 1), // - // Item.book, new ItemInstance(Item.dye_powder, 1, DyePowderItem.BLACK), Item.feather); + //addShapelessRecipy(new ItemInstance(Item.writable_book, 1), // + // Item.book, new ItemInstance(Item.dye, 1, DyePowderItem.BLACK), Item.feather); addShapedRecipy(new ItemInstance(Tile::noteblock, 1), // L"sssctcig", @@ -1147,7 +1147,7 @@ Recipes::Recipes() L"#X#", // L"###", // - L'#', Tile::wood, L'X', Item::redStone, + L'#', Tile::wood, L'X', Item::redstone, L'M'); addShapedRecipy(new ItemInstance(Tile::bookshelf, 1), // @@ -1180,19 +1180,19 @@ Recipes::Recipes() pOreRecipies->addRecipes(this); - addShapedRecipy(new ItemInstance(Item::goldIngot), // + addShapedRecipy(new ItemInstance(Item::gold_ingot), // L"ssscig", L"###", // L"###", // L"###", // - L'#', Item::goldNugget, + L'#', Item::gold_nugget, L'D'); - addShapedRecipy(new ItemInstance(Item::goldNugget, 9), // + addShapedRecipy(new ItemInstance(Item::gold_nugget, 9), // L"scig", L"#", // - L'#', Item::goldIngot, + L'#', Item::gold_ingot, L'D'); // 4J-PB - moving into decorations to make the structures list smaller @@ -1212,15 +1212,15 @@ Recipes::Recipes() L"#X#", // L"#R#", // - L'#', Tile::cobblestone, L'X', Item::ironIngot, L'R', Item::redStone, L'T', Tile::wood, + L'#', Tile::cobblestone, L'X', Item::iron_ingot, L'R', Item::redstone, L'T', Tile::wood, L'M'); - addShapedRecipy(new ItemInstance(static_cast(Tile::pistonStickyBase), 1), // + addShapedRecipy(new ItemInstance(static_cast(Tile::sticky_piston), 1), // L"sscictg", L"S", // L"P", // - L'S', Item::slimeBall, L'P', Tile::pistonBase, + L'S', Item::slime_ball, L'P', Tile::pistonBase, L'M'); @@ -1233,20 +1233,20 @@ Recipes::Recipes() L'P', Item::paper, L'G', Item::gunpowder, L'D'); - addShapedRecipy(new ItemInstance(Item::fireworksCharge,1), // + addShapedRecipy(new ItemInstance(Item::firework_charge,1), // L"sscicig", L" D ", // L" G ", // - L'D', Item::dye_powder, L'G', Item::gunpowder, + L'D', Item::dye, L'G', Item::gunpowder, L'D'); - addShapedRecipy(new ItemInstance(Item::fireworksCharge,1), // + addShapedRecipy(new ItemInstance(Item::firework_charge,1), // L"sscicig", L" D ", // L" C ", // - L'D', Item::dye_powder, L'C', Item::fireworksCharge, + L'D', Item::dye, L'C', Item::firework_charge, L'D'); diff --git a/Minecraft.World/RedStoneDustTile.cpp b/Minecraft.World/RedStoneDustTile.cpp index d488428d..26aca6d3 100644 --- a/Minecraft.World/RedStoneDustTile.cpp +++ b/Minecraft.World/RedStoneDustTile.cpp @@ -277,7 +277,7 @@ void RedStoneDustTile::neighborChanged(Level *level, int x, int y, int z, int ty int RedStoneDustTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::redStone->id; + return Item::redstone->id; } int RedStoneDustTile::getDirectSignal(LevelSource *level, int x, int y, int z, int dir) @@ -380,9 +380,9 @@ void RedStoneDustTile::animateTick(Level *level, int x, int y, int z, Random *ra bool RedStoneDustTile::shouldConnectTo(LevelSource *level, int x, int y, int z, int direction) { int t = level->getTile(x, y, z); - if (t == Tile::redStoneDust_Id) return true; + if (t == Tile::redstone_wire_Id) return true; if (t == 0) return false; - if (Tile::diode_off->isSameDiode(t)) + if (Tile::unpowered_repeater->isSameDiode(t)) { int data = level->getData(x, y, z); return direction == (data & DiodeTile::DIRECTION_MASK) || direction == Direction::DIRECTION_OPPOSITE[data & DiodeTile::DIRECTION_MASK]; @@ -400,7 +400,7 @@ bool RedStoneDustTile::shouldReceivePowerFrom(LevelSource *level, int x, int y, } int t = level->getTile(x, y, z); - if (t == Tile::diode_on_Id) + if (t == Tile::powered_repeater_Id) { int data = level->getData(x, y, z); return direction == (data & DiodeTile::DIRECTION_MASK); @@ -410,7 +410,7 @@ bool RedStoneDustTile::shouldReceivePowerFrom(LevelSource *level, int x, int y, int RedStoneDustTile::cloneTileId(Level *level, int x, int y, int z) { - return Item::redStone_Id; + return Item::redstone_Id; } void RedStoneDustTile::registerIcons(IconRegister *iconRegister) diff --git a/Minecraft.World/RedStoneItem.cpp b/Minecraft.World/RedStoneItem.cpp index 6e12842a..8b34a245 100644 --- a/Minecraft.World/RedStoneItem.cpp +++ b/Minecraft.World/RedStoneItem.cpp @@ -13,7 +13,7 @@ RedStoneItem::RedStoneItem(int id) : Item(id) bool RedStoneItem::useOn(shared_ptr itemInstance, shared_ptr player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly) { // 4J-PB - Adding a test only version to allow tooltips to be displayed - if (level->getTile(x, y, z) != Tile::topSnow_Id) + if (level->getTile(x, y, z) != Tile::snow_layer_Id) { if (face == 0) y--; if (face == 1) y++; @@ -29,10 +29,10 @@ bool RedStoneItem::useOn(shared_ptr itemInstance, shared_ptrawardStat(GenericStats::blocksPlaced(Tile::redStoneDust_Id), GenericStats::param_blocksPlaced(Tile::redStoneDust_Id,itemInstance->getAuxValue(),1)); + player->awardStat(GenericStats::blocksPlaced(Tile::redstone_wire_Id), GenericStats::param_blocksPlaced(Tile::redstone_wire_Id,itemInstance->getAuxValue(),1)); itemInstance->count--; - level->setTileAndUpdate(x, y, z, Tile::redStoneDust_Id); + level->setTileAndUpdate(x, y, z, Tile::redstone_wire_Id); } } diff --git a/Minecraft.World/RedStoneOreTile.cpp b/Minecraft.World/RedStoneOreTile.cpp index 407da2cc..411bc474 100644 --- a/Minecraft.World/RedStoneOreTile.cpp +++ b/Minecraft.World/RedStoneOreTile.cpp @@ -32,7 +32,7 @@ void RedStoneOreTile::stepOn(Level *level, int x, int y, int z, shared_ptr player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param @@ -46,23 +46,23 @@ void RedStoneOreTile::interact(Level *level, int x, int y, int z) { poofParticles(level, x, y, z); if (level->isClientSide) return; // 4J added - if (id == Tile::redStoneOre_Id) + if (id == Tile::redstone_ore_Id) { - level->setTileAndUpdate(x, y, z, Tile::redStoneOre_lit_Id); + level->setTileAndUpdate(x, y, z, Tile::lit_redstone_ore_Id); } } void RedStoneOreTile::tick(Level *level, int x, int y, int z, Random* random) { - if (id == Tile::redStoneOre_lit_Id) + if (id == Tile::lit_redstone_ore_Id) { - level->setTileAndUpdate(x, y, z, Tile::redStoneOre_Id); + level->setTileAndUpdate(x, y, z, Tile::redstone_ore_Id); } } int RedStoneOreTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::redStone->id; + return Item::redstone->id; } int RedStoneOreTile::getResourceCountForLootBonus(int bonusLevel, Random *random) @@ -119,7 +119,7 @@ void RedStoneOreTile::poofParticles(Level *level, int x, int y, int z) bool RedStoneOreTile::shouldTileTick(Level *level, int x,int y,int z) { - return id == Tile::redStoneOre_lit_Id; + return id == Tile::lit_redstone_ore_Id; } shared_ptr RedStoneOreTile::getSilkTouchItemInstance(int data) diff --git a/Minecraft.World/RedlightTile.cpp b/Minecraft.World/RedlightTile.cpp index bf4cc01f..516353c9 100644 --- a/Minecraft.World/RedlightTile.cpp +++ b/Minecraft.World/RedlightTile.cpp @@ -36,7 +36,7 @@ void RedlightTile::onPlace(Level *level, int x, int y, int z) } else if (!isLit && level->hasNeighborSignal(x, y, z)) { - level->setTileAndData(x, y, z, Tile::redstoneLight_lit_Id, 0, UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::lit_redstone_lamp_Id, 0, UPDATE_CLIENTS); } } } @@ -51,7 +51,7 @@ void RedlightTile::neighborChanged(Level *level, int x, int y, int z, int type) } else if (!isLit && level->hasNeighborSignal(x, y, z)) { - level->setTileAndData(x, y, z, Tile::redstoneLight_lit_Id, 0, UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::lit_redstone_lamp_Id, 0, UPDATE_CLIENTS); } } } @@ -62,17 +62,17 @@ void RedlightTile::tick(Level *level, int x, int y, int z, Random *random) { if (isLit && !level->hasNeighborSignal(x, y, z)) { - level->setTileAndData(x, y, z, Tile::redstoneLight_Id, 0, UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::redstone_lamp_Id, 0, UPDATE_CLIENTS); } } } int RedlightTile::getResource(int data, Random *random, int playerBonusLevel) { - return Tile::redstoneLight_Id; + return Tile::redstone_lamp_Id; } int RedlightTile::cloneTileId(Level *level, int x, int y, int z) { - return Tile::redstoneLight_Id; + return Tile::redstone_lamp_Id; } \ No newline at end of file diff --git a/Minecraft.World/Region.cpp b/Minecraft.World/Region.cpp index 7b778d4d..40bac832 100644 --- a/Minecraft.World/Region.cpp +++ b/Minecraft.World/Region.cpp @@ -196,11 +196,11 @@ int Region::getRawBrightness(int x, int y, int z, bool propagate) int id = getTile(x, y, z); switch(id) { - case Tile::stoneSlabHalf_Id: - case Tile::woodSlabHalf_Id: + case Tile::stone_slab_Id: + case Tile::wooden_slab_Id: case Tile::farmland_Id: - case Tile::stairs_stone_Id: - case Tile::stairs_wood_Id: + case Tile::stone_stairs_Id: + case Tile::oak_stairs_Id: { int br = getRawBrightness(x, y + 1, z, false); int br1 = getRawBrightness(x + 1, y, z, false); diff --git a/Minecraft.World/RepairMenu.cpp b/Minecraft.World/RepairMenu.cpp index a4c48edf..695ea0b2 100644 --- a/Minecraft.World/RepairMenu.cpp +++ b/Minecraft.World/RepairMenu.cpp @@ -78,7 +78,7 @@ void RepairMenu::createResult() if (addition != NULL) { - usingBook = addition->id == Item::enchantedBook_Id && Item::enchantedBook->getEnchantments(addition)->size() > 0; + usingBook = addition->id == Item::enchanted_book_Id && Item::enchanted_book->getEnchantments(addition)->size() > 0; if (result->isDamageableItem() && Item::items[result->id]->isValidRepairItem(input, addition)) { diff --git a/Minecraft.World/RepeaterTile.cpp b/Minecraft.World/RepeaterTile.cpp index f15fc0d4..b5f4c743 100644 --- a/Minecraft.World/RepeaterTile.cpp +++ b/Minecraft.World/RepeaterTile.cpp @@ -57,12 +57,12 @@ int RepeaterTile::getTurnOnDelay(int data) DiodeTile *RepeaterTile::getOnTile() { - return Tile::diode_on; + return Tile::powered_repeater; } DiodeTile *RepeaterTile::getOffTile() { - return Tile::diode_off; + return Tile::unpowered_repeater; } int RepeaterTile::getResource(int data, Random *random, int playerBonusLevel) diff --git a/Minecraft.World/ResultSlot.cpp b/Minecraft.World/ResultSlot.cpp index bed4d2d8..27cd83ec 100644 --- a/Minecraft.World/ResultSlot.cpp +++ b/Minecraft.World/ResultSlot.cpp @@ -38,16 +38,16 @@ void ResultSlot::checkTakeAchievements(shared_ptr carried) carried->onCraftedBy(player->level, dynamic_pointer_cast( player->shared_from_this() ), removeCount); removeCount = 0; - if (carried->id == Tile::workBench_Id) player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); - else if (carried->id == Item::pickAxe_wood_Id) player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); + if (carried->id == Tile::crafting_table_Id) player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench()); + else if (carried->id == Item::wooden_pickaxe_Id) player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe()); else if (carried->id == Tile::furnace_Id) player->awardStat(GenericStats::buildFurnace(), GenericStats::param_buildFurnace()); else if (carried->getItem()->getBaseItemType() == Item::eBaseItemType_hoe) player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe()); else if (carried->id == Item::bread_Id) player->awardStat(GenericStats::makeBread(), GenericStats::param_makeBread()); else if (carried->id == Item::cake_Id) player->awardStat(GenericStats::bakeCake(), GenericStats::param_bakeCake()); - else if (carried->id == Item::pickAxe_stone_Id) player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); + else if (carried->id == Item::stone_pickaxe_Id) player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe()); // The description is technically wrong but that's accurate else if (carried->getItem()->getBaseItemType() == Item::eBaseItemType_sword) player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword()); - //else if (carried->id == Tile::enchantTable_Id) player->awardStat(GenericStats::enchantments(), GenericStats::param_achievement(eAward_)); + //else if (carried->id == Tile::enchanting_table_Id) player->awardStat(GenericStats::enchantments(), GenericStats::param_achievement(eAward_)); else if (carried->id == Tile::bookshelf_Id) player->awardStat(GenericStats::bookcase(), GenericStats::param_bookcase()); // 4J : WESTY : Added new acheivements. diff --git a/Minecraft.World/RoofTreeFeature.cpp b/Minecraft.World/RoofTreeFeature.cpp index 8b548442..4025cf1a 100644 --- a/Minecraft.World/RoofTreeFeature.cpp +++ b/Minecraft.World/RoofTreeFeature.cpp @@ -41,7 +41,7 @@ bool RoofTreeFeature::checkSpace(Level *worldIn, int x, int y, int z, int height return false; } - if (tile == Tile::water_Id) { + if (tile == Tile::flowing_water_Id) { return false; } } @@ -55,7 +55,7 @@ bool RoofTreeFeature::checkSpace(Level *worldIn, int x, int y, int z, int height void RoofTreeFeature::placeLog(Level *worldIn, int x, int y, int z) { int tile = worldIn->getTile(x, y, z); if (tile == 0 || tile == Tile::leaves_Id || tile == Tile::leaves2_Id || tile == Tile::tallgrass_Id) { - placeBlock(worldIn, x, y, z, Tile::tree2Trunk_Id, TreeTile2::DARK_TRUNK); + placeBlock(worldIn, x, y, z, Tile::log2_Id, TreeTile2::DARK_TRUNK); } } diff --git a/Minecraft.World/SavannaTreeFeature.cpp b/Minecraft.World/SavannaTreeFeature.cpp index 48457f21..b00c1c4f 100644 --- a/Minecraft.World/SavannaTreeFeature.cpp +++ b/Minecraft.World/SavannaTreeFeature.cpp @@ -11,7 +11,7 @@ SavannaTreeFeature::SavannaTreeFeature(bool doUpdate) : AbstractTreeFeature(doUp void SavannaTreeFeature::placeLog(Level* level, int x, int y, int z) { - placeBlock(level, x, y, z, Tile::tree2Trunk_Id, 0); + placeBlock(level, x, y, z, Tile::log2_Id, 0); } void SavannaTreeFeature::placeLeafAt(Level* level, int x, int y, int z) diff --git a/Minecraft.World/ScatteredFeaturePieces.cpp b/Minecraft.World/ScatteredFeaturePieces.cpp index 18082e46..6b955eae 100644 --- a/Minecraft.World/ScatteredFeaturePieces.cpp +++ b/Minecraft.World/ScatteredFeaturePieces.cpp @@ -105,16 +105,16 @@ bool ScatteredFeaturePieces::ScatteredFeaturePiece::updateAverageGroundHeight(Le WeighedTreasure *ScatteredFeaturePieces::DesertPyramidPiece::treasureItems[ScatteredFeaturePieces::DesertPyramidPiece::TREASURE_ITEMS_COUNT] = { new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 2, 7, 15), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10), + new WeighedTreasure(Item::gold_ingot_Id, 0, 2, 7, 15), new WeighedTreasure(Item::emerald_Id, 0, 1, 3, 2), new WeighedTreasure(Item::bone_Id, 0, 4, 6, 20), new WeighedTreasure(Item::rotten_flesh_Id, 0, 3, 7, 16), // very rare for pyramids ... new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 1), // ... }; @@ -156,73 +156,73 @@ void ScatteredFeaturePieces::DesertPyramidPiece::readAdditonalSaveData(CompoundT bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess(Level *level, Random *random, BoundingBox *chunkBB) { // pyramid - generateBox(level, chunkBB, 0, -4, 0, width - 1, 0, depth - 1, Tile::sandStone_Id, Tile::sandStone_Id, false); + generateBox(level, chunkBB, 0, -4, 0, width - 1, 0, depth - 1, Tile::sandstone_Id, Tile::sandstone_Id, false); for (int pos = 1; pos <= 9; pos++) { - generateBox(level, chunkBB, pos, pos, pos, width - 1 - pos, pos, depth - 1 - pos, Tile::sandStone_Id, Tile::sandStone_Id, false); + generateBox(level, chunkBB, pos, pos, pos, width - 1 - pos, pos, depth - 1 - pos, Tile::sandstone_Id, Tile::sandstone_Id, false); generateBox(level, chunkBB, pos + 1, pos, pos + 1, width - 2 - pos, pos, depth - 2 - pos, 0, 0, false); } for (int x = 0; x < width; x++) { for (int z = 0; z < depth; z++) { - fillColumnDown(level, Tile::sandStone_Id, 0, x, -5, z, chunkBB); + fillColumnDown(level, Tile::sandstone_Id, 0, x, -5, z, chunkBB); } } - int stairsNorth = getOrientationData(Tile::stairs_sandstone_Id, 3); - int stairsSouth = getOrientationData(Tile::stairs_sandstone_Id, 2); - int stairsEast = getOrientationData(Tile::stairs_sandstone_Id, 0); - int stairsWest = getOrientationData(Tile::stairs_sandstone_Id, 1); + int stairsNorth = getOrientationData(Tile::sandstone_stairs_Id, 3); + int stairsSouth = getOrientationData(Tile::sandstone_stairs_Id, 2); + int stairsEast = getOrientationData(Tile::sandstone_stairs_Id, 0); + int stairsWest = getOrientationData(Tile::sandstone_stairs_Id, 1); int baseDecoColor = ~DyePowderItem::ORANGE & 0xf; int blue = ~DyePowderItem::BLUE & 0xf; // towers - generateBox(level, chunkBB, 0, 0, 0, 4, 9, 4, Tile::sandStone_Id, 0, false); - generateBox(level, chunkBB, 1, 10, 1, 3, 10, 3, Tile::sandStone_Id, Tile::sandStone_Id, false); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 10, 0, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsSouth, 2, 10, 4, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsEast, 0, 10, 2, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsWest, 4, 10, 2, chunkBB); - generateBox(level, chunkBB, width - 5, 0, 0, width - 1, 9, 4, Tile::sandStone_Id, 0, false); - generateBox(level, chunkBB, width - 4, 10, 1, width - 2, 10, 3, Tile::sandStone_Id, Tile::sandStone_Id, false); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, width - 3, 10, 0, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsSouth, width - 3, 10, 4, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsEast, width - 5, 10, 2, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsWest, width - 1, 10, 2, chunkBB); + generateBox(level, chunkBB, 0, 0, 0, 4, 9, 4, Tile::sandstone_Id, 0, false); + generateBox(level, chunkBB, 1, 10, 1, 3, 10, 3, Tile::sandstone_Id, Tile::sandstone_Id, false); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, 2, 10, 0, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsSouth, 2, 10, 4, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsEast, 0, 10, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsWest, 4, 10, 2, chunkBB); + generateBox(level, chunkBB, width - 5, 0, 0, width - 1, 9, 4, Tile::sandstone_Id, 0, false); + generateBox(level, chunkBB, width - 4, 10, 1, width - 2, 10, 3, Tile::sandstone_Id, Tile::sandstone_Id, false); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, width - 3, 10, 0, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsSouth, width - 3, 10, 4, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsEast, width - 5, 10, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsWest, width - 1, 10, 2, chunkBB); // entrance - generateBox(level, chunkBB, 8, 0, 0, 12, 4, 4, Tile::sandStone_Id, 0, false); + generateBox(level, chunkBB, 8, 0, 0, 12, 4, 4, Tile::sandstone_Id, 0, false); generateBox(level, chunkBB, 9, 1, 0, 11, 3, 4, 0, 0, false); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 1, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 2, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 3, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, 3, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 3, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 2, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 1, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 1, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 2, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 9, 3, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, 3, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 3, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 2, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 11, 1, 1, chunkBB); // tower pathways - generateBox(level, chunkBB, 4, 1, 1, 8, 3, 3, Tile::sandStone_Id, 0, false); + generateBox(level, chunkBB, 4, 1, 1, 8, 3, 3, Tile::sandstone_Id, 0, false); generateBox(level, chunkBB, 4, 1, 2, 8, 2, 2, 0, 0, false); - generateBox(level, chunkBB, 12, 1, 1, 16, 3, 3, Tile::sandStone_Id, 0, false); + generateBox(level, chunkBB, 12, 1, 1, 16, 3, 3, Tile::sandstone_Id, 0, false); generateBox(level, chunkBB, 12, 1, 2, 16, 2, 2, 0, 0, false); // hall floor and pillars - generateBox(level, chunkBB, 5, 4, 5, width - 6, 4, depth - 6, Tile::sandStone_Id, Tile::sandStone_Id, false); + generateBox(level, chunkBB, 5, 4, 5, width - 6, 4, depth - 6, Tile::sandstone_Id, Tile::sandstone_Id, false); generateBox(level, chunkBB, 9, 4, 9, 11, 4, 11, 0, 0, false); - generateBox(level, chunkBB, 8, 1, 8, 8, 3, 8, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 12, 1, 8, 12, 3, 8, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, 1, 12, 8, 3, 12, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 12, 1, 12, 12, 3, 12, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 8, 1, 8, 8, 3, 8, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 12, 1, 8, 12, 3, 8, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 8, 1, 12, 8, 3, 12, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 12, 1, 12, 12, 3, 12, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); // catwalks - generateBox(level, chunkBB, 1, 1, 5, 4, 4, 11, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 5, 1, 5, width - 2, 4, 11, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 6, 7, 9, 6, 7, 11, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 7, 7, 9, width - 7, 7, 11, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, 5, 5, 9, 5, 7, 11, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, width - 6, 5, 9, width - 6, 7, 11, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 1, 1, 5, 4, 4, 11, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, width - 5, 1, 5, width - 2, 4, 11, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, 6, 7, 9, 6, 7, 11, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, width - 7, 7, 9, width - 7, 7, 11, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, 5, 5, 9, 5, 7, 11, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, width - 6, 5, 9, width - 6, 7, 11, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); placeBlock(level, 0, 0, 5, 5, 10, chunkBB); placeBlock(level, 0, 0, 5, 6, 10, chunkBB); placeBlock(level, 0, 0, 6, 6, 10, chunkBB); @@ -233,125 +233,125 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess(Level *level, Rando // tower stairs generateBox(level, chunkBB, 2, 4, 4, 2, 6, 4, 0, 0, false); generateBox(level, chunkBB, width - 3, 4, 4, width - 3, 6, 4, 0, 0, false); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 4, 5, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, 2, 3, 4, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, width - 3, 4, 5, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsNorth, width - 3, 3, 4, chunkBB); - generateBox(level, chunkBB, 1, 1, 3, 2, 2, 3, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 3, 1, 3, width - 2, 2, 3, Tile::sandStone_Id, Tile::sandStone_Id, false); - placeBlock(level, Tile::stairs_sandstone_Id, 0, 1, 1, 2, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, 0, width - 2, 1, 2, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, 1, 2, 2, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SAND_SLAB, width - 2, 2, 2, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsWest, 2, 1, 2, chunkBB); - placeBlock(level, Tile::stairs_sandstone_Id, stairsEast, width - 3, 1, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, 2, 4, 5, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, 2, 3, 4, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, width - 3, 4, 5, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsNorth, width - 3, 3, 4, chunkBB); + generateBox(level, chunkBB, 1, 1, 3, 2, 2, 3, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, width - 3, 1, 3, width - 2, 2, 3, Tile::sandstone_Id, Tile::sandstone_Id, false); + placeBlock(level, Tile::sandstone_stairs_Id, 0, 1, 1, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, 0, width - 2, 1, 2, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, 1, 2, 2, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SAND_SLAB, width - 2, 2, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsWest, 2, 1, 2, chunkBB); + placeBlock(level, Tile::sandstone_stairs_Id, stairsEast, width - 3, 1, 2, chunkBB); // indoor decoration - generateBox(level, chunkBB, 4, 3, 5, 4, 3, 18, Tile::sandStone_Id, Tile::sandStone_Id, false); - generateBox(level, chunkBB, width - 5, 3, 5, width - 5, 3, 17, Tile::sandStone_Id, Tile::sandStone_Id, false); + generateBox(level, chunkBB, 4, 3, 5, 4, 3, 18, Tile::sandstone_Id, Tile::sandstone_Id, false); + generateBox(level, chunkBB, width - 5, 3, 5, width - 5, 3, 17, Tile::sandstone_Id, Tile::sandstone_Id, false); generateBox(level, chunkBB, 3, 1, 5, 4, 2, 16, 0, 0, false); generateBox(level, chunkBB, width - 6, 1, 5, width - 5, 2, 16, 0, 0, false); for (int z = 5; z <= 17; z += 2) { - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 4, 1, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 4, 2, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, width - 5, 1, z, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, width - 5, 2, z, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 4, 1, z, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 4, 2, z, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, width - 5, 1, z, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, width - 5, 2, z, chunkBB); } - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 10, 0, 7, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 10, 0, 8, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 9, 0, 9, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 11, 0, 9, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 8, 0, 10, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 12, 0, 10, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 7, 0, 10, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 13, 0, 10, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 9, 0, 11, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 11, 0, 11, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 10, 0, 12, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 10, 0, 13, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, blue, 10, 0, 10, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 10, 0, 7, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 10, 0, 8, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 9, 0, 9, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 11, 0, 9, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 8, 0, 10, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 12, 0, 10, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 7, 0, 10, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 13, 0, 10, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 9, 0, 11, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 11, 0, 11, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 10, 0, 12, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 10, 0, 13, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, blue, 10, 0, 10, chunkBB); // outdoor decoration for (int x = 0; x <= width - 1; x += width - 1) { - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 2, 1, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 2, 2, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 2, 3, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 3, 1, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 3, 2, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 3, 3, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 4, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 4, 2, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 4, 3, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 5, 1, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 5, 2, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 5, 3, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 6, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 6, 2, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 6, 3, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 7, 1, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 7, 2, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 7, 3, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 1, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 2, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 3, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 2, 1, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 2, 2, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 2, 3, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 3, 1, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 3, 2, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 3, 3, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 4, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 4, 2, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 4, 3, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 5, 1, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 5, 2, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 5, 3, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 6, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 6, 2, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 6, 3, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 7, 1, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 7, 2, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 7, 3, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 1, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 2, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 3, chunkBB); } for (int x = 2; x <= width - 3; x += width - 3 - 2) { - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 2, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 2, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 2, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 3, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 3, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 3, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x - 1, 4, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 4, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x + 1, 4, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 5, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 5, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 5, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x - 1, 6, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 6, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x + 1, 6, 00, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x - 1, 7, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x, 7, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, x + 1, 7, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 8, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 8, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 2, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 2, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 2, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 3, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 3, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 3, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x - 1, 4, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 4, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x + 1, 4, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 5, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 5, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 5, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x - 1, 6, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, x, 6, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x + 1, 6, 00, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x - 1, 7, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x, 7, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, x + 1, 7, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x - 1, 8, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x, 8, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, x + 1, 8, 0, chunkBB); } - generateBox(level, chunkBB, 8, 4, 0, 12, 6, 0, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 8, 4, 0, 12, 6, 0, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); placeBlock(level, 0, 0, 8, 6, 0, chunkBB); placeBlock(level, 0, 0, 12, 6, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 9, 5, 0, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, 5, 0, chunkBB); - placeBlock(level, Tile::clayHardened_colored_Id, baseDecoColor, 11, 5, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 9, 5, 0, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, 5, 0, chunkBB); + placeBlock(level, Tile::stained_hardened_clay_Id, baseDecoColor, 11, 5, 0, chunkBB); // tombs - generateBox(level, chunkBB, 8, -14, 8, 12, -11, 12, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, -10, 8, 12, -10, 12, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, false); - generateBox(level, chunkBB, 8, -9, 8, 12, -9, 12, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); - generateBox(level, chunkBB, 8, -8, 8, 12, -1, 12, Tile::sandStone_Id, Tile::sandStone_Id, false); + generateBox(level, chunkBB, 8, -14, 8, 12, -11, 12, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 8, -10, 8, 12, -10, 12, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, false); + generateBox(level, chunkBB, 8, -9, 8, 12, -9, 12, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, false); + generateBox(level, chunkBB, 8, -8, 8, 12, -1, 12, Tile::sandstone_Id, Tile::sandstone_Id, false); generateBox(level, chunkBB, 9, -11, 9, 11, -1, 11, 0, 0, false); - placeBlock(level, Tile::pressurePlate_stone_Id, 0, 10, -11, 10, chunkBB); + placeBlock(level, Tile::stone_pressure_plate_Id, 0, 10, -11, 10, chunkBB); generateBox(level, chunkBB, 9, -13, 9, 11, -13, 11, Tile::tnt_Id, 0, false); placeBlock(level, 0, 0, 8, -11, 10, chunkBB); placeBlock(level, 0, 0, 8, -10, 10, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 7, -10, 10, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 7, -11, 10, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 7, -10, 10, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 7, -11, 10, chunkBB); placeBlock(level, 0, 0, 12, -11, 10, chunkBB); placeBlock(level, 0, 0, 12, -10, 10, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 13, -10, 10, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 13, -11, 10, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 13, -10, 10, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 13, -11, 10, chunkBB); placeBlock(level, 0, 0, 10, -11, 8, chunkBB); placeBlock(level, 0, 0, 10, -10, 8, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, -10, 7, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, -11, 7, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, -10, 7, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, -11, 7, chunkBB); placeBlock(level, 0, 0, 10, -11, 12, chunkBB); placeBlock(level, 0, 0, 10, -10, 12, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, -10, 13, chunkBB); - placeBlock(level, Tile::sandStone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, -11, 13, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_HEIROGLYPHS, 10, -10, 13, chunkBB); + placeBlock(level, Tile::sandstone_Id, SandStoneTile::TYPE_SMOOTHSIDE, 10, -11, 13, chunkBB); // chests! for (int i = 0; i < 4; i++) @@ -360,7 +360,7 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess(Level *level, Rando { int xo = Direction::STEP_X[i] * 2; int zo = Direction::STEP_Z[i] * 2; - hasPlacedChest[i] = createChest(level, chunkBB, random, 10 + xo, -11, 10 + zo, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random)), 2 + random->nextInt(5)); + hasPlacedChest[i] = createChest(level, chunkBB, random, 10 + xo, -11, 10 + zo, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random)), 2 + random->nextInt(5)); } } @@ -370,16 +370,16 @@ bool ScatteredFeaturePieces::DesertPyramidPiece::postProcess(Level *level, Rando WeighedTreasure *ScatteredFeaturePieces::JunglePyramidPiece::treasureItems[ScatteredFeaturePieces::JunglePyramidPiece::TREASURE_ITEMS_COUNT] = { new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 2, 7, 15), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10), + new WeighedTreasure(Item::gold_ingot_Id, 0, 2, 7, 15), new WeighedTreasure(Item::emerald_Id, 0, 1, 3, 2), new WeighedTreasure(Item::bone_Id, 0, 4, 6, 20), new WeighedTreasure(Item::rotten_flesh_Id, 0, 3, 7, 16), // very rare for pyramids ... new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 1), // ... }; @@ -428,10 +428,10 @@ bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess(Level *level, Rando return false; } - int stairsNorth = getOrientationData(Tile::stairs_stone_Id, 3); - int stairsSouth = getOrientationData(Tile::stairs_stone_Id, 2); - int stairsEast = getOrientationData(Tile::stairs_stone_Id, 0); - int stairsWest = getOrientationData(Tile::stairs_stone_Id, 1); + int stairsNorth = getOrientationData(Tile::stone_stairs_Id, 3); + int stairsSouth = getOrientationData(Tile::stone_stairs_Id, 2); + int stairsEast = getOrientationData(Tile::stone_stairs_Id, 0); + int stairsWest = getOrientationData(Tile::stone_stairs_Id, 1); // floor generateBox(level, chunkBB, 0, -4, 0, width - 1, 0, depth - 1, false, random, &stoneSelector); @@ -498,38 +498,38 @@ bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess(Level *level, Rando generateBox(level, chunkBB, 4, 9, 10, 4, 9, 10, false, random, &stoneSelector); generateBox(level, chunkBB, 7, 9, 10, 7, 9, 10, false, random, &stoneSelector); generateBox(level, chunkBB, 5, 9, 7, 6, 9, 7, false, random, &stoneSelector); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 5, 9, 6, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 6, 9, 6, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsSouth, 5, 9, 8, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsSouth, 6, 9, 8, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 5, 9, 6, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 6, 9, 6, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsSouth, 5, 9, 8, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsSouth, 6, 9, 8, chunkBB); // front stairs - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 5, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 6, 0, 0, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 0, 0, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 4, 0, 0, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 5, 0, 0, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 6, 0, 0, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 7, 0, 0, chunkBB); // indoor stairs up - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 1, 8, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 2, 9, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 4, 3, 10, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 1, 8, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 2, 9, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsNorth, 7, 3, 10, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 4, 1, 8, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 4, 2, 9, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 4, 3, 10, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 7, 1, 8, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 7, 2, 9, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsNorth, 7, 3, 10, chunkBB); generateBox(level, chunkBB, 4, 1, 9, 4, 1, 9, false, random, &stoneSelector); generateBox(level, chunkBB, 7, 1, 9, 7, 1, 9, false, random, &stoneSelector); generateBox(level, chunkBB, 4, 1, 10, 7, 2, 10, false, random, &stoneSelector); // indoor hand rail generateBox(level, chunkBB, 5, 4, 5, 6, 4, 5, false, random, &stoneSelector); - placeBlock(level, Tile::stairs_stone_Id, stairsEast, 4, 4, 5, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsWest, 7, 4, 5, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsEast, 4, 4, 5, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsWest, 7, 4, 5, chunkBB); // indoor stairs down for (int i = 0; i < 4; i++) { - placeBlock(level, Tile::stairs_stone_Id, stairsSouth, 5, 0 - i, 6 + i, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, stairsSouth, 6, 0 - i, 6 + i, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsSouth, 5, 0 - i, 6 + i, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, stairsSouth, 6, 0 - i, 6 + i, chunkBB); generateAirBox(level, chunkBB, 5, 0 - i, 7 + i, 6, 0 - i, 9 + i); } @@ -551,19 +551,19 @@ bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess(Level *level, Rando generateBox(level, chunkBB, 6, -1, 1, 6, -1, 1, false, random, &stoneSelector); // trip wire trap 1 - placeBlock(level, Tile::tripWireSource_Id, getOrientationData(Tile::tripWireSource_Id, Direction::EAST) | TripWireSourceTile::MASK_ATTACHED, 1, -3, 8, chunkBB); - placeBlock(level, Tile::tripWireSource_Id, getOrientationData(Tile::tripWireSource_Id, Direction::WEST) | TripWireSourceTile::MASK_ATTACHED, 4, -3, 8, chunkBB); - placeBlock(level, Tile::tripWire_Id, TripWireTile::MASK_ATTACHED, 2, -3, 8, chunkBB); - placeBlock(level, Tile::tripWire_Id, TripWireTile::MASK_ATTACHED, 3, -3, 8, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 7, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 6, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 5, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 4, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 3, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 2, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 5, -3, 1, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 4, -3, 1, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 3, -3, 1, chunkBB); + placeBlock(level, Tile::tripwire_hook_Id, getOrientationData(Tile::tripwire_hook_Id, Direction::EAST) | TripWireSourceTile::MASK_ATTACHED, 1, -3, 8, chunkBB); + placeBlock(level, Tile::tripwire_hook_Id, getOrientationData(Tile::tripwire_hook_Id, Direction::WEST) | TripWireSourceTile::MASK_ATTACHED, 4, -3, 8, chunkBB); + placeBlock(level, Tile::tripwire_Id, TripWireTile::MASK_ATTACHED, 2, -3, 8, chunkBB); + placeBlock(level, Tile::tripwire_Id, TripWireTile::MASK_ATTACHED, 3, -3, 8, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 7, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 6, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 5, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 4, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 3, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 2, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 5, -3, 1, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 4, -3, 1, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 3, -3, 1, chunkBB); if (!placedTrap1) { placedTrap1 = createDispenser(level, chunkBB, random, 3, -2, 1, Facing::NORTH, WeighedTreasureArray(dispenserItems,DISPENSER_ITEMS_COUNT), 2); @@ -571,16 +571,16 @@ bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess(Level *level, Rando placeBlock(level, Tile::vine_Id, 0xf, 3, -2, 2, chunkBB); // trip wire trap 2 - placeBlock(level, Tile::tripWireSource_Id, getOrientationData(Tile::tripWireSource_Id, Direction::NORTH) | TripWireSourceTile::MASK_ATTACHED, 7, -3, 1, chunkBB); - placeBlock(level, Tile::tripWireSource_Id, getOrientationData(Tile::tripWireSource_Id, Direction::SOUTH) | TripWireSourceTile::MASK_ATTACHED, 7, -3, 5, chunkBB); - placeBlock(level, Tile::tripWire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 2, chunkBB); - placeBlock(level, Tile::tripWire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 3, chunkBB); - placeBlock(level, Tile::tripWire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 4, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 8, -3, 6, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 9, -3, 6, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 9, -3, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 9, -3, 4, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 9, -2, 4, chunkBB); + placeBlock(level, Tile::tripwire_hook_Id, getOrientationData(Tile::tripwire_hook_Id, Direction::NORTH) | TripWireSourceTile::MASK_ATTACHED, 7, -3, 1, chunkBB); + placeBlock(level, Tile::tripwire_hook_Id, getOrientationData(Tile::tripwire_hook_Id, Direction::SOUTH) | TripWireSourceTile::MASK_ATTACHED, 7, -3, 5, chunkBB); + placeBlock(level, Tile::tripwire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 2, chunkBB); + placeBlock(level, Tile::tripwire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 3, chunkBB); + placeBlock(level, Tile::tripwire_Id, TripWireTile::MASK_ATTACHED, 7, -3, 4, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 8, -3, 6, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 9, -3, 6, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 9, -3, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 9, -3, 4, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 9, -2, 4, chunkBB); if (!placedTrap2) { placedTrap2 = createDispenser(level, chunkBB, random, 9, -2, 3, Facing::WEST, WeighedTreasureArray(dispenserItems,DISPENSER_ITEMS_COUNT), 2); @@ -589,40 +589,40 @@ bool ScatteredFeaturePieces::JunglePyramidPiece::postProcess(Level *level, Rando placeBlock(level, Tile::vine_Id, 0xf, 8, -2, 3, chunkBB); if (!placedMainChest) { - placedMainChest = createChest(level, chunkBB, random, 8, -3, 3, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random)), 2 + random->nextInt(5)); + placedMainChest = createChest(level, chunkBB, random, 8, -3, 3, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random)), 2 + random->nextInt(5)); } - placeBlock(level, Tile::mossyCobblestone_Id, 0, 9, -3, 2, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 8, -3, 1, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 4, -3, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 5, -2, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 5, -1, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 6, -3, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 7, -2, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 7, -1, 5, chunkBB); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 8, -3, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 9, -3, 2, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 8, -3, 1, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 4, -3, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 5, -2, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 5, -1, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 6, -3, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 7, -2, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 7, -1, 5, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 8, -3, 5, chunkBB); generateBox(level, chunkBB, 9, -1, 1, 9, -1, 5, false, random, &stoneSelector); // hidden room generateAirBox(level, chunkBB, 8, -3, 8, 10, -1, 10); - placeBlock(level, Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 8, -2, 11, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 9, -2, 11, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 10, -2, 11, chunkBB); + placeBlock(level, Tile::stonebrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 8, -2, 11, chunkBB); + placeBlock(level, Tile::stonebrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 9, -2, 11, chunkBB); + placeBlock(level, Tile::stonebrick_Id, SmoothStoneBrickTile::TYPE_DETAIL, 10, -2, 11, chunkBB); placeBlock(level, Tile::lever_Id, LeverTile::getLeverFacing(getOrientationData(Tile::lever_Id, Facing::NORTH)), 8, -2, 12, chunkBB); placeBlock(level, Tile::lever_Id, LeverTile::getLeverFacing(getOrientationData(Tile::lever_Id, Facing::NORTH)), 9, -2, 12, chunkBB); placeBlock(level, Tile::lever_Id, LeverTile::getLeverFacing(getOrientationData(Tile::lever_Id, Facing::NORTH)), 10, -2, 12, chunkBB); generateBox(level, chunkBB, 8, -3, 8, 8, -3, 10, false, random, &stoneSelector); generateBox(level, chunkBB, 10, -3, 8, 10, -3, 10, false, random, &stoneSelector); - placeBlock(level, Tile::mossyCobblestone_Id, 0, 10, -2, 9, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 8, -2, 9, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 8, -2, 10, chunkBB); - placeBlock(level, Tile::redStoneDust_Id, 0, 10, -1, 9, chunkBB); - placeBlock(level, Tile::pistonStickyBase_Id, Facing::UP, 9, -2, 8, chunkBB); - placeBlock(level, Tile::pistonStickyBase_Id, getOrientationData(Tile::pistonStickyBase_Id, Facing::WEST), 10, -2, 8, chunkBB); - placeBlock(level, Tile::pistonStickyBase_Id, getOrientationData(Tile::pistonStickyBase_Id, Facing::WEST), 10, -1, 8, chunkBB); - placeBlock(level, Tile::diode_off_Id, getOrientationData(Tile::diode_off_Id, Direction::NORTH), 10, -2, 10, chunkBB); + placeBlock(level, Tile::mossy_cobblestone_Id, 0, 10, -2, 9, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 8, -2, 9, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 8, -2, 10, chunkBB); + placeBlock(level, Tile::redstone_wire_Id, 0, 10, -1, 9, chunkBB); + placeBlock(level, Tile::sticky_piston_Id, Facing::UP, 9, -2, 8, chunkBB); + placeBlock(level, Tile::sticky_piston_Id, getOrientationData(Tile::sticky_piston_Id, Facing::WEST), 10, -2, 8, chunkBB); + placeBlock(level, Tile::sticky_piston_Id, getOrientationData(Tile::sticky_piston_Id, Facing::WEST), 10, -1, 8, chunkBB); + placeBlock(level, Tile::unpowered_repeater_Id, getOrientationData(Tile::unpowered_repeater_Id, Direction::NORTH), 10, -2, 10, chunkBB); if (!placedHiddenChest) { - placedHiddenChest = createChest(level, chunkBB, random, 9, -3, 10, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random)), 2 + random->nextInt(5)); + placedHiddenChest = createChest(level, chunkBB, random, 9, -3, 10, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random)), 2 + random->nextInt(5)); } return true; @@ -636,7 +636,7 @@ void ScatteredFeaturePieces::JunglePyramidPiece::MossStoneSelector::next(Random } else { - nextId = Tile::mossyCobblestone_Id; + nextId = Tile::mossy_cobblestone_Id; } } @@ -673,21 +673,21 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran } // floor and ceiling - generateBox(level, chunkBB, 1, 1, 1, 5, 1, 7, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); - generateBox(level, chunkBB, 1, 4, 2, 5, 4, 7, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); - generateBox(level, chunkBB, 2, 1, 0, 4, 1, 0, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 1, 1, 1, 5, 1, 7, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 1, 4, 2, 5, 4, 7, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 2, 1, 0, 4, 1, 0, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); // walls - generateBox(level, chunkBB, 2, 2, 2, 3, 3, 2, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); - generateBox(level, chunkBB, 1, 2, 3, 1, 3, 6, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); - generateBox(level, chunkBB, 5, 2, 3, 5, 3, 6, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); - generateBox(level, chunkBB, 2, 2, 7, 4, 3, 7, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, Tile::wood_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 2, 2, 2, 3, 3, 2, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 1, 2, 3, 1, 3, 6, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 5, 2, 3, 5, 3, 6, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); + generateBox(level, chunkBB, 2, 2, 7, 4, 3, 7, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, Tile::planks_Id, TreeTile::SPRUCE_TRUNK, false); // pillars - generateBox(level, chunkBB, 1, 0, 2, 1, 3, 2, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 5, 0, 2, 5, 3, 2, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 7, 1, 3, 7, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 5, 0, 7, 5, 3, 7, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 1, 0, 2, 1, 3, 2, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 5, 0, 2, 5, 3, 2, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 0, 7, 1, 3, 7, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 5, 0, 7, 5, 3, 7, Tile::log_Id, Tile::log_Id, false); // windows placeBlock(level, Tile::fence_Id, 0, 2, 3, 2, chunkBB); @@ -695,10 +695,10 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran placeBlock(level, 0, 0, 1, 3, 4, chunkBB); placeBlock(level, 0, 0, 5, 3, 4, chunkBB); placeBlock(level, 0, 0, 5, 3, 5, chunkBB); - placeBlock(level, Tile::flowerPot_Id, FlowerPotTile::TYPE_MUSHROOM_RED, 1, 3, 5, chunkBB); + placeBlock(level, Tile::flower_pot_Id, FlowerPotTile::TYPE_MUSHROOM_RED, 1, 3, 5, chunkBB); // decoration - placeBlock(level, Tile::workBench_Id, 0, 3, 2, 6, chunkBB); + placeBlock(level, Tile::crafting_table_Id, 0, 3, 2, 6, chunkBB); placeBlock(level, Tile::cauldron_Id, 0, 4, 2, 6, chunkBB); // front railings @@ -708,22 +708,22 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran // placeBlock(level, Tile.torch.id, 0, 5, 3, 1, chunkBB); // ceiling edges - int south = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_NORTH); - int east = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_WEST); - int west = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_EAST); - int north = getOrientationData(Tile::stairs_wood_Id, StairTile::DIR_SOUTH); + int south = getOrientationData(Tile::oak_stairs_Id, StairTile::DIR_NORTH); + int east = getOrientationData(Tile::oak_stairs_Id, StairTile::DIR_WEST); + int west = getOrientationData(Tile::oak_stairs_Id, StairTile::DIR_EAST); + int north = getOrientationData(Tile::oak_stairs_Id, StairTile::DIR_SOUTH); - generateBox(level, chunkBB, 0, 4, 1, 6, 4, 1, Tile::stairs_sprucewood_Id, south, Tile::stairs_sprucewood_Id, south, false); - generateBox(level, chunkBB, 0, 4, 2, 0, 4, 7, Tile::stairs_sprucewood_Id, west, Tile::stairs_sprucewood_Id, west, false); - generateBox(level, chunkBB, 6, 4, 2, 6, 4, 7, Tile::stairs_sprucewood_Id, east, Tile::stairs_sprucewood_Id, east, false); - generateBox(level, chunkBB, 0, 4, 8, 6, 4, 8, Tile::stairs_sprucewood_Id, north, Tile::stairs_sprucewood_Id, north, false); + generateBox(level, chunkBB, 0, 4, 1, 6, 4, 1, Tile::spruce_stairs_Id, south, Tile::spruce_stairs_Id, south, false); + generateBox(level, chunkBB, 0, 4, 2, 0, 4, 7, Tile::spruce_stairs_Id, west, Tile::spruce_stairs_Id, west, false); + generateBox(level, chunkBB, 6, 4, 2, 6, 4, 7, Tile::spruce_stairs_Id, east, Tile::spruce_stairs_Id, east, false); + generateBox(level, chunkBB, 0, 4, 8, 6, 4, 8, Tile::spruce_stairs_Id, north, Tile::spruce_stairs_Id, north, false); // fill pillars down to solid ground for (int z = 2; z <= 7; z += 5) { for (int x = 1; x <= 5; x += 4) { - fillColumnDown(level, Tile::treeTrunk_Id, 0, x, -1, z, chunkBB); + fillColumnDown(level, Tile::log_Id, 0, x, -1, z, chunkBB); } } diff --git a/Minecraft.World/ShearsItem.cpp b/Minecraft.World/ShearsItem.cpp index dd0c2ac7..4d047b1e 100644 --- a/Minecraft.World/ShearsItem.cpp +++ b/Minecraft.World/ShearsItem.cpp @@ -11,7 +11,7 @@ ShearsItem::ShearsItem(int itemId) : Item(itemId) bool ShearsItem::mineBlock(shared_ptr itemInstance, Level *level, int tile, int x, int y, int z, shared_ptr owner) { - if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripWire_Id) + if (tile == Tile::leaves_Id || tile == Tile::web_Id || tile == Tile::tallgrass_Id || tile == Tile::vine_Id || tile == Tile::tripwire_Id) { itemInstance->hurtAndBreak(1, owner); return true; @@ -21,7 +21,7 @@ bool ShearsItem::mineBlock(shared_ptr itemInstance, Level *level, bool ShearsItem::canDestroySpecial(Tile *tile) { - return tile->id == Tile::web_Id || tile->id == Tile::redStoneDust_Id || tile->id == Tile::tripWire_Id; + return tile->id == Tile::web_Id || tile->id == Tile::redstone_wire_Id || tile->id == Tile::tripwire_Id; } float ShearsItem::getDestroySpeed(shared_ptr itemInstance, Tile *tile) diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp index d49c5a5c..3a9ae6a5 100644 --- a/Minecraft.World/Sheep.cpp +++ b/Minecraft.World/Sheep.cpp @@ -66,8 +66,8 @@ Sheep::Sheep(Level *level) : Animal( level ) goalSelector.addGoal(8, new RandomLookAroundGoal(this)); container = std::make_shared(new SheepContainer(), 2, 1); - container->setItem(0, std::make_shared(Item::dye_powder, 1, 0)); - container->setItem(1, std::make_shared(Item::dye_powder, 1, 0)); + container->setItem(0, std::make_shared(Item::dye, 1, 0)); + container->setItem(1, std::make_shared(Item::dye, 1, 0)); } bool Sheep::useNewAi() @@ -117,11 +117,11 @@ void Sheep::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { if (isOnFire()) { - spawnAtLocation(Item::mutton_cooked_Id, 1); + spawnAtLocation(Item::cooked_mutton_Id, 1); } else { - spawnAtLocation(Item::mutton_raw_Id, 1); + spawnAtLocation(Item::mutton_Id, 1); } } } @@ -338,7 +338,7 @@ int Sheep::getOffspringColor(shared_ptr animal, shared_ptr partn shared_ptr instance = Recipes::getInstance()->getItemFor(container, animal->level); int color = 0; - if (instance != nullptr && instance->getItem()->id == Item::dye_powder_Id) + if (instance != nullptr && instance->getItem()->id == Item::dye_Id) { color = instance->getAuxValue(); } diff --git a/Minecraft.World/SignItem.cpp b/Minecraft.World/SignItem.cpp index a418fd34..2fbda494 100644 --- a/Minecraft.World/SignItem.cpp +++ b/Minecraft.World/SignItem.cpp @@ -40,11 +40,11 @@ bool SignItem::useOn(shared_ptr instance, shared_ptr playe if (face == 1) { int rot = Mth::floor(((player->yRot + 180) * 16) / 360 + 0.5) & 15; - level->setTileAndData(x, y, z, Tile::sign_Id, rot, Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::standing_sign_Id, rot, Tile::UPDATE_ALL); } else { - level->setTileAndData(x, y, z, Tile::wallSign_Id, face, Tile::UPDATE_ALL); + level->setTileAndData(x, y, z, Tile::wall_standing_sign_Id, face, Tile::UPDATE_ALL); } instance->count--; @@ -53,9 +53,9 @@ bool SignItem::useOn(shared_ptr instance, shared_ptr playe // 4J-JEV: Hook for durango 'BlockPlaced' event. player->awardStat( - GenericStats::blocksPlaced((face==1) ? Tile::sign_Id : Tile::wallSign_Id), + GenericStats::blocksPlaced((face==1) ? Tile::standing_sign_Id : Tile::wall_standing_sign_Id), GenericStats::param_blocksPlaced( - (face==1) ? Tile::sign_Id : Tile::wallSign_Id, + (face==1) ? Tile::standing_sign_Id : Tile::wall_standing_sign_Id, instance->getAuxValue(), 1) ); diff --git a/Minecraft.World/SignTile.cpp b/Minecraft.World/SignTile.cpp index 15be23db..81be3505 100644 --- a/Minecraft.World/SignTile.cpp +++ b/Minecraft.World/SignTile.cpp @@ -120,7 +120,7 @@ void SignTile::neighborChanged(Level *level, int x, int y, int z, int type) int SignTile::cloneTileId(Level *level, int x, int y, int z) { - return Item::sign_Id; + return Item::standing_sign_Id; } void SignTile::registerIcons(IconRegister *iconRegister) diff --git a/Minecraft.World/Silverfish.cpp b/Minecraft.World/Silverfish.cpp index fd7e2d2b..ac97d982 100644 --- a/Minecraft.World/Silverfish.cpp +++ b/Minecraft.World/Silverfish.cpp @@ -137,7 +137,7 @@ void Silverfish::serverAiStep() for (int zOff = 0; !doBreak && zOff <= 10 && zOff >= -10; zOff = (zOff <= 0) ? 1 - zOff : 0 - zOff) { int tile = level->getTile(baseX + xOff, baseY + yOff, baseZ + zOff); - if (tile == Tile::monsterStoneEgg_Id) + if (tile == Tile::monster_egg_Id) { if (!level->getGameRules()->getBoolean(GameRules::RULE_MOBGRIEFING)) { @@ -159,7 +159,7 @@ void Silverfish::serverAiStep() { level->destroyTile(baseX + xOff, baseY + yOff, baseZ + zOff, false); } - Tile::monsterStoneEgg->destroy(level, baseX + xOff, baseY + yOff, baseZ + zOff, 0); + Tile::monster_egg->destroy(level, baseX + xOff, baseY + yOff, baseZ + zOff, 0); if (random->nextBoolean()) { @@ -183,7 +183,7 @@ void Silverfish::serverAiStep() int tile = level->getTile(tileX + Facing::STEP_X[facing], tileY + Facing::STEP_Y[facing], tileZ + Facing::STEP_Z[facing]); if (StoneMonsterTile::isCompatibleHostBlock(tile)) { - level->setTileAndData(tileX + Facing::STEP_X[facing], tileY + Facing::STEP_Y[facing], tileZ + Facing::STEP_Z[facing], Tile::monsterStoneEgg_Id, StoneMonsterTile::getDataForHostBlock(tile), Tile::UPDATE_ALL); + level->setTileAndData(tileX + Facing::STEP_X[facing], tileY + Facing::STEP_Y[facing], tileZ + Facing::STEP_Z[facing], Tile::monster_egg_Id, StoneMonsterTile::getDataForHostBlock(tile), Tile::UPDATE_ALL); spawnAnim(); remove(); } diff --git a/Minecraft.World/Skeleton.cpp b/Minecraft.World/Skeleton.cpp index 8285441d..dfbbc11c 100644 --- a/Minecraft.World/Skeleton.cpp +++ b/Minecraft.World/Skeleton.cpp @@ -237,7 +237,7 @@ MobGroupData *Skeleton::finalizeMobSpawn(MobGroupData *groupData, int extraData goalSelector.addGoal(4, meleeGoal, false); setSkeletonType(TYPE_WITHER); - setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::sword_stone)); + setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::stone_sword)); getAttribute(SharedMonsterAttributes::ATTACK_DAMAGE)->setBaseValue(4); } else diff --git a/Minecraft.World/SkullItem.cpp b/Minecraft.World/SkullItem.cpp index 383f226f..5b9ae68c 100644 --- a/Minecraft.World/SkullItem.cpp +++ b/Minecraft.World/SkullItem.cpp @@ -68,11 +68,11 @@ bool SkullItem::useOn(shared_ptr instance, shared_ptr play bool SkullItem::mayPlace(Level *level, int x, int y, int z, int face, shared_ptr player, shared_ptr item) { int currentTile = level->getTile(x, y, z); - if (currentTile == Tile::topSnow_Id) + if (currentTile == Tile::snow_layer_Id) { face = Facing::UP; } - else if (currentTile != Tile::vine_Id && currentTile != Tile::tallgrass_Id && currentTile != Tile::deadBush_Id) + else if (currentTile != Tile::vine_Id && currentTile != Tile::tallgrass_Id && currentTile != Tile::deadbush_Id) { if (face == 0) y--; if (face == 1) y++; diff --git a/Minecraft.World/SkullTile.cpp b/Minecraft.World/SkullTile.cpp index b5eca373..261b549a 100644 --- a/Minecraft.World/SkullTile.cpp +++ b/Minecraft.World/SkullTile.cpp @@ -137,7 +137,7 @@ void SkullTile::checkMobSpawn(Level *level, int x, int y, int z, shared_ptrgetSkullType() == SkullTileEntity::TYPE_WITHER && y >= 2 && level->difficulty > Difficulty::PEACEFUL && !level->isClientSide) { // Check wither boss spawn - int ss = Tile::soulsand_Id; + int ss = Tile::soul_sand_Id; // North-south alignment for (int zo = -2; zo <= 0; zo++) @@ -175,10 +175,10 @@ void SkullTile::checkMobSpawn(Level *level, int x, int y, int z, shared_ptrspawnResources(level, x, y - 1, z + zo, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x, y - 1, z + zo + 1, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x, y - 2, z + zo + 1, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x, y - 1, z + zo + 2, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x, y - 1, z + zo, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x, y - 1, z + zo + 1, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x, y - 2, z + zo + 1, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x, y - 1, z + zo + 2, 0, 0); shared_ptr itemInstance = std::make_shared(Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER); shared_ptr itemEntity = std::make_shared(level, x, y, z + zo + 1, itemInstance); @@ -237,10 +237,10 @@ void SkullTile::checkMobSpawn(Level *level, int x, int y, int z, shared_ptrspawnResources(level, x + xo, y - 1, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x + xo + 1, y - 1, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x + xo + 1, y - 2, z, 0, 0); - Tile::tiles[Tile::soulsand_Id]->spawnResources(level, x + xo + 2, y - 1, z, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x + xo, y - 1, z, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x + xo + 1, y - 1, z, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x + xo + 1, y - 2, z, 0, 0); + Tile::tiles[Tile::soul_sand_Id]->spawnResources(level, x + xo + 2, y - 1, z, 0, 0); shared_ptr itemInstance = std::make_shared(Item::skull_Id, 3, SkullTileEntity::TYPE_WITHER); shared_ptr itemEntity = std::make_shared(level, x + xo + 1, y, z, itemInstance); diff --git a/Minecraft.World/Slime.cpp b/Minecraft.World/Slime.cpp index 563455d6..54043995 100644 --- a/Minecraft.World/Slime.cpp +++ b/Minecraft.World/Slime.cpp @@ -246,7 +246,7 @@ int Slime::getDeathSound() int Slime::getDeathLoot() { - if (getSize() == 1) return Item::slimeBall->id; + if (getSize() == 1) return Item::slime_ball->id; return 0; } diff --git a/Minecraft.World/Slot.cpp b/Minecraft.World/Slot.cpp index 2f42a27d..ab0cbcdf 100644 --- a/Minecraft.World/Slot.cpp +++ b/Minecraft.World/Slot.cpp @@ -131,7 +131,7 @@ bool Slot::mayCombine(shared_ptr second) if(thisItem) { bool thisIsDyableArmor = thisItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH; - bool itemIsDye = second->id == Item::dye_powder_Id; + bool itemIsDye = second->id == Item::dye_Id; return thisIsDyableArmor && itemIsDye; } // 4J Stu - This condition taken from Recipes::getItemFor to repair items, but added the damaged check to skip when the result is pointless diff --git a/Minecraft.World/SnowItem.cpp b/Minecraft.World/SnowItem.cpp index 73cb57ad..2e2857d9 100644 --- a/Minecraft.World/SnowItem.cpp +++ b/Minecraft.World/SnowItem.cpp @@ -16,7 +16,7 @@ bool SnowItem::useOn(shared_ptr instance, shared_ptr playe int currentTile = level->getTile(x, y, z); // Are we adding extra snow to an existing tile? - if (currentTile == Tile::topSnow_Id) + if (currentTile == Tile::snow_layer_Id) { Tile *snowTile = Tile::tiles[getTileId()]; int currentData = level->getData(x, y, z); diff --git a/Minecraft.World/SnowMan.cpp b/Minecraft.World/SnowMan.cpp index 8a6561bf..c166bdde 100644 --- a/Minecraft.World/SnowMan.cpp +++ b/Minecraft.World/SnowMan.cpp @@ -76,7 +76,7 @@ void SnowMan::aiStep() { if (Tile::topSnow->mayPlace(level, xx, yy, zz)) { - level->setTileAndUpdate(xx, yy, zz, Tile::topSnow_Id); + level->setTileAndUpdate(xx, yy, zz, Tile::snow_layer_Id); } } } @@ -85,7 +85,7 @@ void SnowMan::aiStep() int SnowMan::getDeathLoot() { - return Item::snowBall_Id; + return Item::snowball_Id; } @@ -94,7 +94,7 @@ void SnowMan::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) // drop some feathers int count = random->nextInt(16); for (int i = 0; i < count; i++) { - spawnAtLocation(Item::snowBall_Id, 1); + spawnAtLocation(Item::snowball_Id, 1); } } diff --git a/Minecraft.World/SnowTile.cpp b/Minecraft.World/SnowTile.cpp index e73f5ceb..4c1c4343 100644 --- a/Minecraft.World/SnowTile.cpp +++ b/Minecraft.World/SnowTile.cpp @@ -12,7 +12,7 @@ SnowTile::SnowTile(int id) : Tile(id, Material::snow) int SnowTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::snowBall->id; + return Item::snowball->id; } int SnowTile::getResourceCount(Random *random) diff --git a/Minecraft.World/SpawnEggItem.cpp b/Minecraft.World/SpawnEggItem.cpp index a4de941f..4266af19 100644 --- a/Minecraft.World/SpawnEggItem.cpp +++ b/Minecraft.World/SpawnEggItem.cpp @@ -194,7 +194,7 @@ bool SpawnEggItem::useOn(shared_ptr itemInstance, shared_ptrgetTile(x, y, z); - if (tile == Tile::mobSpawner_Id) + if (tile == Tile::mob_spawner_Id) { shared_ptr spawnerTile = dynamic_pointer_cast(level->getTileEntity(x, y, z)); diff --git a/Minecraft.World/Spider.cpp b/Minecraft.World/Spider.cpp index 63b4d9aa..0ad2bec8 100644 --- a/Minecraft.World/Spider.cpp +++ b/Minecraft.World/Spider.cpp @@ -132,7 +132,7 @@ void Spider::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) if (wasKilledByPlayer && (random->nextInt(3) == 0 || random->nextInt(1 + playerBonusLevel) > 0)) { - spawnAtLocation(Item::spiderEye_Id, 1); + spawnAtLocation(Item::spider_eye_Id, 1); } } diff --git a/Minecraft.World/SpikeFeature.cpp b/Minecraft.World/SpikeFeature.cpp index 912e3aff..7d805727 100644 --- a/Minecraft.World/SpikeFeature.cpp +++ b/Minecraft.World/SpikeFeature.cpp @@ -53,7 +53,7 @@ bool SpikeFeature::place(Level *level, Random *random, int x, int y, int z) shared_ptr enderCrystal = std::make_shared(level); enderCrystal->moveTo(x + 0.5f, y + hh, z + 0.5f, random->nextFloat() * 360, 0); level->addEntity(enderCrystal); - level->setTileAndData(x, y + hh, z, Tile::unbreakable_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y + hh, z, Tile::bedrock_Id, 0, Tile::UPDATE_CLIENTS); return true; } @@ -138,9 +138,9 @@ bool SpikeFeature::placeWithIndex(Level *level, Random *random, int x, int y, in { if(yy==(y + hh - 1)) { - placeBlock(level, xx, y + hh, zz, Tile::ironFence_Id, 0); - placeBlock(level, xx, y + hh +1, zz, Tile::ironFence_Id, 0); - placeBlock(level, xx, y + hh +2, zz, Tile::ironFence_Id, 0); + placeBlock(level, xx, y + hh, zz, Tile::iron_bars_Id, 0); + placeBlock(level, xx, y + hh +1, zz, Tile::iron_bars_Id, 0); + placeBlock(level, xx, y + hh +2, zz, Tile::iron_bars_Id, 0); } } } @@ -162,7 +162,7 @@ bool SpikeFeature::placeWithIndex(Level *level, Random *random, int x, int y, in { for (int zz = z - 2; zz <= z + 2; zz++) { - placeBlock(level, xx, yy, zz, Tile::ironFence_Id, 0); + placeBlock(level, xx, yy, zz, Tile::iron_bars_Id, 0); } } } @@ -171,8 +171,8 @@ bool SpikeFeature::placeWithIndex(Level *level, Random *random, int x, int y, in shared_ptr enderCrystal = std::make_shared(level); enderCrystal->moveTo(x + 0.5f, y + hh, z + 0.5f, random->nextFloat() * 360, 0); level->addEntity(enderCrystal); - placeBlock(level, x, y + hh, z, Tile::unbreakable_Id, 0); - //level->setTile(x, y + hh, z, Tile::unbreakable_Id); + placeBlock(level, x, y + hh, z, Tile::bedrock_Id, 0); + //level->setTile(x, y + hh, z, Tile::bedrock_Id); return true; } diff --git a/Minecraft.World/SpruceFeature.cpp b/Minecraft.World/SpruceFeature.cpp index 11bbc984..8664745c 100644 --- a/Minecraft.World/SpruceFeature.cpp +++ b/Minecraft.World/SpruceFeature.cpp @@ -110,7 +110,7 @@ bool SpruceFeature::place(Level *level, Random *random, int x, int y, int z) for (int hh = 0; hh < treeHeight - topOffset; hh++) { int t = level->getTile(x, y + hh, z); - if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, TreeTile::SPRUCE_TRUNK); + if (t == 0 || t == Tile::leaves_Id) placeBlock(level, x, y + hh, z, Tile::log_Id, TreeTile::SPRUCE_TRUNK); } return true; } diff --git a/Minecraft.World/Squid.cpp b/Minecraft.World/Squid.cpp index c6a5e9a7..57d43347 100644 --- a/Minecraft.World/Squid.cpp +++ b/Minecraft.World/Squid.cpp @@ -81,7 +81,7 @@ void Squid::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) int count = random->nextInt(3 + playerBonusLevel) + 1; for (int i = 0; i < count; i++) { - spawnAtLocation(std::make_shared(Item::dye_powder, 1, DyePowderItem::BLACK), 0.0f); + spawnAtLocation(std::make_shared(Item::dye, 1, DyePowderItem::BLACK), 0.0f); } } diff --git a/Minecraft.World/Stats.cpp b/Minecraft.World/Stats.cpp index 662621da..33d9a48e 100644 --- a/Minecraft.World/Stats.cpp +++ b/Minecraft.World/Stats.cpp @@ -178,7 +178,7 @@ void Stats::buildBlockStats() newStat = new ItemStat(BLOCKS_MINED_OFFSET + 11, L"mineBlock.redstone", Tile::redStoneOre->id); blocksMinedStats->push_back(newStat); blocksMined[Tile::redStoneOre->id] = newStat; - blocksMined[Tile::redStoneOre_lit->id] = newStat; + blocksMined[Tile::lit_redstone_ore->id] = newStat; newStat->postConstruct(); newStat = new ItemStat(BLOCKS_MINED_OFFSET + 12, L"mineBlock.lapisLazuli", Tile::lapisOre->id); @@ -306,105 +306,105 @@ void Stats::buildCraftableStats() itemsCrafted[Item::stick->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 3, L"craftItem.woodenShovel", Item::shovel_wood->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 3, L"craftItem.woodenShovel", Item::wooden_shovel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::shovel_wood->id] = newStat; + itemsCrafted[Item::wooden_shovel->id] = newStat; newStat->postConstruct(); // 4J : WESTY : Added for new achievements. - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 4, L"craftItem.woodenPickAxe", Item::pickAxe_wood->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 4, L"craftItem.woodenPickAxe", Item::wooden_pickaxe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_wood->id] = newStat; + itemsCrafted[Item::wooden_pickaxe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 5, L"craftItem.stonePickAxe", Item::pickAxe_stone->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 5, L"craftItem.stonePickAxe", Item::stone_pickaxe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_stone->id] = newStat; + itemsCrafted[Item::stone_pickaxe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 6, L"craftItem.ironPickAxe", Item::pickAxe_iron->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 6, L"craftItem.ironPickAxe", Item::iron_pickaxe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_iron->id] = newStat; + itemsCrafted[Item::iron_pickaxe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 7, L"craftItem.diamondPickAxe", Item::pickAxe_diamond->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 7, L"craftItem.diamondPickAxe", Item::diamond_pickaxe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_diamond->id] = newStat; + itemsCrafted[Item::diamond_pickaxe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 8, L"craftItem.goldPickAxe", Item::pickAxe_gold->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 8, L"craftItem.goldPickAxe", Item::golden_pickaxe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::pickAxe_gold->id] = newStat; + itemsCrafted[Item::golden_pickaxe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 9, L"craftItem.stoneShovel", Item::shovel_stone->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 9, L"craftItem.stoneShovel", Item::stone_shovel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::shovel_stone->id] = newStat; + itemsCrafted[Item::stone_shovel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 10, L"craftItem.ironShovel", Item::shovel_iron->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 10, L"craftItem.ironShovel", Item::iron_shovel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::shovel_iron->id] = newStat; + itemsCrafted[Item::iron_shovel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 11, L"craftItem.diamondShovel", Item::shovel_diamond->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 11, L"craftItem.diamondShovel", Item::diamond_shovel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::shovel_diamond->id] = newStat; + itemsCrafted[Item::diamond_shovel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 12, L"craftItem.goldShovel", Item::shovel_gold->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 12, L"craftItem.goldShovel", Item::golden_shovel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::shovel_gold->id] = newStat; + itemsCrafted[Item::golden_shovel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 13, L"craftItem.woodenAxe", Item::hatchet_wood->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 13, L"craftItem.woodenAxe", Item::wooden_axe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hatchet_wood->id] = newStat; + itemsCrafted[Item::wooden_axe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 14, L"craftItem.stoneAxe", Item::hatchet_stone->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 14, L"craftItem.stoneAxe", Item::stone_axe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hatchet_stone->id] = newStat; + itemsCrafted[Item::stone_axe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 15, L"craftItem.ironAxe", Item::hatchet_iron->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 15, L"craftItem.ironAxe", Item::iron_axe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hatchet_iron->id] = newStat; + itemsCrafted[Item::iron_axe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 16, L"craftItem.diamondAxe", Item::hatchet_diamond->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 16, L"craftItem.diamondAxe", Item::diamond_axe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hatchet_diamond->id] = newStat; + itemsCrafted[Item::diamond_axe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 17, L"craftItem.goldAxe", Item::hatchet_gold->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 17, L"craftItem.goldAxe", Item::golden_axe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hatchet_gold->id] = newStat; + itemsCrafted[Item::golden_axe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 18, L"craftItem.woodenHoe", Item::hoe_wood->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 18, L"craftItem.woodenHoe", Item::wooden_hoe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hoe_wood->id] = newStat; + itemsCrafted[Item::wooden_hoe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 19, L"craftItem.stoneHoe", Item::hoe_stone->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 19, L"craftItem.stoneHoe", Item::stone_hoe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hoe_stone->id] = newStat; + itemsCrafted[Item::stone_hoe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 20, L"craftItem.ironHoe", Item::hoe_iron->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 20, L"craftItem.ironHoe", Item::iron_hoe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hoe_iron->id] = newStat; + itemsCrafted[Item::iron_hoe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 21, L"craftItem.diamondHoe", Item::hoe_diamond->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 21, L"craftItem.diamondHoe", Item::diamond_hoe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hoe_diamond->id] = newStat; + itemsCrafted[Item::diamond_hoe->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 22, L"craftItem.goldHoe", Item::hoe_gold->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 22, L"craftItem.goldHoe", Item::golden_hoe->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::hoe_gold->id] = newStat; + itemsCrafted[Item::golden_hoe->id] = newStat; newStat->postConstruct(); newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 23, L"craftItem.glowstone", Tile::glowstone_Id); @@ -422,19 +422,19 @@ void Stats::buildCraftableStats() itemsCrafted[Item::bowl->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 26, L"craftItem.bucket", Item::bucket_empty->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 26, L"craftItem.bucket", Item::bucket->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::bucket_empty->id] = newStat; + itemsCrafted[Item::bucket->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 27, L"craftItem.flintAndSteel", Item::flintAndSteel->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 27, L"craftItem.flint_and_steel", Item::flint_and_steel->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::flintAndSteel->id] = newStat; + itemsCrafted[Item::flint_and_steel->id] = newStat; newStat->postConstruct(); - newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 28, L"craftItem.fishingRod", Item::fishingRod->id); + newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 28, L"craftItem.fishing_rod", Item::fishing_rod->id); itemsCraftedStats->push_back(newStat); - itemsCrafted[Item::fishingRod->id] = newStat; + itemsCrafted[Item::fishing_rod->id] = newStat; newStat->postConstruct(); newStat = new ItemStat(ITEMS_CRAFTED_OFFSET + 29, L"craftItem.clock", Item::clock->id); @@ -475,17 +475,17 @@ void Stats::buildAdditionalStats() { - ItemStat *itemStat = new ItemStat(offset++, L"craftItem.flowerPot", Item::flowerPot_Id); + ItemStat *itemStat = new ItemStat(offset++, L"craftItem.flower_pot", Item::flower_pot_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"craftItem.sign", Item::sign_Id); + itemStat = new ItemStat(offset++, L"craftItem.sign", Item::standing_sign_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"mineBlock.emerald", Tile::emeraldOre_Id); + itemStat = new ItemStat(offset++, L"mineBlock.emerald", Tile::emerald_ore_Id); blocksMinedStats->push_back(itemStat); blocksMined[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); @@ -502,17 +502,17 @@ void Stats::buildAdditionalStats() // Either way, I'm making this one smaller because we don't need those record items (and we only need 2). blocksPlaced = StatArray(1000); - itemStat = new ItemStat(offset++, L"blockPlaced.flowerPot", Tile::flowerPot_Id); + itemStat = new ItemStat(offset++, L"blockPlaced.flower_pot", Tile::flower_pot_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"blockPlaced.sign", Tile::sign_Id); + itemStat = new ItemStat(offset++, L"blockPlaced.sign", Tile::standing_sign_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"blockPlaced.wallsign", Tile::wallSign_Id); + itemStat = new ItemStat(offset++, L"blockPlaced.wallsign", Tile::wall_standing_sign_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); @@ -537,12 +537,12 @@ void Stats::buildAdditionalStats() generalStat->postConstruct(); } - itemStat = new ItemStat(offset++, L"itemCrafted.porkchop", Item::porkChop_cooked_Id); + itemStat = new ItemStat(offset++, L"itemCrafted.porkchop", Item::cooked_porkchop_Id); itemsCraftedStats->push_back(itemStat); itemsCrafted[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); - itemStat = new ItemStat(offset++, L"itemEaten.porkchop", Item::porkChop_cooked_Id); + itemStat = new ItemStat(offset++, L"itemEaten.porkchop", Item::cooked_porkchop_Id); blocksPlacedStats->push_back(itemStat); blocksPlaced[itemStat->getItemId()] = itemStat; itemStat->postConstruct(); diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp index 7997b903..06a9f192 100644 --- a/Minecraft.World/StemTile.cpp +++ b/Minecraft.World/StemTile.cpp @@ -243,11 +243,11 @@ int StemTile::cloneTileId(Level *level, int x, int y, int z) { if (fruit == Tile::pumpkin) { - return Item::seeds_pumpkin_Id; + return Item::pumpkin_seeds_Id; } else if (fruit == Tile::melon) { - return Item::seeds_melon_Id; + return Item::melon_seeds_Id; } return 0; diff --git a/Minecraft.World/StoneMonsterTile.cpp b/Minecraft.World/StoneMonsterTile.cpp index fd3f1b90..e99769c3 100644 --- a/Minecraft.World/StoneMonsterTile.cpp +++ b/Minecraft.World/StoneMonsterTile.cpp @@ -66,7 +66,7 @@ int StoneMonsterTile::getResourceCount(Random *random) bool StoneMonsterTile::isCompatibleHostBlock(int block) { - return block == Tile::stone_Id || block == Tile::cobblestone_Id || block == Tile::stoneBrick_Id; + return block == Tile::stone_Id || block == Tile::cobblestone_Id || block == Tile::stonebrick_Id; } int StoneMonsterTile::getDataForHostBlock(int block) @@ -75,7 +75,7 @@ int StoneMonsterTile::getDataForHostBlock(int block) { return HOST_COBBLE; } - if (block == Tile::stoneBrick_Id) + if (block == Tile::stonebrick_Id) { return HOST_STONEBRICK; } diff --git a/Minecraft.World/StoneMonsterTileItem.cpp b/Minecraft.World/StoneMonsterTileItem.cpp index 4ecdf627..7691875a 100644 --- a/Minecraft.World/StoneMonsterTileItem.cpp +++ b/Minecraft.World/StoneMonsterTileItem.cpp @@ -16,7 +16,7 @@ int StoneMonsterTileItem::getLevelDataForAuxValue(int auxValue) Icon *StoneMonsterTileItem::getIcon(int itemAuxValue) { - return Tile::monsterStoneEgg->getTexture(0, itemAuxValue); + return Tile::monster_egg->getTexture(0, itemAuxValue); } unsigned int StoneMonsterTileItem::getDescriptionId(shared_ptr instance) diff --git a/Minecraft.World/StoneSlabTile.cpp b/Minecraft.World/StoneSlabTile.cpp index 37f09404..802be2d8 100644 --- a/Minecraft.World/StoneSlabTile.cpp +++ b/Minecraft.World/StoneSlabTile.cpp @@ -60,7 +60,7 @@ void StoneSlabTile::registerIcons(IconRegister *iconRegister) int StoneSlabTile::getResource(int data, Random *random, int playerBonusLevel) { - return Tile::stoneSlabHalf_Id; + return Tile::stone_slab_Id; } unsigned int StoneSlabTile::getDescriptionId(int iData) @@ -78,5 +78,5 @@ int StoneSlabTile::getAuxName(int auxValue) shared_ptr StoneSlabTile::getSilkTouchItemInstance(int data) { - return make_shared(Tile::stoneSlabHalf_Id, 2, data & TYPE_MASK); + return make_shared(Tile::stone_slab_Id, 2, data & TYPE_MASK); } \ No newline at end of file diff --git a/Minecraft.World/StrongholdPieces.cpp b/Minecraft.World/StrongholdPieces.cpp index d98d9488..eb454b6c 100644 --- a/Minecraft.World/StrongholdPieces.cpp +++ b/Minecraft.World/StrongholdPieces.cpp @@ -280,39 +280,39 @@ void StrongholdPieces::StrongholdPiece::generateSmallDoor(Level *level, Random * generateBox(level, chunkBB, footX, footY, footZ, footX + SMALL_DOOR_WIDTH - 1, footY + SMALL_DOOR_HEIGHT - 1, footZ, 0, 0, false); break; case WOOD_DOOR: - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 1, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY, footZ, chunkBB); - placeBlock(level, Tile::door_wood_Id, 0, footX + 1, footY, footZ, chunkBB); - placeBlock(level, Tile::door_wood_Id, DoorTile::UPPER_BIT, footX + 1, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 1, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY, footZ, chunkBB); + placeBlock(level, Tile::wooden_door_Id, 0, footX + 1, footY, footZ, chunkBB); + placeBlock(level, Tile::wooden_door_Id, DoorTile::UPPER_BIT, footX + 1, footY + 1, footZ, chunkBB); break; case GRATES: placeBlock(level, 0, 0, footX + 1, footY, footZ, chunkBB); placeBlock(level, 0, 0, footX + 1, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX, footY, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX + 1, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX, footY, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX + 1, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX + 2, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX + 2, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, footX + 2, footY, footZ, chunkBB); break; case IRON_DOOR: - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 1, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY + 2, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, footX + 2, footY, footZ, chunkBB); - placeBlock(level, Tile::door_iron_Id, 0, footX + 1, footY, footZ, chunkBB); - placeBlock(level, Tile::door_iron_Id, DoorTile::UPPER_BIT, footX + 1, footY + 1, footZ, chunkBB); - placeBlock(level, Tile::button_stone_Id, getOrientationData(Tile::button_stone_Id, 4), footX + 2, footY + 1, footZ + 1, chunkBB); - placeBlock(level, Tile::button_stone_Id, getOrientationData(Tile::button_stone_Id, 3), footX + 2, footY + 1, footZ - 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 1, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY + 2, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, footX + 2, footY, footZ, chunkBB); + placeBlock(level, Tile::iron_door_Id, 0, footX + 1, footY, footZ, chunkBB); + placeBlock(level, Tile::iron_door_Id, DoorTile::UPPER_BIT, footX + 1, footY + 1, footZ, chunkBB); + placeBlock(level, Tile::stone_button_Id, getOrientationData(Tile::stone_button_Id, 4), footX + 2, footY + 1, footZ + 1, chunkBB); + placeBlock(level, Tile::stone_button_Id, getOrientationData(Tile::stone_button_Id, 3), footX + 2, footY + 1, footZ - 1, chunkBB); break; } @@ -482,26 +482,26 @@ bool StrongholdPieces::FillerCorridor::postProcess(Level *level, Random *random, for (int i = 0; i < steps; i++) { // row 0 - placeBlock(level, Tile::stoneBrick_Id, 0, 0, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 0, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, 0, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 0, 0, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 0, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, 0, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 0, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 4, 0, i, chunkBB); // row 1-3 for (int y = 1; y <= 3; y++) { - placeBlock(level, Tile::stoneBrick_Id, 0, 0, y, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 0, y, i, chunkBB); placeBlock(level, 0, 0, 1, y, i, chunkBB); placeBlock(level, 0, 0, 2, y, i, chunkBB); placeBlock(level, 0, 0, 3, y, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, y, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 4, y, i, chunkBB); } // row 4 - placeBlock(level, Tile::stoneBrick_Id, 0, 0, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 4, i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 4, 4, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 0, 4, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 4, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, 4, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 4, i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 4, 4, i, chunkBB); } return true; @@ -588,23 +588,23 @@ bool StrongholdPieces::StairsDown::postProcess(Level *level, Random *random, Bou generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); // stair steps - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 6, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 5, 1, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 1, 6, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 5, 2, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 4, 3, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 1, 5, 3, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 4, 3, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 3, 3, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 3, 4, 3, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 3, 2, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 2, 1, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 3, 3, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, 2, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 1, 1, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 1, 2, 1, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 1, 1, 2, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::STONE_SLAB, 1, 1, 3, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, 6, 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 5, 1, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 1, 6, 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 5, 2, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 4, 3, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 1, 5, 3, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, 4, 3, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 3, 3, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 3, 4, 3, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 3, 2, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 2, 1, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 3, 3, 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, 2, 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 1, 1, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 1, 2, 1, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, 1, 2, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::STONE_SLAB, 1, 1, 3, chunkBB); return true; } @@ -717,25 +717,25 @@ bool StrongholdPieces::Straight::postProcess(Level *level, Random *random, Bound WeighedTreasure *StrongholdPieces::ChestCorridor::treasureItems[TREASURE_ITEMS_COUNT] = { - new WeighedTreasure(Item::enderPearl_Id, 0, 1, 1, 10), + new WeighedTreasure(Item::ender_pearl_Id, 0, 1, 1, 10), new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3), - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 5), - new WeighedTreasure(Item::redStone_Id, 0, 4, 9, 5), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10), + new WeighedTreasure(Item::gold_ingot_Id, 0, 1, 3, 5), + new WeighedTreasure(Item::redstone_Id, 0, 4, 9, 5), new WeighedTreasure(Item::bread_Id, 0, 1, 3, 15), new WeighedTreasure(Item::apple_Id, 0, 1, 3, 15), - new WeighedTreasure(Item::pickAxe_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::sword_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::chestplate_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::helmet_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::leggings_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::boots_iron_Id, 0, 1, 1, 5), - new WeighedTreasure(Item::apple_gold_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::iron_pickaxe_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_sword_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_chestplate_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_helmet_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_leggings_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::iron_boots_Id, 0, 1, 1, 5), + new WeighedTreasure(Item::golden_apple_Id, 0, 1, 1, 1), // very rare for strongholds ... new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1), - new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 1), // ... }; @@ -799,14 +799,14 @@ bool StrongholdPieces::ChestCorridor::postProcess(Level *level, Random *random, generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); // chest placement - generateBox(level, chunkBB, 3, 1, 2, 3, 1, 4, Tile::stoneBrick_Id, Tile::stoneBrick_Id, false); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 1, 1, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 1, 5, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 2, 2, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 2, 4, chunkBB); + generateBox(level, chunkBB, 3, 1, 2, 3, 1, 4, Tile::stonebrick_Id, Tile::stonebrick_Id, false); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 1, 1, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 1, 5, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 2, 2, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 3, 2, 4, chunkBB); for (int z = 2; z <= 4; z++) { - placeBlock(level, Tile::stoneSlabHalf_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 2, 1, z, chunkBB); + placeBlock(level, Tile::stone_slab_Id, StoneSlabTile::SMOOTHBRICK_SLAB, 2, 1, z, chunkBB); } if (!hasPlacedChest) @@ -816,7 +816,7 @@ bool StrongholdPieces::ChestCorridor::postProcess(Level *level, Random *random, if (chunkBB->isInside(x, y, z)) { hasPlacedChest = true; - createChest(level, chunkBB, random, 3, 2, 3, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random)), 2 + random->nextInt(2)); + createChest(level, chunkBB, random, 3, 2, 3, WeighedTreasure::addToTreasure(WeighedTreasureArray(treasureItems,TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random)), 2 + random->nextInt(2)); } } @@ -871,17 +871,17 @@ bool StrongholdPieces::StraightStairsDown::postProcess(Level *level, Random *ran generateSmallDoor(level, random, chunkBB, OPENING, 1, 1, depth - 1); // stairs - int orientationData = getOrientationData(Tile::stairs_stone_Id, 2); + int orientationData = getOrientationData(Tile::stone_stairs_Id, 2); for (int i = 0; i < 6; i++) { - placeBlock(level, Tile::stairs_stone_Id, orientationData, 1, height - 5 - i, 1 + i, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, orientationData, 2, height - 5 - i, 1 + i, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, orientationData, 3, height - 5 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, orientationData, 1, height - 5 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, orientationData, 2, height - 5 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, orientationData, 3, height - 5 - i, 1 + i, chunkBB); if (i < 5) { - placeBlock(level, Tile::stoneBrick_Id, 0, 1, height - 6 - i, 1 + i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 2, height - 6 - i, 1 + i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3, height - 6 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 1, height - 6 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 2, height - 6 - i, 1 + i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, height - 6 - i, 1 + i, chunkBB); } } @@ -1046,13 +1046,13 @@ StrongholdPieces::RoomCrossing *StrongholdPieces::RoomCrossing::createPiece(list WeighedTreasure *StrongholdPieces::RoomCrossing::smallTreasureItems[SMALL_TREASURE_ITEMS_COUNT] = { - new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10), - new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 5), - new WeighedTreasure(Item::redStone_Id, 0, 4, 9, 5), + new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10), + new WeighedTreasure(Item::gold_ingot_Id, 0, 1, 3, 5), + new WeighedTreasure(Item::redstone_Id, 0, 4, 9, 5), new WeighedTreasure(Item::coal_Id, CoalItem::STONE_COAL, 3, 8, 10), new WeighedTreasure(Item::bread_Id, 0, 1, 3, 15), new WeighedTreasure(Item::apple_Id, 0, 1, 3, 15), - new WeighedTreasure(Item::pickAxe_iron_Id, 0, 1, 1, 1), + new WeighedTreasure(Item::iron_pickaxe_Id, 0, 1, 1, 1), }; bool StrongholdPieces::RoomCrossing::postProcess(Level *level, Random *random, BoundingBox *chunkBB) @@ -1077,35 +1077,35 @@ bool StrongholdPieces::RoomCrossing::postProcess(Level *level, Random *random, B break; case 0: // middle torch pillar - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 1, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 2, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 3, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 1, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 2, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 3, 5, chunkBB); placeBlock(level, Tile::torch_Id, 0, 4, 3, 5, chunkBB); placeBlock(level, Tile::torch_Id, 0, 6, 3, 5, chunkBB); placeBlock(level, Tile::torch_Id, 0, 5, 3, 4, chunkBB); placeBlock(level, Tile::torch_Id, 0, 5, 3, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 5, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 4, 1, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 5, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 6, 1, 6, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 5, 1, 4, chunkBB); - placeBlock(level, Tile::stoneSlabHalf_Id, 0, 5, 1, 6, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 4, 1, 4, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 4, 1, 5, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 4, 1, 6, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 6, 1, 4, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 6, 1, 5, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 6, 1, 6, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 5, 1, 4, chunkBB); + placeBlock(level, Tile::stone_slab_Id, 0, 5, 1, 6, chunkBB); break; case 1: { for (int i = 0; i < 5; i++) { - placeBlock(level, Tile::stoneBrick_Id, 0, 3, 1, 3 + i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 7, 1, 3 + i, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3 + i, 1, 3, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 3 + i, 1, 7, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3, 1, 3 + i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 7, 1, 3 + i, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3 + i, 1, 3, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 3 + i, 1, 7, chunkBB); } - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 1, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 2, 5, chunkBB); - placeBlock(level, Tile::stoneBrick_Id, 0, 5, 3, 5, chunkBB); - placeBlock(level, Tile::water_Id, 0, 5, 4, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 1, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 2, 5, chunkBB); + placeBlock(level, Tile::stonebrick_Id, 0, 5, 3, 5, chunkBB); + placeBlock(level, Tile::flowing_water_Id, 0, 5, 4, 5, chunkBB); } break; case 2: @@ -1138,22 +1138,22 @@ bool StrongholdPieces::RoomCrossing::postProcess(Level *level, Random *random, B placeBlock(level, Tile::torch_Id, 0, 5, 3, 5, chunkBB); for (int z = 2; z <= 8; z++) { - placeBlock(level, Tile::wood_Id, 0, 2, 3, z, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 2, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 3, 3, z, chunkBB); if (z <= 3 || z >= 7) { - placeBlock(level, Tile::wood_Id, 0, 4, 3, z, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 5, 3, z, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 6, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 4, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 5, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 6, 3, z, chunkBB); } - placeBlock(level, Tile::wood_Id, 0, 7, 3, z, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 7, 3, z, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 3, z, chunkBB); } placeBlock(level, Tile::ladder_Id, getOrientationData(Tile::ladder_Id, Facing::WEST), 9, 1, 3, chunkBB); placeBlock(level, Tile::ladder_Id, getOrientationData(Tile::ladder_Id, Facing::WEST), 9, 2, 3, chunkBB); placeBlock(level, Tile::ladder_Id, getOrientationData(Tile::ladder_Id, Facing::WEST), 9, 3, 3, chunkBB); - createChest(level, chunkBB, random, 3, 4, 8, WeighedTreasure::addToTreasure(WeighedTreasureArray(smallTreasureItems,SMALL_TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random)), 1 + random->nextInt(4)); + createChest(level, chunkBB, random, 3, 4, 8, WeighedTreasure::addToTreasure(WeighedTreasureArray(smallTreasureItems,SMALL_TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random)), 1 + random->nextInt(4)); // System.out.println("Created chest at " + getWorldX(3, 8) + // "," + getWorldY(4) + "," + getWorldZ(3, 8)); @@ -1217,16 +1217,16 @@ bool StrongholdPieces::PrisonHall::postProcess(Level *level, Random *random, Bou generateBox(level, chunkBB, 4, 1, 9, 4, 3, 9, false, random, (BlockSelector *)smoothStoneSelector); // grates - generateBox(level, chunkBB, 4, 1, 4, 4, 3, 6, Tile::ironFence_Id, Tile::ironFence_Id, false); - generateBox(level, chunkBB, 5, 1, 5, 7, 3, 5, Tile::ironFence_Id, Tile::ironFence_Id, false); + generateBox(level, chunkBB, 4, 1, 4, 4, 3, 6, Tile::iron_bars_Id, Tile::iron_bars_Id, false); + generateBox(level, chunkBB, 5, 1, 5, 7, 3, 5, Tile::iron_bars_Id, Tile::iron_bars_Id, false); // doors - placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 2, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 8, chunkBB); - placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3), 4, 1, 2, chunkBB); - placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3) + DoorTile::UPPER_BIT, 4, 2, 2, chunkBB); - placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3), 4, 1, 8, chunkBB); - placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3) + DoorTile::UPPER_BIT, 4, 2, 8, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, 4, 3, 2, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, 4, 3, 8, chunkBB); + placeBlock(level, Tile::iron_door_Id, getOrientationData(Tile::iron_door_Id, 3), 4, 1, 2, chunkBB); + placeBlock(level, Tile::iron_door_Id, getOrientationData(Tile::iron_door_Id, 3) + DoorTile::UPPER_BIT, 4, 2, 2, chunkBB); + placeBlock(level, Tile::iron_door_Id, getOrientationData(Tile::iron_door_Id, 3), 4, 1, 8, chunkBB); + placeBlock(level, Tile::iron_door_Id, getOrientationData(Tile::iron_door_Id, 3) + DoorTile::UPPER_BIT, 4, 2, 8, chunkBB); return true; @@ -1317,16 +1317,16 @@ bool StrongholdPieces::Library::postProcess(Level *level, Random *random, Boundi // place library walls for (int d = 1; d <= depth - 2; d++) { if (((d - 1) % 4) == 0) { - generateBox(level, chunkBB, bookLeft, 1, d, bookLeft, 4, d, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, bookRight, 1, d, bookRight, 4, d, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, bookLeft, 1, d, bookLeft, 4, d, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, bookRight, 1, d, bookRight, 4, d, Tile::planks_Id, Tile::planks_Id, false); placeBlock(level, Tile::torch_Id, 0, 2, 3, d, chunkBB); placeBlock(level, Tile::torch_Id, 0, width - 3, 3, d, chunkBB); if (isTall) { - generateBox(level, chunkBB, bookLeft, 6, d, bookLeft, 9, d, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, bookRight, 6, d, bookRight, 9, d, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, bookLeft, 6, d, bookLeft, 9, d, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, bookRight, 6, d, bookRight, 9, d, Tile::planks_Id, Tile::planks_Id, false); } } else @@ -1353,14 +1353,14 @@ bool StrongholdPieces::Library::postProcess(Level *level, Random *random, Boundi if (isTall) { // create balcony - generateBox(level, chunkBB, 1, 5, 1, 3, 5, depth - 2, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, width - 4, 5, 1, width - 2, 5, depth - 2, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 5, 1, width - 5, 5, 2, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 5, depth - 3, width - 5, 5, depth - 2, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 1, 5, 1, 3, 5, depth - 2, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, width - 4, 5, 1, width - 2, 5, depth - 2, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 4, 5, 1, width - 5, 5, 2, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 4, 5, depth - 3, width - 5, 5, depth - 2, Tile::planks_Id, Tile::planks_Id, false); - placeBlock(level, Tile::wood_Id, 0, width - 5, 5, depth - 4, chunkBB); - placeBlock(level, Tile::wood_Id, 0, width - 6, 5, depth - 4, chunkBB); - placeBlock(level, Tile::wood_Id, 0, width - 5, 5, depth - 5, chunkBB); + placeBlock(level, Tile::planks_Id, 0, width - 5, 5, depth - 4, chunkBB); + placeBlock(level, Tile::planks_Id, 0, width - 6, 5, depth - 4, chunkBB); + placeBlock(level, Tile::planks_Id, 0, width - 5, 5, depth - 5, chunkBB); // balcony fences generateBox(level, chunkBB, 3, 6, 2, 3, 6, depth - 3, Tile::fence_Id, Tile::fence_Id, false); @@ -1407,11 +1407,11 @@ bool StrongholdPieces::Library::postProcess(Level *level, Random *random, Boundi } // place chests - createChest(level, chunkBB, random, 3, 3, 5, WeighedTreasure::addToTreasure(WeighedTreasureArray(libraryTreasureItems,LIBRARY_TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random, 1, 5, 2)), 1 + random->nextInt(4)); + createChest(level, chunkBB, random, 3, 3, 5, WeighedTreasure::addToTreasure(WeighedTreasureArray(libraryTreasureItems,LIBRARY_TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random, 1, 5, 2)), 1 + random->nextInt(4)); if (isTall) { placeBlock(level, 0, 0, width - 2, tallHeight - 2, 1, chunkBB); - createChest(level, chunkBB, random, width - 2, tallHeight - 3, 1, WeighedTreasure::addToTreasure(WeighedTreasureArray(libraryTreasureItems,LIBRARY_TREASURE_ITEMS_COUNT), Item::enchantedBook->createForRandomTreasure(random, 1, 5, 2)), 1 + random->nextInt(4)); + createChest(level, chunkBB, random, width - 2, tallHeight - 3, 1, WeighedTreasure::addToTreasure(WeighedTreasureArray(libraryTreasureItems,LIBRARY_TREASURE_ITEMS_COUNT), Item::enchanted_book->createForRandomTreasure(random, 1, 5, 2)), 1 + random->nextInt(4)); } return true; @@ -1517,18 +1517,18 @@ bool StrongholdPieces::FiveCrossing::postProcess(Level *level, Random *random, B // left stairs generateBox(level, chunkBB, 1, 3, 5, 3, 3, 6, false, random, (BlockSelector *)smoothStoneSelector); - generateBox(level, chunkBB, 1, 3, 4, 3, 3, 4, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 1, 4, 6, 3, 4, 6, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); + generateBox(level, chunkBB, 1, 3, 4, 3, 3, 4, Tile::stone_slab_Id, Tile::stone_slab_Id, false); + generateBox(level, chunkBB, 1, 4, 6, 3, 4, 6, Tile::stone_slab_Id, Tile::stone_slab_Id, false); // lower stairs generateBox(level, chunkBB, 5, 1, 7, 7, 1, 8, false, random, (BlockSelector *)smoothStoneSelector); - generateBox(level, chunkBB, 5, 1, 9, 7, 1, 9, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 5, 2, 7, 7, 2, 7, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); + generateBox(level, chunkBB, 5, 1, 9, 7, 1, 9, Tile::stone_slab_Id, Tile::stone_slab_Id, false); + generateBox(level, chunkBB, 5, 2, 7, 7, 2, 7, Tile::stone_slab_Id, Tile::stone_slab_Id, false); // bridge - generateBox(level, chunkBB, 4, 5, 7, 4, 5, 9, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 8, 5, 7, 8, 5, 9, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); - generateBox(level, chunkBB, 5, 5, 7, 7, 5, 9, Tile::stoneSlab_Id, Tile::stoneSlab_Id, false); + generateBox(level, chunkBB, 4, 5, 7, 4, 5, 9, Tile::stone_slab_Id, Tile::stone_slab_Id, false); + generateBox(level, chunkBB, 8, 5, 7, 8, 5, 9, Tile::stone_slab_Id, Tile::stone_slab_Id, false); + generateBox(level, chunkBB, 5, 5, 7, 7, 5, 9, Tile::double_stone_slab_Id, Tile::double_stone_slab_Id, false); placeBlock(level, Tile::torch_Id, 0, 6, 5, 6, chunkBB); return true; @@ -1601,34 +1601,34 @@ bool StrongholdPieces::PortalRoom::postProcess(Level *level, Random *random, Bou // entrance lava pools generateBox(level, chunkBB, 1, 1, 1, 2, 1, 4, false, random, (BlockSelector *)smoothStoneSelector); generateBox(level, chunkBB, width - 3, 1, 1, width - 2, 1, 4, false, random, (BlockSelector *)smoothStoneSelector); - generateBox(level, chunkBB, 1, 1, 1, 1, 1, 3, Tile::lava_Id, Tile::lava_Id, false); - generateBox(level, chunkBB, width - 2, 1, 1, width - 2, 1, 3, Tile::lava_Id, Tile::lava_Id, false); + generateBox(level, chunkBB, 1, 1, 1, 1, 1, 3, Tile::flowing_lava_Id, Tile::flowing_lava_Id, false); + generateBox(level, chunkBB, width - 2, 1, 1, width - 2, 1, 3, Tile::flowing_lava_Id, Tile::flowing_lava_Id, false); // portal lava pool generateBox(level, chunkBB, 3, 1, 8, 7, 1, 12, false, random, (BlockSelector *)smoothStoneSelector); - generateBox(level, chunkBB, 4, 1, 9, 6, 1, 11, Tile::lava_Id, Tile::lava_Id, false); + generateBox(level, chunkBB, 4, 1, 9, 6, 1, 11, Tile::flowing_lava_Id, Tile::flowing_lava_Id, false); // wall decorations for (int z = 3; z < depth - 2; z += 2) { - generateBox(level, chunkBB, 0, 3, z, 0, 4, z, Tile::ironFence_Id, Tile::ironFence_Id, false); - generateBox(level, chunkBB, width - 1, 3, z, width - 1, 4, z, Tile::ironFence_Id, Tile::ironFence_Id, false); + generateBox(level, chunkBB, 0, 3, z, 0, 4, z, Tile::iron_bars_Id, Tile::iron_bars_Id, false); + generateBox(level, chunkBB, width - 1, 3, z, width - 1, 4, z, Tile::iron_bars_Id, Tile::iron_bars_Id, false); } for (int x = 2; x < width - 2; x += 2) { - generateBox(level, chunkBB, x, 3, depth - 1, x, 4, depth - 1, Tile::ironFence_Id, Tile::ironFence_Id, false); + generateBox(level, chunkBB, x, 3, depth - 1, x, 4, depth - 1, Tile::iron_bars_Id, Tile::iron_bars_Id, false); } // stair - int orientationData = getOrientationData(Tile::stairs_stoneBrick_Id, 3); + int orientationData = getOrientationData(Tile::stone_brick_stairs_Id, 3); generateBox(level, chunkBB, 4, 1, 5, 6, 1, 7, false, random, (BlockSelector *)smoothStoneSelector); generateBox(level, chunkBB, 4, 2, 6, 6, 2, 7, false, random, (BlockSelector *)smoothStoneSelector); generateBox(level, chunkBB, 4, 3, 7, 6, 3, 7, false, random, (BlockSelector *)smoothStoneSelector); for (int x = 4; x <= 6; x++) { - placeBlock(level, Tile::stairs_stoneBrick_Id, orientationData, x, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_stoneBrick_Id, orientationData, x, 2, 5, chunkBB); - placeBlock(level, Tile::stairs_stoneBrick_Id, orientationData, x, 3, 6, chunkBB); + placeBlock(level, Tile::stone_brick_stairs_Id, orientationData, x, 1, 4, chunkBB); + placeBlock(level, Tile::stone_brick_stairs_Id, orientationData, x, 2, 5, chunkBB); + placeBlock(level, Tile::stone_brick_stairs_Id, orientationData, x, 3, 6, chunkBB); } int north = Direction::NORTH; @@ -1659,18 +1659,18 @@ bool StrongholdPieces::PortalRoom::postProcess(Level *level, Random *random, Bou // 4J-PB - Removed for Christmas update since we don't have The End // 4J-PB - not going to remove it, so that maps generated will have it in, but it can't be activated - placeBlock(level, Tile::endPortalFrameTile_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 4, 3, 8, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 5, 3, 8, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 6, 3, 8, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 4, 3, 12, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 5, 3, 12, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 6, 3, 12, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 9, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 10, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 11, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 9, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 10, chunkBB); - placeBlock(level, Tile::endPortalFrameTile_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 11, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 4, 3, 8, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 5, 3, 8, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, north + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 6, 3, 8, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 4, 3, 12, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 5, 3, 12, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, south + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 6, 3, 12, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 9, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 10, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, east + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 3, 3, 11, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 9, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 10, chunkBB); + placeBlock(level, Tile::end_portal_frame_Id, west + ((random->nextFloat() > 0.9f) ? TheEndPortalFrameTile::EYE_BIT : 0), 7, 3, 11, chunkBB); if (!hasPlacedMobSpawner) @@ -1686,7 +1686,7 @@ bool StrongholdPieces::PortalRoom::postProcess(Level *level, Random *random, Bou level->getLevelData()->setHasStrongholdEndPortal(); hasPlacedMobSpawner = true; - level->setTileAndData(x, y, z, Tile::mobSpawner_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x, y, z, Tile::mob_spawner_Id, 0, Tile::UPDATE_CLIENTS); shared_ptr entity = dynamic_pointer_cast(level->getTileEntity(x, y, z)); if (entity != nullptr) entity->getSpawner()->setEntityId(L"Silverfish"); } @@ -1700,7 +1700,7 @@ void StrongholdPieces::SmoothStoneSelector::next(Random *random, int worldX, int { if (isEdge) { - nextId = Tile::stoneBrick_Id; + nextId = Tile::stonebrick_Id; float selection = random->nextFloat(); if (selection < 0.2f) @@ -1713,7 +1713,7 @@ void StrongholdPieces::SmoothStoneSelector::next(Random *random, int worldX, int } else if (selection < 0.55f) { - nextId = Tile::monsterStoneEgg_Id; + nextId = Tile::monster_egg_Id; nextData = StoneMonsterTile::HOST_STONEBRICK; } else diff --git a/Minecraft.World/StructurePiece.cpp b/Minecraft.World/StructurePiece.cpp index bb3887c0..d50b951f 100644 --- a/Minecraft.World/StructurePiece.cpp +++ b/Minecraft.World/StructurePiece.cpp @@ -250,7 +250,7 @@ int StructurePiece::getOrientationData( int tile, int data ) } } } - else if ( tile == Tile::door_wood_Id || tile == Tile::door_iron_Id ) + else if ( tile == Tile::wooden_door_Id || tile == Tile::iron_door_Id ) { if ( orientation == Direction::SOUTH ) { @@ -280,7 +280,7 @@ int StructurePiece::getOrientationData( int tile, int data ) return ( data + 3 ) & 3; } } - else if ( tile == Tile::stairs_stone_Id || tile == Tile::stairs_wood_Id || tile == Tile::stairs_netherBricks_Id || tile == Tile::stairs_stoneBrick_Id || tile == Tile::stairs_sandstone_Id) + else if ( tile == Tile::stone_stairs_Id || tile == Tile::oak_stairs_Id || tile == Tile::nether_brick_stairs_Id || tile == Tile::stone_brick_stairs_Id || tile == Tile::sandstone_stairs_Id) { if ( orientation == Direction::SOUTH ) { @@ -437,7 +437,7 @@ int StructurePiece::getOrientationData( int tile, int data ) } } } - else if (tile == Tile::tripWireSource_Id || (Tile::tiles[tile] != nullptr && dynamic_cast(Tile::tiles[tile]))) + else if (tile == Tile::tripwire_hook_Id || (Tile::tiles[tile] != nullptr && dynamic_cast(Tile::tiles[tile]))) { if (orientation == Direction::SOUTH) { @@ -485,7 +485,7 @@ int StructurePiece::getOrientationData( int tile, int data ) } } } - else if (tile == Tile::pistonBase_Id || tile == Tile::pistonStickyBase_Id || tile == Tile::lever_Id || tile == Tile::dispenser_Id) + else if (tile == Tile::piston_Id || tile == Tile::sticky_piston_Id || tile == Tile::lever_Id || tile == Tile::dispenser_Id) { if (orientation == Direction::SOUTH) { @@ -851,6 +851,6 @@ void StructurePiece::createDoor( Level* level, BoundingBox* chunkBB, Random* ran if ( chunkBB->isInside( worldX, worldY, worldZ ) ) { - DoorItem::place( level, worldX, worldY, worldZ, orientation, Tile::door_wood ); + DoorItem::place( level, worldX, worldY, worldZ, orientation, Tile::wooden_door ); } } diff --git a/Minecraft.World/StructureRecipies.cpp b/Minecraft.World/StructureRecipies.cpp index 150c0848..f4397040 100644 --- a/Minecraft.World/StructureRecipies.cpp +++ b/Minecraft.World/StructureRecipies.cpp @@ -120,7 +120,7 @@ void StructureRecipies::addRecipes(Recipes *r) L"#E#", // L"###", // - L'#', Tile::obsidian, L'E', Item::eyeOfEnder, + L'#', Tile::obsidian, L'E', Item::eye_of_ender, L'S'); r->addShapedRecipy(new ItemInstance(Tile::stoneBrick, 4), // @@ -153,15 +153,15 @@ void StructureRecipies::addRecipes(Recipes *r) L'S'); // 4J Stu - Move this into "Recipes" to change the order things are displayed on the crafting menu - //r->addShapedRecipy(new ItemInstance(Tile::ironFence, 16), // + //r->addShapedRecipy(new ItemInstance(Tile::iron_bars, 16), // // L"sscig", // L"###", // // L"###", // - // L'#', Item::ironIngot, + // L'#', Item::iron_ingot, // L'S'); - r->addShapedRecipy(new ItemInstance(Tile::thinGlass, 16), // + r->addShapedRecipy(new ItemInstance(Tile::glass_pane, 16), // L"ssctg", L"###", // L"###", // @@ -181,7 +181,7 @@ for (int i = 0; i < 16; i++) L"#X#", L"###", L'#', new ItemInstance(Tile::glass), - L'X', new ItemInstance(Item::dye_powder, 1, i), + L'X', new ItemInstance(Item::dye, 1, i), L'D'); r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, ColoredTile::getItemAuxValueForTileData(i)), L"ssczg", @@ -199,7 +199,7 @@ for (int i = 0; i < 16; i++) L"#X#", L"###", L'#', new ItemInstance(Tile::glass), - L'X', new ItemInstance(Item::dye_powder, 1, i), + L'X', new ItemInstance(Item::dye, 1, i), L'D'); r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, ColoredTile::getItemAuxValueForTileData(i)), L"ssczg", @@ -222,7 +222,7 @@ for (int i = 0; i < 16; i++) L" R ", // L"RGR", // L" R ", // - L'R', Item::redStone, 'G', Tile::glowstone, + L'R', Item::redstone, 'G', Tile::glowstone, L'M'); r->addShapedRecipy(new ItemInstance(Tile::beacon, 1), // @@ -231,6 +231,6 @@ for (int i = 0; i < 16; i++) L"GSG", // L"OOO", // - L'G', Tile::glass, L'S', Item::netherStar, L'O', Tile::obsidian, + L'G', Tile::glass, L'S', Item::nether_star, L'O', Tile::obsidian, L'M'); } \ No newline at end of file diff --git a/Minecraft.World/SwampBiome.cpp b/Minecraft.World/SwampBiome.cpp index a7a0f489..be7580c4 100644 --- a/Minecraft.World/SwampBiome.cpp +++ b/Minecraft.World/SwampBiome.cpp @@ -40,12 +40,12 @@ void SwampBiome::buildSurfaceAtDefault(Level *level, Random *random, byte* chunk int index = (localZ * 16 + localX) * Level::genDepth + y; if (chunkBlocks[index] != 0) { - if (y == 62 && chunkBlocks[index] != static_cast(Tile::water_Id)) + if (y == 62 && chunkBlocks[index] != static_cast(Tile::flowing_water_Id)) { - chunkBlocks[index] = static_cast(Tile::water_Id); + chunkBlocks[index] = static_cast(Tile::flowing_water_Id); if (d0 < 0.12) { - chunkBlocks[index + 1] = static_cast(Tile::waterLily_Id); + chunkBlocks[index + 1] = static_cast(Tile::waterlily_Id); } } break; diff --git a/Minecraft.World/SwampBiome.h b/Minecraft.World/SwampBiome.h index 7108602c..90befc2e 100644 --- a/Minecraft.World/SwampBiome.h +++ b/Minecraft.World/SwampBiome.h @@ -15,7 +15,7 @@ public: public: virtual Feature *getTreeFeature(Random *random); virtual void buildSurfaceAtDefault(Level *level, Random *random, byte* chunkBlocks, int x, int z, double noiseVal) override; - virtual Feature* getFlowerFeature(Random* random, int x, int y, int z) override{return new FlowerFeature(Tile::rose_Id, Rose::BLUE_ORCHID);} + virtual Feature* getFlowerFeature(Random* random, int x, int y, int z) override{return new FlowerFeature(Tile::red_flower_Id, Rose::BLUE_ORCHID);} // 4J Stu - Not using these any more //virtual int getGrassColor(); //virtual int getFolageColor(); diff --git a/Minecraft.World/SwampTreeFeature.cpp b/Minecraft.World/SwampTreeFeature.cpp index 5b94767a..f0b7270a 100644 --- a/Minecraft.World/SwampTreeFeature.cpp +++ b/Minecraft.World/SwampTreeFeature.cpp @@ -39,7 +39,7 @@ bool SwampTreeFeature::place(Level *level, Random *random, int x, int y, int z) int tt = level->getTile(xx, yy, zz); if (tt != 0 && tt != Tile::leaves_Id) { - if (tt == Tile::calmWater_Id || tt == Tile::water_Id) + if (tt == Tile::water_Id || tt == Tile::flowing_water_Id) { if (yy > y) free = false; } @@ -83,7 +83,7 @@ bool SwampTreeFeature::place(Level *level, Random *random, int x, int y, int z) for (int hh = 0; hh < treeHeight; hh++) { int t = level->getTile(x, y + hh, z); - if (t == 0 || t == Tile::leaves_Id || t == Tile::water_Id || t == Tile::calmWater_Id) placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id); + if (t == 0 || t == Tile::leaves_Id || t == Tile::flowing_water_Id || t == Tile::water_Id) placeBlock(level, x, y + hh, z, Tile::log_Id); } for (int yy = y - 3 + treeHeight; yy <= y + treeHeight; yy++) diff --git a/Minecraft.World/TaigaBiome.cpp b/Minecraft.World/TaigaBiome.cpp index 7e9d9e58..5db734e0 100644 --- a/Minecraft.World/TaigaBiome.cpp +++ b/Minecraft.World/TaigaBiome.cpp @@ -53,7 +53,7 @@ void TaigaBiome::decorate(Level *level, Random *random, int xo, int zo) { if (type == 1 || type == 2) { - BlockBlobFeature mossyBoulder(Tile::mossyCobblestone_Id, 0); + BlockBlobFeature mossyBoulder(Tile::mossy_cobblestone_Id, 0); int count = random->nextInt(3); for (int i = 0; i < count; ++i) { diff --git a/Minecraft.World/TallGrass.cpp b/Minecraft.World/TallGrass.cpp index 1b99e587..88e9a7a9 100644 --- a/Minecraft.World/TallGrass.cpp +++ b/Minecraft.World/TallGrass.cpp @@ -94,7 +94,7 @@ int TallGrass::getColor(LevelSource *level, int x, int y, int z, int data) int TallGrass::getResource(int data, Random *random, int playerBonusLevel) { if (random->nextInt(8) == 0) { - return Item::seeds_wheat->id; + return Item::wheat_seeds->id; } return -1; diff --git a/Minecraft.World/TheEndBiomeDecorator.cpp b/Minecraft.World/TheEndBiomeDecorator.cpp index 2b80bcfc..f744f700 100644 --- a/Minecraft.World/TheEndBiomeDecorator.cpp +++ b/Minecraft.World/TheEndBiomeDecorator.cpp @@ -33,8 +33,8 @@ TheEndBiomeDecorator::SPIKE TheEndBiomeDecorator::SpikeValA[8]= TheEndBiomeDecorator::TheEndBiomeDecorator(Biome *biome) : BiomeDecorator(biome) { - spikeFeature = new SpikeFeature(Tile::endStone_Id); - endPodiumFeature = new EndPodiumFeature(Tile::endStone_Id); + spikeFeature = new SpikeFeature(Tile::end_stone_Id); + endPodiumFeature = new EndPodiumFeature(Tile::end_stone_Id); } void TheEndBiomeDecorator::decorate() diff --git a/Minecraft.World/TheEndLevelRandomLevelSource.cpp b/Minecraft.World/TheEndLevelRandomLevelSource.cpp index 3b42f8ca..aa10d5fd 100644 --- a/Minecraft.World/TheEndLevelRandomLevelSource.cpp +++ b/Minecraft.World/TheEndLevelRandomLevelSource.cpp @@ -86,7 +86,7 @@ void TheEndLevelRandomLevelSource::prepareHeights(int xOffs, int zOffs, byteArra int tileId = 0; if (val > 0) { - tileId = Tile::endStone_Id; + tileId = Tile::end_stone_Id; } else { } @@ -119,8 +119,8 @@ void TheEndLevelRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray int runDepth = 1; int run = -1; - byte top = (byte) Tile::endStone_Id; - byte material = (byte) Tile::endStone_Id; + byte top = (byte) Tile::end_stone_Id; + byte material = (byte) Tile::end_stone_Id; for (int y = Level::genDepthMinusOne; y >= 0; y--) { @@ -139,7 +139,7 @@ void TheEndLevelRandomLevelSource::buildSurfaces(int xOffs, int zOffs, byteArray if (runDepth <= 0) { top = 0; - material = static_cast(Tile::endStone_Id); + material = static_cast(Tile::end_stone_Id); } run = runDepth; @@ -320,10 +320,10 @@ void TheEndLevelRandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, if (level->getHeightmap(xp - 1, zp) > 0 || level->getHeightmap(xp + 1, zp) > 0 || level->getHeightmap(xp, zp - 1) > 0 || level->getHeightmap(xp, zp + 1) > 0) { bool hadWater = false; - if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::calmWater_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::calmWater_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::calmWater_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; - if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::calmWater_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp - 1, y, zp) == Tile::water_Id && level->getData(xp - 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp + 1, y, zp) == Tile::water_Id && level->getData(xp + 1, y, zp) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp - 1) == Tile::water_Id && level->getData(xp, y, zp - 1) < 7)) hadWater = true; + if (hadWater || (level->getTile(xp, y, zp + 1) == Tile::water_Id && level->getData(xp, y, zp + 1) < 7)) hadWater = true; if (hadWater) { for (int x2 = -5; x2 <= 5; x2++) @@ -335,7 +335,7 @@ void TheEndLevelRandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, if (d <= 5) { d = 6 - d; - if (level->getTile(xp + x2, y, zp + z2) == Tile::calmWater_Id) + if (level->getTile(xp + x2, y, zp + z2) == Tile::water_Id) { int od = level->getData(xp + x2, y, zp + z2); if (od < 7 && od < d) @@ -348,10 +348,10 @@ void TheEndLevelRandomLevelSource::calcWaterDepths(ChunkSource *parent, int xt, } if (hadWater) { - level->setTileAndData(xp, y, zp, Tile::calmWater_Id, 7, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y, zp, Tile::water_Id, 7, Tile::UPDATE_CLIENTS); for (int y2 = 0; y2 < y; y2++) { - level->setTileAndData(xp, y2, zp, Tile::calmWater_Id, 8, Tile::UPDATE_CLIENTS); + level->setTileAndData(xp, y2, zp, Tile::water_Id, 8, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/Throwable.cpp b/Minecraft.World/Throwable.cpp index 08e40aa6..4d754f28 100644 --- a/Minecraft.World/Throwable.cpp +++ b/Minecraft.World/Throwable.cpp @@ -206,7 +206,7 @@ void Throwable::tick() if (res != nullptr) { - if ( (res->type == HitResult::TILE) && (level->getTile(res->x, res->y, res->z) == Tile::portalTile_Id) ) + if ( (res->type == HitResult::TILE) && (level->getTile(res->x, res->y, res->z) == Tile::portal_Id) ) { handleInsidePortal(); } diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp index 59746272..16075f64 100644 --- a/Minecraft.World/Tile.cpp +++ b/Minecraft.World/Tile.cpp @@ -82,14 +82,14 @@ Tile *Tile::noteblock = nullptr; Tile *Tile::bed = nullptr; Tile *Tile::goldenRail = nullptr; Tile *Tile::detectorRail = nullptr; -PistonBaseTile *Tile::pistonStickyBase = nullptr; +PistonBaseTile *Tile::sticky_piston = nullptr; Tile *Tile::web = nullptr; TallGrass *Tile::tallgrass = nullptr; DeadBushTile *Tile::deadBush = nullptr; PistonBaseTile *Tile::pistonBase = nullptr; -PistonExtensionTile *Tile::pistonExtension = nullptr; -Tile *Tile::wool = nullptr; PistonMovingPiece *Tile::pistonMovingPiece = nullptr; +Tile *Tile::wool = nullptr; +PistonExtensionTile *Tile::pistonExtension = nullptr; Bush *Tile::flower = nullptr; Bush *Tile::rose = nullptr; Bush *Tile::mushroom_brown = nullptr; @@ -117,17 +117,17 @@ Tile *Tile::farmland = nullptr; Tile *Tile::furnace = nullptr; Tile *Tile::furnace_lit = nullptr; Tile *Tile::sign = nullptr; -Tile *Tile::door_wood = nullptr; +Tile *Tile::wooden_door = nullptr; Tile *Tile::ladder = nullptr; Tile *Tile::rail = nullptr; Tile *Tile::stairs_stone = nullptr; Tile *Tile::wallSign = nullptr; Tile *Tile::lever = nullptr; Tile *Tile::pressurePlate_stone = nullptr; -Tile *Tile::door_iron = nullptr; +Tile *Tile::iron_door = nullptr; Tile *Tile::pressurePlate_wood = nullptr; Tile *Tile::redStoneOre = nullptr; -Tile *Tile::redStoneOre_lit = nullptr; +Tile *Tile::lit_redstone_ore = nullptr; Tile *Tile::redstoneTorch_off = nullptr; Tile *Tile::redstoneTorch_on = nullptr; Tile *Tile::button = nullptr; @@ -146,36 +146,36 @@ Tile *Tile::glowstone = nullptr; PortalTile *Tile::portalTile = nullptr; Tile *Tile::litPumpkin = nullptr; Tile *Tile::cake = nullptr; -RepeaterTile *Tile::diode_off = nullptr; -RepeaterTile *Tile::diode_on = nullptr; +RepeaterTile *Tile::unpowered_repeater = nullptr; +RepeaterTile *Tile::powered_repeater = nullptr; Tile *Tile::stained_glass = nullptr; Tile *Tile::trapdoor = nullptr; -Tile *Tile::monsterStoneEgg = nullptr; +Tile *Tile::monster_egg = nullptr; Tile *Tile::stoneBrick = nullptr; -Tile *Tile::hugeMushroom_brown = nullptr; -Tile *Tile::hugeMushroom_red = nullptr; -Tile *Tile::ironFence = nullptr; -Tile *Tile::thinGlass = nullptr; +Tile *Tile::brown_mushroom_block = nullptr; +Tile *Tile::red_mushroom_block = nullptr; +Tile *Tile::iron_bars = nullptr; +Tile *Tile::glass_pane = nullptr; Tile *Tile::melon = nullptr; -Tile *Tile::pumpkinStem = nullptr; -Tile *Tile::melonStem = nullptr; +Tile *Tile::pumpkin_stem = nullptr; +Tile *Tile::melon_stem = nullptr; Tile *Tile::vine = nullptr; Tile *Tile::fenceGate = nullptr; Tile *Tile::stairs_bricks = nullptr; -Tile *Tile::stairs_stoneBrickSmooth = nullptr; +Tile *Tile::stone_brick_stairsSmooth = nullptr; MycelTile *Tile::mycel = nullptr; Tile *Tile::waterLily = nullptr; Tile *Tile::netherBrick = nullptr; Tile *Tile::netherFence = nullptr; -Tile *Tile::stairs_netherBricks = nullptr; +Tile *Tile::nether_brick_stairs = nullptr; Tile *Tile::netherStalk = nullptr; Tile *Tile::enchantTable = nullptr; Tile *Tile::brewingStand = nullptr; CauldronTile *Tile::cauldron = nullptr; -Tile *Tile::endPortalTile = nullptr; -Tile *Tile::endPortalFrameTile = nullptr; +Tile *Tile::end_portal = nullptr; +Tile *Tile::end_portal_frame = nullptr; Tile *Tile::endStone = nullptr; Tile *Tile::dragonEgg = nullptr; Tile *Tile::redstoneLight = nullptr; @@ -203,13 +203,13 @@ Tile *Tile::cocoa = nullptr; Tile *Tile::skull = nullptr; Tile *Tile::cobbleWall = nullptr; -Tile *Tile::flowerPot = nullptr; +Tile *Tile::flower_pot = nullptr; Tile *Tile::carrots = nullptr; Tile *Tile::potatoes = nullptr; Tile *Tile::anvil = nullptr; Tile *Tile::chest_trap = nullptr; -Tile *Tile::weightedPlate_light = nullptr; -Tile *Tile::weightedPlate_heavy = nullptr; +Tile *Tile::light_weighted_pressure_plate = nullptr; +Tile *Tile::heavy_weighted_pressure_plate = nullptr; ComparatorTile *Tile::comparator_off = nullptr; ComparatorTile *Tile::comparator_on = nullptr; @@ -222,7 +222,7 @@ Tile *Tile::quartzBlock = nullptr; Tile *Tile::stairs_quartz = nullptr; Tile *Tile::activatorRail = nullptr; Tile *Tile::dropper = nullptr; -Tile *Tile::clayHardened_colored = nullptr; +Tile *Tile::stained_hardened_clay = nullptr; Tile *Tile::stained_glass_pane = nullptr; Tile *Tile::hayBlock = nullptr; @@ -235,11 +235,11 @@ Tile* Tile::woodStairsAcacia = nullptr; Tile* Tile::woodStairsDark = nullptr; Tile* Tile::iron_trapdoor = nullptr; -Tile* Tile::door_spruce = nullptr; -Tile* Tile::door_birch = nullptr; -Tile* Tile::door_jungle = nullptr; -Tile* Tile::door_acacia = nullptr; -Tile* Tile::door_dark = nullptr; +Tile* Tile::spruce_door = nullptr; +Tile* Tile::birch_door = nullptr; +Tile* Tile::jungle_door = nullptr; +Tile* Tile::acacia_door = nullptr; +Tile* Tile::dark_oak_door = nullptr; Tile* Tile::spruceFence = nullptr; Tile* Tile::birchFence = nullptr; @@ -253,7 +253,7 @@ Tile* Tile::jungleGate = nullptr; Tile* Tile::acaciaGate = nullptr; Tile* Tile::darkGate = nullptr; -Tile* Tile::invertedDaylightDetector = nullptr; +Tile* Tile::daylight_detector_inverted = nullptr; Tile* Tile::red_sandstone = nullptr; Tile* Tile::stairs_red_sandstone = nullptr; HalfSlabTile* Tile::stoneSlab2 = nullptr; @@ -262,11 +262,11 @@ Tile* Tile::seaLantern = nullptr; Tile* Tile::prismarine = nullptr; -Tile* Tile::tree2Trunk = nullptr; +Tile* Tile::log2 = nullptr; Tile* Tile::packedIce = nullptr; Tile* Tile::barrier = nullptr; -TallGrass2* Tile::tallgrass2 = nullptr; +TallGrass2* Tile::double_plant = nullptr; DWORD Tile::tlsIdxShape = TlsAlloc(); @@ -326,10 +326,10 @@ Tile::BlockState Tile::getBlockState(LevelSource *level, int x, int y, int z) return BlockState(defaultBlockState()); } -class TallGrass2TileItem : public ColoredTileItem +class double_plantTileItem : public ColoredTileItem { public: - TallGrass2TileItem(int id) : ColoredTileItem(id, true) {} + double_plantTileItem(int id) : ColoredTileItem(id, true) {} virtual Icon* getIcon(int auxValue) override { @@ -396,7 +396,7 @@ void Tile::staticCtor() Tile::bed = (new BedTile(26)) ->setDestroyTime(0.2f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"bed")->setDescriptionId(IDS_TILE_BED)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_BED); Tile::goldenRail = (new PoweredRailTile(27)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_rail, Item::eMaterial_gold)->setDestroyTime(0.7f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"rail_golden")->setDescriptionId(IDS_TILE_GOLDEN_RAIL)->sendTileData()->setUseDescriptionId(IDS_DESC_POWEREDRAIL)->disableMipmap(); Tile::detectorRail = (new DetectorRailTile(28)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_rail, Item::eMaterial_detector)->setDestroyTime(0.7f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"rail_detector")->setDescriptionId(IDS_TILE_DETECTOR_RAIL)->sendTileData()->setUseDescriptionId(IDS_DESC_DETECTORRAIL)->disableMipmap(); - Tile::pistonStickyBase = static_cast((new PistonBaseTile(29, true))->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_stickypiston)->setIconName(L"pistonStickyBase")->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON)->sendTileData()); + Tile::sticky_piston = static_cast((new PistonBaseTile(29, true))->setBaseItemTypeAndMaterial(Item::eBaseItemType_piston, Item::eMaterial_stickypiston)->setIconName(L"sticky_piston")->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON)->sendTileData()); Tile::web = (new WebTile(30)) ->setLightBlock(1)->setDestroyTime(4.0f)->setIconName(L"web")->setDescriptionId(IDS_TILE_WEB)->setUseDescriptionId(IDS_DESC_WEB); Tile::tallgrass = static_cast((new TallGrass(31))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass")->setDescriptionId(IDS_TILE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap()); @@ -412,8 +412,8 @@ void Tile::staticCtor() Tile::goldBlock = (new MetalTile(41)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_gold)->setDestroyTime(3.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_METAL)->setIconName(L"gold_block")->setDescriptionId(IDS_TILE_BLOCK_GOLD)->setUseDescriptionId(IDS_DESC_BLOCK_GOLD); Tile::ironBlock = (new MetalTile(42)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_iron)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_METAL)->setIconName(L"iron_block")->setDescriptionId(IDS_TILE_BLOCK_IRON)->setUseDescriptionId(IDS_DESC_BLOCK_IRON); - Tile::stoneSlab = static_cast((new FullStoneSlabTile(Tile::stoneSlab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB)); - Tile::stoneSlabHalf = static_cast((new HalfStoneSlabTile(Tile::stoneSlabHalf_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB)); + Tile::stoneSlab = static_cast((new FullStoneSlabTile(Tile::double_stone_slab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB)); + Tile::stoneSlabHalf = static_cast((new HalfStoneSlabTile(Tile::stone_slab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB)); Tile::redBrick = (new Tile(45, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_brick)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"brick")->setDescriptionId(IDS_TILE_BRICK)->setUseDescriptionId(IDS_DESC_BRICK); Tile::tnt = (new TntTile(46)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tnt")->setDescriptionId(IDS_TILE_TNT)->setUseDescriptionId(IDS_DESC_TNT); Tile::bookshelf = (new BookshelfTile(47)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_paper, Item::eMaterial_bookshelf)->setDestroyTime(1.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"bookshelf")->setDescriptionId(IDS_TILE_BOOKSHELF)->setUseDescriptionId(IDS_DESC_BOOKSHELF); @@ -435,22 +435,22 @@ void Tile::staticCtor() Tile::furnace = (new FurnaceTile(61, false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_stone)->setDestroyTime(3.5f)->setSoundType(Tile::SOUND_STONE)->setIconName(L"furnace")->setDescriptionId(IDS_TILE_FURNACE)->sendTileData()->setUseDescriptionId(IDS_DESC_FURNACE); Tile::furnace_lit = (new FurnaceTile(62, true)) ->setDestroyTime(3.5f)->setSoundType(Tile::SOUND_STONE)->setLightEmission(14 / 16.0f)->setIconName(L"furnace")->setDescriptionId(IDS_TILE_FURNACE)->sendTileData()->setUseDescriptionId(IDS_DESC_FURNACE); Tile::sign = (new SignTile(63, eTYPE_SIGNTILEENTITY, true)) ->setDestroyTime(1.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"sign")->setDescriptionId(IDS_TILE_SIGN)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_SIGN); - Tile::door_wood = (new DoorTile(64, Material::wood, L"doorWood"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_wood")->setDescriptionId(IDS_TILE_DOOR_WOOD)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::wooden_door = (new DoorTile(64, Material::wood, L"doorWood"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"wooden_door")->setDescriptionId(IDS_TILE_DOOR_WOOD)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Tile::ladder = (new LadderTile(65)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stick, Item::eMaterial_wood)->setDestroyTime(0.4f)->setSoundType(Tile::SOUND_LADDER)->setIconName(L"ladder")->setDescriptionId(IDS_TILE_LADDER)->sendTileData()->setUseDescriptionId(IDS_DESC_LADDER)->disableMipmap(); Tile::rail = (new RailTile(66)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_rail, Item::eMaterial_iron)->setDestroyTime(0.7f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"rail_normal")->setDescriptionId(IDS_TILE_RAIL)->sendTileData()->setUseDescriptionId(IDS_DESC_RAIL)->disableMipmap(); Tile::stairs_stone =(new StairTile(67, Tile::cobblestone,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stone) ->setIconName(L"stairsStone")->setDescriptionId(IDS_TILE_STAIRS_STONE) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::wallSign = (new SignTile(68, eTYPE_SIGNTILEENTITY, false)) ->setDestroyTime(1.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"sign")->setDescriptionId(IDS_TILE_SIGN)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_SIGN); Tile::lever = (new LeverTile(69)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_lever, Item::eMaterial_wood)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"lever")->setDescriptionId(IDS_TILE_LEVER)->sendTileData()->setUseDescriptionId(IDS_DESC_LEVER); Tile::pressurePlate_stone = (Tile *)(new PressurePlateTile(70, L"stone", Material::stone, PressurePlateTile::mobs)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_stone)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_STONE)->setDescriptionId(IDS_TILE_PRESSURE_PLATE)->sendTileData()->setUseDescriptionId(IDS_DESC_PRESSUREPLATE); - Tile::door_spruce = (new DoorTile(193, Material::wood, L"doorSpruce"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_spruce")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_birch = (new DoorTile(194, Material::wood, L"doorBirch"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_birch")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_jungle = (new DoorTile(195, Material::wood, L"doorJungle"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_jungle")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_acacia = (new DoorTile(196, Material::wood, L"doorAcacia"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_acacia")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_dark = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_dark")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_iron = (new DoorTile(71, Material::metal, L"doorIron"))->setDestroyTime(5.0f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"door_iron")->setDescriptionId(IDS_TILE_DOOR_IRON)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_IRON); + Tile::spruce_door = (new DoorTile(193, Material::wood, L"doorSpruce"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"spruce_door")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::birch_door = (new DoorTile(194, Material::wood, L"doorBirch"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"birch_door")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::jungle_door = (new DoorTile(195, Material::wood, L"doorJungle"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"jungle_door")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::acacia_door = (new DoorTile(196, Material::wood, L"doorAcacia"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"acacia_door")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::dark_oak_door = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"dark_oak_door")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::iron_door = (new DoorTile(71, Material::metal, L"doorIron"))->setDestroyTime(5.0f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"iron_door")->setDescriptionId(IDS_TILE_DOOR_IRON)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_IRON); Tile::pressurePlate_wood = (new PressurePlateTile(72, L"planks_oak", Material::wood, PressurePlateTile::everything)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_wood)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_PRESSURE_PLATE)->sendTileData()->setUseDescriptionId(IDS_DESC_PRESSUREPLATE); Tile::redStoneOre = (new RedStoneOreTile(73,false)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"redstone_ore")->setDescriptionId(IDS_TILE_ORE_REDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); - Tile::redStoneOre_lit = (new RedStoneOreTile(74, true)) ->setLightEmission(10 / 16.0f)->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"redstone_ore")->setDescriptionId(IDS_TILE_ORE_REDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); + Tile::lit_redstone_ore = (new RedStoneOreTile(74, true)) ->setLightEmission(10 / 16.0f)->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"redstone_ore")->setDescriptionId(IDS_TILE_ORE_REDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); Tile::redstoneTorch_off = (new NotGateTile(75, false)) ->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"redstone_torch_off")->setDescriptionId(IDS_TILE_NOT_GATE)->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONETORCH)->disableMipmap(); Tile::redstoneTorch_on = (new NotGateTile(76, true)) ->setDestroyTime(0.0f)->setLightEmission(8 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"redstone_torch_on")->setDescriptionId(IDS_TILE_NOT_GATE)->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONETORCH)->disableMipmap(); Tile::button = (new StoneButtonTile(77)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_button, Item::eMaterial_stone)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_STONE)->setIconName(L"button")->setDescriptionId(IDS_TILE_BUTTON)->sendTileData()->setUseDescriptionId(IDS_DESC_BUTTON); @@ -471,49 +471,49 @@ void Tile::staticCtor() Tile::litPumpkin = (new PumpkinTile(91, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_pumpkin)->setDestroyTime(1.0f)->setSoundType(Tile::SOUND_WOOD)->setLightEmission(1.0f)->setIconName(L"pumpkin")->setDescriptionId(IDS_TILE_LIT_PUMPKIN)->sendTileData()->setUseDescriptionId(IDS_DESC_JACKOLANTERN); Tile::cake = (new CakeTile(92)) ->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_CLOTH)->setIconName(L"cake")->setDescriptionId(IDS_TILE_CAKE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_CAKE); - Tile::diode_off = static_cast((new RepeaterTile(93, false))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_off")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap()); - Tile::diode_on = static_cast((new RepeaterTile(94, true))->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_on")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap()); + Tile::unpowered_repeater = static_cast((new RepeaterTile(93, false))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_off")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap()); + Tile::powered_repeater = static_cast((new RepeaterTile(94, true))->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"repeater_on")->setDescriptionId(IDS_ITEM_DIODE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_REDSTONEREPEATER)->disableMipmap()); Tile::stained_glass = (new StainedGlassBlock(95, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_glass, Item::eMaterial_glass)->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"glass")->setDescriptionId(IDS_TILE_STAINED_GLASS)->setUseDescriptionId(IDS_DESC_STAINED_GLASS); Tile::trapdoor = (new TrapDoorTile(96, Material::wood)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_door, Item::eMaterial_trap)->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"trapdoor")->setDescriptionId(IDS_TILE_TRAPDOOR)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_TRAPDOOR); - Tile::monsterStoneEgg = (new StoneMonsterTile(97)) ->setDestroyTime(0.75f)->setIconName(L"monsterStoneEgg")->setDescriptionId(IDS_TILE_STONE_SILVERFISH)->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH); + Tile::monster_egg = (new StoneMonsterTile(97)) ->setDestroyTime(0.75f)->setIconName(L"monster_egg")->setDescriptionId(IDS_TILE_STONE_SILVERFISH)->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH); Tile::stoneBrick = (new SmoothStoneBrickTile(98)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stoneSmooth)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"stonebrick")->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH)->setUseDescriptionId(IDS_DESC_STONE_BRICK_SMOOTH); - Tile::hugeMushroom_brown = (new HugeMushroomTile(99, Material::wood, HugeMushroomTile::MUSHROOM_TYPE_BROWN)) ->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"mushroom_block")->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_1)->setUseDescriptionId(IDS_DESC_MUSHROOM)->sendTileData(); - Tile::hugeMushroom_red = (new HugeMushroomTile(100, Material::wood, HugeMushroomTile::MUSHROOM_TYPE_RED)) ->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"mushroom_block")->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_2)->setUseDescriptionId(IDS_DESC_MUSHROOM)->sendTileData(); + Tile::brown_mushroom_block = (new HugeMushroomTile(99, Material::wood, HugeMushroomTile::MUSHROOM_TYPE_BROWN)) ->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"mushroom_block")->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_1)->setUseDescriptionId(IDS_DESC_MUSHROOM)->sendTileData(); + Tile::red_mushroom_block = (new HugeMushroomTile(100, Material::wood, HugeMushroomTile::MUSHROOM_TYPE_RED)) ->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"mushroom_block")->setDescriptionId(IDS_TILE_HUGE_MUSHROOM_2)->setUseDescriptionId(IDS_DESC_MUSHROOM)->sendTileData(); - Tile::ironFence = (new ThinFenceTile(101, L"iron_bars", L"iron_bars", Material::metal, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_iron)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_METAL)->setDescriptionId(IDS_TILE_IRON_FENCE)->setUseDescriptionId(IDS_DESC_IRON_FENCE); - Tile::thinGlass = (new ThinFenceTile(102, L"glass", L"glass_pane_top", Material::glass, false)) + Tile::iron_bars = (new ThinFenceTile(101, L"iron_bars", L"iron_bars", Material::metal, true)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_iron)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_METAL)->setDescriptionId(IDS_TILE_IRON_FENCE)->setUseDescriptionId(IDS_DESC_IRON_FENCE); + Tile::glass_pane = (new ThinFenceTile(102, L"glass", L"glass_pane_top", Material::glass, false)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_glass, Item::eMaterial_glass) ->setDestroyTime(0.3f) ->setSoundType(SOUND_GLASS) ->setDescriptionId(IDS_TILE_THIN_GLASS) ->setUseDescriptionId(IDS_DESC_THIN_GLASS); Tile::melon = (new MelonTile(103)) ->setDestroyTime(1.0f)->setSoundType(SOUND_WOOD)->setIconName(L"melon")->setDescriptionId(IDS_TILE_MELON)->setUseDescriptionId(IDS_DESC_MELON_BLOCK); - Tile::pumpkinStem = (new StemTile(104, Tile::pumpkin)) ->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"pumpkin_stem")->setDescriptionId(IDS_TILE_PUMPKIN_STEM)->sendTileData(); - Tile::melonStem = (new StemTile(105, Tile::melon)) ->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"melon_stem")->setDescriptionId(IDS_TILE_MELON_STEM)->sendTileData(); + Tile::pumpkin_stem = (new StemTile(104, Tile::pumpkin)) ->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"pumpkin_stem")->setDescriptionId(IDS_TILE_PUMPKIN_STEM)->sendTileData(); + Tile::melon_stem = (new StemTile(105, Tile::melon)) ->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"melon_stem")->setDescriptionId(IDS_TILE_MELON_STEM)->sendTileData(); Tile::vine = (new VineTile(106))->setDestroyTime(0.2f) ->setSoundType(SOUND_GRASS)->setIconName(L"vine")->setDescriptionId(IDS_TILE_VINE)->setUseDescriptionId(IDS_DESC_VINE)->sendTileData(); Tile::fenceGate = (new FenceGateTile(107))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fenceGate, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"planks_oak")->setDescriptionId(IDS_TILE_FENCE_GATE)->sendTileData()->setUseDescriptionId(IDS_DESC_FENCE_GATE); Tile::stairs_bricks = (new StairTile(108, Tile::redBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_brick) ->setIconName(L"stairsBrick")->setDescriptionId(IDS_TILE_STAIRS_BRICKS) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); - Tile::stairs_stoneBrickSmooth = (new StairTile(109, Tile::stoneBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stoneSmooth)->setIconName(L"stairsStoneBrickSmooth")->setDescriptionId(IDS_TILE_STAIRS_STONE_BRICKS_SMOOTH) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); + Tile::stone_brick_stairsSmooth = (new StairTile(109, Tile::stoneBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_stoneSmooth)->setIconName(L"stairsStoneBrickSmooth")->setDescriptionId(IDS_TILE_STAIRS_STONE_BRICKS_SMOOTH) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::mycel = static_cast((new MycelTile(110))->setDestroyTime(0.6f)->setSoundType(SOUND_GRASS)->setIconName(L"mycelium")->setDescriptionId(IDS_TILE_MYCEL)->setUseDescriptionId(IDS_DESC_MYCEL)); Tile::waterLily = (new WaterlilyTile(111)) ->setDestroyTime(0.0f)->setSoundType(SOUND_GRASS)->setIconName(L"waterlily")->setDescriptionId(IDS_TILE_WATERLILY)->setUseDescriptionId(IDS_DESC_WATERLILY); Tile::netherBrick = (new Tile(112, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_netherbrick)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"nether_brick")->setDescriptionId(IDS_TILE_NETHERBRICK)->setUseDescriptionId(IDS_DESC_NETHERBRICK); Tile::netherFence = (new FenceTile(113, L"nether_brick", Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_netherbrick)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setDescriptionId(IDS_TILE_NETHERFENCE)->setUseDescriptionId(IDS_DESC_NETHERFENCE); - Tile::stairs_netherBricks = (new StairTile(114, Tile::netherBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_netherbrick)->setIconName(L"stairsNetherBrick")->setDescriptionId(IDS_TILE_STAIRS_NETHERBRICK) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); + Tile::nether_brick_stairs = (new StairTile(114, Tile::netherBrick,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_netherbrick)->setIconName(L"stairsNetherBrick")->setDescriptionId(IDS_TILE_STAIRS_NETHERBRICK) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::netherStalk = (new NetherWartTile(115)) ->setIconName(L"nether_wart")->setDescriptionId(IDS_TILE_NETHERSTALK)->sendTileData()->setUseDescriptionId(IDS_DESC_NETHERSTALK); Tile::enchantTable = (new EnchantmentTableTile(116)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_magic)->setDestroyTime(5.0f)->setExplodeable(2000)->setIconName(L"enchanting_table")->setDescriptionId(IDS_TILE_ENCHANTMENTTABLE)->setUseDescriptionId(IDS_DESC_ENCHANTMENTTABLE); Tile::brewingStand = (new BrewingStandTile(117)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_blaze)->setDestroyTime(0.5f)->setLightEmission(2 / 16.0f)->setIconName(L"brewing_stand")->setDescriptionId(IDS_TILE_BREWINGSTAND)->sendTileData()->setUseDescriptionId(IDS_DESC_BREWING_STAND); Tile::cauldron = static_cast((new CauldronTile(118))->setDestroyTime(2.0f)->setIconName(L"cauldron")->setDescriptionId(IDS_TILE_CAULDRON)->sendTileData()->setUseDescriptionId(IDS_DESC_CAULDRON)); - Tile::endPortalTile = (new TheEndPortal(119, Material::portal)) ->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setExplodeable(6000000)->setDescriptionId(IDS_TILE_END_PORTAL)->setUseDescriptionId(IDS_DESC_END_PORTAL); - Tile::endPortalFrameTile = (new TheEndPortalFrameTile(120)) ->setSoundType(SOUND_GLASS)->setLightEmission(2 / 16.0f)->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setIconName(L"endframe")->setDescriptionId(IDS_TILE_ENDPORTALFRAME)->sendTileData()->setExplodeable(6000000)->setUseDescriptionId(IDS_DESC_ENDPORTALFRAME); + Tile::end_portal = (new TheEndPortal(119, Material::portal)) ->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setExplodeable(6000000)->setDescriptionId(IDS_TILE_END_PORTAL)->setUseDescriptionId(IDS_DESC_END_PORTAL); + Tile::end_portal_frame = (new TheEndPortalFrameTile(120)) ->setSoundType(SOUND_GLASS)->setLightEmission(2 / 16.0f)->setDestroyTime(INDESTRUCTIBLE_DESTROY_TIME)->setIconName(L"endframe")->setDescriptionId(IDS_TILE_ENDPORTALFRAME)->sendTileData()->setExplodeable(6000000)->setUseDescriptionId(IDS_DESC_ENDPORTALFRAME); Tile::endStone = (new Tile(121, Material::stone)) ->setDestroyTime(3.0f)->setExplodeable(15)->setSoundType(SOUND_STONE)->setIconName(L"end_stone")->setDescriptionId(IDS_TILE_WHITESTONE)->setUseDescriptionId(IDS_DESC_WHITESTONE); Tile::dragonEgg = (new EggTile(122)) ->setDestroyTime(3.0f)->setExplodeable(15)->setSoundType(SOUND_STONE)->setLightEmission(2.0f / 16.0f)->setIconName(L"dragon_egg")->setDescriptionId(IDS_TILE_DRAGONEGG)->setUseDescriptionId(IDS_DESC_DRAGONEGG); Tile::redstoneLight = (new RedlightTile(123, false)) ->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"redstone_lamp_off")->setDescriptionId(IDS_TILE_REDSTONE_LIGHT)->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT); Tile::redstoneLight_lit = (new RedlightTile(124, true)) ->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"redstone_lamp_on")->setDescriptionId(IDS_TILE_REDSTONE_LIGHT)->setUseDescriptionId(IDS_DESC_REDSTONE_LIGHT); - Tile::woodSlab = static_cast((new FullWoodSlabTile(Tile::woodSlab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB)); - Tile::woodSlabHalf = static_cast((new HalfWoodSlabTile(Tile::woodSlabHalf_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB)); + Tile::woodSlab = static_cast((new FullWoodSlabTile(Tile::double_wooden_slab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB)); + Tile::woodSlabHalf = static_cast((new HalfWoodSlabTile(Tile::wooden_slab_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_wood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB)); Tile::cocoa = (new CocoaTile(127)) ->setDestroyTime(0.2f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"cocoa")->sendTileData()->setDescriptionId(IDS_TILE_COCOA)->setUseDescriptionId(IDS_DESC_COCOA); Tile::stairs_sandstone = (new StairTile(128, Tile::sandStone,0)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand) ->setIconName(L"stairsSandstone")->setDescriptionId(IDS_TILE_STAIRS_SANDSTONE) ->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); @@ -530,7 +530,7 @@ void Tile::staticCtor() Tile::commandBlock = (new CommandBlock(137)) ->setIndestructible()->setExplodeable(6000000)->setIconName(L"command_block")->setDescriptionId(IDS_TILE_COMMAND_BLOCK)->setUseDescriptionId(IDS_DESC_COMMAND_BLOCK); Tile::beacon = static_cast((new BeaconTile(138))->setLightEmission(1.0f)->setIconName(L"beacon")->setDescriptionId(IDS_TILE_BEACON)->setUseDescriptionId(IDS_DESC_BEACON)); Tile::cobbleWall = (new WallTile(139, Tile::stoneBrick)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_stone)->setIconName(L"cobbleWall")->setDescriptionId(IDS_TILE_COBBLESTONE_WALL)->setUseDescriptionId(IDS_DESC_COBBLESTONE_WALL); - Tile::flowerPot = (new FlowerPotTile(140)) ->setDestroyTime(0.0f)->setSoundType(SOUND_NORMAL)->setIconName(L"flower_pot")->setDescriptionId(IDS_TILE_FLOWERPOT)->setUseDescriptionId(IDS_DESC_FLOWERPOT); + Tile::flower_pot = (new FlowerPotTile(140)) ->setDestroyTime(0.0f)->setSoundType(SOUND_NORMAL)->setIconName(L"flower_pot")->setDescriptionId(IDS_TILE_FLOWERPOT)->setUseDescriptionId(IDS_DESC_FLOWERPOT); Tile::carrots = (new CarrotTile(141)) ->setIconName(L"carrots")->setDescriptionId(IDS_TILE_CARROTS)->setUseDescriptionId(IDS_DESC_CARROTS)->disableMipmap(); Tile::potatoes = (new PotatoTile(142)) ->setIconName(L"potatoes")->setDescriptionId(IDS_TILE_POTATOES)->setUseDescriptionId(IDS_DESC_POTATO)->disableMipmap(); @@ -538,8 +538,8 @@ void Tile::staticCtor() Tile::skull = (new SkullTile(144)) ->setDestroyTime(1.0f)->setSoundType(SOUND_STONE)->setIconName(L"skull")->setDescriptionId(IDS_TILE_SKULL)->setUseDescriptionId(IDS_DESC_SKULL); Tile::anvil = (new AnvilTile(145)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_device, Item::eMaterial_iron)->setDestroyTime(5.0f)->setSoundType(SOUND_ANVIL)->setExplodeable(2000)->setIconName(L"anvil")->sendTileData()->setDescriptionId(IDS_TILE_ANVIL)->setUseDescriptionId(IDS_DESC_ANVIL); Tile::chest_trap = (new ChestTile(146, ChestTile::TYPE_TRAP)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_chest, Item::eMaterial_trap)->setDestroyTime(2.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_CHEST_TRAP)->setUseDescriptionId(IDS_DESC_CHEST_TRAP); - Tile::weightedPlate_light = (new WeightedPressurePlateTile(147, L"gold_block", Material::metal, Redstone::SIGNAL_MAX)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_gold)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_LIGHT)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_LIGHT); - Tile::weightedPlate_heavy = (new WeightedPressurePlateTile(148, L"iron_block", Material::metal, Redstone::SIGNAL_MAX * 10))->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_iron)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_HEAVY)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_HEAVY); + Tile::light_weighted_pressure_plate = (new WeightedPressurePlateTile(147, L"gold_block", Material::metal, Redstone::SIGNAL_MAX)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_gold)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_LIGHT)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_LIGHT); + Tile::heavy_weighted_pressure_plate = (new WeightedPressurePlateTile(148, L"iron_block", Material::metal, Redstone::SIGNAL_MAX * 10))->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_iron)->setDestroyTime(0.5f)->setSoundType(SOUND_WOOD)->setDescriptionId(IDS_TILE_WEIGHTED_PLATE_HEAVY)->setUseDescriptionId(IDS_DESC_WEIGHTED_PLATE_HEAVY); Tile::comparator_off = static_cast((new ComparatorTile(149, false))->setDestroyTime(0.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_off")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR)); Tile::comparator_on = static_cast((new ComparatorTile(150, true))->setDestroyTime(0.0f)->setLightEmission(10 / 16.0f)->setSoundType(SOUND_WOOD)->setIconName(L"comparator_on")->setDescriptionId(IDS_TILE_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR)); @@ -551,10 +551,10 @@ 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::stained_hardened_clay = (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::stained_glass_pane = (new StainedGlassPaneBlock(160)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_glass, Item::eMaterial_glass)->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"glass")->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE)->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE); // - Tile::tree2Trunk = (new TreeTile2(162))->setDestroyTime(2.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->sendTileData()->setUseDescriptionId(IDS_DESC_LOG); + Tile::log2 = (new TreeTile2(162))->setDestroyTime(2.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->sendTileData()->setUseDescriptionId(IDS_DESC_LOG); Tile::woodStairsAcacia = (new StairTile(163, Tile::wood, TreeTile::ACACIA_TRUNK))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_acaciawood)->setIconName(L"stairsWoodAcacia")->setDescriptionId(IDS_TILE_STAIRS_ACACIAWOOD)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::woodStairsDark = (new StairTile(164, Tile::wood, TreeTile::DARK_TRUNK))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_darkwood)->setIconName(L"stairsWoodDark")->setDescriptionId(IDS_TILE_STAIRS_DARKWOOD)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::barrier = (new BarrierTile(166, Material::stone, false)) ->setIndestructible()->setExplodeable(6000000)->setSoundType(Tile::SOUND_STONE)->setIconName(L"barrier")->setDescriptionId(IDS_TILE_BARRIER)->setNotCollectStatistics()->setUseDescriptionId(IDS_DESC_BARRIER); @@ -568,9 +568,9 @@ void Tile::staticCtor() // Tile::packedIce = (new PackedIceTile(174))->setDestroyTime(0.5f)->setSoundType(SOUND_GLASS)->setIconName(L"packed_ice")->setDescriptionId(IDS_TILE_PACKED_ICE)->setUseDescriptionId(IDS_DESC_PACKED_ICE); - Tile::invertedDaylightDetector = static_cast((new DaylightDetectorTile(178, true))->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"daylight_detector")->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR)->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR)); + Tile::daylight_detector_inverted = static_cast((new DaylightDetectorTile(178, true))->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"daylight_detector")->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR)->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR)); Tile::red_sandstone = (new RedSandStoneTile(red_sandstone_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_sand)->setSoundType(Tile::SOUND_STONE)->setDestroyTime(0.8f)->sendTileData()->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_RED_SANDSTONE)->sendTileData(); - Tile::stairs_red_sandstone = (new StairTile(stairs_red_sandstone_Id, Tile::red_sandstone, 0))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand)->setIconName(L"stairsRedSandstone")->setDescriptionId(IDS_TILE_STAIRS_RED_SANDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); + Tile::stairs_red_sandstone = (new StairTile(red_sandstone_stairs_Id, Tile::red_sandstone, 0))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand)->setIconName(L"stairsRedSandstone")->setDescriptionId(IDS_TILE_STAIRS_RED_SANDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS); Tile::stoneSlab2 = static_cast((new FullStoneSlabTile2(double_stone_slab2_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_slab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->sendTileData()->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_SLAB)); Tile::stoneSlab2Half = static_cast((new HalfStoneSlabTile2(stone_slab2_Id))->setBaseItemTypeAndMaterial(Item::eBaseItemType_halfslab, Item::eMaterial_stone)->setDestroyTime(2.0f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->sendTileData()->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_HALFSLAB)); @@ -590,25 +590,25 @@ void Tile::staticCtor() Tile::seaLantern = (new SeaLanternTile(169, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_SEA_LANTERN); Tile::prismarine = (new PrismarineTile(168))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"prismarine")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_DESC_PRISMARINE); - Tile::tallgrass2 = static_cast((new TallGrass2(175))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass2_tall_grass_upper")->setDescriptionId(IDS_DESC_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap()->sendTileData(0xFF)); + Tile::double_plant = static_cast((new TallGrass2(175))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass2_tall_grass_upper")->setDescriptionId(IDS_DESC_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap()->sendTileData(0xFF)); // 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[stained_hardened_clay_Id]= ( new WoolTileItem(Tile::stained_hardened_clay_Id - 256))->setIconName(L"clayHardenedStained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY); Item::items[stained_glass_Id] = ( new WoolTileItem(Tile::stained_glass_Id - 256))->setIconName(L"stainedGlass")->setDescriptionId(IDS_TILE_STAINED_GLASS)->setUseDescriptionId(IDS_DESC_STAINED_GLASS); Item::items[stained_glass_pane_Id] = ( new WoolTileItem(Tile::stained_glass_pane_Id - 256))->setIconName(L"stainedGlassPane")->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE)->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE); - 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, 6))->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, 6, IDS_TILE_PLANKS))->setIconName(L"wood")->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS)->setUseDescriptionId(IDS_DESC_LOG); // <- TODO - Item::items[monsterStoneEgg_Id] = ( new MultiTextureTileItem(Tile::monsterStoneEgg_Id - 256, monsterStoneEgg, (int *)StoneMonsterTile::STONE_MONSTER_NAMES, 3))->setIconName(L"monsterStoneEgg")->setDescriptionId(IDS_TILE_STONE_SILVERFISH)->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH); // 4J - Brought forward from post-1.2 to fix stacking problem + Item::items[carpet_Id] = ( new WoolTileItem(Tile::carpet_Id - 256))->setIconName(L"woolCarpet")->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET); + Item::items[log_Id] = (new MultiTextureTileItem(Tile::log_Id - 256, treeTrunk, (int*)TreeTile::TREE_NAMES, 6))->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG); + Item::items[planks_Id] = (new MultiTextureTileItem(Tile::planks_Id - 256, Tile::wood, (int*)WoodTile::WOOD_NAMES, 6, IDS_TILE_PLANKS))->setIconName(L"wood")->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS)->setUseDescriptionId(IDS_DESC_LOG); // <- TODO + Item::items[monster_egg_Id] = ( new MultiTextureTileItem(Tile::monster_egg_Id - 256, monster_egg, (int *)StoneMonsterTile::STONE_MONSTER_NAMES, 3))->setIconName(L"monster_egg")->setDescriptionId(IDS_TILE_STONE_SILVERFISH)->setUseDescriptionId(IDS_DESC_STONE_SILVERFISH); // 4J - Brought forward from post-1.2 to fix stacking problem Item::items[stone_Id] = ( new MultiTextureTileItem(Tile::stone_Id - 256,Tile::stone,(int*)StoneTile::STONE_NAMES, StoneTile::STONE_NAMES_LENGTH))->setIconName(L"stone")->setDescriptionId(IDS_TILE_STONE); - Item::items[stoneBrick_Id] = ( new MultiTextureTileItem(Tile::stoneBrick_Id - 256, stoneBrick,(int *)SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES, 4))->setIconName(L"stonebricksmooth")->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH); - Item::items[sandStone_Id] = ( new MultiTextureTileItem(sandStone_Id - 256, sandStone, SandStoneTile::SANDSTONE_NAMES, SandStoneTile::SANDSTONE_BLOCK_NAMES) )->setIconName(L"sandStone")->setDescriptionId(IDS_TILE_SANDSTONE)->setUseDescriptionId(IDS_DESC_SANDSTONE); - Item::items[quartzBlock_Id] = ( new MultiTextureTileItem(quartzBlock_Id - 256, quartzBlock, QuartzBlockTile::BLOCK_NAMES, QuartzBlockTile::QUARTZ_BLOCK_NAMES) )->setIconName(L"quartzBlock")->setDescriptionId(IDS_TILE_QUARTZ_BLOCK)->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK); - Item::items[stoneSlabHalf_Id] = ( new StoneSlabTileItem(Tile::stoneSlabHalf_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, false) )->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB); - Item::items[stoneSlab_Id] = ( new StoneSlabTileItem(Tile::stoneSlab_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, true))->setIconName(L"stoneSlab")->setDescriptionId(IDS_DESC_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB); - Item::items[woodSlabHalf_Id] = ( new StoneSlabTileItem(Tile::woodSlabHalf_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, false))->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB); - Item::items[woodSlab_Id] = ( new StoneSlabTileItem(Tile::woodSlab_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, true))->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB); + Item::items[stonebrick_Id] = ( new MultiTextureTileItem(Tile::stonebrick_Id - 256, stoneBrick,(int *)SmoothStoneBrickTile::SMOOTH_STONE_BRICK_NAMES, 4))->setIconName(L"stonebricksmooth")->setDescriptionId(IDS_TILE_STONE_BRICK_SMOOTH); + Item::items[sandstone_Id] = ( new MultiTextureTileItem(sandstone_Id - 256, sandStone, SandStoneTile::SANDSTONE_NAMES, SandStoneTile::SANDSTONE_BLOCK_NAMES) )->setIconName(L"sandStone")->setDescriptionId(IDS_TILE_SANDSTONE)->setUseDescriptionId(IDS_DESC_SANDSTONE); + Item::items[quartz_block_Id] = ( new MultiTextureTileItem(quartz_block_Id - 256, quartzBlock, QuartzBlockTile::BLOCK_NAMES, QuartzBlockTile::QUARTZ_BLOCK_NAMES) )->setIconName(L"quartzBlock")->setDescriptionId(IDS_TILE_QUARTZ_BLOCK)->setUseDescriptionId(IDS_DESC_QUARTZ_BLOCK); + Item::items[stone_slab_Id] = ( new StoneSlabTileItem(Tile::stone_slab_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, false) )->setIconName(L"stoneSlab")->setDescriptionId(IDS_TILE_STONESLAB)->setUseDescriptionId(IDS_DESC_HALFSLAB); + Item::items[double_stone_slab_Id] = ( new StoneSlabTileItem(Tile::double_stone_slab_Id - 256, Tile::stoneSlabHalf, Tile::stoneSlab, true))->setIconName(L"stoneSlab")->setDescriptionId(IDS_DESC_STONESLAB)->setUseDescriptionId(IDS_DESC_SLAB); + Item::items[wooden_slab_Id] = ( new StoneSlabTileItem(Tile::wooden_slab_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, false))->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB); + Item::items[double_wooden_slab_Id] = ( new StoneSlabTileItem(Tile::double_wooden_slab_Id - 256, Tile::woodSlabHalf, Tile::woodSlab, true))->setIconName(L"woodSlab")->setDescriptionId(IDS_DESC_WOODSLAB)->setUseDescriptionId(IDS_DESC_WOODSLAB); Item::items[sapling_Id] = (new MultiTextureTileItem(Tile::sapling_Id - 256, Tile::sapling, Sapling::SAPLING_NAMES, Sapling::SAPLING_NAMES_SIZE))->setIconName(L"sapling")->setDescriptionId(IDS_TILE_SAPLING)->setUseDescriptionId(IDS_DESC_SAPLING);; //Item::items[sapling2_Id] = ( new MultiTextureTileItem(Tile::sapling2_Id - 256, Tile::sapling2, Sapling2::SAPLING_NAMES, 2) )->setIconName(L"sapling2")->setDescriptionId(IDS_TILE_SAPLING)->setUseDescriptionId(IDS_DESC_SAPLING); Item::items[leaves_Id] = ( new LeafTileItem(Tile::leaves_Id - 256) )->setIconName(L"leaves")->setDescriptionId(IDS_TILE_LEAVES)->setUseDescriptionId(IDS_DESC_LEAVES); @@ -617,23 +617,23 @@ void Tile::staticCtor() int idsData[3] = {IDS_TILE_SHRUB, IDS_TILE_TALL_GRASS, IDS_TILE_FERN}; intArray ids = intArray(idsData, 3); Item::items[tallgrass_Id] = static_cast((new ColoredTileItem(Tile::tallgrass_Id - 256, true))->setDescriptionId(IDS_TILE_TALL_GRASS))->setDescriptionPostfixes(ids); - Item::items[topSnow_Id] = ( new SnowItem(topSnow_Id - 256, topSnow) ); - Item::items[waterLily_Id] = ( new WaterLilyTileItem(Tile::waterLily_Id - 256)); - Item::items[pistonBase_Id] = ( new PistonTileItem(Tile::pistonBase_Id - 256) )->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(IDS_DESC_PISTON); - Item::items[pistonStickyBase_Id] = ( new PistonTileItem(Tile::pistonStickyBase_Id - 256) )->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON); - Item::items[cobbleWall_Id] = ( new MultiTextureTileItem(cobbleWall_Id - 256, cobbleWall, (int *)WallTile::COBBLE_NAMES, 2) )->setDescriptionId(IDS_TILE_COBBLESTONE_WALL)->setUseDescriptionId(IDS_DESC_COBBLESTONE_WALL); + Item::items[snow_layer_Id] = ( new SnowItem(snow_layer_Id - 256, topSnow) ); + Item::items[waterlily_Id] = ( new WaterLilyTileItem(Tile::waterlily_Id - 256)); + Item::items[piston_Id] = ( new PistonTileItem(Tile::piston_Id - 256) )->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(IDS_DESC_PISTON); + Item::items[sticky_piston_Id] = ( new PistonTileItem(Tile::sticky_piston_Id - 256) )->setDescriptionId(IDS_TILE_PISTON_STICK_BASE)->setUseDescriptionId(IDS_DESC_STICKY_PISTON); + Item::items[cobblestone_wall_Id] = ( new MultiTextureTileItem(cobblestone_wall_Id - 256, cobbleWall, (int *)WallTile::COBBLE_NAMES, 2) )->setDescriptionId(IDS_TILE_COBBLESTONE_WALL)->setUseDescriptionId(IDS_DESC_COBBLESTONE_WALL); Item::items[anvil_Id] = ( new AnvilTileItem(anvil) )->setDescriptionId(IDS_TILE_ANVIL)->setUseDescriptionId(IDS_DESC_ANVIL); Item::items[dirt_Id] = (new MultiTextureTileItem(Tile::dirt_Id - 256, dirt, (int*)DirtTile::DIRT_NAMES, 3))->setIconName(L"dirt")->setDescriptionId(IDS_TILE_DIRT)->setUseDescriptionId(IDS_DESC_DIRT); - Item::items[rose_Id] = (new MultiTextureTileItem(Tile::rose_Id - 256, rose, (int*)Rose::FLOWER_NAMES, Rose::FLOWER_NAMES_LENGTH))->setIconName(L"flower_rose")->setDescriptionId(IDS_TILE_ROSE)->setUseDescriptionId(IDS_DESC_FLOWER); + Item::items[red_flower_Id] = (new MultiTextureTileItem(Tile::red_flower_Id - 256, rose, (int*)Rose::FLOWER_NAMES, Rose::FLOWER_NAMES_LENGTH))->setIconName(L"flower_rose")->setDescriptionId(IDS_TILE_ROSE)->setUseDescriptionId(IDS_DESC_FLOWER); Item::items[sand_Id] = (new MultiTextureTileItem(Tile::sand_Id - 256, sand, (int*)SandTile::SAND_NAMES, SandTile::SAND_NAMES_LENGTH))->setIconName(L"sand")->setDescriptionId(IDS_TILE_SAND)->setUseDescriptionId(IDS_DESC_SAND); Item::items[red_sandstone_Id] = (new MultiTextureTileItem(Tile::red_sandstone_Id - 256, red_sandstone, (int*)RedSandStoneTile::SANDSTONE_NAMES, RedSandStoneTile::SANDSTONE_BLOCK_NAMES))->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_SANDSTONE); Item::items[stone_slab2_Id] = (new StoneSlabTileItem(Tile::stone_slab2_Id - 256, Tile::stoneSlab2Half, Tile::stoneSlab2, false))->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_HALFSLAB); Item::items[double_stone_slab2_Id] = (new StoneSlabTileItem(Tile::double_stone_slab2_Id - 256, Tile::stoneSlab2Half, Tile::stoneSlab2, true))->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_SLAB); - Item::items[tree2Trunk_Id] = (new MultiTextureTileItem(Tile::tree2Trunk_Id - 256, tree2Trunk, (int*)TreeTile2::TREE_NAMES, TreeTile2::TREE_NAMES_LENGTH))->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG); + Item::items[log2_Id] = (new MultiTextureTileItem(Tile::log2_Id - 256, log2, (int*)TreeTile2::TREE_NAMES, TreeTile2::TREE_NAMES_LENGTH))->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG); Item::items[sponge_Id] = (new MultiTextureTileItem(Tile::sponge_Id - 256, sponge, (int*)Sponge::SPONGE_NAMES, Sponge::SPONGE_NAMES_LENGTH))->setIconName(L"sponge")->setDescriptionId(IDS_TILE_SPONGE)->setUseDescriptionId(IDS_DESC_SPONGE); - int tallgrass2IdsData[TallGrass2::VARIANT_COUNT] = { + int double_plantIdsData[TallGrass2::VARIANT_COUNT] = { IDS_TILE_SUNFLOWER, // 0 - Sunflower, not implemented yet IDS_TILE_LILAC, // 1 - Lilac IDS_TILE_DOUBLE_TALL_GRASS, // 2 - Tall Grass @@ -641,8 +641,8 @@ void Tile::staticCtor() IDS_TILE_ROSE_BUSH, // 4 - Rose Bush IDS_TILE_PEONY, // 5 - Peony }; - intArray tallgrass2Ids = intArray(tallgrass2IdsData, 6); - Item::items[tallgrass2_Id] = static_cast((new TallGrass2TileItem(Tile::tallgrass2_Id - 256))->setDescriptionId(IDS_TILE_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS))->setDescriptionPostfixes(tallgrass2Ids); + intArray double_plantIds = intArray(double_plantIdsData, 6); + Item::items[double_plant_Id] = static_cast((new double_plantTileItem(Tile::double_plant_Id - 256))->setDescriptionId(IDS_TILE_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS))->setDescriptionPostfixes(double_plantIds); for (int i = 0; i < 256; i++) { @@ -1408,8 +1408,8 @@ void Tile::playerDestroy(Level *level, shared_ptr player, int x, int y, player->awardStat(GenericStats::totalBlocksMined(), GenericStats::param_noArgs()); // 4J : WESTY : Added for other award. player->causeFoodExhaustion(FoodConstants::EXHAUSTION_MINE); - if( id == Tile::treeTrunk_Id ) - if( id == Tile::treeTrunk_Id || id == Tile::tree2Trunk_Id ) + if( id == Tile::log_Id ) + if( id == Tile::log_Id || id == Tile::log2_Id ) player->awardStat(GenericStats::mineWood(), GenericStats::param_noArgs()); @@ -1743,82 +1743,82 @@ const int Tile::stone_Id; const int Tile::grass_Id; const int Tile::dirt_Id; // 4 -const int Tile::wood_Id; +const int Tile::planks_Id; const int Tile::sapling_Id; const int Tile::sapling2_Id; -const int Tile::unbreakable_Id; +const int Tile::bedrock_Id; +const int Tile::flowing_water_Id; const int Tile::water_Id; -const int Tile::calmWater_Id; +const int Tile::flowing_lava_Id; const int Tile::lava_Id; -const int Tile::calmLava_Id; const int Tile::sand_Id; const int Tile::gravel_Id; -const int Tile::goldOre_Id; -const int Tile::ironOre_Id; -const int Tile::coalOre_Id; -const int Tile::treeTrunk_Id; +const int Tile::gold_ore_Id; +const int Tile::iron_ore_Id; +const int Tile::coal_ore_Id; +const int Tile::log_Id; const int Tile::leaves_Id; const int Tile::leaves2_Id; const int Tile::sponge_Id; const int Tile::glass_Id; -const int Tile::lapisOre_Id; -const int Tile::lapisBlock_Id; +const int Tile::lapis_ore_Id; +const int Tile::lapis_block_Id; const int Tile::dispenser_Id; -const int Tile::sandStone_Id; +const int Tile::sandstone_Id; // 25 const int Tile::bed_Id; -const int Tile::goldenRail_Id; -const int Tile::detectorRail_Id; -const int Tile::pistonStickyBase_Id; +const int Tile::golden_rail_Id; +const int Tile::detector_rail_Id; +const int Tile::sticky_piston_Id; const int Tile::web_Id; const int Tile::tallgrass_Id; -const int Tile::deadBush_Id; -const int Tile::pistonBase_Id; -const int Tile::pistonExtensionPiece_Id; -const int Tile::wool_Id; +const int Tile::deadbush_Id; +const int Tile::piston_Id; const int Tile::pistonMovingPiece_Id; -const int Tile::flower_Id; -const int Tile::rose_Id; +const int Tile::wool_Id; +const int Tile::piston_extension_Id; +const int Tile::yellow_flower_Id; +const int Tile::red_flower_Id; const int Tile::mushroom_brown_Id; const int Tile::mushroom_red_Id; -const int Tile::goldBlock_Id; -const int Tile::ironBlock_Id; -const int Tile::stoneSlab_Id; -const int Tile::stoneSlabHalf_Id; -const int Tile::redBrick_Id; +const int Tile::gold_block_Id; +const int Tile::iron_block_Id; +const int Tile::double_stone_slab_Id; +const int Tile::stone_slab_Id; +const int Tile::brick_block_Id; const int Tile::tnt_Id; const int Tile::bookshelf_Id; -const int Tile::mossyCobblestone_Id; +const int Tile::mossy_cobblestone_Id; const int Tile::obsidian_Id; const int Tile::torch_Id; const int Tile::fire_Id; -const int Tile::mobSpawner_Id; -const int Tile::stairs_wood_Id; +const int Tile::mob_spawner_Id; +const int Tile::oak_stairs_Id; const int Tile::chest_Id; -const int Tile::redStoneDust_Id; -const int Tile::diamondOre_Id; -const int Tile::diamondBlock_Id; -const int Tile::workBench_Id; +const int Tile::redstone_wire_Id; +const int Tile::diamond_ore_Id; +const int Tile::diamond_block_Id; +const int Tile::crafting_table_Id; const int Tile::wheat_Id; const int Tile::farmland_Id; const int Tile::furnace_Id; -const int Tile::furnace_lit_Id; -const int Tile::sign_Id; -const int Tile::door_wood_Id; +const int Tile::lit_furnace_Id; +const int Tile::standing_sign_Id; +const int Tile::wooden_door_Id; const int Tile::ladder_Id; const int Tile::rail_Id; -const int Tile::stairs_stone_Id; -const int Tile::wallSign_Id; +const int Tile::stone_stairs_Id; +const int Tile::wall_standing_sign_Id; const int Tile::lever_Id; -const int Tile::pressurePlate_stone_Id; -const int Tile::door_iron_Id; -const int Tile::pressurePlate_wood_Id; -const int Tile::redStoneOre_Id; -const int Tile::redStoneOre_lit_Id; -const int Tile::redstoneTorch_off_Id; -const int Tile::redstoneTorch_on_Id; -const int Tile::button_stone_Id; -const int Tile::topSnow_Id; +const int Tile::stone_pressure_plate_Id; +const int Tile::iron_door_Id; +const int Tile::wooden_pressure_plate_Id; +const int Tile::redstone_ore_Id; +const int Tile::lit_redstone_ore_Id; +const int Tile::unlit_redstone_torch_Id; +const int Tile::redstone_torch_Id; +const int Tile::stone_button_Id; +const int Tile::snow_layer_Id; const int Tile::ice_Id; const int Tile::snow_Id; const int Tile::cactus_Id; @@ -1827,67 +1827,67 @@ const int Tile::reeds_Id; const int Tile::jukebox_Id; const int Tile::fence_Id; const int Tile::pumpkin_Id; -const int Tile::netherRack_Id; -const int Tile::soulsand_Id; +const int Tile::netherrack_Id; +const int Tile::soul_sand_Id; const int Tile::glowstone_Id; -const int Tile::portalTile_Id; -const int Tile::litPumpkin_Id; +const int Tile::portal_Id; +const int Tile::lit_pumpkin_Id; const int Tile::cake_Id; -const int Tile::diode_off_Id; -const int Tile::diode_on_Id; +const int Tile::unpowered_repeater_Id; +const int Tile::powered_repeater_Id; const int Tile::stained_glass_Id; const int Tile::trapdoor_Id; -const int Tile::monsterStoneEgg_Id; -const int Tile::stoneBrick_Id; -const int Tile::hugeMushroom_brown_Id; -const int Tile::hugeMushroom_red_Id; -const int Tile::ironFence_Id; -const int Tile::thinGlass_Id; -const int Tile::melon_Id; -const int Tile::pumpkinStem_Id; -const int Tile::melonStem_Id; +const int Tile::monster_egg_Id; +const int Tile::stonebrick_Id; +const int Tile::brown_mushroom_block_Id; +const int Tile::red_mushroom_block_Id; +const int Tile::iron_bars_Id; +const int Tile::glass_pane_Id; +const int Tile::melon_block_Id; +const int Tile::pumpkin_stem_Id; +const int Tile::melon_stem_Id; const int Tile::vine_Id; -const int Tile::fenceGate_Id; -const int Tile::stairs_bricks_Id; -const int Tile::stairs_stoneBrick_Id; -const int Tile::mycel_Id; -const int Tile::waterLily_Id; -const int Tile::netherBrick_Id; -const int Tile::netherFence_Id; -const int Tile::stairs_netherBricks_Id; -const int Tile::netherStalk_Id; -const int Tile::enchantTable_Id; -const int Tile::brewingStand_Id; +const int Tile::fence_gate_Id; +const int Tile::brick_stairs_Id; +const int Tile::stone_brick_stairs_Id; +const int Tile::mycelium_Id; +const int Tile::waterlily_Id; +const int Tile::nether_brick_Id; +const int Tile::nether_brick_fence_Id; +const int Tile::nether_brick_stairs_Id; +const int Tile::nether_wart_Id; +const int Tile::enchanting_table_Id; +const int Tile::brewing_stand_Id; const int Tile::cauldron_Id; -const int Tile::endPortalTile_Id; -const int Tile::endPortalFrameTile_Id; -const int Tile::endStone_Id; -const int Tile::dragonEgg_Id; -const int Tile::redstoneLight_Id; -const int Tile::redstoneLight_lit_Id; -const int Tile::woodSlab_Id; -const int Tile::woodSlabHalf_Id; +const int Tile::end_portal_Id; +const int Tile::endPortalFrame_Id; +const int Tile::end_stone_Id; +const int Tile::dragon_egg_Id; +const int Tile::redstone_lamp_Id; +const int Tile::lit_redstone_lamp_Id; +const int Tile::double_wooden_slab_Id; +const int Tile::wooden_slab_Id; const int Tile::cocoa_Id; -const int Tile::stairs_sandstone_Id; -const int Tile::stairs_sprucewood_Id; -const int Tile::stairs_birchwood_Id; -const int Tile::stairs_junglewood_Id; -const int Tile::emeraldOre_Id; -const int Tile::enderChest_Id; -const int Tile::tripWireSource_Id; -const int Tile::tripWire_Id; -const int Tile::emeraldBlock_Id; -const int Tile::cobbleWall_Id; -const int Tile::flowerPot_Id; +const int Tile::sandstone_stairs_Id; +const int Tile::spruce_stairs_Id; +const int Tile::birch_stairs_Id; +const int Tile::jungle_stairs_Id; +const int Tile::emerald_ore_Id; +const int Tile::ender_chest_Id; +const int Tile::tripwire_hook_Id; +const int Tile::tripwire_Id; +const int Tile::emerald_block_Id; +const int Tile::cobblestone_wall_Id; +const int Tile::flower_pot_Id; const int Tile::carrots_Id; const int Tile::potatoes_Id; const int Tile::anvil_Id; -const int Tile::button_wood_Id; +const int Tile::wooden_button_Id; const int Tile::skull_Id; -const int Tile::netherQuartz_Id; -const int Tile::quartzBlock_Id; -const int Tile::stairs_quartz_Id; -const int Tile::woolCarpet_Id; -const int Tile::stairs_acaciawood_Id; -const int Tile::stairs_darkwood_Id; +const int Tile::quartz_ore_Id; +const int Tile::quartz_block_Id; +const int Tile::quartz_stairs_Id; +const int Tile::carpet_Id; +const int Tile::acacia_stairs_Id; +const int Tile::dark_oak_stairs_Id; #endif diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index 2c92df70..f70b07a2 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -218,90 +218,90 @@ public: static const int grass_Id = 2; static const int dirt_Id = 3; static const int cobblestone_Id = 4; - static const int wood_Id = 5; + static const int planks_Id = 5; static const int sapling_Id = 6; //static const int sapling2_Id = 199;//should go inside sapling. - static const int unbreakable_Id = 7; - static const int water_Id = 8; - static const int calmWater_Id = 9; - static const int lava_Id = 10; + static const int bedrock_Id = 7; + static const int flowing_water_Id = 8; + static const int water_Id = 9; + static const int flowing_lava_Id = 10; - static const int calmLava_Id = 11; + static const int lava_Id = 11; static const int sand_Id = 12; static const int gravel_Id = 13; - static const int goldOre_Id = 14; - static const int ironOre_Id = 15; - static const int coalOre_Id = 16; - static const int treeTrunk_Id = 17; + static const int gold_ore_Id = 14; + static const int iron_ore_Id = 15; + static const int coal_ore_Id = 16; + static const int log_Id = 17; static const int leaves_Id = 18; static const int leaves2_Id = 161; static const int sponge_Id = 19; static const int glass_Id = 20; - static const int lapisOre_Id = 21; - static const int lapisBlock_Id = 22; + static const int lapis_ore_Id = 21; + static const int lapis_block_Id = 22; static const int dispenser_Id = 23; - static const int sandStone_Id = 24; + static const int sandstone_Id = 24; static const int noteblock_Id = 25; static const int bed_Id = 26; - static const int goldenRail_Id = 27; - static const int detectorRail_Id = 28; - static const int pistonStickyBase_Id = 29; + static const int golden_rail_Id = 27; + static const int detector_rail_Id = 28; + static const int sticky_piston_Id = 29; static const int web_Id = 30; static const int tallgrass_Id = 31; - static const int deadBush_Id = 32; - static const int pistonBase_Id = 33; - static const int pistonExtensionPiece_Id = 34; + static const int deadbush_Id = 32; + static const int piston_Id = 33; + static const int piston_head_Id = 34; static const int wool_Id = 35; - static const int pistonMovingPiece_Id = 36; - static const int flower_Id = 37; - static const int rose_Id = 38; + static const int piston_extension_Id = 36; + static const int yellow_flower_Id = 37; + static const int red_flower_Id = 38; static const int mushroom_brown_Id = 39; static const int mushroom_red_Id = 40; - static const int goldBlock_Id = 41; - static const int ironBlock_Id = 42; - static const int stoneSlab_Id = 43; - static const int stoneSlabHalf_Id = 44; - static const int redBrick_Id = 45; + static const int gold_block_Id = 41; + static const int iron_block_Id = 42; + static const int double_stone_slab_Id = 43; + static const int stone_slab_Id = 44; + static const int brick_block_Id = 45; static const int tnt_Id = 46; static const int bookshelf_Id = 47; - static const int mossyCobblestone_Id = 48; + static const int mossy_cobblestone_Id = 48; static const int obsidian_Id = 49; static const int torch_Id = 50; static const int fire_Id = 51; - static const int mobSpawner_Id = 52; - static const int stairs_wood_Id = 53; + static const int mob_spawner_Id = 52; + static const int oak_stairs_Id = 53; static const int chest_Id = 54; - static const int redStoneDust_Id = 55; - static const int diamondOre_Id = 56; - static const int diamondBlock_Id = 57; - static const int workBench_Id = 58; + static const int redstone_wire_Id = 55; + static const int diamond_ore_Id = 56; + static const int diamond_block_Id = 57; + static const int crafting_table_Id = 58; static const int wheat_Id = 59; static const int farmland_Id = 60; static const int furnace_Id = 61; - static const int furnace_lit_Id = 62; - static const int sign_Id = 63; - static const int door_wood_Id = 64; + static const int lit_furnace_Id = 62; + static const int standing_sign_Id = 63; + static const int wooden_door_Id = 64; static const int ladder_Id = 65; static const int rail_Id = 66; - static const int stairs_stone_Id = 67; - static const int wallSign_Id = 68; + static const int stone_stairs_Id = 67; + static const int wall_standing_sign_Id = 68; static const int lever_Id = 69; - static const int pressurePlate_stone_Id = 70; + static const int stone_pressure_plate_Id = 70; - static const int door_iron_Id = 71; - static const int pressurePlate_wood_Id = 72; - static const int redStoneOre_Id = 73; - static const int redStoneOre_lit_Id = 74; - static const int redstoneTorch_off_Id = 75; - static const int redstoneTorch_on_Id = 76; - static const int button_stone_Id = 77; - static const int topSnow_Id = 78; + static const int iron_door_Id = 71; + static const int wooden_pressure_plate_Id = 72; + static const int redstone_ore_Id = 73; + static const int lit_redstone_ore_Id = 74; + static const int unlit_redstone_torch_Id = 75; + static const int redstone_torch_Id = 76; + static const int stone_button_Id = 77; + static const int snow_layer_Id = 78; static const int ice_Id = 79; static const int snow_Id = 80; @@ -311,120 +311,120 @@ public: static const int jukebox_Id = 84; static const int fence_Id = 85; static const int pumpkin_Id = 86; - static const int netherRack_Id = 87; - static const int soulsand_Id = 88; + static const int netherrack_Id = 87; + static const int soul_sand_Id = 88; static const int glowstone_Id = 89; - static const int portalTile_Id = 90; + static const int portal_Id = 90; - static const int litPumpkin_Id = 91; + static const int lit_pumpkin_Id = 91; static const int cake_Id = 92; - static const int diode_off_Id = 93; - static const int diode_on_Id = 94; + static const int unpowered_repeater_Id = 93; + static const int powered_repeater_Id = 94; static const int stained_glass_Id = 95; static const int trapdoor_Id = 96; - static const int monsterStoneEgg_Id = 97; - static const int stoneBrick_Id = 98; - static const int hugeMushroom_brown_Id = 99; - static const int hugeMushroom_red_Id = 100; + static const int monster_egg_Id = 97; + static const int stonebrick_Id = 98; + static const int brown_mushroom_block_Id = 99; + static const int red_mushroom_block_Id = 100; - static const int ironFence_Id = 101; - static const int thinGlass_Id = 102; - static const int melon_Id = 103; - static const int pumpkinStem_Id = 104; - static const int melonStem_Id = 105; + static const int iron_bars_Id = 101; + static const int glass_pane_Id = 102; + static const int melon_block_Id = 103; + static const int pumpkin_stem_Id = 104; + static const int melon_stem_Id = 105; static const int vine_Id = 106; - static const int fenceGate_Id = 107; - static const int stairs_bricks_Id = 108; - static const int stairs_stoneBrick_Id = 109; - static const int mycel_Id = 110; + static const int fence_gate_Id = 107; + static const int brick_stairs_Id = 108; + static const int stone_brick_stairs_Id = 109; + static const int mycelium_Id = 110; - static const int waterLily_Id = 111; - static const int netherBrick_Id = 112; - static const int netherFence_Id = 113; - static const int stairs_netherBricks_Id = 114; - static const int netherStalk_Id = 115; - static const int enchantTable_Id = 116; - static const int brewingStand_Id = 117; + static const int waterlily_Id = 111; + static const int nether_brick_Id = 112; + static const int nether_brick_fence_Id = 113; + static const int nether_brick_stairs_Id = 114; + static const int nether_wart_Id = 115; + static const int enchanting_table_Id = 116; + static const int brewing_stand_Id = 117; static const int cauldron_Id = 118; - static const int endPortalTile_Id = 119; - static const int endPortalFrameTile_Id = 120; + static const int end_portal_Id = 119; + static const int end_portal_frame_Id = 120; - static const int endStone_Id = 121; - static const int dragonEgg_Id = 122; - static const int redstoneLight_Id = 123; - static const int redstoneLight_lit_Id = 124; - static const int woodSlab_Id = 125; - static const int woodSlabHalf_Id = 126; + static const int end_stone_Id = 121; + static const int dragon_egg_Id = 122; + static const int redstone_lamp_Id = 123; + static const int lit_redstone_lamp_Id = 124; + static const int double_wooden_slab_Id = 125; + static const int wooden_slab_Id = 126; static const int cocoa_Id = 127; - static const int stairs_sandstone_Id = 128; - static const int emeraldOre_Id = 129; - static const int enderChest_Id = 130; + static const int sandstone_stairs_Id = 128; + static const int emerald_ore_Id = 129; + static const int ender_chest_Id = 130; - static const int tripWireSource_Id = 131; - static const int tripWire_Id = 132; - static const int emeraldBlock_Id = 133; - static const int stairs_sprucewood_Id = 134; - static const int stairs_birchwood_Id = 135; - static const int stairs_junglewood_Id = 136; - static const int commandBlock_Id = 137; + static const int tripwire_hook_Id = 131; + static const int tripwire_Id = 132; + static const int emerald_block_Id = 133; + static const int spruce_stairs_Id = 134; + static const int birch_stairs_Id = 135; + static const int jungle_stairs_Id = 136; + static const int command_block_Id = 137; static const int beacon_Id = 138; - static const int cobbleWall_Id = 139; - static const int flowerPot_Id = 140; + static const int cobblestone_wall_Id = 139; + static const int flower_pot_Id = 140; static const int carrots_Id = 141; static const int potatoes_Id = 142; - static const int button_wood_Id = 143; + static const int wooden_button_Id = 143; static const int skull_Id = 144; static const int anvil_Id = 145; static const int chest_trap_Id = 146; - static const int weightedPlate_light_Id = 147; - static const int weightedPlate_heavy_Id = 148; - static const int comparator_off_Id = 149; - static const int comparator_on_Id = 150; + static const int light_weighted_pressure_plate_Id = 147; + static const int heavy_weighted_pressure_plate_Id = 148; + static const int unpowered_comparator_Id = 149; + static const int powered_comparator_Id = 150; - static const int daylightDetector_Id = 151; - static const int redstoneBlock_Id = 152; - static const int netherQuartz_Id = 153; + static const int daylight_detector_Id = 151; + static const int redstone_block_Id = 152; + static const int quartz_ore_Id = 153; static const int hopper_Id = 154; - static const int quartzBlock_Id = 155; - static const int stairs_quartz_Id = 156; - static const int activatorRail_Id = 157; + static const int quartz_block_Id = 155; + static const int quartz_stairs_Id = 156; + static const int activator_rail_Id = 157; static const int dropper_Id = 158; - static const int clayHardened_colored_Id = 159; + static const int stained_hardened_clay_Id = 159; static const int stained_glass_pane_Id = 160; - static const int tree2Trunk_Id = 162; + static const int log2_Id = 162; - static const int stairs_acaciawood_Id = 163; - static const int stairs_darkwood_Id = 164; + static const int acacia_stairs_Id = 163; + static const int dark_oak_stairs_Id = 164; //165 slimeblock static const int barrier_Id = 166; static const int iron_trapdoor_Id = 167; static const int prismarine_Id = 168; - static const int seaLantern_Id = 169; - static const int hayBlock_Id = 170; - static const int woolCarpet_Id = 171; - static const int clayHardened_Id = 172; - static const int coalBlock_Id = 173; - static const int packedIce_Id = 174; - static const int tallgrass2_Id = 175; + static const int sea_lantern_Id = 169; + static const int hay_block_Id = 170; + static const int carpet_Id = 171; + static const int hardened_clay_Id = 172; + static const int coal_block_Id = 173; + static const int packed_ice_Id = 174; + static const int double_plant_Id = 175; //176 standing_banner //177 wall_banner - static const int invertedDaylightDetector_Id = 178; + static const int daylight_detector_inverted_Id = 178; static const int red_sandstone_Id = 179; - static const int stairs_red_sandstone_Id = 180; + static const int red_sandstone_stairs_Id = 180; static const int double_stone_slab2_Id = 181; static const int stone_slab2_Id = 182; - static const int spruceGate_Id = 183; - static const int birchGate_Id = 184; - static const int jungleGate_Id = 185; - static const int darkGate_Id = 186; - static const int acaciaGate_Id = 187; - static const int spruceFence_Id = 188; - static const int birchFence_Id = 189; - static const int jungleFence_Id = 190; - static const int darkFence_Id = 191; - static const int acaciaFence_Id = 192; + static const int spruce_fence_gate_Id = 183; + static const int birch_fence_gate_Id = 184; + static const int jungle_fence_gate_Id = 185; + static const int dark_oak_fence_gate_Id = 186; + static const int acacia_fence_gate_Id = 187; + static const int spruce_fence_Id = 188; + static const int birch_fence_Id = 189; + static const int jungle_fence_Id = 190; + static const int dark_oak_fence_Id = 191; + static const int acacia_fence_Id = 192; static const int spruce_door_Id = 193; static const int birch_door_Id = 194; static const int jungle_door_Id = 195; @@ -482,7 +482,7 @@ public: static Tile *bed; static Tile *goldenRail; static Tile *detectorRail; - static PistonBaseTile *pistonStickyBase; + static PistonBaseTile *sticky_piston; static Tile *web; static TallGrass *tallgrass; static DeadBushTile *deadBush; @@ -517,17 +517,17 @@ public: static Tile *furnace; static Tile *furnace_lit; static Tile *sign; - static Tile *door_wood; + static Tile *wooden_door; static Tile *ladder; static Tile *rail; static Tile *stairs_stone; static Tile *wallSign; static Tile *lever; static Tile *pressurePlate_stone; - static Tile *door_iron; + static Tile *iron_door; static Tile *pressurePlate_wood; static Tile *redStoneOre; - static Tile *redStoneOre_lit; + static Tile *lit_redstone_ore; static Tile *redstoneTorch_off; static Tile *redstoneTorch_on; static Tile *button; @@ -546,36 +546,36 @@ public: static PortalTile *portalTile; static Tile *litPumpkin; static Tile *cake; - static RepeaterTile *diode_off; - static RepeaterTile *diode_on; + static RepeaterTile *unpowered_repeater; + static RepeaterTile *powered_repeater; static Tile *stained_glass; static Tile *trapdoor; - static Tile *monsterStoneEgg; + static Tile *monster_egg; static Tile *stoneBrick; - static Tile *hugeMushroom_brown; - static Tile *hugeMushroom_red; - static Tile *ironFence; - static Tile *thinGlass; + static Tile *brown_mushroom_block; + static Tile *red_mushroom_block; + static Tile *iron_bars; + static Tile *glass_pane; static Tile *melon; - static Tile *pumpkinStem; - static Tile *melonStem; + static Tile *pumpkin_stem; + static Tile *melon_stem; static Tile *vine; static Tile *fenceGate; static Tile *stairs_bricks; - static Tile *stairs_stoneBrickSmooth; + static Tile *stone_brick_stairsSmooth; static MycelTile *mycel; static Tile *waterLily; static Tile *netherBrick; static Tile *netherFence; - static Tile *stairs_netherBricks; + static Tile *nether_brick_stairs; static Tile *netherStalk; static Tile *enchantTable; static Tile *brewingStand; static CauldronTile *cauldron; - static Tile *endPortalTile; - static Tile *endPortalFrameTile; + static Tile *end_portal; + static Tile *end_portal_frame; static Tile *endStone; static Tile *dragonEgg; static Tile *redstoneLight; @@ -604,13 +604,13 @@ public: static Tile *skull; static Tile *cobbleWall; - static Tile *flowerPot; + static Tile *flower_pot; static Tile *carrots; static Tile *potatoes; static Tile *anvil; static Tile *chest_trap; - static Tile *weightedPlate_light; - static Tile *weightedPlate_heavy; + static Tile *light_weighted_pressure_plate; + static Tile *heavy_weighted_pressure_plate; static ComparatorTile *comparator_off; static ComparatorTile *comparator_on; @@ -623,7 +623,7 @@ public: static Tile *stairs_quartz; static Tile *activatorRail; static Tile *dropper; - static Tile *clayHardened_colored; + static Tile *stained_hardened_clay; static Tile *stained_glass_pane; static Tile *hayBlock; @@ -634,11 +634,11 @@ public: static Tile *barrier; static Tile *iron_trapdoor; - static Tile* door_spruce; - static Tile* door_birch; - static Tile* door_jungle; - static Tile* door_acacia; - static Tile* door_dark; + static Tile* spruce_door; + static Tile* birch_door; + static Tile* jungle_door; + static Tile* acacia_door; + static Tile* dark_oak_door; static Tile* spruceFence; static Tile* birchFence; @@ -652,17 +652,17 @@ public: static Tile* acaciaGate; static Tile* darkGate; - static Tile* invertedDaylightDetector; + static Tile* daylight_detector_inverted; static Tile* red_sandstone; static Tile* stairs_red_sandstone; static HalfSlabTile* stoneSlab2; static HalfSlabTile* stoneSlab2Half; - static Tile* tree2Trunk; + static Tile* log2; static Tile* packedIce; static Tile* seaLantern; static Tile* prismarine; - static TallGrass2* tallgrass2; + static TallGrass2* double_plant; static void staticCtor(); diff --git a/Minecraft.World/TileItem.cpp b/Minecraft.World/TileItem.cpp index 4e2e5081..3e73c56e 100644 --- a/Minecraft.World/TileItem.cpp +++ b/Minecraft.World/TileItem.cpp @@ -50,11 +50,11 @@ bool TileItem::useOn(shared_ptr instance, shared_ptr playe { // 4J-PB - Adding a test only version to allow tooltips to be displayed int currentTile = level->getTile(x, y, z); - if (currentTile == Tile::topSnow_Id && (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) + if (currentTile == Tile::snow_layer_Id && (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) { face = Facing::UP; } - else if (currentTile == Tile::vine_Id || currentTile == Tile::tallgrass_Id || currentTile == Tile::deadBush_Id) + else if (currentTile == Tile::vine_Id || currentTile == Tile::tallgrass_Id || currentTile == Tile::deadbush_Id) { } else @@ -87,12 +87,12 @@ bool TileItem::useOn(shared_ptr instance, shared_ptr playe { // 4J-JEV: Snow/Iron Golems do not have owners apparently. int newTileId = level->getTile(x,y,z); - if ( (tileId == Tile::pumpkin_Id || tileId == Tile::litPumpkin_Id) && newTileId == 0 ) + if ( (tileId == Tile::pumpkin_Id || tileId == Tile::lit_pumpkin_Id) && newTileId == 0 ) { eINSTANCEOF golemType; switch (undertile) { - case Tile::ironBlock_Id: golemType = eTYPE_VILLAGERGOLEM; break; + case Tile::iron_block_Id: golemType = eTYPE_VILLAGERGOLEM; break; case Tile::snow_Id: golemType = eTYPE_SNOWMAN; break; default: golemType = eTYPE_NOTSET; break; } @@ -165,11 +165,11 @@ bool TileItem::useOn(shared_ptr instance, shared_ptr playe bool TileItem::mayPlace(Level *level, int x, int y, int z, int face, shared_ptr player, shared_ptr item) { int currentTile = level->getTile(x, y, z); - if (currentTile == Tile::topSnow_Id) + if (currentTile == Tile::snow_layer_Id) { face = Facing::UP; } - else if (currentTile != Tile::vine_Id && currentTile != Tile::tallgrass_Id && currentTile != Tile::deadBush_Id) + else if (currentTile != Tile::vine_Id && currentTile != Tile::tallgrass_Id && currentTile != Tile::deadbush_Id) { if (face == 0) y--; if (face == 1) y++; diff --git a/Minecraft.World/TilePlanterItem.cpp b/Minecraft.World/TilePlanterItem.cpp index 3a8f0dea..2806a018 100644 --- a/Minecraft.World/TilePlanterItem.cpp +++ b/Minecraft.World/TilePlanterItem.cpp @@ -19,11 +19,11 @@ bool TilePlanterItem::useOn(shared_ptr instance, shared_ptrgetTile(x, y, z); - if (currentTile == Tile::topSnow_Id && (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) + if (currentTile == Tile::snow_layer_Id && (level->getData(x, y, z) & TopSnowTile::HEIGHT_MASK) < 1) { face = Facing::UP; } - else if (currentTile == Tile::vine_Id || currentTile == Tile::tallgrass_Id || currentTile == Tile::deadBush_Id) + else if (currentTile == Tile::vine_Id || currentTile == Tile::tallgrass_Id || currentTile == Tile::deadbush_Id) { } else diff --git a/Minecraft.World/TntTile.cpp b/Minecraft.World/TntTile.cpp index b1a1a5e7..440b92d5 100644 --- a/Minecraft.World/TntTile.cpp +++ b/Minecraft.World/TntTile.cpp @@ -113,7 +113,7 @@ void TntTile::destroy(Level *level, int x, int y, int z, int data, shared_ptr
  • player, int clickedFace, float clickX, float clickY, float clickZ, bool soundOnly/*=false*/) // 4J added soundOnly param { if (soundOnly) return false; - if (player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::flintAndSteel_Id) + if (player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::flint_and_steel_Id) { destroy(level, x, y, z, EXPLODE_BIT, player); level->removeTile(x, y, z); diff --git a/Minecraft.World/ToolRecipies.cpp b/Minecraft.World/ToolRecipies.cpp index 82b02df1..5a5019d7 100644 --- a/Minecraft.World/ToolRecipies.cpp +++ b/Minecraft.World/ToolRecipies.cpp @@ -31,33 +31,33 @@ void ToolRecipies::_init() ADD_OBJECT(map[0],Tile::wood); ADD_OBJECT(map[0],Tile::cobblestone); - ADD_OBJECT(map[0],Item::ironIngot); + ADD_OBJECT(map[0],Item::iron_ingot); ADD_OBJECT(map[0],Item::diamond); - ADD_OBJECT(map[0],Item::goldIngot); + ADD_OBJECT(map[0],Item::gold_ingot); - ADD_OBJECT(map[1],Item::pickAxe_wood); - ADD_OBJECT(map[1],Item::pickAxe_stone); - ADD_OBJECT(map[1],Item::pickAxe_iron); - ADD_OBJECT(map[1],Item::pickAxe_diamond); - ADD_OBJECT(map[1],Item::pickAxe_gold); + ADD_OBJECT(map[1],Item::wooden_pickaxe); + ADD_OBJECT(map[1],Item::stone_pickaxe); + ADD_OBJECT(map[1],Item::iron_pickaxe); + ADD_OBJECT(map[1],Item::diamond_pickaxe); + ADD_OBJECT(map[1],Item::golden_pickaxe); - ADD_OBJECT(map[2],Item::shovel_wood); - ADD_OBJECT(map[2],Item::shovel_stone); - ADD_OBJECT(map[2],Item::shovel_iron); - ADD_OBJECT(map[2],Item::shovel_diamond); - ADD_OBJECT(map[2],Item::shovel_gold); + ADD_OBJECT(map[2],Item::wooden_shovel); + ADD_OBJECT(map[2],Item::stone_shovel); + ADD_OBJECT(map[2],Item::iron_shovel); + ADD_OBJECT(map[2],Item::diamond_shovel); + ADD_OBJECT(map[2],Item::golden_shovel); - ADD_OBJECT(map[3],Item::hatchet_wood); - ADD_OBJECT(map[3],Item::hatchet_stone); - ADD_OBJECT(map[3],Item::hatchet_iron); - ADD_OBJECT(map[3],Item::hatchet_diamond); - ADD_OBJECT(map[3],Item::hatchet_gold); + ADD_OBJECT(map[3],Item::wooden_axe); + ADD_OBJECT(map[3],Item::stone_axe); + ADD_OBJECT(map[3],Item::iron_axe); + ADD_OBJECT(map[3],Item::diamond_axe); + ADD_OBJECT(map[3],Item::golden_axe); - ADD_OBJECT(map[4],Item::hoe_wood); - ADD_OBJECT(map[4],Item::hoe_stone); - ADD_OBJECT(map[4],Item::hoe_iron); - ADD_OBJECT(map[4],Item::hoe_diamond); - ADD_OBJECT(map[4],Item::hoe_gold); + ADD_OBJECT(map[4],Item::wooden_hoe); + ADD_OBJECT(map[4],Item::stone_hoe); + ADD_OBJECT(map[4],Item::iron_hoe); + ADD_OBJECT(map[4],Item::diamond_hoe); + ADD_OBJECT(map[4],Item::golden_hoe); } void ToolRecipies::addRecipes(Recipes *r) @@ -107,7 +107,7 @@ void ToolRecipies::addRecipes(Recipes *r) L"sscig", L" #", // L"# ", // - L'#', Item::ironIngot, + L'#', Item::iron_ingot, L'T' ); } \ No newline at end of file diff --git a/Minecraft.World/TopSnowTile.cpp b/Minecraft.World/TopSnowTile.cpp index 46b7536f..da91f91b 100644 --- a/Minecraft.World/TopSnowTile.cpp +++ b/Minecraft.World/TopSnowTile.cpp @@ -125,7 +125,7 @@ bool TopSnowTile::checkCanSurvive(Level *level, int x, int y, int z) void TopSnowTile::playerDestroy(Level *level, shared_ptr player, int x, int y, int z, int data) { - int type = Item::snowBall->id; + int type = Item::snowball->id; int height = data & HEIGHT_MASK; popResource(level, x, y, z, std::make_shared(type, height + 1, 0)); level->removeTile(x, y, z); @@ -133,7 +133,7 @@ void TopSnowTile::playerDestroy(Level *level, shared_ptr player, int x, int TopSnowTile::getResource(int data, Random *random, int playerBonusLevel) { - return Item::snowBall->id; + return Item::snowball->id; } int TopSnowTile::getResourceCount(Random *random) @@ -155,7 +155,7 @@ bool TopSnowTile::shouldRenderFace(LevelSource *level, int x, int y, int z, int if (face == 1) return true; // 4J - don't render faces if neighbouring tiles are also TopSnowTile with at least the same height as this one // Otherwise we get horrible artifacts from the non-manifold geometry created. Fixes bug #8506 - if ( ( level->getTile(x,y,z) == Tile::topSnow_Id ) && ( face >= 2 ) ) + if ( ( level->getTile(x,y,z) == Tile::snow_layer_Id ) && ( face >= 2 ) ) { int h0 = level->getData(x,y,z) & HEIGHT_MASK; int xx = x; diff --git a/Minecraft.World/TorchTile.cpp b/Minecraft.World/TorchTile.cpp index ce600a9b..e5b96415 100644 --- a/Minecraft.World/TorchTile.cpp +++ b/Minecraft.World/TorchTile.cpp @@ -77,7 +77,7 @@ bool TorchTile::isConnection(Level *level, int x, int y, int z) int tile = level->getTile(x, y, z); Tile *below = (tile >= 0 && tile < Tile::TILE_NUM_COUNT) ? Tile::tiles[tile] : nullptr; if (below != nullptr && below->getRenderShape() == Tile::SHAPE_FENCE - || tile == Tile::glass_Id || tile == Tile::cobbleWall_Id) + || tile == Tile::glass_Id || tile == Tile::cobblestone_wall_Id) { return true; } diff --git a/Minecraft.World/TreeFeature.cpp b/Minecraft.World/TreeFeature.cpp index 2bfec147..07312d73 100644 --- a/Minecraft.World/TreeFeature.cpp +++ b/Minecraft.World/TreeFeature.cpp @@ -44,7 +44,7 @@ bool TreeFeature::place(Level *level, Random *random, int x, int y, int z) if (yy >= 0 && yy < Level::maxBuildHeight) { int tt = level->getTile(xx, yy, zz); - if (tt != 0 && tt != Tile::leaves_Id && tt != Tile::grass_Id && tt != Tile::dirt_Id && tt != Tile::treeTrunk_Id) free = false; + if (tt != 0 && tt != Tile::leaves_Id && tt != Tile::grass_Id && tt != Tile::dirt_Id && tt != Tile::log_Id) free = false; } else { @@ -88,7 +88,7 @@ bool TreeFeature::place(Level *level, Random *random, int x, int y, int z) int t = level->getTile(x, y + hh, z); if (t == 0 || t == Tile::leaves_Id) { - placeBlock(level, x, y + hh, z, Tile::treeTrunk_Id, trunkType); + placeBlock(level, x, y + hh, z, Tile::log_Id, trunkType); if (addJungleFeatures && hh > 0) { if (random->nextInt(3) > 0 && level->isEmptyTile(x - 1, y + hh, z)) diff --git a/Minecraft.World/TreeTile.cpp b/Minecraft.World/TreeTile.cpp index 93a7efcb..a1ed0ce8 100644 --- a/Minecraft.World/TreeTile.cpp +++ b/Minecraft.World/TreeTile.cpp @@ -54,7 +54,7 @@ int TreeTile::getResourceCount(Random *random) int TreeTile::getResource(int data, Random *random, int playerBonusLevel) { - return Tile::treeTrunk_Id; + return Tile::log_Id; } void TreeTile::onRemove(Level *level, int x, int y, int z, int id, int data) diff --git a/Minecraft.World/TreeTile2.cpp b/Minecraft.World/TreeTile2.cpp index ff7bedc8..e22fadd0 100644 --- a/Minecraft.World/TreeTile2.cpp +++ b/Minecraft.World/TreeTile2.cpp @@ -50,7 +50,7 @@ int TreeTile2::getResourceCount(Random* random) int TreeTile2::getResource(int data, Random* random, int playerBonusLevel) { - return Tile::tree2Trunk_Id; + return Tile::log2_Id; } void TreeTile2::onRemove(Level* level, int x, int y, int z, int id, int data) diff --git a/Minecraft.World/TripWireSourceTile.cpp b/Minecraft.World/TripWireSourceTile.cpp index d85de44c..1d4ca4a6 100644 --- a/Minecraft.World/TripWireSourceTile.cpp +++ b/Minecraft.World/TripWireSourceTile.cpp @@ -141,7 +141,7 @@ void TripWireSourceTile::calculateState(Level *level, int x, int y, int z, int i int dir = data & MASK_DIR; bool wasAttached = (data & MASK_ATTACHED) == MASK_ATTACHED; bool wasPowered = (data & MASK_POWERED) == MASK_POWERED; - bool attached = id == Tile::tripWireSource_Id; // id is only != TripwireSource_id when 'onRemove' + bool attached = id == Tile::tripwire_hook_Id; // id is only != tripwire_hook_Id when 'onRemove' bool powered = false; bool suspended = !level->isTopSolidBlocking(x, y - 1, z); int stepX = Direction::STEP_X[dir]; @@ -156,7 +156,7 @@ void TripWireSourceTile::calculateState(Level *level, int x, int y, int z, int i int zz = z + stepZ * i; int tile = level->getTile(xx, y, zz); - if (tile == Tile::tripWireSource_Id) + if (tile == Tile::tripwire_hook_Id) { int otherData = level->getData(xx, y, zz); @@ -167,7 +167,7 @@ void TripWireSourceTile::calculateState(Level *level, int x, int y, int z, int i break; } - else if (tile == Tile::tripWire_Id || i == wireSource) // wireSource is the wiretile that caused an 'updateSource' + else if (tile == Tile::tripwire_Id || i == wireSource) // wireSource is the wiretile that caused an 'updateSource' { int wireData = i == wireSource ? wireSourceData : level->getData(xx, y, zz); bool wireArmed = (wireData & TripWireTile::MASK_DISARMED) != TripWireTile::MASK_DISARMED; diff --git a/Minecraft.World/TripWireTile.cpp b/Minecraft.World/TripWireTile.cpp index 7881d376..40b6ee58 100644 --- a/Minecraft.World/TripWireTile.cpp +++ b/Minecraft.World/TripWireTile.cpp @@ -155,7 +155,7 @@ void TripWireTile::updateSource(Level *level, int x, int y, int z, int data) int zz = z + Direction::STEP_Z[dir] * i; int tile = level->getTile(xx, y, zz); - if (tile == Tile::tripWireSource_Id) + if (tile == Tile::tripwire_hook_Id) { int sourceDir = level->getData(xx, y, zz) & TripWireSourceTile::MASK_DIR; @@ -166,7 +166,7 @@ void TripWireTile::updateSource(Level *level, int x, int y, int z, int data) break; } - else if (tile != Tile::tripWire_Id) + else if (tile != Tile::tripwire_Id) { break; } @@ -242,7 +242,7 @@ bool TripWireTile::shouldConnectTo(LevelSource *level, int x, int y, int z, int int t = level->getTile(tx, ty, tz); bool suspended = (data & MASK_SUSPENDED) == MASK_SUSPENDED; - if (t == Tile::tripWireSource_Id) + if (t == Tile::tripwire_hook_Id) { int otherData = level->getData(tx, ty, tz); int facing = otherData & TripWireSourceTile::MASK_DIR; @@ -250,7 +250,7 @@ bool TripWireTile::shouldConnectTo(LevelSource *level, int x, int y, int z, int return facing == Direction::DIRECTION_OPPOSITE[dir]; } - if (t == Tile::tripWire_Id) + if (t == Tile::tripwire_Id) { int otherData = level->getData(tx, ty, tz); bool otherSuspended = (otherData & MASK_SUSPENDED) == MASK_SUSPENDED; diff --git a/Minecraft.World/Village.cpp b/Minecraft.World/Village.cpp index b7c82fa4..f12576d3 100644 --- a/Minecraft.World/Village.cpp +++ b/Minecraft.World/Village.cpp @@ -346,7 +346,7 @@ bool Village::isDoor(int x, int y, int z) { int tileId = level->getTile(x, y, z); if (tileId <= 0) return false; - return tileId == Tile::door_wood_Id; + return tileId == Tile::wooden_door_Id; } void Village::calcInfo() diff --git a/Minecraft.World/VillagePieces.cpp b/Minecraft.World/VillagePieces.cpp index dcd765e0..96bc7686 100644 --- a/Minecraft.World/VillagePieces.cpp +++ b/Minecraft.World/VillagePieces.cpp @@ -412,29 +412,29 @@ int VillagePieces::VillagePiece::biomeBlock(int tile, int data) { if (isDesertVillage) { - if (tile == Tile::treeTrunk_Id) + if (tile == Tile::log_Id) { - return Tile::sandStone_Id; + return Tile::sandstone_Id; } else if (tile == Tile::cobblestone_Id) { - return Tile::sandStone_Id; + return Tile::sandstone_Id; } - else if (tile == Tile::wood_Id) + else if (tile == Tile::planks_Id) { - return Tile::sandStone_Id; + return Tile::sandstone_Id; } - else if (tile == Tile::stairs_wood_Id) + else if (tile == Tile::oak_stairs_Id) { - return Tile::stairs_sandstone_Id; + return Tile::sandstone_stairs_Id; } - else if (tile == Tile::stairs_stone_Id) + else if (tile == Tile::stone_stairs_Id) { - return Tile::stairs_sandstone_Id; + return Tile::sandstone_stairs_Id; } else if (tile == Tile::gravel_Id) { - return Tile::sandStone_Id; + return Tile::sandstone_Id; } } return tile; @@ -444,7 +444,7 @@ int VillagePieces::VillagePiece::biomeData(int tile, int data) { if (isDesertVillage) { - if (tile == Tile::treeTrunk_Id) + if (tile == Tile::log_Id) { return 0; } @@ -452,7 +452,7 @@ int VillagePieces::VillagePiece::biomeData(int tile, int data) { return SandStoneTile::TYPE_DEFAULT; } - else if (tile == Tile::wood_Id) + else if (tile == Tile::planks_Id) { return SandStoneTile::TYPE_SMOOTHSIDE; } @@ -530,7 +530,7 @@ bool VillagePieces::Well::postProcess(Level *level, Random *random, BoundingBox boundingBox->move(0, heightPosition - boundingBox->y1 + 3, 0); } - generateBox(level, chunkBB, 1, 0, 1, 4, height - 3, 4, Tile::cobblestone_Id, Tile::water_Id, false); + generateBox(level, chunkBB, 1, 0, 1, 4, height - 3, 4, Tile::cobblestone_Id, Tile::flowing_water_Id, false); placeBlock(level, 0, 0, 2, height - 3, 2, chunkBB); placeBlock(level, 0, 0, 3, height - 3, 2, chunkBB); placeBlock(level, 0, 0, 2, height - 3, 3, chunkBB); @@ -777,8 +777,8 @@ bool VillagePieces::SimpleHouse::postProcess(Level *level, Random *random, Bound // floor generateBox(level, chunkBB, 0, 0, 0, 4, 0, 4, Tile::cobblestone_Id, Tile::cobblestone_Id, false); // roof - generateBox(level, chunkBB, 0, 4, 0, 4, 4, 4, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 4, 1, 3, 4, 3, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 0, 4, 0, 4, 4, 4, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 4, 1, 3, 4, 3, Tile::planks_Id, Tile::planks_Id, false); // window walls placeBlock(level, Tile::cobblestone_Id, 0, 0, 1, 0, chunkBB); @@ -793,24 +793,24 @@ bool VillagePieces::SimpleHouse::postProcess(Level *level, Random *random, Bound placeBlock(level, Tile::cobblestone_Id, 0, 4, 1, 4, chunkBB); placeBlock(level, Tile::cobblestone_Id, 0, 4, 2, 4, chunkBB); placeBlock(level, Tile::cobblestone_Id, 0, 4, 3, 4, chunkBB); - generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 1, 1, 4, 3, 3, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 1, 4, 3, 3, 4, Tile::wood_Id, Tile::wood_Id, false); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 2, chunkBB); + generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 4, 1, 1, 4, 3, 3, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 1, 4, 3, 3, 4, Tile::planks_Id, Tile::planks_Id, false); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 2, 2, chunkBB); // door wall - placeBlock(level, Tile::wood_Id, 0, 1, 1, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 2, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 2, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 3, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 2, 0, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 3, 1, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 1, 1, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 1, 2, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 1, 3, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 2, 3, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 3, 3, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 3, 2, 0, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 3, 1, 0, chunkBB); if (getBlock(level, 2, 0, -1, chunkBB) == 0 && getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 2, 0, -1, chunkBB); } // fill room with air @@ -940,28 +940,28 @@ bool VillagePieces::SmallTemple::postProcess(Level *level, Random *random, Bound placeBlock(level, Tile::cobblestone_Id, 0, 2, 1, 7, chunkBB); placeBlock(level, Tile::cobblestone_Id, 0, 3, 1, 6, chunkBB); placeBlock(level, Tile::cobblestone_Id, 0, 3, 1, 7, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 1, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 2, 1, 6, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 3, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 1), 1, 2, 7, chunkBB); - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 0), 3, 2, 7, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 1, 1, 5, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 2, 1, 6, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 3, 1, 5, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 1), 1, 2, 7, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 0), 3, 2, 7, chunkBB); // windows - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 6, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 7, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 6, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 7, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 6, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 7, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 6, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 7, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 3, 8, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 3, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 3, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 6, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 7, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 6, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 7, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 6, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 7, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 6, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 7, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 3, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 3, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 3, 8, chunkBB); // torches placeBlock(level, Tile::torch_Id, 0, 2, 4, 7, chunkBB); @@ -979,10 +979,10 @@ bool VillagePieces::SmallTemple::postProcess(Level *level, Random *random, Bound // entrance placeBlock(level, 0, 0, 2, 1, 0, chunkBB); placeBlock(level, 0, 0, 2, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::wooden_door_Id, 1)); if (getBlock(level, 2, 0, -1, chunkBB) == 0 && getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 2, 0, -1, chunkBB); } @@ -1052,12 +1052,12 @@ bool VillagePieces::BookHouse::postProcess(Level *level, Random *random, Boundin generateBox(level, chunkBB, 0, 5, 0, 8, 5, 5, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 0, 6, 1, 8, 6, 4, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 0, 7, 2, 8, 7, 3, Tile::cobblestone_Id, Tile::cobblestone_Id, false); - int southStairs = getOrientationData(Tile::stairs_wood_Id, 3); - int northStairs = getOrientationData(Tile::stairs_wood_Id, 2); + int southStairs = getOrientationData(Tile::oak_stairs_Id, 3); + int northStairs = getOrientationData(Tile::oak_stairs_Id, 2); for (int d = -1; d <= 2; d++) { for (int w = 0; w <= 8; w++) { - placeBlock(level, Tile::stairs_wood_Id, southStairs, w, 6 + d, d, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, northStairs, w, 6 + d, 5 - d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, southStairs, w, 6 + d, d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, northStairs, w, 6 + d, 5 - d, chunkBB); } } @@ -1072,59 +1072,59 @@ bool VillagePieces::BookHouse::postProcess(Level *level, Random *random, Boundin generateBox(level, chunkBB, 8, 2, 0, 8, 4, 0, Tile::cobblestone_Id, Tile::cobblestone_Id, false); // wooden walls - generateBox(level, chunkBB, 0, 2, 1, 0, 4, 4, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 2, 5, 7, 4, 5, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 8, 2, 1, 8, 4, 4, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 2, 0, 7, 4, 0, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 0, 2, 1, 0, 4, 4, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 2, 5, 7, 4, 5, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 8, 2, 1, 8, 4, 4, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 2, 0, 7, 4, 0, Tile::planks_Id, Tile::planks_Id, false); // windows - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 3, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 3, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 3, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 3, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 2, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 2, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 6, 2, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 3, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 3, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 6, 3, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 3, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 3, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 3, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 3, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 3, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 6, 2, 5, chunkBB); // roof inside and bookshelf - generateBox(level, chunkBB, 1, 4, 1, 7, 4, 1, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 4, 4, 7, 4, 4, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 1, 4, 1, 7, 4, 1, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 4, 4, 7, 4, 4, Tile::planks_Id, Tile::planks_Id, false); generateBox(level, chunkBB, 1, 3, 4, 7, 3, 4, Tile::bookshelf_Id, Tile::bookshelf_Id, false); // couch - placeBlock(level, Tile::wood_Id, 0, 7, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, getOrientationData(Tile::stairs_wood_Id, 0), 7, 1, 3, chunkBB); - int orientationData = getOrientationData(Tile::stairs_wood_Id, 3); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 6, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 5, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 4, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, orientationData, 3, 1, 4, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 7, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, getOrientationData(Tile::oak_stairs_Id, 0), 7, 1, 3, chunkBB); + int orientationData = getOrientationData(Tile::oak_stairs_Id, 3); + placeBlock(level, Tile::oak_stairs_Id, orientationData, 6, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, orientationData, 5, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, orientationData, 4, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, orientationData, 3, 1, 4, chunkBB); // tables placeBlock(level, Tile::fence_Id, 0, 6, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 6, 2, 3, chunkBB); + placeBlock(level, Tile::wooden_pressure_plate_Id, 0, 6, 2, 3, chunkBB); placeBlock(level, Tile::fence_Id, 0, 4, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 4, 2, 3, chunkBB); - placeBlock(level, Tile::workBench_Id, 0, 7, 1, 1, chunkBB); + placeBlock(level, Tile::wooden_pressure_plate_Id, 0, 4, 2, 3, chunkBB); + placeBlock(level, Tile::crafting_table_Id, 0, 7, 1, 1, chunkBB); // entrance placeBlock(level, 0, 0, 1, 1, 0, chunkBB); placeBlock(level, 0, 0, 1, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 1, 1, 0, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 1, 1, 0, getOrientationData(Tile::wooden_door_Id, 1)); if (getBlock(level, 1, 0, -1, chunkBB) == 0 && getBlock(level, 1, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 1, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 1, 0, -1, chunkBB); } for (int z = 0; z < depth; z++) @@ -1207,50 +1207,50 @@ bool VillagePieces::SmallHut::postProcess(Level *level, Random *random, Bounding generateBox(level, chunkBB, 1, 0, 1, 2, 0, 3, Tile::dirt_Id, Tile::dirt_Id, false); // roof if (lowCeiling) { - generateBox(level, chunkBB, 1, 4, 1, 2, 4, 3, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 1, 4, 1, 2, 4, 3, Tile::log_Id, Tile::log_Id, false); } else { - generateBox(level, chunkBB, 1, 5, 1, 2, 5, 3, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 1, 5, 1, 2, 5, 3, Tile::log_Id, Tile::log_Id, false); } - placeBlock(level, Tile::treeTrunk_Id, 0, 1, 4, 0, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 2, 4, 0, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 1, 4, 4, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 2, 4, 4, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 4, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 4, 2, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 4, 3, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 3, 4, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 3, 4, 2, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 3, 4, 3, chunkBB); + placeBlock(level, Tile::log_Id, 0, 1, 4, 0, chunkBB); + placeBlock(level, Tile::log_Id, 0, 2, 4, 0, chunkBB); + placeBlock(level, Tile::log_Id, 0, 1, 4, 4, chunkBB); + placeBlock(level, Tile::log_Id, 0, 2, 4, 4, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 4, 1, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 4, 2, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 4, 3, chunkBB); + placeBlock(level, Tile::log_Id, 0, 3, 4, 1, chunkBB); + placeBlock(level, Tile::log_Id, 0, 3, 4, 2, chunkBB); + placeBlock(level, Tile::log_Id, 0, 3, 4, 3, chunkBB); // corners - generateBox(level, chunkBB, 0, 1, 0, 0, 3, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 3, 1, 0, 3, 3, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 0, 1, 4, 0, 3, 4, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 3, 1, 4, 3, 3, 4, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 0, 1, 0, 0, 3, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 3, 1, 0, 3, 3, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 0, 1, 4, 0, 3, 4, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 3, 1, 4, 3, 3, 4, Tile::log_Id, Tile::log_Id, false); // wooden walls - generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 3, 1, 1, 3, 3, 3, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 1, 0, 2, 3, 0, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 1, 4, 2, 3, 4, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 0, 1, 1, 0, 3, 3, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 3, 1, 1, 3, 3, 3, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 1, 0, 2, 3, 0, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 1, 4, 2, 3, 4, Tile::planks_Id, Tile::planks_Id, false); // windows - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 3, 2, 2, chunkBB); // table if (tablePlacement > 0) { placeBlock(level, Tile::fence_Id, 0, tablePlacement, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, tablePlacement, 2, 3, chunkBB); + placeBlock(level, Tile::wooden_pressure_plate_Id, 0, tablePlacement, 2, 3, chunkBB); } // entrance placeBlock(level, 0, 0, 1, 1, 0, chunkBB); placeBlock(level, 0, 0, 1, 2, 0, chunkBB); - createDoor(level, chunkBB, random, 1, 1, 0, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 1, 1, 0, getOrientationData(Tile::wooden_door_Id, 1)); if (getBlock(level, 1, 0, -1, chunkBB) == 0 && getBlock(level, 1, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 1, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 1, 0, -1, chunkBB); } for (int z = 0; z < depth; z++) @@ -1318,75 +1318,75 @@ bool VillagePieces::PigHouse::postProcess(Level *level, Random *random, Bounding generateBox(level, chunkBB, 3, 1, 10, 7, 1, 10, Tile::fence_Id, Tile::fence_Id, false); // floor - generateBox(level, chunkBB, 1, 0, 1, 7, 0, 4, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 1, 0, 1, 7, 0, 4, Tile::planks_Id, Tile::planks_Id, false); generateBox(level, chunkBB, 0, 0, 0, 0, 3, 5, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 8, 0, 0, 8, 3, 5, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 1, 0, 0, 7, 1, 0, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 1, 0, 5, 7, 1, 5, Tile::cobblestone_Id, Tile::cobblestone_Id, false); // roof - generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 2, 5, 7, 3, 5, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 4, 1, 8, 4, 1, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 4, 4, 8, 4, 4, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 5, 2, 8, 5, 3, Tile::wood_Id, Tile::wood_Id, false); - placeBlock(level, Tile::wood_Id, 0, 0, 4, 2, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 0, 4, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 4, 2, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 4, 3, chunkBB); + generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 2, 5, 7, 3, 5, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 4, 1, 8, 4, 1, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 4, 4, 8, 4, 4, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 5, 2, 8, 5, 3, Tile::planks_Id, Tile::planks_Id, false); + placeBlock(level, Tile::planks_Id, 0, 0, 4, 2, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 0, 4, 3, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 4, 2, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 4, 3, chunkBB); - int southStairs = getOrientationData(Tile::stairs_wood_Id, 3); - int northStairs = getOrientationData(Tile::stairs_wood_Id, 2); + int southStairs = getOrientationData(Tile::oak_stairs_Id, 3); + int northStairs = getOrientationData(Tile::oak_stairs_Id, 2); for (int d = -1; d <= 2; d++) { for (int w = 0; w <= 8; w++) { - placeBlock(level, Tile::stairs_wood_Id, southStairs, w, 4 + d, d, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, northStairs, w, 4 + d, 5 - d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, southStairs, w, 4 + d, d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, northStairs, w, 4 + d, 5 - d, chunkBB); } } // windows etc - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 3, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 3, 2, 5, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 6, 2, 5, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 2, 1, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 2, 4, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 1, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 3, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 3, 2, 5, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 2, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 6, 2, 5, chunkBB); // table placeBlock(level, Tile::fence_Id, 0, 2, 1, 3, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 2, 2, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, getOrientationData(Tile::stairs_wood_Id, 3), 2, 1, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, getOrientationData(Tile::stairs_wood_Id, 1), 1, 1, 3, chunkBB); + placeBlock(level, Tile::wooden_pressure_plate_Id, 0, 2, 2, 3, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 1, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, getOrientationData(Tile::oak_stairs_Id, 3), 2, 1, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, getOrientationData(Tile::oak_stairs_Id, 1), 1, 1, 3, chunkBB); // butcher table - generateBox(level, chunkBB, 5, 0, 1, 7, 0, 3, Tile::stoneSlab_Id, Tile::stoneSlab_Id, false); - placeBlock(level, Tile::stoneSlab_Id, 0, 6, 1, 1, chunkBB); - placeBlock(level, Tile::stoneSlab_Id, 0, 6, 1, 2, chunkBB); + generateBox(level, chunkBB, 5, 0, 1, 7, 0, 3, Tile::double_stone_slab_Id, Tile::double_stone_slab_Id, false); + placeBlock(level, Tile::double_stone_slab_Id, 0, 6, 1, 1, chunkBB); + placeBlock(level, Tile::double_stone_slab_Id, 0, 6, 1, 2, chunkBB); // entrance placeBlock(level, 0, 0, 2, 1, 0, chunkBB); placeBlock(level, 0, 0, 2, 2, 0, chunkBB); placeBlock(level, Tile::torch_Id, 0, 2, 3, 1, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::wooden_door_Id, 1)); if (getBlock(level, 2, 0, -1, chunkBB) == 0 && getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 2, 0, -1, chunkBB); } // pig entrance placeBlock(level, 0, 0, 6, 1, 5, chunkBB); placeBlock(level, 0, 0, 6, 2, 5, chunkBB); placeBlock(level, Tile::torch_Id, 0, 6, 3, 4, chunkBB); - createDoor(level, chunkBB, random, 6, 1, 5, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 6, 1, 5, getOrientationData(Tile::wooden_door_Id, 1)); for (int z = 0; z < 5; z++) { @@ -1455,8 +1455,8 @@ bool VillagePieces::TwoRoomHouse::postProcess(Level *level, Random *random, Boun generateBox(level, chunkBB, 2, 1, 6, 8, 4, 10, 0, 0, false); // floor - generateBox(level, chunkBB, 2, 0, 5, 8, 0, 10, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 0, 1, 7, 0, 4, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 2, 0, 5, 8, 0, 10, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 0, 1, 7, 0, 4, Tile::planks_Id, Tile::planks_Id, false); generateBox(level, chunkBB, 0, 0, 0, 0, 3, 5, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 8, 0, 0, 8, 3, 10, Tile::cobblestone_Id, Tile::cobblestone_Id, false); generateBox(level, chunkBB, 1, 0, 0, 7, 2, 0, Tile::cobblestone_Id, Tile::cobblestone_Id, false); @@ -1465,94 +1465,94 @@ bool VillagePieces::TwoRoomHouse::postProcess(Level *level, Random *random, Boun generateBox(level, chunkBB, 3, 0, 10, 7, 3, 10, Tile::cobblestone_Id, Tile::cobblestone_Id, false); // room 1 roof - generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 2, 5, 2, 3, 5, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 4, 1, 8, 4, 1, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 4, 4, 3, 4, 4, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 5, 2, 8, 5, 3, Tile::wood_Id, Tile::wood_Id, false); - placeBlock(level, Tile::wood_Id, 0, 0, 4, 2, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 0, 4, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 4, 2, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 4, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 4, 4, chunkBB); + generateBox(level, chunkBB, 1, 2, 0, 7, 3, 0, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 2, 5, 2, 3, 5, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 4, 1, 8, 4, 1, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 4, 4, 3, 4, 4, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 5, 2, 8, 5, 3, Tile::planks_Id, Tile::planks_Id, false); + placeBlock(level, Tile::planks_Id, 0, 0, 4, 2, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 0, 4, 3, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 4, 2, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 4, 3, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 4, 4, chunkBB); - int southStairs = getOrientationData(Tile::stairs_wood_Id, 3); - int northStairs = getOrientationData(Tile::stairs_wood_Id, 2); + int southStairs = getOrientationData(Tile::oak_stairs_Id, 3); + int northStairs = getOrientationData(Tile::oak_stairs_Id, 2); for (int d = -1; d <= 2; d++) { for (int w = 0; w <= 8; w++) { - placeBlock(level, Tile::stairs_wood_Id, southStairs, w, 4 + d, d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, southStairs, w, 4 + d, d, chunkBB); if ((d > -1 || w <= 1) && (d > 0 || w <= 3) && (d > 1 || w <= 4 || w >= 6)) { - placeBlock(level, Tile::stairs_wood_Id, northStairs, w, 4 + d, 5 - d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, northStairs, w, 4 + d, 5 - d, chunkBB); } } } // room 2 roof - generateBox(level, chunkBB, 3, 4, 5, 3, 4, 10, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 7, 4, 2, 7, 4, 10, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 5, 4, 4, 5, 10, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 6, 5, 4, 6, 5, 10, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 5, 6, 3, 5, 6, 10, Tile::wood_Id, Tile::wood_Id, false); - int westStairs = getOrientationData(Tile::stairs_wood_Id, 0); + generateBox(level, chunkBB, 3, 4, 5, 3, 4, 10, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 7, 4, 2, 7, 4, 10, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 4, 5, 4, 4, 5, 10, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 6, 5, 4, 6, 5, 10, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 5, 6, 3, 5, 6, 10, Tile::planks_Id, Tile::planks_Id, false); + int westStairs = getOrientationData(Tile::oak_stairs_Id, 0); for (int w = 4; w >= 1; w--) { - placeBlock(level, Tile::wood_Id, 0, w, 2 + w, 7 - w, chunkBB); + placeBlock(level, Tile::planks_Id, 0, w, 2 + w, 7 - w, chunkBB); for (int d = 8 - w; d <= 10; d++) { - placeBlock(level, Tile::stairs_wood_Id, westStairs, w, 2 + w, d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, westStairs, w, 2 + w, d, chunkBB); } } - int eastStairs = getOrientationData(Tile::stairs_wood_Id, 1); - placeBlock(level, Tile::wood_Id, 0, 6, 6, 3, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 7, 5, 4, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, eastStairs, 6, 6, 4, chunkBB); + int eastStairs = getOrientationData(Tile::oak_stairs_Id, 1); + placeBlock(level, Tile::planks_Id, 0, 6, 6, 3, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 7, 5, 4, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, eastStairs, 6, 6, 4, chunkBB); for (int w = 6; w <= 8; w++) { for (int d = 5; d <= 10; d++) { - placeBlock(level, Tile::stairs_wood_Id, eastStairs, w, 12 - w, d, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, eastStairs, w, 12 - w, d, chunkBB); } } // windows etc - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 1, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 3, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 2, 1, chunkBB); + placeBlock(level, Tile::log_Id, 0, 0, 2, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 3, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 4, 2, 0, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 2, 0, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 6, 2, 0, chunkBB); + placeBlock(level, Tile::log_Id, 0, 4, 2, 0, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 2, 0, chunkBB); + placeBlock(level, Tile::log_Id, 0, 6, 2, 0, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 1, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 3, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 4, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 8, 2, 5, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 7, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 8, 2, 8, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 8, 2, 9, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 2, 2, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 7, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 8, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 2, 2, 9, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 1, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 3, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 4, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 8, 2, 5, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 7, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 8, 2, 8, chunkBB); + placeBlock(level, Tile::log_Id, 0, 8, 2, 9, chunkBB); + placeBlock(level, Tile::log_Id, 0, 2, 2, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 7, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 8, chunkBB); + placeBlock(level, Tile::log_Id, 0, 2, 2, 9, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 4, 4, 10, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 5, 4, 10, chunkBB); - placeBlock(level, Tile::treeTrunk_Id, 0, 6, 4, 10, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 5, 5, 10, chunkBB); + placeBlock(level, Tile::log_Id, 0, 4, 4, 10, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 5, 4, 10, chunkBB); + placeBlock(level, Tile::log_Id, 0, 6, 4, 10, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 5, 5, 10, chunkBB); // entrance placeBlock(level, 0, 0, 2, 1, 0, chunkBB); placeBlock(level, 0, 0, 2, 2, 0, chunkBB); placeBlock(level, Tile::torch_Id, 0, 2, 3, 1, chunkBB); - createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::door_wood_Id, 1)); + createDoor(level, chunkBB, random, 2, 1, 0, getOrientationData(Tile::wooden_door_Id, 1)); generateBox(level, chunkBB, 1, 0, -1, 3, 2, -1, 0, 0, false); if (getBlock(level, 2, 0, -1, chunkBB) == 0 && getBlock(level, 2, -1, -1, chunkBB) != 0) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), 2, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), 2, 0, -1, chunkBB); } for (int z = 0; z < 5; z++) @@ -1582,23 +1582,23 @@ void VillagePieces::Smithy::staticCtor() { treasureItems = WeighedTreasureArray(17); treasureItems[0] = new WeighedTreasure(Item::diamond_Id, 0, 1, 3, 3); - treasureItems[1] = new WeighedTreasure(Item::ironIngot_Id, 0, 1, 5, 10); - treasureItems[2] = new WeighedTreasure(Item::goldIngot_Id, 0, 1, 3, 5); + treasureItems[1] = new WeighedTreasure(Item::iron_ingot_Id, 0, 1, 5, 10); + treasureItems[2] = new WeighedTreasure(Item::gold_ingot_Id, 0, 1, 3, 5); treasureItems[3] = new WeighedTreasure(Item::bread_Id, 0, 1, 3, 15); treasureItems[4] = new WeighedTreasure(Item::apple_Id, 0, 1, 3, 15); - treasureItems[5] = new WeighedTreasure(Item::pickAxe_iron_Id, 0, 1, 1, 5); - treasureItems[6] = new WeighedTreasure(Item::sword_iron_Id, 0, 1, 1, 5); - treasureItems[7] = new WeighedTreasure(Item::chestplate_iron_Id, 0, 1, 1, 5); - treasureItems[8] = new WeighedTreasure(Item::helmet_iron_Id, 0, 1, 1, 5); - treasureItems[9] = new WeighedTreasure(Item::leggings_iron_Id, 0, 1, 1, 5); - treasureItems[10] = new WeighedTreasure(Item::boots_iron_Id, 0, 1, 1, 5); + treasureItems[5] = new WeighedTreasure(Item::iron_pickaxe_Id, 0, 1, 1, 5); + treasureItems[6] = new WeighedTreasure(Item::iron_sword_Id, 0, 1, 1, 5); + treasureItems[7] = new WeighedTreasure(Item::iron_chestplate_Id, 0, 1, 1, 5); + treasureItems[8] = new WeighedTreasure(Item::iron_helmet_Id, 0, 1, 1, 5); + treasureItems[9] = new WeighedTreasure(Item::iron_leggings_Id, 0, 1, 1, 5); + treasureItems[10] = new WeighedTreasure(Item::iron_boots_Id, 0, 1, 1, 5); treasureItems[11] = new WeighedTreasure(Tile::obsidian_Id, 0, 3, 7, 5); treasureItems[12] = new WeighedTreasure(Tile::sapling_Id, 0, 3, 7, 5); // very rare for villages ... treasureItems[13] = new WeighedTreasure(Item::saddle_Id, 0, 1, 1, 3); - treasureItems[14] = new WeighedTreasure(Item::horseArmorMetal_Id, 0, 1, 1, 1); - treasureItems[15] = new WeighedTreasure(Item::horseArmorGold_Id, 0, 1, 1, 1); - treasureItems[16] = new WeighedTreasure(Item::horseArmorDiamond_Id, 0, 1, 1, 1); + treasureItems[14] = new WeighedTreasure(Item::iron_horse_armor_Id, 0, 1, 1, 1); + treasureItems[15] = new WeighedTreasure(Item::golden_horse_armor_Id, 0, 1, 1, 1); + treasureItems[16] = new WeighedTreasure(Item::diamond_horse_armor_Id, 0, 1, 1, 1); // ... } @@ -1660,19 +1660,19 @@ bool VillagePieces::Smithy::postProcess(Level *level, Random *random, BoundingBo // roof generateBox(level, chunkBB, 0, 4, 0, 9, 4, 6, Tile::cobblestone_Id, Tile::cobblestone_Id, false); - generateBox(level, chunkBB, 0, 5, 0, 9, 5, 6, Tile::stoneSlabHalf_Id, Tile::stoneSlabHalf_Id, false); + generateBox(level, chunkBB, 0, 5, 0, 9, 5, 6, Tile::stone_slab_Id, Tile::stone_slab_Id, false); generateBox(level, chunkBB, 1, 5, 1, 8, 5, 5, 0, 0, false); // room walls - generateBox(level, chunkBB, 1, 1, 0, 2, 3, 0, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 1, 0, 0, 4, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 3, 1, 0, 3, 4, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 0, 1, 6, 0, 4, 6, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - placeBlock(level, Tile::wood_Id, 0, 3, 3, 1, chunkBB); - generateBox(level, chunkBB, 3, 1, 2, 3, 3, 2, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 4, 1, 3, 5, 3, 3, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 0, 1, 1, 0, 3, 5, Tile::wood_Id, Tile::wood_Id, false); - generateBox(level, chunkBB, 1, 1, 6, 5, 3, 6, Tile::wood_Id, Tile::wood_Id, false); + generateBox(level, chunkBB, 1, 1, 0, 2, 3, 0, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 1, 0, 0, 4, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 3, 1, 0, 3, 4, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 0, 1, 6, 0, 4, 6, Tile::log_Id, Tile::log_Id, false); + placeBlock(level, Tile::planks_Id, 0, 3, 3, 1, chunkBB); + generateBox(level, chunkBB, 3, 1, 2, 3, 3, 2, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 4, 1, 3, 5, 3, 3, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 0, 1, 1, 0, 3, 5, Tile::planks_Id, Tile::planks_Id, false); + generateBox(level, chunkBB, 1, 1, 6, 5, 3, 6, Tile::planks_Id, Tile::planks_Id, false); // pillars generateBox(level, chunkBB, 5, 1, 0, 5, 3, 0, Tile::fence_Id, Tile::fence_Id, false); @@ -1680,28 +1680,28 @@ bool VillagePieces::Smithy::postProcess(Level *level, Random *random, BoundingBo // furnace generateBox(level, chunkBB, 6, 1, 4, 9, 4, 6, Tile::cobblestone_Id, Tile::cobblestone_Id, false); - placeBlock(level, Tile::lava_Id, 0, 7, 1, 5, chunkBB); - placeBlock(level, Tile::lava_Id, 0, 8, 1, 5, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 5, chunkBB); - placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 4, chunkBB); + placeBlock(level, Tile::flowing_lava_Id, 0, 7, 1, 5, chunkBB); + placeBlock(level, Tile::flowing_lava_Id, 0, 8, 1, 5, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, 9, 2, 5, chunkBB); + placeBlock(level, Tile::iron_bars_Id, 0, 9, 2, 4, chunkBB); generateBox(level, chunkBB, 7, 2, 4, 8, 2, 5, 0, 0, false); placeBlock(level, Tile::cobblestone_Id, 0, 6, 1, 3, chunkBB); placeBlock(level, Tile::furnace_Id, 0, 6, 2, 3, chunkBB); placeBlock(level, Tile::furnace_Id, 0, 6, 3, 3, chunkBB); - placeBlock(level, Tile::stoneSlab_Id, 0, 8, 1, 1, chunkBB); + placeBlock(level, Tile::double_stone_slab_Id, 0, 8, 1, 1, chunkBB); // windows etc - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 2, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 0, 2, 4, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 2, 2, 6, chunkBB); - placeBlock(level, Tile::thinGlass_Id, 0, 4, 2, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 2, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 0, 2, 4, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 2, 2, 6, chunkBB); + placeBlock(level, Tile::glass_pane_Id, 0, 4, 2, 6, chunkBB); // table placeBlock(level, Tile::fence_Id, 0, 2, 1, 4, chunkBB); - placeBlock(level, Tile::pressurePlate_wood_Id, 0, 2, 2, 4, chunkBB); - placeBlock(level, Tile::wood_Id, 0, 1, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, getOrientationData(Tile::stairs_wood_Id, 3), 2, 1, 5, chunkBB); - placeBlock(level, Tile::stairs_wood_Id, getOrientationData(Tile::stairs_wood_Id, 1), 1, 1, 4, chunkBB); + placeBlock(level, Tile::wooden_pressure_plate_Id, 0, 2, 2, 4, chunkBB); + placeBlock(level, Tile::planks_Id, 0, 1, 1, 5, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, getOrientationData(Tile::oak_stairs_Id, 3), 2, 1, 5, chunkBB); + placeBlock(level, Tile::oak_stairs_Id, getOrientationData(Tile::oak_stairs_Id, 1), 1, 1, 4, chunkBB); if (!hasPlacedChest) { @@ -1719,7 +1719,7 @@ bool VillagePieces::Smithy::postProcess(Level *level, Random *random, BoundingBo { if (getBlock(level, x, 0, -1, chunkBB) == 0 && getBlock(level, x, -1, -1, chunkBB) != 0 ) { - placeBlock(level, Tile::stairs_stone_Id, getOrientationData(Tile::stairs_stone_Id, 3), x, 0, -1, chunkBB); + placeBlock(level, Tile::stone_stairs_Id, getOrientationData(Tile::stone_stairs_Id, 3), x, 0, -1, chunkBB); } } @@ -1818,12 +1818,12 @@ bool VillagePieces::Farmland::postProcess(Level *level, Random *random, Bounding generateBox(level, chunkBB, 1, 0, 1, 2, 0, 7, Tile::farmland_Id, Tile::farmland_Id, false); generateBox(level, chunkBB, 4, 0, 1, 5, 0, 7, Tile::farmland_Id, Tile::farmland_Id, false); // walkpaths - generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 0, 5, 0, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 8, 5, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 0, 0, 5, 0, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 0, 8, 5, 0, 8, Tile::log_Id, Tile::log_Id, false); // water - generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::water_Id, Tile::water_Id, false); + generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::flowing_water_Id, Tile::flowing_water_Id, false); // crops for (int d = 1; d <= 7; d++) { @@ -1932,14 +1932,14 @@ bool VillagePieces::DoubleFarmland::postProcess(Level *level, Random *random, Bo generateBox(level, chunkBB, 7, 0, 1, 8, 0, 7, Tile::farmland_Id, Tile::farmland_Id, false); generateBox(level, chunkBB, 10, 0, 1, 11, 0, 7, Tile::farmland_Id, Tile::farmland_Id, false); // walkpaths - generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 12, 0, 0, 12, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 0, 11, 0, 0, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); - generateBox(level, chunkBB, 1, 0, 8, 11, 0, 8, Tile::treeTrunk_Id, Tile::treeTrunk_Id, false); + generateBox(level, chunkBB, 0, 0, 0, 0, 0, 8, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 6, 0, 0, 6, 0, 8, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 12, 0, 0, 12, 0, 8, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 0, 0, 11, 0, 0, Tile::log_Id, Tile::log_Id, false); + generateBox(level, chunkBB, 1, 0, 8, 11, 0, 8, Tile::log_Id, Tile::log_Id, false); // water - generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::water_Id, Tile::water_Id, false); - generateBox(level, chunkBB, 9, 0, 1, 9, 0, 7, Tile::water_Id, Tile::water_Id, false); + generateBox(level, chunkBB, 3, 0, 1, 3, 0, 7, Tile::flowing_water_Id, Tile::flowing_water_Id, false); + generateBox(level, chunkBB, 9, 0, 1, 9, 0, 7, Tile::flowing_water_Id, Tile::flowing_water_Id, false); // crops for (int d = 1; d <= 7; d++) { diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp index e20a9924..c608b065 100644 --- a/Minecraft.World/Villager.cpp +++ b/Minecraft.World/Villager.cpp @@ -154,7 +154,7 @@ bool Villager::mobInteract(shared_ptr player) { // [EB]: Truly dislike this code but I don't see another easy way shared_ptr item = player->inventory->getSelected(); - bool holdingSpawnEgg = item != nullptr && item->id == Item::spawnEgg_Id; + bool holdingSpawnEgg = item != nullptr && item->id == Item::spawn_egg_Id; if (!holdingSpawnEgg && isAlive() && !isTrading() && !isBaby()) { @@ -408,15 +408,15 @@ void Villager::addOffers(int addCount) case PROFESSION_FARMER: addItemForTradeIn(newOffers, Item::wheat_Id, random, getRecipeChance(.9f)); addItemForTradeIn(newOffers, Tile::wool_Id, random, getRecipeChance(.5f)); - addItemForTradeIn(newOffers, Item::chicken_raw_Id, random, getRecipeChance(.5f)); - addItemForTradeIn(newOffers, Item::fish_cooked_Id, random, getRecipeChance(.4f)); + addItemForTradeIn(newOffers, Item::chicken_Id, random, getRecipeChance(.5f)); + addItemForTradeIn(newOffers, Item::cooked_fish_Id, random, getRecipeChance(.4f)); addItemForPurchase(newOffers, Item::bread_Id, random, getRecipeChance(.9f)); - addItemForPurchase(newOffers, Item::melon_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::melon_block_Id, random, getRecipeChance(.3f)); addItemForPurchase(newOffers, Item::apple_Id, random, getRecipeChance(.3f)); addItemForPurchase(newOffers, Item::cookie_Id, random, getRecipeChance(.3f)); addItemForPurchase(newOffers, Item::shears_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::flintAndSteel_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::chicken_cooked_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::flint_and_steel_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::cooked_chicken_Id, random, getRecipeChance(.3f)); addItemForPurchase(newOffers, Item::arrow_Id, random, getRecipeChance(.5f)); if (random->nextFloat() < getRecipeChance(.5f)) { @@ -425,74 +425,74 @@ void Villager::addOffers(int addCount) break; case PROFESSION_BUTCHER: addItemForTradeIn(newOffers, Item::coal_Id, random, getRecipeChance(.7f)); - addItemForTradeIn(newOffers, Item::porkChop_raw_Id, random, getRecipeChance(.5f)); - addItemForTradeIn(newOffers, Item::beef_raw_Id, random, getRecipeChance(.5f)); + addItemForTradeIn(newOffers, Item::porkchop_Id, random, getRecipeChance(.5f)); + addItemForTradeIn(newOffers, Item::beef_Id, random, getRecipeChance(.5f)); addItemForPurchase(newOffers, Item::saddle_Id, random, getRecipeChance(.1f)); - addItemForPurchase(newOffers, Item::chestplate_leather_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::boots_leather_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::helmet_leather_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::leggings_leather_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::porkChop_cooked_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::beef_cooked_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::leather_chestplate_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::leather_boots_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::leather_helmet_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::leather_leggings_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::cooked_porkchop_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::cooked_beef_Id, random, getRecipeChance(.3f)); break; case PROFESSION_SMITH: addItemForTradeIn(newOffers, Item::coal_Id, random, getRecipeChance(.7f)); - addItemForTradeIn(newOffers, Item::ironIngot_Id, random, getRecipeChance(.5f)); - addItemForTradeIn(newOffers, Item::goldIngot_Id, random, getRecipeChance(.5f)); + addItemForTradeIn(newOffers, Item::iron_ingot_Id, random, getRecipeChance(.5f)); + addItemForTradeIn(newOffers, Item::gold_ingot_Id, random, getRecipeChance(.5f)); addItemForTradeIn(newOffers, Item::diamond_Id, random, getRecipeChance(.5f)); - addItemForPurchase(newOffers, Item::sword_iron_Id, random, getRecipeChance(.5f)); - addItemForPurchase(newOffers, Item::sword_diamond_Id, random, getRecipeChance(.5f)); - addItemForPurchase(newOffers, Item::hatchet_iron_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::hatchet_diamond_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::pickAxe_iron_Id, random, getRecipeChance(.5f)); - addItemForPurchase(newOffers, Item::pickAxe_diamond_Id, random, getRecipeChance(.5f)); - addItemForPurchase(newOffers, Item::shovel_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::shovel_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::hoe_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::hoe_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::boots_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::boots_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::helmet_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::helmet_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::chestplate_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::chestplate_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::leggings_iron_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::leggings_diamond_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::boots_chain_Id, random, getRecipeChance(.1f)); - addItemForPurchase(newOffers, Item::helmet_chain_Id, random, getRecipeChance(.1f)); - addItemForPurchase(newOffers, Item::chestplate_chain_Id, random, getRecipeChance(.1f)); - addItemForPurchase(newOffers, Item::leggings_chain_Id, random, getRecipeChance(.1f)); + addItemForPurchase(newOffers, Item::iron_sword_Id, random, getRecipeChance(.5f)); + addItemForPurchase(newOffers, Item::diamond_sword_Id, random, getRecipeChance(.5f)); + addItemForPurchase(newOffers, Item::iron_axe_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::diamond_axe_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::iron_pickaxe_Id, random, getRecipeChance(.5f)); + addItemForPurchase(newOffers, Item::diamond_pickaxe_Id, random, getRecipeChance(.5f)); + addItemForPurchase(newOffers, Item::iron_shovel_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_shovel_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::iron_hoe_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_hoe_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::iron_boots_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_boots_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::iron_helmet_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_helmet_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::iron_chestplate_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_chestplate_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::iron_leggings_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::diamond_leggings_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::chainmail_boots_Id, random, getRecipeChance(.1f)); + addItemForPurchase(newOffers, Item::chainmail_helmet_Id, random, getRecipeChance(.1f)); + addItemForPurchase(newOffers, Item::chainmail_chestplate_Id, random, getRecipeChance(.1f)); + addItemForPurchase(newOffers, Item::chainmail_leggings_Id, random, getRecipeChance(.1f)); break; case PROFESSION_LIBRARIAN: addItemForTradeIn(newOffers, Item::paper_Id, random, getRecipeChance(.8f)); addItemForTradeIn(newOffers, Item::book_Id, random, getRecipeChance(.8f)); - //addItemForTradeIn(newOffers, Item::writtenBook_Id, random, getRecipeChance(0.3f)); + //addItemForTradeIn(newOffers, Item::written_book_Id, random, getRecipeChance(0.3f)); addItemForPurchase(newOffers, Tile::bookshelf_Id, random, getRecipeChance(.8f)); addItemForPurchase(newOffers, Tile::glass_Id, random, getRecipeChance(.2f)); addItemForPurchase(newOffers, Item::compass_Id, random, getRecipeChance(.2f)); addItemForPurchase(newOffers, Item::clock_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::nameTag_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::name_tag_Id, random, getRecipeChance(.2f)); if (random->nextFloat() < getRecipeChance(0.07f)) { Enchantment *enchantment = Enchantment::validEnchantments[random->nextInt(Enchantment::validEnchantments.size())]; int level = Mth::nextInt(random, enchantment->getMinLevel(), enchantment->getMaxLevel()); - shared_ptr book = Item::enchantedBook->createForEnchantment(new EnchantmentInstance(enchantment, level)); + shared_ptr book = Item::enchanted_book->createForEnchantment(new EnchantmentInstance(enchantment, level)); int cost = 2 + random->nextInt(5 + (level * 10)) + 3 * level; newOffers->push_back(new MerchantRecipe(std::make_shared(Item::book), std::make_shared(Item::emerald, cost), book)); } break; case PROFESSION_PRIEST: - addItemForPurchase(newOffers, Item::eyeOfEnder_Id, random, getRecipeChance(.3f)); - addItemForPurchase(newOffers, Item::expBottle_Id, random, getRecipeChance(.2f)); - addItemForPurchase(newOffers, Item::redStone_Id, random, getRecipeChance(.4f)); + addItemForPurchase(newOffers, Item::eye_of_ender_Id, random, getRecipeChance(.3f)); + addItemForPurchase(newOffers, Item::experience_bottle_Id, random, getRecipeChance(.2f)); + addItemForPurchase(newOffers, Item::redstone_Id, random, getRecipeChance(.4f)); addItemForPurchase(newOffers, Tile::glowstone_Id, random, getRecipeChance(.3f)); { int enchantItems[] = { - Item::sword_iron_Id, Item::sword_diamond_Id, Item::chestplate_iron_Id, Item::chestplate_diamond_Id, Item::hatchet_iron_Id, Item::hatchet_diamond_Id, Item::pickAxe_iron_Id, - Item::pickAxe_diamond_Id + Item::iron_sword_Id, Item::diamond_sword_Id, Item::iron_chestplate_Id, Item::diamond_chestplate_Id, Item::iron_axe_Id, Item::diamond_axe_Id, Item::iron_pickaxe_Id, + Item::diamond_pickaxe_Id }; for (unsigned int i = 0; i < 8; ++i) { @@ -510,7 +510,7 @@ void Villager::addOffers(int addCount) if (newOffers->empty()) { - addItemForTradeIn(newOffers, Item::goldIngot_Id, random, 1.0f); + addItemForTradeIn(newOffers, Item::gold_ingot_Id, random, 1.0f); } // shuffle the list to make it more interesting @@ -539,69 +539,69 @@ void Villager::overrideOffers(MerchantRecipeList *recipeList) void Villager::staticCtor() { MIN_MAX_VALUES[Item::coal_Id] = pair(16, 24); - MIN_MAX_VALUES[Item::ironIngot_Id] = pair(8, 10); - MIN_MAX_VALUES[Item::goldIngot_Id] = pair(8, 10); + MIN_MAX_VALUES[Item::iron_ingot_Id] = pair(8, 10); + MIN_MAX_VALUES[Item::gold_ingot_Id] = pair(8, 10); MIN_MAX_VALUES[Item::diamond_Id] = pair(4, 6); MIN_MAX_VALUES[Item::paper_Id] = pair(24, 36); MIN_MAX_VALUES[Item::book_Id] = pair(11, 13); - //MIN_MAX_VALUES.insert(Item::writtenBook_Id, pair(1, 1)); - MIN_MAX_VALUES[Item::enderPearl_Id] = pair(3, 4); - MIN_MAX_VALUES[Item::eyeOfEnder_Id] = pair(2, 3); - MIN_MAX_VALUES[Item::porkChop_raw_Id] = pair(14, 18); - MIN_MAX_VALUES[Item::beef_raw_Id] = pair(14, 18); - MIN_MAX_VALUES[Item::chicken_raw_Id] = pair(14, 18); - MIN_MAX_VALUES[Item::fish_cooked_Id] = pair(9, 13); - MIN_MAX_VALUES[Item::seeds_wheat_Id] = pair(34, 48); - MIN_MAX_VALUES[Item::seeds_melon_Id] = pair(30, 38); - MIN_MAX_VALUES[Item::seeds_pumpkin_Id] = pair(30, 38); + //MIN_MAX_VALUES.insert(Item::written_book_Id, pair(1, 1)); + MIN_MAX_VALUES[Item::ender_pearl_Id] = pair(3, 4); + MIN_MAX_VALUES[Item::eye_of_ender_Id] = pair(2, 3); + MIN_MAX_VALUES[Item::porkchop_Id] = pair(14, 18); + MIN_MAX_VALUES[Item::beef_Id] = pair(14, 18); + MIN_MAX_VALUES[Item::chicken_Id] = pair(14, 18); + MIN_MAX_VALUES[Item::cooked_fish_Id] = pair(9, 13); + MIN_MAX_VALUES[Item::wheat_seeds_Id] = pair(34, 48); + MIN_MAX_VALUES[Item::melon_seeds_Id] = pair(30, 38); + MIN_MAX_VALUES[Item::pumpkin_seeds_Id] = pair(30, 38); MIN_MAX_VALUES[Item::wheat_Id] = pair(18, 22); MIN_MAX_VALUES[Tile::wool_Id] = pair(14, 22); MIN_MAX_VALUES[Item::rotten_flesh_Id] = pair(36, 64); - MIN_MAX_PRICES[Item::flintAndSteel_Id] = pair(3, 4); + MIN_MAX_PRICES[Item::flint_and_steel_Id] = pair(3, 4); MIN_MAX_PRICES[Item::shears_Id] = pair(3, 4); - MIN_MAX_PRICES[Item::sword_iron_Id] = pair(7, 11); - MIN_MAX_PRICES[Item::sword_diamond_Id] = pair(12, 14); - MIN_MAX_PRICES[Item::hatchet_iron_Id] = pair(6, 8); - MIN_MAX_PRICES[Item::hatchet_diamond_Id] = pair(9, 12); - MIN_MAX_PRICES[Item::pickAxe_iron_Id] = pair(7, 9); - MIN_MAX_PRICES[Item::pickAxe_diamond_Id] = pair(10, 12); - MIN_MAX_PRICES[Item::shovel_iron_Id] = pair(4, 6); - MIN_MAX_PRICES[Item::shovel_diamond_Id] = pair(7, 8); - MIN_MAX_PRICES[Item::hoe_iron_Id] = pair(4, 6); - MIN_MAX_PRICES[Item::hoe_diamond_Id] = pair(7, 8); - MIN_MAX_PRICES[Item::boots_iron_Id] = pair(4, 6); - MIN_MAX_PRICES[Item::boots_diamond_Id] = pair(7, 8); - MIN_MAX_PRICES[Item::helmet_iron_Id] = pair(4, 6); - MIN_MAX_PRICES[Item::helmet_diamond_Id] = pair(7, 8); - MIN_MAX_PRICES[Item::chestplate_iron_Id] = pair(10, 14); - MIN_MAX_PRICES[Item::chestplate_diamond_Id] = pair(16, 19); - MIN_MAX_PRICES[Item::leggings_iron_Id] = pair(8, 10); - MIN_MAX_PRICES[Item::leggings_diamond_Id] = pair(11, 14); - MIN_MAX_PRICES[Item::boots_chain_Id] = pair(5, 7); - MIN_MAX_PRICES[Item::helmet_chain_Id] = pair(5, 7); - MIN_MAX_PRICES[Item::chestplate_chain_Id] = pair(11, 15); - MIN_MAX_PRICES[Item::leggings_chain_Id] = pair(9, 11); + MIN_MAX_PRICES[Item::iron_sword_Id] = pair(7, 11); + MIN_MAX_PRICES[Item::diamond_sword_Id] = pair(12, 14); + MIN_MAX_PRICES[Item::iron_axe_Id] = pair(6, 8); + MIN_MAX_PRICES[Item::diamond_axe_Id] = pair(9, 12); + MIN_MAX_PRICES[Item::iron_pickaxe_Id] = pair(7, 9); + MIN_MAX_PRICES[Item::diamond_pickaxe_Id] = pair(10, 12); + MIN_MAX_PRICES[Item::iron_shovel_Id] = pair(4, 6); + MIN_MAX_PRICES[Item::diamond_shovel_Id] = pair(7, 8); + MIN_MAX_PRICES[Item::iron_hoe_Id] = pair(4, 6); + MIN_MAX_PRICES[Item::diamond_hoe_Id] = pair(7, 8); + MIN_MAX_PRICES[Item::iron_boots_Id] = pair(4, 6); + MIN_MAX_PRICES[Item::diamond_boots_Id] = pair(7, 8); + MIN_MAX_PRICES[Item::iron_helmet_Id] = pair(4, 6); + MIN_MAX_PRICES[Item::diamond_helmet_Id] = pair(7, 8); + MIN_MAX_PRICES[Item::iron_chestplate_Id] = pair(10, 14); + MIN_MAX_PRICES[Item::diamond_chestplate_Id] = pair(16, 19); + MIN_MAX_PRICES[Item::iron_leggings_Id] = pair(8, 10); + MIN_MAX_PRICES[Item::diamond_leggings_Id] = pair(11, 14); + MIN_MAX_PRICES[Item::chainmail_boots_Id] = pair(5, 7); + MIN_MAX_PRICES[Item::chainmail_helmet_Id] = pair(5, 7); + MIN_MAX_PRICES[Item::chainmail_chestplate_Id] = pair(11, 15); + MIN_MAX_PRICES[Item::chainmail_leggings_Id] = pair(9, 11); MIN_MAX_PRICES[Item::bread_Id] = pair(-4, -2); - MIN_MAX_PRICES[Item::melon_Id] = pair(-8, -4); + MIN_MAX_PRICES[Item::melon_block_Id] = pair(-8, -4); MIN_MAX_PRICES[Item::apple_Id] = pair(-8, -4); MIN_MAX_PRICES[Item::cookie_Id] = pair(-10, -7); MIN_MAX_PRICES[Tile::glass_Id] = pair(-5, -3); MIN_MAX_PRICES[Tile::bookshelf_Id] = pair(3, 4); - MIN_MAX_PRICES[Item::chestplate_leather_Id] = pair(4, 5); - MIN_MAX_PRICES[Item::boots_leather_Id] = pair(2, 4); - MIN_MAX_PRICES[Item::helmet_leather_Id] = pair(2, 4); - MIN_MAX_PRICES[Item::leggings_leather_Id] = pair(2, 4); + MIN_MAX_PRICES[Item::leather_chestplate_Id] = pair(4, 5); + MIN_MAX_PRICES[Item::leather_boots_Id] = pair(2, 4); + MIN_MAX_PRICES[Item::leather_helmet_Id] = pair(2, 4); + MIN_MAX_PRICES[Item::leather_leggings_Id] = pair(2, 4); MIN_MAX_PRICES[Item::saddle_Id] = pair(6, 8); - MIN_MAX_PRICES[Item::expBottle_Id] = pair(-4, -1); - MIN_MAX_PRICES[Item::redStone_Id] = pair(-4, -1); + MIN_MAX_PRICES[Item::experience_bottle_Id] = pair(-4, -1); + MIN_MAX_PRICES[Item::redstone_Id] = pair(-4, -1); MIN_MAX_PRICES[Item::compass_Id] = pair(10, 12); MIN_MAX_PRICES[Item::clock_Id] = pair(10, 12); MIN_MAX_PRICES[Tile::glowstone_Id] = pair(-3, -1); - MIN_MAX_PRICES[Item::porkChop_cooked_Id] = pair(-7, -5); - MIN_MAX_PRICES[Item::beef_cooked_Id] = pair(-7, -5); - MIN_MAX_PRICES[Item::chicken_cooked_Id] = pair(-8, -6); - MIN_MAX_PRICES[Item::eyeOfEnder_Id] = pair(7, 11); + MIN_MAX_PRICES[Item::cooked_porkchop_Id] = pair(-7, -5); + MIN_MAX_PRICES[Item::cooked_beef_Id] = pair(-7, -5); + MIN_MAX_PRICES[Item::cooked_chicken_Id] = pair(-8, -6); + MIN_MAX_PRICES[Item::eye_of_ender_Id] = pair(7, 11); MIN_MAX_PRICES[Item::arrow_Id] = pair(-12, -8); } diff --git a/Minecraft.World/VillagerGolem.cpp b/Minecraft.World/VillagerGolem.cpp index 04028056..e07237fa 100644 --- a/Minecraft.World/VillagerGolem.cpp +++ b/Minecraft.World/VillagerGolem.cpp @@ -210,12 +210,12 @@ void VillagerGolem::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) int roses = random->nextInt(3); for (int i = 0; i < roses; i++) { - spawnAtLocation(Tile::rose_Id, 1); + spawnAtLocation(Tile::red_flower_Id, 1); } int iron = 3 + random->nextInt(3); for (int i = 0; i < iron; i++) { - spawnAtLocation(Item::ironIngot_Id, 1); + spawnAtLocation(Item::iron_ingot_Id, 1); } } diff --git a/Minecraft.World/Villages.cpp b/Minecraft.World/Villages.cpp index 432a8b6b..49c70c99 100644 --- a/Minecraft.World/Villages.cpp +++ b/Minecraft.World/Villages.cpp @@ -173,7 +173,7 @@ shared_ptr Villages::getDoorInfo(int x, int y, int z) void Villages::createDoorInfo(int x, int y, int z) { - int dir = static_cast(Tile::door_wood)->getDir(level, x, y, z); + int dir = static_cast(Tile::wooden_door)->getDir(level, x, y, z); if (dir == 0 || dir == 2) { int canSeeX = 0; @@ -208,7 +208,7 @@ bool Villages::hasQuery(int x, int y, int z) bool Villages::isDoor(int x, int y, int z) { int tileId = level->getTile(x, y, z); - return tileId == Tile::door_wood_Id; + return tileId == Tile::wooden_door_Id; } void Villages::load(CompoundTag *tag) diff --git a/Minecraft.World/WallTile.cpp b/Minecraft.World/WallTile.cpp index b7d3f038..c4aabf13 100644 --- a/Minecraft.World/WallTile.cpp +++ b/Minecraft.World/WallTile.cpp @@ -154,7 +154,7 @@ AABB *WallTile::getAABB(Level *level, int x, int y, int z) bool WallTile::connectsTo(LevelSource *level, int x, int y, int z) { int tile = level->getTile(x, y, z); - if (tile == id || tile == Tile::fenceGate_Id) + if (tile == id || tile == Tile::fence_gate_Id) { return true; } diff --git a/Minecraft.World/WaterLilyTile.cpp b/Minecraft.World/WaterLilyTile.cpp index 73d1e057..1ed239c7 100644 --- a/Minecraft.World/WaterLilyTile.cpp +++ b/Minecraft.World/WaterLilyTile.cpp @@ -61,7 +61,7 @@ int WaterlilyTile::getColor(LevelSource *level, int x, int y, int z, int data) / bool WaterlilyTile::mayPlaceOn(int tile) { - return tile == Tile::calmWater_Id; + return tile == Tile::water_Id; } bool WaterlilyTile::canSurvive(Level *level, int x, int y, int z) diff --git a/Minecraft.World/WaterlilyFeature.cpp b/Minecraft.World/WaterlilyFeature.cpp index eccfcaf6..4e2f3d3d 100644 --- a/Minecraft.World/WaterlilyFeature.cpp +++ b/Minecraft.World/WaterlilyFeature.cpp @@ -14,7 +14,7 @@ bool WaterlilyFeature::place(Level *level, Random *random, int x, int y, int z) { if (Tile::waterLily->mayPlace(level, x2, y2, z2)) { - level->setTileAndData(x2, y2, z2, Tile::waterLily_Id, 0, Tile::UPDATE_CLIENTS); + level->setTileAndData(x2, y2, z2, Tile::waterlily_Id, 0, Tile::UPDATE_CLIENTS); } } } diff --git a/Minecraft.World/WeaponRecipies.cpp b/Minecraft.World/WeaponRecipies.cpp index 1dbe6bda..8fef0295 100644 --- a/Minecraft.World/WeaponRecipies.cpp +++ b/Minecraft.World/WeaponRecipies.cpp @@ -20,15 +20,15 @@ void WeaponRecipies::_init() ADD_OBJECT(map[0],Tile::wood); ADD_OBJECT(map[0],Tile::cobblestone); - ADD_OBJECT(map[0],Item::ironIngot); + ADD_OBJECT(map[0],Item::iron_ingot); ADD_OBJECT(map[0],Item::diamond); - ADD_OBJECT(map[0],Item::goldIngot); + ADD_OBJECT(map[0],Item::gold_ingot); - ADD_OBJECT(map[1],Item::sword_wood); - ADD_OBJECT(map[1],Item::sword_stone); - ADD_OBJECT(map[1],Item::sword_iron); - ADD_OBJECT(map[1],Item::sword_diamond); - ADD_OBJECT(map[1],Item::sword_gold); + ADD_OBJECT(map[1],Item::wooden_sword); + ADD_OBJECT(map[1],Item::stone_sword); + ADD_OBJECT(map[1],Item::iron_sword); + ADD_OBJECT(map[1],Item::diamond_sword); + ADD_OBJECT(map[1],Item::golden_sword); } void WeaponRecipies::addRecipes(Recipes *r) diff --git a/Minecraft.World/Witch.cpp b/Minecraft.World/Witch.cpp index 375c8388..344be228 100644 --- a/Minecraft.World/Witch.cpp +++ b/Minecraft.World/Witch.cpp @@ -16,7 +16,7 @@ AttributeModifier *Witch::SPEED_MODIFIER_DRINKING = (new AttributeModifier(eModifierId_MOB_WITCH_DRINKSPEED, -0.25f, AttributeModifier::OPERATION_ADDITION))->setSerialize(false); const int Witch::DEATH_LOOT[Witch::DEATH_LOOT_COUNT] = { - Item::yellowDust_Id, Item::sugar_Id, Item::redStone_Id, Item::spiderEye_Id, Item::glassBottle_Id, Item::gunpowder_Id, Item::stick_Id, Item::stick_Id, + Item::glowstone_dust_Id, Item::sugar_Id, Item::redstone_Id, Item::spider_eye_Id, Item::glass_bottle_Id, Item::gunpowder_Id, Item::stick_Id, Item::stick_Id, }; Witch::Witch(Level *level) : Monster(level) diff --git a/Minecraft.World/WitherBoss.cpp b/Minecraft.World/WitherBoss.cpp index af406a93..f9b49223 100644 --- a/Minecraft.World/WitherBoss.cpp +++ b/Minecraft.World/WitherBoss.cpp @@ -337,7 +337,7 @@ void WitherBoss::newServerAiStep() int ty = feet + yStep; int tz = oz + zStep; int tile = level->getTile(tx, ty, tz); - if (tile > 0 && tile != Tile::unbreakable_Id && tile != Tile::endPortalTile_Id && tile != Tile::endPortalFrameTile_Id) + if (tile > 0 && tile != Tile::bedrock_Id && tile != Tile::end_portal_Id && tile != Tile::end_portal_frame_Id) { destroyed = level->destroyTile(tx, ty, tz, true) || destroyed; } @@ -495,7 +495,7 @@ bool WitherBoss::hurt(DamageSource *source, float dmg) void WitherBoss::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel) { - spawnAtLocation(Item::netherStar_Id, 1); + spawnAtLocation(Item::nether_star_Id, 1); } void WitherBoss::checkDespawn() diff --git a/Minecraft.World/WitherSkull.cpp b/Minecraft.World/WitherSkull.cpp index ccde41d4..79a8d24d 100644 --- a/Minecraft.World/WitherSkull.cpp +++ b/Minecraft.World/WitherSkull.cpp @@ -43,7 +43,7 @@ float WitherSkull::getTileExplosionResistance(Explosion *explosion, Level *level { float result = Fireball::getTileExplosionResistance(explosion, level, x, y, z, tile); - if (isDangerous() && tile != Tile::unbreakable && tile != Tile::endPortalTile && tile != Tile::endPortalFrameTile) + if (isDangerous() && tile != Tile::unbreakable && tile != Tile::end_portal && tile != Tile::end_portal_frame) { result = min(0.8f, result); } diff --git a/Minecraft.World/Wolf.cpp b/Minecraft.World/Wolf.cpp index 38047cf2..306bdf35 100644 --- a/Minecraft.World/Wolf.cpp +++ b/Minecraft.World/Wolf.cpp @@ -365,7 +365,7 @@ bool Wolf::mobInteract(shared_ptr player) return true; } } - else if (item->id == Item::dye_powder_Id) + else if (item->id == Item::dye_Id) { int color = ColoredTile::getTileDataForItemAuxValue(item->getAuxValue()); if (color != getCollarColor()) diff --git a/Minecraft.World/WoodSlabTile.cpp b/Minecraft.World/WoodSlabTile.cpp index 434e2b1f..2d44982d 100644 --- a/Minecraft.World/WoodSlabTile.cpp +++ b/Minecraft.World/WoodSlabTile.cpp @@ -29,7 +29,7 @@ Icon *WoodSlabTile::getTexture(int face, int data) int WoodSlabTile::getResource(int data, Random *random, int playerBonusLevel) { - return Tile::woodSlabHalf_Id; + return Tile::wooden_slab_Id; } shared_ptr WoodSlabTile::getSilkTouchItemInstance(int data) diff --git a/Minecraft.World/WoolTileItem.cpp b/Minecraft.World/WoolTileItem.cpp index e1ff8be6..4e7bbb52 100644 --- a/Minecraft.World/WoolTileItem.cpp +++ b/Minecraft.World/WoolTileItem.cpp @@ -143,9 +143,9 @@ 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: + case Tile::stained_hardened_clay_Id: return CLAY_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; - case Tile::woolCarpet_Id: + case Tile::carpet_Id: return CARPET_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())]; case Tile::wool_Id: default: diff --git a/Minecraft.World/Zombie.cpp b/Minecraft.World/Zombie.cpp index 8032a1fe..87e4e173 100644 --- a/Minecraft.World/Zombie.cpp +++ b/Minecraft.World/Zombie.cpp @@ -275,10 +275,10 @@ void Zombie::dropRareDeathLoot(int rareLootLevel) switch (random->nextInt(3)) { case 0: - spawnAtLocation(Item::ironIngot_Id, 1); + spawnAtLocation(Item::iron_ingot_Id, 1); break; case 1: - spawnAtLocation(Item::carrots_Id, 1); + spawnAtLocation(Item::carrot_Id, 1); break; case 2: spawnAtLocation(Item::potato_Id, 1); @@ -295,11 +295,11 @@ void Zombie::populateDefaultEquipmentSlots() int rand = random->nextInt(3); if (rand == 0) { - setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::sword_iron)); + setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::iron_sword)); } else { - setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::shovel_iron)); + setEquippedSlot(SLOT_WEAPON, std::make_shared(Item::iron_shovel)); } } } @@ -430,7 +430,7 @@ bool Zombie::mobInteract(shared_ptr player) { shared_ptr item = player->getSelectedItem(); - if (item != nullptr && item->getItem() == Item::apple_gold && item->getAuxValue() == 0 && isVillager() && hasEffect(MobEffect::weakness)) + if (item != nullptr && item->getItem() == Item::golden_apple && item->getAuxValue() == 0 && isVillager() && hasEffect(MobEffect::weakness)) { if (!player->abilities.instabuild) item->count--; if (item->count <= 0) @@ -515,7 +515,7 @@ int Zombie::getConversionProgress() { int tile = level->getTile(xx, yy, zz); - if (tile == Tile::ironFence_Id || tile == Tile::bed_Id) + if (tile == Tile::iron_bars_Id || tile == Tile::bed_Id) { if (random->nextFloat() < 0.3f) amount++; specialBlocksCount++;