21 files changed, 590 insertions, 250 deletions

diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index eb7a40d62..848a70a19 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -107,6 +107,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
 		case E_BLOCK_ICE:                   return new cBlockIceHandler             (a_BlockType);

 		case E_BLOCK_IRON_DOOR:             return new cBlockDoorHandler            (a_BlockType);

 		case E_BLOCK_IRON_ORE:              return new cBlockOreHandler             (a_BlockType);

+		case E_BLOCK_JUKEBOX:               return new cBlockEntityHandler          (a_BlockType);

 		case E_BLOCK_JUNGLE_WOOD_STAIRS:    return new cBlockStairsHandler          (a_BlockType);

 		case E_BLOCK_LADDER:                return new cBlockLadderHandler          (a_BlockType);

 		case E_BLOCK_LAPIS_ORE:             return new cBlockOreHandler             (a_BlockType);

diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index 7f1c94a07..d10aa6dac 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -16,6 +16,7 @@
 #include "FurnaceEntity.h"
 #include "SignEntity.h"
 #include "NoteEntity.h"
+#include "JukeboxEntity.h"
 #include "Torch.h"
 #include "Ladder.h"
 #include "Pickup.h"
@@ -809,6 +810,15 @@ void cChunk::CreateBlockEntities(void)
 						}
 						break;
 					}
+
+					case E_BLOCK_JUKEBOX:
+					{
+						if (!HasBlockEntityAt(x + m_PosX * Width, y + m_PosY * Height, z + m_PosZ * Width))
+						{
+							m_BlockEntities.push_back(new cJukeboxEntity(x + m_PosX * Width, y + m_PosY * Height, z + m_PosZ * Width, m_World) );
+						}
+						break;
+					}
 				}  // switch (BlockType)
 			}  // for y
 		}  // for z
@@ -934,6 +944,11 @@ void cChunk::SetBlock( int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType
 			AddBlockEntity(new cNoteEntity(WorldPos.x, WorldPos.y, WorldPos.z, m_World));
 			break;
 		}
+		case E_BLOCK_JUKEBOX:
+		{
+			AddBlockEntity(new cJukeboxEntity(WorldPos.x, WorldPos.y, WorldPos.z, m_World));
+			break;
+		}
 	}  // switch (a_BlockType)
 }
 
