]> git.lizzy.rs Git - minetest.git/blobdiff - src/client.cpp
Remove superfluous pointer null checks
[minetest.git] / src / client.cpp
index 99ef3c7e126975245339d8e79b2562d6c306992b..1f6f64ce077cbc2185dc7c976b38b9ae1ba2950e 100644 (file)
@@ -20,190 +20,36 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <algorithm>
 #include <sstream>
+#include <cmath>
 #include <IFileSystem.h>
-#include "jthread/jmutexautolock.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 "mapblock_mesh.h"
 #include "mapblock.h"
-#include "settings.h"
+#include "minimap.h"
+#include "mods.h"
 #include "profiler.h"
 #include "gettext.h"
-#include "log.h"
-#include "nodemetadata.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"
+#include "script/scripting_client.h"
+#include "game.h"
 
 extern gui::IGUIEnvironment* guienv;
 
-/*
-       QueuedMeshUpdate
-*/
-
-QueuedMeshUpdate::QueuedMeshUpdate():
-       p(-1337,-1337,-1337),
-       data(NULL),
-       ack_block_to_server(false)
-{
-}
-
-QueuedMeshUpdate::~QueuedMeshUpdate()
-{
-       if(data)
-               delete data;
-}
-
-/*
-       MeshUpdateQueue
-*/
-
-MeshUpdateQueue::MeshUpdateQueue()
-{
-}
-
-MeshUpdateQueue::~MeshUpdateQueue()
-{
-       JMutexAutoLock lock(m_mutex);
-
-       for(std::vector<QueuedMeshUpdate*>::iterator
-                       i = m_queue.begin();
-                       i != m_queue.end(); i++)
-       {
-               QueuedMeshUpdate *q = *i;
-               delete q;
-       }
-}
-
-/*
-       peer_id=0 adds with nobody to send to
-*/
-void MeshUpdateQueue::addBlock(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent)
-{
-       DSTACK(__FUNCTION_NAME);
-
-       assert(data);   // pre-condition
-
-       JMutexAutoLock lock(m_mutex);
-
-       if(urgent)
-               m_urgents.insert(p);
-
-       /*
-               Find if block is already in queue.
-               If it is, update the data and quit.
-       */
-       for(std::vector<QueuedMeshUpdate*>::iterator
-                       i = m_queue.begin();
-                       i != m_queue.end(); i++)
-       {
-               QueuedMeshUpdate *q = *i;
-               if(q->p == p)
-               {
-                       if(q->data)
-                               delete q->data;
-                       q->data = data;
-                       if(ack_block_to_server)
-                               q->ack_block_to_server = true;
-                       return;
-               }
-       }
-
-       /*
-               Add the block
-       */
-       QueuedMeshUpdate *q = new QueuedMeshUpdate;
-       q->p = p;
-       q->data = data;
-       q->ack_block_to_server = ack_block_to_server;
-       m_queue.push_back(q);
-}
-
-// Returned pointer must be deleted
-// Returns NULL if queue is empty
-QueuedMeshUpdate * MeshUpdateQueue::pop()
-{
-       JMutexAutoLock lock(m_mutex);
-
-       bool must_be_urgent = !m_urgents.empty();
-       for(std::vector<QueuedMeshUpdate*>::iterator
-                       i = m_queue.begin();
-                       i != m_queue.end(); i++)
-       {
-               QueuedMeshUpdate *q = *i;
-               if(must_be_urgent && m_urgents.count(q->p) == 0)
-                       continue;
-               m_queue.erase(i);
-               m_urgents.erase(q->p);
-               return q;
-       }
-       return NULL;
-}
-
-/*
-       MeshUpdateThread
-*/
-
-void * MeshUpdateThread::Thread()
-{
-       ThreadStarted();
-
-       log_register_thread("MeshUpdateThread");
-
-       DSTACK(__FUNCTION_NAME);
-
-       BEGIN_DEBUG_EXCEPTION_HANDLER
-
-       porting::setThreadName("MeshUpdateThread");
-
-       while(!StopRequested())
-       {
-               QueuedMeshUpdate *q = m_queue_in.pop();
-               if(q == NULL)
-               {
-                       sleep_ms(3);
-                       continue;
-               }
-
-               ScopeProfiler sp(g_profiler, "Client: Mesh making");
-
-               MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset);
-               if(mesh_new->getMesh()->getMeshBufferCount() == 0)
-               {
-                       delete mesh_new;
-                       mesh_new = NULL;
-               }
-
-               MeshUpdateResult r;
-               r.p = q->p;
-               r.mesh = mesh_new;
-               r.ack_block_to_server = q->ack_block_to_server;
-
-               m_queue_out.push_back(r);
-
-               delete q;
-       }
-
-       END_DEBUG_EXCEPTION_HANDLER(errorstream)
-
-       return NULL;
-}
-
 /*
        Client
 */
