Begin Hay Bale Removal

Minecraft.Client/Common/Tutorial/Tutorial.cpp

@@ -332,7 +332,6 @@ void Tutorial::staticCtor()
 	s_completableTasks.push_back( e_Tutorial_Hint_Hopper );
 	s_completableTasks.push_back( e_Tutorial_Hint_Comparator );
 	s_completableTasks.push_back( e_Tutorial_Hint_ChestTrap );
-	s_completableTasks.push_back( e_Tutorial_Hint_HayBlock );
 	s_completableTasks.push_back( e_Tutorial_Hint_ClayHardened );
 	s_completableTasks.push_back( e_Tutorial_Hint_ClayHardenedColored );
 	s_completableTasks.push_back( e_Tutorial_Hint_CoalBlock );
@@ -785,15 +784,6 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
 	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};
-	if(!isHintCompleted(e_Tutorial_Hint_HayBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_HayBlock, this, hayBlockItems, 1 ) );
-
-	int clayHardenedItems[] = {Tile::clayHardened_Id};
-	if(!isHintCompleted(e_Tutorial_Hint_ClayHardened)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardened, this, clayHardenedItems, 1 ) );
-
-	int clayHardenedColoredItems[] = {Tile::clayHardened_colored_Id};
-	if(!isHintCompleted(e_Tutorial_Hint_ClayHardenedColored)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ClayHardenedColored, this, clayHardenedColoredItems, 1 ) );
-
 	int coalBlockItems[] = {Tile::coalBlock_Id};
 	if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) );
 

Minecraft.Client/Common/Tutorial/TutorialEnum.h

@@ -309,7 +309,6 @@ enum eTutorial_Hint
 	e_Tutorial_Hint_Hopper,
 	e_Tutorial_Hint_Comparator,
 	e_Tutorial_Hint_ChestTrap,
-	e_Tutorial_Hint_HayBlock,
 	e_Tutorial_Hint_ClayHardened,
 	e_Tutorial_Hint_ClayHardenedColored,
 	e_Tutorial_Hint_CoalBlock,

Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp

@@ -116,24 +116,6 @@ void IUIScene_CreativeMenu::staticCtor()
 		ITEM(Tile::stairs_sandstone_Id)
 		ITEM(Tile::stairs_quartz_Id)
 
-		ITEM(Tile::clayHardened_Id)
-		ITEM_AUX(Tile::clayHardened_colored_Id,14)	// Red
-		ITEM_AUX(Tile::clayHardened_colored_Id,1)	// Orange
-		ITEM_AUX(Tile::clayHardened_colored_Id,4)	// Yellow
-		ITEM_AUX(Tile::clayHardened_colored_Id,5)	// Lime
-		ITEM_AUX(Tile::clayHardened_colored_Id,3)	// Light Blue
-		ITEM_AUX(Tile::clayHardened_colored_Id,9)	// Cyan
-		ITEM_AUX(Tile::clayHardened_colored_Id,11)	// Blue
-		ITEM_AUX(Tile::clayHardened_colored_Id,10)	// Purple
-		ITEM_AUX(Tile::clayHardened_colored_Id,2)	// Magenta
-		ITEM_AUX(Tile::clayHardened_colored_Id,6)	// Pink
-		ITEM_AUX(Tile::clayHardened_colored_Id,0)	// White
-		ITEM_AUX(Tile::clayHardened_colored_Id,8)	// Light Gray
-		ITEM_AUX(Tile::clayHardened_colored_Id,7)	// Gray
-		ITEM_AUX(Tile::clayHardened_colored_Id,15)	// Black
-		ITEM_AUX(Tile::clayHardened_colored_Id,13)	// Green
-		ITEM_AUX(Tile::clayHardened_colored_Id,12)	// Brown
-
 	// Decoration
 	DEF(eCreativeInventory_Decoration)
 		ITEM_AUX(Item::skull_Id,SkullTileEntity::TYPE_SKELETON)
@@ -175,7 +157,6 @@ void IUIScene_CreativeMenu::staticCtor()
 		ITEM(Item::sign_Id)
 		ITEM(Tile::bookshelf_Id)
 		ITEM(Item::flowerPot_Id)
-		ITEM(Tile::hayBlock_Id)
 		ITEM_AUX(Tile::wool_Id,14)	// Red
 		ITEM_AUX(Tile::wool_Id,1)	// Orange
 		ITEM_AUX(Tile::wool_Id,4)	// Yellow

Minecraft.Client/Minecraft.cpp

@@ -3404,7 +3404,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
 								case Item::wheat_Id:
 								case Item::sugar_Id:
 								case Item::bread_Id:
