X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=2148bfe59b438749d52dcac8ed668c3f6e5d080f;hb=569fca53089b7b7e87b02edd44e2ad47166f7af6;hp=e494056f27dcaeaeb56b75e4082df1423a32012d;hpb=75f3e6845187b539a82f8a5e66c2aa48caa0dca8;p=dragonfireclient.git

diff --git a/src/client.cpp b/src/client.cpp
index e494056f2..2148bfe59 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -25,33 +25,185 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "main.h"
 #include <sstream>
 #include "porting.h"
+#include "mapsector.h"
+#include "mapblock_mesh.h"
+#include "mapblock.h"
+#include "settings.h"
+#include "profiler.h"
+#include "log.h"
+#include "nodemetadata.h"
+#include "nodedef.h"
+#include "itemdef.h"
+#include <IFileSystem.h>
+#include "sha1.h"
+#include "base64.h"
+#include "clientmap.h"
+
+static std::string getTextureCacheDir()
+{
+	return porting::path_user + DIR_DELIM + "cache" + DIR_DELIM + "textures";
+}
+
+struct TextureRequest
+{
+	std::string name;
+
+	TextureRequest(const std::string &name_=""):
+		name(name_)
+	{}
+};
+
+/*
+	QueuedMeshUpdate
+*/
+
+QueuedMeshUpdate::QueuedMeshUpdate():
+	p(-1337,-1337,-1337),
+	data(NULL),
+	ack_block_to_server(false)
+{
+}
+
+QueuedMeshUpdate::~QueuedMeshUpdate()
+{
+	if(data)
+		delete data;
+}
+
+/*
+	MeshUpdateQueue
+*/
+	
+MeshUpdateQueue::MeshUpdateQueue()
+{
+	m_mutex.Init();
+}
+
+MeshUpdateQueue::~MeshUpdateQueue()
+{
+	JMutexAutoLock lock(m_mutex);
+
+	for(std::vector<QueuedMeshUpdate*>::iterator
+			i = m_queue.begin();
+			i != m_queue.end(); i++)
+	{
+		QueuedMeshUpdate *q = *i;
+		delete q;
+	}
+}
+
+/*
+	peer_id=0 adds with nobody to send to
+*/
+void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
+{
+	DSTACK(__FUNCTION_NAME);
+
+	assert(data);
+
+	JMutexAutoLock lock(m_mutex);
+
+	if(urgent)
+		m_urgents.insert(p);
+
+	/*
+		Find if block is already in queue.
+		If it is, update the data and quit.
+	*/
+	for(std::vector<QueuedMeshUpdate*>::iterator
+			i = m_queue.begin();
+			i != m_queue.end(); i++)
+	{
+		QueuedMeshUpdate *q = *i;
+		if(q->p == p)
+		{
+			if(q->data)
+				delete q->data;
+			q->data = data;
+			if(ack_block_to_server)
+				q->ack_block_to_server = true;
+			return;
+		}
+	}
+	
+	/*
+		Add the block
+	*/
+	QueuedMeshUpdate *q = new QueuedMeshUpdate;
+	q->p = p;
+	q->data = data;
+	q->ack_block_to_server = ack_block_to_server;
+	m_queue.push_back(q);
+}
+
+// Returned pointer must be deleted
+// Returns NULL if queue is empty
+QueuedMeshUpdate * MeshUpdateQueue::pop()
+{
+	JMutexAutoLock lock(m_mutex);
+
+	bool must_be_urgent = !m_urgents.empty();
+	for(std::vector<QueuedMeshUpdate*>::iterator
+			i = m_queue.begin();
+			i != m_queue.end(); i++)
+	{
+		QueuedMeshUpdate *q = *i;
+		if(must_be_urgent && m_urgents.count(q->p) == 0)
+			continue;
+		m_queue.erase(i);
+		m_urgents.erase(q->p);
+		return q;
+	}
+	return NULL;
+}
+
+/*
+	MeshUpdateThread
+*/
 
 void * MeshUpdateThread::Thread()
 {
 	ThreadStarted();
 
+	log_register_thread("MeshUpdateThread");
+
 	DSTACK(__FUNCTION_NAME);
 	
 	BEGIN_DEBUG_EXCEPTION_HANDLER
 
 	while(getRun())
 	{
+		/*// Wait for output queue to flush.
+		// Allow 2 in queue, this makes less frametime jitter.
+		// Umm actually, there is no much difference
+		if(m_queue_out.size() >= 2)
+		{
+			sleep_ms(3);
+			continue;
+		}*/
+
 		QueuedMeshUpdate *q = m_queue_in.pop();
 		if(q == NULL)
 		{
-			sleep_ms(50);
+			sleep_ms(3);
 			continue;
 		}
 
-		scene::SMesh *mesh_new = NULL;
-		mesh_new = makeMapBlockMesh(q->data);
+		ScopeProfiler sp(g_profiler, "Client: Mesh making");
+
+		MapBlockMesh *mesh_new = new MapBlockMesh(q->data);
+		if(mesh_new->getMesh()->getMeshBufferCount() == 0)
+		{
+			delete mesh_new;
+			mesh_new = NULL;
+		}
 
 		MeshUpdateResult r;
 		r.p = q->p;
 		r.mesh = mesh_new;
 		r.ack_block_to_server = q->ack_block_to_server;
 
-		/*dstream<<"MeshUpdateThread: Processed "
+		/*infostream<<"MeshUpdateThread: Processed "
 				<<"("<<q->p.X<<","<<q->p.Y<<","<<q->p.Z<<")"
 				<<std::endl;*/
 
@@ -60,7 +212,7 @@ void * MeshUpdateThread::Thread()
 		delete q;
 	}
 
-	END_DEBUG_EXCEPTION_HANDLER
+	END_DEBUG_EXCEPTION_HANDLER(errorstream)
 
 	return NULL;
 }
@@ -69,51 +221,65 @@ Client::Client(
 		IrrlichtDevice *device,
 		const char *playername,
 		std::string password,
-		MapDrawControl &control):
-	m_mesh_update_thread(),
+		MapDrawControl &control,
+		IWritableTextureSource *tsrc,
+		IWritableItemDefManager *itemdef,
+		IWritableNodeDefManager *nodedef
+):
+	m_tsrc(tsrc),
+	m_itemdef(itemdef),
+	m_nodedef(nodedef),
+	m_mesh_update_thread(this),
 	m_env(
-		new ClientMap(this, control,
+		new ClientMap(this, this, control,
 			device->getSceneManager()->getRootSceneNode(),
 			device->getSceneManager(), 666),
-		device->getSceneManager()
+		device->getSceneManager(),
+		tsrc, this, device
 	),
 	m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
 	m_device(device),
-	camera_position(0,0,0),
-	camera_direction(0,0,1),
 	m_server_ser_ver(SER_FMT_VER_INVALID),
+	m_playeritem(0),
 	m_inventory_updated(false),
-	m_time_of_day(0),
+	m_inventory_from_server(NULL),
+	m_inventory_from_server_age(0.0),
+	m_animation_time(0),
+	m_crack_level(-1),
+	m_crack_pos(0,0,0),
 	m_map_seed(0),
 	m_password(password),
-	m_access_denied(false)
+	m_access_denied(false),
+	m_texture_receive_progress(0),
+	m_textures_received(false),
+	m_itemdef_received(false),
+	m_nodedef_received(false),
+	m_time_of_day_set(false),
+	m_last_time_of_day_f(-1),
+	m_time_of_day_update_timer(0)
 {
 	m_packetcounter_timer = 0.0;
-	m_delete_unused_sectors_timer = 0.0;
+	//m_delete_unused_sectors_timer = 0.0;
 	m_connection_reinit_timer = 0.0;
 	m_avg_rtt_timer = 0.0;
 	m_playerpos_send_timer = 0.0;
 	m_ignore_damage_timer = 0.0;
 
-	//m_env_mutex.Init();
-	//m_con_mutex.Init();
-
-	m_mesh_update_thread.Start();
-
+	// Build main texture atlas, now that the GameDef exists (that is, us)
+	if(g_settings->getBool("enable_texture_atlas"))
+		m_tsrc->buildMainAtlas(this);
+	else
+		infostream<<"Not building texture atlas."<<std::endl;
+	
 	/*
 		Add local player
 	*/
 	{
-		//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
-		Player *player = new LocalPlayer();
+		Player *player = new LocalPlayer(this);
 
 		player->updateName(playername);
 
 		m_env.addPlayer(player);
-		
-		// Initialize player in the inventory context
-		m_inventory_context.current_player = player;
 	}
 }
 
@@ -127,13 +293,15 @@ Client::~Client()
 	m_mesh_update_thread.setRun(false);
 	while(m_mesh_update_thread.IsRunning())
 		sleep_ms(100);
+
+	delete m_inventory_from_server;
 }
 
 void Client::connect(Address address)
 {
 	DSTACK(__FUNCTION_NAME);
 	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-	m_con.setTimeoutMs(0);
+	m_con.SetTimeoutMs(0);
 	m_con.Connect(address);
 }
 
@@ -163,7 +331,13 @@ void Client::step(float dtime)
 	else
 		m_ignore_damage_timer = 0.0;
 	
-	//dstream<<"Client steps "<<dtime<<std::endl;
+	m_animation_time += dtime;
+	if(m_animation_time > 60.0)
+		m_animation_time -= 60.0;
+
+	m_time_of_day_update_timer += dtime;
+	
+	//infostream<<"Client steps "<<dtime<<std::endl;
 
 	{
 		//TimeTaker timer("ReceiveAll()", m_device);
@@ -188,12 +362,16 @@ void Client::step(float dtime)
 		{
 			counter = 20.0;
 			
-			dout_client<<"Client packetcounter (20s):"<<std::endl;
-			m_packetcounter.print(dout_client);
+			infostream<<"Client packetcounter (20s):"<<std::endl;
+			m_packetcounter.print(infostream);
 			m_packetcounter.clear();
 		}
 	}
+	
+	// Get connection status
+	bool connected = connectedAndInitialized();
 