@@ -211,7 +57,8 @@ void * MeshUpdateThread::Thread()
 Client::Client(
                IrrlichtDevice *device,
                const char *playername,
-               std::string password,
+               const std::string &password,
+               const std::string &address_name,
                MapDrawControl &control,
                IWritableTextureSource *tsrc,
                IWritableShaderSource *shsrc,
@@ -219,7 +66,8 @@ Client::Client(
                IWritableNodeDefManager *nodedef,
                ISoundManager *sound,
                MtEventManager *event,
-               bool ipv6
+               bool ipv6,
+               GameUIFlags *game_ui_flags
 ):
        m_packetcounter_timer(0.0),
        m_connection_reinit_timer(0.1),
@@ -234,7 +82,7 @@ Client::Client(
        m_event(event),
        m_mesh_update_thread(this),
        m_env(
-               new ClientMap(this, this, control,
+               new ClientMap(this, control,
                        device->getSceneManager()->getRootSceneNode(),
                        device->getSceneManager(), 666),
                device->getSceneManager(),
@@ -242,20 +90,28 @@ Client::Client(
        ),
        m_particle_manager(&m_env),
        m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
+       m_address_name(address_name),
        m_device(device),
+       m_camera(NULL),
+       m_minimap(NULL),
+       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_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_last_chat_message_sent(time(NULL)),
+       m_chat_message_allowance(5.0f),
        m_map_seed(0),
        m_password(password),
+       m_chosen_auth_mech(AUTH_MECHANISM_NONE),
+       m_auth_data(NULL),
        m_access_denied(false),
+       m_access_denied_reconnect(false),
        m_itemdef_received(false),
        m_nodedef_received(false),
        m_media_downloader(new ClientMediaDownloader()),
@@ -265,43 +121,119 @@ Client::Client(
        m_recommended_send_interval(0.1),
        m_removed_sounds_check_timer(0),
        m_state(LC_Created),
-       m_localdb(NULL)
+       m_localdb(NULL),
+       m_script(NULL),
+       m_mod_storage_save_timer(10.0f),
+       m_game_ui_flags(game_ui_flags),
+       m_shutdown(false)
 {
        // Add local player
-       m_env.addPlayer(new LocalPlayer(this, playername));
+       m_env.setLocalPlayer(new LocalPlayer(this, playername));
 
+       if (g_settings->getBool("enable_minimap")) {
+               m_minimap = new Minimap(device, this);
+       }
        m_cache_save_interval = g_settings->getU16("server_map_save_interval");
 
-       m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
-       m_cache_enable_shaders  = g_settings->getBool("enable_shaders");
+       m_modding_enabled = g_settings->getBool("enable_client_modding");
+       m_script = new ClientScripting(this);
+       m_env.setScript(m_script);
+       m_script->setEnv(&m_env);
+}
+
+void Client::initMods()
+{
+       m_script->loadMod(getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
+
+       // If modding is not enabled, don't load mods, just builtin
+       if (!m_modding_enabled) {
+               return;
+       }
+
+       ClientModConfiguration modconf(getClientModsLuaPath());
+       std::vector<ModSpec> mods = modconf.getMods();
+       std::vector<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods();
+       // complain about mods with unsatisfied dependencies
+       if (!modconf.isConsistent()) {
+               modconf.printUnsatisfiedModsError();
+       }
+
+       // Print mods
+       infostream << "Client Loading mods: ";
+       for (std::vector<ModSpec>::const_iterator i = mods.begin();
+               i != mods.end(); ++i) {
+               infostream << (*i).name << " ";
+       }
+
+       infostream << std::endl;
+       // Load and run "mod" scripts
+       for (std::vector<ModSpec>::const_iterator it = mods.begin();
+               it != mods.end(); ++it) {
+               const ModSpec &mod = *it;
+               if (!string_allowed(mod.name, MODNAME_ALLOWED_CHARS)) {
+                       throw ModError("Error loading mod \"" + mod.name +
+                               "\": Mod name does not follow naming conventions: "
+                                       "Only characters [a-z0-9_] are allowed.");
+               }
+               std::string script_path = mod.path + DIR_DELIM + "init.lua";
+               infostream << "  [" << padStringRight(mod.name, 12) << "] [\""
+                       << script_path << "\"]" << std::endl;
+               m_script->loadMod(script_path, mod.name);
+       }
+}
+
+const std::string &Client::getBuiltinLuaPath()
+{
+       static const std::string builtin_dir = porting::path_share + DIR_DELIM + "builtin";
+       return builtin_dir;
+}
+
+const std::string &Client::getClientModsLuaPath()
+{
+       static const std::string clientmods_dir = porting::path_share + DIR_DELIM + "clientmods";
+       return clientmods_dir;
+}
+
+const std::vector<ModSpec>& Client::getMods() const
+{
+       static std::vector<ModSpec> client_modspec_temp;
+       return client_modspec_temp;
+}
+
+const ModSpec* Client::getModSpec(const std::string &modname) const
+{
+       return NULL;
 }
 
 void Client::Stop()
 {
+       m_shutdown = true;
+       // Don't disable this part when modding is disabled, it's used in builtin
+       m_script->on_shutdown();
        //request all client managed threads to stop
-       m_mesh_update_thread.Stop();
+       m_mesh_update_thread.stop();
        // Save local server map
        if (m_localdb) {
                infostream << "Local map saving ended." << std::endl;
                m_localdb->endSave();
        }
+
+       delete m_script;
 }
 
 bool Client::isShutdown()
 {
-
-       if (!m_mesh_update_thread.IsRunning()) return true;
-
-       return false;
+       return m_shutdown || !m_mesh_update_thread.isRunning();
 }
 
 Client::~Client()
 {
+       m_shutdown = true;
        m_con.Disconnect();
 
-       m_mesh_update_thread.Stop();
-       m_mesh_update_thread.Wait();
-       while(!m_mesh_update_thread.m_queue_out.empty()) {
+       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;
        }
@@ -310,29 +242,29 @@ Client::~Client()
        delete m_inventory_from_server;
 
        // Delete detached inventories
-       for(std::map<std::string, Inventory*>::iterator
+       for (std::unordered_map<std::string, Inventory*>::iterator
                        i = m_detached_inventories.begin();
-                       i != m_detached_inventories.end(); i++){
+                       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 =
+               scene::IAnimatedMesh *mesh =
                        m_device->getSceneManager()->getMeshCache()->getMeshByIndex(0);
 
                if (mesh != NULL)
                        m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
        }
+
+       delete m_minimap;
 }
 
-void Client::connect(Address address,
-               const std::string &address_name,
-               bool is_local_server)
+void Client::connect(Address address, bool is_local_server)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
-       initLocalMapSaving(address, address_name, is_local_server);
+       initLocalMapSaving(address, m_address_name, is_local_server);
 
        m_con.SetTimeoutMs(0);
        m_con.Connect(address);
@@ -340,7 +272,7 @@ void Client::connect(Address address,
 
 void Client::step(float dtime)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        // Limit a bit
        if(dtime > 2.0)
@@ -388,26 +320,34 @@ void Client::step(float dtime)
                if(counter <= 0.0) {
                        counter = 2.0;
 
-                       Player *myplayer = m_env.getLocalPlayer();
+                       LocalPlayer *myplayer = m_env.getLocalPlayer();
                        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 minimum supported network protocol version (added sometime)
-                       // [53] u16 maximum supported network protocol version (added later than the previous one)
+                       u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
+                               CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
 
-                       char pName[PLAYERNAME_SIZE];
-                       char pPassword[PASSWORD_SIZE];
-                       memset(pName, 0, PLAYERNAME_SIZE * sizeof(char));
-                       memset(pPassword, 0, PASSWORD_SIZE * sizeof(char));
+                       if (proto_version_min < 25) {
+                               // 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 minimum supported network protocol version (added sometime)
+                               // [53] u16 maximum supported network protocol version (added later than the previous one)
 
-                       snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName());
-                       snprintf(pPassword, PASSWORD_SIZE, "%s", m_password.c_str());
+                               char pName[PLAYERNAME_SIZE];
+                               char pPassword[PASSWORD_SIZE];
+                               memset(pName, 0, PLAYERNAME_SIZE * sizeof(char));
+                               memset(pPassword, 0, PASSWORD_SIZE * sizeof(char));
 
-                       sendLegacyInit(pName, pPassword);
+                               std::string hashed_password = translate_password(myplayer->getName(), m_password);
+                               snprintf(pName, PLAYERNAME_SIZE, "%s", myplayer->getName());
+                               snprintf(pPassword, PASSWORD_SIZE, "%s", hashed_password.c_str());
+
+                               sendLegacyInit(pName, pPassword);
+                       }
+                       if (CLIENT_PROTOCOL_VERSION_MAX >= 25)
+                               sendInit(myplayer->getName());
                }
 
                // Not connected, return
@@ -426,8 +366,9 @@ void Client::step(float dtime)
                ScopeProfiler sp(g_profiler, "Client: map timer and unload");
                std::vector<v3s16> deleted_blocks;
                m_env.getMap().timerUpdate(map_timer_and_unload_dtime,
-                               g_settings->getFloat("client_unload_unused_data_timeout"),
-                               &deleted_blocks);
+                       g_settings->getFloat("client_unload_unused_data_timeout"),
+                       g_settings->getS32("client_mapblock_limit"),
+                       &deleted_blocks);
 
                /*
                        Send info to server
@@ -461,6 +402,14 @@ void Client::step(float dtime)
                }
        }
 
+       /*
+               Send pending messages on out chat queue
+       */
+       if (!m_out_chat_queue.empty() && canSendChatMessage()) {
+               sendChatMessage(m_out_chat_queue.front());
+               m_out_chat_queue.pop();
+       }
+
        /*
                Handle environment
        */
@@ -471,20 +420,19 @@ void Client::step(float dtime)
 
        // Step environment
        m_env.step(dtime);
+       m_sound->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;
+       while (m_env.hasClientEnvEvents()) {
+               ClientEnvEvent envEvent = m_env.getClientEnvEvent();
+
+               if (envEvent.type == CEE_PLAYER_DAMAGE) {
+                       if (m_ignore_damage_timer <= 0) {
+                               u8 damage = envEvent.player_damage.amount;
 
-                               if(event.player_damage.send_to_server)
+                               if (envEvent.player_damage.send_to_server)
                                        sendDamage(damage);
 
                                // Add to ClientEvent queue
@@ -494,9 +442,10 @@ void Client::step(float dtime)
                                m_client_event_queue.push(event);
                        }
                }
-               else if(event.type == CEE_PLAYER_BREATH) {
-                               u16 breath = event.player_breath.amount;
-                               sendBreath(breath);
+               // Protocol v29 or greater obsoleted this event
+               else if (envEvent.type == CEE_PLAYER_BREATH && m_proto_ver < 29) {
+                       u16 breath = envEvent.player_breath.amount;
+                       sendBreath(breath);
                }
        }
 
@@ -530,27 +479,44 @@ void Client::step(float dtime)
        */
        {
                int num_processed_meshes = 0;
-               while(!m_mesh_update_thread.m_queue_out.empty())
+               while (!m_mesh_update_thread.m_queue_out.empty())
                {
                        num_processed_meshes++;
+
+                       MinimapMapblock *minimap_mapblock = NULL;
+                       bool do_mapper_update = true;
+
                        MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_frontNoEx();
                        MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
-                       if(block) {
+                       if (block) {
                                // Delete the old mesh
-                               if(block->mesh != NULL)
-                               {
-                                       // TODO: Remove hardware buffers of meshbuffers of block->mesh
-                                       delete block->mesh;
-                                       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;
+
+                                       bool is_empty = true;
+                                       for (int l = 0; l < MAX_TILE_LAYERS; l++)
+                                               if (r.mesh->getMesh(l)->getMeshBufferCount() != 0)
+                                                       is_empty = false;
+
+                                       if (is_empty)
+                                               delete r.mesh;
+                                       else
+                                               // Replace with the new mesh
+                                               block->mesh = r.mesh;
                                }
-
-                               // Replace with the new mesh
-                               block->mesh = r.mesh;
                        } else {
                                delete r.mesh;
                        }
 
-                       if(r.ack_block_to_server) {
+                       if (m_minimap && do_mapper_update)
+                               m_minimap->addBlock(r.p, minimap_mapblock);
+
+                       if (r.ack_block_to_server) {
                                /*
                                        Acknowledge block
                                        [0] u8 count
@@ -560,7 +526,7 @@ void Client::step(float dtime)
                        }
                }
 
-               if(num_processed_meshes > 0)
+               if (num_processed_meshes > 0)
                        g_profiler->graphAdd("num_processed_meshes", num_processed_meshes);
        }
 
@@ -570,7 +536,6 @@ void Client::step(float dtime)
        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;
                }
@@ -594,7 +559,7 @@ void Client::step(float dtime)
                {
                        // Do this every <interval> seconds after TOCLIENT_INVENTORY
                        // Reset the locally changed inventory to the authoritative inventory
-                       Player *player = m_env.getLocalPlayer();
+                       LocalPlayer *player = m_env.getLocalPlayer();
                        player->inventory = *m_inventory_from_server;
                        m_inventory_updated = true;
                }
@@ -604,10 +569,8 @@ void Client::step(float dtime)
                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++)
-               {
+               for(std::unordered_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);
@@ -626,12 +589,11 @@ void Client::step(float dtime)
                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();
+               for (std::unordered_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++;
+                       ++i;
                        if(!m_sound->soundExists(client_id)) {
                                m_sounds_server_to_client.erase(server_id);
                                m_sounds_client_to_server.erase(client_id);
@@ -646,6 +608,18 @@ void Client::step(float dtime)
                }
        }
 
+       m_mod_storage_save_timer -= dtime;
+       if (m_mod_storage_save_timer <= 0.0f) {
+               verbosestream << "Saving registered mod storages." << std::endl;
+               m_mod_storage_save_timer = g_settings->getFloat("server_map_save_interval");
+               for (std::unordered_map<std::string, ModMetadata *>::const_iterator
+                               it = m_mod_storages.begin(); it != m_mod_storages.end(); ++it) {
+                       if (it->second->isModified()) {
+                               it->second->save(getModStoragePath());
+                       }
+               }
+       }
+
        // Write server map
        if (m_localdb && m_localdb_save_interval.step(dtime,
                        m_cache_save_interval)) {
@@ -735,14 +709,19 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 // 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.");
+       }
 }
 
 /*
@@ -777,14 +756,6 @@ void Client::request_media(const std::vector<std::string> &file_requests)
                        << 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)
@@ -796,19 +767,19 @@ void Client::initLocalMapSaving(const Address &address,
        const std::string world_path = porting::path_user
                + DIR_DELIM + "worlds"
                + DIR_DELIM + "server_"
-               + hostname + "_" + to_string(address.getPort());
+               + hostname + "_" + std::to_string(address.getPort());
 
        fs::CreateAllDirs(world_path);
 
-       m_localdb = new Database_SQLite3(world_path);
+       m_localdb = new MapDatabaseSQLite3(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);
-       u32 start_ms = porting::getTimeMs();
+       DSTACK(FUNCTION_NAME);
+       u64 start_ms = porting::getTimeMs();
        for(;;)
        {
                // Limit time even if there would be huge amounts of data to
@@ -833,7 +804,7 @@ void Client::ReceiveAll()
 
 void Client::Receive()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
        NetworkPacket pkt;
        m_con.Receive(&pkt);
        ProcessData(&pkt);
@@ -850,7 +821,7 @@ inline void Client::handleCommand(NetworkPacket* pkt)
 */
 void Client::ProcessData(NetworkPacket *pkt)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        ToClientCommand command = (ToClientCommand) pkt->getCommand();
        u32 sender_peer_id = pkt->getPeerId();
@@ -873,6 +844,7 @@ void Client::ProcessData(NetworkPacket *pkt)
        if (command >= TOCLIENT_NUM_MSG_TYPES) {
                infostream << "Client: Ignoring unknown command "
                        << command << std::endl;
+               return;
        }
 
        /*
@@ -907,6 +879,36 @@ void Client::Send(NetworkPacket* pkt)
                serverCommandFactoryTable[pkt->getCommand()].reliable);
 }
 
+// Will fill up 12 + 12 + 4 + 4 + 4 bytes
+void writePlayerPos(LocalPlayer *myplayer, ClientMap *clientMap, NetworkPacket *pkt)
+{
+       v3f pf           = myplayer->getPosition() * 100;
+       v3f sf           = myplayer->getSpeed() * 100;
+       s32 pitch        = myplayer->getPitch() * 100;
+       s32 yaw          = myplayer->getYaw() * 100;
+       u32 keyPressed   = myplayer->keyPressed;
+       // scaled by 80, so that pi can fit into a u8
+       u8 fov           = clientMap->getCameraFov() * 80;
+       u8 wanted_range  = MYMIN(255,
+                       std::ceil(clientMap->getControl().wanted_range / MAP_BLOCKSIZE));
+
+       v3s32 position(pf.X, pf.Y, pf.Z);
+       v3s32 speed(sf.X, sf.Y, sf.Z);
+
+       /*
+               Format:
+               [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
+               [12+12+4+4+4] u8 fov*80
+               [12+12+4+4+4+1] u8 ceil(wanted_range / MAP_BLOCKSIZE)
+       */
+       *pkt << position << speed << pitch << yaw << keyPressed;
+       *pkt << fov << wanted_range;
+}
+
 void Client::interact(u8 action, const PointedThing& pointed)
 {
        if(m_state != LC_Ready) {
@@ -916,18 +918,24 @@ void Client::interact(u8 action, const PointedThing& pointed)
                return;
        }
 
+       LocalPlayer *myplayer = m_env.getLocalPlayer();
+       if (myplayer == NULL)
+               return;
+
        /*
                [0] u16 command
                [2] u8 action
                [3] u16 item
-               [5] u32 length of the next item
+               [5] u32 length of the next item (plen)
                [9] serialized PointedThing
+               [9 + plen] player position information
                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
+               5: perform secondary action of item
        */
 
        NetworkPacket pkt(TOSERVER_INTERACT, 1 + 2 + 0);
@@ -940,22 +948,127 @@ void Client::interact(u8 action, const PointedThing& pointed)
 
        pkt.putLongString(tmp_os.str());
 
+       writePlayerPos(myplayer, &m_env.getClientMap(), &pkt);
+
        Send(&pkt);
 }
 
+void Client::deleteAuthData()
+{
+       if (!m_auth_data)
+               return;
+
+       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;
+       }
+       m_chosen_auth_mech = AUTH_MECHANISM_NONE;
+}
+
+
+AuthMechanism Client::choseAuthMech(const u32 mechs)
+{
+       if (mechs & AUTH_MECHANISM_SRP)
+               return AUTH_MECHANISM_SRP;
+
+       if (mechs & AUTH_MECHANISM_FIRST_SRP)
+               return AUTH_MECHANISM_FIRST_SRP;
+
+       if (mechs & AUTH_MECHANISM_LEGACY_PASSWORD)
+               return AUTH_MECHANISM_LEGACY_PASSWORD;
+
+       return AUTH_MECHANISM_NONE;
+}
+
 void Client::sendLegacyInit(const char* playerName, const char* playerPassword)
 {
        NetworkPacket pkt(TOSERVER_INIT_LEGACY,
                        1 + PLAYERNAME_SIZE + PASSWORD_SIZE + 2 + 2);
 
+       u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
+               CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
+
        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;
+       pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX;
 
        Send(&pkt);
 }
 
+void Client::sendInit(const std::string &playerName)
+{
+       NetworkPacket pkt(TOSERVER_INIT, 1 + 2 + 2 + (1 + playerName.size()));
+
+       // we don't support network compression yet
+       u16 supp_comp_modes = NETPROTO_COMPRESSION_NONE;
+
+       u16 proto_version_min = g_settings->getFlag("send_pre_v25_init") ?
+               CLIENT_PROTOCOL_VERSION_MIN_LEGACY : CLIENT_PROTOCOL_VERSION_MIN;
+
+       pkt << (u8) SER_FMT_VER_HIGHEST_READ << (u16) supp_comp_modes;
+       pkt << (u16) proto_version_min << (u16) CLIENT_PROTOCOL_VERSION_MAX;
+       pkt << playerName;
+
+       Send(&pkt);
+}
+
+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
+                       std::string verifier;
+                       std::string salt;
+                       generate_srp_verifier_and_salt(getPlayerName(), m_password,
+                               &verifier, &salt);
+
+                       NetworkPacket resp_pkt(TOSERVER_FIRST_SRP, 0);
+                       resp_pkt << salt << verifier << (u8)((m_password == "") ? 1 : 0);
+
+                       Send(&resp_pkt);
+                       break;
+               }
+               case AUTH_MECHANISM_SRP:
+               case AUTH_MECHANISM_LEGACY_PASSWORD: {
+                       u8 based_on = 1;
+
+                       if (chosen_auth_mechanism == AUTH_MECHANISM_LEGACY_PASSWORD) {
+                               m_password = translate_password(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
+       }
+}
+
 void Client::sendDeletedBlocks(std::vector<v3s16> &blocks)
 {
        NetworkPacket pkt(TOSERVER_DELETEDBLOCKS, 1 + sizeof(v3s16) * blocks.size());
@@ -990,14 +1103,14 @@ void Client::sendRemovedSounds(std::vector<s32> &soundList)
        pkt << (u16) (server_ids & 0xFFFF);
 
        for(std::vector<s32>::iterator i = soundList.begin();
-                       i != soundList.end(); i++)
+                       i != soundList.end(); ++i)
                pkt << *i;
 
        Send(&pkt);
 }
 
 void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
-               const std::map<std::string, std::string> &fields)
+               const StringMap &fields)
 {
        size_t fields_size = fields.size();
 
@@ -1007,10 +1120,10 @@ void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
 
        pkt << p << formname << (u16) (fields_size & 0xFFFF);
 
-       for(std::map<std::string, std::string>::const_iterator
-                       i = fields.begin(); i != fields.end(); i++) {
-               const std::string &name = i->first;
-               const std::string &value = i->second;
+       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);
        }
@@ -1019,7 +1132,7 @@ void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
 }
 
 void Client::sendInventoryFields(const std::string &formname,
-               const std::map<std::string, std::string> &fields)
+               const StringMap &fields)
 {
        size_t fields_size = fields.size();
        FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields");
@@ -1027,10 +1140,10 @@ void Client::sendInventoryFields(const std::string &formname,
        NetworkPacket pkt(TOSERVER_INVENTORY_FIELDS, 0);
        pkt << formname << (u16) (fields_size & 0xFFFF);
 
-       for(std::map<std::string, std::string>::const_iterator
-                       i = fields.begin(); i != fields.end(); i++) {
-               const std::string &name  = i->first;
-               const std::string &value = i->second;
+       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);
        }
@@ -1053,43 +1166,86 @@ void Client::sendInventoryAction(InventoryAction *a)
        Send(&pkt);
 }
 
+bool Client::canSendChatMessage() const
+{
+       u32 now = time(NULL);
+       float time_passed = now - m_last_chat_message_sent;
+
+       float virt_chat_message_allowance = m_chat_message_allowance + time_passed *
+                       (CLIENT_CHAT_MESSAGE_LIMIT_PER_10S / 8.0f);
+
+       if (virt_chat_message_allowance < 1.0f)
+               return false;
+
+       return true;
+}
+
 void Client::sendChatMessage(const std::wstring &message)
 {
-       NetworkPacket pkt(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16));
+       const s16 max_queue_size = g_settings->getS16("max_out_chat_queue_size");
+       if (canSendChatMessage()) {
+               u32 now = time(NULL);
+               float time_passed = now - m_last_chat_message_sent;
+               m_last_chat_message_sent = time(NULL);
 
-       pkt << message;
+               m_chat_message_allowance += time_passed * (CLIENT_CHAT_MESSAGE_LIMIT_PER_10S / 8.0f);
+               if (m_chat_message_allowance > CLIENT_CHAT_MESSAGE_LIMIT_PER_10S)
+                       m_chat_message_allowance = CLIENT_CHAT_MESSAGE_LIMIT_PER_10S;
 
-       Send(&pkt);
+               m_chat_message_allowance -= 1.0f;
+
+               NetworkPacket pkt(TOSERVER_CHAT_MESSAGE, 2 + message.size() * sizeof(u16));
+
+               pkt << message;
+
+               Send(&pkt);
+       } else if (m_out_chat_queue.size() < (u16) max_queue_size || max_queue_size == -1) {
+               m_out_chat_queue.push(message);
+       } else {
+               infostream << "Could not queue chat message because maximum out chat queue size ("
+                               << max_queue_size << ") is reached." << std::endl;
+       }
+}
+
+void Client::clearOutChatQueue()
+{
+       m_out_chat_queue = std::queue<std::wstring>();
 }
 
-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)
+       LocalPlayer *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);
+       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 = translate_password(playername, oldpassword);
+               std::string newpwd = translate_password(playername, newpassword);
 
-       NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE);
+               NetworkPacket pkt(TOSERVER_PASSWORD_LEGACY, 2 * PASSWORD_SIZE);
 
-       for(u8 i = 0; i < PASSWORD_SIZE; i++) {
-               pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0);
-       }
+               for (u8 i = 0; i < PASSWORD_SIZE; i++) {
+                       pkt << (u8) (i < oldpwd.length() ? oldpwd[i] : 0);
+               }
 
