Cauldrons and Brewing Stands are now placeable

Cauldrons can be filled with water and used to fill bottles

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
luksor111@gmail.com 2012-12-29 11:49:00 +00:00
parent af7ee903fb
commit 4561b2c22f
9 changed files with 167 additions and 0 deletions

View File

@ -1754,10 +1754,18 @@
RelativePath="..\source\blocks\BlockBed.h"
>
</File>
<File
RelativePath="..\source\Blocks\BlockBrewingStand.h"
>
</File>
<File
RelativePath="..\source\blocks\BlockCactus.h"
>
</File>
<File
RelativePath="..\source\Blocks\BlockCauldron.h"
>
</File>
<File
RelativePath="..\source\blocks\BlockChest.h"
>
@ -1982,10 +1990,18 @@
RelativePath="..\source\items\ItemBed.h"
>
</File>
<File
RelativePath="..\source\Items\ItemBrewingStand.h"
>
</File>
<File
RelativePath="..\source\items\ItemBucket.h"
>
</File>
<File
RelativePath="..\source\Items\ItemCauldron.h"
>
</File>
<File
RelativePath="..\source\items\ItemCloth.h"
>

View File

@ -514,6 +514,7 @@ public:
// Blocks that don´t drop without a special tool
g_BlockRequiresSpecialTool[E_BLOCK_BRICK] = true;
g_BlockRequiresSpecialTool[E_BLOCK_CAULDRON] = true;
g_BlockRequiresSpecialTool[E_BLOCK_COAL_ORE] = true;
g_BlockRequiresSpecialTool[E_BLOCK_COBBLESTONE] = true;
g_BlockRequiresSpecialTool[E_BLOCK_COBBLESTONE_STAIRS] = true;

View File

@ -0,0 +1,32 @@
#pragma once
#include "BlockHandler.h"
class cBlockBrewingStandHandler :
public cBlockHandler
{
public:
cBlockBrewingStandHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_BREWING_STAND, 1, 0));
}
virtual bool IsUseable() override
{
return true;
}
} ;

View File

@ -0,0 +1,59 @@
#pragma once
#include "BlockHandler.h"
class cBlockCauldronHandler :
public cBlockHandler
{
public:
cBlockCauldronHandler(BLOCKTYPE a_BlockType)
: cBlockHandler(a_BlockType)
{
}
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
a_Pickups.push_back(cItem(E_ITEM_CAULDRON, 1, 0));
}
void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ)
{
char Meta = a_World->GetBlockMeta( a_BlockX, a_BlockY, a_BlockZ );
switch( a_Player->GetEquippedItem().m_ItemType )
{
case E_ITEM_WATER_BUCKET:
{
a_World->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, 3 );
cItem Item(a_Player->GetEquippedItem().m_ItemType, 1);
a_Player->GetInventory().RemoveItem(Item);
a_Player->GetInventory().AddItem(cItem(E_ITEM_BUCKET, 1, 0));
break;
}
case E_ITEM_GLASS_BOTTLE:
{
if( Meta > 0 )
{
a_World->SetBlockMeta( a_BlockX, a_BlockY, a_BlockZ, --Meta );
cItem Item(a_Player->GetEquippedItem().m_ItemType, 1);
a_Player->GetInventory().RemoveItem(Item);
a_Player->GetInventory().AddItem(cItem(E_ITEM_POTIONS, 1, 0));
}
break;
}
}
}
virtual bool IsUseable() override
{
return true;
}
} ;

View File

@ -51,6 +51,8 @@
#include "BlockEnderchest.h"
#include "BlockFenceGate.h"
#include "BlockFlowerPot.h"
#include "BlockCauldron.h"
#include "BlockBrewingStand.h"
@ -90,9 +92,11 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
// Block handlers, alphabetically sorted:
case E_BLOCK_BED: return new cBlockBedHandler (a_BlockType);
case E_BLOCK_BIRCH_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType);
case E_BLOCK_BREWING_STAND: return new cBlockBrewingStandHandler (a_BlockType);
case E_BLOCK_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType);
case E_BLOCK_BROWN_MUSHROOM: return new cBlockMushroomHandler (a_BlockType);
case E_BLOCK_CACTUS: return new cBlockCactusHandler (a_BlockType);
case E_BLOCK_CAULDRON: return new cBlockCauldronHandler (a_BlockType);
case E_BLOCK_CHEST: return new cBlockChestHandler (a_BlockType);
case E_BLOCK_COAL_ORE: return new cBlockOreHandler (a_BlockType);
case E_BLOCK_COBBLESTONE: return new cBlockStoneHandler (a_BlockType);

View File

@ -0,0 +1,25 @@
#pragma once
#include "ItemHandler.h"
class cItemBrewingStandHandler : public cItemHandler
{
public:
cItemBrewingStandHandler(int a_ItemType)
: cItemHandler(a_ItemType)
{
}
virtual bool IsPlaceable() override
{
return true;
}
virtual BLOCKTYPE GetBlockType() override
{
return E_BLOCK_BREWING_STAND;
}
};

View File

@ -0,0 +1,25 @@
#pragma once
#include "ItemHandler.h"
class cItemCauldronHandler : public cItemHandler
{
public:
cItemCauldronHandler(int a_ItemType)
: cItemHandler(a_ItemType)
{
}
virtual bool IsPlaceable() override
{
return true;
}
virtual BLOCKTYPE GetBlockType() override
{
return E_BLOCK_CAULDRON;
}
};

View File

@ -29,6 +29,8 @@
#include "ItemBed.h"
#include "ItemSpawnEgg.h"
#include "ItemFlowerPot.h"
#include "ItemBrewingStand.h"
#include "ItemCauldron.h"
#include "../Blocks/BlockHandler.h"
@ -70,6 +72,8 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
// Single item per handler, alphabetically sorted:
case E_ITEM_BED: return new cItemBedHandler(a_ItemType);
case E_ITEM_BREWING_STAND: return new cItemBrewingStandHandler(a_ItemType);
case E_ITEM_CAULDRON: return new cItemCauldronHandler(a_ItemType);
case E_ITEM_DYE: return new cItemDyeHandler(a_ItemType);
case E_ITEM_FLINT_AND_STEEL: return new cItemLighterHandler(a_ItemType);
case E_ITEM_FLOWER_POT: return new cItemFlowerPotHandler(a_ItemType);

View File

@ -68,6 +68,7 @@ public:
case E_BLOCK_COBBLESTONE_STAIRS:
case E_BLOCK_STONE_BRICK_STAIRS:
case E_BLOCK_NETHER_BRICK_STAIRS:
case E_BLOCK_CAULDRON:
return PickaxeLevel() >= 1;
}
return false;