+#if 0
 	{
 		/*
 			Delete unused sectors
@@ -215,24 +393,24 @@ void Client::step(float dtime)
 			core::list<v3s16> deleted_blocks;
 
 			float delete_unused_sectors_timeout = 
-				g_settings.getFloat("client_delete_unused_sectors_timeout");
+				g_settings->getFloat("client_delete_unused_sectors_timeout");
 	
 			// Delete sector blocks
-			/*u32 num = m_env.getMap().deleteUnusedSectors
+			/*u32 num = m_env.getMap().unloadUnusedData
 					(delete_unused_sectors_timeout,
 					true, &deleted_blocks);*/
 			
 			// Delete whole sectors
-			u32 num = m_env.getMap().deleteUnusedSectors
+			m_env.getMap().unloadUnusedData
 					(delete_unused_sectors_timeout,
-					false, &deleted_blocks);
+					&deleted_blocks);
 
-			if(num > 0)
+			if(deleted_blocks.size() > 0)
 			{
-				/*dstream<<DTIME<<"Client: Deleted blocks of "<<num
+				/*infostream<<"Client: Deleted blocks of "<<num
+						<<" unused sectors"<<std::endl;*/
+				/*infostream<<"Client: Deleted "<<num
 						<<" unused sectors"<<std::endl;*/
-				dstream<<DTIME<<"Client: Deleted "<<num
-						<<" unused sectors"<<std::endl;
 				
 				/*
 					Send info to server
@@ -282,8 +460,7 @@ void Client::step(float dtime)
 			}
 		}
 	}
-
-	bool connected = connectedAndInitialized();
+#endif
 
 	if(connected == false)
 	{
@@ -302,19 +479,23 @@ void Client::step(float dtime)
 			// [0] u16 TOSERVER_INIT
 			// [2] u8 SER_FMT_VER_HIGHEST
 			// [3] u8[20] player_name
-			// [23] u8[28] password
-			SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE);
+			// [23] u8[28] password (new in some version)
+			// [51] u16 client network protocol version (new in some version)
+			SharedBuffer<u8> data(2+1+PLAYERNAME_SIZE+PASSWORD_SIZE+2);
 			writeU16(&data[0], TOSERVER_INIT);
 			writeU8(&data[2], SER_FMT_VER_HIGHEST);
 
 			memset((char*)&data[3], 0, PLAYERNAME_SIZE);
 			snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
 
-			/*dstream<<"Client: password hash is \""<<m_password<<"\""
+			/*infostream<<"Client: sending initial password hash: \""<<m_password<<"\""
 					<<std::endl;*/
 
 			memset((char*)&data[23], 0, PASSWORD_SIZE);
 			snprintf((char*)&data[23], PASSWORD_SIZE, "%s", m_password.c_str());
+			
+			// This should be incremented in each version
+			writeU16(&data[51], PROTOCOL_VERSION);
 
 			// Send as unreliable
 			Send(0, data, false);
@@ -328,6 +509,67 @@ void Client::step(float dtime)
 		Do stuff if connected
 	*/
 	
+	/*
+		Run Map's timers and unload unused data
+	*/
+	const float map_timer_and_unload_dtime = 5.25;
+	if(m_map_timer_and_unload_interval.step(dtime, map_timer_and_unload_dtime))
+	{
+		ScopeProfiler sp(g_profiler, "Client: map timer and unload");
+		core::list<v3s16> deleted_blocks;
+		m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
+				g_settings->getFloat("client_unload_unused_data_timeout"),
+				&deleted_blocks);
+				
+		/*if(deleted_blocks.size() > 0)
+			infostream<<"Client: Unloaded "<<deleted_blocks.size()
+					<<" unused blocks"<<std::endl;*/
+			
+		/*
+			Send info to server
+			NOTE: This loop is intentionally iterated the way it is.
+		*/
+
+		core::list<v3s16>::Iterator i = deleted_blocks.begin();
+		core::list<v3s16> sendlist;
+		for(;;)
+		{
+			if(sendlist.size() == 255 || i == deleted_blocks.end())
+			{
+				if(sendlist.size() == 0)
+					break;
+				/*
+					[0] u16 command
+					[2] u8 count
+					[3] v3s16 pos_0
+					[3+6] v3s16 pos_1
+					...
+				*/
+				u32 replysize = 2+1+6*sendlist.size();
+				SharedBuffer<u8> reply(replysize);
+				writeU16(&reply[0], TOSERVER_DELETEDBLOCKS);
+				reply[2] = sendlist.size();
+				u32 k = 0;
+				for(core::list<v3s16>::Iterator
+						j = sendlist.begin();
+						j != sendlist.end(); j++)
+				{
+					writeV3S16(&reply[2+1+6*k], *j);
+					k++;
+				}
+				m_con.Send(PEER_ID_SERVER, 1, reply, true);
+
+				if(i == deleted_blocks.end())
+					break;
+
+				sendlist.clear();
+			}
+
+			sendlist.push_back(*i);
+			i++;
+		}
+	}
+
 	/*
 		Handle environment
 	*/
@@ -343,25 +585,7 @@ void Client::step(float dtime)
 		//TimeTaker envtimer("env step", m_device);
 		// Step environment
 		m_env.step(dtime);
-
-		// Step active blocks
-		for(core::map<v3s16, bool>::Iterator
-				i = m_active_blocks.getIterator();
-				i.atEnd() == false; i++)
-		{
-			v3s16 p = i.getNode()->getKey();
-
-			MapBlock *block = NULL;
-			try
-			{
-				block = m_env.getMap().getBlockNoCreate(p);
-				block->stepObjects(dtime, false, m_env.getDayNightRatio());
-			}
-			catch(InvalidPositionException &e)
-			{
-			}
-		}
-
+		
 		/*
 			Get events
 		*/
@@ -377,7 +601,9 @@ void Client::step(float dtime)
 				if(m_ignore_damage_timer <= 0)
 				{
 					u8 damage = event.player_damage.amount;
-					sendDamage(damage);
+					
+					if(event.player_damage.send_to_server)
+						sendDamage(damage);
 
 					// Add to ClientEvent queue
 					ClientEvent event;
@@ -400,8 +626,8 @@ void Client::step(float dtime)
 			counter = 0.0;
 			//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 			// connectedAndInitialized() is true, peer exists.
-			con::Peer *peer = m_con.GetPeer(PEER_ID_SERVER);
-			dstream<<DTIME<<"Client: avg_rtt="<<peer->avg_rtt<<std::endl;
+			float avg_rtt = m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+			infostream<<"Client: avg_rtt="<<avg_rtt<<std::endl;
 		}
 	}
 
@@ -427,7 +653,7 @@ void Client::step(float dtime)
 		//TimeTaker timer("** Processing mesh update result queue");
 		// 0ms
 		
-		/*dstream<<"Mesh update result queue size is "
+		/*infostream<<"Mesh update result queue size is "
 				<<m_mesh_update_thread.m_queue_out.size()
 				<<std::endl;*/
 
@@ -437,11 +663,22 @@ void Client::step(float dtime)
 			MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
 			if(block)
 			{
-				block->replaceMesh(r.mesh);
+				//JMutexAutoLock lock(block->mesh_mutex);
+
+				// Delete the old mesh
+				if(block->mesh != NULL)
+				{
+					// TODO: Remove hardware buffers of meshbuffers of block->mesh
+					delete block->mesh;
+					block->mesh = NULL;
+				}
+
+				// Replace with the new mesh
+				block->mesh = r.mesh;
 			}
 			if(r.ack_block_to_server)
 			{
-				/*dstream<<"Client: ACK block ("<<r.p.X<<","<<r.p.Y
+				/*infostream<<"Client: ACK block ("<<r.p.X<<","<<r.p.Y
 						<<","<<r.p.Z<<")"<<std::endl;*/
 				/*
 					Acknowledge block
@@ -463,17 +700,41 @@ void Client::step(float dtime)
 			}
 		}
 	}
+
+	/*
+		If the server didn't update the inventory in a while, revert
+		the local inventory (so the player notices the lag problem
+		and knows something is wrong).
+	*/
+	if(m_inventory_from_server)
+	{
+		float interval = 10.0;
+		float count_before = floor(m_inventory_from_server_age / interval);
+
+		m_inventory_from_server_age += dtime;
+
+		float count_after = floor(m_inventory_from_server_age / interval);
+
+		if(count_after != count_before)
+		{
+			// Do this every <interval> seconds after TOCLIENT_INVENTORY
+			// Reset the locally changed inventory to the authoritative inventory
+			Player *player = m_env.getLocalPlayer();
+			player->inventory = *m_inventory_from_server;
+			m_inventory_updated = true;
+		}
+	}
 }
 
 // Virtual methods from con::PeerHandler
 void Client::peerAdded(con::Peer *peer)
 {
-	derr_client<<"Client::peerAdded(): peer->id="
+	infostream<<"Client::peerAdded(): peer->id="
 			<<peer->id<<std::endl;
 }
 void Client::deletingPeer(con::Peer *peer, bool timeout)
 {
-	derr_client<<"Client::deletingPeer(): "
+	infostream<<"Client::deletingPeer(): "
 			"Server Peer is getting deleted "
 			<<"(timeout="<<timeout<<")"<<std::endl;
 }