-       for(u8 i = 0; i < PASSWORD_SIZE; i++) {
-               pkt << (u8) (i < newpwd.length() ? newpwd[i] : 0);
+               for (u8 i = 0; i < PASSWORD_SIZE; i++) {
+                       pkt << (u8) (i < newpwd.length() ? newpwd[i] : 0);
+               }
+               Send(&pkt);
        }
-
-       Send(&pkt);
 }
 
 
 void Client::sendDamage(u8 damage)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_DAMAGE, sizeof(u8));
        pkt << damage;
@@ -1098,7 +1254,11 @@ void Client::sendDamage(u8 damage)
 
 void Client::sendBreath(u16 breath)
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
+
+       // Protocol v29 make this obsolete
+       if (m_proto_ver >= 29)
+               return;
 
        NetworkPacket pkt(TOSERVER_BREATH, sizeof(u16));
        pkt << breath;
@@ -1107,7 +1267,7 @@ void Client::sendBreath(u16 breath)
 
 void Client::sendRespawn()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_RESPAWN, 0);
        Send(&pkt);
@@ -1115,7 +1275,7 @@ void Client::sendRespawn()
 
 void Client::sendReady()
 {
-       DSTACK(__FUNCTION_NAME);
+       DSTACK(FUNCTION_NAME);
 
        NetworkPacket pkt(TOSERVER_CLIENT_READY,
                        1 + 1 + 1 + 1 + 2 + sizeof(char) * strlen(g_version_hash));
@@ -1133,23 +1293,34 @@ void Client::sendPlayerPos()
        if(myplayer == NULL)
                return;
 
+       ClientMap &map = m_env.getClientMap();
+
+       u8 camera_fov    = map.getCameraFov();
+       u8 wanted_range  = map.getControl().wanted_range;
+
        // 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)
+                       myplayer->last_speed        == myplayer->getSpeed()    &&
+                       myplayer->last_pitch        == myplayer->getPitch()    &&
+                       myplayer->last_yaw          == myplayer->getYaw()      &&
+                       myplayer->last_keyPressed   == myplayer->keyPressed    &&
+                       myplayer->last_camera_fov   == camera_fov              &&
+                       myplayer->last_wanted_range == wanted_range)
                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;