@@ -1757,6 +1772,22 @@ void cChunk::BroadcastSoundEffect(const AString & a_SoundName, int a_SrcX, int a
 
 
 
+void cChunk::BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude)
+{
+	for (cClientHandleList::iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr )
+	{
+		if (*itr == a_Exclude)
+		{
+			continue;
+		}
+		(*itr)->SendSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data);
+	}  // for itr - LoadedByClient[]
+}
+
+
+
+
+
 void cChunk::BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude)
 {
 	for (cClientHandleList::iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr )
diff --git a/source/Chunk.h b/source/Chunk.h
index 3ecf50907..4bc99b8d2 100644
--- a/source/Chunk.h
+++ b/source/Chunk.h
@@ -182,26 +182,27 @@ public:
 	void CalculateLighting(); // Recalculate right now
 	void CalculateHeightmap();
 
-	void BroadcastPlayerAnimation(const cPlayer & a_Player, char a_Animation, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntRelMoveLook (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntRelMove     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntLook        (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntHeadLook    (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastBlockAction    (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType, const cClientHandle * a_Exclude = NULL);
-	void BroadcastDestroyEntity  (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntityStatus   (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
-	void BroadcastMetadata       (const cPawn & a_Pawn, const cClientHandle * a_Exclude = NULL);
-	void BroadcastSpawn          (cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastBlockEntity    (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastCollectPickup  (const cPickup & a_Pickup, const cPlayer & a_Player, const cClientHandle * a_Exclude = NULL);
-	void BroadcastThunderbolt    (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastSoundEffect    (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL);  // a_Src coords are Block * 8
-	void BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude = NULL);
-	void BroadcastUseBed         (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
-	void BroadcastChunkData      (cChunkDataSerializer & a_Serializer, const cClientHandle * a_Exclude = NULL);
+	void BroadcastPlayerAnimation    (const cPlayer & a_Player, char a_Animation, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntLook            (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntHeadLook        (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType, const cClientHandle * a_Exclude = NULL);
+	void BroadcastDestroyEntity      (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntityStatus       (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
+	void BroadcastMetadata           (const cPawn & a_Pawn, const cClientHandle * a_Exclude = NULL);
+	void BroadcastSpawn              (cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastBlockEntity        (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player, const cClientHandle * a_Exclude = NULL);
+	void BroadcastThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL);  // a_Src coords are Block * 8
+	void BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = NULL);
+	void BroadcastBlockBreakAnimation(int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage, const cClientHandle * a_Exclude = NULL);
+	void BroadcastUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
+	void BroadcastChunkData          (cChunkDataSerializer & a_Serializer, const cClientHandle * a_Exclude = NULL);
 	
-	void SendBlockEntity         (int a_BlockX, int a_BlockY, int a_BlockZ, cClientHandle & a_Client);
+	void SendBlockEntity             (int a_BlockX, int a_BlockY, int a_BlockZ, cClientHandle & a_Client);
 
 	Vector3i PositionToWorldPosition(const Vector3i & a_RelPos)
 	{
diff --git a/source/ChunkMap.cpp b/source/ChunkMap.cpp
index a5d8b004e..06b1d9039 100644
--- a/source/ChunkMap.cpp
+++ b/source/ChunkMap.cpp
@@ -466,6 +466,25 @@ void cChunkMap::BroadcastSoundEffect(const AString & a_SoundName, int a_SrcX, in
 
 
 
+void cChunkMap::BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude)
+{
+	cCSLock Lock(m_CSLayers);
+	int ChunkX, ChunkZ;
+
+	cChunkDef::BlockToChunk(a_SrcX / 8, a_SrcY / 8, a_SrcZ / 8, ChunkX, ChunkZ);
+	cChunkPtr Chunk = GetChunkNoGen(ChunkX, 0, ChunkZ);
+	if (Chunk == NULL)
+	{
+		return;
+	}
+	// It's perfectly legal to broadcast packets even to invalid chunks!
+	Chunk->BroadcastSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data, a_Exclude);
+}
+
+
+
+
+
 void cChunkMap::BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude)
 {
 	cCSLock Lock(m_CSLayers);
diff --git a/source/ChunkMap.h b/source/ChunkMap.h
index af84b9ce6..ea1aecfb4 100644
--- a/source/ChunkMap.h
+++ b/source/ChunkMap.h
@@ -78,6 +78,8 @@ public:
 	
 	void BroadcastSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL);   // a_Src coords are Block * 8
 	
+	void BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = NULL);
+
 	void BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude = NULL);
 
 	void BroadcastUseBed(const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index 844ea0db8..6bc0185ae 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1485,6 +1485,15 @@ void cClientHandle::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 
 
 
+void cClientHandle::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)
+{
+	m_Protocol->SendSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data);
+}
+
+
+
+
+
 void cClientHandle::SendBlockBreakAnim(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage)
 {
 	m_Protocol->SendBlockBreakAnim(a_entityID, a_blockX, a_blockY, a_blockZ, a_stage);
diff --git a/source/ClientHandle.h b/source/ClientHandle.h
index 85c5cecb9..c3b8ec731 100644
--- a/source/ClientHandle.h
+++ b/source/ClientHandle.h
@@ -78,47 +78,48 @@ public:
 	
 	bool IsPlaying(void) const {return (m_State == csPlaying); }
 
-	void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType);
-	void SendBlockChange      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
-	void SendBlockChanges     (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes);
-	void SendChat             (const AString & a_Message);
-	void SendChunkData        (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer);
-	void SendCollectPickup    (const cPickup & a_Pickup, const cPlayer & a_Player);
-	void SendDestroyEntity    (const cEntity & a_Entity);
-	void SendDisconnect       (const AString & a_Reason);
-	void SendEntHeadLook      (const cEntity & a_Entity);
-	void SendEntLook          (const cEntity & a_Entity);
-	void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
-	void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
-	void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item);
-	void SendEntityStatus     (const cEntity & a_Entity, char a_Status);
-	void SendGameMode         (eGameMode a_GameMode);
-	void SendHealth           (void);
-	void SendInventoryProgress(char a_WindowID, short a_Progressbar, short a_Value);
-	void SendInventorySlot    (char a_WindowID, short a_SlotNum, const cItem & a_Item);
-	void SendMetadata         (const cPawn & a_Entity);
-	void SendPickupSpawn      (const cPickup & a_Pickup);
-	void SendPlayerAnimation  (const cPlayer & a_Player, char a_Animation);
-	void SendPlayerListItem   (const cPlayer & a_Player, bool a_IsOnline);
-	void SendPlayerMoveLook   (void);
-	void SendPlayerPosition   (void);
-	void SendPlayerSpawn      (const cPlayer & a_Player);
-	void SendRespawn          (void);
-	void SendSoundEffect      (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch);  // a_Src coords are Block * 8
-	void SendBlockBreakAnim   (int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage);
-	void SendSpawnMob         (const cMonster & a_Mob);
-	void SendTeleportEntity   (const cEntity & a_Entity);
-	void SendThunderbolt      (int a_BlockX, int a_BlockY, int a_BlockZ);
-	void SendTimeUpdate       (Int64 a_WorldTime);
-	void SendUnloadChunk      (int a_ChunkX, int a_ChunkZ);
-	void SendUpdateSign       (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
-	void SendWeather          (eWeather a_Weather);
-	void SendWholeInventory   (const cInventory & a_Inventory);
-	void SendWholeInventory   (const cWindow    & a_Window);
-	void SendWindowClose      (char a_WindowID);
-	void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots);
-	void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
-	void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ);
+	void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType);
+	void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta);
+	void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes);
+	void SendChat               (const AString & a_Message);
+	void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer);
+	void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player);
+	void SendDestroyEntity      (const cEntity & a_Entity);
+	void SendDisconnect         (const AString & a_Reason);
+	void SendEntHeadLook        (const cEntity & a_Entity);
+	void SendEntLook            (const cEntity & a_Entity);
+	void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
+	void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ);
+	void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item);
+	void SendEntityStatus       (const cEntity & a_Entity, char a_Status);
+	void SendGameMode           (eGameMode a_GameMode);
+	void SendHealth             (void);
+	void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value);
+	void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item);
+	void SendMetadata           (const cPawn & a_Entity);
+	void SendPickupSpawn        (const cPickup & a_Pickup);
+	void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation);
+	void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline);
+	void SendPlayerMoveLook     (void);
+	void SendPlayerPosition     (void);
+	void SendPlayerSpawn        (const cPlayer & a_Player);
+	void SendRespawn            (void);
+	void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch);  // a_Src coords are Block * 8
+	void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data);
+	void SendBlockBreakAnim     (int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage);
+	void SendSpawnMob           (const cMonster & a_Mob);
+	void SendTeleportEntity     (const cEntity & a_Entity);
+	void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ);
+	void SendTimeUpdate         (Int64 a_WorldTime);
+	void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ);
+	void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
+	void SendWeather            (eWeather a_Weather);
+	void SendWholeInventory     (const cInventory & a_Inventory);
+	void SendWholeInventory     (const cWindow    & a_Window);
+	void SendWindowClose        (char a_WindowID);
+	void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots);
+	void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
+	void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ);
 
 	const AString & GetUsername(void) const;		//tolua_export
 	void SetUsername( const AString & a_Username );	//tolua_export