@@ -481,8 +742,14 @@ void Client::deletingPeer(con::Peer *peer, bool timeout)
 void Client::ReceiveAll()
 {
 	DSTACK(__FUNCTION_NAME);
+	u32 start_ms = porting::getTimeMs();
 	for(;;)
 	{
+		// Limit time even if there would be huge amounts of data to
+		// process
+		if(porting::getTimeMs() > start_ms + 100)
+			break;
+		
 		try{
 			Receive();
 		}
@@ -492,7 +759,7 @@ void Client::ReceiveAll()
 		}
 		catch(con::InvalidIncomingDataException &e)
 		{
-			dout_client<<DTIME<<"Client::ReceiveAll(): "
+			infostream<<"Client::ReceiveAll(): "
 					"InvalidIncomingDataException: what()="
 					<<e.what()<<std::endl;
 		}
@@ -502,14 +769,13 @@ void Client::ReceiveAll()
 void Client::Receive()
 {
 	DSTACK(__FUNCTION_NAME);
-	u32 data_maxsize = 200000;
-	Buffer<u8> data(data_maxsize);
+	SharedBuffer<u8> data;
 	u16 sender_peer_id;
 	u32 datasize;
 	{
 		//TimeTaker t1("con mutex and receive", m_device);
 		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-		datasize = m_con.Receive(sender_peer_id, *data, data_maxsize);
+		datasize = m_con.Receive(sender_peer_id, data);
 	}
 	//TimeTaker t1("ProcessData", m_device);
 	ProcessData(*data, datasize, sender_peer_id);
@@ -531,7 +797,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 	ToClientCommand command = (ToClientCommand)readU16(&data[0]);
 
-	//dstream<<"Client: received command="<<command<<std::endl;
+	//infostream<<"Client: received command="<<command<<std::endl;
 	m_packetcounter.add((u16)command);
 	
 	/*
@@ -540,23 +806,15 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 	*/
 	if(sender_peer_id != PEER_ID_SERVER)
 	{
-		dout_client<<DTIME<<"Client::ProcessData(): Discarding data not "
+		infostream<<"Client::ProcessData(): Discarding data not "
 				"coming from server: peer_id="<<sender_peer_id
 				<<std::endl;
 		return;
 	}
 
-	con::Peer *peer;
-	{
-		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-		// All data is coming from the server
-		// PeerNotFoundException is handled by caller.
-		peer = m_con.GetPeer(PEER_ID_SERVER);
-	}
-
 	u8 ser_version = m_server_ser_ver;
 
-	//dstream<<"Client received command="<<(int)command<<std::endl;
+	//infostream<<"Client received command="<<(int)command<<std::endl;
 
 	if(command == TOCLIENT_INIT)
 	{
@@ -565,13 +823,13 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 		u8 deployed = data[2];
 
-		dout_client<<DTIME<<"Client: TOCLIENT_INIT received with "
+		infostream<<"Client: TOCLIENT_INIT received with "
 				"deployed="<<((int)deployed&0xff)<<std::endl;
 
 		if(deployed < SER_FMT_VER_LOWEST
 				|| deployed > SER_FMT_VER_HIGHEST)
 		{
-			derr_client<<DTIME<<"Client: TOCLIENT_INIT: Server sent "
+			infostream<<"Client: TOCLIENT_INIT: Server sent "
 					<<"unsupported ser_fmt_ver"<<std::endl;
 			return;
 		}
@@ -597,7 +855,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		{
 			// Get map seed
 			m_map_seed = readU64(&data[2+1+6]);
-			dstream<<"Client: received map seed: "<<m_map_seed<<std::endl;
+			infostream<<"Client: received map seed: "<<m_map_seed<<std::endl;
 		}
 		
 		// Reply to server
@@ -628,7 +886,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 	if(ser_version == SER_FMT_VER_INVALID)
 	{
-		dout_client<<DTIME<<"WARNING: Client: Server serialization"
+		infostream<<"Client: Server serialization"
 				" format invalid or not initialized."
 				" Skipping incoming command="<<command<<std::endl;
 		return;
@@ -649,9 +907,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		
 		//TimeTaker t1("TOCLIENT_REMOVENODE");
 		
-		// This will clear the cracking animation after digging
-		((ClientMap&)m_env.getMap()).clearTempMod(p);
-
 		removeNode(p);
 	}
 	else if(command == TOCLIENT_ADDNODE)
@@ -682,9 +937,9 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		p.Y = readS16(&data[4]);
 		p.Z = readS16(&data[6]);
 		
-		/*dout_client<<DTIME<<"Client: Thread: BLOCKDATA for ("
+		/*infostream<<"Client: Thread: BLOCKDATA for ("
 				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-		/*dstream<<DTIME<<"Client: Thread: BLOCKDATA for ("
+		/*infostream<<"Client: Thread: BLOCKDATA for ("
 				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
 		
 		std::string datastring((char*)&data[8], datasize-8);
@@ -693,78 +948,33 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		MapSector *sector;
 		MapBlock *block;
 		
-		{ //envlock
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			
-			v2s16 p2d(p.X, p.Z);
-			sector = m_env.getMap().emergeSector(p2d);
-			
-			v2s16 sp = sector->getPos();
-			if(sp != p2d)
-			{
-				dstream<<"ERROR: Got sector with getPos()="
-						<<"("<<sp.X<<","<<sp.Y<<"), tried to get"
-						<<"("<<p2d.X<<","<<p2d.Y<<")"<<std::endl;
-			}
-
-			assert(sp == p2d);
-			//assert(sector->getPos() == p2d);
+		v2s16 p2d(p.X, p.Z);
+		sector = m_env.getMap().emergeSector(p2d);
+		
+		assert(sector->getPos() == p2d);
 
-			//TimeTaker timer("MapBlock deSerialize");
-			// 0ms
-			
-			try{
-				block = sector->getBlockNoCreate(p.Y);
-				/*
-					Update an existing block
-				*/
-				//dstream<<"Updating"<<std::endl;
-				block->deSerialize(istr, ser_version);
-				//block->setChangedFlag();
-			}
-			catch(InvalidPositionException &e)
-			{
-				/*
-					Create a new block
-				*/
-				//dstream<<"Creating new"<<std::endl;
-				block = new MapBlock(&m_env.getMap(), p);
-				block->deSerialize(istr, ser_version);
-				sector->insertBlock(block);
-				//block->setChangedFlag();
-
-				//DEBUG
-				/*NodeMod mod;
-				mod.type = NODEMOD_CHANGECONTENT;
-				mod.param = CONTENT_MESE;
-				block->setTempMod(v3s16(8,10,8), mod);
-				block->setTempMod(v3s16(8,9,8), mod);
-				block->setTempMod(v3s16(8,8,8), mod);
-				block->setTempMod(v3s16(8,7,8), mod);
-				block->setTempMod(v3s16(8,6,8), mod);*/
-#if 0
-				/*
-					Add some coulds
-					Well, this is a dumb way to do it, they should just
-					be drawn as separate objects. But the looks of them
-					can be tested this way.
-				*/
-				if(p.Y == 3)
-				{
-					NodeMod mod;
-					mod.type = NODEMOD_CHANGECONTENT;
-					mod.param = CONTENT_CLOUD;
-					v3s16 p2;
-					p2.Y = 8;
-					for(p2.X=3; p2.X<=13; p2.X++)
-					for(p2.Z=3; p2.Z<=13; p2.Z++)
-					{
-						block->setTempMod(p2, mod);
-					}
-				}
-#endif
-			}
-		} //envlock
+		//TimeTaker timer("MapBlock deSerialize");
+		// 0ms
+		
+		block = sector->getBlockNoCreateNoEx(p.Y);
+		if(block)
+		{
+			/*
+				Update an existing block
+			*/
+			//infostream<<"Updating"<<std::endl;
+			block->deSerialize(istr, ser_version, false);
+		}
+		else
+		{
+			/*
+				Create a new block
+			*/
+			//infostream<<"Creating new"<<std::endl;
+			block = new MapBlock(&m_env.getMap(), p, this);
+			block->deSerialize(istr, ser_version, false);
+			sector->insertBlock(block);
+		}
 
 #if 0
 		/*
@@ -787,475 +997,119 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 #endif
 
 		/*
-			Update Mesh of this block and blocks at x-, y- and z-.
-			Environment should not be locked as it interlocks with the
-			main thread, from which is will want to retrieve textures.
+			Add it to mesh update queue and set it to be acknowledged after update.
 		*/
-
-		//m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
-		
+		//infostream<<"Adding mesh update task for received block"<<std::endl;
 		addUpdateMeshTaskWithEdge(p, true);
 	}
-	else if(command == TOCLIENT_PLAYERPOS)
+	else if(command == TOCLIENT_INVENTORY)
 	{
-		dstream<<"WARNING: Received deprecated TOCLIENT_PLAYERPOS"
-				<<std::endl;
-		/*u16 our_peer_id;
-		{
-			//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-			our_peer_id = m_con.GetPeerID();
-		}
-		// Cancel if we don't have a peer id
-		if(our_peer_id == PEER_ID_INEXISTENT){
-			dout_client<<DTIME<<"TOCLIENT_PLAYERPOS cancelled: "
-					"we have no peer id"
-					<<std::endl;
+		if(datasize < 3)
 			return;
-		}*/
+
+		//TimeTaker t1("Parsing TOCLIENT_INVENTORY", m_device);
 
 		{ //envlock
+			//TimeTaker t2("mutex locking", m_device);
 			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+			//t2.stop();
 			
-			u32 player_size = 2+12+12+4+4;
-				
-			u32 player_count = (datasize-2) / player_size;
-			u32 start = 2;
-			for(u32 i=0; i<player_count; i++)
-			{
-				u16 peer_id = readU16(&data[start]);
+			//TimeTaker t3("istringstream init", m_device);
+			std::string datastring((char*)&data[2], datasize-2);
+			std::istringstream is(datastring, std::ios_base::binary);
+			//t3.stop();
+			
+			//m_env.printPlayers(infostream);
+
+			//TimeTaker t4("player get", m_device);
+			Player *player = m_env.getLocalPlayer();
+			assert(player != NULL);
+			//t4.stop();
 
-				Player *player = m_env.getPlayer(peer_id);
+			//TimeTaker t1("inventory.deSerialize()", m_device);
+			player->inventory.deSerialize(is);
+			//t1.stop();
 
-				// Skip if player doesn't exist
-				if(player == NULL)
-				{
-					start += player_size;
-					continue;
-				}
+			m_inventory_updated = true;
 
-				// Skip if player is local player
-				if(player->isLocal())
-				{
-					start += player_size;
-					continue;
-				}
+			delete m_inventory_from_server;
+			m_inventory_from_server = new Inventory(player->inventory);
+			m_inventory_from_server_age = 0.0;
 
-				v3s32 ps = readV3S32(&data[start+2]);
-				v3s32 ss = readV3S32(&data[start+2+12]);
-				s32 pitch_i = readS32(&data[start+2+12+12]);
-				s32 yaw_i = readS32(&data[start+2+12+12+4]);
-				/*dstream<<"Client: got "
-						<<"pitch_i="<<pitch_i
-						<<" yaw_i="<<yaw_i<<std::endl;*/
-				f32 pitch = (f32)pitch_i / 100.0;
-				f32 yaw = (f32)yaw_i / 100.0;
-				v3f position((f32)ps.X/100., (f32)ps.Y/100., (f32)ps.Z/100.);
-				v3f speed((f32)ss.X/100., (f32)ss.Y/100., (f32)ss.Z/100.);
-				player->setPosition(position);
-				player->setSpeed(speed);
-				player->setPitch(pitch);
-				player->setYaw(yaw);
-
-				/*dstream<<"Client: player "<<peer_id
-						<<" pitch="<<pitch
-						<<" yaw="<<yaw<<std::endl;*/
-
-				start += player_size;
-			}
-		} //envlock
+			//infostream<<"Client got player inventory:"<<std::endl;
+			//player->inventory.print(infostream);
+		}
 	}
