diff options
| -rw-r--r-- | VC2008/MCServer.vcproj | 16 | ||||
| -rw-r--r-- | source/BlockID.cpp | 1 | ||||
| -rw-r--r-- | source/Blocks/BlockBrewingStand.h | 32 | ||||
| -rw-r--r-- | source/Blocks/BlockCauldron.h | 59 | ||||
| -rw-r--r-- | source/Blocks/BlockHandler.cpp | 4 | ||||
| -rw-r--r-- | source/Items/ItemBrewingStand.h | 25 | ||||
| -rw-r--r-- | source/Items/ItemCauldron.h | 25 | ||||
| -rw-r--r-- | source/Items/ItemHandler.cpp | 4 | ||||
| -rw-r--r-- | source/Items/ItemPickaxe.h | 1 |
9 files changed, 167 insertions, 0 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 472e068ab..c22870614 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1755,10 +1755,18 @@ >
</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"
>
</File>
@@ -1983,10 +1991,18 @@ >
</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"
>
</File>
diff --git a/source/BlockID.cpp b/source/BlockID.cpp index d2bef02ce..8a02d58c5 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -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; 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);
diff --git a/source/Items/ItemBrewingStand.h b/source/Items/ItemBrewingStand.h new file mode 100644 index 000000000..a4fe6bcbe --- /dev/null +++ b/source/Items/ItemBrewingStand.h @@ -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;
+ }
+
+};
\ No newline at end of file diff --git a/source/Items/ItemCauldron.h b/source/Items/ItemCauldron.h new file mode 100644 index 000000000..96ddf6c05 --- /dev/null +++ b/source/Items/ItemCauldron.h @@ -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;
+ }
+
+};
\ No newline at end of file diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp index 7a6b82eaa..6426ce212 100644 --- a/source/Items/ItemHandler.cpp +++ b/source/Items/ItemHandler.cpp @@ -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);
diff --git a/source/Items/ItemPickaxe.h b/source/Items/ItemPickaxe.h index 4f513d2bc..26d0d5ade 100644 --- a/source/Items/ItemPickaxe.h +++ b/source/Items/ItemPickaxe.h @@ -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;
|