diff --git a/source/JukeboxEntity.cpp b/source/JukeboxEntity.cpp
new file mode 100644
index 000000000..e72f95926
--- /dev/null
+++ b/source/JukeboxEntity.cpp
@@ -0,0 +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 <= 2266)

+	{

+		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 <= 2266)

+		{

+			m_Record = HeldItem.m_ItemType;

+			a_Player->UseEquippedItem();

+			PlayRecord();

+		}

+	}

+	else if (m_Record >= 2256 && m_Record <= 2266)

+	{

+		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/JukeboxEntity.h b/source/JukeboxEntity.h
new file mode 100644
index 000000000..94ecd2894
--- /dev/null
+++ b/source/JukeboxEntity.h
@@ -0,0 +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;

+};

+

+

+

+

diff --git a/source/Protocol/Protocol.h b/source/Protocol/Protocol.h
index 2e2afd364..b4235129e 100644
--- a/source/Protocol/Protocol.h
+++ b/source/Protocol/Protocol.h
@@ -43,49 +43,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) = 0;

 	

 	// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) = 0;

-	virtual void SendBlockChange      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) = 0;

-	virtual void SendBlockChanges     (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) = 0;

-	virtual void SendChat             (const AString & a_Message) = 0;

-	virtual void SendChunkData        (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;

-	virtual void SendCollectPickup    (const cPickup & a_Pickup, const cPlayer & a_Player) = 0;

-	virtual void SendDestroyEntity    (const cEntity & a_Entity) = 0;

-	virtual void SendDisconnect       (const AString & a_Reason) = 0;

-	virtual void SendEntHeadLook      (const cEntity & a_Entity) = 0;

-	virtual void SendEntLook          (const cEntity & a_Entity) = 0;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) = 0;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

-	virtual void SendGameMode         (eGameMode a_GameMode) = 0;

-	virtual void SendHealth           (void) = 0;

-	virtual void SendInventoryProgress(char a_WindowID, short a_Progressbar, short a_Value) = 0;

-	virtual void SendInventorySlot    (char a_WindowID, short a_SlotNum, const cItem & a_Item) = 0;

-	virtual void SendKeepAlive        (int a_PingID) = 0;

-	virtual void SendLogin            (const cPlayer & a_Player, const cWorld & a_World) = 0;

-	virtual void SendMetadata         (const cEntity & a_Entity) = 0;

-	virtual void SendPickupSpawn      (const cPickup & a_Pickup) = 0;

-	virtual void SendPlayerAnimation  (const cPlayer & a_Player, char a_Animation) = 0;

-	virtual void SendPlayerListItem   (const cPlayer & a_Player, bool a_IsOnline) = 0;

-	virtual void SendPlayerMoveLook   (void) = 0;

-	virtual void SendPlayerPosition   (void) = 0;

-	virtual void SendPlayerSpawn      (const cPlayer & a_Player) = 0;

-	virtual void SendRespawn          (void) = 0;

-	virtual void SendSoundEffect      (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0;  // a_Src coords are Block * 8

-	virtual void SendBlockBreakAnim   (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) = 0;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) = 0;

-	virtual void SendTeleportEntity   (const cEntity & a_Entity) = 0;

-	virtual void SendThunderbolt      (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;

-	virtual void SendTimeUpdate       (Int64 a_WorldTime) = 0;

-	virtual void SendUnloadChunk      (int a_ChunkX, int a_ChunkZ) = 0;

-	virtual void SendUpdateSign       (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) = 0;

-	virtual void SendWeather          (eWeather a_Weather) = 0;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) = 0;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) = 0;

-	virtual void SendWindowClose      (char a_WindowID) = 0;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) = 0;

+	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) = 0;

+	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) = 0;

+	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) = 0;

+	virtual void SendChat               (const AString & a_Message) = 0;

+	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) = 0;

+	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) = 0;

+	virtual void SendDestroyEntity      (const cEntity & a_Entity) = 0;

+	virtual void SendDisconnect         (const AString & a_Reason) = 0;

+	virtual void SendEntHeadLook        (const cEntity & a_Entity) = 0;

+	virtual void SendEntLook            (const cEntity & a_Entity) = 0;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) = 0;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) = 0;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) = 0;

+	virtual void SendGameMode           (eGameMode a_GameMode) = 0;

+	virtual void SendHealth             (void) = 0;

+	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) = 0;

+	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) = 0;

+	virtual void SendKeepAlive          (int a_PingID) = 0;

+	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) = 0;

+	virtual void SendMetadata           (const cEntity & a_Entity) = 0;

+	virtual void SendPickupSpawn        (const cPickup & a_Pickup) = 0;

+	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) = 0;

+	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) = 0;

+	virtual void SendPlayerMoveLook     (void) = 0;

+	virtual void SendPlayerPosition     (void) = 0;

+	virtual void SendPlayerSpawn        (const cPlayer & a_Player) = 0;

+	virtual void SendRespawn            (void) = 0;

+	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) = 0;  // a_Src coords are Block * 8

+	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) = 0;

+	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) = 0;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) = 0;

+	virtual void SendTeleportEntity     (const cEntity & a_Entity) = 0;

+	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) = 0;

+	virtual void SendTimeUpdate         (Int64 a_WorldTime) = 0;

+	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) = 0;

+	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) = 0;

+	virtual void SendWeather            (eWeather a_Weather) = 0;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) = 0;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) = 0;

+	virtual void SendWindowClose        (char a_WindowID) = 0;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) = 0;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) = 0;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) = 0;

 

 	/// Returns the ServerID used for authentication through session.minecraft.net

 	virtual AString GetAuthServerID(void) = 0;

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 66519b0dd..e92197a9b 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -69,7 +69,8 @@ enum
 	PACKET_BLOCK_CHANGE              = 0x35,

 	PACKET_BLOCK_ACTION              = 0x36,

 	PACKET_EXPLOSION                 = 0x3C,

