01b8ed5295
The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
99 lines
1.9 KiB
C++
99 lines
1.9 KiB
C++
|
|
#pragma once
|
|
|
|
#include "ItemHandler.h"
|
|
#include "../BlockInfo.h"
|
|
#include "../World.h"
|
|
|
|
|
|
|
|
|
|
|
|
class cItemBottleHandler :
|
|
public cItemHandler
|
|
{
|
|
public:
|
|
cItemBottleHandler() :
|
|
cItemHandler(E_ITEM_GLASS_BOTTLE)
|
|
{
|
|
}
|
|
|
|
|
|
bool GetBlockFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & a_BlockPos)
|
|
{
|
|
class cCallbacks :
|
|
public cBlockTracer::cCallbacks
|
|
{
|
|
public:
|
|
Vector3i m_Pos;
|
|
bool m_HasHitFluid;
|
|
|
|
|
|
cCallbacks(void) :
|
|
m_HasHitFluid(false)
|
|
{
|
|
}
|
|
|
|
virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, eBlockFace a_EntryFace) override
|
|
{
|
|
if (IsBlockWater(a_BlockType))
|
|
{
|
|
if (a_BlockMeta != 0) // we're only looking for source blocks
|
|
{
|
|
return false;
|
|
}
|
|
m_HasHitFluid = true;
|
|
m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
} Callbacks;
|
|
|
|
cLineBlockTracer Tracer(*a_World, 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)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
a_BlockPos = Callbacks.m_Pos;
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
virtual bool OnItemUse(
|
|
cWorld * a_World, cPlayer * a_Player, cBlockPluginInterface & a_PluginInterface, const cItem & a_Item,
|
|
int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace
|
|
) override
|
|
{
|
|
if (a_BlockFace != BLOCK_FACE_NONE)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
Vector3i BlockPos;
|
|
if (!GetBlockFromTrace(a_World, a_Player, BlockPos))
|
|
{
|
|
return false; // Nothing in range.
|
|
}
|
|
|
|
// Give back a filled water bottle if gamemode is not creative:
|
|
if (!a_Player->IsGameModeCreative())
|
|
{
|
|
a_Player->ReplaceOneEquippedItemTossRest(cItem(E_ITEM_POTION));
|
|
}
|
|
return true;
|
|
}
|
|
} ;
|
|
|
|
|
|
|
|
|