13 files changed, 1779 insertions, 1779 deletions

diff --git a/source/BlockEntities/BlockEntityWithItems.h b/source/BlockEntities/BlockEntityWithItems.h
index 587b10461..0846ae17e 100644
--- a/source/BlockEntities/BlockEntityWithItems.h
+++ b/source/BlockEntities/BlockEntityWithItems.h
@@ -1,86 +1,86 @@
-

-// BlockEntityWithItems.h

-

-// Declares the cBlockEntityWithItems class representing a common ancestor for all block entities that have an ItemGrid

-

-

-

-

-

-#pragma once

-

-#include "BlockEntity.h"

-#include "../ItemGrid.h"

-

-

-

-

-

-// tolua_begin

-class cBlockEntityWithItems :

-	public cBlockEntity

-	// tolua_end

-	// tolua doesn't seem to support multiple inheritance?

-	, public cItemGrid::cListener

-	// tolua_begin

-{

-	typedef cBlockEntity super;

-	

-public:

-	// tolua_end

-	

-	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

-		int a_ItemGridWidth, int a_ItemGridHeight,  // Dimensions of the ItemGrid

-		cWorld * a_World                            // Optional world to assign to the entity

-	) :

-		super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World),

-		m_Contents(a_ItemGridWidth, a_ItemGridHeight)

-	{

-		m_Contents.AddListener(*this);

-	}

-	

-	virtual void Destroy(void) override

-	{

-		// Drop the contents as pickups:

-		ASSERT(m_World != NULL);

-		cItems Pickups;

-		m_Contents.CopyToItems(Pickups);

-		m_Contents.Clear();

-		m_World->SpawnItemPickups(Pickups, m_PosX, m_PosY, m_PosZ);

-	}

-	

-	// tolua_begin

-	

-	const cItem & GetSlot(int a_SlotNum)    const { return m_Contents.GetSlot(a_SlotNum); }

-	const cItem & GetSlot(int a_X, int a_Y) const { return m_Contents.GetSlot(a_X, a_Y); }

-	

-	void SetSlot(int a_SlotNum,    const cItem & a_Item) { m_Contents.SetSlot(a_SlotNum, a_Item); }

-	void SetSlot(int a_X, int a_Y, const cItem & a_Item) { m_Contents.SetSlot(a_X, a_Y, a_Item); }

-

-	/// Returns the ItemGrid used for storing the contents

-	cItemGrid & GetContents(void) { return m_Contents; }

-

-	// tolua_end

-	

-	/// Const version of the GetContents() function for C++ type-safety

-	const cItemGrid & GetContents(void) const { return m_Contents; }

-

-protected:

-	cItemGrid m_Contents;

-	

-	// cItemGrid::cListener overrides:

-	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)

-	{

-		ASSERT(a_Grid == &m_Contents);

-		if (m_World != NULL)

-		{

-			m_World->MarkChunkDirty(GetChunkX(), GetChunkZ());

-		}

-	}

-} ;  // tolua_export

-

-

-

-

+
+// BlockEntityWithItems.h
+
+// Declares the cBlockEntityWithItems class representing a common ancestor for all block entities that have an ItemGrid
+
+
+
+
+
+#pragma once
+
+#include "BlockEntity.h"
+#include "../ItemGrid.h"
+
+
+
+
+
+// tolua_begin
+class cBlockEntityWithItems :
+	public cBlockEntity
+	// tolua_end
+	// tolua doesn't seem to support multiple inheritance?
+	, public cItemGrid::cListener
+	// tolua_begin
+{
+	typedef cBlockEntity super;
+	
+public:
+	// tolua_end
+	
+	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
+		int a_ItemGridWidth, int a_ItemGridHeight,  // Dimensions of the ItemGrid
+		cWorld * a_World                            // Optional world to assign to the entity
+	) :
+		super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World),
+		m_Contents(a_ItemGridWidth, a_ItemGridHeight)
+	{
+		m_Contents.AddListener(*this);
+	}
+	
+	virtual void Destroy(void) override
+	{
+		// Drop the contents as pickups:
+		ASSERT(m_World != NULL);
+		cItems Pickups;
+		m_Contents.CopyToItems(Pickups);
+		m_Contents.Clear();
+		m_World->SpawnItemPickups(Pickups, m_PosX, m_PosY, m_PosZ);
+	}
+	
+	// tolua_begin
+	
+	const cItem & GetSlot(int a_SlotNum)    const { return m_Contents.GetSlot(a_SlotNum); }
+	const cItem & GetSlot(int a_X, int a_Y) const { return m_Contents.GetSlot(a_X, a_Y); }
+	
+	void SetSlot(int a_SlotNum,    const cItem & a_Item) { m_Contents.SetSlot(a_SlotNum, a_Item); }
+	void SetSlot(int a_X, int a_Y, const cItem & a_Item) { m_Contents.SetSlot(a_X, a_Y, a_Item); }
+
+	/// Returns the ItemGrid used for storing the contents
+	cItemGrid & GetContents(void) { return m_Contents; }
+
+	// tolua_end
+	
+	/// Const version of the GetContents() function for C++ type-safety
+	const cItemGrid & GetContents(void) const { return m_Contents; }
+
+protected:
+	cItemGrid m_Contents;
+	
+	// cItemGrid::cListener overrides:
+	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
+	{
+		ASSERT(a_Grid == &m_Contents);
+		if (m_World != NULL)
+		{
+			m_World->MarkChunkDirty(GetChunkX(), GetChunkZ());
+		}
+	}
+} ;  // tolua_export
+
+
+
+
diff --git a/source/BlockEntities/DispenserEntity.cpp b/source/BlockEntities/DispenserEntity.cpp
index ab4c8e519..cde67bb41 100644
--- a/source/BlockEntities/DispenserEntity.cpp
+++ b/source/BlockEntities/DispenserEntity.cpp
@@ -1,225 +1,225 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "DispenserEntity.h"

-#include "../Player.h"

-#include "../Simulator/FluidSimulator.h"

-#include "../Chunk.h"

-

-

-

-

-

-cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :

-	super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, NULL)

-{

-	SetBlockEntity(this);  // cBlockEntityWindowOwner

-}

-

-

-

-

-

-cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :

-	super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, a_World)

-{

-	SetBlockEntity(this);  // cBlockEntityWindowOwner

-}

-

-

-

-

-

-void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)

-{

-	int DispX = m_RelX;

-	int DispY = m_PosY;

-	int DispZ = m_RelZ;

-	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);

-	AddDropSpenserDir(DispX, DispY, DispZ, Meta);

-	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);

-	if (DispChunk == NULL)

-	{

-		// Would dispense into / interact with a non-loaded chunk, ignore the tick

-		return;

-	}

-	BLOCKTYPE DispBlock = DispChunk->GetBlock(DispX, DispY, DispZ);

-

-	// Dispense the item:

-	switch (m_Contents.GetSlot(a_SlotNum).m_ItemType)

-	{

-		case E_ITEM_BUCKET:

-		{

-			LOGD("Dispensing empty bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);

-			switch (DispBlock)

-			{

-				case E_BLOCK_STATIONARY_WATER:

-				case E_BLOCK_WATER:

-				{

-					if (ScoopUpLiquid(a_SlotNum, E_ITEM_WATER_BUCKET))

-					{

-						DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_AIR, 0);

-					}

-					break;

-				}

-				case E_BLOCK_STATIONARY_LAVA:

-				case E_BLOCK_LAVA:

-				{

-					if (ScoopUpLiquid(a_SlotNum, E_ITEM_LAVA_BUCKET))

-					{

-						DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_AIR, 0);

-					}

-					break;

-				}

-				default:

-				{

-					DropFromSlot(a_Chunk, a_SlotNum);

-					break;

-				}

-			}

-			break;

-		}  // E_ITEM_BUCKET

-		

-		case E_ITEM_WATER_BUCKET:

-		{

-			LOGD("Dispensing water bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);

-			if (EmptyLiquidBucket(DispBlock, a_SlotNum))

-			{

-				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_WATER, 0);

-			}

-			else

-			{

-				DropFromSlot(a_Chunk, a_SlotNum);

-			}

-			break;

-		}

-		

-		case E_ITEM_LAVA_BUCKET:

-		{

-			LOGD("Dispensing lava bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);

-			if (EmptyLiquidBucket(DispBlock, a_SlotNum))

-			{

-				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_LAVA, 0);

-			}

-			else

-			{

-				DropFromSlot(a_Chunk, a_SlotNum);

-			}

-			break;

-		}

-		

-		case E_ITEM_SPAWN_EGG:

-		{

-			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);

-			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);

-			if (m_World->SpawnMob(MobX, DispY, MobZ, m_Contents.GetSlot(a_SlotNum).m_ItemDamage) >= 0)

-			{

-				m_Contents.ChangeSlotCount(a_SlotNum, -1);

-			}

-			break;

-		}

-		

-		case E_BLOCK_TNT:

-		{

-			// Spawn a primed TNT entity, if space allows:

-			if (DispChunk->GetBlock(DispX, DispY, DispZ) == E_BLOCK_AIR)

-			{

-				double TNTX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);

-				double TNTZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);

-				m_World->SpawnPrimedTNT(TNTX, DispY + 0.5, TNTZ, 4, 0);  // 4 seconds fuse, no initial velocity

-				m_Contents.ChangeSlotCount(a_SlotNum, -1);

-			}

-			break;

-		}

-

-		case E_ITEM_FLINT_AND_STEEL:

-		{

-			// Spawn fire if the block in front is air.

-			if (DispChunk->GetBlock(DispX, DispY, DispZ) == E_BLOCK_AIR)

-			{

-				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_FIRE, 0);

-				m_Contents.SetSlot(a_SlotNum, m_Contents.GetSlot(a_SlotNum).m_ItemType, m_Contents.GetSlot(a_SlotNum).m_ItemCount, m_Contents.GetSlot(a_SlotNum).m_ItemDamage + 1);

-				// If the durability has run out destroy the item.

-				if (m_Contents.GetSlot(a_SlotNum).m_ItemDamage > 64)

-				{				

-					m_Contents.ChangeSlotCount(a_SlotNum, -1);

-				}

-			}

-			break;

-		}

-		

-		default:

-		{

-			DropFromSlot(a_Chunk, a_SlotNum);

-			break;

-		}

-	}  // switch (ItemType)

-}

-

-

-

-

-

-

-bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)

-{

-	cItem LiquidBucket(a_BucketItemType, 1);

-	if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1)

-	{

-		// Special case: replacing one empty bucket with one full bucket

-		m_Contents.SetSlot(a_SlotNum, LiquidBucket);

-		return true;

-	}

-	

-	// There are stacked buckets at the selected slot, see if a full bucket will fit somewhere else

-	if (m_Contents.HowManyCanFit(LiquidBucket) < 1)

-	{

-		// Cannot fit into m_Contents

-		return false;

-	}

-	

-	m_Contents.ChangeSlotCount(a_SlotNum, -1);

-	m_Contents.AddItem(LiquidBucket);

-	return true;

-}

-

-

-

-

-

-bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum)

-{

-	if (

-		(a_BlockInFront != E_BLOCK_AIR) &&

-		!IsBlockLiquid(a_BlockInFront) &&

-		!cFluidSimulator::CanWashAway(a_BlockInFront)

-	)

-	{

-		// Not a suitable block in front

-		return false;

-	}

-	

-	cItem EmptyBucket(E_ITEM_BUCKET, 1);

-	if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1)

-	{

-		// Change the single full bucket present into a single empty bucket

-		m_Contents.SetSlot(a_SlotNum, EmptyBucket);

-		return true;

-	}

-	

-	// There are full buckets stacked at this slot, check if we can fit in the empty bucket

-	if (m_Contents.HowManyCanFit(EmptyBucket) < 1)

-	{

-		// The empty bucket wouldn't fit into m_Contents

-		return false;

-	}

-	

-	// The empty bucket fits in, remove one full bucket and add the empty one

-	m_Contents.ChangeSlotCount(a_SlotNum, -1);

-	m_Contents.AddItem(EmptyBucket);

