X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=02f78e233293236c193b08ab5ef7d1dfa1206016;hb=f143e269f47fd024f69c3f536b558fbac4828b41;hp=b612c9c44c2465446b744b7fd18002ec72810138;hpb=5a36956f75959887f75fda90c39d56181cd1f196;p=dragonfireclient.git

diff --git a/src/client.cpp b/src/client.cpp
index b612c9c44..02f78e233 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -24,48 +24,153 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "jmutexautolock.h"
 #include "main.h"
 #include <sstream>
+#include "porting.h"
+#include "mapsector.h"
+#include "mapblock_mesh.h"
+#include "mapblock.h"
 
-#ifdef _WIN32
-	#include <windows.h>
-	#define sleep_ms(x) Sleep(x)
-#else
-	#include <unistd.h>
-	#define sleep_ms(x) usleep(x*1000)
-#endif
+/*
+	QueuedMeshUpdate
+*/
 
-void * ClientUpdateThread::Thread()
+QueuedMeshUpdate::QueuedMeshUpdate():
+	p(-1337,-1337,-1337),
+	data(NULL),
+	ack_block_to_server(false)
 {
-	ThreadStarted();
+}
 
-	DSTACK(__FUNCTION_NAME);
+QueuedMeshUpdate::~QueuedMeshUpdate()
+{
+	if(data)
+		delete data;
+}
 
-#if CATCH_UNHANDLED_EXCEPTIONS
-	try
+/*
+	MeshUpdateQueue
+*/
+	
+MeshUpdateQueue::MeshUpdateQueue()
+{
+	m_mutex.Init();
+}
+
+MeshUpdateQueue::~MeshUpdateQueue()
+{
+	JMutexAutoLock lock(m_mutex);
+
+	core::list<QueuedMeshUpdate*>::Iterator i;
+	for(i=m_queue.begin(); i!=m_queue.end(); i++)
 	{
-#endif
-		while(getRun())
-		{
-			m_client->asyncStep();
+		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)
+{
+	DSTACK(__FUNCTION_NAME);
 
-			//m_client->updateSomeExpiredMeshes();
+	assert(data);
 
-			bool was = m_client->AsyncProcessData();
+	JMutexAutoLock lock(m_mutex);
 
-			if(was == false)
-				sleep_ms(10);
+	/*
+		Find if block is already in queue.
+		If it is, update the data and quit.
+	*/
+	core::list<QueuedMeshUpdate*>::Iterator i;
+	for(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;
 		}
-#if CATCH_UNHANDLED_EXCEPTIONS
 	}
+	
 	/*
-		This is what has to be done in threads to get suitable debug info
+		Add the block
 	*/
-	catch(std::exception &e)
+	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);
+
+	core::list<QueuedMeshUpdate*>::Iterator i = m_queue.begin();
+	if(i == m_queue.end())
+		return NULL;
+	QueuedMeshUpdate *q = *i;
+	m_queue.erase(i);
+	return q;
+}
+
+/*
+	MeshUpdateThread
+*/
+
+void * MeshUpdateThread::Thread()
+{
+	ThreadStarted();
+
+	DSTACK(__FUNCTION_NAME);
+	
+	BEGIN_DEBUG_EXCEPTION_HANDLER
+
+	while(getRun())
 	{
-		dstream<<std::endl<<DTIME<<"An unhandled exception occurred: "
-				<<e.what()<<std::endl;
-		assert(0);
+		/*// 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(3);
+			continue;
+		}
+
+		ScopeProfiler sp(&g_profiler, "mesh make");
+
+		scene::SMesh *mesh_new = NULL;
+		mesh_new = makeMapBlockMesh(q->data);
+
+		MeshUpdateResult r;
+		r.p = q->p;
+		r.mesh = mesh_new;
+		r.ack_block_to_server = q->ack_block_to_server;
+
+		/*dstream<<"MeshUpdateThread: Processed "
+				<<"("<<q->p.X<<","<<q->p.Y<<","<<q->p.Z<<")"
+				<<std::endl;*/
+
+		m_queue_out.push_back(r);
+
+		delete q;
 	}
-#endif
+
+	END_DEBUG_EXCEPTION_HANDLER
 
 	return NULL;
 }
@@ -73,73 +178,78 @@ void * ClientUpdateThread::Thread()
 Client::Client(
 		IrrlichtDevice *device,
 		const char *playername,
-		JMutex &range_mutex,
-		s16 &viewing_range_nodes,
-		bool &viewing_range_all):
-	m_thread(this),
-	m_env(new ClientMap(this,
-			range_mutex,
-			viewing_range_nodes,
-			viewing_range_all,
+		std::string password,
+		MapDrawControl &control):
+	m_mesh_update_thread(),
+	m_env(
+		new ClientMap(this, control,
 			device->getSceneManager()->getRootSceneNode(),
 			device->getSceneManager(), 666),
-			dout_client),
+		device->getSceneManager()
+	),
 	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_step_dtime(0.0),
 	m_inventory_updated(false),
-	m_time_of_day(0)
+	m_time_of_day(0),
+	m_map_seed(0),
+	m_password(password),
+	m_access_denied(false)
 {
 	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_fetchblock_mutex.Init();
-	m_incoming_queue_mutex.Init();
-	m_env_mutex.Init();
-	m_con_mutex.Init();
-	m_step_dtime_mutex.Init();
+	//m_env_mutex.Init();
+	//m_con_mutex.Init();
 
-	m_thread.Start();
-	
+	m_mesh_update_thread.Start();
+
+	/*
+		Add local player
+	*/
 	{
-		JMutexAutoLock envlock(m_env_mutex);
-		//m_env.getMap().StartUpdater();
+		//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 
 		Player *player = new LocalPlayer();
 
 		player->updateName(playername);
 
-		/*f32 y = BS*2 + BS*20;
-		player->setPosition(v3f(0, y, 0));*/
-		//player->setPosition(v3f(0, y, 30900*BS)); // DEBUG
 		m_env.addPlayer(player);
+		
+		// Initialize player in the inventory context
+		m_inventory_context.current_player = player;
 	}
 }
 
 Client::~Client()
 {
-	m_thread.setRun(false);
-	while(m_thread.IsRunning())
+	{
+		//JMutexAutoLock conlock(m_con_mutex); //bulk comment-out
+		m_con.Disconnect();
+	}
+
+	m_mesh_update_thread.setRun(false);
+	while(m_mesh_update_thread.IsRunning())
 		sleep_ms(100);
 }
 
 void Client::connect(Address address)
 {
 	DSTACK(__FUNCTION_NAME);
-	JMutexAutoLock lock(m_con_mutex);
+	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 	m_con.setTimeoutMs(0);
 	m_con.Connect(address);
 }
 
 bool Client::connectedAndInitialized()
 {
-	JMutexAutoLock lock(m_con_mutex);
+	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 
 	if(m_con.Connected() == false)
 		return false;
@@ -158,36 +268,10 @@ void Client::step(float dtime)
 	if(dtime > 2.0)
 		dtime = 2.0;
 	
-	/*
-		Day/night
-	*/
-	{
-		s32 d = 8;
-		s32 t = (((m_time_of_day.get() + 24000/d/2)%24000)/(24000/d));
-		s32 dn = 0;
-		if(t == d/4 || t == (d-d/4))
-			dn = 1;
-		else if(t < d/4 || t > (d-d/4))
-			dn = 2;
-		else
-			dn = 0;
-
-		u32 dr = 1000;
-		if(dn == 0)
-			dr = 1000;
-		if(dn == 1)
-			dr = 600;
-		if(dn == 2)
-			dr = 300;
-		
-		if(dr != m_env.getDayNightRatio())
-		{
-			//dstream<<"dr="<<dr<<std::endl;
-			m_env.setDayNightRatio(dr);
-			m_env.expireMeshes(true);
-		}
-	}
-
+	if(m_ignore_damage_timer > dtime)
+		m_ignore_damage_timer -= dtime;
+	else
+		m_ignore_damage_timer = 0.0;
 	
 	//dstream<<"Client steps "<<dtime<<std::endl;
 
@@ -200,7 +284,7 @@ void Client::step(float dtime)
 	{
 		//TimeTaker timer("m_con_mutex + m_con.RunTimeouts()", m_device);
 		// 0ms
-		JMutexAutoLock lock(m_con_mutex);
+		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 		m_con.RunTimeouts(dtime);
 	}
 
@@ -219,7 +303,11 @@ void Client::step(float dtime)
 			m_packetcounter.clear();
 		}
 	}