-								case Tile::hayBlock_Id:
 								case Item::apple_Id:
 									heldItemIsFood = true;
 									break;

Minecraft.Client/PSVitaMedia/strings.h

@@ -405,7 +405,6 @@
 #define IDS_DESC_HALFSLAB 403
 #define IDS_DESC_HARDENED_CLAY 404
 #define IDS_DESC_HATCHET 405
-#define IDS_DESC_HAY 406
 #define IDS_DESC_HELL_ROCK 407
 #define IDS_DESC_HELL_SAND 408
 #define IDS_DESC_HELMET 409
@@ -1554,7 +1553,6 @@
 #define IDS_TILE_GRASS 1552
 #define IDS_TILE_GRAVEL 1553
 #define IDS_TILE_HARDENED_CLAY 1554
-#define IDS_TILE_HAY 1555
 #define IDS_TILE_HELL_ROCK 1556
 #define IDS_TILE_HELL_SAND 1557
 #define IDS_TILE_HOPPER 1558

Minecraft.Client/Windows64Media/strings.h

@@ -463,7 +463,6 @@
 #define IDS_DESC_ACTIVATOR_RAIL                                457
 #define IDS_DESC_DROPPER                                       458
 #define IDS_DESC_STAINED_CLAY                                  459
-#define IDS_DESC_HAY                                           460
 #define IDS_DESC_HARDENED_CLAY                                 461
 #define IDS_DESC_STAINED_GLASS                                 462
 #define IDS_DESC_STAINED_GLASS_PANE                            463
@@ -954,7 +953,6 @@
 #define IDS_TILE_ACTIVATOR_RAIL                                948
 #define IDS_TILE_DROPPER                                       949
 #define IDS_TILE_STAINED_CLAY                                  950
-#define IDS_TILE_HAY                                           951
 #define IDS_TILE_HARDENED_CLAY                                 952
 #define IDS_TILE_COAL                                          953
 #define IDS_TILE_STAINED_CLAY_BLACK                            954

Minecraft.World/ClothDyeRecipes.cpp

@@ -7,35 +7,6 @@
 
 void ClothDyeRecipes::addRecipes(Recipes *r) 
 {
-	// recipes for converting cloth to colored cloth using dye
-	for (int i = 0; i < 16; i++) 
-	{
-		r->addShapelessRecipy(new ItemInstance(Tile::wool, 1, ColoredTile::getItemAuxValueForTileData(i)), //
-			L"zzg",
-			new ItemInstance(Item::dye_powder, 1, i), new ItemInstance(Item::items[Tile::wool_Id], 1, 0),L'D');
-		r->addShapedRecipy(new ItemInstance(Tile::clayHardened_colored, 8, ColoredTile::getItemAuxValueForTileData(i)), //
-			L"sssczczg",
-			L"###",
-			L"#X#",
-			L"###",
-			L'#', new ItemInstance(Tile::clayHardened),
-			L'X', new ItemInstance(Item::dye_powder, 1, i),L'D');
-
-//#if 0
-//		r->addShapedRecipy(new ItemInstance(Tile::stained_glass, 8, ColoredTile::getItemAuxValueForTileData(i)), //
-//			L"sssczczg",
-//			L"###",
-//			L"#X#",
-//			L"###",
-//			L'#', new ItemInstance(Tile::glass),
-//			L'X', new ItemInstance(Item::dye_powder, 1, i), L'D');
-//		r->addShapedRecipy(new ItemInstance(Tile::stained_glass_pane, 16, i), //
-//			L"ssczg",
-//			L"###",
-//			L"###",
-//			L'#', new ItemInstance(Tile::stained_glass, 1, i), L'D');
-//#endif
-	}
 
 	// some dye recipes
 	r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW),

Minecraft.World/EntityHorse.cpp

@@ -897,11 +897,6 @@ bool EntityHorse::mobInteract(shared_ptr<Player> player)
 				_ageUp = 180;
 				temper = 3;
 			}
-			else if (itemstack->id == Tile::hayBlock_Id)
-			{
-				_heal = 20;
-				_ageUp = 180;
-			}
 			else if (itemstack->id == Item::apple_Id)
 			{
 				_heal = 3;

Minecraft.World/FireTile.cpp

@@ -53,7 +53,6 @@ void FireTile::init()
 	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);
 }
 
 void FireTile::setFlammable(int id, int flame, int burn)

Minecraft.World/FurnaceRecipes.cpp

@@ -27,7 +27,6 @@ FurnaceRecipes::FurnaceRecipes()
 	addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f);
 	addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone), .1f);
 	addFurnaceRecipy(Item::clay_Id, new ItemInstance(Item::brick), .3f);