-	return true;

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "DispenserEntity.h"
+#include "../Player.h"
+#include "../Simulator/FluidSimulator.h"
+#include "../Chunk.h"
+
+
+
+
+
+cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
+	super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, NULL)
+{
+	SetBlockEntity(this);  // cBlockEntityWindowOwner
+}
+
+
+
+
+
+cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
+	super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, a_World)
+{
+	SetBlockEntity(this);  // cBlockEntityWindowOwner
+}
+
+
+
+
+
+void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
+{
+	int DispX = m_RelX;
+	int DispY = m_PosY;
+	int DispZ = m_RelZ;
+	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
+	AddDropSpenserDir(DispX, DispY, DispZ, Meta);
+	cChunk * DispChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(DispX, DispZ);
+	if (DispChunk == NULL)
+	{
+		// Would dispense into / interact with a non-loaded chunk, ignore the tick
+		return;
+	}
+	BLOCKTYPE DispBlock = DispChunk->GetBlock(DispX, DispY, DispZ);
+
+	// Dispense the item:
+	switch (m_Contents.GetSlot(a_SlotNum).m_ItemType)
+	{
+		case E_ITEM_BUCKET:
+		{
+			LOGD("Dispensing empty bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);
+			switch (DispBlock)
+			{
+				case E_BLOCK_STATIONARY_WATER:
+				case E_BLOCK_WATER:
+				{
+					if (ScoopUpLiquid(a_SlotNum, E_ITEM_WATER_BUCKET))
+					{
+						DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_AIR, 0);
+					}
+					break;
+				}
+				case E_BLOCK_STATIONARY_LAVA:
+				case E_BLOCK_LAVA:
+				{
+					if (ScoopUpLiquid(a_SlotNum, E_ITEM_LAVA_BUCKET))
+					{
+						DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_AIR, 0);
+					}
+					break;
+				}
+				default:
+				{
+					DropFromSlot(a_Chunk, a_SlotNum);
+					break;
+				}
+			}
+			break;
+		}  // E_ITEM_BUCKET
+		
+		case E_ITEM_WATER_BUCKET:
+		{
+			LOGD("Dispensing water bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);
+			if (EmptyLiquidBucket(DispBlock, a_SlotNum))
+			{
+				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_WATER, 0);
+			}
+			else
+			{
+				DropFromSlot(a_Chunk, a_SlotNum);
+			}
+			break;
+		}
+		
+		case E_ITEM_LAVA_BUCKET:
+		{
+			LOGD("Dispensing lava bucket in slot %d; DispBlock is \"%s\" (%d).", a_SlotNum, ItemTypeToString(DispBlock).c_str(), DispBlock);
+			if (EmptyLiquidBucket(DispBlock, a_SlotNum))
+			{
+				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_LAVA, 0);
+			}
+			else
+			{
+				DropFromSlot(a_Chunk, a_SlotNum);
+			}
+			break;
+		}
+		
+		case E_ITEM_SPAWN_EGG:
+		{
+			double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+			double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+			if (m_World->SpawnMob(MobX, DispY, MobZ, m_Contents.GetSlot(a_SlotNum).m_ItemDamage) >= 0)
+			{
+				m_Contents.ChangeSlotCount(a_SlotNum, -1);
+			}
+			break;
+		}
+		
+		case E_BLOCK_TNT:
+		{
+			// Spawn a primed TNT entity, if space allows:
+			if (DispChunk->GetBlock(DispX, DispY, DispZ) == E_BLOCK_AIR)
+			{
+				double TNTX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width);
+				double TNTZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width);
+				m_World->SpawnPrimedTNT(TNTX, DispY + 0.5, TNTZ, 4, 0);  // 4 seconds fuse, no initial velocity
+				m_Contents.ChangeSlotCount(a_SlotNum, -1);
+			}
+			break;
+		}
+
+		case E_ITEM_FLINT_AND_STEEL:
+		{
+			// Spawn fire if the block in front is air.
+			if (DispChunk->GetBlock(DispX, DispY, DispZ) == E_BLOCK_AIR)
+			{
+				DispChunk->SetBlock(DispX, DispY, DispZ, E_BLOCK_FIRE, 0);
+				m_Contents.SetSlot(a_SlotNum, m_Contents.GetSlot(a_SlotNum).m_ItemType, m_Contents.GetSlot(a_SlotNum).m_ItemCount, m_Contents.GetSlot(a_SlotNum).m_ItemDamage + 1);
+				// If the durability has run out destroy the item.
+				if (m_Contents.GetSlot(a_SlotNum).m_ItemDamage > 64)
+				{				
+					m_Contents.ChangeSlotCount(a_SlotNum, -1);
+				}
+			}
+			break;
+		}
+		
+		default:
+		{
+			DropFromSlot(a_Chunk, a_SlotNum);
+			break;
+		}
+	}  // switch (ItemType)
+}
+
+
+
+
+
+
+bool cDispenserEntity::ScoopUpLiquid(int a_SlotNum, short a_BucketItemType)
+{
+	cItem LiquidBucket(a_BucketItemType, 1);
+	if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1)
+	{
+		// Special case: replacing one empty bucket with one full bucket
+		m_Contents.SetSlot(a_SlotNum, LiquidBucket);
+		return true;
+	}
+	
+	// There are stacked buckets at the selected slot, see if a full bucket will fit somewhere else
+	if (m_Contents.HowManyCanFit(LiquidBucket) < 1)
+	{
+		// Cannot fit into m_Contents
+		return false;
+	}
+	
+	m_Contents.ChangeSlotCount(a_SlotNum, -1);
+	m_Contents.AddItem(LiquidBucket);
+	return true;
+}
+
+
+
+
+
+bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum)
+{
+	if (
+		(a_BlockInFront != E_BLOCK_AIR) &&
+		!IsBlockLiquid(a_BlockInFront) &&
+		!cFluidSimulator::CanWashAway(a_BlockInFront)
+	)
+	{
+		// Not a suitable block in front
+		return false;
+	}
+	
+	cItem EmptyBucket(E_ITEM_BUCKET, 1);
+	if (m_Contents.GetSlot(a_SlotNum).m_ItemCount == 1)
+	{
+		// Change the single full bucket present into a single empty bucket
+		m_Contents.SetSlot(a_SlotNum, EmptyBucket);
+		return true;
+	}
+	
+	// There are full buckets stacked at this slot, check if we can fit in the empty bucket
+	if (m_Contents.HowManyCanFit(EmptyBucket) < 1)
+	{
+		// The empty bucket wouldn't fit into m_Contents
+		return false;
+	}
+	
+	// The empty bucket fits in, remove one full bucket and add the empty one
+	m_Contents.ChangeSlotCount(a_SlotNum, -1);
+	m_Contents.AddItem(EmptyBucket);
+	return true;
+}
+
+
+
+
diff --git a/source/BlockEntities/DispenserEntity.h b/source/BlockEntities/DispenserEntity.h
index 09270e7f8..5e3327f18 100644
--- a/source/BlockEntities/DispenserEntity.h
+++ b/source/BlockEntities/DispenserEntity.h
@@ -1,41 +1,41 @@
-

-#pragma once

-

-#include "DropSpenserEntity.h"

-

-

-

-

-

-// tolua_begin

-class cDispenserEntity :

-	public cDropSpenserEntity

-{

-	typedef cDropSpenserEntity super;

-	

-public:

-

-	/// Constructor used while generating a chunk; sets m_World to NULL

-	cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ);

-	

-	// tolua_end

-	

-	/// 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"; }

-

-private:

-	// cDropSpenser overrides:

-	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;

-	

-	/// If such a bucket can fit, adds it to m_Contents and returns true

-	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);

-	

-	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true

-	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);

-} ;  // tolua_export

-

-

-

-

+
+#pragma once
+
+#include "DropSpenserEntity.h"
+
+
+
+
+
+// tolua_begin
+class cDispenserEntity :
+	public cDropSpenserEntity
+{
+	typedef cDropSpenserEntity super;
+	
+public:
+
+	/// Constructor used while generating a chunk; sets m_World to NULL
+	cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ);
+	
+	// tolua_end
+	
+	/// 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"; }
+
+private:
+	// cDropSpenser overrides:
+	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) override;
+	
+	/// If such a bucket can fit, adds it to m_Contents and returns true
+	bool ScoopUpLiquid(int a_SlotNum, short a_BucketItemType);
+	
+	/// If the a_BlockInFront is liquidable and the empty bucket can fit, does the m_Contents processing and returns true
+	bool EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum);
+} ;  // tolua_export
+
+
+
+
diff --git a/source/BlockEntities/DropSpenserEntity.cpp b/source/BlockEntities/DropSpenserEntity.cpp
index a9860d812..eb8257a21 100644
--- a/source/BlockEntities/DropSpenserEntity.cpp
+++ b/source/BlockEntities/DropSpenserEntity.cpp
@@ -1,245 +1,245 @@
-

-// DropSpenserEntity.cpp

-

-// Declares the cDropSpenserEntity class representing a common ancestor to the cDispenserEntity and cDropperEntity

-// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior

-

-#include "Globals.h"

-#include "DropSpenserEntity.h"

-#include "../Player.h"

-#include "../Chunk.h"

-

-

-

-

-

-cDropSpenserEntity::cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :

-	super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),

-	m_ShouldDropSpense(false),

-	m_IsPowered(false)

-{

-	SetBlockEntity(this);  // cBlockEntityWindowOwner

-}

-

-

-

-

-

-cDropSpenserEntity::~cDropSpenserEntity()

-{

-	// Tell window its owner is destroyed

-	cWindow * Window = GetWindow();

-	if (Window != NULL)

-	{

-		Window->OwnerDestroyed();

-	}

-}

-

-

-

-

-

-void cDropSpenserEntity::AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction)

-{

-	switch (a_Direction)

-	{

-		case E_META_DROPSPENSER_FACING_YM: a_BlockY--; return;

-		case E_META_DROPSPENSER_FACING_YP: a_BlockY++; return;

-		case E_META_DROPSPENSER_FACING_ZM: a_BlockZ--; return;

-		case E_META_DROPSPENSER_FACING_ZP: a_BlockZ++; return;

-		case E_META_DROPSPENSER_FACING_XM: a_BlockX--; return;

-		case E_META_DROPSPENSER_FACING_XP: a_BlockX++; return;

-	}

-	LOGWARNING("%s: Unhandled direction: %d", __FUNCTION__, a_Direction);

-	return;

-}

-

-

-

-

-

-void cDropSpenserEntity::DropSpense(cChunk & a_Chunk)

-{

-	// Pick one of the occupied slots:

-	int OccupiedSlots[9];

-	int SlotsCnt = 0;

-	for (int i = m_Contents.GetNumSlots() - 1; i >= 0; i--)

-	{

-		if (!m_Contents.GetSlot(i).IsEmpty())

-		{

-			OccupiedSlots[SlotsCnt] = i;

-			SlotsCnt++;

-		}

-	}  // for i - m_Contents[]

-	

-	if (SlotsCnt == 0)

-	{

-		// Nothing in the dropspenser, play the click sound

-		m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.2f);

-		return;

-	}

-	

-	int RandomSlot = 	m_World->GetTickRandomNumber(SlotsCnt - 1);

-	

-	// DropSpense the item, using the specialized behavior in the subclasses:

-	DropSpenseFromSlot(a_Chunk, OccupiedSlots[RandomSlot]);

-	

-	// Broadcast a smoke and click effects:

-	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);

-	int SmokeDir = 0;

-	switch (Meta)

-	{

-		case E_META_DROPSPENSER_FACING_XM: SmokeDir = 3; break;

-		case E_META_DROPSPENSER_FACING_XP: SmokeDir = 5; break;

-		case E_META_DROPSPENSER_FACING_ZM: SmokeDir = 1; break;

-		case E_META_DROPSPENSER_FACING_ZP: SmokeDir = 7; break;

-	}

-	m_World->BroadcastSoundParticleEffect(2000, m_PosX * 8, m_PosY * 8, m_PosZ * 8, SmokeDir);

-	m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.0f);

-	

-	// Update the UI window, if open:

-	cWindow * Window = GetWindow();

-	if (Window != NULL)

-	{

-		Window->BroadcastWholeWindow();

-	}

-}	

-

-

-

-

-

-void cDropSpenserEntity::Activate(void)

-{

-	m_ShouldDropSpense = true;

-}

-

-

-

-

-

-void cDropSpenserEntity::SetRedstonePower(bool a_IsPowered)

-{

-	if (a_IsPowered && !m_IsPowered)

-	{

-		Activate();

-	}

-	m_IsPowered = a_IsPowered;

-}

-

-

-

-

-

-bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk)

-{

-	if (!m_ShouldDropSpense)

-	{

-		return false;

-	}

-	

-	m_ShouldDropSpense = false;

-	DropSpense(a_Chunk);

-	return true;

-}

-

-

-

-

-

-bool cDropSpenserEntity::LoadFromJson(const Json::Value & a_Value)

-{

-	m_PosX = a_Value.get("x", 0).asInt();

-	m_PosY = a_Value.get("y", 0).asInt();

-	m_PosZ = a_Value.get("z", 0).asInt();

-

-	Json::Value AllSlots = a_Value.get("Slots", 0);

-	int SlotIdx = 0;

-	for (Json::Value::iterator itr = AllSlots.begin(); itr != AllSlots.end(); ++itr)

-	{

-		cItem Contents;

-		Contents.FromJson(*itr);

-		m_Contents.SetSlot(SlotIdx, Contents);

-		SlotIdx++;

-		if (SlotIdx >= m_Contents.GetNumSlots())

-		{

-			return true;

-		}

-	}

-

-	return true;

-}