-	else if(command == TOCLIENT_PLAYERINFO)
+	else if(command == TOCLIENT_TIME_OF_DAY)
 	{
-		u16 our_peer_id;
-		{
-			//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-			our_peer_id = m_con.GetPeerID();
-		}
-		// Cancel if we don't have a peer id
-		if(our_peer_id == PEER_ID_INEXISTENT){
-			dout_client<<DTIME<<"TOCLIENT_PLAYERINFO cancelled: "
-					"we have no peer id"
-					<<std::endl;
+		if(datasize < 4)
 			return;
+		
+		u16 time_of_day = readU16(&data[2]);
+		time_of_day = time_of_day % 24000;
+		//infostream<<"Client: time_of_day="<<time_of_day<<std::endl;
+		float time_speed = 0;
+		if(datasize >= 2 + 2 + 4){
+			time_speed = readF1000(&data[4]);
+		} else {
+			// Old message; try to approximate speed of time by ourselves
+			float time_of_day_f = (float)time_of_day / 24000.0;
+			float tod_diff_f = 0;
+			if(time_of_day_f < 0.2 && m_last_time_of_day_f > 0.8)
+				tod_diff_f = time_of_day_f - m_last_time_of_day_f + 1.0;
+			else
+				tod_diff_f = time_of_day_f - m_last_time_of_day_f;
+			m_last_time_of_day_f = time_of_day_f;
+			float time_diff = m_time_of_day_update_timer;
+			m_time_of_day_update_timer = 0;
+			if(m_time_of_day_set){
+				time_speed = 3600.0*24.0 * tod_diff_f / time_diff;
+				infostream<<"Client: Measured time_of_day speed (old format): "
+						<<time_speed<<" tod_diff_f="<<tod_diff_f
+						<<" time_diff="<<time_diff<<std::endl;
+			}
 		}
 		
-		//dstream<<DTIME<<"Client: Server reports players:"<<std::endl;
-
-		{ //envlock
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			
-			u32 item_size = 2+PLAYERNAME_SIZE;
-			u32 player_count = (datasize-2) / item_size;
-			u32 start = 2;
-			// peer_ids
-			core::list<u16> players_alive;
-			for(u32 i=0; i<player_count; i++)
-			{
-				// Make sure the name ends in '\0'
-				data[start+2+20-1] = 0;
-
-				u16 peer_id = readU16(&data[start]);
+		// Update environment
+		m_env.setTimeOfDay(time_of_day);
+		m_env.setTimeOfDaySpeed(time_speed);
+		m_time_of_day_set = true;
+
+		u32 dr = m_env.getDayNightRatio();
+		verbosestream<<"Client: time_of_day="<<time_of_day
+				<<" time_speed="<<time_speed
+				<<" dr="<<dr<<std::endl;
+	}
+	else if(command == TOCLIENT_CHAT_MESSAGE)
+	{
+		/*
+			u16 command
+			u16 length
+			wstring message
+		*/
+		u8 buf[6];
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		
+		// Read stuff
+		is.read((char*)buf, 2);
+		u16 len = readU16(buf);
+		
+		std::wstring message;
+		for(u16 i=0; i<len; i++)
+		{
+			is.read((char*)buf, 2);
+			message += (wchar_t)readU16(buf);
+		}
 
-				players_alive.push_back(peer_id);
-				
-				/*dstream<<DTIME<<"peer_id="<<peer_id
-						<<" name="<<((char*)&data[start+2])<<std::endl;*/
-
-				// Don't update the info of the local player
-				if(peer_id == our_peer_id)
-				{
-					start += item_size;
-					continue;
-				}
-
-				Player *player = m_env.getPlayer(peer_id);
-
-				// Create a player if it doesn't exist
-				if(player == NULL)
-				{
-					player = new RemotePlayer(
-							m_device->getSceneManager()->getRootSceneNode(),
-							m_device,
-							-1);
-					player->peer_id = peer_id;
-					m_env.addPlayer(player);
-					dout_client<<DTIME<<"Client: Adding new player "
-							<<peer_id<<std::endl;
-				}
-				
-				player->updateName((char*)&data[start+2]);
-
-				start += item_size;
-			}
-			
-			/*
-				Remove those players from the environment that
-				weren't listed by the server.
-			*/
-			//dstream<<DTIME<<"Removing dead players"<<std::endl;
-			core::list<Player*> players = m_env.getPlayers();
-			core::list<Player*>::Iterator ip;
-			for(ip=players.begin(); ip!=players.end(); ip++)
-			{
-				// Ingore local player
-				if((*ip)->isLocal())
-					continue;
-				
-				// Warn about a special case
-				if((*ip)->peer_id == 0)
-				{
-					dstream<<DTIME<<"WARNING: Client: Removing "
-							"dead player with id=0"<<std::endl;
-				}
-
-				bool is_alive = false;
-				core::list<u16>::Iterator i;
-				for(i=players_alive.begin(); i!=players_alive.end(); i++)
-				{
-					if((*ip)->peer_id == *i)
-					{
-						is_alive = true;
-						break;
-					}
-				}
-				/*dstream<<DTIME<<"peer_id="<<((*ip)->peer_id)
-						<<" is_alive="<<is_alive<<std::endl;*/
-				if(is_alive)
-					continue;
-				dstream<<DTIME<<"Removing dead player "<<(*ip)->peer_id
-						<<std::endl;
-				m_env.removePlayer((*ip)->peer_id);
-			}
-		} //envlock
-	}
-	else if(command == TOCLIENT_SECTORMETA)
-	{
-		/*
-			[0] u16 command
-			[2] u8 sector count
-			[3...] v2s16 pos + sector metadata
-		*/
-		if(datasize < 3)
-			return;
-
-		//dstream<<"Client received TOCLIENT_SECTORMETA"<<std::endl;
-
-		{ //envlock
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			
-			std::string datastring((char*)&data[2], datasize-2);
-			std::istringstream is(datastring, std::ios_base::binary);
-
-			u8 buf[4];
-
-			is.read((char*)buf, 1);
-			u16 sector_count = readU8(buf);
-			
-			//dstream<<"sector_count="<<sector_count<<std::endl;
-
-			for(u16 i=0; i<sector_count; i++)
-			{
-				// Read position
-				is.read((char*)buf, 4);
-				v2s16 pos = readV2S16(buf);
-				/*dstream<<"Client: deserializing sector at "
-						<<"("<<pos.X<<","<<pos.Y<<")"<<std::endl;*/
-				// Create sector
-				assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
-				((ClientMap&)m_env.getMap()).deSerializeSector(pos, is);
-			}
-		} //envlock
-	}
-	else if(command == TOCLIENT_INVENTORY)
-	{
-		if(datasize < 3)
-			return;
-
-		//TimeTaker t1("Parsing TOCLIENT_INVENTORY", m_device);
-
-		{ //envlock
-			//TimeTaker t2("mutex locking", m_device);
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			//t2.stop();
-			
-			//TimeTaker t3("istringstream init", m_device);
-			std::string datastring((char*)&data[2], datasize-2);
-			std::istringstream is(datastring, std::ios_base::binary);
-			//t3.stop();
-			
-			//m_env.printPlayers(dstream);
-
-			//TimeTaker t4("player get", m_device);
-			Player *player = m_env.getLocalPlayer();
-			assert(player != NULL);
-			//t4.stop();
-
-			//TimeTaker t1("inventory.deSerialize()", m_device);
-			player->inventory.deSerialize(is);
-			//t1.stop();
-
-			m_inventory_updated = true;
-
-			//dstream<<"Client got player inventory:"<<std::endl;
-			//player->inventory.print(dstream);
-		}
-	}
-	//DEBUG
-	else if(command == TOCLIENT_OBJECTDATA)
-	//else if(0)
-	{
-		// Strip command word and create a stringstream
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
-		
-		{ //envlock
-		
-		//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
-		u8 buf[12];
-
-		/*
-			Read players
-		*/
-
-		is.read((char*)buf, 2);
-		u16 playercount = readU16(buf);
-		
-		for(u16 i=0; i<playercount; i++)
-		{
-			is.read((char*)buf, 2);
-			u16 peer_id = readU16(buf);
-			is.read((char*)buf, 12);
-			v3s32 p_i = readV3S32(buf);
-			is.read((char*)buf, 12);
-			v3s32 s_i = readV3S32(buf);
-			is.read((char*)buf, 4);
-			s32 pitch_i = readS32(buf);
-			is.read((char*)buf, 4);
-			s32 yaw_i = readS32(buf);
-			
-			Player *player = m_env.getPlayer(peer_id);
-
-			// Skip if player doesn't exist
-			if(player == NULL)
-			{
-				continue;
-			}
-
-			// Skip if player is local player
-			if(player->isLocal())
-			{
-				continue;
-			}
-	
-			f32 pitch = (f32)pitch_i / 100.0;
-			f32 yaw = (f32)yaw_i / 100.0;
-			v3f position((f32)p_i.X/100., (f32)p_i.Y/100., (f32)p_i.Z/100.);
-			v3f speed((f32)s_i.X/100., (f32)s_i.Y/100., (f32)s_i.Z/100.);
-			
-			player->setPosition(position);
-			player->setSpeed(speed);
-			player->setPitch(pitch);
-			player->setYaw(yaw);
-		}
-
-		/*
-			Read block objects
-		*/
-
-		// Read active block count
-		is.read((char*)buf, 2);
-		u16 blockcount = readU16(buf);
-		
-		// Initialize delete queue with all active blocks
-		core::map<v3s16, bool> abs_to_delete;
-		for(core::map<v3s16, bool>::Iterator
-				i = m_active_blocks.getIterator();
-				i.atEnd() == false; i++)
-		{
-			v3s16 p = i.getNode()->getKey();
-			/*dstream<<"adding "
-					<<"("<<p.x<<","<<p.y<<","<<p.z<<") "
-					<<" to abs_to_delete"
-					<<std::endl;*/
-			abs_to_delete.insert(p, true);
-		}
-
-		/*dstream<<"Initial delete queue size: "<<abs_to_delete.size()
-				<<std::endl;*/
-		
-		for(u16 i=0; i<blockcount; i++)
-		{
-			// Read blockpos
-			is.read((char*)buf, 6);
-			v3s16 p = readV3S16(buf);
-			// Get block from somewhere
-			MapBlock *block = NULL;
-			try{
-				block = m_env.getMap().getBlockNoCreate(p);
-			}
-			catch(InvalidPositionException &e)
-			{
-				//TODO: Create a dummy block?
-			}
-			if(block == NULL)
-			{
-				dstream<<"WARNING: "
-						<<"Could not get block at blockpos "
-						<<"("<<p.X<<","<<p.Y<<","<<p.Z<<") "
-						<<"in TOCLIENT_OBJECTDATA. Ignoring "
-						<<"following block object data."
-						<<std::endl;
-				return;
-			}
-
-			/*dstream<<"Client updating objects for block "
-					<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
-					<<std::endl;*/
-
-			// Insert to active block list
-			m_active_blocks.insert(p, true);
-
-			// Remove from deletion queue
-			if(abs_to_delete.find(p) != NULL)
-				abs_to_delete.remove(p);
-
-			/*
-				Update objects of block
-				
-				NOTE: Be sure this is done in the main thread.
-			*/
-			block->updateObjects(is, m_server_ser_ver,
-					m_device->getSceneManager(), m_env.getDayNightRatio());
-		}
-		
-		/*dstream<<"Final delete queue size: "<<abs_to_delete.size()
-				<<std::endl;*/
-		
-		// Delete objects of blocks in delete queue
-		for(core::map<v3s16, bool>::Iterator
-				i = abs_to_delete.getIterator();
-				i.atEnd() == false; i++)
-		{
-			v3s16 p = i.getNode()->getKey();
-			try
-			{
-				MapBlock *block = m_env.getMap().getBlockNoCreate(p);
-				
-				// Clear objects
-				block->clearObjects();
-				// Remove from active blocks list
-				m_active_blocks.remove(p);
-			}
-			catch(InvalidPositionException &e)
-			{
-				dstream<<"WARNAING: Client: "
-						<<"Couldn't clear objects of active->inactive"
-						<<" block "
-						<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
-						<<" because block was not found"
-						<<std::endl;
-				// Ignore
-			}
-		}
-
-		} //envlock
-	}
-	else if(command == TOCLIENT_TIME_OF_DAY)
-	{
-		if(datasize < 4)
-			return;
-		
-		u16 time_of_day = readU16(&data[2]);
-		time_of_day = time_of_day % 24000;
-		//dstream<<"Client: time_of_day="<<time_of_day<<std::endl;
-		
-		/*
-			time_of_day:
-			0 = midnight
-			12000 = midday
-		*/
-		{
-			m_env.setTimeOfDay(time_of_day);
-
-			u32 dr = m_env.getDayNightRatio();
-
-			dstream<<"Client: time_of_day="<<time_of_day
-					<<", dr="<<dr
-					<<std::endl;
-		}
-
-	}
-	else if(command == TOCLIENT_CHAT_MESSAGE)
-	{
-		/*
-			u16 command
-			u16 length
-			wstring message
-		*/
-		u8 buf[6];
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
-		
-		// Read stuff
-		is.read((char*)buf, 2);
-		u16 len = readU16(buf);
-		
-		std::wstring message;
-		for(u16 i=0; i<len; i++)
-		{
-			is.read((char*)buf, 2);
-			message += (wchar_t)readU16(buf);
-		}
-
-		/*dstream<<"Client received chat message: "
+		/*infostream<<"Client received chat message: "
 				<<wide_to_narrow(message)<<std::endl;*/
 		
 		m_chat_queue.push_back(message);
 	}
 	else if(command == TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD)
 	{
-		//if(g_settings.getBool("enable_experimental"))
+		//if(g_settings->getBool("enable_experimental"))
 		{
 			/*
 				u16 command
@@ -1267,7 +1121,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 				for all added objects {
 					u16 id
 					u8 type
-					u16 initialization data length
+					u32 initialization data length
 					string initialization data
 				}
 			*/
@@ -1314,7 +1168,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 	}
 	else if(command == TOCLIENT_ACTIVE_OBJECT_MESSAGES)
 	{
-		//if(g_settings.getBool("enable_experimental"))
+		//if(g_settings->getBool("enable_experimental"))
 		{
 			/*
 				u16 command
@@ -1361,8 +1215,18 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		std::istringstream is(datastring, std::ios_base::binary);
 		Player *player = m_env.getLocalPlayer();
 		assert(player != NULL);
+		u8 oldhp = player->hp;
 		u8 hp = readU8(is);
 		player->hp = hp;
+
+		if(hp < oldhp)
+		{
+			// Add to ClientEvent queue
+			ClientEvent event;
+			event.type = CE_PLAYER_DAMAGE;
+			event.player_damage.amount = oldhp - hp;
+			m_client_event_queue.push_back(event);
+		}
 	}
 	else if(command == TOCLIENT_MOVE_PLAYER)
 	{
@@ -1377,7 +1241,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		/*player->setPitch(pitch);
 		player->setYaw(yaw);*/
 
-		dstream<<"Client got TOCLIENT_MOVE_PLAYER"
+		infostream<<"Client got TOCLIENT_MOVE_PLAYER"
 				<<" pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"
 				<<" pitch="<<pitch
 				<<" yaw="<<yaw
@@ -1399,142 +1263,394 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		// get damage from falling on ground
 		m_ignore_damage_timer = 3.0;
 	}
-	else
+	else if(command == TOCLIENT_PLAYERITEM)
 	{
-		dout_client<<DTIME<<"WARNING: Client: Ignoring unknown command "
-				<<command<<std::endl;
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+
+		u16 count = readU16(is);
+
+		for (u16 i = 0; i < count; ++i) {
+			u16 peer_id = readU16(is);
+			Player *player = m_env.getPlayer(peer_id);
+
+			if (player == NULL)
+			{
+				infostream<<"Client: ignoring player item "
+					<< deSerializeString(is)
+					<< " for non-existing peer id " << peer_id
+					<< std::endl;
+				continue;
+			} else if (player->isLocal()) {
+				infostream<<"Client: ignoring player item "
+					<< deSerializeString(is)
+					<< " for local player" << std::endl;
+				continue;
+			} else {
+				InventoryList *inv = player->inventory.getList("main");
+				std::string itemstring(deSerializeString(is));
+				ItemStack item;
+				item.deSerialize(itemstring, m_itemdef);
+				inv->changeItem(0, item);
+				if(itemstring.empty())
+				{
+					infostream<<"Client: empty player item for peer "
+						<<peer_id<<std::endl;
+				}
+				else
+				{
+					infostream<<"Client: player item for peer "
+						<<peer_id<<": "<<itemstring<<std::endl;
+				}
+			}
+		}
 	}
-}
+	else if(command == TOCLIENT_DEATHSCREEN)
+	{
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		
+		bool set_camera_point_target = readU8(is);
+		v3f camera_point_target = readV3F1000(is);
+		
+		ClientEvent event;
+		event.type = CE_DEATHSCREEN;
+		event.deathscreen.set_camera_point_target = set_camera_point_target;
+		event.deathscreen.camera_point_target_x = camera_point_target.X;
+		event.deathscreen.camera_point_target_y = camera_point_target.Y;
+		event.deathscreen.camera_point_target_z = camera_point_target.Z;
+		m_client_event_queue.push_back(event);
+	}
+	else if(command == TOCLIENT_ANNOUNCE_TEXTURES)
+	{
+		io::IFileSystem *irrfs = m_device->getFileSystem();
+		video::IVideoDriver *vdrv = m_device->getVideoDriver();
 
-void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
-{
-	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-	m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
-}
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
 
-void Client::groundAction(u8 action, v3s16 nodepos_undersurface,
-		v3s16 nodepos_oversurface, u16 item)
-{
-	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::groundAction() "
-				"cancelled (not connected)"
-				<<std::endl;
-		return;
+		// Mesh update thread must be stopped while
+		// updating content definitions
+		assert(!m_mesh_update_thread.IsRunning());
+
+		int num_textures = readU16(is);
+
+		core::list<TextureRequest> texture_requests;
+
+		for(int i=0; i<num_textures; i++){
+
+			bool texture_found = false;
+
+			//read texture from cache
+			std::string name = deSerializeString(is);
+			std::string sha1_texture = deSerializeString(is);
+			
+			// if name contains illegal characters, ignore the texture
+			if(!string_allowed(name, TEXTURENAME_ALLOWED_CHARS)){
+				errorstream<<"Client: ignoring illegal texture name "
+						<<"sent by server: \""<<name<<"\""<<std::endl;
+				continue;
+			}
+
+			std::string tpath = getTextureCacheDir() + DIR_DELIM + name;
+			// Read data
+			std::ifstream fis(tpath.c_str(), std::ios_base::binary);
+
+
+			if(fis.good() == false){
+				infostream<<"Client::Texture not found in cache: "
+						<<name << " expected it at: "<<tpath<<std::endl;
+			}
+			else
+			{
+				std::ostringstream tmp_os(std::ios_base::binary);
+				bool bad = false;
+				for(;;){
+					char buf[1024];
+					fis.read(buf, 1024);
+					std::streamsize len = fis.gcount();
+					tmp_os.write(buf, len);
+					if(fis.eof())
+						break;
+					if(!fis.good()){
+						bad = true;
+						break;
+					}
+				}
+				if(bad){
+					infostream<<"Client: Failed to read texture from cache\""
+							<<name<<"\""<<std::endl;
+				}
+				else {
+
+					SHA1 sha1;
+					sha1.addBytes(tmp_os.str().c_str(), tmp_os.str().length());
+
+					unsigned char *digest = sha1.getDigest();
+
+					std::string digest_string = base64_encode(digest, 20);
+
+					if (digest_string == sha1_texture) {
+						// Silly irrlicht's const-incorrectness
+						Buffer<char> data_rw(tmp_os.str().c_str(), tmp_os.str().size());
+
+						// Create an irrlicht memory file
+						io::IReadFile *rfile = irrfs->createMemoryReadFile(
+								*data_rw,  tmp_os.str().size(), "_tempreadfile");
+						assert(rfile);
+						// Read image
+						video::IImage *img = vdrv->createImageFromFile(rfile);
+						if(!img){
+							infostream<<"Client: Cannot create image from data of "
+									<<"received texture \""<<name<<"\""<<std::endl;
+							rfile->drop();
+						}
+						else {
+							m_tsrc->insertSourceImage(name, img);
+							img->drop();
+							rfile->drop();
+
+							texture_found = true;
+						}
+					}
+					else {
+						infostream<<"Client::Texture cached sha1 hash not matching server hash: "
+								<<name << ": server ->"<<sha1_texture <<" client -> "<<digest_string<<std::endl;
+					}
+
+					free(digest);
+				}
+			}
+
+			//add texture request
+			if (!texture_found) {
+				infostream<<"Client: Adding texture to request list: \""
+						<<name<<"\""<<std::endl;
+				texture_requests.push_back(TextureRequest(name));
+			}
+
+		}
+
+		ClientEvent event;
+		event.type = CE_TEXTURES_UPDATED;
+		m_client_event_queue.push_back(event);
+
+
+		//send Texture request
+		/*
+				u16 command
+				u16 number of textures requested
+				for each texture {
+					u16 length of name
+					string name
+				}
+		 */
+		std::ostringstream os(std::ios_base::binary);
+		u8 buf[12];
+
+
+		// Write command
+		writeU16(buf, TOSERVER_REQUEST_TEXTURES);
+		os.write((char*)buf, 2);
+
+		writeU16(buf,texture_requests.size());
+		os.write((char*)buf, 2);
+
+
+		for(core::list<TextureRequest>::Iterator i = texture_requests.begin();
+				i != texture_requests.end(); i++) {
+			os<<serializeString(i->name);
+		}
+
+		// Make data buffer
+		std::string s = os.str();
+		SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+		// Send as reliable
+		Send(0, data, true);
+		infostream<<"Client: Sending request list to server " <<std::endl;
+	}
+	else if(command == TOCLIENT_TEXTURES)
+	{
+		io::IFileSystem *irrfs = m_device->getFileSystem();
+		video::IVideoDriver *vdrv = m_device->getVideoDriver();
+
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+
+		// Mesh update thread must be stopped while
+		// updating content definitions
+		assert(!m_mesh_update_thread.IsRunning());
+
+		/*
+			u16 command
+			u16 total number of texture bunches
+			u16 index of this bunch
+			u32 number of textures in this bunch
+			for each texture {
+				u16 length of name
+				string name
+				u32 length of data
+				data
+			}
+		*/
+		int num_bunches = readU16(is);
+		int bunch_i = readU16(is);
+		m_texture_receive_progress = (float)bunch_i / (float)(num_bunches - 1);
+		if(bunch_i == num_bunches - 1)
+			m_textures_received = true;
+		int num_textures = readU32(is);
+		infostream<<"Client: Received textures: bunch "<<bunch_i<<"/"
+				<<num_bunches<<" textures="<<num_textures
+				<<" size="<<datasize<<std::endl;
+		for(int i=0; i<num_textures; i++){
+			std::string name = deSerializeString(is);
+			std::string data = deSerializeLongString(is);
+
+			// if name contains illegal characters, ignore the texture
+			if(!string_allowed(name, TEXTURENAME_ALLOWED_CHARS)){
+				errorstream<<"Client: ignoring illegal texture name "
+						<<"sent by server: \""<<name<<"\""<<std::endl;
+				continue;
+			}
+
+			// Silly irrlicht's const-incorrectness
+			Buffer<char> data_rw(data.c_str(), data.size());
+			// Create an irrlicht memory file
+			io::IReadFile *rfile = irrfs->createMemoryReadFile(
+					*data_rw, data.size(), "_tempreadfile");
+			assert(rfile);
+			// Read image
+			video::IImage *img = vdrv->createImageFromFile(rfile);
+			if(!img){
+				errorstream<<"Client: Cannot create image from data of "
+						<<"received texture \""<<name<<"\""<<std::endl;
+				rfile->drop();
+				continue;
+			}
+
+			fs::CreateAllDirs(getTextureCacheDir());
+
+			std::string filename = getTextureCacheDir() + DIR_DELIM + name;
+			std::ofstream outfile(filename.c_str(), std::ios_base::binary | std::ios_base::trunc);
+
+			if (outfile.good()) {
+				outfile.write(data.c_str(),data.length());
+				outfile.close();
+			}
+			else {
+				errorstream<<"Client: Unable to open cached texture file "<< filename <<std::endl;
+			}
+
+			m_tsrc->insertSourceImage(name, img);
+			img->drop();
+			rfile->drop();
+		}
+
+		ClientEvent event;
+		event.type = CE_TEXTURES_UPDATED;
+		m_client_event_queue.push_back(event);
+	}
+	else if(command == TOCLIENT_TOOLDEF)
+	{
+		infostream<<"Client: WARNING: Ignoring TOCLIENT_TOOLDEF"<<std::endl;
+	}
+	else if(command == TOCLIENT_NODEDEF)
+	{
+		infostream<<"Client: Received node definitions: packet size: "
+				<<datasize<<std::endl;
+
+		// Mesh update thread must be stopped while
+		// updating content definitions
+		assert(!m_mesh_update_thread.IsRunning());
+
+		// Decompress node definitions
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+		std::ostringstream tmp_os;
+		decompressZlib(tmp_is, tmp_os);
+
+		// Deserialize node definitions
+		std::istringstream tmp_is2(tmp_os.str());
+		m_nodedef->deSerialize(tmp_is2);
+		m_nodedef_received = true;
+	}
+	else if(command == TOCLIENT_CRAFTITEMDEF)
+	{
+		infostream<<"Client: WARNING: Ignoring TOCLIENT_CRAFTITEMDEF"<<std::endl;
+	}
+	else if(command == TOCLIENT_ITEMDEF)
+	{
+		infostream<<"Client: Received item definitions: packet size: "
+				<<datasize<<std::endl;
+
+		// Mesh update thread must be stopped while
+		// updating content definitions
+		assert(!m_mesh_update_thread.IsRunning());
+
+		// Decompress item definitions
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+		std::ostringstream tmp_os;
+		decompressZlib(tmp_is, tmp_os);
+
+		// Deserialize node definitions
+		std::istringstream tmp_is2(tmp_os.str());
+		m_itemdef->deSerialize(tmp_is2);
+		m_itemdef_received = true;
+	}
+	else
+	{
+		infostream<<"Client: Ignoring unknown command "
+				<<command<<std::endl;
 	}
-	
-	/*
-		length: 17
-		[0] u16 command
-		[2] u8 action
-		[3] v3s16 nodepos_undersurface
-		[9] v3s16 nodepos_abovesurface
-		[15] u16 item
-		actions:
-		0: start digging
-		1: place block
-		2: stop digging (all parameters ignored)
-		3: digging completed
-	*/
-	u8 datasize = 2 + 1 + 6 + 6 + 2;
-	SharedBuffer<u8> data(datasize);
-	writeU16(&data[0], TOSERVER_GROUND_ACTION);
-	writeU8(&data[2], action);
-	writeV3S16(&data[3], nodepos_undersurface);
-	writeV3S16(&data[9], nodepos_oversurface);
-	writeU16(&data[15], item);
-	Send(0, data, true);
 }
 
-void Client::clickObject(u8 button, v3s16 blockpos, s16 id, u16 item)
+void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
 {
-	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::clickObject() "
-				"cancelled (not connected)"
-				<<std::endl;
-		return;
-	}
-	
-	/*
-		[0] u16 command=TOSERVER_CLICK_OBJECT
-		[2] u8 button (0=left, 1=right)
-		[3] v3s16 block
-		[9] s16 id
-		[11] u16 item
-	*/
-	u8 datasize = 2 + 1 + 6 + 2 + 2;
-	SharedBuffer<u8> data(datasize);
-	writeU16(&data[0], TOSERVER_CLICK_OBJECT);
-	writeU8(&data[2], button);
-	writeV3S16(&data[3], blockpos);
-	writeS16(&data[9], id);
-	writeU16(&data[11], item);
-	Send(0, data, true);
+	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
+	m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
 }
 
-void Client::clickActiveObject(u8 button, u16 id, u16 item)
+void Client::interact(u8 action, const PointedThing& pointed)
 {
 	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::clickActiveObject() "
+		infostream<<"Client::interact() "
 				"cancelled (not connected)"
 				<<std::endl;
 		return;
 	}
-	
-	/*
-		length: 7
-		[0] u16 command
-		[2] u8 button (0=left, 1=right)
-		[3] u16 id
-		[5] u16 item
-	*/
-	u8 datasize = 2 + 1 + 6 + 2 + 2;
-	SharedBuffer<u8> data(datasize);
-	writeU16(&data[0], TOSERVER_CLICK_ACTIVEOBJECT);
-	writeU8(&data[2], button);
-	writeU16(&data[3], id);
-	writeU16(&data[5], item);
-	Send(0, data, true);
-}
 
