X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fclient.cpp;h=5e8f20620f5b9b66000b552ff8541db0afdc3c45;hb=6f2d785d0ff761961912d7e79a7d16c4adf86861;hp=d092c6a10ceb00b4277c8c3690fecb688e7fc113;hpb=2dc9a0c724dafde4a4858060268f3bec1b7cb720;p=minetest.git

diff --git a/src/client.cpp b/src/client.cpp
index d092c6a10..5c04632d1 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,41 +1,59 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "client.h"
-#include "utility.h"
 #include <iostream>
-#include "clientserver.h"
-#include "jmutexautolock.h"
-#include "main.h"
+#include <algorithm>
 #include <sstream>
+#include <IFileSystem.h>
+#include "threading/mutex_auto_lock.h"
+#include "util/auth.h"
+#include "util/directiontables.h"
+#include "util/pointedthing.h"
+#include "util/serialize.h"
+#include "util/string.h"
+#include "util/srp.h"
+#include "client.h"
+#include "network/clientopcodes.h"
+#include "filesys.h"
 #include "porting.h"
-#include "mapsector.h"
 #include "mapblock_mesh.h"
 #include "mapblock.h"
+#include "minimap.h"
 #include "settings.h"
 #include "profiler.h"
+#include "gettext.h"
 #include "log.h"
 #include "nodemetadata.h"
-#include "nodedef.h"
-#include "tooldef.h"
-#include "craftitemdef.h"
-#include <IFileSystem.h>
+#include "itemdef.h"
+#include "shader.h"
+#include "clientmap.h"
+#include "clientmedia.h"
+#include "sound.h"
+#include "IMeshCache.h"
+#include "config.h"
+#include "version.h"
+#include "drawscene.h"
+#include "database-sqlite3.h"
+#include "serialization.h"
+#include "guiscalingfilter.h"
+
+extern gui::IGUIEnvironment* guienv;
 
 /*
 	QueuedMeshUpdate
@@ -57,18 +75,18 @@ QueuedMeshUpdate::~QueuedMeshUpdate()
 /*
 	MeshUpdateQueue
 */
-	
+
 MeshUpdateQueue::MeshUpdateQueue()
 {
-	m_mutex.Init();
 }
 
 MeshUpdateQueue::~MeshUpdateQueue()
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock lock(m_mutex);
 
-	core::list<QueuedMeshUpdate*>::Iterator i;
-	for(i=m_queue.begin(); i!=m_queue.end(); i++)
+	for(std::vector<QueuedMeshUpdate*>::iterator
+			i = m_queue.begin();
+			i != m_queue.end(); ++i)
 	{
 		QueuedMeshUpdate *q = *i;
 		delete q;
@@ -78,20 +96,24 @@ MeshUpdateQueue::~MeshUpdateQueue()
 /*
 	peer_id=0 adds with nobody to send to
 */
-void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server)
+void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
 {
-	DSTACK(__FUNCTION_NAME);
+	DSTACK(FUNCTION_NAME);
+
+	assert(data);	// pre-condition
 
-	assert(data);
+	MutexAutoLock lock(m_mutex);
 
-	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.
 	*/
-	core::list<QueuedMeshUpdate*>::Iterator i;
-	for(i=m_queue.begin(); i!=m_queue.end(); i++)
+	for(std::vector<QueuedMeshUpdate*>::iterator
+			i = m_queue.begin();
+			i != m_queue.end(); ++i)
 	{
 		QueuedMeshUpdate *q = *i;
 		if(q->p == p)
@@ -104,7 +126,7 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se
 			return;
 		}
 	}
-	
+
 	/*
 		Add the block
 	*/
@@ -117,89 +139,85 @@ void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_se
 
 // Returned pointer must be deleted
 // Returns NULL if queue is empty
-QueuedMeshUpdate * MeshUpdateQueue::pop()
+QueuedMeshUpdate *MeshUpdateQueue::pop()
 {
-	JMutexAutoLock lock(m_mutex);
+	MutexAutoLock 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;
+	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()
+void MeshUpdateThread::enqueueUpdate(v3s16 p, MeshMakeData *data,
+		bool ack_block_to_server, bool urgent)
 {
-	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;
-		}*/
+	m_queue_in.addBlock(p, data, ack_block_to_server, urgent);
+	deferUpdate();
+}
 
-		QueuedMeshUpdate *q = m_queue_in.pop();
-		if(q == NULL)
-		{
-			sleep_ms(3);
-			continue;
-		}
+void MeshUpdateThread::doUpdate()
+{
+	QueuedMeshUpdate *q;
+	while ((q = m_queue_in.pop())) {
 
 		ScopeProfiler sp(g_profiler, "Client: Mesh making");
 
-		scene::SMesh *mesh_new = NULL;
-		mesh_new = makeMapBlockMesh(q->data, m_gamedef);
+		MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset);
 
 		MeshUpdateResult r;
 		r.p = q->p;
 		r.mesh = mesh_new;
 		r.ack_block_to_server = q->ack_block_to_server;
 
-		/*infostream<<"MeshUpdateThread: Processed "
-				<<"("<<q->p.X<<","<<q->p.Y<<","<<q->p.Z<<")"
-				<<std::endl;*/
-
 		m_queue_out.push_back(r);
 
 		delete q;
 	}
-
-	END_DEBUG_EXCEPTION_HANDLER(errorstream)
-
-	return NULL;
 }
 
+/*
+	Client
+*/
+
 Client::Client(
 		IrrlichtDevice *device,
 		const char *playername,
 		std::string password,
 		MapDrawControl &control,
 		IWritableTextureSource *tsrc,
-		IWritableToolDefManager *tooldef,
+		IWritableShaderSource *shsrc,
+		IWritableItemDefManager *itemdef,
 		IWritableNodeDefManager *nodedef,
-		IWritableCraftItemDefManager *craftitemdef
+		ISoundManager *sound,
+		MtEventManager *event,
+		bool ipv6
 ):
+	m_packetcounter_timer(0.0),
+	m_connection_reinit_timer(0.1),
+	m_avg_rtt_timer(0.0),
+	m_playerpos_send_timer(0.0),
+	m_ignore_damage_timer(0.0),
 	m_tsrc(tsrc),
-	m_tooldef(tooldef),
+	m_shsrc(shsrc),
+	m_itemdef(itemdef),
 	m_nodedef(nodedef),
