summaryrefslogtreecommitdiffstats
path: root/src/Blocks/BlockEndPortalFrame.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Blocks/BlockEndPortalFrame.h')
-rw-r--r--src/Blocks/BlockEndPortalFrame.h74
1 files changed, 8 insertions, 66 deletions
diff --git a/src/Blocks/BlockEndPortalFrame.h b/src/Blocks/BlockEndPortalFrame.h
index 0b5e84da2..68e6e09fe 100644
--- a/src/Blocks/BlockEndPortalFrame.h
+++ b/src/Blocks/BlockEndPortalFrame.h
@@ -8,19 +8,19 @@
class cBlockEndPortalFrameHandler final :
- public cMetaRotator<cBlockHandler, 0x03,
- E_META_END_PORTAL_FRAME_ZM,
- E_META_END_PORTAL_FRAME_XP,
+ public cYawRotator<cBlockHandler, 0x03,
E_META_END_PORTAL_FRAME_ZP,
- E_META_END_PORTAL_FRAME_XM
+ E_META_END_PORTAL_FRAME_XM,
+ E_META_END_PORTAL_FRAME_ZM,
+ E_META_END_PORTAL_FRAME_XP
>
{
- using Super = cMetaRotator<
+ using Super = cYawRotator<
cBlockHandler, 0x03,
- E_META_END_PORTAL_FRAME_ZM,
- E_META_END_PORTAL_FRAME_XP,
E_META_END_PORTAL_FRAME_ZP,
- E_META_END_PORTAL_FRAME_XM
+ E_META_END_PORTAL_FRAME_XM,
+ E_META_END_PORTAL_FRAME_ZM,
+ E_META_END_PORTAL_FRAME_XP
>;
public:
@@ -29,54 +29,6 @@ public:
private:
- virtual bool GetPlacementBlockTypeMeta(
- cChunkInterface & a_ChunkInterface,
- cPlayer & a_Player,
- const Vector3i a_PlacedBlockPos,
- eBlockFace a_ClickedBlockFace,
- const Vector3i a_CursorPos,
- BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
- ) const override
- {
- a_BlockType = m_BlockType;
- a_BlockMeta = YawToMetaData(a_Player.GetYaw());
- return true;
- }
-
-
-
-
-
- inline static NIBBLETYPE YawToMetaData(double a_Rotation)
- {
- a_Rotation += 90 + 45; // So its not aligned with axis
- if (a_Rotation > 360)
- {
- a_Rotation -= 360;
- }
-
- if ((a_Rotation >= 0) && (a_Rotation < 90))
- {
- return E_META_END_PORTAL_FRAME_XM;
- }
- else if ((a_Rotation >= 180) && (a_Rotation < 270))
- {
- return E_META_END_PORTAL_FRAME_XP;
- }
- else if ((a_Rotation >= 90) && (a_Rotation < 180))
- {
- return E_META_END_PORTAL_FRAME_ZM;
- }
- else
- {
- return E_META_END_PORTAL_FRAME_ZP;
- }
- }
-
-
-
-
-
virtual void OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, Vector3i a_BlockPos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) const override
{
// E_META_END_PORTAL_FRAME_EYE is the bit which signifies the eye of ender is in it.
@@ -237,16 +189,6 @@ private:
- virtual bool IsClickedThrough(void) const override
- {
- // TODO: Colision
- return true;
- }
-
-
-
-
-
virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override
{
UNUSED(a_Meta);