-void Client::sendSignText(v3s16 blockpos, s16 id, std::string text)
-{
-	/*
-		u16 command
-		v3s16 blockpos
-		s16 id
-		u16 textlen
-		textdata
-	*/
 	std::ostringstream os(std::ios_base::binary);
-	u8 buf[12];
-	
-	// Write command
-	writeU16(buf, TOSERVER_SIGNTEXT);
-	os.write((char*)buf, 2);
-	
-	// Write blockpos
-	writeV3S16(buf, blockpos);
-	os.write((char*)buf, 6);
-
-	// Write id
-	writeS16(buf, id);
-	os.write((char*)buf, 2);
 
-	u16 textlen = text.size();
-	// Write text length
-	writeS16(buf, textlen);
-	os.write((char*)buf, 2);
+	/*
+		[0] u16 command
+		[2] u8 action
+		[3] u16 item
+		[5] u32 length of the next item
+		[9] serialized PointedThing
+		actions:
+		0: start digging (from undersurface) or use
+		1: stop digging (all parameters ignored)
+		2: digging completed
+		3: place block or item (to abovesurface)
+		4: use item
+	*/
+	writeU16(os, TOSERVER_INTERACT);
+	writeU8(os, action);
+	writeU16(os, getPlayerItem());
+	std::ostringstream tmp_os(std::ios::binary);
+	pointed.serialize(tmp_os);
+	os<<serializeLongString(tmp_os.str());
 
-	// Write text
-	os.write((char*)text.c_str(), textlen);
-	
-	// Make data buffer
 	std::string s = os.str();
 	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+
 	// Send as reliable
 	Send(0, data, true);
 }