-

-

-

-

-

-void cDropSpenserEntity::SaveToJson(Json::Value & a_Value)

-{

-	a_Value["x"] = m_PosX;

-	a_Value["y"] = m_PosY;

-	a_Value["z"] = m_PosZ;

-

-	Json::Value AllSlots;

-	int NumSlots = m_Contents.GetNumSlots();

-	for (int i = 0; i < NumSlots; i++)

-	{

-		Json::Value Slot;

-		m_Contents.GetSlot(i).GetJson(Slot);

-		AllSlots.append(Slot);

-	}

-	a_Value["Slots"] = AllSlots;

-}

-

-

-

-

-

-void cDropSpenserEntity::SendTo(cClientHandle & a_Client)

-{

-	// Nothing needs to be sent

-	UNUSED(a_Client);

-}

-

-

-

-

-

-void cDropSpenserEntity::UsedBy(cPlayer * a_Player)

-{

-	cWindow * Window = GetWindow();

-	if (Window == NULL)

-	{

-		OpenWindow(new cDropSpenserWindow(m_PosX, m_PosY, m_PosZ, this));

-		Window = GetWindow();

-	}

-	

-	if (Window != NULL)

-	{

-		if (a_Player->GetWindow() != Window)

-		{

-			a_Player->OpenWindow(Window);

-		}

-	}

-}

-

-

-

-

-

-void cDropSpenserEntity::DropFromSlot(cChunk & a_Chunk, int a_SlotNum)

-{

-	int DispX = m_PosX;

-	int DispY = m_PosY;

-	int DispZ = m_PosZ;

-	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);

-	AddDropSpenserDir(DispX, DispY, DispZ, Meta);

-

-	cItems Pickups;

-	Pickups.push_back(m_Contents.RemoveOneItem(a_SlotNum));

-	m_World->SpawnItemPickups(Pickups, DispX, DispY, DispZ);

-}

-

-

-

-

+
+// DropSpenserEntity.cpp
+
+// Declares the cDropSpenserEntity class representing a common ancestor to the cDispenserEntity and cDropperEntity
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
+
+#include "Globals.h"
+#include "DropSpenserEntity.h"
+#include "../Player.h"
+#include "../Chunk.h"
+
+
+
+
+
+cDropSpenserEntity::cDropSpenserEntity(BLOCKTYPE a_BlockType, int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
+	super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
+	m_ShouldDropSpense(false),
+	m_IsPowered(false)
+{
+	SetBlockEntity(this);  // cBlockEntityWindowOwner
+}
+
+
+
+
+
+cDropSpenserEntity::~cDropSpenserEntity()
+{
+	// Tell window its owner is destroyed
+	cWindow * Window = GetWindow();
+	if (Window != NULL)
+	{
+		Window->OwnerDestroyed();
+	}
+}
+
+
+
+
+
+void cDropSpenserEntity::AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction)
+{
+	switch (a_Direction)
+	{
+		case E_META_DROPSPENSER_FACING_YM: a_BlockY--; return;
+		case E_META_DROPSPENSER_FACING_YP: a_BlockY++; return;
+		case E_META_DROPSPENSER_FACING_ZM: a_BlockZ--; return;
+		case E_META_DROPSPENSER_FACING_ZP: a_BlockZ++; return;
+		case E_META_DROPSPENSER_FACING_XM: a_BlockX--; return;
+		case E_META_DROPSPENSER_FACING_XP: a_BlockX++; return;
+	}
+	LOGWARNING("%s: Unhandled direction: %d", __FUNCTION__, a_Direction);
+	return;
+}
+
+
+
+
+
+void cDropSpenserEntity::DropSpense(cChunk & a_Chunk)
+{
+	// Pick one of the occupied slots:
+	int OccupiedSlots[9];
+	int SlotsCnt = 0;
+	for (int i = m_Contents.GetNumSlots() - 1; i >= 0; i--)
+	{
+		if (!m_Contents.GetSlot(i).IsEmpty())
+		{
+			OccupiedSlots[SlotsCnt] = i;
+			SlotsCnt++;
+		}
+	}  // for i - m_Contents[]
+	
+	if (SlotsCnt == 0)
+	{
+		// Nothing in the dropspenser, play the click sound
+		m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.2f);
+		return;
+	}
+	
+	int RandomSlot = 	m_World->GetTickRandomNumber(SlotsCnt - 1);
+	
+	// DropSpense the item, using the specialized behavior in the subclasses:
+	DropSpenseFromSlot(a_Chunk, OccupiedSlots[RandomSlot]);
+	
+	// Broadcast a smoke and click effects:
+	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
+	int SmokeDir = 0;
+	switch (Meta)
+	{
+		case E_META_DROPSPENSER_FACING_XM: SmokeDir = 3; break;
+		case E_META_DROPSPENSER_FACING_XP: SmokeDir = 5; break;
+		case E_META_DROPSPENSER_FACING_ZM: SmokeDir = 1; break;
+		case E_META_DROPSPENSER_FACING_ZP: SmokeDir = 7; break;
+	}
+	m_World->BroadcastSoundParticleEffect(2000, m_PosX * 8, m_PosY * 8, m_PosZ * 8, SmokeDir);
+	m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.0f);
+	
+	// Update the UI window, if open:
+	cWindow * Window = GetWindow();
+	if (Window != NULL)
+	{
+		Window->BroadcastWholeWindow();
+	}
+}	
+
+
+
+
+
+void cDropSpenserEntity::Activate(void)
+{
+	m_ShouldDropSpense = true;
+}
+
+
+
+
+
+void cDropSpenserEntity::SetRedstonePower(bool a_IsPowered)
+{
+	if (a_IsPowered && !m_IsPowered)
+	{
+		Activate();
+	}
+	m_IsPowered = a_IsPowered;
+}
+
+
+
+
+
+bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk)
+{
+	if (!m_ShouldDropSpense)
+	{
+		return false;
+	}
+	
+	m_ShouldDropSpense = false;
+	DropSpense(a_Chunk);
+	return true;
+}
+
+
+
+
+
+bool cDropSpenserEntity::LoadFromJson(const Json::Value & a_Value)
+{
+	m_PosX = a_Value.get("x", 0).asInt();
+	m_PosY = a_Value.get("y", 0).asInt();
+	m_PosZ = a_Value.get("z", 0).asInt();
+
+	Json::Value AllSlots = a_Value.get("Slots", 0);
+	int SlotIdx = 0;
+	for (Json::Value::iterator itr = AllSlots.begin(); itr != AllSlots.end(); ++itr)
+	{
+		cItem Contents;
+		Contents.FromJson(*itr);
+		m_Contents.SetSlot(SlotIdx, Contents);
+		SlotIdx++;
+		if (SlotIdx >= m_Contents.GetNumSlots())
+		{
+			return true;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+
+void cDropSpenserEntity::SaveToJson(Json::Value & a_Value)
+{
+	a_Value["x"] = m_PosX;
+	a_Value["y"] = m_PosY;
+	a_Value["z"] = m_PosZ;
+
+	Json::Value AllSlots;
+	int NumSlots = m_Contents.GetNumSlots();
+	for (int i = 0; i < NumSlots; i++)
+	{
+		Json::Value Slot;
+		m_Contents.GetSlot(i).GetJson(Slot);
+		AllSlots.append(Slot);
+	}
+	a_Value["Slots"] = AllSlots;
+}
+
+
+
+
+
+void cDropSpenserEntity::SendTo(cClientHandle & a_Client)
+{
+	// Nothing needs to be sent
+	UNUSED(a_Client);
+}
+
+
+
+
+
+void cDropSpenserEntity::UsedBy(cPlayer * a_Player)
+{
+	cWindow * Window = GetWindow();
+	if (Window == NULL)
+	{
+		OpenWindow(new cDropSpenserWindow(m_PosX, m_PosY, m_PosZ, this));
+		Window = GetWindow();
+	}
+	
+	if (Window != NULL)
+	{
+		if (a_Player->GetWindow() != Window)
+		{
+			a_Player->OpenWindow(Window);
+		}
+	}
+}
+
+
+
+
+
+void cDropSpenserEntity::DropFromSlot(cChunk & a_Chunk, int a_SlotNum)
+{
+	int DispX = m_PosX;
+	int DispY = m_PosY;
+	int DispZ = m_PosZ;
+	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
+	AddDropSpenserDir(DispX, DispY, DispZ, Meta);
+
+	cItems Pickups;
+	Pickups.push_back(m_Contents.RemoveOneItem(a_SlotNum));
+	m_World->SpawnItemPickups(Pickups, DispX, DispY, DispZ);
+}
+
+
+
+
diff --git a/source/BlockEntities/DropSpenserEntity.h b/source/BlockEntities/DropSpenserEntity.h
index ca9f7dfa3..f2f1eba36 100644
--- a/source/BlockEntities/DropSpenserEntity.h
+++ b/source/BlockEntities/DropSpenserEntity.h
@@ -1,89 +1,89 @@
-

-// DropSpenser.h

-

-// Declares the cDropSpenser class representing a common ancestor to the cDispenserEntity and cDropperEntity

-// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior

-

-

-

-

-

-#pragma once

-

-#include "BlockEntityWithItems.h"

-#include "../UI/WindowOwner.h"

-

-

-

-

-

-namespace Json

-{

-	class Value;

-}

-

-class cClientHandle;

-class cServer;

-

-

-

-

-

-// tolua_begin

-class cDropSpenserEntity :

-	public cBlockEntityWithItems,

-	public cBlockEntityWindowOwner

-{

-	typedef cBlockEntityWithItems super;

-

-public:

-	enum {

-		ContentsHeight = 3,

-		ContentsWidth  = 3,

-	} ;

-	

-	// tolua_end

-	

-	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"; }

-

-	bool LoadFromJson(const Json::Value & a_Value);

-	

-	// cBlockEntity overrides:

-	virtual void SaveToJson(Json::Value & a_Value) override;

-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;

-	virtual void SendTo(cClientHandle & a_Client) override;

-	virtual void UsedBy(cPlayer * a_Player) override;

-	

-	// tolua_begin

-	

-	/// Modifies the block coords to match the dropspenser direction given (where the dropspensed pickups should materialize)

-	void AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction);

-

-	/// Sets the dropspenser to dropspense an item in the next tick

-	void Activate(void);

-	

-	/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate

-	void SetRedstonePower(bool a_IsPowered);

-	

-	// tolua_end

-

-protected:

-	bool m_ShouldDropSpense;  ///< If true, the dropspenser will dropspense an item in the next tick

-	bool m_IsPowered;         ///< Set to true when the dropspenser receives redstone power.

-	

-	/// Does the actual work on dropspensing an item. Chooses the slot, calls DropSpenseFromSlot() and handles smoke / sound effects

-	void DropSpense(cChunk & a_Chunk);

-	

-	/// Override this function to provide the specific behavior for item dropspensing (drop / shoot / pour / ...)

-	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) = 0;

-	

-	/// Helper function, drops one item from the specified slot (like a dropper)

-	void DropFromSlot(cChunk & a_Chunk, int a_SlotNum);

-} ;  // tolua_export

-

-

-

-

+
+// DropSpenser.h
+
+// Declares the cDropSpenser class representing a common ancestor to the cDispenserEntity and cDropperEntity
+// The dropper and dispenser only needs to override the DropSpenseFromSlot() function to provide the specific item behavior
+
+
+
+
+
+#pragma once
+
+#include "BlockEntityWithItems.h"
+#include "../UI/WindowOwner.h"
+
+
+
+
+
+namespace Json
+{
+	class Value;
+}
+
+class cClientHandle;
+class cServer;
+
+
+
+
+
+// tolua_begin
+class cDropSpenserEntity :
+	public cBlockEntityWithItems,
+	public cBlockEntityWindowOwner
+{
+	typedef cBlockEntityWithItems super;
+
+public:
+	enum {
+		ContentsHeight = 3,
+		ContentsWidth  = 3,
+	} ;
+	
+	// tolua_end
+	
+	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"; }
+
+	bool LoadFromJson(const Json::Value & a_Value);
+	
+	// cBlockEntity overrides:
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
+	
+	// tolua_begin
+	
+	/// Modifies the block coords to match the dropspenser direction given (where the dropspensed pickups should materialize)
+	void AddDropSpenserDir(int & a_BlockX, int & a_BlockY, int & a_BlockZ, NIBBLETYPE a_Direction);
+
+	/// Sets the dropspenser to dropspense an item in the next tick
+	void Activate(void);
+	
+	/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
+	void SetRedstonePower(bool a_IsPowered);
+	
+	// tolua_end
+
+protected:
+	bool m_ShouldDropSpense;  ///< If true, the dropspenser will dropspense an item in the next tick
+	bool m_IsPowered;         ///< Set to true when the dropspenser receives redstone power.
+	
+	/// Does the actual work on dropspensing an item. Chooses the slot, calls DropSpenseFromSlot() and handles smoke / sound effects
+	void DropSpense(cChunk & a_Chunk);
+	
+	/// Override this function to provide the specific behavior for item dropspensing (drop / shoot / pour / ...)
+	virtual void DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) = 0;
+	
+	/// Helper function, drops one item from the specified slot (like a dropper)
+	void DropFromSlot(cChunk & a_Chunk, int a_SlotNum);
+} ;  // tolua_export
+
+
+
+
diff --git a/source/BlockEntities/DropperEntity.cpp b/source/BlockEntities/DropperEntity.cpp
index ebb52c8a1..44d679e02 100644
--- a/source/BlockEntities/DropperEntity.cpp
+++ b/source/BlockEntities/DropperEntity.cpp
@@ -1,42 +1,42 @@
-