-	PACKET_SOUND_EFFECT              = 0x3D,

+	PACKET_SOUND_EFFECT              = 0x3e,

+	PACKET_SOUND_PARTICLE_EFFECT     = 0x3d,

 	PACKET_CHANGE_GAME_STATE         = 0x46,

 	PACKET_THUNDERBOLT               = 0x47,

 	PACKET_WINDOW_OPEN               = 0x64,

@@ -592,6 +593,15 @@ void cProtocol125::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 

 

 

+void cProtocol125::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	// Not implemented in this protocol version

+}

+

+

+

+

+

 void cProtocol125::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	// Not supported in this protocol version

diff --git a/source/Protocol/Protocol125.h b/source/Protocol/Protocol125.h
index 898a53008..716bfe7b1 100644
--- a/source/Protocol/Protocol125.h
+++ b/source/Protocol/Protocol125.h
@@ -27,49 +27,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	/// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

-	virtual void SendBlockChange      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

-	virtual void SendBlockChanges     (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;

-	virtual void SendChat             (const AString & a_Message) override;

-	virtual void SendChunkData        (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

-	virtual void SendCollectPickup    (const cPickup & a_Pickup, const cPlayer & a_Player) override;

-	virtual void SendDestroyEntity    (const cEntity & a_Entity) override;

-	virtual void SendDisconnect       (const AString & a_Reason) override;

-	virtual void SendEntHeadLook      (const cEntity & a_Entity) override;

-	virtual void SendEntLook          (const cEntity & a_Entity) override;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) override;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendGameMode         (eGameMode a_GameMode) override;

-	virtual void SendHealth           (void) override;

-	virtual void SendInventoryProgress(char a_WindowID, short a_Progressbar, short a_Value) override;

-	virtual void SendInventorySlot    (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendKeepAlive        (int a_PingID) override;

-	virtual void SendLogin            (const cPlayer & a_Player, const cWorld & a_World) override;

-	virtual void SendMetadata         (const cEntity & a_Entity) override;

-	virtual void SendPickupSpawn      (const cPickup & a_Pickup) override;

-	virtual void SendPlayerAnimation  (const cPlayer & a_Player, char a_Animation) override;

-	virtual void SendPlayerListItem   (const cPlayer & a_Player, bool a_IsOnline) override;

-	virtual void SendPlayerMoveLook   (void) override;

-	virtual void SendPlayerPosition   (void) override;

-	virtual void SendPlayerSpawn      (const cPlayer & a_Player) override;

-	virtual void SendRespawn          (void) override;

-	virtual void SendSoundEffect      (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8

-	virtual void SendBlockBreakAnim	  (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) override;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) override;

-	virtual void SendTeleportEntity   (const cEntity & a_Entity) override;

-	virtual void SendThunderbolt      (int a_BlockX, int a_BlockY, int a_BlockZ) override;

-	virtual void SendTimeUpdate       (Int64 a_WorldTime) override;

-	virtual void SendUnloadChunk      (int a_ChunkX, int a_ChunkZ) override;

-	virtual void SendUpdateSign       (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;

-	virtual void SendWeather          (eWeather a_Weather) override;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) override;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) override;

-	virtual void SendWindowClose      (char a_WindowID) override;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

+	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

+	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

+	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;

+	virtual void SendChat               (const AString & a_Message) override;

+	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

+	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;

+	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;

+	virtual void SendDisconnect         (const AString & a_Reason) override;

+	virtual void SendEntHeadLook        (const cEntity & a_Entity) override;

+	virtual void SendEntLook            (const cEntity & a_Entity) override;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendGameMode           (eGameMode a_GameMode) override;

+	virtual void SendHealth             (void) override;

+	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) override;

+	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendKeepAlive          (int a_PingID) override;

+	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;

+	virtual void SendMetadata           (const cEntity & a_Entity) override;

+	virtual void SendPickupSpawn        (const cPickup & a_Pickup) override;

+	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) override;

+	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) override;

+	virtual void SendPlayerMoveLook     (void) override;

+	virtual void SendPlayerPosition     (void) override;

+	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;

+	virtual void SendRespawn            (void) override;

+	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8

+	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;

+	virtual void SendBlockBreakAnim	    (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) override;

+	virtual void SendTeleportEntity     (const cEntity & a_Entity) override;

+	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) override;

+	virtual void SendTimeUpdate         (Int64 a_WorldTime) override;

+	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;

+	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;

+	virtual void SendWeather            (eWeather a_Weather) override;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) override;

+	virtual void SendWindowClose        (char a_WindowID) override;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

 	

 	virtual AString GetAuthServerID(void) override;

 	

diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 2e5803273..9c0047c16 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -52,19 +52,20 @@ const int MAX_ENC_LEN = 512;  // Maximum size of the encrypted message; should b
 

 enum

 {

-	PACKET_KEEP_ALIVE         = 0x00,

-	PACKET_LOGIN              = 0x01,

-	PACKET_ENTITY_EQUIPMENT   = 0x05,

-	PACKET_COMPASS            = 0x06,

-	PACKET_PLAYER_SPAWN       = 0x14,

-	PACKET_COLLECT_PICKUP     = 0x16,

-	PACKET_SPAWN_MOB          = 0x18,

-	PACKET_DESTROY_ENTITIES   = 0x1d,

-	PACKET_CHUNK_DATA         = 0x33,

-	PACKET_BLOCK_CHANGE       = 0x35,

-	PACKET_BLOCK_ACTION       = 0x36,

-	PACKET_BLOCK_BREAK_ANIM   = 0x37,

-	PACKET_SOUND_EFFECT       = 0x3e

+	PACKET_KEEP_ALIVE            = 0x00,

+	PACKET_LOGIN                 = 0x01,

+	PACKET_ENTITY_EQUIPMENT      = 0x05,

+	PACKET_COMPASS               = 0x06,

+	PACKET_PLAYER_SPAWN          = 0x14,

+	PACKET_COLLECT_PICKUP        = 0x16,

+	PACKET_SPAWN_MOB             = 0x18,

+	PACKET_DESTROY_ENTITIES      = 0x1d,

+	PACKET_CHUNK_DATA            = 0x33,

+	PACKET_BLOCK_CHANGE          = 0x35,

+	PACKET_BLOCK_ACTION          = 0x36,

+	PACKET_BLOCK_BREAK_ANIM      = 0x37,

+	PACKET_SOUND_EFFECT          = 0x3e,

+	PACKET_SOUND_PARTICLE_EFFECT = 0x3d

 } ;

 

 