-	
+
 void Client::sendSignNodeText(v3s16 p, std::string text)
 {
 	/*
@@ -1667,6 +1783,20 @@ void Client::sendDamage(u8 damage)
 	Send(0, data, true);
 }
 
+void Client::sendRespawn()
+{
+	DSTACK(__FUNCTION_NAME);
+	std::ostringstream os(std::ios_base::binary);
+
+	writeU16(os, TOSERVER_RESPAWN);
+
+	// Make data buffer
+	std::string s = os.str();
+	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+	// Send as reliable
+	Send(0, data, true);
+}
+
 void Client::sendPlayerPos()
 {
 	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
@@ -1714,10 +1844,30 @@ void Client::sendPlayerPos()
 	Send(0, data, false);
 }
 
+void Client::sendPlayerItem(u16 item)
+{
+	Player *myplayer = m_env.getLocalPlayer();
+	if(myplayer == NULL)
+		return;
+
+	u16 our_peer_id = m_con.GetPeerID();
+
+	// Set peer id if not set already
+	if(myplayer->peer_id == PEER_ID_INEXISTENT)
+		myplayer->peer_id = our_peer_id;
+	// Check that an existing peer_id is the same as the connection's
+	assert(myplayer->peer_id == our_peer_id);
+
+	SharedBuffer<u8> data(2+2);
+	writeU16(&data[0], TOSERVER_PLAYERITEM);
+	writeU16(&data[2], item);
+
+	// Send as reliable
+	Send(0, data, true);
+}
+
 void Client::removeNode(v3s16 p)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	
 	core::map<v3s16, MapBlock*> modified_blocks;
 
 	try
@@ -1729,76 +1879,55 @@ void Client::removeNode(v3s16 p)
 	{
 	}
 	
+	// add urgent task to update the modified node
+	addUpdateMeshTaskForNode(p, false, true);
+
 	for(core::map<v3s16, MapBlock * >::Iterator
 			i = modified_blocks.getIterator();
 			i.atEnd() == false; i++)
 	{
 		v3s16 p = i.getNode()->getKey();
-		//m_env.getClientMap().updateMeshes(p, m_env.getDayNightRatio());
 		addUpdateMeshTaskWithEdge(p);
 	}
 }
 
 void Client::addNode(v3s16 p, MapNode n)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
 	TimeTaker timer1("Client::addNode()");
 
 	core::map<v3s16, MapBlock*> modified_blocks;
 
 	try
 	{
-		TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
+		//TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
 		m_env.getMap().addNodeAndUpdate(p, n, modified_blocks);
 	}
 	catch(InvalidPositionException &e)
 	{}
 	
-	//TimeTaker timer2("Client::addNode(): updateMeshes");
-
 	for(core::map<v3s16, MapBlock * >::Iterator
 			i = modified_blocks.getIterator();
 			i.atEnd() == false; i++)
 	{
 		v3s16 p = i.getNode()->getKey();
-		//m_env.getClientMap().updateMeshes(p, m_env.getDayNightRatio());
 		addUpdateMeshTaskWithEdge(p);
 	}
 }
 	
-void Client::updateCamera(v3f pos, v3f dir)
-{
-	m_env.getClientMap().updateCamera(pos, dir);
-	camera_position = pos;
-	camera_direction = dir;
-}
-
-MapNode Client::getNode(v3s16 p)
-{
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	return m_env.getMap().getNode(p);
-}
-
-NodeMetadata* Client::getNodeMetadata(v3s16 p)
-{
-	return m_env.getMap().getNodeMetadata(p);
-}
-
-v3f Client::getPlayerPosition()
+void Client::setPlayerControl(PlayerControl &control)
 {
 	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
-	return player->getPosition();
+	player->control = control;
 }
 
-void Client::setPlayerControl(PlayerControl &control)
+void Client::selectPlayerItem(u16 item)
 {
 	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
-	player->control = control;
+	m_playeritem = item;
+	m_inventory_updated = true;
+	sendPlayerItem(item);
 }
 
 // Returns true if the inventory of the local player has been
@@ -1821,107 +1950,51 @@ void Client::getLocalInventory(Inventory &dst)
 	dst = player->inventory;
 }
 
-InventoryContext *Client::getInventoryContext()
-{
-	return &m_inventory_context;
-}
-
-Inventory* Client::getInventory(InventoryContext *c, std::string id)
+Inventory* Client::getInventory(const InventoryLocation &loc)
 {
-	if(id == "current_player")
+	switch(loc.type){
+	case InventoryLocation::UNDEFINED:
+	{}
+	break;
+	case InventoryLocation::CURRENT_PLAYER:
+	{
+		Player *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		return &player->inventory;
+	}
+	break;
+	case InventoryLocation::PLAYER:
 	{
-		assert(c->current_player);
-		return &(c->current_player->inventory);
+		Player *player = m_env.getPlayer(loc.name.c_str());
+		if(!player)
+			return NULL;
+		return &player->inventory;
 	}
-	
-	Strfnd fn(id);
-	std::string id0 = fn.next(":");
-
-	if(id0 == "nodemeta")
+	break;
+	case InventoryLocation::NODEMETA:
 	{
-		v3s16 p;
-		p.X = stoi(fn.next(","));
-		p.Y = stoi(fn.next(","));
-		p.Z = stoi(fn.next(","));
-		NodeMetadata* meta = getNodeMetadata(p);
-		if(meta)
-			return meta->getInventory();
-		dstream<<"nodemeta at ("<<p.X<<","<<p.Y<<","<<p.Z<<"): "
-				<<"no metadata found"<<std::endl;
-		return NULL;
-	}
-
-	dstream<<__FUNCTION_NAME<<": unknown id "<<id<<std::endl;
+		NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);
+		if(!meta)
+			return NULL;
+		return meta->getInventory();
+	}
+	break;
+	default:
+		assert(0);
+	}
 	return NULL;
 }
 void Client::inventoryAction(InventoryAction *a)
 {
+	/*
+		Send it to the server
+	*/
 	sendInventoryAction(a);
-}
-
-MapBlockObject * Client::getSelectedObject(
-		f32 max_d,
-		v3f from_pos_f_on_map,
-		core::line3d<f32> shootline_on_map
-	)
-{
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
-	core::array<DistanceSortedObject> objects;
-
-	for(core::map<v3s16, bool>::Iterator
-			i = m_active_blocks.getIterator();
-			i.atEnd() == false; i++)
-	{
-		v3s16 p = i.getNode()->getKey();
-
-		MapBlock *block = NULL;
-		try
-		{
-			block = m_env.getMap().getBlockNoCreate(p);
-		}
-		catch(InvalidPositionException &e)
-		{
-			continue;
-		}
-
-		// Calculate from_pos relative to block
-		v3s16 block_pos_i_on_map = block->getPosRelative();
-		v3f block_pos_f_on_map = intToFloat(block_pos_i_on_map, BS);
-		v3f from_pos_f_on_block = from_pos_f_on_map - block_pos_f_on_map;
-
-		block->getObjects(from_pos_f_on_block, max_d, objects);
-		//block->getPseudoObjects(from_pos_f_on_block, max_d, objects);
-	}
 
-	//dstream<<"Collected "<<objects.size()<<" nearby objects"<<std::endl;
-	
-	// Sort them.
-	// After this, the closest object is the first in the array.
-	objects.sort();
-
-	for(u32 i=0; i<objects.size(); i++)
-	{
-		MapBlockObject *obj = objects[i].obj;
-		MapBlock *block = obj->getBlock();
-
-		// Calculate shootline relative to block
-		v3s16 block_pos_i_on_map = block->getPosRelative();
-		v3f block_pos_f_on_map = intToFloat(block_pos_i_on_map, BS);
-		core::line3d<f32> shootline_on_block(
-				shootline_on_map.start - block_pos_f_on_map,
-				shootline_on_map.end - block_pos_f_on_map
-		);
-
-		if(obj->isSelected(shootline_on_block))
-		{
-			//dstream<<"Returning selected object"<<std::endl;
-			return obj;
-		}
-	}
-
-	//dstream<<"No object selected; returning NULL."<<std::endl;
-	return NULL;
+	/*
+		Predict some local inventory changes
+	*/
+	a->clientApply(this, this);
 }
 
 ClientActiveObject * Client::getSelectedActiveObject(
@@ -1934,7 +2007,7 @@ ClientActiveObject * Client::getSelectedActiveObject(
 
 	m_env.getActiveObjects(from_pos_f_on_map, max_d, objects);
 
-	//dstream<<"Collected "<<objects.size()<<" nearby objects"<<std::endl;
+	//infostream<<"Collected "<<objects.size()<<" nearby objects"<<std::endl;
 	
 	// Sort them.
 	// After this, the closest object is the first in the array.
@@ -1957,12 +2030,12 @@ ClientActiveObject * Client::getSelectedActiveObject(
 
 		if(offsetted_box.intersectsWithLine(shootline_on_map))
 		{
-			//dstream<<"Returning selected object"<<std::endl;
+			//infostream<<"Returning selected object"<<std::endl;
 			return obj;
 		}
 	}
 
-	//dstream<<"No object selected; returning NULL."<<std::endl;
+	//infostream<<"No object selected; returning NULL."<<std::endl;
 	return NULL;
 }
 
@@ -1976,17 +2049,49 @@ void Client::printDebugInfo(std::ostream &os)
 		//<<", m_opt_not_found_history.size()="<<m_opt_not_found_history.size()
 		<<std::endl;*/
 }