+	
+	// Get connection status
+	bool connected = connectedAndInitialized();
 
+#if 0
 	{
 		/*
 			Delete unused sectors
@@ -236,7 +324,7 @@ void Client::step(float dtime)
 			//counter = 180.0;
 			counter = 60.0;
 
-			JMutexAutoLock lock(m_env_mutex);
+			//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
 
 			core::list<v3s16> deleted_blocks;
 
@@ -244,28 +332,28 @@ void Client::step(float dtime)
 				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
 						<<" unused sectors"<<std::endl;*/
-				dstream<<DTIME<<"Client: Deleted "<<num
-						<<" unused sectors"<<std::endl;
+				/*dstream<<DTIME<<"Client: Deleted "<<num
+						<<" unused sectors"<<std::endl;*/
 				
 				/*
 					Send info to server
 				*/
 
 				// Env is locked so con can be locked.
-				JMutexAutoLock lock(m_con_mutex);
+				//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 				
 				core::list<v3s16>::Iterator i = deleted_blocks.begin();
 				core::list<v3s16> sendlist;
@@ -308,8 +396,7 @@ void Client::step(float dtime)
 			}
 		}
 	}
-
-	bool connected = connectedAndInitialized();
+#endif
 
 	if(connected == false)
 	{
@@ -319,7 +406,7 @@ void Client::step(float dtime)
 		{
 			counter = 2.0;
 
-			JMutexAutoLock envlock(m_env_mutex);
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 			
 			Player *myplayer = m_env.getLocalPlayer();
 			assert(myplayer != NULL);
@@ -328,10 +415,24 @@ void Client::step(float dtime)
 			// [0] u16 TOSERVER_INIT
 			// [2] u8 SER_FMT_VER_HIGHEST
 			// [3] u8[20] player_name
-			SharedBuffer<u8> data(2+1+20);
+			// [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);
-			memcpy(&data[3], myplayer->getName(), 20);
+
+			memset((char*)&data[3], 0, PLAYERNAME_SIZE);
+			snprintf((char*)&data[3], PLAYERNAME_SIZE, "%s", myplayer->getName());
+
+			/*dstream<<"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], 1);
+
 			// Send as unreliable
 			Send(0, data, false);
 		}
@@ -344,9 +445,73 @@ 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)
+			dstream<<"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
+	*/
 	{
 		// 0ms
-		JMutexAutoLock lock(m_env_mutex);
+		//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
 
 		// Control local player (0ms)
 		LocalPlayer *player = m_env.getLocalPlayer();
@@ -356,38 +521,71 @@ void Client::step(float dtime)
 		//TimeTaker envtimer("env step", m_device);
 		// Step environment
 		m_env.step(dtime);
-
-		// Step active blocks
+		
+		/*
+			Handle active blocks
+			NOTE: These old objects are DEPRECATED. TODO: Remove
+		*/
 		for(core::map<v3s16, bool>::Iterator
 				i = m_active_blocks.getIterator();
 				i.atEnd() == false; i++)
 		{
 			v3s16 p = i.getNode()->getKey();
 
-			MapBlock *block = NULL;
-			try
+			MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(p);
+			if(block == NULL)
+				continue;
+			
+			// Step MapBlockObjects
+			block->stepObjects(dtime, false, m_env.getDayNightRatio());
+		}
+
+		/*
+			Get events
+		*/
+		for(;;)
+		{
+			ClientEnvEvent event = m_env.getClientEvent();
+			if(event.type == CEE_NONE)
 			{
-				block = m_env.getMap().getBlockNoCreate(p);
-				block->stepObjects(dtime, false);
+				break;
 			}
-			catch(InvalidPositionException &e)
+			else if(event.type == CEE_PLAYER_DAMAGE)
 			{
+				if(m_ignore_damage_timer <= 0)
+				{
+					u8 damage = event.player_damage.amount;
+					sendDamage(damage);
+
+					// Add to ClientEvent queue
+					ClientEvent event;
+					event.type = CE_PLAYER_DAMAGE;
+					event.player_damage.amount = damage;
+					m_client_event_queue.push_back(event);
+				}
 			}
 		}
 	}
-
+	
+	/*
+		Print some info
+	*/
 	{
 		float &counter = m_avg_rtt_timer;
 		counter += dtime;
 		if(counter >= 10)
 		{
 			counter = 0.0;
-			JMutexAutoLock lock(m_con_mutex);
+			//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;
 		}
 	}
+
+	/*
+		Send player position to server
+	*/
 	{
 		float &counter = m_playerpos_send_timer;
 		counter += dtime;
@@ -398,63 +596,51 @@ void Client::step(float dtime)
 		}
 	}
 
-#if 0
 	/*
-		Clear old entries from fetchblock history
+		Replace updated meshes
 	*/
 	{
-		JMutexAutoLock lock(m_fetchblock_mutex);
+		//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
+
+		//TimeTaker timer("** Processing mesh update result queue");
+		// 0ms
 		
-		core::list<v3s16> remove_queue;
-		core::map<v3s16, float>::Iterator i;
-		i = m_fetchblock_history.getIterator();
-		for(; i.atEnd() == false; i++)
-		{
-			float value = i.getNode()->getValue();
-			value += dtime;
-			i.getNode()->setValue(value);
-			if(value >= 60.0)
-				remove_queue.push_back(i.getNode()->getKey());
-		}
-		core::list<v3s16>::Iterator j;
-		j = remove_queue.begin();
-		for(; j != remove_queue.end(); j++)
+		/*dstream<<"Mesh update result queue size is "
+				<<m_mesh_update_thread.m_queue_out.size()
+				<<std::endl;*/
+
+		while(m_mesh_update_thread.m_queue_out.size() > 0)
 		{
-			m_fetchblock_history.remove(*j);
+			MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front();
+			MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
+			if(block)
+			{
+				block->replaceMesh(r.mesh);
+			}
+			if(r.ack_block_to_server)
+			{
+				/*dstream<<"Client: ACK block ("<<r.p.X<<","<<r.p.Y
+						<<","<<r.p.Z<<")"<<std::endl;*/
+				/*
+					Acknowledge block
+				*/
+				/*
+					[0] u16 command
+					[2] u8 count
+					[3] v3s16 pos_0
+					[3+6] v3s16 pos_1
+					...
+				*/
+				u32 replysize = 2+1+6;
+				SharedBuffer<u8> reply(replysize);
+				writeU16(&reply[0], TOSERVER_GOTBLOCKS);
+				reply[2] = 1;
+				writeV3S16(&reply[3], r.p);
+				// Send as reliable
+				m_con.Send(PEER_ID_SERVER, 1, reply, true);
+			}
 		}
 	}
-#endif
-
-	/*{
-		JMutexAutoLock lock(m_step_dtime_mutex);
-		m_step_dtime += dtime;
-	}*/
-	
-	/*
-		BEGIN TEST CODE
-	*/
-
-	/*
-		END OF TEST CODE
-	*/
-}
-
-float Client::asyncStep()
-{
-	DSTACK(__FUNCTION_NAME);
-	//dstream<<"Client::asyncStep()"<<std::endl;
-	
-	/*float dtime;
-	{
-		JMutexAutoLock lock1(m_step_dtime_mutex);
-		if(m_step_dtime < 0.001)
-			return 0.0;
-		dtime = m_step_dtime;
-		m_step_dtime = 0.0;
-	}
-
-	return dtime;*/
-	return 0.0;
 }
 
 // Virtual methods from con::PeerHandler