+       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;
+       myplayer->last_camera_fov   = camera_fov;
+       myplayer->last_wanted_range = wanted_range;
+
+       //infostream << "Sending Player Position information" << std::endl;
 
        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();
        }
 
@@ -1159,33 +1330,16 @@ void Client::sendPlayerPos()
 
        assert(myplayer->peer_id == our_peer_id);
 
-       v3f pf         = myplayer->getPosition();
-       v3f sf         = myplayer->getSpeed();
-       s32 pitch      = myplayer->getPitch() * 100;
-       s32 yaw        = myplayer->getYaw() * 100;
-       u32 keyPressed = myplayer->keyPressed;
+       NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4 + 1 + 1);
 
-       v3s32 position(pf.X*100, pf.Y*100, pf.Z*100);
-       v3s32 speed(sf.X*100, sf.Y*100, sf.Z*100);
-       /*
-               Format:
-               [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
-       */
-
-       NetworkPacket pkt(TOSERVER_PLAYERPOS, 12 + 12 + 4 + 4 + 4);
-
-       pkt << position << speed << pitch << yaw << keyPressed;
+       writePlayerPos(myplayer, &map, &pkt);
 
        Send(&pkt);
 }
 
 void Client::sendPlayerItem(u16 item)
 {
-       Player *myplayer = m_env.getLocalPlayer();
+       LocalPlayer *myplayer = m_env.getLocalPlayer();
        if(myplayer == NULL)
                return;
 
@@ -1220,6 +1374,11 @@ void Client::removeNode(v3s16 p)
        }
 }
 