-	
-/*s32 Client::getDayNightIndex()
+
+core::list<std::wstring> Client::getConnectedPlayerNames()
 {
-	assert(m_daynight_i >= 0 && m_daynight_i < DAYNIGHT_CACHE_COUNT);
-	return m_daynight_i;
-}*/
+	core::list<Player*> players = m_env.getPlayers(true);
+	core::list<std::wstring> playerNames;
+	for(core::list<Player*>::Iterator
+			i = players.begin();
+			i != players.end(); i++)
+	{
+		Player *player = *i;
+		playerNames.push_back(narrow_to_wide(player->getName()));
+	}
+	return playerNames;
+}
 
-u32 Client::getDayNightRatio()
+float Client::getAnimationTime()
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	return m_env.getDayNightRatio();
+	return m_animation_time;
+}
+
+int Client::getCrackLevel()
+{
+	return m_crack_level;
+}
+
+void Client::setCrack(int level, v3s16 pos)
+{
+	int old_crack_level = m_crack_level;
+	v3s16 old_crack_pos = m_crack_pos;
+
+	m_crack_level = level;
+	m_crack_pos = pos;
+
+	if(old_crack_level >= 0 && (level < 0 || pos != old_crack_pos))
+	{
+		// remove old crack
+		addUpdateMeshTaskForNode(old_crack_pos, false, true);
+	}
+	if(level >= 0 && (old_crack_level < 0 || pos != old_crack_pos))
+	{
+		// add new crack
+		addUpdateMeshTaskForNode(pos, false, true);
+	}
 }
 
 u16 Client::getHP()