-	m_craftitemdef(craftitemdef),
-	m_mesh_update_thread(this),
+	m_sound(sound),
+	m_event(event),
+	m_mesh_update_thread(),
 	m_env(
 		new ClientMap(this, this, control,
 			device->getSceneManager()->getRootSceneNode(),
@@ -207,115 +225,132 @@ Client::Client(
 		device->getSceneManager(),
 		tsrc, this, device
 	),
-	m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this),
+	m_particle_manager(&m_env),
+	m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
 	m_device(device),
+	m_minimap_disabled_by_server(false),
 	m_server_ser_ver(SER_FMT_VER_INVALID),
+	m_proto_ver(0),
 	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_show_highlighted(false),
+	m_animation_time(0),
+	m_crack_level(-1),
+	m_crack_pos(0,0,0),
+	m_highlighted_pos(0,0,0),
 	m_map_seed(0),
 	m_password(password),
+	m_chosen_auth_mech(AUTH_MECHANISM_NONE),
+	m_auth_data(NULL),
 	m_access_denied(false),
-	m_texture_receive_progress(0),
-	m_textures_received(false),
-	m_tooldef_received(false),
+	m_access_denied_reconnect(false),
+	m_itemdef_received(false),
 	m_nodedef_received(false),
-	m_craftitemdef_received(false)
-{
-	m_packetcounter_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;
-
-	// 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;
-	
-	// Update node textures
-	m_nodedef->updateTextures(m_tsrc);
-
-	// Start threads after setting up content definitions
-	m_mesh_update_thread.Start();
+	m_media_downloader(new ClientMediaDownloader()),
+	m_time_of_day_set(false),
+	m_last_time_of_day_f(-1),
+	m_time_of_day_update_timer(0),
+	m_recommended_send_interval(0.1),
+	m_removed_sounds_check_timer(0),
+	m_state(LC_Created),
+	m_localdb(NULL)
+{
+	// Add local player
+	m_env.addPlayer(new LocalPlayer(this, playername));
 
-	/*
-		Add local player
-	*/
-	{
-		Player *player = new LocalPlayer(this);
+	m_mapper = new Mapper(device, this);
+	m_cache_save_interval = g_settings->getU16("server_map_save_interval");
 
-		player->updateName(playername);
+	m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
+	m_cache_enable_shaders  = g_settings->getBool("enable_shaders");
+}
 
-		m_env.addPlayer(player);
-		
-		// Initialize player in the inventory context
-		m_inventory_context.current_player = player;
+void Client::Stop()
+{
+	//request all client managed threads to stop
+	m_mesh_update_thread.stop();
+	// Save local server map
+	if (m_localdb) {
+		infostream << "Local map saving ended." << std::endl;
+		m_localdb->endSave();
 	}
 }
 
-Client::~Client()
+bool Client::isShutdown()
 {
-	{
-		//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);
+	if (!m_mesh_update_thread.isRunning()) return true;
+
+	return false;
 }
 
-void Client::connect(Address address)
+Client::~Client()
 {
-	DSTACK(__FUNCTION_NAME);
-	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-	m_con.SetTimeoutMs(0);
-	m_con.Connect(address);
+	m_con.Disconnect();
+
+	m_mesh_update_thread.stop();
+	m_mesh_update_thread.wait();
+	while (!m_mesh_update_thread.m_queue_out.empty()) {
+		MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
+		delete r.mesh;
+	}
+
+
+	delete m_inventory_from_server;
+
+	// Delete detached inventories
+	for (std::map<std::string, Inventory*>::iterator
+			i = m_detached_inventories.begin();
+			i != m_detached_inventories.end(); ++i) {
+		delete i->second;
+	}
+
+	// cleanup 3d model meshes on client shutdown
+	while (m_device->getSceneManager()->getMeshCache()->getMeshCount() != 0) {
+		scene::IAnimatedMesh *mesh =
+			m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0);
+
+		if (mesh != NULL)
+			m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
+	}
+
+	delete m_mapper;
 }
 
-bool Client::connectedAndInitialized()
+void Client::connect(Address address,
+		const std::string &address_name,
+		bool is_local_server)
 {
-	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
+	DSTACK(FUNCTION_NAME);
 
-	if(m_con.Connected() == false)
-		return false;
-	
-	if(m_server_ser_ver == SER_FMT_VER_INVALID)
-		return false;
-	
-	return true;
+	initLocalMapSaving(address, address_name, is_local_server);
+
+	m_con.SetTimeoutMs(0);
+	m_con.Connect(address);
 }
 
 void Client::step(float dtime)
 {
-	DSTACK(__FUNCTION_NAME);
-	
+	DSTACK(FUNCTION_NAME);
+
 	// Limit a bit
 	if(dtime > 2.0)
 		dtime = 2.0;
-	
+
 	if(m_ignore_damage_timer > dtime)
 		m_ignore_damage_timer -= dtime;
 	else
 		m_ignore_damage_timer = 0.0;
-	
-	//infostream<<"Client steps "<<dtime<<std::endl;
 
-	{
-		//TimeTaker timer("ReceiveAll()", m_device);
-		// 0ms
-		ReceiveAll();
-	}
-	
-	{
-		//TimeTaker timer("m_con_mutex + m_con.RunTimeouts()", m_device);
-		// 0ms
-		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-		m_con.RunTimeouts(dtime);
-	}
+	m_animation_time += dtime;
+	if(m_animation_time > 60.0)
+		m_animation_time -= 60.0;
+
+	m_time_of_day_update_timer += dtime;
+
+	ReceiveAll();
 
 	/*
 		Packet counter
@@ -326,144 +361,49 @@ void Client::step(float dtime)
 		if(counter <= 0.0)
 		{
 			counter = 20.0;
-			
-			infostream<<"Client packetcounter (20s):"<<std::endl;
+
+			infostream << "Client packetcounter (" << m_packetcounter_timer
+					<< "):"<<std::endl;
 			m_packetcounter.print(infostream);
 			m_packetcounter.clear();
 		}
 	}
-	
-	// Get connection status
-	bool connected = connectedAndInitialized();
-
-#if 0
-	{
-		/*
-			Delete unused sectors
-
-			NOTE: This jams the game for a while because deleting sectors
-			      clear caches
-		*/
-		
-		float &counter = m_delete_unused_sectors_timer;
-		counter -= dtime;
-		if(counter <= 0.0)
-		{
-			// 3 minute interval
-			//counter = 180.0;
-			counter = 60.0;
-
-			//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
-
-			core::list<v3s16> deleted_blocks;
-
-			float delete_unused_sectors_timeout = 
-				g_settings->getFloat("client_delete_unused_sectors_timeout");
-	
-			// Delete sector blocks
-			/*u32 num = m_env.getMap().unloadUnusedData
-					(delete_unused_sectors_timeout,
-					true, &deleted_blocks);*/
-			
-			// Delete whole sectors
-			m_env.getMap().unloadUnusedData
-					(delete_unused_sectors_timeout,
-					&deleted_blocks);
-
-			if(deleted_blocks.size() > 0)
-			{
-				/*infostream<<"Client: Deleted blocks of "<<num
-						<<" unused sectors"<<std::endl;*/
-				/*infostream<<"Client: Deleted "<<num
-						<<" unused sectors"<<std::endl;*/
-				
-				/*
-					Send info to server
-				*/
 
-				// Env is locked so con can be locked.
-				//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-				
-				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++;
-				}
-			}
-		}
+	// UGLY hack to fix 2 second startup delay caused by non existent
+	// server client startup synchronization in local server or singleplayer mode
+	static bool initial_step = true;
+	if (initial_step) {
+		initial_step = false;
 	}
-#endif
-
-	if(connected == false)
-	{
+	else if(m_state == LC_Created) {
 		float &counter = m_connection_reinit_timer;
 		counter -= dtime;
-		if(counter <= 0.0)
-		{
+		if(counter <= 0.0) {
 			counter = 2.0;
 
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			
 			Player *myplayer = m_env.getLocalPlayer();
-			assert(myplayer != NULL);
-	
-			// Send TOSERVER_INIT
-			// [0] u16 TOSERVER_INIT
-			// [2] u8 SER_FMT_VER_HIGHEST
+			FATAL_ERROR_IF(myplayer == NULL, "Local player not found in environment.");
+
+			// Send TOSERVER_INIT_LEGACY
+			// [0] u16 TOSERVER_INIT_LEGACY
+			// [2] u8 SER_FMT_VER_HIGHEST_READ
 			// [3] u8[20] player_name
 			// [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());
+			// [51] u16 minimum supported network protocol version (added sometime)
+			// [53] u16 maximum supported network protocol version (added later than the previous one)
 
-			/*infostream<<"Client: sending initial password hash: \""<<m_password<<"\""
-					<<std::endl;*/
+			char pName[PLAYERNAME_SIZE];
+			char pPassword[PASSWORD_SIZE];
+			memset(pName, 0, PLAYERNAME_SIZE * sizeof(char));
+			memset(pPassword, 0, PASSWORD_SIZE * sizeof(char));
 
-			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);
+			std::string hashed_password = translatePassword(myplayer->getName(), m_password);
+			snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName());
+			snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str());
 
-			// Send as unreliable
-			Send(0, data, false);
+			sendLegacyInit(pName, pPassword);
+			if (LATEST_PROTOCOL_VERSION >= 25)
+				sendInit(myplayer->getName());
 		}
 
 		// Not connected, return
@@ -473,35 +413,29 @@ 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))
-	{
+	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;
+		std::vector<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;*/
-			
+			g_settings->getFloat("client_unload_unused_data_timeout"),
+			g_settings->getS32("client_mapblock_limit"),
+			&deleted_blocks);
+
 		/*
 			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)
+		std::vector<v3s16>::iterator i = deleted_blocks.begin();
+		std::vector<v3s16> sendlist;
+		for(;;) {
+			if(sendlist.size() == 255 || i == deleted_blocks.end()) {
+				if(sendlist.empty())
 					break;
 				/*
 					[0] u16 command
@@ -510,19 +444,8 @@ void Client::step(float dtime)
 					[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);
+
+				sendDeletedBlocks(sendlist);
 
 				if(i == deleted_blocks.end())
 					break;
@@ -531,69 +454,59 @@ void Client::step(float dtime)
 			}
 
 			sendlist.push_back(*i);
-			i++;
+			++i;
 		}
 	}
 
 	/*
 		Handle environment
 	*/
-	{
-		// 0ms
-		//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
+	// Control local player (0ms)
+	LocalPlayer *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+	player->applyControl(dtime);
 
-		// Control local player (0ms)
-		LocalPlayer *player = m_env.getLocalPlayer();
-		assert(player != NULL);
-		player->applyControl(dtime);
+	// Step environment
+	m_env.step(dtime);
 
-		//TimeTaker envtimer("env step", m_device);
-		// Step environment
-		m_env.step(dtime);
-		
-		/*
-			Get events
-		*/
-		for(;;)
-		{
-			ClientEnvEvent event = m_env.getClientEvent();
-			if(event.type == CEE_NONE)
-			{
-				break;
-			}
-			else if(event.type == CEE_PLAYER_DAMAGE)
-			{
-				if(m_ignore_damage_timer <= 0)
-				{
-					u8 damage = event.player_damage.amount;
-					
-					if(event.player_damage.send_to_server)
-						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);
-				}
+	/*
+		Get events
+	*/
+	for(;;) {
+		ClientEnvEvent event = m_env.getClientEvent();
+		if(event.type == CEE_NONE) {
+			break;
+		}
+		else if(event.type == CEE_PLAYER_DAMAGE) {
+			if(m_ignore_damage_timer <= 0) {
+				u8 damage = event.player_damage.amount;
+
+				if(event.player_damage.send_to_server)
+					sendDamage(damage);
+
+				// Add to ClientEvent queue
+				ClientEvent event;
+				event.type = CE_PLAYER_DAMAGE;
+				event.player_damage.amount = damage;
+				m_client_event_queue.push(event);
 			}
 		}
+		else if(event.type == CEE_PLAYER_BREATH) {
+				u16 breath = event.player_breath.amount;
+				sendBreath(breath);
+		}
 	}
-	
+
 	/*
 		Print some info
 	*/
-	{
-		float &counter = m_avg_rtt_timer;
-		counter += dtime;
-		if(counter >= 10)
-		{
-			counter = 0.0;
-			//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-			// connectedAndInitialized() is true, peer exists.
-			float avg_rtt = m_con.GetPeerAvgRTT(PEER_ID_SERVER);
-			infostream<<"Client: avg_rtt="<<avg_rtt<<std::endl;
-		}
+	float &counter = m_avg_rtt_timer;
+	counter += dtime;
+	if(counter >= 10) {
+		counter = 0.0;
+		// connectedAndInitialized() is true, peer exists.
+		float avg_rtt = getRTT();
+		infostream << "Client: avg_rtt=" << avg_rtt << std::endl;
 	}
 
 	/*
@@ -602,7 +515,7 @@ void Client::step(float dtime)
 	{
 		float &counter = m_playerpos_send_timer;
 		counter += dtime;
-		if(counter >= 0.2)
+		if((m_state == LC_Ready) && (counter >= m_recommended_send_interval))
 		{
 			counter = 0.0;
 			sendPlayerPos();
@@ -613,65 +526,305 @@ void Client::step(float dtime)
 		Replace updated meshes
 	*/
 	{
-		//JMutexAutoLock lock(m_env_mutex); //bulk comment-out
+		int num_processed_meshes = 0;
+		while (!m_mesh_update_thread.m_queue_out.empty())
+		{
+			num_processed_meshes++;
 
-		//TimeTaker timer("** Processing mesh update result queue");
-		// 0ms
-		
-		/*infostream<<"Mesh update result queue size is "
-				<<m_mesh_update_thread.m_queue_out.size()
-				<<std::endl;*/
+			MinimapMapblock *minimap_mapblock = NULL;
+			bool do_mapper_update = true;
 
-		while(m_mesh_update_thread.m_queue_out.size() > 0)
-		{
-			MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front();
+			MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
 			MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
-			if(block)
-			{
-				block->replaceMesh(r.mesh);
+			if (block) {
+				// Delete the old mesh
+				if (block->mesh != NULL) {
+					delete block->mesh;
+					block->mesh = NULL;
+				}
+
+				if (r.mesh) {
+					minimap_mapblock = r.mesh->moveMinimapMapblock();
+					if (minimap_mapblock == NULL)
+						do_mapper_update = false;
+				}
+
+				if (r.mesh && r.mesh->getMesh()->getMeshBufferCount() == 0) {
+					delete r.mesh;
+				} else {
+					// Replace with the new mesh
+					block->mesh = r.mesh;
+				}
+			} else {
+				delete r.mesh;
 			}
-			if(r.ack_block_to_server)
-			{
-				/*infostream<<"Client: ACK block ("<<r.p.X<<","<<r.p.Y
-						<<","<<r.p.Z<<")"<<std::endl;*/
+
+			if (do_mapper_update)
+				m_mapper->addBlock(r.p, minimap_mapblock);
+
+			if (r.ack_block_to_server) {
 				/*
 					Acknowledge block
+					[0] u8 count
+					[1] v3s16 pos_0
 				*/
-				/*
-					[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);
+				sendGotBlocks(r.p);
+			}
+		}
+
+		if (num_processed_meshes > 0)
+			g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
+	}
+
+	/*
+		Load fetched media
+	*/
+	if (m_media_downloader && m_media_downloader->isStarted()) {
+		m_media_downloader->step(this);
+		if (m_media_downloader->isDone()) {
+			received_media();
+			delete m_media_downloader;
+			m_media_downloader = NULL;
+		}
+	}
+
+	/*
+		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;
+		}
+	}
+
+	/*
+		Update positions of sounds attached to objects
+	*/
+	{
+		for(std::map<int, u16>::iterator
+				i = m_sounds_to_objects.begin();
+				i != m_sounds_to_objects.end(); ++i)
+		{
+			int client_id = i->first;
+			u16 object_id = i->second;
+			ClientActiveObject *cao = m_env.getActiveObject(object_id);
+			if(!cao)
+				continue;
+			v3f pos = cao->getPosition();
+			m_sound->updateSoundPosition(client_id, pos);
+		}
+	}
+
+	/*
+		Handle removed remotely initiated sounds
+	*/
+	m_removed_sounds_check_timer += dtime;
+	if(m_removed_sounds_check_timer >= 2.32) {
+		m_removed_sounds_check_timer = 0;
+		// Find removed sounds and clear references to them
+		std::vector<s32> removed_server_ids;
+		for(std::map<s32, int>::iterator
+				i = m_sounds_server_to_client.begin();
+				i != m_sounds_server_to_client.end();) {
+			s32 server_id = i->first;
+			int client_id = i->second;
+			++i;
+			if(!m_sound->soundExists(client_id)) {
+				m_sounds_server_to_client.erase(server_id);
+				m_sounds_client_to_server.erase(client_id);
+				m_sounds_to_objects.erase(client_id);
+				removed_server_ids.push_back(server_id);
 			}
 		}
+
+		// Sync to server
+		if(!removed_server_ids.empty()) {
+			sendRemovedSounds(removed_server_ids);
+		}
+	}
+
+	// Write server map
+	if (m_localdb && m_localdb_save_interval.step(dtime,
+			m_cache_save_interval)) {
+		m_localdb->endSave();
+		m_localdb->beginSave();
+	}
+}
+
+bool Client::loadMedia(const std::string &data, const std::string &filename)
+{
+	// Silly irrlicht's const-incorrectness
+	Buffer<char> data_rw(data.c_str(), data.size());
+
+	std::string name;
+
+	const char *image_ext[] = {
+		".png", ".jpg", ".bmp", ".tga",
+		".pcx", ".ppm", ".psd", ".wal", ".rgb",
+		NULL
+	};
+	name = removeStringEnd(filename, image_ext);
+	if(name != "")
+	{
+		verbosestream<<"Client: Attempting to load image "
+		<<"file \""<<filename<<"\""<<std::endl;
+
+		io::IFileSystem *irrfs = m_device->getFileSystem();
+		video::IVideoDriver *vdrv = m_device->getVideoDriver();
+
+		// Create an irrlicht memory file
+		io::IReadFile *rfile = irrfs->createMemoryReadFile(
+				*data_rw, data_rw.getSize(), "_tempreadfile");
+
+		FATAL_ERROR_IF(!rfile, "Could not create irrlicht memory file.");
+
+		// Read image
+		video::IImage *img = vdrv->createImageFromFile(rfile);
+		if(!img){
+			errorstream<<"Client: Cannot create image from data of "
+					<<"file \""<<filename<<"\""<<std::endl;
+			rfile->drop();
+			return false;
+		}
+		else {
+			m_tsrc->insertSourceImage(filename, img);
+			img->drop();
+			rfile->drop();
+			return true;
+		}
+	}
+
+	const char *sound_ext[] = {
+		".0.ogg", ".1.ogg", ".2.ogg", ".3.ogg", ".4.ogg",
+		".5.ogg", ".6.ogg", ".7.ogg", ".8.ogg", ".9.ogg",
+		".ogg", NULL
+	};
+	name = removeStringEnd(filename, sound_ext);
+	if(name != "")
+	{
+		verbosestream<<"Client: Attempting to load sound "
+		<<"file \""<<filename<<"\""<<std::endl;
+		m_sound->loadSoundData(name, data);
+		return true;
+	}
+
+	const char *model_ext[] = {
+		".x", ".b3d", ".md2", ".obj",
+		NULL
+	};
+	name = removeStringEnd(filename, model_ext);
+	if(name != "")
+	{
+		verbosestream<<"Client: Storing model into memory: "
+				<<"\""<<filename<<"\""<<std::endl;
+		if(m_mesh_data.count(filename))
+			errorstream<<"Multiple models with name \""<<filename.c_str()
+					<<"\" found; replacing previous model"<<std::endl;
+		m_mesh_data[filename] = data;
+		return true;
 	}
+
+	errorstream<<"Client: Don't know how to load file \""
+			<<filename<<"\""<<std::endl;
+	return false;
 }
 
 // Virtual methods from con::PeerHandler
 void Client::peerAdded(con::Peer *peer)
 {
-	infostream<<"Client::peerAdded(): peer->id="
-			<<peer->id<<std::endl;
+	infostream << "Client::peerAdded(): peer->id="
+			<< peer->id << std::endl;
 }
 void Client::deletingPeer(con::Peer *peer, bool timeout)
 {
-	infostream<<"Client::deletingPeer(): "
+	infostream << "Client::deletingPeer(): "
 			"Server Peer is getting deleted "
-			<<"(timeout="<<timeout<<")"<<std::endl;
+			<< "(timeout=" << timeout << ")" << std::endl;
+
+	if (timeout) {
+		m_access_denied = true;
+		m_access_denied_reason = gettext("Connection timed out.");
+	}
+}
+
+/*
+	u16 command
+	u16 number of files requested
+	for each file {
+		u16 length of name
+		string name
+	}
+*/
+void Client::request_media(const std::vector<std::string> &file_requests)
+{
+	std::ostringstream os(std::ios_base::binary);
+	writeU16(os, TOSERVER_REQUEST_MEDIA);
+	size_t file_requests_size = file_requests.size();
+
+	FATAL_ERROR_IF(file_requests_size > 0xFFFF, "Unsupported number of file requests");
+
+	// Packet dynamicly resized
+	NetworkPacket pkt(TOSERVER_REQUEST_MEDIA, 2 + 0);
+
+	pkt << (u16) (file_requests_size & 0xFFFF);
+
+	for(std::vector<std::string>::const_iterator i = file_requests.begin();
+			i != file_requests.end(); ++i) {
+		pkt << (*i);
+	}
+
+	Send(&pkt);
+
+	infostream << "Client: Sending media request list to server ("
+			<< file_requests.size() << " files. packet size)" << std::endl;
+}
+
+void Client::received_media()
+{
+	NetworkPacket pkt(TOSERVER_RECEIVED_MEDIA, 0);
+	Send(&pkt);
+	infostream << "Client: Notifying server that we received all media"
+			<< std::endl;
+}
+
+void Client::initLocalMapSaving(const Address &address,
+		const std::string &hostname,
+		bool is_local_server)
+{
+	if (!g_settings->getBool("enable_local_map_saving") || is_local_server) {
+		return;
+	}
+
+	const std::string world_path = porting::path_user
+		+ DIR_DELIM + "worlds"
+		+ DIR_DELIM + "server_"
+		+ hostname + "_" + to_string(address.getPort());
+
+	fs::CreateAllDirs(world_path);
+
+	m_localdb = new Database_SQLite3(world_path);
+	m_localdb->beginSave();
+	actionstream << "Local map saving started, map will be saved at '" << world_path << "'" << std::endl;
 }
 
 void Client::ReceiveAll()
 {
-	DSTACK(__FUNCTION_NAME);
+	DSTACK(FUNCTION_NAME);
 	u32 start_ms = porting::getTimeMs();
 	for(;;)
 	{
@@ -679,16 +832,15 @@ void Client::ReceiveAll()
 		// process
 		if(porting::getTimeMs() > start_ms + 100)
 			break;
-		
-		try{
+
+		try {
 			Receive();
+			g_profiler->graphAdd("client_received_packets", 1);
 		}
-		catch(con::NoIncomingDataException &e)
-		{
+		catch(con::NoIncomingDataException &e) {
 			break;
 		}
-		catch(con::InvalidIncomingDataException &e)
-		{
+		catch(con::InvalidIncomingDataException &e) {
 			infostream<<"Client::ReceiveAll(): "
 					"InvalidIncomingDataException: what()="
 					<<e.what()<<std::endl;
@@ -698,940 +850,461 @@ void Client::ReceiveAll()
 
 void Client::Receive()
 {
-	DSTACK(__FUNCTION_NAME);
-	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);
-	}
-	//TimeTaker t1("ProcessData", m_device);
-	ProcessData(*data, datasize, sender_peer_id);
+	DSTACK(FUNCTION_NAME);
+	NetworkPacket pkt;
+	m_con.Receive(&pkt);
+	ProcessData(&pkt);
+}
+
+inline void Client::handleCommand(NetworkPacket* pkt)
+{
+	const ToClientCommandHandler& opHandle = toClientCommandTable[pkt->getCommand()];
+	(this->*opHandle.handler)(pkt);
 }
 
 /*
 	sender_peer_id given to this shall be quaranteed to be a valid peer
 */
-void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
+void Client::ProcessData(NetworkPacket *pkt)
 {
-	DSTACK(__FUNCTION_NAME);
-
-	// Ignore packets that don't even fit a command
-	if(datasize < 2)
-	{
-		m_packetcounter.add(60000);
-		return;
-	}
+	DSTACK(FUNCTION_NAME);
 
-	ToClientCommand command = (ToClientCommand)readU16(&data[0]);
+	ToClientCommand command = (ToClientCommand) pkt->getCommand();
+	u32 sender_peer_id = pkt->getPeerId();
 
 	//infostream<<"Client: received command="<<command<<std::endl;
 	m_packetcounter.add((u16)command);
-	
+
 	/*
 		If this check is removed, be sure to change the queue
 		system to know the ids
 	*/
-	if(sender_peer_id != PEER_ID_SERVER)
-	{
-		infostream<<"Client::ProcessData(): Discarding data not "
-				"coming from server: peer_id="<<sender_peer_id
-				<<std::endl;
+	if(sender_peer_id != PEER_ID_SERVER) {
+		infostream << "Client::ProcessData(): Discarding data not "
+			"coming from server: peer_id=" << sender_peer_id
+			<< std::endl;
 		return;
 	}
 
-	u8 ser_version = m_server_ser_ver;
+	// Command must be handled into ToClientCommandHandler
+	if (command >= TOCLIENT_NUM_MSG_TYPES) {
+		infostream << "Client: Ignoring unknown command "
+			<< command << std::endl;
+		return;
+	}
 
-	//infostream<<"Client received command="<<(int)command<<std::endl;
+	/*
+	 * Those packets are handled before m_server_ser_ver is set, it's normal
+	 * But we must use the new ToClientConnectionState in the future,
+	 * as a byte mask
+	 */
+	if(toClientCommandTable[command].state == TOCLIENT_STATE_NOT_CONNECTED) {
+		handleCommand(pkt);
+		return;
+	}
 
-	if(command == TOCLIENT_INIT)
-	{
-		if(datasize < 3)
-			return;
+	if(m_server_ser_ver == SER_FMT_VER_INVALID) {
+		infostream << "Client: Server serialization"
+				" format invalid or not initialized."
+				" Skipping incoming command=" << command << std::endl;
+		return;
+	}
 
-		u8 deployed = data[2];
+	/*
+	  Handle runtime commands
+	*/
 
-		infostream<<"Client: TOCLIENT_INIT received with "
-				"deployed="<<((int)deployed&0xff)<<std::endl;
+	handleCommand(pkt);
+}
 
-		if(deployed < SER_FMT_VER_LOWEST
-				|| deployed > SER_FMT_VER_HIGHEST)
-		{
-			infostream<<"Client: TOCLIENT_INIT: Server sent "
-					<<"unsupported ser_fmt_ver"<<std::endl;
-			return;
-		}
-		
-		m_server_ser_ver = deployed;
-
-		// Get player position
-		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, BS) - v3f(0, BS/2, 0);
-
-		{ //envlock
-			//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-			
-			// Set player position
-			Player *player = m_env.getLocalPlayer();
-			assert(player != NULL);
-			player->setPosition(playerpos_f);
-		}
-		
-		if(datasize >= 2+1+6+8)
-		{
-			// Get map seed
-			m_map_seed = readU64(&data[2+1+6]);
-			infostream<<"Client: received map seed: "<<m_map_seed<<std::endl;
-		}
-		
-		// Reply to server
-		u32 replysize = 2;
-		SharedBuffer<u8> reply(replysize);
-		writeU16(&reply[0], TOSERVER_INIT2);
-		// Send as reliable
-		m_con.Send(PEER_ID_SERVER, 1, reply, true);
+void Client::Send(NetworkPacket* pkt)
+{
+	m_con.Send(PEER_ID_SERVER,
+		serverCommandFactoryTable[pkt->getCommand()].channel,
+		pkt,
+		serverCommandFactoryTable[pkt->getCommand()].reliable);
+}
 
+void Client::interact(u8 action, const PointedThing& pointed)
+{
+	if(m_state != LC_Ready) {
+		errorstream << "Client::interact() "
+				"Canceled (not connected)"
+				<< std::endl;
 		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;
-	}
+	/*
+		[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
+	*/
 
-	if(ser_version == SER_FMT_VER_INVALID)
-	{
-		infostream<<"Client: Server serialization"
-				" format invalid or not initialized."
-				" Skipping incoming command="<<command<<std::endl;
-		return;
-	}
-	
-	// Just here to avoid putting the two if's together when
-	// making some copypasta
-	{}
+	NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0);
 
-	if(command == TOCLIENT_REMOVENODE)
-	{
-		if(datasize < 8)
-			return;
-		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);
-
-		removeNode(p);
-	}
-	else if(command == TOCLIENT_ADDNODE)
-	{
-		if(datasize < 8 + MapNode::serializedLength(ser_version))
-			return;
+	pkt << action;
+	pkt << (u16)getPlayerItem();
 
-		v3s16 p;
-		p.X = readS16(&data[2]);
-		p.Y = readS16(&data[4]);
-		p.Z = readS16(&data[6]);
-		
-		//TimeTaker t1("TOCLIENT_ADDNODE");
+	std::ostringstream tmp_os(std::ios::binary);
+	pointed.serialize(tmp_os);
 
-		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]);
-		
-		/*infostream<<"Client: Thread: BLOCKDATA for ("
-				<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl;*/
-		/*infostream<<"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
-			*/
-			//infostream<<"Updating"<<std::endl;
-			block->deSerialize(istr, ser_version);
-		}
-		else
-		{
-			/*
-				Create a new block
-			*/
-			//infostream<<"Creating new"<<std::endl;
-			block = new MapBlock(&m_env.getMap(), p, this);
-			block->deSerialize(istr, ser_version);
-			sector->insertBlock(block);
-		}
+	pkt.putLongString(tmp_os.str());
 
-#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
+	Send(&pkt);
+}
 
-		/*
-			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.
-		*/
+void Client::deleteAuthData()
+{
+	if (!m_auth_data)
+		return;
 
-		//m_env.getClientMap().updateMeshes(block->getPos(), getDayNightRatio());
-		/*
-			Add it to mesh update queue and set it to be acknowledged after update.
-		*/
-		//infostream<<"Adding mesh update task for received block"<<std::endl;
-		addUpdateMeshTaskWithEdge(p, true);
+	switch (m_chosen_auth_mech) {
+		case AUTH_MECHANISM_FIRST_SRP:
+			break;
+		case AUTH_MECHANISM_SRP:
+		case AUTH_MECHANISM_LEGACY_PASSWORD:
+			srp_user_delete((SRPUser *) m_auth_data);
+			m_auth_data = NULL;
+			break;
+		case AUTH_MECHANISM_NONE:
+			break;
 	}
-	else if(command == TOCLIENT_INVENTORY)
-	{
-		if(datasize < 3)
-			return;
+	m_chosen_auth_mech = AUTH_MECHANISM_NONE;
+}
 
-		//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(infostream);
-
-			//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, this);
-			//t1.stop();
+AuthMechanism Client::choseAuthMech(const u32 mechs)
+{
+	if (mechs & AUTH_MECHANISM_SRP)
+		return AUTH_MECHANISM_SRP;
 
-			m_inventory_updated = true;
+	if (mechs & AUTH_MECHANISM_FIRST_SRP)
+		return AUTH_MECHANISM_FIRST_SRP;
 
-			//infostream<<"Client got player inventory:"<<std::endl;
-			//player->inventory.print(infostream);
-		}
-	}
-	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;
-		//infostream<<"Client: time_of_day="<<time_of_day<<std::endl;
-		
-		/*
-			time_of_day:
-			0 = midnight
-			12000 = midday
-		*/
-		{
-			m_env.setTimeOfDay(time_of_day);
+	if (mechs & AUTH_MECHANISM_LEGACY_PASSWORD)
+		return AUTH_MECHANISM_LEGACY_PASSWORD;
 
-			u32 dr = m_env.getDayNightRatio();
+	return AUTH_MECHANISM_NONE;
+}
 
-			infostream<<"Client: time_of_day="<<time_of_day
-					<<", dr="<<dr
-					<<std::endl;
-		}
+void Client::sendLegacyInit(const char* playerName, const char* playerPassword)
+{
+	NetworkPacket pkt(TOSERVER_INIT_LEGACY,
+			1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2);
 
-	}
-	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);
-		}
+	pkt << (u8) SER_FMT_VER_HIGHEST_READ;
+	pkt.putRawString(playerName,PLAYERNAME_SIZE);
+	pkt.putRawString(playerPassword, PASSWORD_SIZE);
+	pkt << (u16) CLIENT_PROTOCOL_VERSION_MIN << (u16) CLIENT_PROTOCOL_VERSION_MAX;
 
-		/*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"))
-		{
-			/*
-				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
-					u32 initialization data length
-					string initialization data
-				}
-			*/
-
-			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
-			
-			// Read removed objects
-			is.read(buf, 2);
-			u16 removed_count = readU16((u8*)buf);
-			for(u16 i=0; i<removed_count; i++)
-			{
-				is.read(buf, 2);
-				u16 id = readU16((u8*)buf);
-				// Remove it
-				{
-					//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-					m_env.removeActiveObject(id);
-				}
-			}
-			
-			// Read added objects
-			is.read(buf, 2);
-			u16 added_count = readU16((u8*)buf);
-			for(u16 i=0; i<added_count; i++)
-			{
-				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
-				{
-					//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-					m_env.addActiveObject(id, type, data);
-				}
-			}
-		}
-	}
-	else if(command == TOCLIENT_ACTIVE_OBJECT_MESSAGES)
-	{
-		//if(g_settings->getBool("enable_experimental"))
-		{
-			/*
-				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);*/
-
-		infostream<<"Client got TOCLIENT_MOVE_PLAYER"
-				<<" pos=("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"
-				<<" pitch="<<pitch
-				<<" yaw="<<yaw
-				<<std::endl;
+	Send(&pkt);
+}
 
-		/*
-			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.
-		*/
-		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);
+void Client::sendInit(const std::string &playerName)
+{
+	NetworkPacket pkt(TOSERVER_INIT, 1 + 2 + 2 + (1 + playerName.size()));
 
-		// 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 if(command == TOCLIENT_PLAYERITEM)
-	{
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
+	// we don't support network compression yet
+	u16 supp_comp_modes = NETPROTO_COMPRESSION_NONE;
+	pkt << (u8) SER_FMT_VER_HIGHEST_READ << (u16) supp_comp_modes;
+	pkt << (u16) CLIENT_PROTOCOL_VERSION_MIN << (u16) CLIENT_PROTOCOL_VERSION_MAX;
+	pkt << playerName;
 
-		u16 count = readU16(is);
+	Send(&pkt);
+}
 
-		for (u16 i = 0; i < count; ++i) {
-			u16 peer_id = readU16(is);
-			Player *player = m_env.getPlayer(peer_id);
+void Client::startAuth(AuthMechanism chosen_auth_mechanism)
+{
+	m_chosen_auth_mech = chosen_auth_mechanism;
+
+	switch (chosen_auth_mechanism) {
+		case AUTH_MECHANISM_FIRST_SRP: {
+			// send srp verifier to server
+			NetworkPacket resp_pkt(TOSERVER_FIRST_SRP, 0);
+			char *salt, *bytes_v;
+			std::size_t len_salt, len_v;
+			salt = NULL;
+			getSRPVerifier(getPlayerName(), m_password,
+				&salt, &len_salt, &bytes_v, &len_v);
+			resp_pkt
+				<< std::string((char*)salt, len_salt)
+				<< std::string((char*)bytes_v, len_v)
+				<< (u8)((m_password == "") ? 1 : 0);
+			free(salt);
+			free(bytes_v);
+			Send(&resp_pkt);
+			break;
+		}
+		case AUTH_MECHANISM_SRP:
+		case AUTH_MECHANISM_LEGACY_PASSWORD: {
+			u8 based_on = 1;
 
-			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));
-				if (itemstring.empty()) {
-					inv->deleteItem(0);
-					infostream
-						<<"Client: empty player item for peer "
-						<< peer_id << std::endl;
-				} else {
-					std::istringstream iss(itemstring);
-					delete inv->changeItem(0,
-							InventoryItem::deSerialize(iss, this));
-					infostream<<"Client: player item for peer " << peer_id << ": ";
-					player->getWieldItem()->serialize(infostream);
-					infostream<<std::endl;
-				}
+			if (chosen_auth_mechanism == AUTH_MECHANISM_LEGACY_PASSWORD) {
+				m_password = translatePassword(getPlayerName(), m_password);
+				based_on = 0;
 			}
+
+			std::string playername_u = lowercase(getPlayerName());
+			m_auth_data = srp_user_new(SRP_SHA256, SRP_NG_2048,
+				getPlayerName().c_str(), playername_u.c_str(),
+				(const unsigned char *) m_password.c_str(),
+				m_password.length(), NULL, NULL);
+			char *bytes_A = 0;
+			size_t len_A = 0;
+			SRP_Result res = srp_user_start_authentication(
+				(struct SRPUser *) m_auth_data, NULL, NULL, 0,
+				(unsigned char **) &bytes_A, &len_A);
+			FATAL_ERROR_IF(res != SRP_OK, "Creating local SRP user failed.");
+
+			NetworkPacket resp_pkt(TOSERVER_SRP_BYTES_A, 0);
+			resp_pkt << std::string(bytes_A, len_A) << based_on;
+			Send(&resp_pkt);
+			break;
 		}
+		case AUTH_MECHANISM_NONE:
+			break; // not handled in this method
 	}
-	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_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);
+}
 
-		// Stop threads while updating content definitions
-		m_mesh_update_thread.setRun(false);
-		// Process the remaining TextureSource queue to let MeshUpdateThread
-		// get it's remaining textures and thus let it stop
-		while(m_mesh_update_thread.IsRunning()){
-			m_tsrc->processQueue();
-		}
-		
-		/*
-			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);
-			// 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;
-			}
-			m_tsrc->insertSourceImage(name, img);
-			img->drop();
-			rfile->drop();
-		}
-		
-		if(m_nodedef_received && 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 textures
-			m_nodedef->updateTextures(m_tsrc);
-		}
+void Client::sendDeletedBlocks(std::vector<v3s16> &blocks)
+{
+	NetworkPacket pkt(TOSERVER_DELETEDBLOCKS, 1 + sizeof(v3s16) * blocks.size());
 
-		// Resume threads
-		m_mesh_update_thread.setRun(true);
-		m_mesh_update_thread.Start();
+	pkt << (u8) blocks.size();
 
-		ClientEvent event;
-		event.type = CE_TEXTURES_UPDATED;
-		m_client_event_queue.push_back(event);
+	u32 k = 0;
+	for(std::vector<v3s16>::iterator
+			j = blocks.begin();
+			j != blocks.end(); ++j) {
+		pkt << *j;
+		k++;
 	}
-	else if(command == TOCLIENT_TOOLDEF)
-	{
-		infostream<<"Client: Received tool definitions: packet size: "
-				<<datasize<<std::endl;
 
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
+	Send(&pkt);
+}
 
-		m_tooldef_received = true;
+void Client::sendGotBlocks(v3s16 block)
+{
+	NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6);
+	pkt << (u8) 1 << block;
+	Send(&pkt);
+}
 
-		// Stop threads while updating content definitions
-		m_mesh_update_thread.setRun(false);
-		// Process the remaining TextureSource queue to let MeshUpdateThread
-		// get it's remaining textures and thus let it stop
-		while(m_mesh_update_thread.IsRunning()){
-			m_tsrc->processQueue();
-		}
-		
-		std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
-		m_tooldef->deSerialize(tmp_is);
-		
-		// Resume threads
-		m_mesh_update_thread.setRun(true);
-		m_mesh_update_thread.Start();
-	}
-	else if(command == TOCLIENT_NODEDEF)
-	{
-		infostream<<"Client: Received node definitions: packet size: "
-				<<datasize<<std::endl;
-
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
-
-		m_nodedef_received = true;
-
-		// Stop threads while updating content definitions
-		m_mesh_update_thread.stop();
-
-		std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
-		m_nodedef->deSerialize(tmp_is, this);
-		
-		if(m_textures_received){
-			// Update texture atlas
-			if(g_settings->getBool("enable_texture_atlas"))
-				m_tsrc->buildMainAtlas(this);
-			
-			// Update node textures
-			m_nodedef->updateTextures(m_tsrc);
-		}
+void Client::sendRemovedSounds(std::vector<s32> &soundList)
+{
+	size_t server_ids = soundList.size();
+	assert(server_ids <= 0xFFFF);
 
-		// Resume threads
-		m_mesh_update_thread.setRun(true);
-		m_mesh_update_thread.Start();
-	}
-	else if(command == TOCLIENT_CRAFTITEMDEF)
-	{
-		infostream<<"Client: Received CraftItem definitions: packet size: "
-				<<datasize<<std::endl;
+	NetworkPacket pkt(TOSERVER_REMOVED_SOUNDS, 2 + server_ids * 4);
 
-		std::string datastring((char*)&data[2], datasize-2);
-		std::istringstream is(datastring, std::ios_base::binary);
+	pkt << (u16) (server_ids & 0xFFFF);
 
-		m_craftitemdef_received = true;
+	for(std::vector<s32>::iterator i = soundList.begin();
+			i != soundList.end(); ++i)
+		pkt << *i;
 
-		// Stop threads while updating content definitions
-		m_mesh_update_thread.setRun(false);
-		// Process the remaining TextureSource queue to let MeshUpdateThread
-		// get it's remaining textures and thus let it stop
-		while(m_mesh_update_thread.IsRunning()){
-			m_tsrc->processQueue();
-		}
-		
-		std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
-		m_craftitemdef->deSerialize(tmp_is);
-		
-		// Resume threads
-		m_mesh_update_thread.setRun(true);
-		m_mesh_update_thread.Start();
-	}
-	else
-	{
-		infostream<<"Client: Ignoring unknown command "
-				<<command<<std::endl;
-	}
+	Send(&pkt);
 }
 
-void Client::Send(u16 channelnum, SharedBuffer<u8> data, bool reliable)
+void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
+		const StringMap &fields)
 {
-	//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
-	m_con.Send(PEER_ID_SERVER, channelnum, data, reliable);
-}
+	size_t fields_size = fields.size();
 
-void Client::interact(u8 action, const PointedThing& pointed)
-{
-	if(connectedAndInitialized() == false){
-		infostream<<"Client::interact() "
-				"cancelled (not connected)"
-				<<std::endl;
-		return;
-	}
+	FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of nodemeta fields");
 
-	std::ostringstream os(std::ios_base::binary);
+	NetworkPacket pkt(TOSERVER_NODEMETA_FIELDS, 0);
 
-	/*
-		[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());
+	pkt << p << formname << (u16) (fields_size & 0xFFFF);
 
-	std::string s = os.str();
-	SharedBuffer<u8> data((u8*)s.c_str(), s.size());
+	StringMap::const_iterator it;
+	for (it = fields.begin(); it != fields.end(); ++it) {
+		const std::string &name = it->first;
+		const std::string &value = it->second;
+		pkt << name;
+		pkt.putLongString(value);
+	}
 
-	// Send as reliable
-	Send(0, data, true);
+	Send(&pkt);
 }
 
-void Client::sendSignNodeText(v3s16 p, std::string text)
+void Client::sendInventoryFields(const std::string &formname,
+		const StringMap &fields)
 {
-	/*
-		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);
+	size_t fields_size = fields.size();
+	FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields");
+
+	NetworkPacket pkt(TOSERVER_INVENTORY_FIELDS, 0);
+	pkt << formname << (u16) (fields_size & 0xFFFF);
+
+	StringMap::const_iterator it;
+	for (it = fields.begin(); it != fields.end(); ++it) {
+		const std::string &name  = it->first;
+		const std::string &value = it->second;
+		pkt << name;
+		pkt.putLongString(value);
+	}
+
+	Send(&pkt);
 }
-	
+
 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);
+
+	NetworkPacket pkt(TOSERVER_INVENTORY_ACTION, s.size());
+	pkt.putRawString(s.c_str(),s.size());
+
+	Send(&pkt);
 }
 
 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);
+	NetworkPacket pkt(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16));
+
+	pkt << message;
+
+	Send(&pkt);
 }
 
-void Client::sendChangePassword(const std::wstring oldpassword,
-		const std::wstring newpassword)
+void Client::sendChangePassword(const std::string &oldpassword,
+        const std::string &newpassword)
 {
 	Player *player = m_env.getLocalPlayer();
-	if(player == NULL)
+	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
-	*/
+	if (m_proto_ver >= 25) {
+		// get into sudo mode and then send new password to server
+		m_password = oldpassword;
+		m_new_password = newpassword;
+		startAuth(choseAuthMech(m_sudo_auth_methods));
+	} else {
+		std::string oldpwd = translatePassword(playername, oldpassword);
+		std::string newpwd = translatePassword(playername, newpassword);
+
+		NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE);
+
+		for (u8 i = 0; i < PASSWORD_SIZE; i++) {
+			pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0);
+		}
 
-	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;
+		for (u8 i = 0; i < PASSWORD_SIZE; i++) {
+			pkt << (u8) (i < newpwd.length() ? newpwd[i] : 0);
+		}
+		Send(&pkt);
 	}
-	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);
+	DSTACK(FUNCTION_NAME);
 
-	writeU16(os, TOSERVER_DAMAGE);
-	writeU8(os, damage);
+	NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8));
+	pkt << damage;
+	Send(&pkt);
+}
 
