Implemented lilypad placement
This commit is contained in:
parent
83d0c6d6a7
commit
f622f4317c
|
@ -41,6 +41,7 @@
|
||||||
#include "BlockIce.h"
|
#include "BlockIce.h"
|
||||||
#include "BlockLadder.h"
|
#include "BlockLadder.h"
|
||||||
#include "BlockLeaves.h"
|
#include "BlockLeaves.h"
|
||||||
|
#include "BlockLilypad.h"
|
||||||
#include "BlockNewLeaves.h"
|
#include "BlockNewLeaves.h"
|
||||||
#include "BlockLever.h"
|
#include "BlockLever.h"
|
||||||
#include "BlockMelon.h"
|
#include "BlockMelon.h"
|
||||||
|
@ -142,6 +143,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
|
||||||
case E_BLOCK_LAPIS_ORE: return new cBlockOreHandler (a_BlockType);
|
case E_BLOCK_LAPIS_ORE: return new cBlockOreHandler (a_BlockType);
|
||||||
case E_BLOCK_LAVA: return new cBlockLavaHandler (a_BlockType);
|
case E_BLOCK_LAVA: return new cBlockLavaHandler (a_BlockType);
|
||||||
case E_BLOCK_LEAVES: return new cBlockLeavesHandler (a_BlockType);
|
case E_BLOCK_LEAVES: return new cBlockLeavesHandler (a_BlockType);
|
||||||
|
case E_BLOCK_LILY_PAD: return new cBlockLilypadHandler (a_BlockType);
|
||||||
case E_BLOCK_LIT_FURNACE: return new cBlockFurnaceHandler (a_BlockType);
|
case E_BLOCK_LIT_FURNACE: return new cBlockFurnaceHandler (a_BlockType);
|
||||||
case E_BLOCK_LOG: return new cBlockSidewaysHandler (a_BlockType);
|
case E_BLOCK_LOG: return new cBlockSidewaysHandler (a_BlockType);
|
||||||
case E_BLOCK_MELON: return new cBlockMelonHandler (a_BlockType);
|
case E_BLOCK_MELON: return new cBlockMelonHandler (a_BlockType);
|
||||||
|
|
84
src/Blocks/BlockLilypad.h
Normal file
84
src/Blocks/BlockLilypad.h
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "BlockHandler.h"
|
||||||
|
#include "../Entities/Player.h"
|
||||||
|
#include "Vector3.h"
|
||||||
|
#include "../LineBlockTracer.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class cBlockLilypadHandler :
|
||||||
|
public cBlockHandler
|
||||||
|
{
|
||||||
|
typedef cBlockHandler super;
|
||||||
|
|
||||||
|
public:
|
||||||
|
cBlockLilypadHandler(BLOCKTYPE a_BlockType)
|
||||||
|
: cBlockHandler(a_BlockType)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool GetPlacementBlockTypeMeta(
|
||||||
|
cChunkInterface & a_ChunkInterface, cPlayer * a_Player,
|
||||||
|
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace,
|
||||||
|
int a_CursorX, int a_CursorY, int a_CursorZ,
|
||||||
|
BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
|
||||||
|
) override
|
||||||
|
{
|
||||||
|
if (a_BlockFace > 0)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
class cCallbacks :
|
||||||
|
public cBlockTracer::cCallbacks
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
cCallbacks(void) :
|
||||||
|
m_HasHitFluid(false)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
|
||||||
|
{
|
||||||
|
if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
|
||||||
|
{
|
||||||
|
if ((a_BlockMeta != 0) || (a_EntryFace == BLOCK_FACE_NONE)) // The hit block should be a source. The FACE_NONE check is for AddFaceDir below
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
m_HasHitFluid = true;
|
||||||
|
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, (eBlockFace)a_EntryFace);
|
||||||
|
m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3i m_Pos;
|
||||||
|
bool m_HasHitFluid;
|
||||||
|
|
||||||
|
} Callbacks;
|
||||||
|
|
||||||
|
cLineBlockTracer Tracer(*a_Player->GetWorld(), Callbacks);
|
||||||
|
Vector3d Start(a_Player->GetEyePosition() + a_Player->GetLookVector());
|
||||||
|
Vector3d End(a_Player->GetEyePosition() + a_Player->GetLookVector() * 5);
|
||||||
|
|
||||||
|
Tracer.Trace(Start.x, Start.y, Start.z, End.x, End.y, End.z);
|
||||||
|
|
||||||
|
if (Callbacks.m_HasHitFluid)
|
||||||
|
{
|
||||||
|
a_Player->GetWorld()->SetBlock(Callbacks.m_Pos.x, Callbacks.m_Pos.y, Callbacks.m_Pos.z, E_BLOCK_LILY_PAD, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -988,7 +988,7 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
|
||||||
|
|
||||||
cItemHandler * ItemHandler = cItemHandler::GetItemHandler(Equipped.m_ItemType);
|
cItemHandler * ItemHandler = cItemHandler::GetItemHandler(Equipped.m_ItemType);
|
||||||
|
|
||||||
if (ItemHandler->IsPlaceable() && (a_BlockFace > -1))
|
if (ItemHandler->IsPlaceable() && ((a_BlockFace > -1) || (Equipped.m_ItemType == E_BLOCK_LILY_PAD)))
|
||||||
{
|
{
|
||||||
HandlePlaceBlock(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, *ItemHandler);
|
HandlePlaceBlock(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, *ItemHandler);
|
||||||
}
|
}
|
||||||
|
@ -1026,7 +1026,8 @@ void cClientHandle::HandleRightClick(int a_BlockX, int a_BlockY, int a_BlockZ, e
|
||||||
|
|
||||||
void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, cItemHandler & a_ItemHandler)
|
void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, cItemHandler & a_ItemHandler)
|
||||||
{
|
{
|
||||||
if (a_BlockFace < 0)
|
BLOCKTYPE EquippedBlock = (BLOCKTYPE)(m_Player->GetEquippedItem().m_ItemType);
|
||||||
|
if ((a_BlockFace < 0) && (EquippedBlock != E_BLOCK_LILY_PAD))
|
||||||
{
|
{
|
||||||
// Clicked in air
|
// Clicked in air
|
||||||
return;
|
return;
|
||||||
|
@ -1036,7 +1037,6 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, e
|
||||||
|
|
||||||
BLOCKTYPE ClickedBlock;
|
BLOCKTYPE ClickedBlock;
|
||||||
NIBBLETYPE ClickedBlockMeta;
|
NIBBLETYPE ClickedBlockMeta;
|
||||||
BLOCKTYPE EquippedBlock = (BLOCKTYPE)(m_Player->GetEquippedItem().m_ItemType);
|
|
||||||
NIBBLETYPE EquippedBlockDamage = (NIBBLETYPE)(m_Player->GetEquippedItem().m_ItemDamage);
|
NIBBLETYPE EquippedBlockDamage = (NIBBLETYPE)(m_Player->GetEquippedItem().m_ItemDamage);
|
||||||
|
|
||||||
if ((a_BlockY < 0) || (a_BlockY >= cChunkDef::Height))
|
if ((a_BlockY < 0) || (a_BlockY >= cChunkDef::Height))
|
||||||
|
@ -1085,7 +1085,10 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, e
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
|
if (EquippedBlock != E_BLOCK_LILY_PAD)
|
||||||
|
{
|
||||||
|
AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, a_BlockFace);
|
||||||
|
}
|
||||||
|
|
||||||
if ((a_BlockY < 0) || (a_BlockY >= cChunkDef::Height))
|
if ((a_BlockY < 0) || (a_BlockY >= cChunkDef::Height))
|
||||||
{
|
{
|
||||||
|
@ -1106,6 +1109,7 @@ void cClientHandle::HandlePlaceBlock(int a_BlockX, int a_BlockY, int a_BlockZ, e
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
|
(EquippedBlock != E_BLOCK_LILY_PAD) &&
|
||||||
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision() &&
|
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision() &&
|
||||||
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision(m_Player, PlaceMeta)
|
!BlockHandler(PlaceBlock)->DoesIgnoreBuildCollision(m_Player, PlaceMeta)
|
||||||
)
|
)
|
||||||
|
|
|
@ -172,12 +172,12 @@ public:
|
||||||
|
|
||||||
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
|
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override
|
||||||
{
|
{
|
||||||
if (a_BlockMeta != 0) // Even if it was a water block it would not be a source.
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
|
if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType))
|
||||||
{
|
{
|
||||||
|
if (a_BlockMeta != 0) // GetBlockFromTrace is called for scooping up fluids; the hit block should be a source
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
m_HasHitFluid = true;
|
m_HasHitFluid = true;
|
||||||
m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ);
|
m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user