From a62b2b1be2103d7de2fd66c7304b7473e369be3c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 5 May 2021 14:25:10 +0100 Subject: Move item placement into item handlers (#5184) * Move item placement into item handlers + Add appropriate CanBeAt checks in cPlayer::PlaceBlocks, into which all placement handlers call. * Partly addresses #5157 * Fixes #4878 * Fixes #2919 * Fixes #4629 * Fixes #4239 * Fixes #4849 Co-authored-by: changyong guo Co-authored-by: Xotheus Co-authored-by: Krist Pregracke * Review fixes * Update APIDesc.lua * Rename Co-authored-by: changyong guo Co-authored-by: Xotheus Co-authored-by: Krist Pregracke --- src/Items/ItemSideways.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/Items/ItemSideways.h (limited to 'src/Items/ItemSideways.h') diff --git a/src/Items/ItemSideways.h b/src/Items/ItemSideways.h new file mode 100644 index 000000000..cb6403fd6 --- /dev/null +++ b/src/Items/ItemSideways.h @@ -0,0 +1,53 @@ + +#pragma once + +#include "ItemHandler.h" +#include "Blocks/BlockSideways.h" + + + + + +/** Handler for blocks that have 3 orientations (hay bale, log), specified by the upper 2 bits in meta. +Handles setting the correct orientation on placement. +Additionally supports the metadata specifying block sub-type in its lower 2 bits. */ +class cItemSidewaysHandler : + public cItemHandler +{ + using Super = cItemHandler; + +public: + + using Super::Super; + +private: + + static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace, NIBBLETYPE a_Meta) + { + switch (a_BlockFace) + { + case BLOCK_FACE_YM: + case BLOCK_FACE_YP: + { + return a_Meta; // Top or bottom, just return original. + } + case BLOCK_FACE_ZP: + case BLOCK_FACE_ZM: + { + return a_Meta | 0x8; // North or south. + } + case BLOCK_FACE_XP: + case BLOCK_FACE_XM: + { + return a_Meta | 0x4; // East or west. + } + default: UNREACHABLE("Unsupported block face"); + } + } + + + virtual bool CommitPlacement(cPlayer & a_Player, const cItem & a_HeldItem, const Vector3i a_PlacePosition, const eBlockFace a_ClickedBlockFace, const Vector3i a_CursorPosition) override + { + return a_Player.PlaceBlock(a_PlacePosition, static_cast(a_HeldItem.m_ItemType), BlockFaceToMetaData(a_ClickedBlockFace, static_cast(a_HeldItem.m_ItemDamage))); + } +}; -- cgit v1.2.3