-	// 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::sendBreath(u16 breath)
+{
+	DSTACK(FUNCTION_NAME);
+
+	NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16));
+	pkt << breath;
+	Send(&pkt);
 }
 
 void Client::sendRespawn()
 {
-	DSTACK(__FUNCTION_NAME);
-	std::ostringstream os(std::ios_base::binary);
+	DSTACK(FUNCTION_NAME);
 
-	writeU16(os, TOSERVER_RESPAWN);
+	NetworkPacket pkt(TOSERVER_RESPAWN, 0);
+	Send(&pkt);
+}
 
-	// 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::sendReady()
+{
+	DSTACK(FUNCTION_NAME);
+
+	NetworkPacket pkt(TOSERVER_CLIENT_READY,
+			1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash));
+
+	pkt << (u8) VERSION_MAJOR << (u8) VERSION_MINOR << (u8) VERSION_PATCH
+		<< (u8) 0 << (u16) strlen(g_version_hash);
+
+	pkt.putRawString(g_version_hash, (u16) strlen(g_version_hash));
+	Send(&pkt);
 }
 
 void Client::sendPlayerPos()
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	
-	Player *myplayer = m_env.getLocalPlayer();
+	LocalPlayer *myplayer = m_env.getLocalPlayer();
 	if(myplayer == NULL)
 		return;
