summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2021-03-05 19:43:40 +0100
committerGitHub <noreply@github.com>2021-03-05 19:43:40 +0100
commit40b6758905eb7182b6a903c9b30ed5edeaaaf057 (patch)
tree1b715c45a36ee0b1db1119eba671ff7dd4839a14 /src/Blocks
parentAdding Boss bar (#5025) (diff)
downloadcuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar.gz
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar.bz2
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar.lz
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar.xz
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.tar.zst
cuberite-40b6758905eb7182b6a903c9b30ed5edeaaaf057.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockHandler.cpp5
-rw-r--r--src/Blocks/BlockHugeMushroom.h53
-rw-r--r--src/Blocks/CMakeLists.txt1
3 files changed, 57 insertions, 2 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 71169ea7f..829905221 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -48,6 +48,7 @@
#include "BlockGrass.h"
#include "BlockGravel.h"
#include "BlockHopper.h"
+#include "BlockHugeMushroom.h"
#include "BlockIce.h"
#include "BlockJukebox.h"
#include "BlockLadder.h"
@@ -296,8 +297,8 @@ namespace
constexpr cBlockMobHeadHandler BlockHeadHandler (E_BLOCK_HEAD);
constexpr cBlockPressurePlateHandler BlockHeavyWeightedPressurePHandler(E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE);
constexpr cBlockHopperHandler BlockHopperHandler (E_BLOCK_HOPPER);
- constexpr cDefaultBlockHandler BlockHugeBrownMushroomHandler (E_BLOCK_HUGE_BROWN_MUSHROOM);
- constexpr cDefaultBlockHandler BlockHugeRedMushroomHandler (E_BLOCK_HUGE_RED_MUSHROOM);
+ constexpr cBlockHugeMushroomHandler BlockHugeBrownMushroomHandler (E_BLOCK_HUGE_BROWN_MUSHROOM);
+ constexpr cBlockHugeMushroomHandler BlockHugeRedMushroomHandler (E_BLOCK_HUGE_RED_MUSHROOM);
constexpr cBlockIceHandler BlockIceHandler (E_BLOCK_ICE);
constexpr cBlockComparatorHandler BlockInactiveComparatorHandler (E_BLOCK_INACTIVE_COMPARATOR);
constexpr cBlockInfestedHandler BlockInfestedBlockHandler (E_BLOCK_SILVERFISH_EGG);
diff --git a/src/Blocks/BlockHugeMushroom.h b/src/Blocks/BlockHugeMushroom.h
new file mode 100644
index 000000000..2f3b1f7c9
--- /dev/null
+++ b/src/Blocks/BlockHugeMushroom.h
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "BlockHandler.h"
+
+
+
+
+
+/** Handler for huge mushroom blocks. */
+class cBlockHugeMushroomHandler final :
+ public cClearMetaOnDrop<cBlockHandler>
+{
+ using Super = cClearMetaOnDrop<cBlockHandler>;
+
+public:
+
+ using Super::Super;
+
+private:
+
+ virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, const cEntity * a_Digger, const cItem * a_Tool) const override
+ {
+ if (ToolHasSilkTouch(a_Tool))
+ {
+ return cItem(m_BlockType);
+ }
+ else if ((a_BlockMeta == E_META_MUSHROOM_FULL_STEM) || (a_BlockMeta == E_META_MUSHROOM_STEM))
+ {
+ // Stems don't drop anything
+ return cItem();
+ }
+
+ const auto MushroomType = (m_BlockType == E_BLOCK_HUGE_BROWN_MUSHROOM) ? E_BLOCK_BROWN_MUSHROOM : E_BLOCK_RED_MUSHROOM;
+ const auto DropNum = GetRandomProvider().RandInt<char>(2);
+
+ return cItem(MushroomType, DropNum);
+ }
+
+
+
+
+
+ virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
+ {
+ UNUSED(a_Meta);
+ return (m_BlockType == E_BLOCK_HUGE_BROWN_MUSHROOM) ? 10 : 28;
+ }
+} ;
+
+
+
+
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index 7fb0237e3..770b0dab8 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -51,6 +51,7 @@ target_sources(
BlockGravel.h
BlockHandler.h
BlockHopper.h
+ BlockHugeMushroom.h
BlockIce.h
BlockJukebox.h
BlockLadder.h