-// DropperEntity.cpp

-

-// Implements the cRtopperEntity class representing a Dropper block entity

-

-#include "Globals.h"

-#include "DropperEntity.h"

-#include "../Player.h"

-#include "../Simulator/FluidSimulator.h"

-

-

-

-

-

-cDropperEntity::cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :

-	super(E_BLOCK_DROPPER, a_BlockX, a_BlockY, a_BlockZ, NULL)

-{

-	SetBlockEntity(this);  // cBlockEntityWindowOwner

-}

-

-

-

-

-

-cDropperEntity::cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :

-	super(E_BLOCK_DROPPER, a_BlockX, a_BlockY, a_BlockZ, a_World)

-{

-	SetBlockEntity(this);  // cBlockEntityWindowOwner

-}

-

-

-

-

-

-void cDropperEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)

-{

-	DropFromSlot(a_Chunk, a_SlotNum);

-}

-

-

-

-

+
+// DropperEntity.cpp
+
+// Implements the cRtopperEntity class representing a Dropper block entity
+
+#include "Globals.h"
+#include "DropperEntity.h"
+#include "../Player.h"
+#include "../Simulator/FluidSimulator.h"
+
+
+
+
+
+cDropperEntity::cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
+	super(E_BLOCK_DROPPER, a_BlockX, a_BlockY, a_BlockZ, NULL)
+{
+	SetBlockEntity(this);  // cBlockEntityWindowOwner
+}
+
+
+
+
+
+cDropperEntity::cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
+	super(E_BLOCK_DROPPER, a_BlockX, a_BlockY, a_BlockZ, a_World)
+{
+	SetBlockEntity(this);  // cBlockEntityWindowOwner
+}
+
+
+
+
+
+void cDropperEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum)
+{
+	DropFromSlot(a_Chunk, a_SlotNum);
+}
+
+
+
+
diff --git a/source/BlockEntities/DropperEntity.h b/source/BlockEntities/DropperEntity.h
index ed29bfe95..af74e7f7c 100644
--- a/source/BlockEntities/DropperEntity.h
+++ b/source/BlockEntities/DropperEntity.h
@@ -1,49 +1,49 @@
-

-// DropperEntity.h

-

-// Declares the cDropperEntity class representing a dropper block entity

-

-

-

-

-

-#pragma once

-

-#include "DropSpenserEntity.h"

-

-

-

-

-

-// tolua_begin

-class cDropperEntity :

-	public cDropSpenserEntity

-{

-	typedef cDropSpenserEntity super;

-	

-public:

-

-	/// Constructor used while generating a chunk; sets m_World to NULL

-	cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ);

-	

-	// tolua_end

-	

-	/// 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;

-	

-	/** Takes an item from slot a_SlotNum and puts it into the container in front of the dropper.

-	Called when there's a container directly in front of the dropper,

-	so the dropper should store items there, rather than dropping.

-	*/

-	void PutIntoContainer(cChunk & a_Chunk, int a_SlotNum, BLOCKTYPE a_ContainerBlock, int a_ContainerX, int a_ContainerY, int a_ContainerZ);

-} ;  // tolua_export

-

-

-

-

+
+// DropperEntity.h
+
+// Declares the cDropperEntity class representing a dropper block entity
+
+
+
+
+
+#pragma once
+
+#include "DropSpenserEntity.h"
+
+
+
+
+
+// tolua_begin
+class cDropperEntity :
+	public cDropSpenserEntity
+{
+	typedef cDropSpenserEntity super;
+	
+public:
+
+	/// Constructor used while generating a chunk; sets m_World to NULL
+	cDropperEntity(int a_BlockX, int a_BlockY, int a_BlockZ);
+	
+	// tolua_end
+	
+	/// 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;
+	
+	/** Takes an item from slot a_SlotNum and puts it into the container in front of the dropper.
+	Called when there's a container directly in front of the dropper,
+	so the dropper should store items there, rather than dropping.
+	*/
+	void PutIntoContainer(cChunk & a_Chunk, int a_SlotNum, BLOCKTYPE a_ContainerBlock, int a_ContainerX, int a_ContainerY, int a_ContainerZ);
+} ;  // tolua_export
+
+
+
+
diff --git a/source/BlockEntities/HopperEntity.cpp b/source/BlockEntities/HopperEntity.cpp
index 3fadf727c..23e4b8096 100644
--- a/source/BlockEntities/HopperEntity.cpp
+++ b/source/BlockEntities/HopperEntity.cpp
@@ -1,523 +1,523 @@
-

-// HopperEntity.cpp

-

-// Implements the cHopperEntity representing a hopper block entity

-

-#include "Globals.h"

-#include "HopperEntity.h"

-#include "../Chunk.h"

-#include "../Player.h"

-#include "ChestEntity.h"

-#include "DropSpenserEntity.h"

-#include "FurnaceEntity.h"

-

-

-

-

-

-cHopperEntity::cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :

-	super(E_BLOCK_HOPPER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL),

-	m_LastMoveItemsInTick(0),

-	m_LastMoveItemsOutTick(0)

-{

-}

-

-

-

-

-

-cHopperEntity::cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :

-	super(E_BLOCK_HOPPER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),

-	m_LastMoveItemsInTick(0),

-	m_LastMoveItemsOutTick(0)

-{

-}

-

-

-

-

-

-/** Returns the block coords of the block receiving the output items, based on the meta

-Returns false if unattached

-*/

-bool cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ)

-{

-	a_OutputX = m_PosX;

-	a_OutputY = m_PosY;

-	a_OutputZ = m_PosZ;

-	switch (a_BlockMeta)

-	{

-		case E_META_HOPPER_FACING_XM: a_OutputX--; return true;

-		case E_META_HOPPER_FACING_XP: a_OutputX++; return true;

-		case E_META_HOPPER_FACING_YM: a_OutputY--; return true;

-		case E_META_HOPPER_FACING_ZM: a_OutputZ--; return true;

-		case E_META_HOPPER_FACING_ZP: a_OutputZ++; return true;

-		default:

-		{

-			// Not attached

-			return false;

-		}

-	}

-}

-

-

-

-

-

-bool cHopperEntity::Tick(float a_Dt, cChunk & a_Chunk)

-{

-	Int64 CurrentTick = a_Chunk.GetWorld()->GetWorldAge();

-	

-	bool res = false;

-	res = MoveItemsIn  (a_Chunk, CurrentTick) || res;

-	res = MovePickupsIn(a_Chunk, CurrentTick) || res;

-	res = MoveItemsOut (a_Chunk, CurrentTick) || res;

-	return res;

-}

-

-

-

-

-

-void cHopperEntity::SaveToJson(Json::Value & a_Value)

-{

-	// TODO

-	LOGWARNING("%s: Not implemented yet", __FUNCTION__);

-}

-

-

-

-

-

-void cHopperEntity::SendTo(cClientHandle & a_Client)

-{

-	// The hopper entity doesn't need anything sent to the client when it's created / gets in the viewdistance

-	// All the actual handling is in the cWindow UI code that gets called when the hopper is rclked

-	

-	UNUSED(a_Client);

-}

-

-

-

-

-

-void cHopperEntity::UsedBy(cPlayer * a_Player)

-{

-	// If the window is not created, open it anew:

-	cWindow * Window = GetWindow();

-	if (Window == NULL)

-	{

-		OpenNewWindow();

-		Window = GetWindow();

-	}

-	

-	// Open the window for the player:

-	if (Window != NULL)

-	{

-		if (a_Player->GetWindow() != Window)

-		{

-			a_Player->OpenWindow(Window);

-		}

-	}

-

-	// This is rather a hack

-	// Instead of marking the chunk as dirty upon chest contents change, we mark it dirty now

-	// We cannot properly detect contents change, but such a change doesn't happen without a player opening the chest first.

-	// The few false positives aren't much to worry about

-	int ChunkX, ChunkZ;

-	cChunkDef::BlockToChunk(m_PosX, m_PosY, m_PosZ, ChunkX, ChunkZ);

-	m_World->MarkChunkDirty(ChunkX, ChunkZ);

-}

-

-

-

-

-

-/// Opens a new window UI for this hopper

-void cHopperEntity::OpenNewWindow(void)

-{

-	OpenWindow(new cHopperWindow(m_PosX, m_PosY, m_PosZ, this));

-}

-

-

-

-

-

-/// Moves items from the container above it into this hopper. Returns true if the contents have changed.

-bool cHopperEntity::MoveItemsIn(cChunk & a_Chunk, Int64 a_CurrentTick)