-	
+
+	// Save bandwidth by only updating position when something changed
+	if(myplayer->last_position        == myplayer->getPosition() &&
+			myplayer->last_speed      == myplayer->getSpeed()    &&
+			myplayer->last_pitch      == myplayer->getPitch()    &&
+			myplayer->last_yaw        == myplayer->getYaw()      &&
+			myplayer->last_keyPressed == myplayer->keyPressed)
+		return;
+
+	myplayer->last_position   = myplayer->getPosition();
+	myplayer->last_speed      = myplayer->getSpeed();
+	myplayer->last_pitch      = myplayer->getPitch();
+	myplayer->last_yaw        = myplayer->getYaw();
+	myplayer->last_keyPressed = myplayer->keyPressed;
+
 	u16 our_peer_id;
 	{
-		//JMutexAutoLock lock(m_con_mutex); //bulk comment-out
+		//MutexAutoLock 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_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);
-	
-	v3f pf = myplayer->getPosition();
+
+	v3f pf         = myplayer->getPosition();
+	v3f sf         = myplayer->getSpeed();
+	s32 pitch      = myplayer->getPitch() * 100;
+	s32 yaw        = myplayer->getYaw() * 100;
+	u32 keyPressed = myplayer->keyPressed;
+
 	v3s32 position(pf.X*100, pf.Y*100, pf.Z*100);
-	v3f sf = myplayer->getSpeed();
 	v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
-	s32 pitch = myplayer->getPitch() * 100;
-	s32 yaw = myplayer->getYaw() * 100;
-
 	/*
 		Format:
-		[0] u16 command
-		[2] v3s32 position*100
-		[2+12] v3s32 speed*100
-		[2+12+12] s32 pitch*100
-		[2+12+12+4] s32 yaw*100
+		[0] v3s32 position*100
+		[12] v3s32 speed*100
+		[12+12] s32 pitch*100
+		[12+12+4] s32 yaw*100
+		[12+12+4+4] u32 keyPressed
 	*/
 
-	SharedBuffer<u8> data(2+12+12+4+4);
-	writeU16(&data[0], TOSERVER_PLAYERPOS);
-	writeV3S32(&data[2], position);
-	writeV3S32(&data[2+12], speed);
-	writeS32(&data[2+12+12], pitch);
-	writeS32(&data[2+12+12+4], yaw);
+	NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
+
+	pkt << position << speed << pitch << yaw << keyPressed;
 
-	// Send as unreliable
-	Send(0, data, false);
+	Send(&pkt);
 }
 
 void Client::sendPlayerItem(u16 item)
