From 4f3b699b27da11a3641ba3e231bbd4efcfdd9177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dami=C3=A1n=20Imrich?= Date: Fri, 22 Jan 2021 18:06:26 +0100 Subject: End crystal placement (#5112) * End crystal placement * End crystal placement - fixed error and added some comments * Removed unused includes * Update src/Items/ItemEndCrystal.h Co-authored-by: Alexander Harkness * End Crystal placement, early-return pattern enforcement * End crystal Item finish? * Small changes Fixed a crashbug in ender crystal destruction. According to vanilla 1.16 testing, end crystals don't place if any entity intersects the box, not just other end crystals. Check return value of SpawnEnderCrystal. Add header in SeeMake. Cafe Stile Redux. * The stylechecker relies on CMakeLists * There is another Co-authored-by: Alexander Harkness Co-authored-by: Tiger Wang --- src/Items/ItemEndCrystal.h | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/Items/ItemEndCrystal.h (limited to 'src/Items/ItemEndCrystal.h') diff --git a/src/Items/ItemEndCrystal.h b/src/Items/ItemEndCrystal.h new file mode 100644 index 000000000..b9b265b60 --- /dev/null +++ b/src/Items/ItemEndCrystal.h @@ -0,0 +1,81 @@ + +#pragma once + +#include "ItemHandler.h" +#include "../World.h" +#include "../Entities/Player.h" + + + + + +class cItemEndCrystalHandler : + public cItemHandler +{ + using Super = cItemHandler; + +public: + + cItemEndCrystalHandler(int a_ItemType) : + Super(a_ItemType) + { + } + + + virtual bool OnItemUse( + cWorld * a_World, cPlayer * a_Player, + cBlockPluginInterface & a_PluginInterface, const cItem & a_HeldItem, + const Vector3i a_BlockPos, + eBlockFace a_ClickedBlockFace) override + { + // Must click a valid block: + if (a_ClickedBlockFace < 0) + { + return false; + } + + if ( + const auto BlockType = a_World->GetBlock(a_BlockPos); + + // Don't place if placement block is not obsidian or bedrock: + (BlockType != E_BLOCK_OBSIDIAN) && (BlockType != E_BLOCK_BEDROCK) + ) + { + return false; + } + + // The position of the block above the placement block. + const auto Above = a_BlockPos.addedY(1); + + if ( + // Don't place if two blocks above placement block aren't air: + ((Above.y != cChunkDef::Height) && (a_World->GetBlock(Above) != E_BLOCK_AIR)) || + ((Above.y < (cChunkDef::Height - 1)) && (a_World->GetBlock(Above.addedY(1)) != E_BLOCK_AIR)) || + + // Refuse placement if there are any entities in a (1 by 2 by 1) bounding box with base at the block above: + !a_World->ForEachEntityInBox( + { Above, Above + Vector3i(1, 2, 1) }, + [](cEntity & a_Entity) + { + return true; + } + ) + ) + { + return false; + } + + // Spawns ender crystal entity, aborts if plugin cancelled: + if (a_World->SpawnEnderCrystal(Vector3d(0.5, 0, 0.5) + Above, false) == cEntity::INVALID_ID) + { + return false; + } + + if (!a_Player->IsGameModeCreative()) + { + a_Player->GetInventory().RemoveOneEquippedItem(); + } + + return true; + } +}; -- cgit v1.2.3