-	addFurnaceRecipy(Tile::clay_Id, new ItemInstance(Tile::clayHardened), .35f);
 	addFurnaceRecipy(Tile::cactus_Id, new ItemInstance(Item::dye_powder, 1, DyePowderItem::GREEN), .2f);
 	addFurnaceRecipy(Tile::treeTrunk_Id, new ItemInstance(Item::coal, 1, CoalItem::CHAR_COAL), .15f);
 	addFurnaceRecipy(Tile::emeraldOre_Id, new ItemInstance(Item::emerald), 1);

Minecraft.World/HayBlockTile.cpp

@@ -1,23 +0,0 @@
-#include "stdafx.h"
-#include "net.minecraft.world.h"
-#include "HayBlockTile.h"
-
-HayBlockTile::HayBlockTile(int id) : RotatedPillarTile(id, Material::grass)
-{
-}
-
-int HayBlockTile::getRenderShape()
-{
-	return SHAPE_TREE;
-}
-
-Icon *HayBlockTile::getTypeTexture(int type)
-{
-	return icon;
-}
-
-void HayBlockTile::registerIcons(IconRegister *iconRegister)
-{
-	iconTop = iconRegister->registerIcon(getIconName() + L"_top");
-	icon = iconRegister->registerIcon(getIconName() + L"_side");
-}

Minecraft.World/HayBlockTile.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#include "RotatedPillarTile.h"
-
-class HayBlockTile : public RotatedPillarTile
-{
-	friend class ChunkRebuildData;
-public:
-	HayBlockTile(int id);
-
-	int getRenderShape();
-
-protected:
-	Icon *getTypeTexture(int type);
-
-public:
-	void registerIcons(IconRegister *iconRegister);
-};

Minecraft.World/OreRecipies.cpp

@@ -29,7 +29,6 @@ void OreRecipies::_init()
 	ADD_OBJECT(map[6],Tile::coalBlock);
 	ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
 
-	ADD_OBJECT(map[7],Tile::hayBlock);
 	ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
 }
 void OreRecipies::addRecipes(Recipes *r) 

Minecraft.World/Tile.cpp

@@ -211,11 +211,8 @@ Tile *Tile::quartzBlock = nullptr;
 Tile *Tile::stairs_quartz = nullptr;
 Tile *Tile::activatorRail = nullptr;
 Tile *Tile::dropper = nullptr;
-Tile *Tile::clayHardened_colored = nullptr;
 
-Tile *Tile::hayBlock = nullptr;
 Tile *Tile::woolCarpet = nullptr;
-Tile *Tile::clayHardened = nullptr;
 Tile *Tile::coalBlock = nullptr;
 
 DWORD Tile::tlsIdxShape = TlsAlloc();
@@ -436,17 +433,14 @@ void Tile::staticCtor()
 	Tile::stairs_quartz =	(new StairTile(156, Tile::quartzBlock, QuartzBlockTile::TYPE_DEFAULT))	->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs,	Item::eMaterial_quartz)->setIconName(L"stairsQuartz")->setDescriptionId(IDS_TILE_STAIRS_QUARTZ)->setUseDescriptionId(IDS_DESC_STAIRS);
 	Tile::activatorRail = (new PoweredRailTile(157))						->setDestroyTime(0.7f)->setSoundType(SOUND_METAL)->setIconName(L"rail_activator")->setDescriptionId(IDS_TILE_ACTIVATOR_RAIL)->setUseDescriptionId(IDS_DESC_ACTIVATOR_RAIL);
 	Tile::dropper = (new DropperTile(158))									->setBaseItemTypeAndMaterial(Item::eBaseItemType_redstoneContainer,	Item::eMaterial_undefined)->setDestroyTime(3.5f)->setSoundType(SOUND_STONE)->setIconName(L"dropper")->setDescriptionId(IDS_TILE_DROPPER)->setUseDescriptionId(IDS_DESC_DROPPER);
-	Tile::clayHardened_colored = (new ColoredTile(159, Material::stone))	->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay,	Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay_stained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY);
 
-	Tile::hayBlock = (new HayBlockTile(170))						->setBaseItemTypeAndMaterial(Item::eBaseItemType_block,	Item::eMaterial_wheat)->setDestroyTime(0.5f)->setSoundType(SOUND_GRASS)->setIconName(L"hay_block")->setDescriptionId(IDS_TILE_HAY)->setUseDescriptionId(IDS_DESC_HAY);
+	(new Tile(170, Material::stone))->setDestroyTime(0.0f)->setNotCollectStatistics();
 	Tile::woolCarpet =		(new WoolCarpetTile(171))				->setBaseItemTypeAndMaterial(Item::eBaseItemType_carpet,	Item::eMaterial_cloth)->setDestroyTime(0.1f)->setSoundType(SOUND_CLOTH)->setIconName(L"woolCarpet")->setLightBlock(0)->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET);