@@ -1645,100 +1318,54 @@ void Client::sendPlayerItem(u16 item)
 	// 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);
+	NetworkPacket pkt(TOSERVER_PLAYERITEM, 2);
 
-	// Send as reliable
-	Send(0, data, true);
+	pkt << item;
+
+	Send(&pkt);
 }
 
 void Client::removeNode(v3s16 p)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	
-	core::map<v3s16, MapBlock*> modified_blocks;
+	std::map<v3s16, MapBlock*> modified_blocks;
 
-	try
-	{
-		//TimeTaker t("removeNodeAndUpdate", m_device);
+	try {
 		m_env.getMap().removeNodeAndUpdate(p, modified_blocks);
 	}
-	catch(InvalidPositionException &e)
-	{
+	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);
+
+	for(std::map<v3s16, MapBlock *>::iterator
+			i = modified_blocks.begin();
+			i != modified_blocks.end(); ++i) {
+		addUpdateMeshTaskWithEdge(i->first, false, true);
 	}
 }
 
-void Client::addNode(v3s16 p, MapNode n)
+void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-
-	TimeTaker timer1("Client::addNode()");
+	//TimeTaker timer1("Client::addNode()");
 
-	core::map<v3s16, MapBlock*> modified_blocks;
+	std::map<v3s16, MapBlock*> modified_blocks;
 