+MapNode Client::getNode(v3s16 p, bool *is_valid_position)
+{
+       return m_env.getMap().getNodeNoEx(p, is_valid_position);
+}
+
 void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)
 {
        //TimeTaker timer1("Client::addNode()");
@@ -1266,7 +1425,7 @@ bool Client::getLocalInventoryUpdated()
 // Copies the inventory of the local player to parameter
 void Client::getLocalInventory(Inventory &dst)
 {
-       Player *player = m_env.getLocalPlayer();
+       LocalPlayer *player = m_env.getLocalPlayer();
        assert(player != NULL);
        dst = player->inventory;
 }
@@ -1279,15 +1438,16 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
        break;
        case InventoryLocation::CURRENT_PLAYER:
        {
-               Player *player = m_env.getLocalPlayer();
+               LocalPlayer *player = m_env.getLocalPlayer();
                assert(player != NULL);
                return &player->inventory;
        }
        break;
        case InventoryLocation::PLAYER:
        {
-               Player *player = m_env.getPlayer(loc.name.c_str());
-               if(!player)
+               // Check if we are working with local player inventory
+               LocalPlayer *player = m_env.getLocalPlayer();
+               if (!player || strcmp(player->getName(), loc.name.c_str()) != 0)
                        return NULL;
                return &player->inventory;
        }
@@ -1302,7 +1462,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
        break;
        case InventoryLocation::DETACHED:
        {
-               if(m_detached_inventories.count(loc.name) == 0)
+               if (m_detached_inventories.count(loc.name) == 0)
                        return NULL;
                return m_detached_inventories[loc.name];
        }
@@ -1330,49 +1490,6 @@ void Client::inventoryAction(InventoryAction *a)
        delete a;
 }
 
