summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
author12xx12 <44411062+12xx12@users.noreply.github.com>2020-10-11 17:27:41 +0200
committerGitHub <noreply@github.com>2020-10-11 17:27:41 +0200
commitc080f819d2af3cc8c71d39c222a249e4df5e6f67 (patch)
tree94dc27dacbd040be12348150914d0d7ff1d42d91 /src/Blocks
parentCorrected invalid syntax for return types in APIDoc (#4989) (diff)
downloadcuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar.gz
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar.bz2
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar.lz
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar.xz
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.tar.zst
cuberite-c080f819d2af3cc8c71d39c222a249e4df5e6f67.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockHandler.cpp3
-rw-r--r--src/Blocks/BlockInfested.h88
-rw-r--r--src/Blocks/CMakeLists.txt1
3 files changed, 91 insertions, 1 deletions
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 8925449e6..6342c80fb 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -56,6 +56,7 @@
#include "BlockMelon.h"
#include "BlockMobHead.h"
#include "BlockMobSpawner.h"
+#include "BlockInfested.h"
#include "BlockMushroom.h"
#include "BlockMycelium.h"
#include "BlockNetherWart.h"
@@ -297,7 +298,7 @@ namespace
constexpr cDefaultBlockHandler BlockHugeRedMushroomHandler (E_BLOCK_HUGE_RED_MUSHROOM);
constexpr cBlockIceHandler BlockIceHandler (E_BLOCK_ICE);
constexpr cBlockComparatorHandler BlockInactiveComparatorHandler (E_BLOCK_INACTIVE_COMPARATOR);
- constexpr cDefaultBlockHandler BlockInfestedBlockHandler (E_BLOCK_SILVERFISH_EGG);
+ constexpr cBlockInfestedHandler BlockInfestedBlockHandler (E_BLOCK_SILVERFISH_EGG);
constexpr cDefaultBlockHandler BlockIronBarsHandler (E_BLOCK_IRON_BARS);
constexpr cDefaultBlockHandler BlockIronBlockHandler (E_BLOCK_IRON_BLOCK);
constexpr cBlockDoorHandler BlockIronDoorHandler (E_BLOCK_IRON_DOOR);
diff --git a/src/Blocks/BlockInfested.h b/src/Blocks/BlockInfested.h
new file mode 100644
index 000000000..d2b634dd0
--- /dev/null
+++ b/src/Blocks/BlockInfested.h
@@ -0,0 +1,88 @@
+
+// BlockInfested.h
+
+#include "../Entities/Player.h"
+
+/* This Block Handler describes the blocks spawning silver fishes. Mojang calls them monster egg */
+
+class cBlockInfestedHandler final:
+ public cBlockHandler
+{
+ using Super = cBlockHandler;
+
+public:
+
+ using Super::Super;
+
+ static void SpawnSilverfish(cWorldInterface & a_WorldInterface, Vector3i a_BlockPos)
+ {
+ auto Pos = Vector3f(a_BlockPos.x - 0.5f, a_BlockPos.y - 0.5f, a_BlockPos.z - 0.5f);
+ // TODO: only display animation if the difficulty allows mob spawns - Add when difficulty is implemented
+ // Spawn Silverfish
+ a_WorldInterface.SpawnMob(Pos.x, Pos.y, Pos.z, mtSilverfish, false);
+ // Play particle
+ a_WorldInterface.GetBroadcastManager().BroadcastParticleEffect("explode", Pos, Vector3f(), 0.1f, 50);
+ }
+
+private:
+
+ virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, const cEntity * a_Digger, const cItem * a_Tool) const override
+ {
+ switch (a_BlockMeta)
+ {
+ case E_META_SILVERFISH_EGG_STONE:
+ {
+ if (ToolHasSilkTouch(a_Tool))
+ {
+ return cItem(E_BLOCK_STONE);
+ }
+ else
+ {
+ return cItem(E_BLOCK_COBBLESTONE);
+ }
+ }
+ case E_META_SILVERFISH_EGG_COBBLESTONE: return cItem(E_BLOCK_COBBLESTONE);
+ case E_META_SILVERFISH_EGG_STONE_BRICK: return cItem(E_BLOCK_STONE_BRICKS);
+ case E_META_SILVERFISH_EGG_MOSSY_STONE_BRICK: return cItem(E_BLOCK_STONE_BRICKS, 1, E_META_STONE_BRICK_MOSSY);
+ case E_META_SILVERFISH_EGG_CRACKED_STONE_BRICK: return cItem(E_BLOCK_STONE_BRICKS, 1, E_META_STONE_BRICK_CRACKED);
+ case E_META_SILVERFISH_EGG_CHISELED_STONE_BRICK: return cItem(E_BLOCK_STONE_BRICKS, 1, E_META_STONE_BRICK_ORNAMENT);
+ }
+ return {};
+ }
+
+
+
+
+
+ virtual void OnBroken(
+ cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface,
+ Vector3i a_BlockPos,
+ BLOCKTYPE a_OldBlockType, NIBBLETYPE a_OldBlockMeta,
+ const cEntity * a_Digger
+ ) const override
+ {
+ if (a_Digger != nullptr)
+ {
+ if (a_Digger->IsPlayer())
+ {
+ const auto Player = static_cast<const cPlayer *>(a_Digger);
+ if (Player->IsGameModeCreative())
+ {
+ return;
+ }
+ }
+ if (a_Digger->IsMob())
+ {
+ return;
+ }
+ }
+ SpawnSilverfish(a_WorldInterface, a_BlockPos);
+ }
+
+
+ virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
+ {
+ return 11;
+ }
+} ;
+
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index d9d6e58f1..e20bda584 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -59,6 +59,7 @@ target_sources(
BlockMelon.h
BlockMobHead.h
BlockMobSpawner.h
+ BlockInfested.h
BlockMushroom.h
BlockMycelium.h
BlockNetherrack.h