-	try
-	{
+	try {
 		//TimeTaker timer3("Client::addNode(): addNodeAndUpdate");
-		std::string st = std::string("");
-		m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, st);
+		m_env.getMap().addNodeAndUpdate(p, n, modified_blocks, remove_metadata);
 	}
-	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);
+	catch(InvalidPositionException &e) {
 	}
-}
-	
-void Client::updateCamera(v3f pos, v3f dir, f32 fov)
-{
-	m_env.getClientMap().updateCamera(pos, dir, fov);
-}
 
-void Client::renderPostFx()
-{
-	m_env.getClientMap().renderPostFx();
-}
-
-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);
-}
-
-LocalPlayer* Client::getLocalPlayer()
-{
-	return m_env.getLocalPlayer();
+	for(std::map<v3s16, MapBlock *>::iterator
+			i = modified_blocks.begin();
+			i != modified_blocks.end(); ++i) {
+		addUpdateMeshTaskWithEdge(i->first, false, true);
+	}
 }
 
 void Client::setPlayerControl(PlayerControl &control)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	LocalPlayer *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	player->control = control;
@@ -1746,14 +1373,8 @@ void Client::setPlayerControl(PlayerControl &control)
 
 void Client::selectPlayerItem(u16 item)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	m_playeritem = item;
 	m_inventory_updated = true;
-
-	LocalPlayer *player = m_env.getLocalPlayer();
-	assert(player != NULL);
-	player->wieldItem(item);
-
 	sendPlayerItem(item);
 }
 
@@ -1761,8 +1382,6 @@ void Client::selectPlayerItem(u16 item)
 // updated from the server. If it is true, it is set to false.
 bool Client::getLocalInventoryUpdated()
 {
-	// m_inventory_updated is behind envlock
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	bool updated = m_inventory_updated;
 	m_inventory_updated = false;
 	return updated;
@@ -1771,48 +1390,68 @@ bool Client::getLocalInventoryUpdated()
 // Copies the inventory of the local player to parameter
 void Client::getLocalInventory(Inventory &dst)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
 	Player *player = m_env.getLocalPlayer();
 	assert(player != NULL);
 	dst = player->inventory;
 }
 