-ClientActiveObject * Client::getSelectedActiveObject(
-               f32 max_d,
-               v3f from_pos_f_on_map,
-               core::line3d<f32> shootline_on_map
-       )
-{
-       std::vector<DistanceSortedActiveObject> objects;
-
-       m_env.getActiveObjects(from_pos_f_on_map, max_d, objects);
-
-       // Sort them.
-       // After this, the closest object is the first in the array.
-       std::sort(objects.begin(), objects.end());
-
-       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;
-
-               v3f pos = obj->getPosition();
-
-               core::aabbox3d<f32> offsetted_box(
-                               selection_box->MinEdge + pos,
-                               selection_box->MaxEdge + pos
-               );
-
-               if(offsetted_box.intersectsWithLine(shootline_on_map))
-               {
-                       return obj;
-               }
-       }
-
-       return NULL;
-}
-
-std::list<std::string> Client::getConnectedPlayerNames()
-{
-       return m_env.getPlayerNames();
-}
-
 float Client::getAnimationTime()
 {
        return m_animation_time;
@@ -1383,13 +1500,9 @@ int Client::getCrackLevel()
        return m_crack_level;
 }
 
-void Client::setHighlighted(v3s16 pos, bool show_highlighted)
+v3s16 Client::getCrackPos()
 {
-       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);
+       return m_crack_pos;
 }
 
 void Client::setCrack(int level, v3s16 pos)
