From 4561b2c22f755cd91009f2d90efa15671db6a15a Mon Sep 17 00:00:00 2001 From: "luksor111@gmail.com" Date: Sat, 29 Dec 2012 11:49:00 +0000 Subject: 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 --- source/Blocks/BlockBrewingStand.h | 32 +++++++++++++++++++++ source/Blocks/BlockCauldron.h | 59 +++++++++++++++++++++++++++++++++++++++ source/Blocks/BlockHandler.cpp | 4 +++ 3 files changed, 95 insertions(+) create mode 100644 source/Blocks/BlockBrewingStand.h create mode 100644 source/Blocks/BlockCauldron.h (limited to 'source/Blocks') diff --git a/source/Blocks/BlockBrewingStand.h b/source/Blocks/BlockBrewingStand.h new file mode 100644 index 000000000..34a2b6c56 --- /dev/null +++ b/source/Blocks/BlockBrewingStand.h @@ -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; + } +} ; + + + + diff --git a/source/Blocks/BlockCauldron.h b/source/Blocks/BlockCauldron.h new file mode 100644 index 000000000..c8e571623 --- /dev/null +++ b/source/Blocks/BlockCauldron.h @@ -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; + } +} ; + + + + diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp index a6ada015b..0356589fa 100644 --- a/source/Blocks/BlockHandler.cpp +++ b/source/Blocks/BlockHandler.cpp @@ -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); -- cgit v1.2.3