Begin Hay Bale Removal

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/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

@@ -212,7 +212,6 @@ Tile *Tile::stairs_quartz = nullptr;
 Tile *Tile::activatorRail = nullptr;
 Tile *Tile::dropper = nullptr;
 
-Tile *Tile::hayBlock = nullptr;
 Tile *Tile::woolCarpet = nullptr;
 Tile *Tile::coalBlock = nullptr;
 
@@ -435,7 +434,7 @@ void Tile::staticCtor()
 	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::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::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);
 
@@ -1507,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

@@ -359,7 +359,6 @@ public:
 	static const int dropper_Id = 158;
 	static const int stained_glass_pane_Id = 160;
 
-	static const int hayBlock_Id = 170;
 	static const int woolCarpet_Id = 171;
 	static const int coalBlock_Id = 173;
 
@@ -533,7 +532,6 @@ public:
 	static Tile *dropper;
 	static Tile *stained_glass_pane;
 
-	static Tile *hayBlock;
 	static Tile *woolCarpet;
 	static Tile *coalBlock;
 

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"