@@ -1414,18 +1527,11 @@ void Client::setCrack(int level, v3s16 pos)
 
 u16 Client::getHP()
 {
-       Player *player = m_env.getLocalPlayer();
+       LocalPlayer *player = m_env.getLocalPlayer();
        assert(player != NULL);
        return player->hp;
 }
 
-u16 Client::getBreath()
-{
-       Player *player = m_env.getLocalPlayer();
-       assert(player != NULL);
-       return player->getBreath();
-}
-
 bool Client::getChatMessage(std::wstring &message)
 {
        if(m_chat_queue.size() == 0)
@@ -1441,47 +1547,37 @@ void Client::typeChatMessage(const std::wstring &message)
        if(message == L"")
                return;
 
+       // If message was ate by script API, don't send it to server
+       if (m_script->on_sending_message(wide_to_utf8(message))) {
+               return;
+       }
+
        // Send to others
        sendChatMessage(message);
 
        // Show locally
-       if (message[0] == L'/')
+       if (message[0] != L'/')
        {
-               m_chat_queue.push((std::wstring)L"issued command: " + message);
-       }
-       else
-       {
-               LocalPlayer *player = m_env.getLocalPlayer();
-               assert(player != NULL);
-               std::wstring name = narrow_to_wide(player->getName());
-               m_chat_queue.push((std::wstring)L"<" + name + L"> " + message);
+               // compatibility code
+               if (m_proto_ver < 29) {
+                       LocalPlayer *player = m_env.getLocalPlayer();
+                       assert(player != NULL);
+                       std::wstring name = narrow_to_wide(player->getName());
+                       pushToChatQueue((std::wstring)L"<" + name + L"> " + message);
+               }
        }
 }
 
 void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
 {
+       // Check if the block exists to begin with. In the case when a non-existing
+       // neighbor is automatically added, it may not. In that case we don't want
+       // to tell the mesh update thread about it.
        MapBlock *b = m_env.getMap().getBlockNoCreateNoEx(p);
-       if(b == NULL)
+       if (b == NULL)
                return;
 
-       /*
-               Create a task to update the mesh of the block
-       */
-
-       MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders);
-
-       {
-               //TimeTaker timer("data fill");
-               // Release: ~0ms
-               // Debug: 1-6ms, avg=2ms
-               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);
-       }
-
-       // Add task to queue
-       m_mesh_update_thread.m_queue_in.addBlock(p, data, ack_to_server, urgent);
+       m_mesh_update_thread.updateBlock(&m_env.getMap(), p, ack_to_server, urgent);
 }
 
 void Client::addUpdateMeshTaskWithEdge(v3s16 blockpos, bool ack_to_server, bool urgent)
@@ -1547,14 +1643,11 @@ void Client::addUpdateMeshTaskForNode(v3s16 nodepos, bool ack_to_server, bool ur
 
 ClientEvent Client::getClientEvent()
 {
-       ClientEvent event;
-       if(m_client_event_queue.size() == 0) {
-               event.type = CE_NONE;
-       }
-       else {
-               event = m_client_event_queue.front();
-               m_client_event_queue.pop();
-       }
+       FATAL_ERROR_IF(m_client_event_queue.empty(),
+                       "Cannot getClientEvent, queue is empty.");
+
+       ClientEvent event = m_client_event_queue.front();
+       m_client_event_queue.pop();
        return event;
 }
 
@@ -1569,9 +1662,10 @@ float Client::mediaReceiveProgress()
 typedef struct TextureUpdateArgs {
        IrrlichtDevice *device;
        gui::IGUIEnvironment *guienv;
-       u32 last_time_ms;
+       u64 last_time_ms;
        u16 last_percent;
        const wchar_t* text_base;
+       ITextureSource *tsrc;
 } TextureUpdateArgs;
 
 void texture_update_progress(void *args, u32 progress, u32 max_progress)
@@ -1581,10 +1675,10 @@ void texture_update_progress(void *args, u32 progress, u32 max_progress)
 
                // update the loading menu -- if neccessary
                bool do_draw = false;
-               u32 time_ms = targs->last_time_ms;
+               u64 time_ms = targs->last_time_ms;
                if (cur_percent != targs->last_percent) {
                        targs->last_percent = cur_percent;
-                       time_ms = getTimeMs();
+                       time_ms = porting::getTimeMs();
                        // only draw when the user will notice something:
                        do_draw = (time_ms - targs->last_time_ms > 100);
                }
@@ -1593,8 +1687,8 @@ void texture_update_progress(void *args, u32 progress, u32 max_progress)
                        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));