-InventoryContext *Client::getInventoryContext()
+Inventory* Client::getInventory(const InventoryLocation &loc)
 {
-	return &m_inventory_context;
-}
-
-Inventory* Client::getInventory(InventoryContext *c, std::string id)
-{
-	if(id == "current_player")
+	switch(loc.type){
+	case InventoryLocation::UNDEFINED:
+	{}
+	break;
+	case InventoryLocation::CURRENT_PLAYER:
 	{
-		assert(c->current_player);
-		return &(c->current_player->inventory);
+		Player *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		return &player->inventory;
 	}
-	
-	Strfnd fn(id);
-	std::string id0 = fn.next(":");
-
-	if(id0 == "nodemeta")
+	break;
+	case InventoryLocation::PLAYER:
 	{
-		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();
-		infostream<<"nodemeta at ("<<p.X<<","<<p.Y<<","<<p.Z<<"): "
-				<<"no metadata found"<<std::endl;
-		return NULL;
+		Player *player = m_env.getPlayer(loc.name.c_str());
+		if(!player)
+			return NULL;
+		return &player->inventory;
+	}
+	break;
+	case InventoryLocation::NODEMETA:
+	{
+		NodeMetadata *meta = m_env.getMap().getNodeMetadata(loc.p);
+		if(!meta)
+			return NULL;
+		return meta->getInventory();
+	}
+	break;
+	case InventoryLocation::DETACHED:
+	{
+		if(m_detached_inventories.count(loc.name) == 0)
+			return NULL;
+		return m_detached_inventories[loc.name];
+	}
+	break;
+	default:
+		FATAL_ERROR("Invalid inventory location type.");
+		break;
 	}
-
-	infostream<<__FUNCTION_NAME<<": unknown id "<<id<<std::endl;
 	return NULL;
 }