@@ -488,21 +674,19 @@ void Client::ReceiveAll()
 					"InvalidIncomingDataException: what()="
 					<<e.what()<<std::endl;
 		}
-		//TODO: Testing
-		//break;
 	}
 }
 
 void Client::Receive()
 {
 	DSTACK(__FUNCTION_NAME);
-	u32 data_maxsize = 10000;
+	u32 data_maxsize = 200000;
 	Buffer<u8> data(data_maxsize);
 	u16 sender_peer_id;
 	u32 datasize;
 	{
 		//TimeTaker t1("con mutex and receive", m_device);
-		JMutexAutoLock lock(m_con_mutex);
+		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 		datasize = m_con.Receive(sender_peer_id, *data, data_maxsize);
 	}
 	//TimeTaker t1("ProcessData", m_device);
@@ -542,7 +726,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 	con::Peer *peer;
 	{
-		JMutexAutoLock lock(m_con_mutex);
+		//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);
@@ -552,8 +736,6 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 	//dstream<<"Client received command="<<(int)command<<std::endl;
 
-	// Execute fast commands straight away
-
 	if(command == TOCLIENT_INIT)
 	{
 		if(datasize < 3)
@@ -578,10 +760,10 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		v3s16 playerpos_s16(0, BS*2+BS*20, 0);
 		if(datasize >= 2+1+6)
 			playerpos_s16 = readV3S16(&data[2+1]);
-		v3f playerpos_f = intToFloat(playerpos_s16) - v3f(0, BS/2, 0);
+		v3f playerpos_f = intToFloat(playerpos_s16, BS) - v3f(0, BS/2, 0);
 
 		{ //envlock
-			JMutexAutoLock envlock(m_env_mutex);
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 			
 			// Set player position
 			Player *player = m_env.getLocalPlayer();
@@ -589,6 +771,13 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 			player->setPosition(playerpos_f);
 		}
 		
+		if(datasize >= 2+1+6+8)
+		{
+			// Get map seed
+			m_map_seed = readU64(&data[2+1+6]);
+			dstream<<"Client: received map seed: "<<m_map_seed<<std::endl;
+		}
+		
 		// Reply to server
 		u32 replysize = 2;
 		SharedBuffer<u8> reply(replysize);
@@ -598,7 +787,23 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 		return;
 	}
-	
+
+	if(command == TOCLIENT_ACCESS_DENIED)
+	{
+		// The server didn't like our password. Note, this needs
+		// to be processed even if the serialisation format has
+		// not been agreed yet, the same as TOCLIENT_INIT.
+		m_access_denied = true;
+		m_access_denied_reason = L"Unknown";
+		if(datasize >= 4)
+		{
+			std::string datastring((char*)&data[2], datasize-2);
+			std::istringstream is(datastring, std::ios_base::binary);
+			m_access_denied_reason = deSerializeWideString(is);
+		}
+		return;
+	}
+
 	if(ser_version == SER_FMT_VER_INVALID)
 	{
 		dout_client<<DTIME<<"WARNING: Client: Server serialization"
@@ -611,47 +816,173 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 	// making some copypasta
 	{}
 
-	if(command == TOCLIENT_PLAYERPOS)
+	if(command == TOCLIENT_REMOVENODE)
 	{
-		dstream<<"WARNING: Received deprecated TOCLIENT_PLAYERPOS"
-				<<std::endl;
-		/*u16 our_peer_id;
-		{
-			JMutexAutoLock lock(m_con_mutex);
-			our_peer_id = m_con.GetPeerID();
-		}
-		// Cancel if we don't have a peer id
-		if(our_peer_id == PEER_ID_NEW){
-			dout_client<<DTIME<<"TOCLIENT_PLAYERPOS cancelled: "
-					"we have no peer id"
-					<<std::endl;
+		if(datasize < 8)
 			return;
-		}*/
-
-		{ //envlock
-			JMutexAutoLock envlock(m_env_mutex);
-			
-			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]);
+		v3s16 p;
+		p.X = readS16(&data[2]);
+		p.Y = readS16(&data[4]);
+		p.Z = readS16(&data[6]);
+		
+		//TimeTaker t1("TOCLIENT_REMOVENODE");
+		
+		// This will clear the cracking animation after digging
+		((ClientMap&)m_env.getMap()).clearTempMod(p);
 
-				Player *player = m_env.getPlayer(peer_id);
+		removeNode(p);
+	}
+	else if(command == TOCLIENT_ADDNODE)
+	{
+		if(datasize < 8 + MapNode::serializedLength(ser_version))
+			return;
 
-				// Skip if player doesn't exist
-				if(player == NULL)
-				{
-					start += player_size;
-					continue;
-				}
+		v3s16 p;
+		p.X = readS16(&data[2]);
+		p.Y = readS16(&data[4]);
+		p.Z = readS16(&data[6]);
+		
+		//TimeTaker t1("TOCLIENT_ADDNODE");
 
-				// Skip if player is local player
-				if(player->isLocal())
-				{
-					start += player_size;
+		MapNode n;
+		n.deSerialize(&data[8], ser_version);
+		
+		addNode(p, n);
+	}
+	else if(command == TOCLIENT_BLOCKDATA)
+	{
+		// Ignore too small packet
+		if(datasize < 8)
+			return;
+			
+		v3s16 p;
+		p.X = readS16(&data[2]);
+		p.Y = readS16(&data[4]);
+		p.Z = readS16(&data[6]);
+		
+		/*dout_client<<DTIME<<"Client: Thread: BLOCKDATA for ("
+				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
+		/*dstream<<DTIME<<"Client: Thread: BLOCKDATA for ("
+				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
+		
+		std::string datastring((char*)&data[8], datasize-8);
+		std::istringstream istr(datastring, std::ios_base::binary);
+		
+		MapSector *sector;
+		MapBlock *block;
+		
+		v2s16 p2d(p.X, p.Z);
+		sector = m_env.getMap().emergeSector(p2d);
+		
+		assert(sector->getPos() == p2d);
+
+		//TimeTaker timer("MapBlock deSerialize");
+		// 0ms
+		
+		block = sector->getBlockNoCreateNoEx(p.Y);
+		if(block)
+		{
+			/*
+				Update an existing block
+			*/
+			//dstream<<"Updating"<<std::endl;
+			block->deSerialize(istr, ser_version);
+		}
+		else
+		{
+			/*
+				Create a new block
+			*/
+			//dstream<<"Creating new"<<std::endl;
+			block = new MapBlock(&m_env.getMap(), p);
+			block->deSerialize(istr, ser_version);
+			sector->insertBlock(block);
+
+			//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
+		/*
+			Acknowledge block
+		*/
+		/*
+			[0] u16 command
+			[2] u8 count
+			[3] v3s16 pos_0
+			[3+6] v3s16 pos_1
+			...
+		*/
+		u32 replysize = 2+1+6;
+		SharedBuffer<u8> reply(replysize);
+		writeU16(&reply[0], TOSERVER_GOTBLOCKS);
+		reply[2] = 1;
+		writeV3S16(&reply[3], p);
+		// Send as reliable
+		m_con.Send(PEER_ID_SERVER, 1, reply, true);
+#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.
+		*/
+
+		//m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
+		/*
+			Add it to mesh update queue and set it to be acknowledged after update.
+		*/
+		//std::cerr<<"Adding mesh update task for received block"<<std::endl;
+		addUpdateMeshTaskWithEdge(p, true);
+	}
+	else if(command == TOCLIENT_PLAYERPOS)
+	{
+		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;
+			return;
+		}*/
+
+		{ //envlock
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+			
+			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]);
+
+				Player *player = m_env.getPlayer(peer_id);
+
+				// Skip if player doesn't exist
+				if(player == NULL)
+				{
+					start += player_size;
+					continue;
+				}
+
+				// Skip if player is local player
+				if(player->isLocal())
+				{
+					start += player_size;
 					continue;
 				}
 
@@ -683,11 +1014,11 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 	{
 		u16 our_peer_id;
 		{
-			JMutexAutoLock lock(m_con_mutex);
+			//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_NEW){
+		if(our_peer_id == PEER_ID_INEXISTENT){
 			dout_client<<DTIME<<"TOCLIENT_PLAYERINFO cancelled: "
 					"we have no peer id"
 					<<std::endl;
@@ -697,7 +1028,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		//dstream<<DTIME<<"Client: Server reports players:"<<std::endl;
 
 		{ //envlock
-			JMutexAutoLock envlock(m_env_mutex);
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 			
 			u32 item_size = 2+PLAYERNAME_SIZE;
 			u32 player_count = (datasize-2) / item_size;
@@ -785,6 +1116,8 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 	}
 	else if(command == TOCLIENT_SECTORMETA)
 	{
+		dstream<<"Client received DEPRECATED TOCLIENT_SECTORMETA"<<std::endl;
+#if 0
 		/*
 			[0] u16 command
 			[2] u8 sector count
@@ -796,7 +1129,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		//dstream<<"Client received TOCLIENT_SECTORMETA"<<std::endl;
 
 		{ //envlock
-			JMutexAutoLock envlock(m_env_mutex);
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 			
 			std::string datastring((char*)&data[2], datasize-2);
 			std::istringstream is(datastring, std::ios_base::binary);
@@ -820,6 +1153,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 				((ClientMap&)m_env.getMap()).deSerializeSector(pos, is);
 			}
 		} //envlock
+#endif
 	}
 	else if(command == TOCLIENT_INVENTORY)
 	{
@@ -830,7 +1164,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 		{ //envlock
 			//TimeTaker t2("mutex locking", m_device);
-			JMutexAutoLock envlock(m_env_mutex);
+			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 			//t2.stop();
 			
 			//TimeTaker t3("istringstream init", m_device);
@@ -865,7 +1199,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		
 		{ //envlock
 		
-		JMutexAutoLock envlock(m_env_mutex);
+		//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 
 		u8 buf[12];
 
@@ -916,6 +1250,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 
 		/*
 			Read block objects
+			NOTE: Deprecated stuff here, TODO: Remove
 		*/
 
 		// Read active block count
@@ -975,9 +1310,13 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 			if(abs_to_delete.find(p) != NULL)
 				abs_to_delete.remove(p);
 
-			// Update objects of block
+			/*
+				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_device->getSceneManager(), m_env.getDayNightRatio());
 		}
 		
 		/*dstream<<"Final delete queue size: "<<abs_to_delete.size()
@@ -1017,476 +1356,217 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
 		if(datasize < 4)
 			return;
 		
-		u16 time = readU16(&data[2]);
-		time = time % 24000;
-		m_time_of_day.set(time);
-		//dstream<<"Client: time="<<time<<std::endl;
-	}
-	// Default to queueing it (for slow commands)
-	else
-	{
-		JMutexAutoLock lock(m_incoming_queue_mutex);
+		u16 time_of_day = readU16(&data[2]);
+		time_of_day = time_of_day % 24000;
+		//dstream<<"Client: time_of_day="<<time_of_day<<std::endl;
 		
-		IncomingPacket packet(data, datasize);
-		m_incoming_queue.push_back(packet);
-	}
-}
+		/*
+			time_of_day:
+			0 = midnight
+			12000 = midday
+		*/
+		{
+			m_env.setTimeOfDay(time_of_day);
 
-/*
-	Returns true if there was something in queue
-*/
-bool Client::AsyncProcessPacket(LazyMeshUpdater &mesh_updater)
-{
-	DSTACK(__FUNCTION_NAME);
-	
-	try //for catching con::PeerNotFoundException
-	{
+			u32 dr = m_env.getDayNightRatio();
 
-	con::Peer *peer;
-	{
-		JMutexAutoLock lock(m_con_mutex);
-		// All data is coming from the server
-		peer = m_con.GetPeer(PEER_ID_SERVER);
-	}
-	
-	u8 ser_version = m_server_ser_ver;
+			dstream<<"Client: time_of_day="<<time_of_day
+					<<", dr="<<dr
+					<<std::endl;
+		}
 
-	IncomingPacket packet = getPacket();
-	u8 *data = packet.m_data;
-	u32 datasize = packet.m_datalen;
-	
-	// An empty packet means queue is empty
-	if(data == NULL){
-		return false;
 	}
-	
-	if(datasize < 2)
-		return true;
-	
-	ToClientCommand command = (ToClientCommand)readU16(&data[0]);
-
-	if(command == TOCLIENT_REMOVENODE)
+	else if(command == TOCLIENT_CHAT_MESSAGE)
 	{
-		if(datasize < 8)
-			return true;
-		v3s16 p;
-		p.X = readS16(&data[2]);
-		p.Y = readS16(&data[4]);
-		p.Z = readS16(&data[6]);
+		/*
+			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);
 		
-		//TimeTaker t1("TOCLIENT_REMOVENODE", g_device);
-
-		core::map<v3s16, MapBlock*> modified_blocks;
-
-		try
-		{
-			JMutexAutoLock envlock(m_env_mutex);
-			//TimeTaker t("removeNodeAndUpdate", m_device);
-			m_env.getMap().removeNodeAndUpdate(p, modified_blocks);
-		}
-		catch(InvalidPositionException &e)
-		{
-		}
+		// Read stuff
+		is.read((char*)buf, 2);
+		u16 len = readU16(buf);
 		
-		for(core::map<v3s16, MapBlock * >::Iterator
-				i = modified_blocks.getIterator();
-				i.atEnd() == false; i++)
+		std::wstring message;
+		for(u16 i=0; i<len; i++)
 		{
-			v3s16 p = i.getNode()->getKey();
-			//m_env.getMap().updateMeshes(p);
-			mesh_updater.add(p);
+			is.read((char*)buf, 2);
+			message += (wchar_t)readU16(buf);
 		}
-	}
-	else if(command == TOCLIENT_ADDNODE)
-	{
-		if(datasize < 8 + MapNode::serializedLength(ser_version))
-			return true;
-
-		v3s16 p;
-		p.X = readS16(&data[2]);
-		p.Y = readS16(&data[4]);
-		p.Z = readS16(&data[6]);
-		
-		//TimeTaker t1("TOCLIENT_ADDNODE", g_device);
-
-		MapNode n;
-		n.deSerialize(&data[8], ser_version);
-		
-		core::map<v3s16, MapBlock*> modified_blocks;
 
-		try
-		{
-			JMutexAutoLock envlock(m_env_mutex);
-			m_env.getMap().addNodeAndUpdate(p, n, modified_blocks);
-		}
-		catch(InvalidPositionException &e)
-		{}
+		/*dstream<<"Client received chat message: "
+				<<wide_to_narrow(message)<<std::endl;*/
 		
-		for(core::map<v3s16, MapBlock * >::Iterator
-				i = modified_blocks.getIterator();
-				i.atEnd() == false; i++)
-		{
-			v3s16 p = i.getNode()->getKey();
-			//m_env.getMap().updateMeshes(p);
-			mesh_updater.add(p);
-		}
+		m_chat_queue.push_back(message);
 	}
-	else if(command == TOCLIENT_BLOCKDATA)
+	else if(command == TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD)
 	{
-		// Ignore too small packet
-		if(datasize < 8)
-			return true;
-		/*if(datasize < 8 + MapBlock::serializedLength(ser_version))
-			goto getdata;*/
-			
-		v3s16 p;
-		p.X = readS16(&data[2]);
-		p.Y = readS16(&data[4]);
-		p.Z = readS16(&data[6]);
-		
-		/*dout_client<<DTIME<<"Client: Thread: BLOCKDATA for ("
-				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
+		//if(g_settings.getBool("enable_experimental"))
+		{
+			/*
+				u16 command
+				u16 count of removed objects
+				for all removed objects {
+					u16 id
+				}
+				u16 count of added objects
+				for all added objects {
+					u16 id
+					u8 type
+					u16 initialization data length
+					string initialization data
+				}
+			*/
 
-		/*dstream<<DTIME<<"Client: Thread: BLOCKDATA for ("
-				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-		
-		std::string datastring((char*)&data[8], datasize-8);
-		std::istringstream istr(datastring, std::ios_base::binary);
-		
-		MapSector *sector;
-		MapBlock *block;
-		
-		{ //envlock
-			JMutexAutoLock envlock(m_env_mutex);
-			
-			v2s16 p2d(p.X, p.Z);
-			sector = m_env.getMap().emergeSector(p2d);
+			char buf[6];
+			// Get all data except the command number
+			std::string datastring((char*)&data[2], datasize-2);
+			// Throw them in an istringstream
+			std::istringstream is(datastring, std::ios_base::binary);
+
+			// Read stuff
 			
-			v2s16 sp = sector->getPos();
-			if(sp != p2d)
+			// Read removed objects
+			is.read(buf, 2);
+			u16 removed_count = readU16((u8*)buf);
+			for(u16 i=0; i<removed_count; i++)
 			{
-				dstream<<"ERROR: Got sector with getPos()="
-						<<"("<<sp.X<<","<<sp.Y<<"), tried to get"
-						<<"("<<p2d.X<<","<<p2d.Y<<")"<<std::endl;
+				is.read(buf, 2);
+				u16 id = readU16((u8*)buf);
+				// Remove it
+				{
+					//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+					m_env.removeActiveObject(id);
+				}
 			}
-
-			assert(sp == p2d);
-			//assert(sector->getPos() == p2d);
 			
-			try{
-				block = sector->getBlockNoCreate(p.Y);
-				/*
-					Update an existing block
-				*/
-				//dstream<<"Updating"<<std::endl;
-				block->deSerialize(istr, ser_version);
-				//block->setChangedFlag();
-			}
-			catch(InvalidPositionException &e)
+			// Read added objects
+			is.read(buf, 2);
+			u16 added_count = readU16((u8*)buf);
+			for(u16 i=0; i<added_count; i++)
 			{
-				/*
-					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);*/
-				
-				/*
-					Add some coulds
-					Well, this is a dumb way to do it, they should just
-					be drawn as separate objects.
-				*/
-				/*if(p.Y == 3)
+				is.read(buf, 2);
+				u16 id = readU16((u8*)buf);
+				is.read(buf, 1);
+				u8 type = readU8((u8*)buf);
+				std::string data = deSerializeLongString(is);
+				// Add it
 				{
-					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);
-					}
-				}*/
+					//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+					m_env.addActiveObject(id, type, data);
+				}
 			}
-		} //envlock
-		
-		
-		// Old version has zero lighting, update it.
-		if(ser_version == 0 || ser_version == 1)
+		}
+	}
+	else if(command == TOCLIENT_ACTIVE_OBJECT_MESSAGES)
+	{
+		//if(g_settings.getBool("enable_experimental"))
 		{
-			derr_client<<"Client: Block in old format: "
-					"Calculating lighting"<<std::endl;
-			core::map<v3s16, MapBlock*> blocks_changed;
-			blocks_changed.insert(block->getPos(), block);
-			core::map<v3s16, MapBlock*> modified_blocks;
-			m_env.getMap().updateLighting(blocks_changed, modified_blocks);
+			/*
+				u16 command
+				for all objects
+				{
+					u16 id
+					u16 message length
+					string message
+				}
+			*/
+			char buf[6];
+			// Get all data except the command number
+			std::string datastring((char*)&data[2], datasize-2);
+			// Throw them in an istringstream
+			std::istringstream is(datastring, std::ios_base::binary);
+			
+			while(is.eof() == false)
+			{
+				// Read stuff
+				is.read(buf, 2);
+				u16 id = readU16((u8*)buf);
+				if(is.eof())
+					break;
+				is.read(buf, 2);
+				u16 message_size = readU16((u8*)buf);
+				std::string message;
+				message.reserve(message_size);
+				for(u16 i=0; i<message_size; i++)
+				{
+					is.read(buf, 1);
+					message.append(buf, 1);
+				}
+				// Pass on to the environment
+				{
+					//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+					m_env.processActiveObjectMessage(id, message);
+				}
+			}
 		}
+	}
+	else if(command == TOCLIENT_HP)
+	{
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		Player *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		u8 hp = readU8(is);
+		player->hp = hp;
+	}
+	else if(command == TOCLIENT_MOVE_PLAYER)
+	{
+		std::string datastring((char*)&data[2], datasize-2);
+		std::istringstream is(datastring, std::ios_base::binary);
+		Player *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		v3f pos = readV3F1000(is);
+		f32 pitch = readF1000(is);
+		f32 yaw = readF1000(is);
+		player->setPosition(pos);
+		/*player->setPitch(pitch);
+		player->setYaw(yaw);*/
+
+		dstream<<"Client got TOCLIENT_MOVE_PLAYER"
+				<<" pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"
+				<<" pitch="<<pitch
+				<<" yaw="<<yaw
+				<<std::endl;
 
 		/*
-			Update Mesh of this block and blocks at x-, y- and z-
-		*/
-
-		//m_env.getMap().updateMeshes(block->getPos());
-		mesh_updater.add(block->getPos());
-		
-		/*
-			Acknowledge block.
-		*/
-		/*
-			[0] u16 command
-			[2] u8 count
-			[3] v3s16 pos_0
-			[3+6] v3s16 pos_1
-			...
-		*/
-		u32 replysize = 2+1+6;
-		SharedBuffer<u8> reply(replysize);
-		writeU16(&reply[0], TOSERVER_GOTBLOCKS);
-		reply[2] = 1;
-		writeV3S16(&reply[3], p);
-		// Send as reliable
-		m_con.Send(PEER_ID_SERVER, 1, reply, true);
-
-#if 0
-		/*
-			Remove from history
+			Add to ClientEvent queue.
+			This has to be sent to the main program because otherwise
+			it would just force the pitch and yaw values to whatever
+			the camera points to.
 		*/
-		{
-			JMutexAutoLock lock(m_fetchblock_mutex);
-			
-			if(m_fetchblock_history.find(p) != NULL)
-			{
-				m_fetchblock_history.remove(p);
-			}
-			else
-			{
-				/*
-					Acknowledge block.
-				*/
-				/*
-					[0] u16 command
-					[2] u8 count
-					[3] v3s16 pos_0
-					[3+6] v3s16 pos_1
-					...
-				*/
-				u32 replysize = 2+1+6;
-				SharedBuffer<u8> reply(replysize);
-				writeU16(&reply[0], TOSERVER_GOTBLOCKS);
-				reply[2] = 1;
-				writeV3S16(&reply[3], p);
-				// Send as reliable
-				m_con.Send(PEER_ID_SERVER, 1, reply, true);
-			}
-		}
-#endif
+		ClientEvent event;
+		event.type = CE_PLAYER_FORCE_MOVE;
+		event.player_force_move.pitch = pitch;
+		event.player_force_move.yaw = yaw;
+		m_client_event_queue.push_back(event);
+
+		// Ignore damage for a few seconds, so that the player doesn't
+		// get damage from falling on ground
+		m_ignore_damage_timer = 3.0;
 	}
 	else
 	{
 		dout_client<<DTIME<<"WARNING: Client: Ignoring unknown command "
 				<<command<<std::endl;
 	}
-
-	return true;
-
-	} //try
-	catch(con::PeerNotFoundException &e)
-	{
-		dout_client<<DTIME<<"Client::AsyncProcessData(): Cancelling: The server"
-				" connection doesn't exist (a timeout or not yet connected?)"<<std::endl;
-		return false;
-	}
-}
-
-bool Client::AsyncProcessData()
-{
-	for(;;)
-	{
-		// We want to update the meshes as soon as a single packet has
-		// been processed
-		LazyMeshUpdater mesh_updater(&m_env);
-		bool r = AsyncProcessPacket(mesh_updater);
-		if(r == false)
-			break;
-	}
-	return false;
-
-	/*LazyMeshUpdater mesh_updater(&m_env);
-	for(;;)
-	{
-		bool r = AsyncProcessPacket(mesh_updater);
-		if(r == false)
-			break;
-	}
-	return false;*/
-
 }
 
 void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
 {
-	JMutexAutoLock lock(m_con_mutex);
+	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 	m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
 }
 
-#if 0
-void Client::fetchBlock(v3s16 p, u8 flags)
-{
-	if(connectedAndInitialized() == false)
-		throw ClientNotReadyException
-		("ClientNotReadyException: connectedAndInitialized() == false");
-
-	/*dstream<<"Client::fetchBlock(): Sending GETBLOCK for ("
-			<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-
-	JMutexAutoLock conlock(m_con_mutex);
-
-	SharedBuffer<u8> data(9);
-	writeU16(&data[0], TOSERVER_GETBLOCK);
-	writeS16(&data[2], p.X);
-	writeS16(&data[4], p.Y);
-	writeS16(&data[6], p.Z);
-	writeU8(&data[8], flags);
-	m_con.Send(PEER_ID_SERVER, 1, data, true);
-}
-
-/*
-	Calls fetchBlock() on some nearby missing blocks.
-
-	Returns when any of various network load indicators go over limit.
-
-	Does nearly the same thing as the old updateChangedVisibleArea()
-*/
-void Client::fetchBlocks()
-{
-	if(connectedAndInitialized() == false)
-		throw ClientNotReadyException
-		("ClientNotReadyException: connectedAndInitialized() == false");
-}
-#endif
-
-bool Client::isFetchingBlocks()
-{
-	JMutexAutoLock conlock(m_con_mutex);
-	con::Peer *peer = m_con.GetPeerNoEx(PEER_ID_SERVER);
-	// Not really fetching but can't fetch more.
-	if(peer == NULL) return true;
-
-	con::Channel *channel = &(peer->channels[1]);
-	/*
-		NOTE: Channel 0 should always be used for fetching blocks,
-		      and for nothing else.
-	*/
-	if(channel->incoming_reliables.size() > 0)
-		return true;
-	if(channel->outgoing_reliables.size() > 0)
-		return true;
-	return false;
-}
-
-IncomingPacket Client::getPacket()
-{
-	JMutexAutoLock lock(m_incoming_queue_mutex);
-	
-	core::list<IncomingPacket>::Iterator i;
-	// Refer to first one
-	i = m_incoming_queue.begin();
-
-	// If queue is empty, return empty packet
-	if(i == m_incoming_queue.end()){
-		IncomingPacket packet;
-		return packet;
-	}
-	
-	// Pop out first packet and return it
-	IncomingPacket packet = *i;
-	m_incoming_queue.erase(i);
-	return packet;
-}
-
-#if 0
-void Client::removeNode(v3s16 nodepos)
-{
-	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::removeNode() cancelled (not connected)"
-				<<std::endl;
-		return;
-	}
-	
-	// Test that the position exists
-	try{
-		JMutexAutoLock envlock(m_env_mutex);
-		m_env.getMap().getNode(nodepos);
-	}
-	catch(InvalidPositionException &e)
-	{
-		dout_client<<DTIME<<"Client::removeNode() cancelled (doesn't exist)"
-				<<std::endl;
-		return;
-	}
-
-	SharedBuffer<u8> data(8);
-	writeU16(&data[0], TOSERVER_REMOVENODE);
-	writeS16(&data[2], nodepos.X);
-	writeS16(&data[4], nodepos.Y);
-	writeS16(&data[6], nodepos.Z);
-	Send(0, data, true);
-}
-
-void Client::addNodeFromInventory(v3s16 nodepos, u16 i)
-{
-	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::addNodeFromInventory() "
-				"cancelled (not connected)"
-				<<std::endl;
-		return;
-	}
-	
-	// Test that the position exists
-	try{
-		JMutexAutoLock envlock(m_env_mutex);
-		m_env.getMap().getNode(nodepos);
-	}
-	catch(InvalidPositionException &e)
-	{
-		dout_client<<DTIME<<"Client::addNode() cancelled (doesn't exist)"
-				<<std::endl;
-		return;
-	}
-
-	//u8 ser_version = m_server_ser_ver;
-
-	// SUGGESTION: The validity of the operation could be checked here too
-
-	u8 datasize = 2 + 6 + 2;
-	SharedBuffer<u8> data(datasize);
-	writeU16(&data[0], TOSERVER_ADDNODE_FROM_INVENTORY);
-	writeS16(&data[2], nodepos.X);
-	writeS16(&data[4], nodepos.Y);
-	writeS16(&data[6], nodepos.Z);
-	writeU16(&data[8], i);
-	Send(0, data, true);
-}
-#endif
-
-void Client::pressGround(u8 button, v3s16 nodepos_undersurface,
+void Client::groundAction(u8 action, v3s16 nodepos_undersurface,
 		v3s16 nodepos_oversurface, u16 item)
 {
 	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::pressGround() "
+		dout_client<<DTIME<<"Client::groundAction() "
 				"cancelled (not connected)"
 				<<std::endl;
 		return;
@@ -1503,11 +1583,12 @@ void Client::pressGround(u8 button, v3s16 nodepos_undersurface,
 		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], button);
+	writeU8(&data[2], action);
 	writeV3S16(&data[3], nodepos_undersurface);
 	writeV3S16(&data[9], nodepos_oversurface);
 	writeU16(&data[15], item);
@@ -1524,7 +1605,7 @@ void Client::clickObject(u8 button, v3s16 blockpos, s16 id, u16 item)
 	}
 	
 	/*
-		[0] u16 command
+		[0] u16 command=TOSERVER_CLICK_OBJECT
 		[2] u8 button (0=left, 1=right)
 		[3] v3s16 block
 		[9] s16 id
@@ -1540,34 +1621,28 @@ void Client::clickObject(u8 button, v3s16 blockpos, s16 id, u16 item)
 	Send(0, data, true);
 }
 
-void Client::stopDigging()
+void Client::clickActiveObject(u8 button, u16 id, u16 item)
 {
 	if(connectedAndInitialized() == false){
-		dout_client<<DTIME<<"Client::release() "
+		dout_client<<DTIME<<"Client::clickActiveObject() "
 				"cancelled (not connected)"
 				<<std::endl;
 		return;
 	}
 	
 	/*
-		length: 17
+		length: 7
 		[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)
+		[2] u8 button (0=left, 1=right)
+		[3] u16 id
+		[5] u16 item
 	*/
-	u8 datasize = 2 + 1 + 6 + 6 + 2;
+	u8 datasize = 2 + 1 + 6 + 2 + 2;
 	SharedBuffer<u8> data(datasize);
-	writeU16(&data[0], TOSERVER_GROUND_ACTION);
-	writeU8(&data[2], 2);
-	writeV3S16(&data[3], v3s16(0,0,0));
-	writeV3S16(&data[9], v3s16(0,0,0));
-	writeU16(&data[15], 0);
+	writeU16(&data[0], TOSERVER_CLICK_ACTIVEOBJECT);
+	writeU8(&data[2], button);
+	writeU16(&data[3], id);
+	writeU16(&data[5], item);
 	Send(0, data, true);
 }
 