-{

-	if (m_PosY >= cChunkDef::Height)

-	{

-		// This hopper is at the top of the world, no more blocks above

-		return false;

-	}

-

-	if (a_CurrentTick - m_LastMoveItemsInTick < TICKS_PER_TRANSFER)

-	{

-		// Too early after the previous transfer

-		return false;

-	}

-	

-	// Try moving an item in:

-	bool res = false;

-	switch (a_Chunk.GetBlock(m_RelX, m_PosY + 1, m_RelZ))

-	{

-		case E_BLOCK_CHEST:       res = MoveItemsFromChest(a_Chunk); break;

-		case E_BLOCK_FURNACE:     res = MoveItemsFromFurnace(a_Chunk); break;

-		case E_BLOCK_DISPENSER:

-		case E_BLOCK_DROPPER:     res = MoveItemsFromGrid(((cDropSpenserEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()); break;

-		case E_BLOCK_HOPPER:      res = MoveItemsFromGrid(((cHopperEntity *)     a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()); break;

-		case E_BLOCK_LIT_FURNACE: res = MoveItemsFromFurnace(a_Chunk); break;

-	}

-	

-	// If the item has been moved, reset the last tick:

-	if (res)

-	{

-		m_LastMoveItemsInTick = a_CurrentTick;

-	}

-	

-	return res;

-}

-

-

-

-

-

-/// Moves pickups from above this hopper into it. Returns true if the contents have changed.

-bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)

-{

-	// TODO

-	return false;

-}

-

-

-

-

-

-/// Moves items out from this hopper into the destination. Returns true if the contents have changed.

-bool cHopperEntity::MoveItemsOut(cChunk & a_Chunk, Int64 a_CurrentTick)

-{

-	if (a_CurrentTick - m_LastMoveItemsOutTick < TICKS_PER_TRANSFER)

-	{

-		// Too early after the previous transfer

-		return false;

-	}

-	

-	int bx, by, bz;

-	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);

-	if (!GetOutputBlockPos(Meta, bx, by, bz))

-	{

-		// Not attached to another container

-		return false;

-	}

-	if (by < 0)

-	{

-		// Cannot output below the zero-th block level

-		return false;

-	}

-	

-	// Convert coords to relative:

-	int rx = bx - a_Chunk.GetPosX() * cChunkDef::Width;

-	int rz = bz - a_Chunk.GetPosZ() * cChunkDef::Width;

-	cChunk * DestChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(rx, rz);

-	if (DestChunk == NULL)

-	{

-		// The destination chunk has been unloaded, don't tick

-		return false;

-	}

-	

-	// Call proper moving function, based on the blocktype present at the coords:

-	bool res = false;

-	switch (DestChunk->GetBlock(rx, by, rz))

-	{

-		case E_BLOCK_CHEST:       res = MoveItemsToChest(*DestChunk, bx, by, bz); break;

-		case E_BLOCK_FURNACE:     res = MoveItemsToFurnace(*DestChunk, bx, by, bz, Meta); break;

-		case E_BLOCK_DISPENSER:

-		case E_BLOCK_DROPPER:     res = MoveItemsToGrid(((cDropSpenserEntity *)DestChunk->GetBlockEntity(bx, by, bz))->GetContents()); break;

-		case E_BLOCK_HOPPER:      res = MoveItemsToGrid(((cHopperEntity *)     DestChunk->GetBlockEntity(bx, by, bz))->GetContents()); break;

-		case E_BLOCK_LIT_FURNACE: res = MoveItemsToFurnace(*DestChunk, bx, by, bz, Meta); break;

-	}

-	

-	// If the item has been moved, reset the last tick:

-	if (res)

-	{

-		m_LastMoveItemsOutTick = a_CurrentTick;

-	}

-	

-	return res;

-}

-

-

-

-

-

-/// Moves items from a chest (dblchest) above the hopper into this hopper. Returns true if contents have changed.

-bool cHopperEntity::MoveItemsFromChest(cChunk & a_Chunk)

-{

-	if (MoveItemsFromGrid(((cChestEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()))

-	{

-		// Moved the item from the chest directly above the hopper

-		return true;

-	}

-	

-	// Check if the chest is a double-chest, if so, try to move from there:

-	static const struct

-	{

-		int x, z;

-	}

-	Coords [] =

-	{

-		{1, 0},

-		{-1, 0},

-		{0, 1},

-		{0, -1},

-	} ;

-	for (int i = 0; i < ARRAYCOUNT(Coords); i++)

-	{

-		int x = m_RelX + Coords[i].x;

-		int z = m_RelZ + Coords[i].z;

-		cChunk * Neighbor = a_Chunk.GetRelNeighborChunkAdjustCoords(x, z);

-		if (

-			(Neighbor == NULL) ||

-			(Neighbor->GetBlock(x, m_PosY + 1, z) != E_BLOCK_CHEST)

-		)

-		{

-			continue;

-		}

-		if (MoveItemsFromGrid(((cChestEntity *)Neighbor->GetBlockEntity(x, m_PosY, z))->GetContents()))

-		{

-			return true;

-		}

-		return false;

-	}

-	

-	// The chest was single and nothing could be moved

-	return false;

-}

-

-

-

-

-

-/// Moves items from a furnace above the hopper into this hopper. Returns true if contents have changed.

-bool cHopperEntity::MoveItemsFromFurnace(cChunk & a_Chunk)

-{

-	cFurnaceEntity * Furnace = (cFurnaceEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ);

-	ASSERT(Furnace != NULL);

-	

-	// Try move from the output slot:

-	if (MoveItemsFromSlot(Furnace->GetOutputSlot(), true))

-	{

-		cItem NewOutput(Furnace->GetOutputSlot());

-		Furnace->SetOutputSlot(NewOutput.AddCount(-1));

-		return true;

-	}

-	

-	// No output moved, check if we can move an empty bucket out of the fuel slot:

-	if (Furnace->GetFuelSlot().m_ItemType == E_ITEM_BUCKET)

-	{

-		if (MoveItemsFromSlot(Furnace->GetFuelSlot(), true))

-		{

-			Furnace->SetFuelSlot(cItem());

-			return true;

-		}

-	}

-	

-	// Nothing can be moved

-	return false;

-}

-

-

-

-

-

-/// Moves items from the specified ItemGrid into this hopper. Returns true if contents have changed.

-bool cHopperEntity::MoveItemsFromGrid(cItemGrid & a_Grid)

-{

-	int NumSlots = a_Grid.GetNumSlots();

-	

-	// First try adding items of types already in the hopper:

-	for (int i = 0; i < NumSlots; i++)

-	{

-		if (a_Grid.IsSlotEmpty(i))

-		{

-			continue;

-		}

-		if (MoveItemsFromSlot(a_Grid.GetSlot(i), false))

-		{

-			a_Grid.ChangeSlotCount(i, -1);

-			return true;

-		}

-	}

-

-	// No already existing stack can be topped up, try again with allowing new stacks:

-	for (int i = 0; i < NumSlots; i++)

-	{

-		if (a_Grid.IsSlotEmpty(i))

-		{

-			continue;

-		}

-		if (MoveItemsFromSlot(a_Grid.GetSlot(i), true))

-		{

-			a_Grid.ChangeSlotCount(i, -1);

-			return true;

-		}

-	}

-	return false;

-}

-

-

-

-

-

-/// Moves one of the specified itemstack into this hopper. Returns true if contents have changed. Doesn't change the itemstack.

-bool cHopperEntity::MoveItemsFromSlot(const cItem & a_ItemStack, bool a_AllowNewStacks)

-{

-	cItem One(a_ItemStack.CopyOne());

-	if (m_Contents.AddItem(One, a_AllowNewStacks) > 0)

-	{

-		return true;

-	}

-	return false;

-}

-

-

-

-

-

-/// Moves items to the chest at the specified coords. Returns true if contents have changed

-bool cHopperEntity::MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ)

-{

-	// Try the chest directly connected to the hopper:

-	if (MoveItemsToGrid(((cChestEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ))->GetContents()))

-	{

-		return true;

-	}

-

-	// Check if the chest is a double-chest, if so, try to move into the other half:

-	static const struct

-	{

-		int x, z;

-	}

-	Coords [] =

-	{

-		{1, 0},

-		{-1, 0},

-		{0, 1},

-		{0, -1},

-	} ;

-	for (int i = 0; i < ARRAYCOUNT(Coords); i++)

-	{

-		int x = m_RelX + Coords[i].x;

-		int z = m_RelZ + Coords[i].z;

-		cChunk * Neighbor = a_Chunk.GetRelNeighborChunkAdjustCoords(x, z);

-		if (

-			(Neighbor == NULL) ||

-			(Neighbor->GetBlock(x, m_PosY + 1, z) != E_BLOCK_CHEST)

-		)

-		{

-			continue;

-		}

-		if (MoveItemsToGrid(((cChestEntity *)Neighbor->GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ))->GetContents()))

-		{

-			return true;

-		}

-		return false;

-	}

-	

-	// The chest was single and nothing could be moved

-	return false;

-}

-

-

-

-

-

-/// Moves items to the furnace at the specified coords. Returns true if contents have changed

-bool cHopperEntity::MoveItemsToFurnace(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_HopperMeta)

-{

-	cFurnaceEntity * Furnace = (cFurnaceEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ);

-	if (a_HopperMeta == E_META_HOPPER_FACING_YM)

-	{

-		// Feed the input slot of the furnace

-		return MoveItemsToSlot(Furnace->GetContents(), cFurnaceEntity::fsInput);

-	}

-	else

-	{

-		// Feed the fuel slot of the furnace

-		return MoveItemsToSlot(Furnace->GetContents(), cFurnaceEntity::fsFuel);

-	}

-	return false;

-}

-

-

-

-

-

-/// Moves items to the specified ItemGrid. Returns true if contents have changed

-bool cHopperEntity::MoveItemsToGrid(cItemGrid & a_ItemGrid)

-{

-	// Iterate through our slots, try to move from each one:

-	for (int i = 0; i < ContentsWidth * ContentsHeight; i++)

-	{

-		const cItem & SrcItem = m_Contents.GetSlot(i);

-		if (SrcItem.IsEmpty())

-		{

-			continue;

-		}

-		

-		cItem ToAdd = SrcItem.CopyOne();

-		if (a_ItemGrid.AddItem(ToAdd) > 0)

-		{

-			m_Contents.ChangeSlotCount(i, -1);

-			return true;

-		}

-	}

-	return false;

-}

-

-

-

-

-

-/// Moves one piece to the specified ItemGrid's slot. Returns true if contents have changed.

-bool cHopperEntity::MoveItemsToSlot(cItemGrid & a_ItemGrid, int a_DestSlotNum)

-{

-	if (a_ItemGrid.IsSlotEmpty(a_DestSlotNum))

-	{

-		// The slot is empty, move the first non-empty slot from our contents:

-		for (int i = 0; i < ContentsWidth * ContentsHeight; i++)

-		{

-			if (!m_Contents.IsSlotEmpty(i))

-			{

-				a_ItemGrid.SetSlot(a_DestSlotNum, m_Contents.GetSlot(i).CopyOne());

-				m_Contents.ChangeSlotCount(i, -1);

-				return true;

-			}

-		}

-		return false;

-	}

-	else

-	{

-		// The slot is taken, try to top it up:

-		const cItem & DestSlot = a_ItemGrid.GetSlot(a_DestSlotNum);

-		if (DestSlot.IsFullStack())

-		{

-			return false;

-		}

-		for (int i = 0; i < ContentsWidth * ContentsHeight; i++)

-		{

-			if (m_Contents.GetSlot(i).IsStackableWith(DestSlot))

-			{

-				a_ItemGrid.ChangeSlotCount(a_DestSlotNum, 1);

-				m_Contents.ChangeSlotCount(i, -1);

-				return true;

-			}

-		}

-		return false;

-	}

-}

-

-

-

-

+
+// HopperEntity.cpp
+
+// Implements the cHopperEntity representing a hopper block entity
+
+#include "Globals.h"
+#include "HopperEntity.h"
+#include "../Chunk.h"
+#include "../Player.h"
+#include "ChestEntity.h"
+#include "DropSpenserEntity.h"
+#include "FurnaceEntity.h"
+
+
+
+
+
+cHopperEntity::cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
+	super(E_BLOCK_HOPPER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL),
+	m_LastMoveItemsInTick(0),
+	m_LastMoveItemsOutTick(0)
+{
+}
+
+
+
+
+
+cHopperEntity::cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
+	super(E_BLOCK_HOPPER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
+	m_LastMoveItemsInTick(0),
+	m_LastMoveItemsOutTick(0)
+{
+}
+
+
+
+
+
+/** Returns the block coords of the block receiving the output items, based on the meta
+Returns false if unattached
+*/
+bool cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ)
+{
+	a_OutputX = m_PosX;
+	a_OutputY = m_PosY;
+	a_OutputZ = m_PosZ;
+	switch (a_BlockMeta)
+	{
+		case E_META_HOPPER_FACING_XM: a_OutputX--; return true;
+		case E_META_HOPPER_FACING_XP: a_OutputX++; return true;
+		case E_META_HOPPER_FACING_YM: a_OutputY--; return true;
+		case E_META_HOPPER_FACING_ZM: a_OutputZ--; return true;
+		case E_META_HOPPER_FACING_ZP: a_OutputZ++; return true;
+		default:
+		{
+			// Not attached
+			return false;
+		}
+	}
+}
+
+
+
+
+
+bool cHopperEntity::Tick(float a_Dt, cChunk & a_Chunk)
+{
+	Int64 CurrentTick = a_Chunk.GetWorld()->GetWorldAge();
+	
+	bool res = false;
+	res = MoveItemsIn  (a_Chunk, CurrentTick) || res;
+	res = MovePickupsIn(a_Chunk, CurrentTick) || res;
+	res = MoveItemsOut (a_Chunk, CurrentTick) || res;
+	return res;
+}
+
+
+
+
+
+void cHopperEntity::SaveToJson(Json::Value & a_Value)
+{
+	// TODO
+	LOGWARNING("%s: Not implemented yet", __FUNCTION__);
+}
+
+
+
+
+
+void cHopperEntity::SendTo(cClientHandle & a_Client)
+{
+	// The hopper entity doesn't need anything sent to the client when it's created / gets in the viewdistance
+	// All the actual handling is in the cWindow UI code that gets called when the hopper is rclked
+	
+	UNUSED(a_Client);
+}
+
+
+
+
+
+void cHopperEntity::UsedBy(cPlayer * a_Player)
+{
+	// If the window is not created, open it anew:
+	cWindow * Window = GetWindow();
+	if (Window == NULL)
+	{
+		OpenNewWindow();
+		Window = GetWindow();
+	}
+	
+	// Open the window for the player:
+	if (Window != NULL)
+	{
+		if (a_Player->GetWindow() != Window)
+		{
+			a_Player->OpenWindow(Window);
+		}
+	}
+
+	// This is rather a hack
+	// Instead of marking the chunk as dirty upon chest contents change, we mark it dirty now
+	// We cannot properly detect contents change, but such a change doesn't happen without a player opening the chest first.
+	// The few false positives aren't much to worry about
+	int ChunkX, ChunkZ;
+	cChunkDef::BlockToChunk(m_PosX, m_PosY, m_PosZ, ChunkX, ChunkZ);
+	m_World->MarkChunkDirty(ChunkX, ChunkZ);
+}
+
+
+
+
+
+/// Opens a new window UI for this hopper
+void cHopperEntity::OpenNewWindow(void)
+{
+	OpenWindow(new cHopperWindow(m_PosX, m_PosY, m_PosZ, this));
+}
+
+
+
+
+
+/// Moves items from the container above it into this hopper. Returns true if the contents have changed.
+bool cHopperEntity::MoveItemsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
+{
+	if (m_PosY >= cChunkDef::Height)
+	{
+		// This hopper is at the top of the world, no more blocks above
+		return false;
+	}
+
+	if (a_CurrentTick - m_LastMoveItemsInTick < TICKS_PER_TRANSFER)
+	{
+		// Too early after the previous transfer
+		return false;
+	}
+	
+	// Try moving an item in:
+	bool res = false;
+	switch (a_Chunk.GetBlock(m_RelX, m_PosY + 1, m_RelZ))
+	{
+		case E_BLOCK_CHEST:       res = MoveItemsFromChest(a_Chunk); break;
+		case E_BLOCK_FURNACE:     res = MoveItemsFromFurnace(a_Chunk); break;
+		case E_BLOCK_DISPENSER:
+		case E_BLOCK_DROPPER:     res = MoveItemsFromGrid(((cDropSpenserEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()); break;
+		case E_BLOCK_HOPPER:      res = MoveItemsFromGrid(((cHopperEntity *)     a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()); break;
+		case E_BLOCK_LIT_FURNACE: res = MoveItemsFromFurnace(a_Chunk); break;
+	}
+	
+	// If the item has been moved, reset the last tick:
+	if (res)
+	{
+		m_LastMoveItemsInTick = a_CurrentTick;
+	}
+	
+	return res;
+}
+
+
+
+
+
+/// Moves pickups from above this hopper into it. Returns true if the contents have changed.
+bool cHopperEntity::MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick)
+{
+	// TODO
+	return false;
+}
+
+
+
+
+
+/// Moves items out from this hopper into the destination. Returns true if the contents have changed.
+bool cHopperEntity::MoveItemsOut(cChunk & a_Chunk, Int64 a_CurrentTick)
+{
+	if (a_CurrentTick - m_LastMoveItemsOutTick < TICKS_PER_TRANSFER)
+	{
+		// Too early after the previous transfer
+		return false;
+	}
+	
+	int bx, by, bz;
+	NIBBLETYPE Meta = a_Chunk.GetMeta(m_RelX, m_PosY, m_RelZ);
+	if (!GetOutputBlockPos(Meta, bx, by, bz))
+	{
+		// Not attached to another container
+		return false;
+	}
+	if (by < 0)
+	{
+		// Cannot output below the zero-th block level
+		return false;
+	}
+	
+	// Convert coords to relative:
+	int rx = bx - a_Chunk.GetPosX() * cChunkDef::Width;
+	int rz = bz - a_Chunk.GetPosZ() * cChunkDef::Width;
+	cChunk * DestChunk = a_Chunk.GetRelNeighborChunkAdjustCoords(rx, rz);
+	if (DestChunk == NULL)
+	{
+		// The destination chunk has been unloaded, don't tick
+		return false;
+	}
+	
+	// Call proper moving function, based on the blocktype present at the coords:
+	bool res = false;
+	switch (DestChunk->GetBlock(rx, by, rz))
+	{
+		case E_BLOCK_CHEST:       res = MoveItemsToChest(*DestChunk, bx, by, bz); break;
+		case E_BLOCK_FURNACE:     res = MoveItemsToFurnace(*DestChunk, bx, by, bz, Meta); break;
+		case E_BLOCK_DISPENSER:
+		case E_BLOCK_DROPPER:     res = MoveItemsToGrid(((cDropSpenserEntity *)DestChunk->GetBlockEntity(bx, by, bz))->GetContents()); break;
+		case E_BLOCK_HOPPER:      res = MoveItemsToGrid(((cHopperEntity *)     DestChunk->GetBlockEntity(bx, by, bz))->GetContents()); break;
+		case E_BLOCK_LIT_FURNACE: res = MoveItemsToFurnace(*DestChunk, bx, by, bz, Meta); break;
+	}
+	
+	// If the item has been moved, reset the last tick:
+	if (res)
+	{
+		m_LastMoveItemsOutTick = a_CurrentTick;
+	}
+	
+	return res;
+}
+
+
+
+
+
+/// Moves items from a chest (dblchest) above the hopper into this hopper. Returns true if contents have changed.
+bool cHopperEntity::MoveItemsFromChest(cChunk & a_Chunk)
+{
+	if (MoveItemsFromGrid(((cChestEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ))->GetContents()))
+	{
+		// Moved the item from the chest directly above the hopper
+		return true;
+	}
+	
+	// Check if the chest is a double-chest, if so, try to move from there:
+	static const struct
+	{
+		int x, z;
+	}
+	Coords [] =
+	{
+		{1, 0},
+		{-1, 0},
+		{0, 1},
+		{0, -1},
+	} ;
+	for (int i = 0; i < ARRAYCOUNT(Coords); i++)
+	{
+		int x = m_RelX + Coords[i].x;
+		int z = m_RelZ + Coords[i].z;
+		cChunk * Neighbor = a_Chunk.GetRelNeighborChunkAdjustCoords(x, z);
+		if (
+			(Neighbor == NULL) ||
+			(Neighbor->GetBlock(x, m_PosY + 1, z) != E_BLOCK_CHEST)
+		)
+		{
+			continue;
+		}
+		if (MoveItemsFromGrid(((cChestEntity *)Neighbor->GetBlockEntity(x, m_PosY, z))->GetContents()))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	// The chest was single and nothing could be moved
+	return false;
+}
+
+
+
+
+
+/// Moves items from a furnace above the hopper into this hopper. Returns true if contents have changed.
+bool cHopperEntity::MoveItemsFromFurnace(cChunk & a_Chunk)
+{
+	cFurnaceEntity * Furnace = (cFurnaceEntity *)a_Chunk.GetBlockEntity(m_PosX, m_PosY + 1, m_PosZ);
+	ASSERT(Furnace != NULL);
+	
+	// Try move from the output slot:
+	if (MoveItemsFromSlot(Furnace->GetOutputSlot(), true))
+	{
+		cItem NewOutput(Furnace->GetOutputSlot());
+		Furnace->SetOutputSlot(NewOutput.AddCount(-1));
+		return true;
+	}
+	
+	// No output moved, check if we can move an empty bucket out of the fuel slot:
+	if (Furnace->GetFuelSlot().m_ItemType == E_ITEM_BUCKET)
+	{
+		if (MoveItemsFromSlot(Furnace->GetFuelSlot(), true))
+		{
+			Furnace->SetFuelSlot(cItem());
+			return true;
+		}
+	}
+	
+	// Nothing can be moved
+	return false;
+}
+
+
+
+
+
+/// Moves items from the specified ItemGrid into this hopper. Returns true if contents have changed.
+bool cHopperEntity::MoveItemsFromGrid(cItemGrid & a_Grid)
+{
+	int NumSlots = a_Grid.GetNumSlots();
+	
+	// First try adding items of types already in the hopper:
+	for (int i = 0; i < NumSlots; i++)
+	{
+		if (a_Grid.IsSlotEmpty(i))
+		{
+			continue;
+		}
+		if (MoveItemsFromSlot(a_Grid.GetSlot(i), false))
+		{
+			a_Grid.ChangeSlotCount(i, -1);
+			return true;
+		}
+	}
+
+	// No already existing stack can be topped up, try again with allowing new stacks:
+	for (int i = 0; i < NumSlots; i++)
+	{
+		if (a_Grid.IsSlotEmpty(i))
+		{
+			continue;
+		}
+		if (MoveItemsFromSlot(a_Grid.GetSlot(i), true))
+		{
+			a_Grid.ChangeSlotCount(i, -1);
+			return true;
+		}
+	}
+	return false;
+}
+
+
+
+
+
+/// Moves one of the specified itemstack into this hopper. Returns true if contents have changed. Doesn't change the itemstack.
+bool cHopperEntity::MoveItemsFromSlot(const cItem & a_ItemStack, bool a_AllowNewStacks)
+{
+	cItem One(a_ItemStack.CopyOne());
+	if (m_Contents.AddItem(One, a_AllowNewStacks) > 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+
+
+
+
+/// Moves items to the chest at the specified coords. Returns true if contents have changed
+bool cHopperEntity::MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ)
+{
+	// Try the chest directly connected to the hopper:
+	if (MoveItemsToGrid(((cChestEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ))->GetContents()))
+	{
+		return true;
+	}
+
+	// Check if the chest is a double-chest, if so, try to move into the other half:
+	static const struct
+	{
+		int x, z;
+	}
+	Coords [] =
+	{
+		{1, 0},
+		{-1, 0},
+		{0, 1},
+		{0, -1},
+	} ;
+	for (int i = 0; i < ARRAYCOUNT(Coords); i++)
+	{
+		int x = m_RelX + Coords[i].x;
+		int z = m_RelZ + Coords[i].z;
+		cChunk * Neighbor = a_Chunk.GetRelNeighborChunkAdjustCoords(x, z);
+		if (
+			(Neighbor == NULL) ||
+			(Neighbor->GetBlock(x, m_PosY + 1, z) != E_BLOCK_CHEST)
+		)
+		{
+			continue;
+		}
+		if (MoveItemsToGrid(((cChestEntity *)Neighbor->GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ))->GetContents()))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	// The chest was single and nothing could be moved
+	return false;
+}
+
+
+
+
+
+/// Moves items to the furnace at the specified coords. Returns true if contents have changed
+bool cHopperEntity::MoveItemsToFurnace(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_HopperMeta)
+{
+	cFurnaceEntity * Furnace = (cFurnaceEntity *)a_Chunk.GetBlockEntity(a_BlockX, a_BlockY, a_BlockZ);
+	if (a_HopperMeta == E_META_HOPPER_FACING_YM)
+	{
+		// Feed the input slot of the furnace
+		return MoveItemsToSlot(Furnace->GetContents(), cFurnaceEntity::fsInput);
+	}
+	else
+	{
+		// Feed the fuel slot of the furnace
+		return MoveItemsToSlot(Furnace->GetContents(), cFurnaceEntity::fsFuel);
+	}
+	return false;
+}
+
+
+
+
+
+/// Moves items to the specified ItemGrid. Returns true if contents have changed
+bool cHopperEntity::MoveItemsToGrid(cItemGrid & a_ItemGrid)
+{
+	// Iterate through our slots, try to move from each one:
+	for (int i = 0; i < ContentsWidth * ContentsHeight; i++)
+	{
+		const cItem & SrcItem = m_Contents.GetSlot(i);
+		if (SrcItem.IsEmpty())
+		{
+			continue;
+		}
+		
+		cItem ToAdd = SrcItem.CopyOne();
+		if (a_ItemGrid.AddItem(ToAdd) > 0)
+		{
+			m_Contents.ChangeSlotCount(i, -1);
+			return true;
+		}
+	}
+	return false;
+}
+
+
+
+
+
+/// Moves one piece to the specified ItemGrid's slot. Returns true if contents have changed.
+bool cHopperEntity::MoveItemsToSlot(cItemGrid & a_ItemGrid, int a_DestSlotNum)
+{
+	if (a_ItemGrid.IsSlotEmpty(a_DestSlotNum))
+	{
+		// The slot is empty, move the first non-empty slot from our contents:
+		for (int i = 0; i < ContentsWidth * ContentsHeight; i++)
+		{
+			if (!m_Contents.IsSlotEmpty(i))
+			{
+				a_ItemGrid.SetSlot(a_DestSlotNum, m_Contents.GetSlot(i).CopyOne());
+				m_Contents.ChangeSlotCount(i, -1);
+				return true;
+			}
+		}
+		return false;
+	}
+	else
+	{
+		// The slot is taken, try to top it up:
+		const cItem & DestSlot = a_ItemGrid.GetSlot(a_DestSlotNum);
+		if (DestSlot.IsFullStack())
+		{
+			return false;
+		}
+		for (int i = 0; i < ContentsWidth * ContentsHeight; i++)
+		{
+			if (m_Contents.GetSlot(i).IsStackableWith(DestSlot))
+			{
+				a_ItemGrid.ChangeSlotCount(a_DestSlotNum, 1);
+				m_Contents.ChangeSlotCount(i, -1);
+				return true;
+			}
+		}
+		return false;
+	}
+}
+
+
+
+
diff --git a/source/BlockEntities/HopperEntity.h b/source/BlockEntities/HopperEntity.h
index 7f5eb23d1..8fc17b631 100644
--- a/source/BlockEntities/HopperEntity.h
+++ b/source/BlockEntities/HopperEntity.h
@@ -1,102 +1,102 @@
-

-// HopperEntity.h

-

-// Declares the cHopperEntity representing a hopper block entity

-

-

-

-

-

-#pragma once

-

-#include "BlockEntityWithItems.h"

-#include "../UI/WindowOwner.h"

-

-

-

-

-

-class cHopperEntity :  // tolua_export

-	public cBlockEntityWindowOwner,

-	// tolua_begin

-	public cBlockEntityWithItems

-{

-	typedef cBlockEntityWithItems super;

-

-public:

-	enum {

-		ContentsHeight = 1,

-		ContentsWidth  = 5,

-		TICKS_PER_TRANSFER = 8,  ///< How many ticks at minimum between two item transfers to or from the hopper

-	} ;

-

-	/// Constructor used while generating a chunk; sets m_World to NULL

-	cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ);

-	

-	// tolua_end

-	

-	/// Constructor used for normal operation

-	cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);

-	

-	// tolua_begin

-	

-	/** Returns the block coords of the block receiving the output items, based on the meta

-	Returns false if unattached

-	*/

-	bool GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ);

-	

-	// tolua_end

-	

-	static const char * GetClassStatic(void) { return "cHopperEntity"; }

-	

-protected:

-

-	Int64 m_LastMoveItemsInTick;

-	Int64 m_LastMoveItemsOutTick;

-

-	// cBlockEntity overrides:

-	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;

-	virtual void SaveToJson(Json::Value & a_Value) override;

-	virtual void SendTo(cClientHandle & a_Client) override;

-	virtual void UsedBy(cPlayer * a_Player) override;

-	

-	/// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate.

-	void OpenNewWindow(void);

-

-	/// Moves items from the container above it into this hopper. Returns true if the contents have changed.

-	bool MoveItemsIn(cChunk & a_Chunk, Int64 a_CurrentTick);

-	

-	/// Moves pickups from above this hopper into it. Returns true if the contents have changed.

-	bool MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick);

-	

-	/// Moves items out from this hopper into the destination. Returns true if the contents have changed.

-	bool MoveItemsOut(cChunk & a_Chunk, Int64 a_CurrentTick);

-	

-	/// Moves items from a chest (dblchest) above the hopper into this hopper. Returns true if contents have changed.

-	bool MoveItemsFromChest(cChunk & a_Chunk);

-	

-	/// Moves items from a furnace above the hopper into this hopper. Returns true if contents have changed.

-	bool MoveItemsFromFurnace(cChunk & a_Chunk);

-	

-	/// Moves items from the specified ItemGrid into this hopper. Returns true if contents have changed.

-	bool MoveItemsFromGrid(cItemGrid & a_Grid);

-	

-	/// Moves one piece from the specified itemstack into this hopper. Returns true if contents have changed. Doesn't change the itemstack.

-	bool MoveItemsFromSlot(const cItem & a_ItemStack, bool a_AllowNewStacks);

-	

-	/// Moves items to the chest at the specified coords. Returns true if contents have changed

-	bool MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ);

-	

-	/// Moves items to the furnace at the specified coords. Returns true if contents have changed

-	bool MoveItemsToFurnace(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_HopperMeta);

-	

-	/// Moves items to the specified ItemGrid. Returns true if contents have changed

-	bool MoveItemsToGrid(cItemGrid & a_ItemGrid);

-

-	/// Moves one piece to the specified ItemGrid's slot. Returns true if contents have changed.

-	bool MoveItemsToSlot(cItemGrid & a_ItemGrid, int a_DestSlotNum);

-} ;