-	Tile::clayHardened = (new Tile(172, Material::stone))			->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay,	Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay")->setDescriptionId(IDS_TILE_HARDENED_CLAY)->setUseDescriptionId(IDS_DESC_HARDENED_CLAY);
 	Tile::coalBlock = (new Tile(173, Material::stone))				->setBaseItemTypeAndMaterial(Item::eBaseItemType_block,	Item::eMaterial_coal)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"coal_block")->setDescriptionId(IDS_TILE_COAL)->setUseDescriptionId(IDS_DESC_COAL_BLOCK);
 
 
 	// Special cases for certain items since they can have different icons
 	Item::items[wool_Id]				= ( new WoolTileItem(Tile::wool_Id- 256) )->setIconName(L"cloth")->setDescriptionId(IDS_TILE_CLOTH)->setUseDescriptionId(IDS_DESC_WOOL);
-	Item::items[clayHardened_colored_Id]= ( new WoolTileItem(Tile::clayHardened_colored_Id - 256))->setIconName(L"clayHardenedStained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY);
 	Item::items[woolCarpet_Id]			= ( new WoolTileItem(Tile::woolCarpet_Id - 256))->setIconName(L"woolCarpet")->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET);
 	Item::items[treeTrunk_Id]			= ( new MultiTextureTileItem(Tile::treeTrunk_Id - 256, treeTrunk, (int *)TreeTile::TREE_NAMES, 4) )->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG);
 	Item::items[wood_Id]				= ( new MultiTextureTileItem(Tile::wood_Id - 256, Tile::wood, (int *)WoodTile::WOOD_NAMES, 4, IDS_TILE_PLANKS))->setIconName(L"wood")->setDescriptionId(IDS_TILE_OAKWOOD_PLANKS)->setUseDescriptionId(IDS_DESC_LOG); //  <- TODO
@@ -1512,6 +1506,9 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, flo
 	case eMaterialSoundType_LADDER:
 		this->iStepSound=eSoundType_STEP_LADDER;
 		break;
+	case eMaterialSoundType_ANVIL:
+		this->iStepSound = eSoundType_STEP_STONE;
+		break;
 	default:
 		app.DebugPrintf("NO STEP SOUND!\n");
 

Minecraft.World/Tile.h

@@ -357,12 +357,9 @@ public:
 	static const int stairs_quartz_Id = 156;
 	static const int activatorRail_Id = 157;
 	static const int dropper_Id = 158;
-	static const int clayHardened_colored_Id = 159;
 	static const int stained_glass_pane_Id = 160;
 
-	static const int hayBlock_Id = 170;
 	static const int woolCarpet_Id = 171;
-	static const int clayHardened_Id = 172;
 	static const int coalBlock_Id = 173;
 
 
@@ -533,12 +530,9 @@ public:
 	static Tile *stairs_quartz;
 	static Tile *activatorRail;
 	static Tile *dropper;
-	static Tile *clayHardened_colored;
 	static Tile *stained_glass_pane;
 
-	static Tile *hayBlock;
 	static Tile *woolCarpet;
-	static Tile *clayHardened;
 	static Tile *coalBlock;
 
 	static void staticCtor();

Minecraft.World/WoolTileItem.cpp

@@ -143,8 +143,6 @@ unsigned int WoolTileItem::getDescriptionId(shared_ptr<ItemInstance> instance)
 		return GLASS_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())];
 	case Tile::stained_glass_pane_Id:
 		return GLASS_PANE_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())];
-	case Tile::clayHardened_colored_Id:
-		return CLAY_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())];
 	case Tile::woolCarpet_Id:
 		return CARPET_COLOR_DESCS[ColoredTile::getTileDataForItemAuxValue(instance->getAuxValue())];
 	case Tile::wool_Id:

Minecraft.World/cmake/sources/Common.cmake

@@ -1803,8 +1803,6 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_TILE
   "${CMAKE_CURRENT_SOURCE_DIR}/HalfSlabTile.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/HalfTransparentTile.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/HalfTransparentTile.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/HayBlockTile.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/HayBlockTile.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/HeavyTile.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/HeavyTile.h"
   "${CMAKE_CURRENT_SOURCE_DIR}/HopperTile.cpp"

Minecraft.World/net.minecraft.world.level.tile.h

@@ -49,7 +49,6 @@
 #include "GravelTile.h"
 #include "HalfSlabTile.h"
 #include "HalfTransparentTile.h"
-#include "HayBlockTile.h"
 #include "HeavyTile.h"
 #include "HopperTile.h"
 #include "HugeMushroomTile.h"