@@ -1996,58 +2101,82 @@ u16 Client::getHP()
 	return player->hp;
 }
 
-void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server)
+bool Client::getChatMessage(std::wstring &message)
+{
+	if(m_chat_queue.size() == 0)
+		return false;
+	message = m_chat_queue.pop_front();
+	return true;
+}
+
+void Client::typeChatMessage(const std::wstring &message)
+{
+	// Discard empty line
+	if(message == L"")
+		return;
+
+	// Send to others
+	sendChatMessage(message);
+
+	// Show locally
+	if (message[0] == L'/')
+	{
+		m_chat_queue.push_back(
+				(std::wstring)L"issued command: "+message);
+	}
+	else
+	{
+		LocalPlayer *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		std::wstring name = narrow_to_wide(player->getName());
+		m_chat_queue.push_back(
+				(std::wstring)L"<"+name+L"> "+message);
+	}
+}
+
+void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
 {
-	/*dstream<<"Client::addUpdateMeshTask(): "
+	/*infostream<<"Client::addUpdateMeshTask(): "
 			<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+			<<" ack_to_server="<<ack_to_server
+			<<" urgent="<<urgent
 			<<std::endl;*/
 
 	MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
 	if(b == NULL)
 		return;
-
+	
 	/*
 		Create a task to update the mesh of the block
 	*/
 	
-	MeshMakeData *data = new MeshMakeData;
+	MeshMakeData *data = new MeshMakeData(this);
 	
 	{
 		//TimeTaker timer("data fill");
-		// 0ms
-		data->fill(getDayNightRatio(), b);
+		// Release: ~0ms
+		// Debug: 1-6ms, avg=2ms
+		data->fill(b);
+		data->setCrack(m_crack_level, m_crack_pos);
+		data->setSmoothLighting(g_settings->getBool("smooth_lighting"));
 	}
 
 	// Debug wait
 	//while(m_mesh_update_thread.m_queue_in.size() > 0) sleep_ms(10);
 	
 	// Add task to queue
-	m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server);
+	m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent);
 
-	/*dstream<<"Mesh update input queue size is "
+	/*infostream<<"Mesh update input queue size is "
 			<<m_mesh_update_thread.m_queue_in.size()
 			<<std::endl;*/
-	
-#if 0
-	// Temporary test: make mesh directly in here
-	{
-		//TimeTaker timer("make mesh");
-		// 10ms
-		scene::SMesh *mesh_new = NULL;
-		mesh_new = makeMapBlockMesh(data);
-		b->replaceMesh(mesh_new);
-		delete data;
-	}
-#endif
-
-	b->setMeshExpired(false);
 }
 
-void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server)
+void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
 {
 	/*{
 		v3s16 p = blockpos;
-		dstream<<"Client::addUpdateMeshTaskWithEdge(): "
+		infostream<<"Client::addUpdateMeshTaskWithEdge(): "
 				<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
 				<<std::endl;
 	}*/
@@ -2055,25 +2184,66 @@ void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server)
 	try{
 		v3s16 p = blockpos + v3s16(0,0,0);
 		//MapBlock *b = m_env.getMap().getBlockNoCreate(p);
-		addUpdateMeshTask(p, ack_to_server);
+		addUpdateMeshTask(p, ack_to_server, urgent);
 	}
 	catch(InvalidPositionException &e){}
 	// Leading edge
 	try{
 		v3s16 p = blockpos + v3s16(-1,0,0);
-		addUpdateMeshTask(p);
+		addUpdateMeshTask(p, false, urgent);
 	}
 	catch(InvalidPositionException &e){}
 	try{
 		v3s16 p = blockpos + v3s16(0,-1,0);
-		addUpdateMeshTask(p);
+		addUpdateMeshTask(p, false, urgent);
 	}
 	catch(InvalidPositionException &e){}
 	try{
 		v3s16 p = blockpos + v3s16(0,0,-1);
-		addUpdateMeshTask(p);
+		addUpdateMeshTask(p, false, urgent);
+	}
+	catch(InvalidPositionException &e){}
+}
+
+void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool urgent)
+{
+	{
+		v3s16 p = nodepos;
+		infostream<<"Client::addUpdateMeshTaskForNode(): "
+				<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+				<<std::endl;
+	}
+
+	v3s16 blockpos = getNodeBlockPos(nodepos);
+	v3s16 blockpos_relative = blockpos * MAP_BLOCKSIZE;
+
+	try{
+		v3s16 p = blockpos + v3s16(0,0,0);
+		addUpdateMeshTask(p, ack_to_server, urgent);
 	}
 	catch(InvalidPositionException &e){}
+	// Leading edge
+	if(nodepos.X == blockpos_relative.X){
+		try{
+			v3s16 p = blockpos + v3s16(-1,0,0);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
+	}
+	if(nodepos.Y == blockpos_relative.Y){
+		try{
+			v3s16 p = blockpos + v3s16(0,-1,0);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
+	}
+	if(nodepos.Z == blockpos_relative.Z){
+		try{
+			v3s16 p = blockpos + v3s16(0,0,-1);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
+	}
 }
 
 ClientEvent Client::getClientEvent()
@@ -2087,4 +2257,65 @@ ClientEvent Client::getClientEvent()
 	return m_client_event_queue.pop_front();
 }
 
+void Client::afterContentReceived()
+{
+	assert(m_itemdef_received);
+	assert(m_nodedef_received);
+	assert(m_textures_received);
+
+	// Rebuild inherited images and recreate textures
+	m_tsrc->rebuildImagesAndTextures();
+
+	// Update texture atlas
+	if(g_settings->getBool("enable_texture_atlas"))
+		m_tsrc->buildMainAtlas(this);
+
+	// Update node aliases
+	m_nodedef->updateAliases(m_itemdef);
+
+	// Update node textures
+	m_nodedef->updateTextures(m_tsrc);
+
+	// Update item textures and meshes
+	m_itemdef->updateTexturesAndMeshes(this);
+
+	// Start mesh update thread after setting up content definitions
+	m_mesh_update_thread.Start();
+}
+
+float Client::getRTT(void)
+{
+	try{
+		return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
+	} catch(con::PeerNotFoundException &e){
+		return 1337;
+	}
+}
+
+// IGameDef interface
+// Under envlock
+IItemDefManager* Client::getItemDefManager()
+{
+	return m_itemdef;
+}
+INodeDefManager* Client::getNodeDefManager()
+{
+	return m_nodedef;
+}
+ICraftDefManager* Client::getCraftDefManager()
+{
+	return NULL;
+	//return m_craftdef;
+}
+ITextureSource* Client::getTextureSource()
+{
+	return m_tsrc;
+}
+u16 Client::allocateUnknownNodeId(const std::string &name)
+{
+	errorstream<<"Client::allocateUnknownNodeId(): "
+			<<"Client cannot allocate node IDs"<<std::endl;
+	assert(0);
+	return CONTENT_IGNORE;
+}