-

-

-

-

+
+// HopperEntity.h
+
+// Declares the cHopperEntity representing a hopper block entity
+
+
+
+
+
+#pragma once
+
+#include "BlockEntityWithItems.h"
+#include "../UI/WindowOwner.h"
+
+
+
+
+
+class cHopperEntity :  // tolua_export
+	public cBlockEntityWindowOwner,
+	// tolua_begin
+	public cBlockEntityWithItems
+{
+	typedef cBlockEntityWithItems super;
+
+public:
+	enum {
+		ContentsHeight = 1,
+		ContentsWidth  = 5,
+		TICKS_PER_TRANSFER = 8,  ///< How many ticks at minimum between two item transfers to or from the hopper
+	} ;
+
+	/// Constructor used while generating a chunk; sets m_World to NULL
+	cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ);
+	
+	// tolua_end
+	
+	/// Constructor used for normal operation
+	cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
+	
+	// tolua_begin
+	
+	/** Returns the block coords of the block receiving the output items, based on the meta
+	Returns false if unattached
+	*/
+	bool GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ);
+	
+	// tolua_end
+	
+	static const char * GetClassStatic(void) { return "cHopperEntity"; }
+	
+protected:
+
+	Int64 m_LastMoveItemsInTick;
+	Int64 m_LastMoveItemsOutTick;
+
+	// cBlockEntity overrides:
+	virtual bool Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void SaveToJson(Json::Value & a_Value) override;
+	virtual void SendTo(cClientHandle & a_Client) override;
+	virtual void UsedBy(cPlayer * a_Player) override;
+	
+	/// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate.
+	void OpenNewWindow(void);
+
+	/// Moves items from the container above it into this hopper. Returns true if the contents have changed.
+	bool MoveItemsIn(cChunk & a_Chunk, Int64 a_CurrentTick);
+	
+	/// Moves pickups from above this hopper into it. Returns true if the contents have changed.
+	bool MovePickupsIn(cChunk & a_Chunk, Int64 a_CurrentTick);
+	
+	/// Moves items out from this hopper into the destination. Returns true if the contents have changed.
+	bool MoveItemsOut(cChunk & a_Chunk, Int64 a_CurrentTick);
+	
+	/// Moves items from a chest (dblchest) above the hopper into this hopper. Returns true if contents have changed.
+	bool MoveItemsFromChest(cChunk & a_Chunk);
+	
+	/// Moves items from a furnace above the hopper into this hopper. Returns true if contents have changed.
+	bool MoveItemsFromFurnace(cChunk & a_Chunk);
+	
+	/// Moves items from the specified ItemGrid into this hopper. Returns true if contents have changed.
+	bool MoveItemsFromGrid(cItemGrid & a_Grid);
+	
+	/// Moves one piece from the specified itemstack into this hopper. Returns true if contents have changed. Doesn't change the itemstack.
+	bool MoveItemsFromSlot(const cItem & a_ItemStack, bool a_AllowNewStacks);
+	
+	/// Moves items to the chest at the specified coords. Returns true if contents have changed
+	bool MoveItemsToChest(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ);
+	
+	/// Moves items to the furnace at the specified coords. Returns true if contents have changed
+	bool MoveItemsToFurnace(cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ, NIBBLETYPE a_HopperMeta);
+	
+	/// Moves items to the specified ItemGrid. Returns true if contents have changed
+	bool MoveItemsToGrid(cItemGrid & a_ItemGrid);
+
+	/// Moves one piece to the specified ItemGrid's slot. Returns true if contents have changed.
+	bool MoveItemsToSlot(cItemGrid & a_ItemGrid, int a_DestSlotNum);
+} ;
+
+
+
+
diff --git a/source/BlockEntities/JukeboxEntity.cpp b/source/BlockEntities/JukeboxEntity.cpp
index 617b7bd00..ec6d13282 100644
--- a/source/BlockEntities/JukeboxEntity.cpp
+++ b/source/BlockEntities/JukeboxEntity.cpp
@@ -1,123 +1,123 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "JukeboxEntity.h"