+                       draw_load_screen(strm.str(), targs->device, targs->guienv, targs->tsrc, 0,
+                               72 + (u16) ((18. / 100.) * (double) targs->last_percent), true);
                }
 }
 
@@ -1614,22 +1708,25 @@ void Client::afterContentReceived(IrrlichtDevice *device)
 
        // Rebuild inherited images and recreate textures
        infostream<<"- Rebuilding images and textures"<<std::endl;
-       draw_load_screen(text,device, guienv, 0, 70);
+       draw_load_screen(text,device, guienv, m_tsrc, 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);
+       draw_load_screen(text, device, guienv, m_tsrc, 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);
+       draw_load_screen(text, device, guienv, m_tsrc, 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;
@@ -1639,64 +1736,42 @@ void Client::afterContentReceived(IrrlichtDevice *device)
        TextureUpdateArgs tu_args;
        tu_args.device = device;
        tu_args.guienv = guienv;
-       tu_args.last_time_ms = getTimeMs();
+       tu_args.last_time_ms = porting::getTimeMs();
        tu_args.last_percent = 0;
        tu_args.text_base =  wgettext("Initializing nodes");
+       tu_args.tsrc = m_tsrc;
        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_mesh_update_thread.start();
 
        m_state = LC_Ready;
        sendReady();
+
+       if (g_settings->getBool("enable_client_modding")) {
+               m_script->on_client_ready(m_env.getLocalPlayer());
+               m_script->on_connect();
+       }
+
        text = wgettext("Done!");
-       draw_load_screen(text, device, guienv, 0, 100);
+       draw_load_screen(text, device, guienv, m_tsrc, 0, 100);
        infostream<<"Client::afterContentReceived() done"<<std::endl;
        delete[] text;
 }
 
-float Client::getRTT(void)
+float Client::getRTT()
 {
        return m_con.getPeerStat(PEER_ID_SERVER,con::AVG_RTT);
 }
 
-float Client::getCurRate(void)
+float Client::getCurRate()
 {
-       return ( m_con.getLocalStat(con::CUR_INC_RATE) +
+       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();
@@ -1715,9 +1790,12 @@ void Client::makeScreenshot(IrrlichtDevice *device)
                        + DIR_DELIM
                        + std::string("screenshot_")
                        + std::string(timetstamp_c);
-       std::string filename_ext = ".png";
+       std::string filename_ext = "." + g_settings->get("screenshot_format");
        std::string filename;
 
+       u32 quality = (u32)g_settings->getS32("screenshot_quality");
+       quality = MYMIN(MYMAX(quality, 0), 100) / 100.0 * 255;
+
        // Try to find a unique filename
        unsigned serial = 0;
 
@@ -1739,12 +1817,12 @@ void Client::makeScreenshot(IrrlichtDevice *device)
                        raw_image->copyTo(image);
 
                        std::ostringstream sstr;
-                       if (driver->writeImageToFile(image, filename.c_str())) {
+                       if (driver->writeImageToFile(image, filename.c_str(), quality)) {
                                sstr << "Saved screenshot to '" << filename << "'";
                        } else {
                                sstr << "Failed to save screenshot '" << filename << "'";
                        }
-                       m_chat_queue.push(narrow_to_wide(sstr.str()));
+                       pushToChatQueue(narrow_to_wide(sstr.str()));
                        infostream << sstr.str() << std::endl;
                        image->drop();
                }
@@ -1753,6 +1831,41 @@ void Client::makeScreenshot(IrrlichtDevice *device)
        raw_image->drop();
 }
 
+bool Client::shouldShowMinimap() const
+{
+       return !m_minimap_disabled_by_server;
+}
+
+void Client::showGameChat(const bool show)
+{
+       m_game_ui_flags->show_chat = show;
+}
+
+void Client::showGameHud(const bool show)
+{
+       m_game_ui_flags->show_hud = show;
+}
+
+void Client::showMinimap(const bool show)
+{
+       m_game_ui_flags->show_minimap = show;
+}
+
+void Client::showProfiler(const bool show)
+{
+       m_game_ui_flags->show_profiler_graph = show;
+}
+
+void Client::showGameFog(const bool show)
+{
+       m_game_ui_flags->force_fog_off = !show;
+}
+
+void Client::showGameDebug(const bool show)
+{
+       m_game_ui_flags->show_debug = show;
+}
+
 // IGameDef interface
 // Under envlock
 IItemDefManager* Client::getItemDefManager()
@@ -1804,14 +1917,13 @@ ParticleManager* Client::getParticleManager()
 
 scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
 {
-       std::map<std::string, std::string>::const_iterator i =
-                       m_mesh_data.find(filename);
-       if(i == m_mesh_data.end()){
-               errorstream<<"Client::getMesh(): Mesh not found: \""<<filename<<"\""
-                               <<std::endl;
+       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    = i->second;
+       const std::string &data    = it->second;
        scene::ISceneManager *smgr = m_device->getSceneManager();
 
        // Create the mesh, remove it from cache and return it
@@ -1830,3 +1942,31 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
        smgr->getMeshCache()->removeMesh(mesh);
        return mesh;
 }
+
+bool Client::registerModStorage(ModMetadata *storage)
+{
+       if (m_mod_storages.find(storage->getModName()) != m_mod_storages.end()) {
+               errorstream << "Unable to register same mod storage twice. Storage name: "
+                               << storage->getModName() << std::endl;
+               return false;
+       }
+
+       m_mod_storages[storage->getModName()] = storage;
+       return true;
+}
+
+void Client::unregisterModStorage(const std::string &name)
+{
+       std::unordered_map<std::string, ModMetadata *>::const_iterator it =
+               m_mod_storages.find(name);
+       if (it != m_mod_storages.end()) {
+               // Save unconditionaly on unregistration
+               it->second->save(getModStoragePath());
+               m_mod_storages.erase(name);
+       }
+}
+
+std::string Client::getModStoragePath() const
+{
+       return porting::path_user + DIR_DELIM + "client" + DIR_DELIM + "mod_storage";
+}