@@ -378,6 +379,22 @@ void cProtocol132::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int
 

 

 

+void cProtocol132::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	cCSLock Lock(m_CSPacket);

+	WriteByte(PACKET_SOUND_PARTICLE_EFFECT);

+	WriteInt (a_EffectID);

+	WriteInt (a_SrcX / 8);

+	WriteByte(a_SrcY / 8);

+	WriteInt (a_SrcZ / 8);

+	WriteInt (a_Data);

+	Flush();

+}

+

+

+

+

+

 void cProtocol132::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	cCSLock Lock(m_CSPacket);

diff --git a/source/Protocol/Protocol132.h b/source/Protocol/Protocol132.h
index f5175e3bb..a14f8d9a4 100644
--- a/source/Protocol/Protocol132.h
+++ b/source/Protocol/Protocol132.h
@@ -30,19 +30,20 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	// Sending commands:

-	virtual void SendBlockAction    (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

-	virtual void SendBlockChange    (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

-	virtual void SendChunkData      (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

-	virtual void SendCollectPickup  (const cPickup & a_Pickup, const cPlayer & a_Player) override;

-	virtual void SendDestroyEntity  (const cEntity & a_Entity) override;

-	virtual void SendEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendLogin          (const cPlayer & a_Player, const cWorld & a_World) override;

-	virtual void SendPlayerSpawn    (const cPlayer & a_Player) override;

-	virtual void SendSoundEffect    (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8

-	virtual void SendBlockBreakAnim (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) override;

-	virtual void SendSpawnMob       (const cMonster & a_Mob) override;

-	virtual void SendUnloadChunk    (int a_ChunkX, int a_ChunkZ) override;

-	virtual void SendWholeInventory (const cWindow & a_Window) override;

+	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

+	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

+	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

+	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;

+	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;

+	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;

+	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;  // a_Src coords are Block * 8

+	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;

+	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) override;

+	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;

+	virtual void SendWholeInventory     (const cWindow & a_Window) override;

 

 	virtual AString GetAuthServerID(void) override;

 

diff --git a/source/Protocol/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp
index 3d71c95ee..79bdf2457 100644
--- a/source/Protocol/ProtocolRecognizer.cpp
+++ b/source/Protocol/ProtocolRecognizer.cpp
@@ -356,7 +356,9 @@ void cProtocolRecognizer::SendRespawn(void)
 

 

 

-void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) {

+

+void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch)

+{

 	ASSERT(m_Protocol != NULL);

 	m_Protocol->SendSoundEffect(a_SoundName, a_SrcX, a_SrcY, a_SrcZ, a_Volume, a_Pitch);

 }

@@ -365,6 +367,16 @@ void cProtocolRecognizer::SendSoundEffect(const AString & a_SoundName, int a_Src
 

 

 

+void cProtocolRecognizer::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data)

+{

+	ASSERT(m_Protocol != NULL);

+	m_Protocol->SendSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data);

+}

+

+

+

+

+

 void cProtocolRecognizer::SendBlockBreakAnim(int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage)

 {

 	ASSERT(m_Protocol != NULL);

diff --git a/source/Protocol/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h
index a5099367a..46c29386e 100644
--- a/source/Protocol/ProtocolRecognizer.h
+++ b/source/Protocol/ProtocolRecognizer.h
@@ -38,49 +38,50 @@ public:
 	virtual void DataReceived(const char * a_Data, int a_Size) override;

 	

 	/// Sending stuff to clients:

-	virtual void SendBlockAction      (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

-	virtual void SendBlockChange      (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

-	virtual void SendBlockChanges     (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;

-	virtual void SendChat             (const AString & a_Message) override;

-	virtual void SendChunkData        (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

-	virtual void SendCollectPickup    (const cPickup & a_Pickup, const cPlayer & a_Player) override;

-	virtual void SendDestroyEntity    (const cEntity & a_Entity) override;

-	virtual void SendDisconnect       (const AString & a_Reason) override;

-	virtual void SendEntHeadLook      (const cEntity & a_Entity) override;

-	virtual void SendEntLook          (const cEntity & a_Entity) override;

-	virtual void SendEntityEquipment  (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendEntityStatus     (const cEntity & a_Entity, char a_Status) override;

-	virtual void SendEntRelMove       (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendEntRelMoveLook   (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

-	virtual void SendGameMode         (eGameMode a_GameMode) override;

-	virtual void SendHealth           (void) override;

-	virtual void SendInventoryProgress(char a_WindowID, short a_Progressbar, short a_Value) override;

-	virtual void SendInventorySlot    (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;

-	virtual void SendKeepAlive        (int a_PingID) override;

-	virtual void SendLogin            (const cPlayer & a_Player, const cWorld & a_World) override;

-	virtual void SendMetadata         (const cEntity & a_Entity) override;

-	virtual void SendPickupSpawn      (const cPickup & a_Pickup) override;

-	virtual void SendPlayerAnimation  (const cPlayer & a_Player, char a_Animation) override;

-	virtual void SendPlayerListItem   (const cPlayer & a_Player, bool a_IsOnline) override;

-	virtual void SendPlayerMoveLook   (void) override;

-	virtual void SendPlayerPosition   (void) override;

-	virtual void SendPlayerSpawn      (const cPlayer & a_Player) override;

-	virtual void SendRespawn          (void) override;

-	virtual void SendSoundEffect      (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;

-	virtual void SendBlockBreakAnim   (int a_entityID, int a_BlockX, int a_BlockY, int a_BlockZ, char stage) override;

-	virtual void SendSpawnMob         (const cMonster & a_Mob) override;

-	virtual void SendTeleportEntity   (const cEntity & a_Entity) override;

-	virtual void SendThunderbolt      (int a_BlockX, int a_BlockY, int a_BlockZ) override;

-	virtual void SendTimeUpdate       (Int64 a_WorldTime) override;

-	virtual void SendUnloadChunk      (int a_ChunkX, int a_ChunkZ) override;

-	virtual void SendUpdateSign       (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;

-	virtual void SendWeather          (eWeather a_Weather) override;

-	virtual void SendWholeInventory   (const cInventory & a_Inventory) override;

-	virtual void SendWholeInventory   (const cWindow    & a_Window) override;

-	virtual void SendWindowClose      (char a_WindowID) override;

-	virtual void SendWindowOpen       (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

-	virtual void SendUseBed           (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

-	virtual void SendSpawnObject      (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

+	virtual void SendBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType) override;

+	virtual void SendBlockChange        (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override;

+	virtual void SendBlockChanges       (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override;

+	virtual void SendChat               (const AString & a_Message) override;

+	virtual void SendChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override;

+	virtual void SendCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player) override;

+	virtual void SendDestroyEntity      (const cEntity & a_Entity) override;

+	virtual void SendDisconnect         (const AString & a_Reason) override;

+	virtual void SendEntHeadLook        (const cEntity & a_Entity) override;

+	virtual void SendEntLook            (const cEntity & a_Entity) override;

+	virtual void SendEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendEntityStatus       (const cEntity & a_Entity, char a_Status) override;

+	virtual void SendEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ) override;

+	virtual void SendGameMode           (eGameMode a_GameMode) override;

+	virtual void SendHealth             (void) override;

+	virtual void SendInventoryProgress  (char a_WindowID, short a_Progressbar, short a_Value) override;

+	virtual void SendInventorySlot      (char a_WindowID, short a_SlotNum, const cItem & a_Item) override;

+	virtual void SendKeepAlive          (int a_PingID) override;

+	virtual void SendLogin              (const cPlayer & a_Player, const cWorld & a_World) override;

+	virtual void SendMetadata           (const cEntity & a_Entity) override;

+	virtual void SendPickupSpawn        (const cPickup & a_Pickup) override;

+	virtual void SendPlayerAnimation    (const cPlayer & a_Player, char a_Animation) override;

+	virtual void SendPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline) override;

+	virtual void SendPlayerMoveLook     (void) override;

+	virtual void SendPlayerPosition     (void) override;

+	virtual void SendPlayerSpawn        (const cPlayer & a_Player) override;

+	virtual void SendRespawn            (void) override;

+	virtual void SendSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch) override;

+	virtual void SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data) override;

+	virtual void SendBlockBreakAnim     (int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage) override;

+	virtual void SendSpawnMob           (const cMonster & a_Mob) override;

+	virtual void SendTeleportEntity     (const cEntity & a_Entity) override;

+	virtual void SendThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ) override;

+	virtual void SendTimeUpdate         (Int64 a_WorldTime) override;

+	virtual void SendUnloadChunk        (int a_ChunkX, int a_ChunkZ) override;

+	virtual void SendUpdateSign         (int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) override;

+	virtual void SendWeather            (eWeather a_Weather) override;

+	virtual void SendWholeInventory     (const cInventory & a_Inventory) override;

+	virtual void SendWholeInventory     (const cWindow    & a_Window) override;

+	virtual void SendWindowClose        (char a_WindowID) override;

+	virtual void SendWindowOpen         (char a_WindowID, char a_WindowType, const AString & a_WindowTitle, char a_NumSlots) override;

+	virtual void SendUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ ) override;

+	virtual void SendSpawnObject        (const cEntity & a_Entity, char a_ObjectType, int a_ObjectData, short a_SpeedX, short a_SpeedY, short a_SpeedZ) override;

 	

 	virtual AString GetAuthServerID(void) override;

 

diff --git a/source/World.cpp b/source/World.cpp
index e6cd10f34..9ca84156b 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -1475,9 +1475,18 @@ void cWorld::BroadcastSoundEffect(const AString & a_SoundName, int a_SrcX, int a
 
 
 
-void cWorld::BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude )
+void cWorld::BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude)
 {
-	m_ChunkMap->BroadcastBlockBreakAnimation(a_entityID, a_blockX, a_blockY, a_blockZ, a_stage, a_Exclude);
+	m_ChunkMap->BroadcastSoundParticleEffect(a_EffectID, a_SrcX, a_SrcY, a_SrcZ, a_Data, a_Exclude);
+}
+
+
+
+
+
+void cWorld::BroadcastBlockBreakAnimation(int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage, const cClientHandle * a_Exclude )
+{
+	m_ChunkMap->BroadcastBlockBreakAnimation(a_EntityID, a_BlockX, a_BlockY, a_BlockZ, a_Stage, a_Exclude);
 }
 
 
diff --git a/source/World.h b/source/World.h
index 370dc904f..f9cc83f31 100644
--- a/source/World.h
+++ b/source/World.h
@@ -73,28 +73,29 @@ public:
 
 	int GetHeight( int a_X, int a_Z );												//tolua_export
 
-	void BroadcastChat(const AString & a_Message, const cClientHandle * a_Exclude = NULL);
-	void BroadcastPlayerAnimation(const cPlayer & a_Player, char a_Animation, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntityEquipment(const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item, const cClientHandle * a_Exclude = NULL);
-	void BroadcastTeleportEntity (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntRelMoveLook (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntRelMove     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntLook        (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntHeadLook    (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastBlockAction    (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType, const cClientHandle * a_Exclude = NULL);
-	void BroadcastDestroyEntity  (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastEntityStatus   (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
-	void BroadcastMetadata       (const cPawn & a_Pawn, const cClientHandle * a_Exclude = NULL);
-	void BroadcastSpawn          (cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
-	void BroadcastCollectPickup  (const cPickup & a_Pickup, const cPlayer & a_Player, const cClientHandle * a_Exclude = NULL);
-	void BroadcastWeather        (eWeather a_Weather, const cClientHandle * a_Exclude = NULL);
-	void BroadcastThunderbolt    (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
-	void BroadcastTimeUpdate     (const cClientHandle * a_Exclude = NULL);
-	void BroadcastChunkData      (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer, const cClientHandle * a_Exclude = NULL);
-	void BroadcastPlayerListItem (const cPlayer & a_Player, bool a_IsOnline, const cClientHandle * a_Exclude = NULL);
-	void BroadcastSoundEffect    (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL);   // a_Src coords are Block * 8
-	void BroadcastBlockBreakAnimation(int a_entityID, int a_blockX, int a_blockY, int a_blockZ, char a_stage, const cClientHandle * a_Exclude = NULL);
-	void BroadcastUseBed         (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
+	void BroadcastChat               (const AString & a_Message, const cClientHandle * a_Exclude = NULL);
+	void BroadcastPlayerAnimation    (const cPlayer & a_Player, char a_Animation, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntityEquipment    (const cEntity & a_Entity, short a_SlotNum, const cItem & a_Item, const cClientHandle * a_Exclude = NULL);
+	void BroadcastTeleportEntity     (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntRelMoveLook     (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntRelMove         (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntLook            (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntHeadLook        (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastBlockAction        (int a_BlockX, int a_BlockY, int a_BlockZ, char a_Byte1, char a_Byte2, BLOCKTYPE a_BlockType, const cClientHandle * a_Exclude = NULL);
+	void BroadcastDestroyEntity      (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastEntityStatus       (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
+	void BroadcastMetadata           (const cPawn & a_Pawn, const cClientHandle * a_Exclude = NULL);
+	void BroadcastSpawn              (cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
+	void BroadcastCollectPickup      (const cPickup & a_Pickup, const cPlayer & a_Player, const cClientHandle * a_Exclude = NULL);
+	void BroadcastWeather            (eWeather a_Weather, const cClientHandle * a_Exclude = NULL);
+	void BroadcastThunderbolt        (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
+	void BroadcastTimeUpdate         (const cClientHandle * a_Exclude = NULL);
+	void BroadcastChunkData          (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer, const cClientHandle * a_Exclude = NULL);
+	void BroadcastPlayerListItem     (const cPlayer & a_Player, bool a_IsOnline, const cClientHandle * a_Exclude = NULL);
+	void BroadcastSoundEffect        (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL);   // a_Src coords are Block * 8
+	void BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = NULL);
+	void BroadcastBlockBreakAnimation(int a_EntityID, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Stage, const cClientHandle * a_Exclude = NULL);
+	void BroadcastUseBed             (const cEntity & a_Entity, int a_BlockX, int a_BlockY, int a_BlockZ );
 
 	/// If there is a block entity at the specified coods, sends it to all clients except a_Exclude
 	void BroadcastBlockEntity    (int a_BlockX, int a_BlockY, int a_BlockZ, const cClientHandle * a_Exclude = NULL);
diff --git a/source/WorldStorage/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp
index 2036da92d..ded7e4327 100644
--- a/source/WorldStorage/WSSAnvil.cpp
+++ b/source/WorldStorage/WSSAnvil.cpp
@@ -12,6 +12,7 @@
 #include "../FurnaceEntity.h"
 #include "../SignEntity.h"
 #include "../NoteEntity.h"
+#include "../JukeboxEntity.h"
 #include "../Item.h"
 #include "../StringCompression.h"
 #include "../Entity.h"
@@ -156,6 +157,13 @@ protected:
 		m_Writer.EndCompound();
 	}
 
+	void AddJukeboxEntity(cJukeboxEntity * a_Jukebox)
+	{
+		m_Writer.BeginCompound("");
+		AddBasicTileEntity(a_Jukebox, "RecordPlayer");
+		m_Writer.AddInt("Record", a_Jukebox->GetRecord());
+		m_Writer.EndCompound();
+	}
 
 	virtual bool LightIsValid(bool a_IsLightValid) override
 	{
@@ -189,11 +197,12 @@ protected:
 		// Add tile-entity into NBT:
 		switch (a_Entity->GetBlockType())
 		{
-			case E_BLOCK_CHEST:     AddChestEntity  ((cChestEntity *)  a_Entity); break;
-			case E_BLOCK_FURNACE:   AddFurnaceEntity((cFurnaceEntity *)a_Entity); break;
+			case E_BLOCK_CHEST:      AddChestEntity  ((cChestEntity *)  a_Entity); break;
+			case E_BLOCK_FURNACE:    AddFurnaceEntity((cFurnaceEntity *)a_Entity); break;
 			case E_BLOCK_SIGN_POST:
-			case E_BLOCK_WALLSIGN:  AddSignEntity   ((cSignEntity *)   a_Entity); break;
-			case E_BLOCK_NOTE_BLOCK:  AddNoteEntity   ((cNoteEntity *)   a_Entity); break;
+			case E_BLOCK_WALLSIGN:   AddSignEntity   ((cSignEntity *)   a_Entity); break;
+			case E_BLOCK_NOTE_BLOCK: AddNoteEntity   ((cNoteEntity *)   a_Entity); break;
+			case E_BLOCK_JUKEBOX:    AddJukeboxEntity((cJukeboxEntity *)a_Entity); break;
 			default:
 			{
 				ASSERT(!"Unhandled block entity saved into Anvil");
@@ -662,6 +671,10 @@ void cWSSAnvil::LoadBlockEntitiesFromNBT(cBlockEntityList & a_BlockEntities, con
 		{
 			LoadNoteFromNBT(a_BlockEntities, a_NBT, Child);
 		}
+		else if (strncmp(a_NBT.GetData(sID), "RecordPlayer", a_NBT.GetDataLength(sID)) == 0)
+		{
+			LoadJukeboxFromNBT(a_BlockEntities, a_NBT, Child);
+		}
 		// TODO: Other block entities
 	}  // for Child - tag children
 }
@@ -844,6 +857,27 @@ void cWSSAnvil::LoadNoteFromNBT(cBlockEntityList & a_BlockEntities, const cParse
 
 
 
+void cWSSAnvil::LoadJukeboxFromNBT(cBlockEntityList & a_BlockEntities, const cParsedNBT & a_NBT, int a_TagIdx)
+{
+	ASSERT(a_NBT.GetType(a_TagIdx) == TAG_Compound);
+	int x, y, z;
+	if (!GetBlockEntityNBTPos(a_NBT, a_TagIdx, x, y, z))
+	{
+		return;
+	}
+	std::auto_ptr<cJukeboxEntity> Jukebox(new cJukeboxEntity(x, y, z, m_World));
+	int Record = a_NBT.FindChildByName(a_TagIdx, "Record");
+	if (Record >= 0)
+	{
+		Jukebox->SetRecord(a_NBT.GetInt(Record));
+	}
+	a_BlockEntities.push_back(Jukebox.release());
+}
+
+
+
+
+
 bool cWSSAnvil::GetBlockEntityNBTPos(const cParsedNBT & a_NBT, int a_TagIdx, int & a_X, int & a_Y, int & a_Z)
 {
 	int x = a_NBT.FindChildByName(a_TagIdx, "x");
diff --git a/source/WorldStorage/WSSAnvil.h b/source/WorldStorage/WSSAnvil.h
index 18e3ce8ad..b0641b586 100644
--- a/source/WorldStorage/WSSAnvil.h
+++ b/source/WorldStorage/WSSAnvil.h
@@ -112,6 +112,7 @@ protected:
 	void LoadFurnaceFromNBT(cBlockEntityList & a_BlockEntities, const cParsedNBT & a_NBT, int a_TagIdx);
 	void LoadSignFromNBT   (cBlockEntityList & a_BlockEntities, const cParsedNBT & a_NBT, int a_TagIdx);
 	void LoadNoteFromNBT   (cBlockEntityList & a_BlockEntities, const cParsedNBT & a_NBT, int a_TagIdx);
+	void LoadJukeboxFromNBT(cBlockEntityList & a_BlockEntities, const cParsedNBT & a_NBT, int a_TagIdx);
 	
 	/// Helper function for extracting the X, Y, and Z int subtags of a NBT compound; returns true if successful
 	bool GetBlockEntityNBTPos(const cParsedNBT & a_NBT, int a_TagIdx, int & a_X, int & a_Y, int & a_Z);
diff --git a/source/WorldStorage/WSSCompact.cpp b/source/WorldStorage/WSSCompact.cpp
index addb2a1cd..22e25eb6f 100644
--- a/source/WorldStorage/WSSCompact.cpp
+++ b/source/WorldStorage/WSSCompact.cpp
@@ -13,6 +13,7 @@
 #include "../SignEntity.h"
 #include "../FurnaceEntity.h"
 #include "../NoteEntity.h"
+#include "../JukeboxEntity.h"
 #include "../BlockID.h"
 
 
@@ -70,11 +71,12 @@ void cJsonChunkSerializer::BlockEntity(cBlockEntity * a_BlockEntity)
 	const char * SaveInto = NULL;
 	switch (a_BlockEntity->GetBlockType())
 	{
-		case E_BLOCK_CHEST:     SaveInto = "Chests";   break;
-		case E_BLOCK_FURNACE:   SaveInto = "Furnaces"; break;
-		case E_BLOCK_SIGN_POST: SaveInto = "Signs";    break;
-		case E_BLOCK_WALLSIGN:  SaveInto = "Signs";    break;
-		case E_BLOCK_NOTE_BLOCK:  SaveInto = "Notes";    break;
+		case E_BLOCK_CHEST:      SaveInto = "Chests";    break;
+		case E_BLOCK_FURNACE:    SaveInto = "Furnaces";  break;
+		case E_BLOCK_SIGN_POST:  SaveInto = "Signs";     break;
+		case E_BLOCK_WALLSIGN:   SaveInto = "Signs";     break;
+		case E_BLOCK_NOTE_BLOCK: SaveInto = "Notes";     break;
+		case E_BLOCK_JUKEBOX:    SaveInto = "Jukeboxes"; break;
 
 		default:
 		{
@@ -338,6 +340,26 @@ void cWSSCompact::LoadEntitiesFromJson(Json::Value & a_Value, cEntityList & a_En
 			}
 		}  // for itr - AllNotes[]
 	}
+
+	// Load jukeboxes
+	Json::Value AllJukeboxes = a_Value.get("Jukeboxes", Json::nullValue);
+	if( !AllJukeboxes.empty() )
+	{
+		for( Json::Value::iterator itr = AllJukeboxes.begin(); itr != AllJukeboxes.end(); ++itr )
+		{
+			Json::Value & Jukebox = *itr;
+			cJukeboxEntity * JukeboxEntity = new cJukeboxEntity(0, 0, 0, a_World);
+			if ( !JukeboxEntity->LoadFromJson( Jukebox ) )
+			{
+				LOGERROR("ERROR READING JUKEBOX FROM JSON!" );
+				delete JukeboxEntity;
+			}
+			else
+			{
+				a_BlockEntities.push_back( JukeboxEntity );
+			}
+		}  // for itr - AllJukeboxes[]
+	}
 }