-#include "../World.h"

-#include <json/json.h>

-

-

-

-

-

-cJukeboxEntity::cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)

-	: cBlockEntity(E_BLOCK_JUKEBOX, a_BlockX, a_BlockY, a_BlockZ, a_World)

-	, m_Record( 0 )

-{

-}

-

-

-

-

-

-cJukeboxEntity::~cJukeboxEntity()

-{

-	if (m_Record >= 2256 && m_Record <= 2267)

-	{

-		EjectRecord();

-		m_Record = 0;

-	}

-}

-

-

-

-

-

-void cJukeboxEntity::UsedBy(cPlayer * a_Player)

-{

-	if (m_Record == 0)

-	{

-		const cItem & HeldItem = a_Player->GetEquippedItem();

-		if (HeldItem.m_ItemType >= 2256 && HeldItem.m_ItemType <= 2267)

-		{

-			m_Record = HeldItem.m_ItemType;

-			a_Player->GetInventory().RemoveOneEquippedItem();

-			PlayRecord();

-		}

-	}

-	else if (m_Record >= 2256 && m_Record <= 2267)

-	{

-		EjectRecord();

-		m_Record = 0;

-	}

-}

-

-

-

-

-

-void cJukeboxEntity::PlayRecord( void )

-{

-	m_World->BroadcastSoundParticleEffect(1005, m_PosX * 8, m_PosY * 8, m_PosZ * 8, m_Record);

-}

-

-

-

-

-

-void cJukeboxEntity::EjectRecord( void )

-{

-	cItems Drops;

-	Drops.push_back(cItem(m_Record, 1, 0));

-	m_World->SpawnItemPickups(Drops, m_PosX, m_PosY+1, m_PosZ);

-	m_World->BroadcastSoundParticleEffect(1005, m_PosX * 8, m_PosY * 8, m_PosZ * 8, 0);

-}

-

-

-

-

-

-int cJukeboxEntity::GetRecord( void )

-{

-	return m_Record;

-}

-

-

-

-

-

-void cJukeboxEntity::SetRecord( int a_Record )

-{

-	m_Record = a_Record;

-}

-

-

-

-

-

-bool cJukeboxEntity::LoadFromJson( const Json::Value & a_Value )

-{

-	m_PosX = a_Value.get("x", 0).asInt();

-	m_PosY = a_Value.get("y", 0).asInt();

-	m_PosZ = a_Value.get("z", 0).asInt();

-

-	m_Record = a_Value.get("Record", 0).asInt();

-

-	return true;

-}

-

-

-

-

-

-void cJukeboxEntity::SaveToJson( Json::Value & a_Value )

-{

-	a_Value["x"] = m_PosX;

-	a_Value["y"] = m_PosY;

-	a_Value["z"] = m_PosZ;

-

-	a_Value["Record"] = m_Record;

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "JukeboxEntity.h"
+#include "../World.h"
+#include <json/json.h>
+
+
+
+
+
+cJukeboxEntity::cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
+	: cBlockEntity(E_BLOCK_JUKEBOX, a_BlockX, a_BlockY, a_BlockZ, a_World)
+	, m_Record( 0 )
+{
+}
+
+
+
+
+
+cJukeboxEntity::~cJukeboxEntity()
+{
+	if (m_Record >= 2256 && m_Record <= 2267)
+	{
+		EjectRecord();
+		m_Record = 0;
+	}
+}
+
+
+
+
+
+void cJukeboxEntity::UsedBy(cPlayer * a_Player)
+{
+	if (m_Record == 0)
+	{
+		const cItem & HeldItem = a_Player->GetEquippedItem();
+		if (HeldItem.m_ItemType >= 2256 && HeldItem.m_ItemType <= 2267)
+		{
+			m_Record = HeldItem.m_ItemType;
+			a_Player->GetInventory().RemoveOneEquippedItem();
+			PlayRecord();
+		}
+	}
+	else if (m_Record >= 2256 && m_Record <= 2267)
+	{
+		EjectRecord();
+		m_Record = 0;
+	}
+}
+
+
+
+
+
+void cJukeboxEntity::PlayRecord( void )
+{
+	m_World->BroadcastSoundParticleEffect(1005, m_PosX * 8, m_PosY * 8, m_PosZ * 8, m_Record);
+}
+
+
+
+
+
+void cJukeboxEntity::EjectRecord( void )
+{
+	cItems Drops;
+	Drops.push_back(cItem(m_Record, 1, 0));
+	m_World->SpawnItemPickups(Drops, m_PosX, m_PosY+1, m_PosZ);
+	m_World->BroadcastSoundParticleEffect(1005, m_PosX * 8, m_PosY * 8, m_PosZ * 8, 0);
+}
+
+
+
+
+
+int cJukeboxEntity::GetRecord( void )
+{
+	return m_Record;
+}
+
+
+
+
+
+void cJukeboxEntity::SetRecord( int a_Record )
+{
+	m_Record = a_Record;
+}
+
+
+
+
+
+bool cJukeboxEntity::LoadFromJson( const Json::Value & a_Value )
+{
+	m_PosX = a_Value.get("x", 0).asInt();
+	m_PosY = a_Value.get("y", 0).asInt();
+	m_PosZ = a_Value.get("z", 0).asInt();
+
+	m_Record = a_Value.get("Record", 0).asInt();
+
+	return true;
+}
+
+
+
+
+
+void cJukeboxEntity::SaveToJson( Json::Value & a_Value )
+{
+	a_Value["x"] = m_PosX;
+	a_Value["y"] = m_PosY;
+	a_Value["z"] = m_PosZ;
+
+	a_Value["Record"] = m_Record;
+}
+
+
+
+
diff --git a/source/BlockEntities/JukeboxEntity.h b/source/BlockEntities/JukeboxEntity.h
index 063453607..74d40ecef 100644
--- a/source/BlockEntities/JukeboxEntity.h
+++ b/source/BlockEntities/JukeboxEntity.h
@@ -1,43 +1,43 @@
-

-#pragma once

-

-#include "BlockEntity.h"

-#include "../Player.h"

-

-

-

-

-

-namespace Json

-{

-	class Value;

-}

-

-

-

-

-

-class cJukeboxEntity : 

-	public cBlockEntity

-{

-public:

-	cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);

-	virtual ~cJukeboxEntity();

-

-	bool LoadFromJson( const Json::Value& a_Value );

-	virtual void SaveToJson( Json::Value& a_Value ) override;

-

-	int  GetRecord( void );

-	void SetRecord( int a_Record );

-	void PlayRecord( void );

-	void EjectRecord( void );

-	virtual void UsedBy( cPlayer * a_Player ) override;

-	virtual void SendTo(cClientHandle & a_Client) override { };

-

-private:

-	int m_Record;

-};

