summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 13:34:05 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 13:34:05 +0200
commitcc600de51f5946af5d4018b7681f2c11c68662e7 (patch)
tree73782543b31568c66bba5d1f87ea0ffcbdca2357 /src/BlockEntities
parentUse std::thread (diff)
parentcLuaState: cMonster descendants don't push their specific type. (diff)
downloadcuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.gz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.bz2
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.lz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.xz
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.tar.zst
cuberite-cc600de51f5946af5d4018b7681f2c11c68662e7.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/BeaconEntity.h2
-rw-r--r--src/BlockEntities/BlockEntity.h31
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h4
-rw-r--r--src/BlockEntities/ChestEntity.h4
-rw-r--r--src/BlockEntities/CommandBlockEntity.h2
-rw-r--r--src/BlockEntities/DispenserEntity.h4
-rw-r--r--src/BlockEntities/DropSpenserEntity.h4
-rw-r--r--src/BlockEntities/DropperEntity.h4
-rw-r--r--src/BlockEntities/EnderChestEntity.h4
-rw-r--r--src/BlockEntities/FlowerPotEntity.h4
-rw-r--r--src/BlockEntities/FurnaceEntity.cpp150
-rw-r--r--src/BlockEntities/FurnaceEntity.h114
-rw-r--r--src/BlockEntities/HopperEntity.h4
-rw-r--r--src/BlockEntities/JukeboxEntity.h4
-rw-r--r--src/BlockEntities/MobHeadEntity.h4
-rw-r--r--src/BlockEntities/NoteEntity.h4
-rw-r--r--src/BlockEntities/SignEntity.h4
17 files changed, 176 insertions, 171 deletions
diff --git a/src/BlockEntities/BeaconEntity.h b/src/BlockEntities/BeaconEntity.h
index 8c2dad254..d1db3a68f 100644
--- a/src/BlockEntities/BeaconEntity.h
+++ b/src/BlockEntities/BeaconEntity.h
@@ -32,6 +32,8 @@ class cBeaconEntity :
public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cBeaconEntity);
+
cBeaconEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
// cBlockEntity overrides:
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h
index 54ab40f3e..b04d20340 100644
--- a/src/BlockEntities/BlockEntity.h
+++ b/src/BlockEntities/BlockEntity.h
@@ -5,6 +5,28 @@
+/** Place this macro in the declaration of each cBlockEntity descendant. */
+#define BLOCKENTITY_PROTODEF(classname) \
+ virtual bool IsA(const char * a_ClassName) const override \
+ { \
+ return ((strcmp(a_ClassName, #classname) == 0) || super::IsA(a_ClassName)); \
+ } \
+ virtual const char * GetClass(void) const override \
+ { \
+ return #classname; \
+ } \
+ static const char * GetClassStatic(void) \
+ { \
+ return #classname; \
+ } \
+ virtual const char * GetParentClass(void) const override \
+ { \
+ return super::GetClass(); \
+ }
+
+
+
+
namespace Json
{
@@ -55,6 +77,15 @@ public:
{
return "cBlockEntity";
}
+
+ /** Returns true if the object is the specified class, or its descendant. */
+ virtual bool IsA(const char * a_ClassName) const { return (strcmp(a_ClassName, "cBlockEntity") == 0); }
+
+ /** Returns the name of the tompost class (the most descendant). Used for Lua bindings to push the correct object type. */
+ virtual const char * GetClass(void) const { return GetClassStatic(); }
+
+ /** Returns the name of the parent class, or empty string if no parent class. */
+ virtual const char * GetParentClass(void) const { return ""; }
// tolua_begin
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 00173cbcb..cb7bc2fb4 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -25,10 +25,12 @@ class cBlockEntityWithItems :
public cBlockEntityWindowOwner
{
typedef cBlockEntity super;
-
+
public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cBlockEntityWithItems);
+
cBlockEntityWithItems(
BLOCKTYPE a_BlockType, // Type of the block that the entity represents
int a_BlockX, int a_BlockY, int a_BlockZ, // Position of the block entity
diff --git a/src/BlockEntities/ChestEntity.h b/src/BlockEntities/ChestEntity.h
index af5d851a8..09fffb923 100644
--- a/src/BlockEntities/ChestEntity.h
+++ b/src/BlockEntities/ChestEntity.h
@@ -33,13 +33,13 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cChestEntity);
+
/** Constructor used for normal operation */
cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World, BLOCKTYPE a_Type);
virtual ~cChestEntity();
- static const char * GetClassStatic(void) { return "cChestEntity"; }
-
// cBlockEntity overrides:
virtual void SendTo(cClientHandle & a_Client) override;
virtual void UsedBy(cPlayer * a_Player) override;
diff --git a/src/BlockEntities/CommandBlockEntity.h b/src/BlockEntities/CommandBlockEntity.h
index 939f38610..217390293 100644
--- a/src/BlockEntities/CommandBlockEntity.h
+++ b/src/BlockEntities/CommandBlockEntity.h
@@ -36,6 +36,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cCommandBlockEntity);
+
/// Creates a new empty command block entity
cCommandBlockEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
diff --git a/src/BlockEntities/DispenserEntity.h b/src/BlockEntities/DispenserEntity.h
index b33d08342..5ba87b716 100644
--- a/src/BlockEntities/DispenserEntity.h
+++ b/src/BlockEntities/DispenserEntity.h
@@ -17,11 +17,11 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cDispenserEntity);
+
/** Constructor used for normal operation */
cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
- static const char * GetClassStatic(void) { return "cDispenserEntity"; }
-
// tolua_begin
/** Spawns a projectile of the given kind in front of the dispenser with the specified speed. */
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index 23f0ae89a..f77a28c28 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -45,11 +45,11 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cDropSpenserEntity);
+
cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
virtual ~cDropSpenserEntity();
- static const char * GetClassStatic(void) { return "cDropSpenserEntity"; }
-
// cBlockEntity overrides:
virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void SendTo(cClientHandle & a_Client) override;
diff --git a/src/BlockEntities/DropperEntity.h b/src/BlockEntities/DropperEntity.h
index 8e07bc6f8..91adf660f 100644
--- a/src/BlockEntities/DropperEntity.h
+++ b/src/BlockEntities/DropperEntity.h
@@ -25,11 +25,11 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cDropperEntity);
+
/// Constructor used for normal operation
cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
- static const char * GetClassStatic(void) { return "cDropperEntity"; }
-
protected:
// cDropSpenserEntity overrides:
virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index 2719eb5e4..17abd880a 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -18,11 +18,11 @@ class cEnderChestEntity :
public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cEnderChestEntity);
+
cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
virtual ~cEnderChestEntity();
- static const char * GetClassStatic(void) { return "cEnderChestEntity"; }
-
// cBlockEntity overrides:
virtual void UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle & a_Client) override { UNUSED(a_Client); }
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index b68d3b118..5b86621f5 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -36,6 +36,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cFlowerPotEntity);
+
/** Creates a new flowerpot entity at the specified block coords. a_World may be NULL */
cFlowerPotEntity(int a_BlocX, int a_BlockY, int a_BlockZ, cWorld * a_World);
@@ -59,8 +61,6 @@ public:
static bool IsFlower(short m_ItemType, short m_ItemData);
- static const char * GetClassStatic(void) { return "cFlowerPotEntity"; }
-
private:
cItem m_Item;
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index 4452fc00a..284ac7de9 100644
--- a/src/BlockEntities/FurnaceEntity.cpp
+++ b/src/BlockEntities/FurnaceEntity.cpp
@@ -5,6 +5,7 @@
#include "../UI/Window.h"
#include "../Entities/Player.h"
#include "../Root.h"
+#include "../Chunk.h"
@@ -13,8 +14,9 @@
enum
{
- PROGRESSBAR_SMELTING = 0,
- PROGRESSBAR_FUEL = 1,
+ PROGRESSBAR_FUEL = 0,
+ PROGRESSBAR_SMELTING = 2,
+ PROGRESSBAR_SMELTING_CONFIRM = 3,
} ;
@@ -22,17 +24,15 @@ enum
cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World) :
- super(E_BLOCK_FURNACE, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
- m_BlockType(a_BlockType),
+ super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
m_BlockMeta(a_BlockMeta),
m_CurrentRecipe(NULL),
- m_IsCooking((a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_LIT_FURNACE)),
+ m_IsDestroyed(false),
+ m_IsCooking(a_BlockType == E_BLOCK_LIT_FURNACE),
m_NeedCookTime(0),
m_TimeCooked(0),
m_FuelBurnTime(0),
- m_TimeBurned(0),
- m_LastProgressFuel(0),
- m_LastProgressCook(0)
+ m_TimeBurned(0)
{
m_Contents.AddListener(*this);
}
@@ -57,27 +57,28 @@ cFurnaceEntity::~cFurnaceEntity()
void cFurnaceEntity::UsedBy(cPlayer * a_Player)
{
- if (GetWindow() == NULL)
+ cWindow * Window = GetWindow();
+ if (Window == nullptr)
{
OpenWindow(new cFurnaceWindow(m_PosX, m_PosY, m_PosZ, this));
+ Window = GetWindow();
}
- cWindow * Window = GetWindow();
- if (Window != NULL)
+
+ if (Window != nullptr)
{
if (a_Player->GetWindow() != Window)
{
a_Player->OpenWindow(Window);
- BroadcastProgress(PROGRESSBAR_FUEL, (short)m_LastProgressFuel);
- BroadcastProgress(PROGRESSBAR_SMELTING, (short)m_LastProgressCook);
}
}
+
+ UpdateProgressBars(true);
}
-/// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
bool cFurnaceEntity::ContinueCooking(void)
{
UpdateInput();
@@ -92,14 +93,16 @@ bool cFurnaceEntity::ContinueCooking(void)
bool cFurnaceEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
UNUSED(a_Dt);
- UNUSED(a_Chunk);
+
if (m_FuelBurnTime <= 0)
{
- // No fuel is burning, reset progressbars and bail out
- if ((m_LastProgressCook > 0) || (m_LastProgressFuel > 0))
- {
- UpdateProgressBars();
- }
+ // If a furnace is out of fuel, the progress bar reverses at twice the speed of cooking.
+ m_TimeCooked = std::max((m_TimeCooked - 2), 0);
+
+ // Reset progressbars, block type, and bail out
+ m_BlockType = E_BLOCK_FURNACE;
+ a_Chunk.FastSetBlock(GetRelX(), m_PosY, GetRelZ(), E_BLOCK_FURNACE, m_BlockMeta);
+ UpdateProgressBars();
return false;
}
@@ -139,12 +142,12 @@ void cFurnaceEntity::SendTo(cClientHandle & a_Client)
-void cFurnaceEntity::BroadcastProgress(int a_ProgressbarID, short a_Value)
+void cFurnaceEntity::BroadcastProgress(short a_ProgressbarID, short a_Value)
{
cWindow * Window = GetWindow();
if (Window != NULL)
{
- Window->BroadcastProgress(a_ProgressbarID, a_Value);
+ Window->SetProperty(a_ProgressbarID, a_Value);
}
}
@@ -152,7 +155,6 @@ void cFurnaceEntity::BroadcastProgress(int a_ProgressbarID, short a_Value)
-/// One item finished cooking
void cFurnaceEntity::FinishOne()
{
m_TimeCooked = 0;
@@ -166,8 +168,6 @@ void cFurnaceEntity::FinishOne()
m_Contents.ChangeSlotCount(fsOutput, m_CurrentRecipe->Out->m_ItemCount);
}
m_Contents.ChangeSlotCount(fsInput, -m_CurrentRecipe->In->m_ItemCount);
-
- UpdateIsCooking();
}
@@ -181,8 +181,7 @@ void cFurnaceEntity::BurnNewFuel(void)
if (NewTime == 0)
{
// The item in the fuel slot is not suitable
- m_FuelBurnTime = 0;
- m_TimeBurned = 0;
+ SetBurnTimes(0, 0);
SetIsCooking(false);
return;
}
@@ -194,8 +193,7 @@ void cFurnaceEntity::BurnNewFuel(void)
}
// Burn one new fuel:
- m_FuelBurnTime = NewTime;
- m_TimeBurned = 0;
+ SetBurnTimes(NewTime, 0);
SetIsCooking(true);
if (m_Contents.GetSlot(fsFuel).m_ItemType == E_ITEM_LAVA_BUCKET)
{
@@ -214,33 +212,19 @@ void cFurnaceEntity::BurnNewFuel(void)
void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
{
super::OnSlotChanged(a_ItemGrid, a_SlotNum);
-
- if (m_World == NULL)
+
+ if (m_IsDestroyed)
{
- // The furnace isn't initialized yet, do no processing
return;
}
ASSERT(a_ItemGrid == &m_Contents);
switch (a_SlotNum)
{
- case fsInput:
- {
- UpdateInput();
- break;
- }
-
- case fsFuel:
- {
- UpdateFuel();
- break;
- }
-
- case fsOutput:
- {
- UpdateOutput();
- break;
- }
+ case fsInput: UpdateInput(); break;
+ case fsFuel: UpdateFuel(); break;
+ case fsOutput: UpdateOutput(); break;
+ default: ASSERT(!"Invalid furnace slot update!"); break;
}
}
@@ -249,7 +233,6 @@ void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
-/// Updates the current recipe, based on the current input
void cFurnaceEntity::UpdateInput(void)
{
if (!m_Contents.GetSlot(fsInput).IsEqual(m_LastInput))
@@ -263,8 +246,8 @@ void cFurnaceEntity::UpdateInput(void)
m_CurrentRecipe = FR->GetRecipeFrom(m_Contents.GetSlot(fsInput));
if (!CanCookInputToOutput())
{
- // This input cannot be cooked
- m_NeedCookTime = 0;
+ // This input cannot be cooked, reset cook counter immediately
+ SetCookTimes(0, 0);
SetIsCooking(false);
}
else
@@ -284,7 +267,6 @@ void cFurnaceEntity::UpdateInput(void)
-/// Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate
void cFurnaceEntity::UpdateFuel(void)
{
if (m_FuelBurnTime > m_TimeBurned)
@@ -301,14 +283,12 @@ void cFurnaceEntity::UpdateFuel(void)
-/// Called when the output slot changes; starts burning if space became available
void cFurnaceEntity::UpdateOutput(void)
{
if (!CanCookInputToOutput())
{
// Cannot cook anymore:
- m_TimeCooked = 0;
- m_NeedCookTime = 0;
+ SetCookTimes(0, 0);
SetIsCooking(false);
return;
}
@@ -324,30 +304,6 @@ void cFurnaceEntity::UpdateOutput(void)
-/// Updates the m_IsCooking, based on the input slot, output slot and m_FuelBurnTime / m_TimeBurned
-void cFurnaceEntity::UpdateIsCooking(void)
-{
- if (
- !CanCookInputToOutput() || // Cannot cook this
- (m_FuelBurnTime <= 0) || // No fuel
- (m_TimeBurned >= m_FuelBurnTime) // Fuel burnt out
- )
- {
- // Reset everything
- SetIsCooking(false);
- m_TimeCooked = 0;
- m_NeedCookTime = 0;
- return;
- }
-
- SetIsCooking(true);
-}
-
-
-
-
-
-/// Returns true if the input can be cooked into output and the item counts allow for another cooking operation
bool cFurnaceEntity::CanCookInputToOutput(void) const
{
if (m_CurrentRecipe == NULL)
@@ -382,25 +338,20 @@ bool cFurnaceEntity::CanCookInputToOutput(void) const
-/// Broadcasts progressbar updates, if needed
-void cFurnaceEntity::UpdateProgressBars(void)
+void cFurnaceEntity::UpdateProgressBars(bool a_ForceUpdate)
{
// In order to preserve bandwidth, an update is sent only every 10th tick
- // That's why the comparisons use the division by eight
-
- int CurFuel = (m_FuelBurnTime > 0) ? (200 - 200 * m_TimeBurned / m_FuelBurnTime) : 0;
- if ((CurFuel / 8) != (m_LastProgressFuel / 8))
+ if (!a_ForceUpdate && (m_World->GetWorldAge() % 10 != 0))
{
- BroadcastProgress(PROGRESSBAR_FUEL, (short)CurFuel);
- m_LastProgressFuel = CurFuel;
+ return;
}
- int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0;
- if ((CurCook / 8) != (m_LastProgressCook / 8))
- {
- BroadcastProgress(PROGRESSBAR_SMELTING, (short)CurCook);
- m_LastProgressCook = CurCook;
- }
+ int CurFuel = (m_FuelBurnTime > 0) ? 200 - (200 * m_TimeBurned / m_FuelBurnTime) : 0;
+ BroadcastProgress(PROGRESSBAR_FUEL, static_cast<short>(CurFuel));
+
+ int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0;
+ BroadcastProgress(PROGRESSBAR_SMELTING_CONFIRM, 200); // Post 1.8, Mojang requires a random packet with an ID of three and value of 200. Wat. Wat. Wat.
+ BroadcastProgress(PROGRESSBAR_SMELTING, static_cast<short>(CurCook));
}
@@ -413,11 +364,14 @@ void cFurnaceEntity::SetIsCooking(bool a_IsCooking)
{
return;
}
-
m_IsCooking = a_IsCooking;
-
- // Light or extinguish the furnace:
- m_World->FastSetBlock(m_PosX, m_PosY, m_PosZ, m_IsCooking ? E_BLOCK_LIT_FURNACE : E_BLOCK_FURNACE, m_BlockMeta);
+
+ // Only light the furnace as it is extinguished only when the fuel runs out, not when cooking stops - handled in this::Tick()
+ if (m_IsCooking)
+ {
+ m_BlockType = E_BLOCK_LIT_FURNACE;
+ m_World->FastSetBlock(m_PosX, m_PosY, m_PosZ, E_BLOCK_LIT_FURNACE, m_BlockMeta);
+ }
}
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index ed3317af6..8e48810ba 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -38,114 +38,128 @@ public:
// tolua_end
- /// Constructor used for normal operation
+ BLOCKENTITY_PROTODEF(cFurnaceEntity);
+
+ /** Constructor used for normal operation */
cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World);
virtual ~cFurnaceEntity();
- static const char * GetClassStatic() { return "cFurnaceEntity"; }
-
// cBlockEntity overrides:
virtual void SendTo(cClientHandle & a_Client) override;
virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void Destroy() override
+ {
+ m_IsDestroyed = true;
+ super::Destroy();
+ }
- /// Restarts cooking. Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active. Returns true if cooking.
+ /** Restarts cooking
+ Used after the furnace is loaded from storage to set up the internal variables so that cooking continues, if it was active
+ Returns true if cooking */
bool ContinueCooking(void);
-
- void ResetCookTimer();
// tolua_begin
- /// Returns the item in the input slot
+ /** Returns the item in the input slot */
const cItem & GetInputSlot(void) const { return GetSlot(fsInput); }
- /// Returns the item in the fuel slot
+ /** Returns the item in the fuel slot */
const cItem & GetFuelSlot(void) const { return GetSlot(fsFuel); }
- /// Returns the item in the output slot
+ /** Returns the item in the output slot */
const cItem & GetOutputSlot(void) const { return GetSlot(fsOutput); }
- /// Sets the item in the input slot
+ /** Sets the item in the input slot */
void SetInputSlot(const cItem & a_Item) { SetSlot(fsInput, a_Item); }
- /// Sets the item in the fuel slot
+ /** Sets the item in the fuel slot */
void SetFuelSlot(const cItem & a_Item) { SetSlot(fsFuel, a_Item); }
- /// Sets the item in the output slot
+ /** Sets the item in the output slot */
void SetOutputSlot(const cItem & a_Item) { SetSlot(fsOutput, a_Item); }
- /// Returns the time that the current item has been cooking, in ticks
- int GetTimeCooked(void) const {return m_TimeCooked; }
+ /** Returns the time that the current item has been cooking, in ticks */
+ int GetTimeCooked(void) const { return m_TimeCooked; }
- /// Returns the time until the current item finishes cooking, in ticks
+ /** Returns the time until the current item finishes cooking, in ticks */
int GetCookTimeLeft(void) const { return m_NeedCookTime - m_TimeCooked; }
- /// Returns the time until the current fuel is depleted, in ticks
- int GetFuelBurnTimeLeft(void) const {return m_FuelBurnTime - m_TimeBurned; }
+ /** Returns the time until the current fuel is depleted, in ticks */
+ int GetFuelBurnTimeLeft(void) const { return m_FuelBurnTime - m_TimeBurned; }
- /// Returns true if there's time left before the current fuel is depleted
+ /** Returns true if there's time left before the current fuel is depleted */
bool HasFuelTimeLeft(void) const { return (GetFuelBurnTimeLeft() > 0); }
// tolua_end
- void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned) {m_FuelBurnTime = a_FuelBurnTime; m_TimeBurned = a_TimeBurned; }
- void SetCookTimes(int a_NeedCookTime, int a_TimeCooked) {m_NeedCookTime = a_NeedCookTime; m_TimeCooked = a_TimeCooked; }
+ void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned)
+ {
+ m_FuelBurnTime = a_FuelBurnTime;
+ m_TimeBurned = a_TimeBurned;
+ }
+
+ void SetCookTimes(int a_NeedCookTime, int a_TimeCooked)
+ {
+ m_NeedCookTime = a_NeedCookTime;
+ m_TimeCooked = a_TimeCooked;
+ }
protected:
-
- /// Block type of the block currently represented by this entity (changes when furnace lights up)
- BLOCKTYPE m_BlockType;
- /// Block meta of the block currently represented by this entity
+ /** Block meta of the block currently represented by this entity */
NIBBLETYPE m_BlockMeta;
- /// The recipe for the current input slot
+ /** The recipe for the current input slot */
const cFurnaceRecipe::cRecipe * m_CurrentRecipe;
- /// The item that is being smelted
+ /** The item that is being smelted */
cItem m_LastInput;
+
+ /** Set to true when the furnace entity has been destroyed to prevent the block being set again */
+ bool m_IsDestroyed;
- bool m_IsCooking; ///< Set to true if the furnace is cooking an item
-
- // All timers are in ticks
- int m_NeedCookTime; ///< Amount of time needed to fully cook current item
- int m_TimeCooked; ///< Amount of time that the current item has been cooking
- int m_FuelBurnTime; ///< Amount of time that the current fuel can burn (in total); zero if no fuel burning
- int m_TimeBurned; ///< Amount of time that the current fuel has been burning
-
- int m_LastProgressFuel; ///< Last value sent as the progress for the fuel
- int m_LastProgressCook; ///< Last value sent as the progress for the cooking
+ /** Set to true if the furnace is cooking an item */
+ bool m_IsCooking;
+ /** Amount of ticks needed to fully cook current item */
+ int m_NeedCookTime;
+
+ /** Amount of ticks that the current item has been cooking */
+ int m_TimeCooked;
+
+ /** Amount of ticks that the current fuel can burn (in total); zero if no fuel burning */
+ int m_FuelBurnTime;
+
+ /** Amount of ticks that the current fuel has been burning */
+ int m_TimeBurned;
- /// Sends the specified progressbar value to all clients of the window
- void BroadcastProgress(int a_ProgressbarID, short a_Value);
+ /** Sends the specified progressbar value to all clients of the window */
+ void BroadcastProgress(short a_ProgressbarID, short a_Value);
- /// One item finished cooking
+ /** One item finished cooking */
void FinishOne();
- /// Starts burning a new fuel, if possible
+ /** Starts burning a new fuel, if possible */
void BurnNewFuel(void);
- /// Updates the recipe, based on the current input
+ /** Updates the recipe, based on the current input */
void UpdateInput(void);
- /// Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate
+ /** Called when the fuel slot changes or when the fuel is spent, burns another piece of fuel if appropriate */
void UpdateFuel(void);
- /// Called when the output slot changes
+ /** Called when the output slot changes */
void UpdateOutput(void);
- /// Updates the m_IsCooking, based on the input slot, output slot and m_FuelBurnTime / m_TimeBurned
- void UpdateIsCooking(void);
-
- /// Returns true if the input can be cooked into output and the item counts allow for another cooking operation
+ /** Returns true if the input can be cooked into output and the item counts allow for another cooking operation */
bool CanCookInputToOutput(void) const;
- /// Broadcasts progressbar updates, if needed
- void UpdateProgressBars(void);
+ /** Broadcasts progressbar updates, if needed */
+ void UpdateProgressBars(bool a_ForceUpdate = false);
- /// Sets the m_IsCooking variable, updates the furnace block type based on the value
+ /** Sets the m_IsCooking variable, updates the furnace block type based on the value */
void SetIsCooking(bool a_IsCooking);
// cItemGrid::cListener overrides:
diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h
index 5d06581c2..7070bbad3 100644
--- a/src/BlockEntities/HopperEntity.h
+++ b/src/BlockEntities/HopperEntity.h
@@ -31,6 +31,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cHopperEntity);
+
/// Constructor used for normal operation
cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
@@ -40,8 +42,6 @@ public:
*/
bool GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ);
- static const char * GetClassStatic(void) { return "cHopperEntity"; }
-
protected:
Int64 m_LastMoveItemsInTick;
diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h
index 49d2faa89..7a69d6499 100644
--- a/src/BlockEntities/JukeboxEntity.h
+++ b/src/BlockEntities/JukeboxEntity.h
@@ -26,6 +26,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cJukeboxEntity);
+
cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
virtual ~cJukeboxEntity();
@@ -51,8 +53,6 @@ public:
// tolua_end
- static const char * GetClassStatic(void) { return "cJukeboxEntity"; }
-
virtual void UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle &) override {}
diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
index fcdeaa8a6..7f69bc5ad 100644
--- a/src/BlockEntities/MobHeadEntity.h
+++ b/src/BlockEntities/MobHeadEntity.h
@@ -34,6 +34,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cMobHeadEntity);
+
/** Creates a new mob head entity at the specified block coords. a_World may be NULL */
cMobHeadEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
@@ -62,8 +64,6 @@ public:
virtual void UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle & a_Client) override;
- static const char * GetClassStatic(void) { return "cMobHeadEntity"; }
-
private:
eMobHeadType m_Type;
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index d1ffa126a..74dbde046 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -40,6 +40,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cNoteEntity);
+
/// Creates a new note entity. a_World may be NULL
cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
virtual ~cNoteEntity() {}
@@ -64,8 +66,6 @@ public:
}
}
- static const char * GetClassStatic(void) { return "cNoteEntity"; }
-
private:
char m_Pitch;
} ; // tolua_export
diff --git a/src/BlockEntities/SignEntity.h b/src/BlockEntities/SignEntity.h
index 53c43b758..be13c7a32 100644
--- a/src/BlockEntities/SignEntity.h
+++ b/src/BlockEntities/SignEntity.h
@@ -34,6 +34,8 @@ public:
// tolua_end
+ BLOCKENTITY_PROTODEF(cSignEntity);
+
/// Creates a new empty sign entity at the specified block coords and block type (wall or standing). a_World may be NULL
cSignEntity(BLOCKTYPE a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World);
@@ -53,8 +55,6 @@ public:
virtual void UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle & a_Client) override;
- static const char * GetClassStatic(void) { return "cSignEntity"; }
-
private:
AString m_Line[4];