+
 void Client::inventoryAction(InventoryAction *a)
 {
+	/*
+		Send it to the server
+	*/
 	sendInventoryAction(a);
+
+	/*
+		Predict some local inventory changes
+	*/
+	a->clientApply(this, this);
+
+	// Remove it
+	delete a;
 }
 
 ClientActiveObject * Client::getSelectedActiveObject(
@@ -1821,20 +1460,18 @@ ClientActiveObject * Client::getSelectedActiveObject(
 		core::line3d<f32> shootline_on_map
 	)
 {
-	core::array<DistanceSortedActiveObject> objects;
+	std::vector<DistanceSortedActiveObject> objects;
 
 	m_env.getActiveObjects(from_pos_f_on_map, max_d, objects);
 
-	//infostream<<"Collected "<<objects.size()<<" nearby objects"<<std::endl;
-	
 	// Sort them.
 	// After this, the closest object is the first in the array.
-	objects.sort();
+	std::sort(objects.begin(), objects.end());
 
-	for(u32 i=0; i<objects.size(); i++)
+	for(unsigned int i=0; i<objects.size(); i++)
 	{
 		ClientActiveObject *obj = objects[i].obj;
-		
+
 		core::aabbox3d<f32> *selection_box = obj->getSelectionBox();
 		if(selection_box == NULL)
 			continue;
@@ -1848,30 +1485,55 @@ ClientActiveObject * Client::getSelectedActiveObject(
 
 		if(offsetted_box.intersectsWithLine(shootline_on_map))
 		{
-			//infostream<<"Returning selected object"<<std::endl;
 			return obj;
 		}
 	}
 
-	//infostream<<"No object selected; returning NULL."<<std::endl;
 	return NULL;
 }
 
-void Client::printDebugInfo(std::ostream &os)
+std::list<std::string> Client::getConnectedPlayerNames()
+{
+	return m_env.getPlayerNames();
+}
+
+float Client::getAnimationTime()
 {
-	//JMutexAutoLock lock1(m_fetchblock_mutex);
-	/*JMutexAutoLock lock2(m_incoming_queue_mutex);
+	return m_animation_time;
+}
 
-	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;*/
+int Client::getCrackLevel()
+{
+	return m_crack_level;
 }
-	
-u32 Client::getDayNightRatio()
+
+void Client::setHighlighted(v3s16 pos, bool show_highlighted)
+{
+	m_show_highlighted = show_highlighted;
+	v3s16 old_highlighted_pos = m_highlighted_pos;
+	m_highlighted_pos = pos;
+	addUpdateMeshTaskForNode(old_highlighted_pos, false, true);
+	addUpdateMeshTaskForNode(m_highlighted_pos, false, true);
+}
+
+void Client::setCrack(int level, v3s16 pos)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	return m_env.getDayNightRatio();
+	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()
@@ -1881,150 +1543,348 @@ u16 Client::getHP()
 	return player->hp;
 }
 
-void Client::setTempMod(v3s16 p, NodeMod mod)
+u16 Client::getBreath()
 {
-	//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);
+	Player *player = m_env.getLocalPlayer();
+	assert(player != NULL);
+	return player->getBreath();
+}
 
-	for(core::map<v3s16, MapBlock*>::Iterator
-			i = affected_blocks.getIterator();
-			i.atEnd() == false; i++)
-	{
-		i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
-	}
+bool Client::getChatMessage(std::wstring &message)
+{
+	if(m_chat_queue.size() == 0)
+		return false;
+	message = m_chat_queue.front();
+	m_chat_queue.pop();
+	return true;
 }
 
-void Client::clearTempMod(v3s16 p)
+void Client::typeChatMessage(const std::wstring &message)
 {
-	//JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
-	assert(m_env.getMap().mapType() == MAPTYPE_CLIENT);
+	// Discard empty line
+	if(message == L"")
+		return;
 
-	core::map<v3s16, MapBlock*> affected_blocks;
-	((ClientMap&)m_env.getMap()).clearTempMod(p,
-			&affected_blocks);
+	// Send to others
+	sendChatMessage(message);
 
-	for(core::map<v3s16, MapBlock*>::Iterator
-			i = affected_blocks.getIterator();
-			i.atEnd() == false; i++)
+	// Show locally
+	if (message[0] == L'/')
+	{
+		m_chat_queue.push((std::wstring)L"issued command: " + message);
+	}
+	else
 	{
-		i.getNode()->getValue()->updateMesh(m_env.getDayNightRatio());
+		LocalPlayer *player = m_env.getLocalPlayer();
+		assert(player != NULL);
+		std::wstring name = narrow_to_wide(player->getName());
+		m_chat_queue.push((std::wstring)L"<" + name + L"> " + message);
 	}
 }
 
-void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server)
+void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
 {
-	/*infostream<<"Client::addUpdateMeshTask(): "
-			<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
-			<<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, m_cache_enable_shaders);
+
 	{
 		//TimeTaker timer("data fill");
 		// Release: ~0ms
 		// Debug: 1-6ms, avg=2ms
-		data->fill(getDayNightRatio(), b);
+		data->fill(b);
+		data->setCrack(m_crack_level, m_crack_pos);
+		data->setHighlighted(m_highlighted_pos, m_show_highlighted);
+		data->setSmoothLighting(m_cache_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);
-
-	/*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;
+	m_mesh_update_thread.enqueueUpdate(p, data, ack_to_server, urgent);
+}
+
+void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
+{
+	try{
+		addUpdateMeshTask(blockpos, ack_to_server, urgent);
 	}
-#endif
+	catch(InvalidPositionException &e){}
 
-	/*
-		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);
+	// Leading edge
+	for (int i=0;i<6;i++)
+	{
+		try{
+			v3s16 p = blockpos + g_6dirs[i];
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
+	}
 }
 
-void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server)
+void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool urgent)
 {
-	/*{
-		v3s16 p = blockpos;
-		infostream<<"Client::addUpdateMeshTaskWithEdge(): "
+	{
+		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);
-		//MapBlock *b = m_env.getMap().getBlockNoCreate(p);
-		addUpdateMeshTask(p, ack_to_server);
+		addUpdateMeshTask(blockpos, ack_to_server, urgent);
 	}
-	catch(InvalidPositionException &e){}
+	catch(InvalidPositionException &e) {}
+
 	// Leading edge
-	try{
-		v3s16 p = blockpos + v3s16(-1,0,0);
-		addUpdateMeshTask(p);
+	if(nodepos.X == blockpos_relative.X){
+		try{
+			v3s16 p = blockpos + v3s16(-1,0,0);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
 	}
-	catch(InvalidPositionException &e){}
-	try{
-		v3s16 p = blockpos + v3s16(0,-1,0);
-		addUpdateMeshTask(p);
+
+	if(nodepos.Y == blockpos_relative.Y){
+		try{
+			v3s16 p = blockpos + v3s16(0,-1,0);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
 	}
-	catch(InvalidPositionException &e){}
-	try{
-		v3s16 p = blockpos + v3s16(0,0,-1);
-		addUpdateMeshTask(p);
+
+	if(nodepos.Z == blockpos_relative.Z){
+		try{
+			v3s16 p = blockpos + v3s16(0,0,-1);
+			addUpdateMeshTask(p, false, urgent);
+		}
+		catch(InvalidPositionException &e){}
 	}
-	catch(InvalidPositionException &e){}
 }
 
 ClientEvent Client::getClientEvent()
 {
-	if(m_client_event_queue.size() == 0)
-	{
-		ClientEvent event;
+	ClientEvent event;
+	if(m_client_event_queue.size() == 0) {
 		event.type = CE_NONE;
-		return event;
 	}
-	return m_client_event_queue.pop_front();
+	else {
+		event = m_client_event_queue.front();
+		m_client_event_queue.pop();
+	}
+	return event;
+}
+
+float Client::mediaReceiveProgress()
+{
+	if (m_media_downloader)
+		return m_media_downloader->getProgress();
+	else
+		return 1.0; // downloader only exists when not yet done
+}
+
+typedef struct TextureUpdateArgs {
+	IrrlichtDevice *device;
+	gui::IGUIEnvironment *guienv;
+	u32 last_time_ms;
+	u16 last_percent;
+	const wchar_t* text_base;
+} TextureUpdateArgs;
+
+void texture_update_progress(void *args, u32 progress, u32 max_progress)
+{
+		TextureUpdateArgs* targs = (TextureUpdateArgs*) args;
+		u16 cur_percent = ceil(progress / (double) max_progress * 100.);
+
+		// update the loading menu -- if neccessary
+		bool do_draw = false;
+		u32 time_ms = targs->last_time_ms;
+		if (cur_percent != targs->last_percent) {
+			targs->last_percent = cur_percent;
+			time_ms = getTimeMs();
+			// only draw when the user will notice something:
+			do_draw = (time_ms - targs->last_time_ms > 100);
+		}
+
+		if (do_draw) {
+			targs->last_time_ms = time_ms;
+			std::basic_stringstream<wchar_t> strm;
+			strm << targs->text_base << " " << targs->last_percent << "%...";
+			draw_load_screen(strm.str(), targs->device, targs->guienv, 0,
+				72 + (u16) ((18. / 100.) * (double) targs->last_percent));
+		}
+}
+
+void Client::afterContentReceived(IrrlichtDevice *device)
+{
+	infostream<<"Client::afterContentReceived() started"<<std::endl;
+	assert(m_itemdef_received); // pre-condition
+	assert(m_nodedef_received); // pre-condition
+	assert(mediaReceived()); // pre-condition
+
+	const wchar_t* text = wgettext("Loading textures...");
+
+	// Clear cached pre-scaled 2D GUI images, as this cache
+	// might have images with the same name but different
+	// content from previous sessions.
+	guiScalingCacheClear(device->getVideoDriver());
+
+	// Rebuild inherited images and recreate textures
+	infostream<<"- Rebuilding images and textures"<<std::endl;
+	draw_load_screen(text,device, guienv, 0, 70);
+	m_tsrc->rebuildImagesAndTextures();
+	delete[] text;
+
+	// Rebuild shaders
+	infostream<<"- Rebuilding shaders"<<std::endl;
+	text = wgettext("Rebuilding shaders...");
+	draw_load_screen(text, device, guienv, 0, 71);
+	m_shsrc->rebuildShaders();
+	delete[] text;
+
+	// Update node aliases
+	infostream<<"- Updating node aliases"<<std::endl;
+	text = wgettext("Initializing nodes...");
+	draw_load_screen(text, device, guienv, 0, 72);
+	m_nodedef->updateAliases(m_itemdef);
+	std::string texture_path = g_settings->get("texture_path");
+	if (texture_path != "" && fs::IsDir(texture_path))
+		m_nodedef->applyTextureOverrides(texture_path + DIR_DELIM + "override.txt");
+	m_nodedef->setNodeRegistrationStatus(true);
+	m_nodedef->runNodeResolveCallbacks();
+	delete[] text;
+
+	// Update node textures and assign shaders to each tile
+	infostream<<"- Updating node textures"<<std::endl;
+	TextureUpdateArgs tu_args;
+	tu_args.device = device;
+	tu_args.guienv = guienv;
+	tu_args.last_time_ms = getTimeMs();
+	tu_args.last_percent = 0;
+	tu_args.text_base =  wgettext("Initializing nodes");
+	m_nodedef->updateTextures(this, texture_update_progress, &tu_args);
+	delete[] tu_args.text_base;
+
+	// Preload item textures and meshes if configured to
+	if(g_settings->getBool("preload_item_visuals"))
+	{
+		verbosestream<<"Updating item textures and meshes"<<std::endl;
+		text = wgettext("Item textures...");
+		draw_load_screen(text, device, guienv, 0, 0);
+		std::set<std::string> names = m_itemdef->getAll();
+		size_t size = names.size();
+		size_t count = 0;
+		int percent = 0;
+		for(std::set<std::string>::const_iterator
+				i = names.begin(); i != names.end(); ++i)
+		{
+			// Asking for these caches the result
+			m_itemdef->getInventoryTexture(*i, this);
+			m_itemdef->getWieldMesh(*i, this);
+			count++;
+			percent = (count * 100 / size * 0.2) + 80;
+			draw_load_screen(text, device, guienv, 0, percent);
+		}
+		delete[] text;
+	}
+
+	// Start mesh update thread after setting up content definitions
+	infostream<<"- Starting mesh update thread"<<std::endl;
+	m_mesh_update_thread.start();
+
+	m_state = LC_Ready;
+	sendReady();
+	text = wgettext("Done!");
+	draw_load_screen(text, device, guienv, 0, 100);
+	infostream<<"Client::afterContentReceived() done"<<std::endl;
+	delete[] text;
 }
 
 float Client::getRTT(void)
 {
-	try{
-		return m_con.GetPeerAvgRTT(PEER_ID_SERVER);
-	} catch(con::PeerNotFoundException &e){
-		return 1337;
+	return m_con.getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
+}
+
+float Client::getCurRate(void)
+{
+	return ( m_con.getLocalStat(con::CUR_INC_RATE) +
+			m_con.getLocalStat(con::CUR_DL_RATE));
+}
+
+float Client::getAvgRate(void)
+{
+	return ( m_con.getLocalStat(con::AVG_INC_RATE) +
+			m_con.getLocalStat(con::AVG_DL_RATE));
+}
+
+void Client::makeScreenshot(IrrlichtDevice *device)
+{
+	irr::video::IVideoDriver *driver = device->getVideoDriver();
+	irr::video::IImage* const raw_image = driver->createScreenShot();
+
+	if (!raw_image)
+		return;
+
+	time_t t = time(NULL);
+	struct tm *tm = localtime(&t);
+
+	char timetstamp_c[64];
+	strftime(timetstamp_c, sizeof(timetstamp_c), "%Y%m%d_%H%M%S", tm);
+
+	std::string filename_base = g_settings->get("screenshot_path")
+			+ DIR_DELIM
+			+ std::string("screenshot_")
+			+ std::string(timetstamp_c);
+	std::string filename_ext = ".png";
+	std::string filename;
+
+	// Try to find a unique filename
+	unsigned serial = 0;
+
+	while (serial < SCREENSHOT_MAX_SERIAL_TRIES) {
+		filename = filename_base + (serial > 0 ? ("_" + itos(serial)) : "") + filename_ext;
+		std::ifstream tmp(filename.c_str());
+		if (!tmp.good())
+			break;	// File did not apparently exist, we'll go with it
+		serial++;
 	}
+
+	if (serial == SCREENSHOT_MAX_SERIAL_TRIES) {
+		infostream << "Could not find suitable filename for screenshot" << std::endl;
+	} else {
+		irr::video::IImage* const image =
+				driver->createImage(video::ECF_R8G8B8, raw_image->getDimension());
+
+		if (image) {
+			raw_image->copyTo(image);
+
+			std::ostringstream sstr;
+			if (driver->writeImageToFile(image, filename.c_str())) {
+				sstr << "Saved screenshot to '" << filename << "'";
+			} else {
+				sstr << "Failed to save screenshot '" << filename << "'";
+			}
+			m_chat_queue.push(narrow_to_wide(sstr.str()));
+			infostream << sstr.str() << std::endl;
+			image->drop();
+		}
+	}
+
+	raw_image->drop();
 }
 
 // IGameDef interface
 // Under envlock
-IToolDefManager* Client::getToolDefManager()
+IItemDefManager* Client::getItemDefManager()
 {
-	return m_tooldef;
+	return m_itemdef;
 }
 INodeDefManager* Client::getNodeDefManager()
 {
@@ -2035,19 +1895,64 @@ ICraftDefManager* Client::getCraftDefManager()
 	return NULL;
 	//return m_craftdef;
 }
-ICraftItemDefManager* Client::getCraftItemDefManager()
-{
-	return m_craftitemdef;
-}
 ITextureSource* Client::getTextureSource()
 {
 	return m_tsrc;
 }
+IShaderSource* Client::getShaderSource()
+{
+	return m_shsrc;
+}
+scene::ISceneManager* Client::getSceneManager()
+{
+	return m_device->getSceneManager();
+}
 u16 Client::allocateUnknownNodeId(const std::string &name)
 {
-	errorstream<<"Client::allocateUnknownNodeId(): "
-			<<"Client cannot allocate node IDs"<<std::endl;
-	assert(0);
+	errorstream << "Client::allocateUnknownNodeId(): "
+			<< "Client cannot allocate node IDs" << std::endl;
+	FATAL_ERROR("Client allocated unknown node");
+
 	return CONTENT_IGNORE;
 }
+ISoundManager* Client::getSoundManager()
+{
+	return m_sound;
+}
+MtEventManager* Client::getEventManager()
+{
+	return m_event;
+}
 
+ParticleManager* Client::getParticleManager()
+{
+	return &m_particle_manager;
+}
+
+scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
+{
+	StringMap::const_iterator it = m_mesh_data.find(filename);
+	if (it == m_mesh_data.end()) {
+		errorstream << "Client::getMesh(): Mesh not found: \"" << filename
+			<< "\"" << std::endl;
+		return NULL;
+	}
+	const std::string &data    = it->second;
+	scene::ISceneManager *smgr = m_device->getSceneManager();
+
+	// Create the mesh, remove it from cache and return it
+	// This allows unique vertex colors and other properties for each instance
+	Buffer<char> data_rw(data.c_str(), data.size()); // Const-incorrect Irrlicht
+	io::IFileSystem *irrfs = m_device->getFileSystem();
+	io::IReadFile *rfile   = irrfs->createMemoryReadFile(
+			*data_rw, data_rw.getSize(), filename.c_str());
+	FATAL_ERROR_IF(!rfile, "Could not create/open RAM file");
+
+	scene::IAnimatedMesh *mesh = smgr->getMesh(rfile);
+	rfile->drop();
+	// NOTE: By playing with Irrlicht refcounts, maybe we could cache a bunch
+	// of uniquely named instances and re-use them
+	mesh->grab();
+	smgr->getMeshCache()->removeMesh(mesh);
+	return mesh;
+}