-

-

-

-

+
+#pragma once
+
+#include "BlockEntity.h"
+#include "../Player.h"
+
+
+
+
+
+namespace Json
+{
+	class Value;
+}
+
+
+
+
+
+class cJukeboxEntity : 
+	public cBlockEntity
+{
+public:
+	cJukeboxEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World);
+	virtual ~cJukeboxEntity();
+
+	bool LoadFromJson( const Json::Value& a_Value );
+	virtual void SaveToJson( Json::Value& a_Value ) override;
+
+	int  GetRecord( void );
+	void SetRecord( int a_Record );
+	void PlayRecord( void );
+	void EjectRecord( void );
+	virtual void UsedBy( cPlayer * a_Player ) override;
+	virtual void SendTo(cClientHandle & a_Client) override { };
+
+private:
+	int m_Record;
+};
+
+
+
+
diff --git a/source/BlockEntities/NoteEntity.cpp b/source/BlockEntities/NoteEntity.cpp
index 36da13692..6dc0e20a1 100644
--- a/source/BlockEntities/NoteEntity.cpp
+++ b/source/BlockEntities/NoteEntity.cpp
@@ -1,159 +1,159 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "NoteEntity.h"

-#include "../World.h"

-#include <json/json.h>

-

-

-cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)

-	: cBlockEntity(E_BLOCK_NOTE_BLOCK, a_BlockX, a_BlockY, a_BlockZ, a_World)

-	, m_Pitch( 0 )

-{

-}

-

-

-

-

-

-cNoteEntity::~cNoteEntity()

-{

-}

-

-

-

-

-

-void cNoteEntity::UsedBy( cPlayer * a_Player )

-{

-	IncrementPitch();

-	MakeSound();

-}

-

-

-

-

-

-void cNoteEntity::MakeSound( void )

-{

-	char instrument;

-	AString sampleName;

-	

-	switch (m_World->GetBlock(m_PosX, m_PosY - 1, m_PosZ))

-	{

-		case E_BLOCK_PLANKS:

-		case E_BLOCK_LOG:

-		case E_BLOCK_NOTE_BLOCK:

-		{

-			// TODO: add other wood-based blocks if needed

-			instrument = E_INST_DOUBLE_BASS;

-			sampleName = "note.db";

-			break;

-		}

-		

-		case E_BLOCK_SAND:

-		case E_BLOCK_GRAVEL:

-		case E_BLOCK_SOULSAND:

-		{

-			instrument = E_INST_SNARE_DRUM;

-			sampleName = "note.snare";

-			break;

-		}

-		

-		case E_BLOCK_GLASS:

-		case E_BLOCK_GLASS_PANE:

-		case E_BLOCK_GLOWSTONE:

-		{

-			instrument = E_INST_CLICKS;

-			sampleName = "note.hat";

-			break;

-		}

-

-		case E_BLOCK_STONE:

-		case E_BLOCK_STONE_BRICKS:

-		case E_BLOCK_COBBLESTONE:

-		case E_BLOCK_OBSIDIAN:

-		case E_BLOCK_NETHERRACK:

-		case E_BLOCK_BRICK:

-		case E_BLOCK_NETHER_BRICK:

-		{

-			// TODO: add other stone-based blocks if needed

-			instrument = E_INST_BASS_DRUM;

-			sampleName = "note.bassattack";

-			break;

-		}

-

-		default:

-		{

-			instrument = E_INST_HARP_PIANO;

-			sampleName = "note.harp";

-			break;

-		}

-	}

-

-	m_World->BroadcastBlockAction(m_PosX, m_PosY, m_PosZ, instrument, m_Pitch, E_BLOCK_NOTE_BLOCK);

-	

-	// TODO: instead of calculating the power function over and over, make a precalculated table - there's only 24 pitches after all

-	float calcPitch = pow(2.0f, ((float)m_Pitch - 12.0f) / 12.0f);

-	m_World->BroadcastSoundEffect(sampleName, m_PosX * 8, m_PosY * 8, m_PosZ * 8, 3.0f, calcPitch);

-}

-

-

-

-

-

-char cNoteEntity::GetPitch( void )

-{

-	return m_Pitch;

-}

-

-

-

-

-

-void cNoteEntity::SetPitch( char a_Pitch )

-{

-	m_Pitch = a_Pitch % 25;

-}

-

-

-

-

-

-void cNoteEntity::IncrementPitch( void )

-{

-	SetPitch( m_Pitch + 1 );

-}

-

-

-

-

-

-bool cNoteEntity::LoadFromJson( const Json::Value & a_Value )

-{

-

-	m_PosX = a_Value.get("x", 0).asInt();

-	m_PosY = a_Value.get("y", 0).asInt();

-	m_PosZ = a_Value.get("z", 0).asInt();

-

-	m_Pitch = (char)a_Value.get("p", 0).asInt();

-

-	return true;

-}

-

-

-

-

-

-void cNoteEntity::SaveToJson( Json::Value & a_Value )

-{

-	a_Value["x"] = m_PosX;

-	a_Value["y"] = m_PosY;

-	a_Value["z"] = m_PosZ;

-

-	a_Value["p"] = m_Pitch;

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "NoteEntity.h"
+#include "../World.h"
+#include <json/json.h>
+
+
+cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World)
+	: cBlockEntity(E_BLOCK_NOTE_BLOCK, a_BlockX, a_BlockY, a_BlockZ, a_World)
+	, m_Pitch( 0 )
+{
+}
+
+
+
+
+
+cNoteEntity::~cNoteEntity()
+{
+}
+
+
+
+
+
+void cNoteEntity::UsedBy( cPlayer * a_Player )
+{
+	IncrementPitch();
+	MakeSound();
+}
+
+
+
+
+
+void cNoteEntity::MakeSound( void )
+{
+	char instrument;
+	AString sampleName;
+	
+	switch (m_World->GetBlock(m_PosX, m_PosY - 1, m_PosZ))
+	{
+		case E_BLOCK_PLANKS:
+		case E_BLOCK_LOG:
+		case E_BLOCK_NOTE_BLOCK:
+		{
+			// TODO: add other wood-based blocks if needed
+			instrument = E_INST_DOUBLE_BASS;
+			sampleName = "note.db";
+			break;
+		}
+		
+		case E_BLOCK_SAND:
+		case E_BLOCK_GRAVEL:
+		case E_BLOCK_SOULSAND:
+		{
+			instrument = E_INST_SNARE_DRUM;
+			sampleName = "note.snare";
+			break;
+		}
+		
+		case E_BLOCK_GLASS:
+		case E_BLOCK_GLASS_PANE:
+		case E_BLOCK_GLOWSTONE:
+		{
+			instrument = E_INST_CLICKS;
+			sampleName = "note.hat";
+			break;
+		}
+
+		case E_BLOCK_STONE:
+		case E_BLOCK_STONE_BRICKS:
+		case E_BLOCK_COBBLESTONE:
+		case E_BLOCK_OBSIDIAN:
+		case E_BLOCK_NETHERRACK:
+		case E_BLOCK_BRICK:
+		case E_BLOCK_NETHER_BRICK:
+		{
+			// TODO: add other stone-based blocks if needed
+			instrument = E_INST_BASS_DRUM;
+			sampleName = "note.bassattack";
+			break;
+		}
+
+		default:
+		{
+			instrument = E_INST_HARP_PIANO;
+			sampleName = "note.harp";
+			break;
+		}
+	}
+
+	m_World->BroadcastBlockAction(m_PosX, m_PosY, m_PosZ, instrument, m_Pitch, E_BLOCK_NOTE_BLOCK);
+	
+	// TODO: instead of calculating the power function over and over, make a precalculated table - there's only 24 pitches after all
+	float calcPitch = pow(2.0f, ((float)m_Pitch - 12.0f) / 12.0f);
+	m_World->BroadcastSoundEffect(sampleName, m_PosX * 8, m_PosY * 8, m_PosZ * 8, 3.0f, calcPitch);
+}
+
+
+
+
+
+char cNoteEntity::GetPitch( void )
+{
+	return m_Pitch;
+}
+
+
+
+
+
+void cNoteEntity::SetPitch( char a_Pitch )
+{
+	m_Pitch = a_Pitch % 25;
+}
+
+
+
+
+
+void cNoteEntity::IncrementPitch( void )
+{
+	SetPitch( m_Pitch + 1 );
+}
+
+
+
+
+
+bool cNoteEntity::LoadFromJson( const Json::Value & a_Value )
+{
+
+	m_PosX = a_Value.get("x", 0).asInt();
+	m_PosY = a_Value.get("y", 0).asInt();
+	m_PosZ = a_Value.get("z", 0).asInt();
+
+	m_Pitch = (char)a_Value.get("p", 0).asInt();
+
+	return true;
+}
+
+
+
+
+
+void cNoteEntity::SaveToJson( Json::Value & a_Value )
+{
+	a_Value["x"] = m_PosX;
+	a_Value["y"] = m_PosY;
+	a_Value["z"] = m_PosZ;
+
+	a_Value["p"] = m_Pitch;
+}
+
+
+
+
diff --git a/source/BlockEntities/NoteEntity.h b/source/BlockEntities/NoteEntity.h
index 29ce4ef8f..385591df6 100644
--- a/source/BlockEntities/NoteEntity.h
+++ b/source/BlockEntities/NoteEntity.h
@@ -1,52 +1,52 @@
-

-#pragma once

-

-#include "BlockEntity.h"

-

-

-namespace Json

-{

-	class Value;

-}

-

-

-

-

-

-enum ENUM_NOTE_INSTRUMENTS

-{

-	E_INST_HARP_PIANO  = 0,

-	E_INST_DOUBLE_BASS = 1,

-	E_INST_SNARE_DRUM  = 2,

-	E_INST_CLICKS      = 3,

-	E_INST_BASS_DRUM   = 4

-};

-

-

-

-

-

-class cNoteEntity : 

-	public cBlockEntity

-{

-public:

-	cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);

-	virtual ~cNoteEntity();

-

-	bool LoadFromJson( const Json::Value& a_Value );

-	virtual void SaveToJson( Json::Value& a_Value ) override;

-

-	char GetPitch( void );

-	void SetPitch( char a_Pitch );

-	void IncrementPitch( void );

-	void MakeSound( void );

-	virtual void UsedBy( cPlayer * a_Player ) override;

-	virtual void SendTo(cClientHandle & a_Client) override { };

-

-private:

-	unsigned char m_Pitch;

-};

-

-

-

-

+
+#pragma once
+
+#include "BlockEntity.h"
+
+
+namespace Json
+{
+	class Value;
+}
+
+
+
+
+
+enum ENUM_NOTE_INSTRUMENTS
+{
+	E_INST_HARP_PIANO  = 0,
+	E_INST_DOUBLE_BASS = 1,
+	E_INST_SNARE_DRUM  = 2,
+	E_INST_CLICKS      = 3,
+	E_INST_BASS_DRUM   = 4
+};
+
+
+
+
+
+class cNoteEntity : 
+	public cBlockEntity
+{
+public:
+	cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
+	virtual ~cNoteEntity();
+
+	bool LoadFromJson( const Json::Value& a_Value );
+	virtual void SaveToJson( Json::Value& a_Value ) override;
+
+	char GetPitch( void );
+	void SetPitch( char a_Pitch );
+	void IncrementPitch( void );
+	void MakeSound( void );
+	virtual void UsedBy( cPlayer * a_Player ) override;
+	virtual void SendTo(cClientHandle & a_Client) override { };
+
+private:
+	unsigned char m_Pitch;
+};
+
+
+
+