@@ -1609,10 +1684,142 @@ void Client::sendSignText(v3s16 blockpos, s16 id, std::string text)
 	// Send as reliable
 	Send(0, data, true);
 }
+	
+void Client::sendSignNodeText(v3s16 p, std::string text)
+{
+	/*
+		u16 command
+		v3s16 p
+		u16 textlen
+		textdata
+	*/
+	std::ostringstream os(std::ios_base::binary);
+	u8 buf[12];
+	
+	// Write command
+	writeU16(buf, TOSERVER_SIGNNODETEXT);
+	os.write((char*)buf, 2);
+	
+	// Write p
+	writeV3S16(buf, p);
+	os.write((char*)buf, 6);
+
+	u16 textlen = text.size();
+	// Write text length
+	writeS16(buf, textlen);
+	os.write((char*)buf, 2);
+
+	// 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::sendInventoryAction(InventoryAction *a)
+{
+	std::ostringstream os(std::ios_base::binary);
+	u8 buf[12];
+	
+	// Write command
+	writeU16(buf, TOSERVER_INVENTORY_ACTION);
+	os.write((char*)buf, 2);
+
+	a->serialize(os);
+	
+	// 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::sendChatMessage(const std::wstring &message)
+{
+	std::ostringstream os(std::ios_base::binary);
+	u8 buf[12];
+	
+	// Write command
+	writeU16(buf, TOSERVER_CHAT_MESSAGE);
+	os.write((char*)buf, 2);
+	
+	// Write length
+	writeU16(buf, message.size());
+	os.write((char*)buf, 2);
+	
+	// Write string
+	for(u32 i=0; i<message.size(); i++)
+	{
+		u16 w = message[i];
+		writeU16(buf, w);
+		os.write((char*)buf, 2);
+	}
+	
+	// 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::sendChangePassword(const std::wstring oldpassword,
+		const std::wstring newpassword)
+{
+	Player *player = m_env.getLocalPlayer();
+	if(player == NULL)
+		return;
+
+	std::string playername = player->getName();
+	std::string oldpwd = translatePassword(playername, oldpassword);
+	std::string newpwd = translatePassword(playername, newpassword);
+
+	std::ostringstream os(std::ios_base::binary);
+	u8 buf[2+PASSWORD_SIZE*2];
+	/*
+		[0] u16 TOSERVER_PASSWORD
+		[2] u8[28] old password
+		[30] u8[28] new password
+	*/
+
+	writeU16(buf, TOSERVER_PASSWORD);
+	for(u32 i=0;i<PASSWORD_SIZE-1;i++)
+	{
+		buf[2+i] = i<oldpwd.length()?oldpwd[i]:0;
+		buf[30+i] = i<newpwd.length()?newpwd[i]:0;
+	}
+	buf[2+PASSWORD_SIZE-1] = 0;
+	buf[30+PASSWORD_SIZE-1] = 0;
+	os.write((char*)buf, 2+PASSWORD_SIZE*2);
+
+	// 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::sendDamage(u8 damage)
+{
+	DSTACK(__FUNCTION_NAME);
+	std::ostringstream os(std::ios_base::binary);
+
+	writeU16(os, TOSERVER_DAMAGE);
+	writeU8(os, damage);
+
+	// 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);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	
 	Player *myplayer = m_env.getLocalPlayer();
 	if(myplayer == NULL)
@@ -1620,12 +1827,12 @@ void Client::sendPlayerPos()
 	
 	u16 our_peer_id;
 	{
-		JMutexAutoLock lock(m_con_mutex);
+		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
 		our_peer_id = m_con.GetPeerID();
 	}
 	
 	// Set peer id if not set already
-	if(myplayer->peer_id == PEER_ID_NEW)
+	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);
@@ -1657,47 +1864,80 @@ void Client::sendPlayerPos()
 	Send(0, data, false);
 }
 
+void Client::removeNode(v3s16 p)
+{
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+	
+	core::map<v3s16, MapBlock*> modified_blocks;
+
+	try
+	{
+		//TimeTaker t("removeNodeAndUpdate", m_device);
+		m_env.getMap().removeNodeAndUpdate(p, modified_blocks);
+	}
+	catch(InvalidPositionException &e)
+	{
+	}
+	
+	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");
+		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.getMap().updateCamera(pos, dir);
+	m_env.getClientMap().updateCamera(pos, dir);
 	camera_position = pos;
 	camera_direction = dir;
 }
 
 MapNode Client::getNode(v3s16 p)
 {
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	return m_env.getMap().getNode(p);
 }
 
-/*f32 Client::getGroundHeight(v2s16 p)
-{
-	JMutexAutoLock envlock(m_env_mutex);
-	return m_env.getMap().getGroundHeight(p);
-}*/
-
-bool Client::isNodeUnderground(v3s16 p)
+NodeMetadata* Client::getNodeMetadata(v3s16 p)
 {
-	JMutexAutoLock envlock(m_env_mutex);
-	return m_env.getMap().isNodeUnderground(p);
+	return m_env.getMap().getNodeMetadata(p);
 }
 
-/*Player * Client::getLocalPlayer()
-{
-	JMutexAutoLock envlock(m_env_mutex);
-	return m_env.getLocalPlayer();
-}*/
-
-/*core::list<Player*> Client::getPlayers()
-{
-	JMutexAutoLock envlock(m_env_mutex);
-	return m_env.getPlayers();
-}*/
-
 v3f Client::getPlayerPosition()
 {
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	return player->getPosition();
@@ -1705,7 +1945,7 @@ v3f Client::getPlayerPosition()
 
 void Client::setPlayerControl(PlayerControl &control)
 {
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	player->control = control;
@@ -1716,7 +1956,7 @@ void Client::setPlayerControl(PlayerControl &control)
 bool Client::getLocalInventoryUpdated()
 {
 	// m_inventory_updated is behind envlock
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	bool updated = m_inventory_updated;
 	m_inventory_updated = false;
 	return updated;
@@ -1725,19 +1965,57 @@ bool Client::getLocalInventoryUpdated()
 // Copies the inventory of the local player to parameter
 void Client::getLocalInventory(Inventory &dst)
 {
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	Player *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	dst = player->inventory;
 }
 
+InventoryContext *Client::getInventoryContext()
+{
+	return &m_inventory_context;
+}
+
+Inventory* Client::getInventory(InventoryContext *c, std::string id)
+{
+	if(id == "current_player")
+	{
+		assert(c->current_player);
+		return &(c->current_player->inventory);
+	}
+	
+	Strfnd fn(id);
+	std::string id0 = fn.next(":");
+
+	if(id0 == "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;
+	return NULL;
+}
+void Client::inventoryAction(InventoryAction *a)
+{
+	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);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 
 	core::array<DistanceSortedObject> objects;
 
@@ -1759,7 +2037,7 @@ MapBlockObject * Client::getSelectedObject(
 
 		// 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);
+		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);
@@ -1779,7 +2057,7 @@ MapBlockObject * Client::getSelectedObject(
 
 		// 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);
+		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
@@ -1796,82 +2074,200 @@ MapBlockObject * Client::getSelectedObject(
 	return NULL;
 }
 
+ClientActiveObject * Client::getSelectedActiveObject(
+		f32 max_d,
+		v3f from_pos_f_on_map,
+		core::line3d<f32> shootline_on_map
+	)
+{
+	core::array<DistanceSortedActiveObject> objects;
+
+	m_env.getActiveObjects(from_pos_f_on_map, 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++)
+	{
+		ClientActiveObject *obj = objects[i].obj;
+		
+		core::aabbox3d<f32> *selection_box = obj->getSelectionBox();
+		if(selection_box == NULL)
+			continue;
+
+		v3f pos = obj->getPosition();
+
+		core::aabbox3d<f32> offsetted_box(
+				selection_box->MinEdge + pos,
+				selection_box->MaxEdge + pos
+		);
+
+		if(offsetted_box.intersectsWithLine(shootline_on_map))
+		{
+			//dstream<<"Returning selected object"<<std::endl;
+			return obj;
+		}
+	}
+
+	//dstream<<"No object selected; returning NULL."<<std::endl;
+	return NULL;
+}
+
 void Client::printDebugInfo(std::ostream &os)
 {
 	//JMutexAutoLock lock1(m_fetchblock_mutex);
-	JMutexAutoLock lock2(m_incoming_queue_mutex);
+	/*JMutexAutoLock lock2(m_incoming_queue_mutex);
 
 	os<<"m_incoming_queue.getSize()="<<m_incoming_queue.getSize()
 		//<<", m_fetchblock_history.size()="<<m_fetchblock_history.size()
 		//<<", m_opt_not_found_history.size()="<<m_opt_not_found_history.size()
-		<<std::endl;
+		<<std::endl;*/
 }
 	
-/*s32 Client::getDayNightIndex()
-{
-	assert(m_daynight_i >= 0 && m_daynight_i < DAYNIGHT_CACHE_COUNT);
-	return m_daynight_i;
-}*/
-
 u32 Client::getDayNightRatio()
 {
-	JMutexAutoLock envlock(m_env_mutex);
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	return m_env.getDayNightRatio();
 }
 
-/*void Client::updateSomeExpiredMeshes()
+u16 Client::getHP()
 {
-	TimeTaker timer("updateSomeExpiredMeshes()", g_device);
-	
-	Player *player;
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+	return player->hp;
+}
+
+void Client::setTempMod(v3s16 p, NodeMod mod)
+{
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+	assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
+
+	core::map<v3s16, MapBlock*> affected_blocks;
+	((ClientMap&)m_env.getMap()).setTempMod(p, mod,
+			&affected_blocks);
+
+	for(core::map<v3s16, MapBlock*>::Iterator
+			i = affected_blocks.getIterator();
+			i.atEnd() == false; i++)
 	{
-		JMutexAutoLock envlock(m_env_mutex);
-		player = m_env.getLocalPlayer();
+		i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
 	}
+}
 
-	u32 daynight_ratio = getDayNightRatio();
+void Client::clearTempMod(v3s16 p)
+{
+	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
+	assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
+
+	core::map<v3s16, MapBlock*> affected_blocks;
+	((ClientMap&)m_env.getMap()).clearTempMod(p,
+			&affected_blocks);
+
+	for(core::map<v3s16, MapBlock*>::Iterator
+			i = affected_blocks.getIterator();
+			i.atEnd() == false; i++)
+	{
+		i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
+	}
+}
 
-	v3f playerpos = player->getPosition();
-	v3f playerspeed = player->getSpeed();
+void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server)
+{
+	/*dstream<<"Client::addUpdateMeshTask(): "
+			<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+			<<std::endl;*/
 
-	v3s16 center_nodepos = floatToInt(playerpos);
-	v3s16 center = getNodeBlockPos(center_nodepos);
+	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;
+	
+	{
+		//TimeTaker timer("data fill");
+		// Release: ~0ms
+		// Debug: 1-6ms, avg=2ms
+		data->fill(getDayNightRatio(), b);
+	}
 
-	u32 counter = 0;
+	// 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);
 
-	s16 d_max = 5;
+	/*dstream<<"Mesh update input queue size is "
+			<<m_mesh_update_thread.m_queue_in.size()
+			<<std::endl;*/
 	
-	for(s16 d = 0; d <= d_max; d++)
+#if 0
+	// Temporary test: make mesh directly in here
 	{
-		core::list<v3s16> list;
-		getFacePositions(list, d);
-		
-		core::list<v3s16>::Iterator li;
-		for(li=list.begin(); li!=list.end(); li++)
-		{
-			v3s16 p = *li + center;
-			MapBlock *block = NULL;
-			try
-			{
-				//JMutexAutoLock envlock(m_env_mutex);
-				block = m_env.getMap().getBlockNoCreate(p);
-			}
-			catch(InvalidPositionException &e)
-			{
-			}
+		//TimeTaker timer("make mesh");
+		// 10ms
+		scene::SMesh *mesh_new = NULL;
+		mesh_new = makeMapBlockMesh(data);
+		b->replaceMesh(mesh_new);
+		delete data;
+	}
+#endif
 
-			if(block == NULL)
-				continue;
+	/*
+		Mark mesh as non-expired at this point so that it can already
+		be marked as expired again if the data changes
+	*/
+	b->setMeshExpired(false);
+}
 
-			if(block->getMeshExpired() == false)
-				continue;
+void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server)
+{
+	/*{
+		v3s16 p = blockpos;
+		dstream<<"Client::addUpdateMeshTaskWithEdge(): "
+				<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
+				<<std::endl;
+	}*/
 
-			block->updateMesh(daynight_ratio);
+	try{
+		v3s16 p = blockpos + v3s16(0,0,0);
+		//MapBlock *b = m_env.getMap().getBlockNoCreate(p);
+		addUpdateMeshTask(p, ack_to_server);
+	}
+	catch(InvalidPositionException &e){}
+	// Leading edge
+	try{
+		v3s16 p = blockpos + v3s16(-1,0,0);
+		addUpdateMeshTask(p);
+	}
+	catch(InvalidPositionException &e){}
+	try{
+		v3s16 p = blockpos + v3s16(0,-1,0);
+		addUpdateMeshTask(p);
+	}
+	catch(InvalidPositionException &e){}
+	try{
+		v3s16 p = blockpos + v3s16(0,0,-1);
+		addUpdateMeshTask(p);
+	}
+	catch(InvalidPositionException &e){}
+}
 
-			counter++;
-			if(counter >= 5)
-				return;
-		}
+ClientEvent Client::getClientEvent()
+{
+	if(m_client_event_queue.size() == 0)
+	{
+		ClientEvent event;
+		event.type = CE_NONE;
+		return event;
 	}
-}*/
+	return m_client_event_queue.pop_front();
+}
+