]> git.lizzy.rs Git - minetest.git/blobdiff - src/script/lua_api/l_object.cpp
Lua API: Document shader dependencies of set_lighting() (#13079)
[minetest.git] / src / script / lua_api / l_object.cpp
index c7a31d0487d2d30e0f9e223a88012a3ecc62e484..0a3e05907bb60e7e46e978f3d33c3e137d81a2e3 100644 (file)
@@ -18,100 +18,61 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "lua_api/l_object.h"
+#include <cmath>
 #include "lua_api/l_internal.h"
 #include "lua_api/l_inventory.h"
 #include "lua_api/l_item.h"
+#include "lua_api/l_playermeta.h"
 #include "common/c_converter.h"
 #include "common/c_content.h"
 #include "log.h"
 #include "tool.h"
-#include "serverobject.h"
-#include "content_sao.h"
+#include "remoteplayer.h"
 #include "server.h"
 #include "hud.h"
 #include "scripting_server.h"
-
-struct EnumString es_HudElementType[] =
-{
-       {HUD_ELEM_IMAGE,     "image"},
-       {HUD_ELEM_TEXT,      "text"},
-       {HUD_ELEM_STATBAR,   "statbar"},
-       {HUD_ELEM_INVENTORY, "inventory"},
-       {HUD_ELEM_WAYPOINT,  "waypoint"},
-{0, NULL},
-};
-
-struct EnumString es_HudElementStat[] =
-{
-       {HUD_STAT_POS,    "position"},
-       {HUD_STAT_POS,    "pos"}, /* Deprecated, only for compatibility's sake */
-       {HUD_STAT_NAME,   "name"},
-       {HUD_STAT_SCALE,  "scale"},
-       {HUD_STAT_TEXT,   "text"},
-       {HUD_STAT_NUMBER, "number"},
-       {HUD_STAT_ITEM,   "item"},
-       {HUD_STAT_DIR,    "direction"},
-       {HUD_STAT_ALIGN,  "alignment"},
-       {HUD_STAT_OFFSET, "offset"},
-       {HUD_STAT_WORLD_POS, "world_pos"},
-       {0, NULL},
-};
-
-struct EnumString es_HudBuiltinElement[] =
-{
-       {HUD_FLAG_HOTBAR_VISIBLE,    "hotbar"},
-       {HUD_FLAG_HEALTHBAR_VISIBLE, "healthbar"},
-       {HUD_FLAG_CROSSHAIR_VISIBLE, "crosshair"},
-       {HUD_FLAG_WIELDITEM_VISIBLE, "wielditem"},
-       {HUD_FLAG_BREATHBAR_VISIBLE, "breathbar"},
-       {HUD_FLAG_MINIMAP_VISIBLE,   "minimap"},
-       {0, NULL},
-};
+#include "server/luaentity_sao.h"
+#include "server/player_sao.h"
+#include "server/serverinventorymgr.h"
 
 /*
        ObjectRef
 */
 
 
-ObjectRef* ObjectRef::checkobject(lua_State *L, int narg)
-{
-       luaL_checktype(L, narg, LUA_TUSERDATA);
-       void *ud = luaL_checkudata(L, narg, className);
-       if (!ud) luaL_typerror(L, narg, className);
-       return *(ObjectRef**)ud;  // unbox pointer
-}
-
 ServerActiveObject* ObjectRef::getobject(ObjectRef *ref)
 {
-       ServerActiveObject *co = ref->m_object;
-       return co;
+       ServerActiveObject *sao = ref->m_object;
+       if (sao && sao->isGone())
+               return nullptr;
+       return sao;
 }
 
 LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 {
-       ServerActiveObject *obj = getobject(ref);
-       if (obj == NULL)
-               return NULL;
-       if (obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
-               return NULL;
-       return (LuaEntitySAO*)obj;
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return nullptr;
+       if (sao->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
+               return nullptr;
+       return (LuaEntitySAO*)sao;
 }
 
 PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 {
-       ServerActiveObject *obj = getobject(ref);
-       if (obj == NULL)
-               return NULL;
-       if (obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
-               return NULL;
-       return (PlayerSAO*)obj;
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return nullptr;
+       if (sao->getType() != ACTIVEOBJECT_TYPE_PLAYER)
+               return nullptr;
+       return (PlayerSAO*)sao;
 }
 
 RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
        PlayerSAO *playersao = getplayersao(ref);
-       if (playersao == NULL)
-               return NULL;
+       if (playersao == nullptr)
+               return nullptr;
        return playersao->getPlayer();
 }
 
@@ -119,9 +80,8 @@ RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 
 // garbage collector
 int ObjectRef::gc_object(lua_State *L) {
-       ObjectRef *o = *(ObjectRef **)(lua_touserdata(L, 1));
-       //infostream<<"ObjectRef::gc_object: o="<<o<<std::endl;
-       delete o;
+       ObjectRef *obj = *(ObjectRef **)(lua_touserdata(L, 1));
+       delete obj;
        return 0;
 }
 
@@ -130,42 +90,31 @@ int ObjectRef::l_remove(lua_State *L)
 {
        GET_ENV_PTR;
 
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+       if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER)
                return 0;
 
-       const UNORDERED_SET<int> &child_ids = co->getAttachmentChildIds();
-       UNORDERED_SET<int>::const_iterator it;
-       for (it = child_ids.begin(); it != child_ids.end(); ++it) {
-               // Child can be NULL if it was deleted earlier
-               if (ServerActiveObject *child = env->getActiveObject(*it))
-                       child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
-       }
+       sao->clearChildAttachments();
+       sao->clearParentAttachment();
 
-       verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
-       co->m_removed = true;
+       verbosestream << "ObjectRef::l_remove(): id=" << sao->getId() << std::endl;
+       sao->markForRemoval();
        return 0;
 }
 
 // get_pos(self)
-// returns: {x=num, y=num, z=num}
 int ObjectRef::l_get_pos(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       v3f pos = co->getBasePosition() / BS;
-       lua_newtable(L);
-       lua_pushnumber(L, pos.X);
-       lua_setfield(L, -2, "x");
-       lua_pushnumber(L, pos.Y);
-       lua_setfield(L, -2, "y");
-       lua_pushnumber(L, pos.Z);
-       lua_setfield(L, -2, "z");
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       push_v3f(L, sao->getBasePosition() / BS);
        return 1;
 }
 
@@ -173,31 +122,30 @@ int ObjectRef::l_get_pos(lua_State *L)
 int ObjectRef::l_set_pos(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       //LuaEntitySAO *co = getluaobject(ref);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // pos
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
        v3f pos = checkFloatPos(L, 2);
-       // Do it
-       co->setPos(pos);
+
+       sao->setPos(pos);
        return 0;
 }
 
-// move_to(self, pos, continuous=false)
+// move_to(self, pos, continuous)
 int ObjectRef::l_move_to(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       //LuaEntitySAO *co = getluaobject(ref);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // pos
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
        v3f pos = checkFloatPos(L, 2);
-       // continuous
-       bool continuous = lua_toboolean(L, 3);
-       // Do it
-       co->moveTo(pos, continuous);
+       bool continuous = readParam<bool>(L, 3);
+
+       sao->moveTo(pos, continuous);
        return 0;
 }
 
@@ -205,97 +153,85 @@ int ObjectRef::l_move_to(lua_State *L)
 int ObjectRef::l_punch(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ObjectRef *puncher_ref = checkobject(L, 2);
-       ServerActiveObject *co = getobject(ref);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ObjectRef *puncher_ref = checkObject<ObjectRef>(L, 2);
+       ServerActiveObject *sao = getobject(ref);
        ServerActiveObject *puncher = getobject(puncher_ref);
-       if (co == NULL) return 0;
-       if (puncher == NULL) return 0;
-       v3f dir;
-       if (lua_type(L, 5) != LUA_TTABLE)
-               dir = co->getBasePosition() - puncher->getBasePosition();
-       else
-               dir = read_v3f(L, 5);
-       float time_from_last_punch = 1000000;
-       if (lua_isnumber(L, 3))
-               time_from_last_punch = lua_tonumber(L, 3);
+       if (sao == nullptr || puncher == nullptr)
+               return 0;
+
+       float time_from_last_punch = readParam<float>(L, 3, 1000000.0f);
        ToolCapabilities toolcap = read_tool_capabilities(L, 4);
+       v3f dir = readParam<v3f>(L, 5, sao->getBasePosition() - puncher->getBasePosition());
        dir.normalize();
 
-       s16 src_original_hp = co->getHP();
-       s16 dst_origin_hp = puncher->getHP();
-
-       // Do it
-       co->punch(dir, &toolcap, puncher, time_from_last_punch);
-
-       // If the punched is a player, and its HP changed
-       if (src_original_hp != co->getHP() &&
-                       co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
-       }
+       u32 wear = sao->punch(dir, &toolcap, puncher, time_from_last_punch);
+       lua_pushnumber(L, wear);
 
-       // If the puncher is a player, and its HP changed
-       if (dst_origin_hp != puncher->getHP() &&
-                       puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)puncher);
-       }
-       return 0;
+       return 1;
 }
 
-// right_click(self, clicker); clicker = an another ObjectRef
+// right_click(self, clicker)
 int ObjectRef::l_right_click(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ObjectRef *ref2 = checkobject(L, 2);
-       ServerActiveObject *co = getobject(ref);
-       ServerActiveObject *co2 = getobject(ref2);
-       if (co == NULL) return 0;
-       if (co2 == NULL) return 0;
-       // Do it
-       co->rightClick(co2);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ObjectRef *ref2 = checkObject<ObjectRef>(L, 2);
+       ServerActiveObject *sao = getobject(ref);
+       ServerActiveObject *sao2 = getobject(ref2);
+       if (sao == nullptr || sao2 == nullptr)
+               return 0;
+
+       sao->rightClick(sao2);
        return 0;
 }
 
-// set_hp(self, hp)
-// hp = number of hitpoints (2 * number of hearts)
-// returns: nil
+// set_hp(self, hp, reason)
 int ObjectRef::l_set_hp(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       luaL_checknumber(L, 2);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       int hp = lua_tonumber(L, 2);
-       /*infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
-                       <<" hp="<<hp<<std::endl;*/
-       // Do it
-       co->setHP(hp);
-       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
-               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       int hp = readParam<float>(L, 2);
+       PlayerHPChangeReason reason(PlayerHPChangeReason::SET_HP);
+
+       reason.from_mod = true;
+       if (lua_istable(L, 3)) {
+               lua_pushvalue(L, 3);
+
+               lua_getfield(L, -1, "type");
+               if (lua_isstring(L, -1) &&
+                               !reason.setTypeFromString(readParam<std::string>(L, -1))) {
+                       errorstream << "Bad type given!" << std::endl;
+               }
+               lua_pop(L, 1);
+
+               reason.lua_reference = luaL_ref(L, LUA_REGISTRYINDEX);
+       }
 
-       // Return
+       sao->setHP(hp, reason);
+       if (reason.hasLuaReference())
+               luaL_unref(L, LUA_REGISTRYINDEX, reason.lua_reference);
        return 0;
 }
 
 // get_hp(self)
-// returns: number of hitpoints (2 * number of hearts)
-// 0 if not applicable to this type of object
 int ObjectRef::l_get_hp(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) {
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr) {
                // Default hp is 1
                lua_pushnumber(L, 1);
                return 1;
        }
-       int hp = co->getHP();
-       /*infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
-                       <<" hp="<<hp<<std::endl;*/
-       // Return
+
+       int hp = sao->getHP();
+
        lua_pushnumber(L, hp);
        return 1;
 }
@@ -304,12 +240,13 @@ int ObjectRef::l_get_hp(lua_State *L)
 int ObjectRef::l_get_inventory(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       InventoryLocation loc = co->getInventoryLocation();
-       if (getServer(L)->getInventory(loc) != NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       InventoryLocation loc = sao->getInventoryLocation();
+       if (getServerInventoryMgr(L)->getInventory(loc) != nullptr)
                InvRef::create(L, loc);
        else
                lua_pushnil(L); // An object may have no inventory (nil)
@@ -320,11 +257,12 @@ int ObjectRef::l_get_inventory(lua_State *L)
 int ObjectRef::l_get_wield_list(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushstring(L, co->getWieldList().c_str());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       lua_pushstring(L, sao->getWieldList().c_str());
        return 1;
 }
 
@@ -332,11 +270,12 @@ int ObjectRef::l_get_wield_list(lua_State *L)
 int ObjectRef::l_get_wield_index(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushinteger(L, co->getWieldIndex() + 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       lua_pushinteger(L, sao->getWieldIndex() + 1);
        return 1;
 }
 
@@ -344,30 +283,34 @@ int ObjectRef::l_get_wield_index(lua_State *L)
 int ObjectRef::l_get_wielded_item(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) {
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr) {
                // Empty ItemStack
                LuaItemStack::create(L, ItemStack());
                return 1;
        }
-       // Do it
-       LuaItemStack::create(L, co->getWieldedItem());
+
+       ItemStack selected_item;
+       sao->getWieldedItem(&selected_item, nullptr);
+       LuaItemStack::create(L, selected_item);
        return 1;
 }
 
-// set_wielded_item(self, itemstack or itemstring or table or nil)
+// set_wielded_item(self, item)
 int ObjectRef::l_set_wielded_item(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
        ItemStack item = read_item(L, 2, getServer(L)->idef());
-       bool success = co->setWieldedItem(item);
-       if (success && co->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
-               getServer(L)->SendInventory(((PlayerSAO*)co));
+
+       bool success = sao->setWieldedItem(item);
+       if (success && sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               getServer(L)->SendInventory((PlayerSAO *)sao, true);
        }
        lua_pushboolean(L, success);
        return 1;
@@ -377,13 +320,24 @@ int ObjectRef::l_set_wielded_item(lua_State *L)
 int ObjectRef::l_set_armor_groups(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
        ItemGroupList groups;
+
        read_groups(L, 2, groups);
-       co->setArmorGroups(groups);
+       if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               if (!g_settings->getBool("enable_damage") && !itemgroup_get(groups, "immortal")) {
+                       warningstream << "Mod tried to enable damage for a player, but it's "
+                               "disabled globally. Ignoring." << std::endl;
+                       infostream << script_get_backtrace(L) << std::endl;
+                       groups["immortal"] = 1;
+               }
+       }
+
+       sao->setArmorGroups(groups);
        return 0;
 }
 
@@ -391,78 +345,12 @@ int ObjectRef::l_set_armor_groups(lua_State *L)
 int ObjectRef::l_get_armor_groups(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       // Do it
-       push_groups(L, co->getArmorGroups());
-       return 1;
-}
-
-// set_physics_override(self, physics_override_speed, physics_override_jump,
-//                      physics_override_gravity, sneak, sneak_glitch, new_move)
-int ObjectRef::l_set_physics_override(lua_State *L)
-{
-       NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO *co = (PlayerSAO *) getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       if (lua_istable(L, 2)) {
-               co->m_physics_override_speed = getfloatfield_default(
-                               L, 2, "speed", co->m_physics_override_speed);
-               co->m_physics_override_jump = getfloatfield_default(
-                               L, 2, "jump", co->m_physics_override_jump);
-               co->m_physics_override_gravity = getfloatfield_default(
-                               L, 2, "gravity", co->m_physics_override_gravity);
-               co->m_physics_override_sneak = getboolfield_default(
-                               L, 2, "sneak", co->m_physics_override_sneak);
-               co->m_physics_override_sneak_glitch = getboolfield_default(
-                               L, 2, "sneak_glitch", co->m_physics_override_sneak_glitch);
-               co->m_physics_override_new_move = getboolfield_default(
-                               L, 2, "new_move", co->m_physics_override_new_move);
-               co->m_physics_override_sent = false;
-       } else {
-               // old, non-table format
-               if (!lua_isnil(L, 2)) {
-                       co->m_physics_override_speed = lua_tonumber(L, 2);
-                       co->m_physics_override_sent = false;
-               }
-               if (!lua_isnil(L, 3)) {
-                       co->m_physics_override_jump = lua_tonumber(L, 3);
-                       co->m_physics_override_sent = false;
-               }
-               if (!lua_isnil(L, 4)) {
-                       co->m_physics_override_gravity = lua_tonumber(L, 4);
-                       co->m_physics_override_sent = false;
-               }
-       }
-       return 0;
-}
 
-// get_physics_override(self)
-int ObjectRef::l_get_physics_override(lua_State *L)
-{
-       NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO *co = (PlayerSAO *)getobject(ref);
-       if (co == NULL)
-               return 0;
-       // Do it
-       lua_newtable(L);
-       lua_pushnumber(L, co->m_physics_override_speed);
-       lua_setfield(L, -2, "speed");
-       lua_pushnumber(L, co->m_physics_override_jump);
-       lua_setfield(L, -2, "jump");
-       lua_pushnumber(L, co->m_physics_override_gravity);
-       lua_setfield(L, -2, "gravity");
-       lua_pushboolean(L, co->m_physics_override_sneak);
-       lua_setfield(L, -2, "sneak");
-       lua_pushboolean(L, co->m_physics_override_sneak_glitch);
-       lua_setfield(L, -2, "sneak_glitch");
-       lua_pushboolean(L, co->m_physics_override_new_move);
-       lua_setfield(L, -2, "new_move");
+       push_groups(L, sao->getArmorGroups());
        return 1;
 }
 
@@ -470,23 +358,17 @@ int ObjectRef::l_get_physics_override(lua_State *L)
 int ObjectRef::l_set_animation(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       v2f frames = v2f(1, 1);
-       if (!lua_isnil(L, 2))
-               frames = read_v2f(L, 2);
-       float frame_speed = 15;
-       if (!lua_isnil(L, 3))
-               frame_speed = lua_tonumber(L, 3);
-       float frame_blend = 0;
-       if (!lua_isnil(L, 4))
-               frame_blend = lua_tonumber(L, 4);
-       bool frame_loop = true;
-       if (lua_isboolean(L, 5))
-               frame_loop = lua_toboolean(L, 5);
-       co->setAnimation(frames, frame_speed, frame_blend, frame_loop);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       v2f frame_range   = readParam<v2f>(L,  2, v2f(1, 1));
+       float frame_speed = readParam<float>(L, 3, 15.0f);
+       float frame_blend = readParam<float>(L, 4, 0.0f);
+       bool frame_loop   = readParam<bool>(L, 5, true);
+
+       sao->setAnimation(frame_range, frame_speed, frame_blend, frame_loop);
        return 0;
 }
 
@@ -494,17 +376,17 @@ int ObjectRef::l_set_animation(lua_State *L)
 int ObjectRef::l_get_animation(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       // Do it
-       v2f frames = v2f(1,1);
+
+       v2f frames = v2f(1, 1);
        float frame_speed = 15;
        float frame_blend = 0;
        bool frame_loop = true;
-       co->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
 
+       sao->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
        push_v2f(L, frames);
        lua_pushnumber(L, frame_speed);
        lua_pushnumber(L, frame_blend);
@@ -512,79 +394,66 @@ int ObjectRef::l_get_animation(lua_State *L)
        return 4;
 }
 
-// set_local_animation(self, {stand/idle}, {walk}, {dig}, {walk+dig}, frame_speed)
+// set_local_animation(self, idle, walk, dig, walk_while_dig, frame_speed)
 int ObjectRef::l_set_local_animation(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
-       // Do it
+
        v2s32 frames[4];
        for (int i=0;i<4;i++) {
                if (!lua_isnil(L, 2+1))
                        frames[i] = read_v2s32(L, 2+i);
        }
-       float frame_speed = 30;
-       if (!lua_isnil(L, 6))
-               frame_speed = lua_tonumber(L, 6);
-
-       if (!getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed))
-               return 0;
+       float frame_speed = readParam<float>(L, 6, 30.0f);
 
-       lua_pushboolean(L, true);
+       getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed);
        return 0;
 }
 
 // get_local_animation(self)
 int ObjectRef::l_get_local_animation(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED
-       ObjectRef *ref = checkobject(L, 1);
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
        v2s32 frames[4];
        float frame_speed;
        player->getLocalAnimations(frames, &frame_speed);
 
-       for (int i = 0; i < 4; i++) {
-               push_v2s32(L, frames[i]);
+       for (const v2s32 &frame : frames) {
+               push_v2s32(L, frame);
        }
 
        lua_pushnumber(L, frame_speed);
        return 5;
 }
 
-// set_eye_offset(self, v3f first pv, v3f third pv)
+// set_eye_offset(self, firstperson, thirdperson)
 int ObjectRef::l_set_eye_offset(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
-       // Do it
-       v3f offset_first = v3f(0, 0, 0);
-       v3f offset_third = v3f(0, 0, 0);
 
-       if (!lua_isnil(L, 2))
-               offset_first = read_v3f(L, 2);
-       if (!lua_isnil(L, 3))
-               offset_third = read_v3f(L, 3);
+       v3f offset_first = readParam<v3f>(L, 2, v3f(0, 0, 0));
+       v3f offset_third = readParam<v3f>(L, 3, v3f(0, 0, 0));
 
        // Prevent abuse of offset values (keep player always visible)
        offset_third.X = rangelim(offset_third.X,-10,10);
        offset_third.Z = rangelim(offset_third.Z,-5,5);
-       /* TODO: if possible: improve the camera colision detetion to allow Y <= -1.5) */
+       /* TODO: if possible: improve the camera collision detection to allow Y <= -1.5) */
        offset_third.Y = rangelim(offset_third.Y,-10,15); //1.5*BS
 
-       if (!getServer(L)->setPlayerEyeOffset(player, offset_first, offset_third))
-               return 0;
-
-       lua_pushboolean(L, true);
+       getServer(L)->setPlayerEyeOffset(player, offset_first, offset_third);
        return 0;
 }
 
@@ -592,34 +461,67 @@ int ObjectRef::l_set_eye_offset(lua_State *L)
 int ObjectRef::l_get_eye_offset(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
-       // Do it
+
        push_v3f(L, player->eye_offset_first);
        push_v3f(L, player->eye_offset_third);
        return 2;
 }
 
-// set_bone_position(self, std::string bone, v3f position, v3f rotation)
+// send_mapblock(self, pos)
+int ObjectRef::l_send_mapblock(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       v3s16 pos = read_v3s16(L, 2);
+
+       session_t peer_id = player->getPeerId();
+       bool r = getServer(L)->SendBlock(peer_id, pos);
+
+       lua_pushboolean(L, r);
+       return 1;
+}
+
+// set_animation_frame_speed(self, frame_speed)
+int ObjectRef::l_set_animation_frame_speed(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       if (!lua_isnil(L, 2)) {
+               float frame_speed = readParam<float>(L, 2);
+               sao->setAnimationSpeed(frame_speed);
+               lua_pushboolean(L, true);
+       } else {
+               lua_pushboolean(L, false);
+       }
+       return 1;
+}
+
+// set_bone_position(self, bone, position, rotation)
 int ObjectRef::l_set_bone_position(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       std::string bone = "";
-       if (!lua_isnil(L, 2))
-               bone = lua_tostring(L, 2);
-       v3f position = v3f(0, 0, 0);
-       if (!lua_isnil(L, 3))
-               position = check_v3f(L, 3);
-       v3f rotation = v3f(0, 0, 0);
-       if (!lua_isnil(L, 4))
-               rotation = check_v3f(L, 4);
-       co->setBonePosition(bone, position, rotation);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       std::string bone = readParam<std::string>(L, 2, "");
+       v3f position = readParam<v3f>(L, 3, v3f(0, 0, 0));
+       v3f rotation = readParam<v3f>(L, 4, v3f(0, 0, 0));
+
+       sao->setBonePosition(bone, position, rotation);
        return 0;
 }
 
@@ -627,59 +529,54 @@ int ObjectRef::l_set_bone_position(lua_State *L)
 int ObjectRef::l_get_bone_position(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       // Do it
-       std::string bone = "";
-       if (!lua_isnil(L, 2))
-               bone = lua_tostring(L, 2);
+
+       std::string bone = readParam<std::string>(L, 2, "");
 
        v3f position = v3f(0, 0, 0);
        v3f rotation = v3f(0, 0, 0);
-       co->getBonePosition(bone, &position, &rotation);
+       sao->getBonePosition(bone, &position, &rotation);
 
        push_v3f(L, position);
        push_v3f(L, rotation);
        return 2;
 }
 
-// set_attach(self, parent, bone, position, rotation)
+// set_attach(self, parent, bone, position, rotation, force_visible)
 int ObjectRef::l_set_attach(lua_State *L)
 {
        GET_ENV_PTR;
-
-       ObjectRef *ref = checkobject(L, 1);
-       ObjectRef *parent_ref = checkobject(L, 2);
-       ServerActiveObject *co = getobject(ref);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ObjectRef *parent_ref = checkObject<ObjectRef>(L, 2);
+       ServerActiveObject *sao = getobject(ref);
        ServerActiveObject *parent = getobject(parent_ref);
-       if (co == NULL)
+       if (sao == nullptr || parent == nullptr)
                return 0;
-       if (parent == NULL)
-               return 0;
-       // Do it
-       int parent_id = 0;
-       std::string bone = "";
-       v3f position = v3f(0, 0, 0);
-       v3f rotation = v3f(0, 0, 0);
-       co->getAttachment(&parent_id, &bone, &position, &rotation);
+       if (sao == parent)
+               throw LuaError("ObjectRef::set_attach: attaching object to itself is not allowed.");
+
+       int parent_id;
+       std::string bone;
+       v3f position;
+       v3f rotation;
+       bool force_visible;
+
+       sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
        if (parent_id) {
                ServerActiveObject *old_parent = env->getActiveObject(parent_id);
-               old_parent->removeAttachmentChild(co->getId());
+               old_parent->removeAttachmentChild(sao->getId());
        }
 
-       bone = "";
-       if (!lua_isnil(L, 3))
-               bone = lua_tostring(L, 3);
-       position = v3f(0, 0, 0);
-       if (!lua_isnil(L, 4))
-               position = read_v3f(L, 4);
-       rotation = v3f(0, 0, 0);
-       if (!lua_isnil(L, 5))
-               rotation = read_v3f(L, 5);
-       co->setAttachment(parent->getId(), bone, position, rotation);
-       parent->addAttachmentChild(co->getId());
+       bone          = readParam<std::string>(L, 3, "");
+       position      = readParam<v3f>(L, 4, v3f(0, 0, 0));
+       rotation      = readParam<v3f>(L, 5, v3f(0, 0, 0));
+       force_visible = readParam<bool>(L, 6, false);
+
+       sao->setAttachment(parent->getId(), bone, position, rotation, force_visible);
+       parent->addAttachmentChild(sao->getId());
        return 0;
 }
 
@@ -687,54 +584,61 @@ int ObjectRef::l_set_attach(lua_State *L)
 int ObjectRef::l_get_attach(lua_State *L)
 {
        GET_ENV_PTR;
-
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
 
-       // Do it
-       int parent_id = 0;
-       std::string bone = "";
-       v3f position = v3f(0, 0, 0);
-       v3f rotation = v3f(0, 0, 0);
-       co->getAttachment(&parent_id, &bone, &position, &rotation);
-       if (!parent_id)
+       int parent_id;
+       std::string bone;
+       v3f position;
+       v3f rotation;
+       bool force_visible;
+
+       sao->getAttachment(&parent_id, &bone, &position, &rotation, &force_visible);
+       if (parent_id == 0)
                return 0;
-       ServerActiveObject *parent = env->getActiveObject(parent_id);
 
+       ServerActiveObject *parent = env->getActiveObject(parent_id);
        getScriptApiBase(L)->objectrefGetOrCreate(L, parent);
        lua_pushlstring(L, bone.c_str(), bone.size());
        push_v3f(L, position);
        push_v3f(L, rotation);
-       return 4;
+       lua_pushboolean(L, force_visible);
+       return 5;
+}
+
+// get_children(self)
+int ObjectRef::l_get_children(lua_State *L)
+{
+       GET_ENV_PTR;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       const std::unordered_set<int> child_ids = sao->getAttachmentChildIds();
+       int i = 0;
+
+       lua_createtable(L, child_ids.size(), 0);
+       for (const int id : child_ids) {
+               ServerActiveObject *child = env->getActiveObject(id);
+               getScriptApiBase(L)->objectrefGetOrCreate(L, child);
+               lua_rawseti(L, -2, ++i);
+       }
+       return 1;
 }
 
 // set_detach(self)
 int ObjectRef::l_set_detach(lua_State *L)
 {
        GET_ENV_PTR;
-
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
 
-       int parent_id = 0;
-       std::string bone = "";
-       v3f position;
-       v3f rotation;
-       co->getAttachment(&parent_id, &bone, &position, &rotation);
-       ServerActiveObject *parent = NULL;
-       if (parent_id) {
-               parent = env->getActiveObject(parent_id);
-               co->setAttachment(0, "", position, rotation);
-       } else {
-               co->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
-       }
-       // Do it
-       if (parent != NULL)
-               parent->removeAttachmentChild(co->getId());
+       sao->clearParentAttachment();
        return 0;
 }
 
@@ -742,14 +646,18 @@ int ObjectRef::l_set_detach(lua_State *L)
 int ObjectRef::l_set_properties(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
-       ObjectProperties *prop = co->accessObjectProperties();
-       if (!prop)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       read_object_properties(L, 2, prop, getServer(L)->idef());
-       co->notifyObjectPropertiesModified();
+
+       ObjectProperties *prop = sao->accessObjectProperties();
+       if (prop == nullptr)
+               return 0;
+
+       read_object_properties(L, 2, sao, prop, getServer(L)->idef());
+       prop->validate();
+       sao->notifyObjectPropertiesModified();
        return 0;
 }
 
@@ -757,13 +665,15 @@ int ObjectRef::l_set_properties(lua_State *L)
 int ObjectRef::l_get_properties(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       ObjectProperties *prop = co->accessObjectProperties();
-       if (!prop)
+
+       ObjectProperties *prop = sao->accessObjectProperties();
+       if (prop == nullptr)
                return 0;
+
        push_object_properties(L, prop);
        return 1;
 }
@@ -772,9 +682,9 @@ int ObjectRef::l_get_properties(lua_State *L)
 int ObjectRef::l_is_player(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       lua_pushboolean(L, (player != NULL));
+       lua_pushboolean(L, (player != nullptr));
        return 1;
 }
 
@@ -782,13 +692,13 @@ int ObjectRef::l_is_player(lua_State *L)
 int ObjectRef::l_set_nametag_attributes(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       ObjectProperties *prop = co->accessObjectProperties();
-       if (!prop)
+
+       ObjectProperties *prop = sao->accessObjectProperties();
+       if (prop == nullptr)
                return 0;
 
        lua_getfield(L, 2, "color");
@@ -799,49 +709,96 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
        }
        lua_pop(L, 1);
 
-       std::string nametag = getstringfield_default(L, 2, "text", "");
-       prop->nametag = nametag;
+       lua_getfield(L, -1, "bgcolor");
+       if (!lua_isnil(L, -1)) {
+               if (lua_toboolean(L, -1)) {
+                       video::SColor color;
+                       if (read_color(L, -1, &color))
+                               prop->nametag_bgcolor = color;
+               } else {
+                       prop->nametag_bgcolor = nullopt;
+               }
+       }
+       lua_pop(L, 1);
+
+       prop->nametag = getstringfield_default(L, 2, "text", prop->nametag);
 
-       co->notifyObjectPropertiesModified();
-       lua_pushboolean(L, true);
-       return 1;
+       prop->validate();
+       sao->notifyObjectPropertiesModified();
+       return 0;
 }
 
 // get_nametag_attributes(self)
 int ObjectRef::l_get_nametag_attributes(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       ServerActiveObject *co = getobject(ref);
-
-       if (co == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
                return 0;
-       ObjectProperties *prop = co->accessObjectProperties();
+
+       ObjectProperties *prop = sao->accessObjectProperties();
        if (!prop)
                return 0;
 
-       video::SColor color = prop->nametag_color;
-
        lua_newtable(L);
-       push_ARGB8(L, color);
+
+       push_ARGB8(L, prop->nametag_color);
        lua_setfield(L, -2, "color");
+
+       if (prop->nametag_bgcolor) {
+               push_ARGB8(L, prop->nametag_bgcolor.value());
+               lua_setfield(L, -2, "bgcolor");
+       } else {
+               lua_pushboolean(L, false);
+               lua_setfield(L, -2, "bgcolor");
+       }
+
        lua_pushstring(L, prop->nametag.c_str());
        lua_setfield(L, -2, "text");
+
+
+
        return 1;
 }
 
 /* LuaEntitySAO-only */
 
-// set_velocity(self, {x=num, y=num, z=num})
+// set_velocity(self, velocity)
 int ObjectRef::l_set_velocity(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       v3f pos = checkFloatPos(L, 2);
-       // Do it
-       co->setVelocity(pos);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *sao = getluaobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       v3f vel = checkFloatPos(L, 2);
+
+       sao->setVelocity(vel);
+       return 0;
+}
+
+// add_velocity(self, velocity)
+int ObjectRef::l_add_velocity(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       v3f vel = checkFloatPos(L, 2);
+
+       if (sao->getType() == ACTIVEOBJECT_TYPE_LUAENTITY) {
+               LuaEntitySAO *entitysao = dynamic_cast<LuaEntitySAO*>(sao);
+               entitysao->addVelocity(vel);
+       } else if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               PlayerSAO *playersao = dynamic_cast<PlayerSAO*>(sao);
+               playersao->setMaxSpeedOverride(vel);
+               getServer(L)->SendPlayerSpeed(playersao->getPeerID(), vel);
+       }
+
        return 0;
 }
 
@@ -849,26 +806,38 @@ int ObjectRef::l_set_velocity(lua_State *L)
 int ObjectRef::l_get_velocity(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       v3f v = co->getVelocity();
-       pushFloatPos(L, v);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       ServerActiveObject *sao = getobject(ref);
+       if (sao == nullptr)
+               return 0;
+
+       if (sao->getType() == ACTIVEOBJECT_TYPE_LUAENTITY) {
+               LuaEntitySAO *entitysao = dynamic_cast<LuaEntitySAO*>(sao);
+               v3f vel = entitysao->getVelocity();
+               pushFloatPos(L, vel);
+               return 1;
+       } else if (sao->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
+               RemotePlayer *player = dynamic_cast<PlayerSAO*>(sao)->getPlayer();
+               push_v3f(L, player->getSpeed() / BS);
+               return 1;
+       }
+
+       lua_pushnil(L);
        return 1;
 }
 
-// set_acceleration(self, {x=num, y=num, z=num})
+// set_acceleration(self, acceleration)
 int ObjectRef::l_set_acceleration(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // pos
-       v3f pos = checkFloatPos(L, 2);
-       // Do it
-       co->setAcceleration(pos);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       v3f acceleration = checkFloatPos(L, 2);
+
+       entitysao->setAcceleration(acceleration);
        return 0;
 }
 
@@ -876,25 +845,59 @@ int ObjectRef::l_set_acceleration(lua_State *L)
 int ObjectRef::l_get_acceleration(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       v3f v = co->getAcceleration();
-       pushFloatPos(L, v);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       v3f acceleration = entitysao->getAcceleration();
+       pushFloatPos(L, acceleration);
+       return 1;
+}
+
+// set_rotation(self, rotation)
+int ObjectRef::l_set_rotation(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       v3f rotation = check_v3f(L, 2) * core::RADTODEG;
+
+       entitysao->setRotation(rotation);
+       return 0;
+}
+
+// get_rotation(self)
+int ObjectRef::l_get_rotation(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       v3f rotation = entitysao->getRotation() * core::DEGTORAD;
+
+       lua_newtable(L);
+       push_v3f(L, rotation);
        return 1;
 }
 
-// set_yaw(self, radians)
+// set_yaw(self, yaw)
 int ObjectRef::l_set_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
-       // Do it
-       co->setYaw(yaw);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       float yaw = readParam<float>(L, 2) * core::RADTODEG;
+
+       entitysao->setRotation(v3f(0, yaw, 0));
        return 0;
 }
 
@@ -902,11 +905,13 @@ int ObjectRef::l_set_yaw(lua_State *L)
 int ObjectRef::l_get_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       float yaw = co->getYaw() * core::DEGTORAD;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       float yaw = entitysao->getRotation().Y * core::DEGTORAD;
+
        lua_pushnumber(L, yaw);
        return 1;
 }
@@ -915,12 +920,14 @@ int ObjectRef::l_get_yaw(lua_State *L)
 int ObjectRef::l_set_texture_mod(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       std::string mod = luaL_checkstring(L, 2);
-       co->setTextureMod(mod);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       std::string mod = readParam<std::string>(L, 2);
+
+       entitysao->setTextureMod(mod);
        return 0;
 }
 
@@ -928,37 +935,32 @@ int ObjectRef::l_set_texture_mod(lua_State *L)
 int ObjectRef::l_get_texture_mod(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       std::string mod = co->getTextureMod();
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       std::string mod = entitysao->getTextureMod();
+
        lua_pushstring(L, mod.c_str());
        return 1;
 }
 
-// set_sprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
-//           select_horiz_by_yawpitch=false)
+// set_sprite(self, start_frame, num_frames, framelength, select_x_by_camera)
 int ObjectRef::l_set_sprite(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       v2s16 p(0,0);
-       if (!lua_isnil(L, 2))
-               p = read_v2s16(L, 2);
-       int num_frames = 1;
-       if (!lua_isnil(L, 3))
-               num_frames = lua_tonumber(L, 3);
-       float framelength = 0.2;
-       if (!lua_isnil(L, 4))
-               framelength = lua_tonumber(L, 4);
-       bool select_horiz_by_yawpitch = false;
-       if (!lua_isnil(L, 5))
-               select_horiz_by_yawpitch = lua_toboolean(L, 5);
-       co->setSprite(p, num_frames, framelength, select_horiz_by_yawpitch);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       v2s16 start_frame = readParam<v2s16>(L, 2, v2s16(0,0));
+       int num_frames    = readParam<int>(L, 3, 1);
+       float framelength = readParam<float>(L, 4, 0.2f);
+       bool select_x_by_camera = readParam<bool>(L, 5, false);
+
+       entitysao->setSprite(start_frame, num_frames, framelength, select_x_by_camera);
        return 0;
 }
 
@@ -967,13 +969,15 @@ int ObjectRef::l_set_sprite(lua_State *L)
 int ObjectRef::l_get_entity_name(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
        log_deprecated(L,"Deprecated call to \"get_entity_name");
-       if (co == NULL) return 0;
-       // Do it
-       std::string name = co->getName();
-       lua_pushstring(L, name.c_str());
+       if (entitysao == nullptr)
+               return 0;
+
+       std::string name = entitysao->getName();
+
+       lua_pushstring(L, name.c_str());
        return 1;
 }
 
@@ -981,53 +985,29 @@ int ObjectRef::l_get_entity_name(lua_State *L)
 int ObjectRef::l_get_luaentity(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       LuaEntitySAO *co = getluaobject(ref);
-       if (co == NULL) return 0;
-       // Do it
-       luaentity_get(L, co->getId());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       LuaEntitySAO *entitysao = getluaobject(ref);
+       if (entitysao == nullptr)
+               return 0;
+
+       luaentity_get(L, entitysao->getId());
        return 1;
 }
 
 /* Player-only */
 
-// is_player_connected(self)
-int ObjectRef::l_is_player_connected(lua_State *L)
-{
-       NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       RemotePlayer *player = getplayer(ref);
-       lua_pushboolean(L, (player != NULL && player->peer_id != 0));
-       return 1;
-}
-
 // get_player_name(self)
 int ObjectRef::l_get_player_name(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL) {
+       if (player == nullptr) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
-       // Do it
-       lua_pushstring(L, player->getName());
-       return 1;
-}
 
-// get_player_velocity(self)
-int ObjectRef::l_get_player_velocity(lua_State *L)
-{
-       NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       RemotePlayer *player = getplayer(ref);
-       if (player == NULL) {
-               lua_pushnil(L);
-               return 1;
-       }
-       // Do it
-       push_v3f(L, player->getSpeed() / BS);
+       lua_pushstring(L, player->getName());
        return 1;
 }
 
@@ -1035,13 +1015,16 @@ int ObjectRef::l_get_player_velocity(lua_State *L)
 int ObjectRef::l_get_look_dir(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       float pitch = co->getRadPitchDep();
-       float yaw = co->getRadYawDep();
-       v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       float pitch = playersao->getRadLookPitchDep();
+       float yaw = playersao->getRadYawDep();
+       v3f v(std::cos(pitch) * std::cos(yaw), std::sin(pitch), std::cos(pitch) *
+               std::sin(yaw));
+
        push_v3f(L, v);
        return 1;
 }
@@ -1055,11 +1038,12 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
        log_deprecated(L,
                "Deprecated call to get_look_pitch, use get_look_vertical instead");
 
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushnumber(L, co->getRadPitchDep());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       lua_pushnumber(L, playersao->getRadLookPitchDep());
        return 1;
 }
 
@@ -1072,35 +1056,38 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
        log_deprecated(L,
                "Deprecated call to get_look_yaw, use get_look_horizontal instead");
 
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushnumber(L, co->getRadYawDep());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       lua_pushnumber(L, playersao->getRadYawDep());
        return 1;
 }
 
-// get_look_pitch2(self)
+// get_look_vertical(self)
 int ObjectRef::l_get_look_vertical(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushnumber(L, co->getRadPitch());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       lua_pushnumber(L, playersao->getRadLookPitch());
        return 1;
 }
 
-// get_look_yaw2(self)
+// get_look_horizontal(self)
 int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       lua_pushnumber(L, co->getRadYaw());
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       lua_pushnumber(L, playersao->getRadRotation().Y);
        return 1;
 }
 
@@ -1108,26 +1095,30 @@ int ObjectRef::l_get_look_horizontal(lua_State *L)
 int ObjectRef::l_set_look_vertical(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
-       // Do it
-       co->setPitchAndSend(pitch);
-       return 1;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       float pitch = readParam<float>(L, 2) * core::RADTODEG;
+
+       playersao->setLookPitchAndSend(pitch);
+       return 0;
 }
 
 // set_look_horizontal(self, radians)
 int ObjectRef::l_set_look_horizontal(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
-       // Do it
-       co->setYawAndSend(yaw);
-       return 1;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       float yaw = readParam<float>(L, 2) * core::RADTODEG;
+
+       playersao->setPlayerYawAndSend(yaw);
+       return 0;
 }
 
 // DEPRECATED
@@ -1139,13 +1130,15 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
        log_deprecated(L,
                "Deprecated call to set_look_pitch, use set_look_vertical instead.");
 
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
-       // Do it
-       co->setPitchAndSend(pitch);
-       return 1;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       float pitch = readParam<float>(L, 2) * core::RADTODEG;
+
+       playersao->setLookPitchAndSend(pitch);
+       return 0;
 }
 
 // DEPRECATED
@@ -1157,25 +1150,65 @@ int ObjectRef::l_set_look_yaw(lua_State *L)
        log_deprecated(L,
                "Deprecated call to set_look_yaw, use set_look_horizontal instead.");
 
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
-       // Do it
-       co->setYawAndSend(yaw);
-       return 1;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       float yaw = readParam<float>(L, 2) * core::RADTODEG;
+
+       playersao->setPlayerYawAndSend(yaw);
+       return 0;
+}
+
+// set_fov(self, degrees, is_multiplier, transition_time)
+int ObjectRef::l_set_fov(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       float degrees = static_cast<f32>(luaL_checknumber(L, 2));
+       bool is_multiplier = readParam<bool>(L, 3, false);
+       float transition_time = lua_isnumber(L, 4) ?
+               static_cast<f32>(luaL_checknumber(L, 4)) : 0.0f;
+
+       player->setFov({degrees, is_multiplier, transition_time});
+       getServer(L)->SendPlayerFov(player->getPeerId());
+       return 0;
+}
+
+// get_fov(self)
+int ObjectRef::l_get_fov(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       PlayerFovSpec fov_spec = player->getFov();
+
+       lua_pushnumber(L, fov_spec.fov);
+       lua_pushboolean(L, fov_spec.is_multiplier);
+       lua_pushnumber(L, fov_spec.transition_time);
+       return 3;
 }
 
 // set_breath(self, breath)
 int ObjectRef::l_set_breath(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
        u16 breath = luaL_checknumber(L, 2);
-       co->setBreath(breath);
 
+       playersao->setBreath(breath);
        return 0;
 }
 
@@ -1183,30 +1216,34 @@ int ObjectRef::l_set_breath(lua_State *L)
 int ObjectRef::l_get_breath(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) return 0;
-       // Do it
-       u16 breath = co->getBreath();
-       lua_pushinteger (L, breath);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       u16 breath = playersao->getBreath();
+
+       lua_pushinteger(L, breath);
        return 1;
 }
 
 // set_attribute(self, attribute, value)
 int ObjectRef::l_set_attribute(lua_State *L)
 {
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) {
+       log_deprecated(L,
+               "Deprecated call to set_attribute, use MetaDataRef methods instead.");
+
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
                return 0;
-       }
 
        std::string attr = luaL_checkstring(L, 2);
        if (lua_isnil(L, 3)) {
-               co->removeExtendedAttribute(attr);
+               playersao->getMeta().removeString(attr);
        } else {
                std::string value = luaL_checkstring(L, 3);
-               co->setExtendedAttribute(attr, value);
+               playersao->getMeta().setString(attr, value);
        }
        return 1;
 }
@@ -1214,16 +1251,18 @@ int ObjectRef::l_set_attribute(lua_State *L)
 // get_attribute(self, attribute)
 int ObjectRef::l_get_attribute(lua_State *L)
 {
-       ObjectRef *ref = checkobject(L, 1);
-       PlayerSAO* co = getplayersao(ref);
-       if (co == NULL) {
+       log_deprecated(L,
+               "Deprecated call to get_attribute, use MetaDataRef methods instead.");
+
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO* playersao = getplayersao(ref);
+       if (playersao == nullptr)
                return 0;
-       }
 
        std::string attr = luaL_checkstring(L, 2);
 
-       std::string value = "";
-       if (co->getExtendedAttribute(attr, &value)) {
+       std::string value;
+       if (playersao->getMeta().getStringToRef(attr, value)) {
                lua_pushstring(L, value.c_str());
                return 1;
        }
@@ -1232,30 +1271,77 @@ int ObjectRef::l_get_attribute(lua_State *L)
 }
 
 
+// get_meta(self, attribute)
+int ObjectRef::l_get_meta(lua_State *L)
+{
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO *playersao = getplayersao(ref);
+       if (playersao == nullptr)
+               return 0;
+
+       PlayerMetaRef::create(L, &playersao->getMeta());
+       return 1;
+}
+
+
 // set_inventory_formspec(self, formspec)
 int ObjectRef::l_set_inventory_formspec(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL) return 0;
+       if (player == nullptr)
+               return 0;
+
        std::string formspec = luaL_checkstring(L, 2);
 
        player->inventory_formspec = formspec;
        getServer(L)->reportInventoryFormspecModified(player->getName());
-       lua_pushboolean(L, true);
-       return 1;
+       return 0;
 }
 
 // get_inventory_formspec(self) -> formspec
 int ObjectRef::l_get_inventory_formspec(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL) return 0;
+       if (player == nullptr)
+               return 0;
 
        std::string formspec = player->inventory_formspec;
+
+       lua_pushlstring(L, formspec.c_str(), formspec.size());
+       return 1;
+}
+
+// set_formspec_prepend(self, formspec)
+int ObjectRef::l_set_formspec_prepend(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       std::string formspec = luaL_checkstring(L, 2);
+
+       player->formspec_prepend = formspec;
+       getServer(L)->reportFormspecPrependModified(player->getName());
+       return 0;
+}
+
+// get_formspec_prepend(self)
+int ObjectRef::l_get_formspec_prepend(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+                return 0;
+
+       std::string formspec = player->formspec_prepend;
+
        lua_pushlstring(L, formspec.c_str(), formspec.size());
        return 1;
 }
@@ -1264,22 +1350,21 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 int ObjectRef::l_get_player_control(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL) {
-               lua_pushlstring(L, "", 0);
+
+       lua_newtable(L);
+       if (player == nullptr)
                return 1;
-       }
 
        const PlayerControl &control = player->getPlayerControl();
-       lua_newtable(L);
-       lua_pushboolean(L, control.up);
+       lua_pushboolean(L, control.direction_keys & (1 << 0));
        lua_setfield(L, -2, "up");
-       lua_pushboolean(L, control.down);
+       lua_pushboolean(L, control.direction_keys & (1 << 1));
        lua_setfield(L, -2, "down");
-       lua_pushboolean(L, control.left);
+       lua_pushboolean(L, control.direction_keys & (1 << 2));
        lua_setfield(L, -2, "left");
-       lua_pushboolean(L, control.right);
+       lua_pushboolean(L, control.direction_keys & (1 << 3));
        lua_setfield(L, -2, "right");
        lua_pushboolean(L, control.jump);
        lua_setfield(L, -2, "jump");
@@ -1287,10 +1372,17 @@ int ObjectRef::l_get_player_control(lua_State *L)
        lua_setfield(L, -2, "aux1");
        lua_pushboolean(L, control.sneak);
        lua_setfield(L, -2, "sneak");
-       lua_pushboolean(L, control.LMB);
+       lua_pushboolean(L, control.dig);
+       lua_setfield(L, -2, "dig");
+       lua_pushboolean(L, control.place);
+       lua_setfield(L, -2, "place");
+       // Legacy fields to ensure mod compatibility
+       lua_pushboolean(L, control.dig);
        lua_setfield(L, -2, "LMB");
-       lua_pushboolean(L, control.RMB);
+       lua_pushboolean(L, control.place);
        lua_setfield(L, -2, "RMB");
+       lua_pushboolean(L, control.zoom);
+       lua_setfield(L, -2, "zoom");
        return 1;
 }
 
@@ -1298,69 +1390,111 @@ int ObjectRef::l_get_player_control(lua_State *L)
 int ObjectRef::l_get_player_control_bits(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL) {
-               lua_pushlstring(L, "", 0);
+       if (player == nullptr) {
+               lua_pushinteger(L, 0);
                return 1;
        }
-       // Do it
-       lua_pushnumber(L, player->keyPressed);
+
+       const auto &c = player->getPlayerControl();
+
+       // This is very close to PlayerControl::getKeysPressed() but duplicated
+       // here so the encoding in the API is not inadvertedly changed.
+       u32 keypress_bits =
+               c.direction_keys |
+               ( (u32)(c.jump  & 1) << 4) |
+               ( (u32)(c.aux1  & 1) << 5) |
+               ( (u32)(c.sneak & 1) << 6) |
+               ( (u32)(c.dig   & 1) << 7) |
+               ( (u32)(c.place & 1) << 8) |
+               ( (u32)(c.zoom  & 1) << 9)
+       ;
+
+       lua_pushinteger(L, keypress_bits);
        return 1;
 }
 
-// hud_add(self, form)
-int ObjectRef::l_hud_add(lua_State *L)
+// set_physics_override(self, override_table)
+int ObjectRef::l_set_physics_override(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       PlayerSAO *playersao = getplayersao(ref);
+       if (playersao == nullptr)
                return 0;
 
-       HudElement *elem = new HudElement;
-
-       elem->type = (HudElementType)getenumfield(L, 2, "hud_elem_type",
-                                                               es_HudElementType, HUD_ELEM_TEXT);
-
-       lua_getfield(L, 2, "position");
-       elem->pos = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
+       RemotePlayer *player = playersao->getPlayer();
+       auto &phys = player->physics_override;
 
-       lua_getfield(L, 2, "scale");
-       elem->scale = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
-
-       lua_getfield(L, 2, "size");
-       elem->size = lua_istable(L, -1) ? read_v2s32(L, -1) : v2s32();
-       lua_pop(L, 1);
-
-       elem->name   = getstringfield_default(L, 2, "name", "");
-       elem->text   = getstringfield_default(L, 2, "text", "");
-       elem->number = getintfield_default(L, 2, "number", 0);
-       elem->item   = getintfield_default(L, 2, "item", 0);
-       elem->dir    = getintfield_default(L, 2, "direction", 0);
+       if (lua_istable(L, 2)) {
+               bool modified = false;
+               modified |= getfloatfield(L, 2, "speed", phys.speed);
+               modified |= getfloatfield(L, 2, "jump", phys.jump);
+               modified |= getfloatfield(L, 2, "gravity", phys.gravity);
+               modified |= getboolfield(L, 2, "sneak", phys.sneak);
+               modified |= getboolfield(L, 2, "sneak_glitch", phys.sneak_glitch);
+               modified |= getboolfield(L, 2, "new_move", phys.new_move);
+               if (modified)
+                       playersao->m_physics_override_sent = false;
+       } else {
+               // old, non-table format
+               // TODO: Remove this code after version 5.4.0
+               log_deprecated(L, "Deprecated use of set_physics_override(num, num, num)");
 
-       // Deprecated, only for compatibility's sake
-       if (elem->dir == 0)
-               elem->dir = getintfield_default(L, 2, "dir", 0);
+               if (!lua_isnil(L, 2)) {
+                       phys.speed = lua_tonumber(L, 2);
+                       playersao->m_physics_override_sent = false;
+               }
+               if (!lua_isnil(L, 3)) {
+                       phys.jump = lua_tonumber(L, 3);
+                       playersao->m_physics_override_sent = false;
+               }
+               if (!lua_isnil(L, 4)) {
+                       phys.gravity = lua_tonumber(L, 4);
+                       playersao->m_physics_override_sent = false;
+               }
+       }
+       return 0;
+}
 
-       lua_getfield(L, 2, "alignment");
-       elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
+// get_physics_override(self)
+int ObjectRef::l_get_physics_override(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
 
-       lua_getfield(L, 2, "offset");
-       elem->offset = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
+       const auto &phys = player->physics_override;
+       lua_newtable(L);
+       lua_pushnumber(L, phys.speed);
+       lua_setfield(L, -2, "speed");
+       lua_pushnumber(L, phys.jump);
+       lua_setfield(L, -2, "jump");
+       lua_pushnumber(L, phys.gravity);
+       lua_setfield(L, -2, "gravity");
+       lua_pushboolean(L, phys.sneak);
+       lua_setfield(L, -2, "sneak");
+       lua_pushboolean(L, phys.sneak_glitch);
+       lua_setfield(L, -2, "sneak_glitch");
+       lua_pushboolean(L, phys.new_move);
+       lua_setfield(L, -2, "new_move");
+       return 1;
+}
 
-       lua_getfield(L, 2, "world_pos");
-       elem->world_pos = lua_istable(L, -1) ? read_v3f(L, -1) : v3f();
-       lua_pop(L, 1);
+// hud_add(self, hud)
+int ObjectRef::l_hud_add(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
 
-       /* check for known deprecated element usage */
-       if ((elem->type  == HUD_ELEM_STATBAR) && (elem->size == v2s32())) {
-               log_deprecated(L,"Deprecated usage of statbar without size!");
-       }
+       HudElement *elem = new HudElement;
+       read_hud_element(L, elem);
 
        u32 id = getServer(L)->hudAdd(player, elem);
        if (id == U32_MAX) {
@@ -1376,14 +1510,12 @@ int ObjectRef::l_hud_add(lua_State *L)
 int ObjectRef::l_hud_remove(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       u32 id = -1;
-       if (!lua_isnil(L, 2))
-               id = lua_tonumber(L, 2);
+       u32 id = luaL_checkint(L, 2);
 
        if (!getServer(L)->hudRemove(player, id))
                return 0;
@@ -1396,76 +1528,25 @@ int ObjectRef::l_hud_remove(lua_State *L)
 int ObjectRef::l_hud_change(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       u32 id = lua_isnumber(L, 2) ? lua_tonumber(L, 2) : -1;
+       u32 id = luaL_checkint(L, 2);
 
-       HudElement *e = player->getHud(id);
-       if (!e)
+       HudElement *elem = player->getHud(id);
+       if (elem == nullptr)
                return 0;
 
-       HudElementStat stat = HUD_STAT_NUMBER;
-       if (lua_isstring(L, 3)) {
-               int statint;
-               std::string statstr = lua_tostring(L, 3);
-               stat = string_to_enum(es_HudElementStat, statint, statstr) ?
-                               (HudElementStat)statint : HUD_STAT_NUMBER;
-       }
+       HudElementStat stat;
+       void *value = nullptr;
+       bool ok = read_hud_change(L, stat, elem, &value);
 
-       void *value = NULL;
-       switch (stat) {
-               case HUD_STAT_POS:
-                       e->pos = read_v2f(L, 4);
-                       value = &e->pos;
-                       break;
-               case HUD_STAT_NAME:
-                       e->name = luaL_checkstring(L, 4);
-                       value = &e->name;
-                       break;
-               case HUD_STAT_SCALE:
-                       e->scale = read_v2f(L, 4);
-                       value = &e->scale;
-                       break;
-               case HUD_STAT_TEXT:
-                       e->text = luaL_checkstring(L, 4);
-                       value = &e->text;
-                       break;
-               case HUD_STAT_NUMBER:
-                       e->number = luaL_checknumber(L, 4);
-                       value = &e->number;
-                       break;
-               case HUD_STAT_ITEM:
-                       e->item = luaL_checknumber(L, 4);
-                       value = &e->item;
-                       break;
-               case HUD_STAT_DIR:
-                       e->dir = luaL_checknumber(L, 4);
-                       value = &e->dir;
-                       break;
-               case HUD_STAT_ALIGN:
-                       e->align = read_v2f(L, 4);
-                       value = &e->align;
-                       break;
-               case HUD_STAT_OFFSET:
-                       e->offset = read_v2f(L, 4);
-                       value = &e->offset;
-                       break;
-               case HUD_STAT_WORLD_POS:
-                       e->world_pos = read_v3f(L, 4);
-                       value = &e->world_pos;
-                       break;
-               case HUD_STAT_SIZE:
-                       e->size = read_v2s32(L, 4);
-                       value = &e->size;
-                       break;
-       }
+       if (ok)
+               getServer(L)->hudChange(player, id, stat, value);
 
-       getServer(L)->hudChange(player, id, stat, value);
-
-       lua_pushboolean(L, true);
+       lua_pushboolean(L, ok);
        return 1;
 }
 
@@ -1473,50 +1554,18 @@ int ObjectRef::l_hud_change(lua_State *L)
 int ObjectRef::l_hud_get(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       u32 id = lua_tonumber(L, -1);
+       u32 id = luaL_checkint(L, 2);
 
-       HudElement *e = player->getHud(id);
-       if (!e)
+       HudElement *elem = player->getHud(id);
+       if (elem == nullptr)
                return 0;
 
-       lua_newtable(L);
-
-       lua_pushstring(L, es_HudElementType[(u8)e->type].str);
-       lua_setfield(L, -2, "type");
-
-       push_v2f(L, e->pos);
-       lua_setfield(L, -2, "position");
-
-       lua_pushstring(L, e->name.c_str());
-       lua_setfield(L, -2, "name");
-
-       push_v2f(L, e->scale);
-       lua_setfield(L, -2, "scale");
-
-       lua_pushstring(L, e->text.c_str());
-       lua_setfield(L, -2, "text");
-
-       lua_pushnumber(L, e->number);
-       lua_setfield(L, -2, "number");
-
-       lua_pushnumber(L, e->item);
-       lua_setfield(L, -2, "item");
-
-       lua_pushnumber(L, e->dir);
-       lua_setfield(L, -2, "direction");
-
-       // Deprecated, only for compatibility's sake
-       lua_pushnumber(L, e->dir);
-       lua_setfield(L, -2, "dir");
-
-       push_v3f(L, e->world_pos);
-       lua_setfield(L, -2, "world_pos");
-
+       push_hud_element(L, elem);
        return 1;
 }
 
@@ -1524,9 +1573,9 @@ int ObjectRef::l_hud_get(lua_State *L)
 int ObjectRef::l_hud_set_flags(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
        u32 flags = 0;
@@ -1543,32 +1592,24 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
        if (!getServer(L)->hudSetFlags(player, flags, mask))
                return 0;
 
-       lua_pushboolean(L, true);
-       return 1;
+       return 0;
 }
 
+// hud_get_flags(self)
 int ObjectRef::l_hud_get_flags(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
        lua_newtable(L);
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_HOTBAR_VISIBLE);
-       lua_setfield(L, -2, "hotbar");
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_HEALTHBAR_VISIBLE);
-       lua_setfield(L, -2, "healthbar");
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE);
-       lua_setfield(L, -2, "crosshair");
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_WIELDITEM_VISIBLE);
-       lua_setfield(L, -2, "wielditem");
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_BREATHBAR_VISIBLE);
-       lua_setfield(L, -2, "breathbar");
-       lua_pushboolean(L, player->hud_flags & HUD_FLAG_MINIMAP_VISIBLE);
-       lua_setfield(L, -2, "minimap");
-
+       const EnumString *esp = es_HudBuiltinElement;
+       for (int i = 0; esp[i].str; i++) {
+               lua_pushboolean(L, (player->hud_flags & esp[i].num) != 0);
+               lua_setfield(L, -2, esp[i].str);
+       }
        return 1;
 }
 
@@ -1576,12 +1617,12 @@ int ObjectRef::l_hud_get_flags(lua_State *L)
 int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       s32 hotbar_itemcount = lua_tonumber(L, 2);
+       s32 hotbar_itemcount = luaL_checkint(L, 2);
 
        if (!getServer(L)->hudSetHotbarItemcount(player, hotbar_itemcount))
                return 0;
@@ -1594,14 +1635,12 @@ int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       s32 hotbar_itemcount = getServer(L)->hudGetHotbarItemcount(player);
-
-       lua_pushnumber(L, hotbar_itemcount);
+       lua_pushnumber(L, player->getHotbarItemcount());
        return 1;
 }
 
@@ -1609,12 +1648,12 @@ int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
 int ObjectRef::l_hud_set_hotbar_image(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       std::string name = lua_tostring(L, 2);
+       std::string name = readParam<std::string>(L, 2);
 
        getServer(L)->hudSetHotbarImage(player, name);
        return 1;
@@ -1624,12 +1663,13 @@ int ObjectRef::l_hud_set_hotbar_image(lua_State *L)
 int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       std::string name = getServer(L)->hudGetHotbarImage(player);
+       const std::string &name = player->getHotbarImage();
+
        lua_pushlstring(L, name.c_str(), name.size());
        return 1;
 }
@@ -1638,12 +1678,12 @@ int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
 int ObjectRef::l_hud_set_hotbar_selected_image(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       std::string name = lua_tostring(L, 2);
+       std::string name = readParam<std::string>(L, 2);
 
        getServer(L)->hudSetHotbarSelectedImage(player, name);
        return 1;
@@ -1653,143 +1693,474 @@ int ObjectRef::l_hud_set_hotbar_selected_image(lua_State *L)
 int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);
+       const std::string &name = player->getHotbarSelectedImage();
+
        lua_pushlstring(L, name.c_str(), name.size());
        return 1;
 }
 
-// set_sky(self, bgcolor, type, list, clouds = true)
+// set_sky(self, sky_parameters)
 int ObjectRef::l_set_sky(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
-       video::SColor bgcolor(255,255,255,255);
-       read_color(L, 2, &bgcolor);
+       SkyboxParams sky_params = player->getSkyParams();
+
+       // reset if empty
+       if (lua_isnoneornil(L, 2) && lua_isnone(L, 3)) {
+               sky_params = SkyboxDefaults::getSkyDefaults();
+       } else if (lua_istable(L, 2) && !is_color_table(L, 2)) {
+               lua_getfield(L, 2, "base_color");
+               if (!lua_isnil(L, -1))
+                       read_color(L, -1, &sky_params.bgcolor);
+               lua_pop(L, 1);
+
+               lua_getfield(L, 2, "type");
+               if (!lua_isnil(L, -1))
+                       sky_params.type = luaL_checkstring(L, -1);
+               lua_pop(L, 1);
+
+               lua_getfield(L, 2, "textures");
+               sky_params.textures.clear();
+               if (lua_istable(L, -1) && sky_params.type == "skybox") {
+                       lua_pushnil(L);
+                       while (lua_next(L, -2) != 0) {
+                               // Key is at index -2 and value at index -1
+                               sky_params.textures.emplace_back(readParam<std::string>(L, -1));
+                               // Removes the value, but keeps the key for iteration
+                               lua_pop(L, 1);
+                       }
+               }
+               lua_pop(L, 1);
 
-       std::string type = luaL_checkstring(L, 3);
+               // Validate that we either have six or zero textures
+               if (sky_params.textures.size() != 6 && !sky_params.textures.empty())
+                       throw LuaError("Skybox expects 6 textures!");
 
-       std::vector<std::string> params;
-       if (lua_istable(L, 4)) {
-               lua_pushnil(L);
-               while (lua_next(L, 4) != 0) {
-                       // key at index -2 and value at index -1
-                       if (lua_isstring(L, -1))
-                               params.push_back(lua_tostring(L, -1));
-                       else
-                               params.push_back("");
-                       // removes value, keeps key for next iteration
+               sky_params.clouds = getboolfield_default(L, 2, "clouds", sky_params.clouds);
+
+               lua_getfield(L, 2, "sky_color");
+               if (lua_istable(L, -1)) {
+                       lua_getfield(L, -1, "day_sky");
+                       read_color(L, -1, &sky_params.sky_color.day_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "day_horizon");
+                       read_color(L, -1, &sky_params.sky_color.day_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "dawn_sky");
+                       read_color(L, -1, &sky_params.sky_color.dawn_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "dawn_horizon");
+                       read_color(L, -1, &sky_params.sky_color.dawn_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "night_sky");
+                       read_color(L, -1, &sky_params.sky_color.night_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "night_horizon");
+                       read_color(L, -1, &sky_params.sky_color.night_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "indoors");
+                       read_color(L, -1, &sky_params.sky_color.indoors);
+                       lua_pop(L, 1);
+
+                       // Prevent flickering clouds at dawn/dusk:
+                       sky_params.fog_sun_tint = video::SColor(255, 255, 255, 255);
+                       lua_getfield(L, -1, "fog_sun_tint");
+                       read_color(L, -1, &sky_params.fog_sun_tint);
+                       lua_pop(L, 1);
+
+                       sky_params.fog_moon_tint = video::SColor(255, 255, 255, 255);
+                       lua_getfield(L, -1, "fog_moon_tint");
+                       read_color(L, -1, &sky_params.fog_moon_tint);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "fog_tint_type");
+                       if (!lua_isnil(L, -1))
+                               sky_params.fog_tint_type = luaL_checkstring(L, -1);
+                       lua_pop(L, 1);
+
+                       // pop "sky_color" table
                        lua_pop(L, 1);
                }
-       }
+       } else {
+               // Handle old set_sky calls, and log deprecated:
+               log_deprecated(L, "Deprecated call to set_sky, please check lua_api.txt");
+
+               // Fix sun, moon and stars showing when classic textured skyboxes are used
+               SunParams sun_params = player->getSunParams();
+               MoonParams moon_params = player->getMoonParams();
+               StarParams star_params = player->getStarParams();
+
+               // Prevent erroneous background colors
+               sky_params.bgcolor = video::SColor(255, 255, 255, 255);
+               read_color(L, 2, &sky_params.bgcolor);
+
+               sky_params.type = luaL_checkstring(L, 3);
+
+               // Preserve old behavior of the sun, moon and stars
+               // when using the old set_sky call.
+               if (sky_params.type == "regular") {
+                       sun_params.visible = true;
+                       sun_params.sunrise_visible = true;
+                       moon_params.visible = true;
+                       star_params.visible = true;
+               } else {
+                       sun_params.visible = false;
+                       sun_params.sunrise_visible = false;
+                       moon_params.visible = false;
+                       star_params.visible = false;
+               }
 
-       if (type == "skybox" && params.size() != 6)
-               throw LuaError("skybox expects 6 textures");
+               sky_params.textures.clear();
+               if (lua_istable(L, 4)) {
+                       lua_pushnil(L);
+                       while (lua_next(L, 4) != 0) {
+                               // Key at index -2, and value at index -1
+                               sky_params.textures.emplace_back(readParam<std::string>(L, -1));
+                               // Remove the value, keep the key for the next iteration
+                               lua_pop(L, 1);
+                       }
+               }
+               if (sky_params.type == "skybox" && sky_params.textures.size() != 6)
+                       throw LuaError("Skybox expects 6 textures.");
 
-       bool clouds = true;
-       if (lua_isboolean(L, 5))
-               clouds = lua_toboolean(L, 5);
+               sky_params.clouds = true;
+               if (lua_isboolean(L, 5))
+                       sky_params.clouds = readParam<bool>(L, 5);
 
-       if (!getServer(L)->setSky(player, bgcolor, type, params, clouds))
-               return 0;
+               getServer(L)->setSun(player, sun_params);
+               getServer(L)->setMoon(player, moon_params);
+               getServer(L)->setStars(player, star_params);
+       }
 
-       lua_pushboolean(L, true);
-       return 1;
+       getServer(L)->setSky(player, sky_params);
+       return 0;
 }
 
-// get_sky(self)
+static void push_sky_color(lua_State *L, const SkyboxParams &params)
+{
+       lua_newtable(L);
+       if (params.type == "regular") {
+               push_ARGB8(L, params.sky_color.day_sky);
+               lua_setfield(L, -2, "day_sky");
+               push_ARGB8(L, params.sky_color.day_horizon);
+               lua_setfield(L, -2, "day_horizon");
+               push_ARGB8(L, params.sky_color.dawn_sky);
+               lua_setfield(L, -2, "dawn_sky");
+               push_ARGB8(L, params.sky_color.dawn_horizon);
+               lua_setfield(L, -2, "dawn_horizon");
+               push_ARGB8(L, params.sky_color.night_sky);
+               lua_setfield(L, -2, "night_sky");
+               push_ARGB8(L, params.sky_color.night_horizon);
+               lua_setfield(L, -2, "night_horizon");
+               push_ARGB8(L, params.sky_color.indoors);
+               lua_setfield(L, -2, "indoors");
+       }
+       push_ARGB8(L, params.fog_sun_tint);
+       lua_setfield(L, -2, "fog_sun_tint");
+       push_ARGB8(L, params.fog_moon_tint);
+       lua_setfield(L, -2, "fog_moon_tint");
+       lua_pushstring(L, params.fog_tint_type.c_str());
+       lua_setfield(L, -2, "fog_tint_type");
+}
+
+// get_sky(self, as_table)
 int ObjectRef::l_get_sky(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
-       video::SColor bgcolor(255, 255, 255, 255);
-       std::string type;
-       std::vector<std::string> params;
-       bool clouds;
 
-       player->getSky(&bgcolor, &type, &params, &clouds);
-       type = type == "" ? "regular" : type;
+       const SkyboxParams &skybox_params = player->getSkyParams();
+
+       // handle the deprecated version
+       if (!readParam<bool>(L, 2, false)) {
+               log_deprecated(L, "Deprecated call to get_sky, please check lua_api.txt");
+
+               push_ARGB8(L, skybox_params.bgcolor);
+               lua_pushlstring(L, skybox_params.type.c_str(), skybox_params.type.size());
+
+               lua_newtable(L);
+               s16 i = 1;
+               for (const std::string &texture : skybox_params.textures) {
+                       lua_pushlstring(L, texture.c_str(), texture.size());
+                       lua_rawseti(L, -2, i++);
+               }
+               lua_pushboolean(L, skybox_params.clouds);
+               return 4;
+       }
+
+       lua_newtable(L);
+       push_ARGB8(L, skybox_params.bgcolor);
+       lua_setfield(L, -2, "base_color");
+       lua_pushlstring(L, skybox_params.type.c_str(), skybox_params.type.size());
+       lua_setfield(L, -2, "type");
 
-       push_ARGB8(L, bgcolor);
-       lua_pushlstring(L, type.c_str(), type.size());
        lua_newtable(L);
        s16 i = 1;
-       for (std::vector<std::string>::iterator it = params.begin();
-                       it != params.end(); ++it) {
-               lua_pushlstring(L, it->c_str(), it->size());
-               lua_rawseti(L, -2, i);
-               i++;
+       for (const std::string &texture : skybox_params.textures) {
+               lua_pushlstring(L, texture.c_str(), texture.size());
+               lua_rawseti(L, -2, i++);
        }
-       lua_pushboolean(L, clouds);
-       return 3;
+       lua_setfield(L, -2, "textures");
+       lua_pushboolean(L, skybox_params.clouds);
+       lua_setfield(L, -2, "clouds");
+
+       push_sky_color(L, skybox_params);
+       lua_setfield(L, -2, "sky_color");
+       return 1;
 }
 
-// set_clouds(self, {density=, color=, ambient=, height=, thickness=, speed=})
-int ObjectRef::l_set_clouds(lua_State *L)
+// DEPRECATED
+// get_sky_color(self)
+int ObjectRef::l_get_sky_color(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+
+       log_deprecated(L, "Deprecated call to get_sky_color, use get_sky instead");
+
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (!player)
+       if (player == nullptr)
                return 0;
-       if (!lua_istable(L, 2))
+
+       const SkyboxParams &skybox_params = player->getSkyParams();
+       push_sky_color(L, skybox_params);
+       return 1;
+}
+
+// set_sun(self, sun_parameters)
+int ObjectRef::l_set_sun(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
                return 0;
 
-       CloudParams cloud_params = player->getCloudParams();
+       SunParams sun_params = player->getSunParams();
 
-       cloud_params.density = getfloatfield_default(L, 2, "density", cloud_params.density);
+       // reset if empty
+       if (lua_isnoneornil(L, 2)) {
+               sun_params = SkyboxDefaults::getSunDefaults();
+       } else {
+               luaL_checktype(L, 2, LUA_TTABLE);
+               sun_params.visible = getboolfield_default(L, 2,   "visible", sun_params.visible);
+               sun_params.texture = getstringfield_default(L, 2, "texture", sun_params.texture);
+               sun_params.tonemap = getstringfield_default(L, 2, "tonemap", sun_params.tonemap);
+               sun_params.sunrise = getstringfield_default(L, 2, "sunrise", sun_params.sunrise);
+               sun_params.sunrise_visible = getboolfield_default(L, 2, "sunrise_visible", sun_params.sunrise_visible);
+               sun_params.scale   = getfloatfield_default(L, 2,  "scale",   sun_params.scale);
+       }
 
-       lua_getfield(L, 2, "color");
-       if (!lua_isnil(L, -1))
-               read_color(L, -1, &cloud_params.color_bright);
-       lua_pop(L, 1);
-       lua_getfield(L, 2, "ambient");
-       if (!lua_isnil(L, -1))
-               read_color(L, -1, &cloud_params.color_ambient);
-       lua_pop(L, 1);
+       getServer(L)->setSun(player, sun_params);
+       return 0;
+}
 
-       cloud_params.height    = getfloatfield_default(L, 2, "height",    cloud_params.height   );
-       cloud_params.thickness = getfloatfield_default(L, 2, "thickness", cloud_params.thickness);
+//get_sun(self)
+int ObjectRef::l_get_sun(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
 
-       lua_getfield(L, 2, "speed");
-       if (lua_istable(L, -1)) {
-               v2f new_speed;
-               new_speed.X = getfloatfield_default(L, -1, "x", 0);
-               new_speed.Y = getfloatfield_default(L, -1, "y", 0);
-               cloud_params.speed = new_speed;
+       const SunParams &sun_params = player->getSunParams();
+
+       lua_newtable(L);
+       lua_pushboolean(L, sun_params.visible);
+       lua_setfield(L, -2, "visible");
+       lua_pushstring(L, sun_params.texture.c_str());
+       lua_setfield(L, -2, "texture");
+       lua_pushstring(L, sun_params.tonemap.c_str());
+       lua_setfield(L, -2, "tonemap");
+       lua_pushstring(L, sun_params.sunrise.c_str());
+       lua_setfield(L, -2, "sunrise");
+       lua_pushboolean(L, sun_params.sunrise_visible);
+       lua_setfield(L, -2, "sunrise_visible");
+       lua_pushnumber(L, sun_params.scale);
+       lua_setfield(L, -2, "scale");
+       return 1;
+}
+
+// set_moon(self, moon_parameters)
+int ObjectRef::l_set_moon(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       MoonParams moon_params = player->getMoonParams();
+
+       // reset if empty
+       if (lua_isnoneornil(L, 2)) {
+               moon_params = SkyboxDefaults::getMoonDefaults();
+       } else {
+               luaL_checktype(L, 2, LUA_TTABLE);
+               moon_params.visible = getboolfield_default(L, 2,   "visible", moon_params.visible);
+               moon_params.texture = getstringfield_default(L, 2, "texture", moon_params.texture);
+               moon_params.tonemap = getstringfield_default(L, 2, "tonemap", moon_params.tonemap);
+               moon_params.scale   = getfloatfield_default(L, 2,  "scale",   moon_params.scale);
        }
-       lua_pop(L, 1);
 
-       if (!getServer(L)->setClouds(player, cloud_params.density,
-                       cloud_params.color_bright, cloud_params.color_ambient,
-                       cloud_params.height, cloud_params.thickness,
-                       cloud_params.speed))
+       getServer(L)->setMoon(player, moon_params);
+       return 0;
+}
+
+// get_moon(self)
+int ObjectRef::l_get_moon(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
                return 0;
 
-       player->setCloudParams(cloud_params);
+       const MoonParams &moon_params = player->getMoonParams();
 
-       lua_pushboolean(L, true);
+       lua_newtable(L);
+       lua_pushboolean(L, moon_params.visible);
+       lua_setfield(L, -2, "visible");
+       lua_pushstring(L, moon_params.texture.c_str());
+       lua_setfield(L, -2, "texture");
+       lua_pushstring(L, moon_params.tonemap.c_str());
+       lua_setfield(L, -2, "tonemap");
+       lua_pushnumber(L, moon_params.scale);
+       lua_setfield(L, -2, "scale");
+       return 1;
+}
+
+// set_stars(self, star_parameters)
+int ObjectRef::l_set_stars(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       StarParams star_params = player->getStarParams();
+
+       // reset if empty
+       if (lua_isnoneornil(L, 2)) {
+               star_params = SkyboxDefaults::getStarDefaults();
+       } else {
+               luaL_checktype(L, 2, LUA_TTABLE);
+               star_params.visible = getboolfield_default(L, 2, "visible", star_params.visible);
+               star_params.count   = getintfield_default(L, 2,  "count",   star_params.count);
+
+               lua_getfield(L, 2, "star_color");
+               if (!lua_isnil(L, -1))
+                       read_color(L, -1, &star_params.starcolor);
+               lua_pop(L, 1);
+
+               star_params.scale = getfloatfield_default(L, 2,
+                       "scale", star_params.scale);
+               star_params.day_opacity = getfloatfield_default(L, 2,
+                       "day_opacity", star_params.day_opacity);
+       }
+
+       getServer(L)->setStars(player, star_params);
+       return 0;
+}
+
+// get_stars(self)
+int ObjectRef::l_get_stars(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       const StarParams &star_params = player->getStarParams();
+
+       lua_newtable(L);
+       lua_pushboolean(L, star_params.visible);
+       lua_setfield(L, -2, "visible");
+       lua_pushnumber(L, star_params.count);
+       lua_setfield(L, -2, "count");
+       push_ARGB8(L, star_params.starcolor);
+       lua_setfield(L, -2, "star_color");
+       lua_pushnumber(L, star_params.scale);
+       lua_setfield(L, -2, "scale");
+       lua_pushnumber(L, star_params.day_opacity);
+       lua_setfield(L, -2, "day_opacity");
        return 1;
 }
 
+// set_clouds(self, cloud_parameters)
+int ObjectRef::l_set_clouds(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       CloudParams cloud_params = player->getCloudParams();
+
+       // reset if empty
+       if (lua_isnoneornil(L, 2)) {
+               cloud_params = SkyboxDefaults::getCloudDefaults();
+       } else {
+               luaL_checktype(L, 2, LUA_TTABLE);
+               cloud_params.density = getfloatfield_default(L, 2, "density", cloud_params.density);
+
+               lua_getfield(L, 2, "color");
+               if (!lua_isnil(L, -1))
+                       read_color(L, -1, &cloud_params.color_bright);
+               lua_pop(L, 1);
+               lua_getfield(L, 2, "ambient");
+               if (!lua_isnil(L, -1))
+                       read_color(L, -1, &cloud_params.color_ambient);
+               lua_pop(L, 1);
+
+               cloud_params.height    = getfloatfield_default(L, 2, "height",    cloud_params.height);
+               cloud_params.thickness = getfloatfield_default(L, 2, "thickness", cloud_params.thickness);
+
+               lua_getfield(L, 2, "speed");
+               if (lua_istable(L, -1)) {
+                       v2f new_speed;
+                       new_speed.X = getfloatfield_default(L, -1, "x", 0);
+                       new_speed.Y = getfloatfield_default(L, -1, "z", 0);
+                       cloud_params.speed = new_speed;
+               }
+               lua_pop(L, 1);
+       }
+
+       getServer(L)->setClouds(player, cloud_params);
+       return 0;
+}
+
 int ObjectRef::l_get_clouds(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (!player)
+       if (player == nullptr)
                return 0;
+
        const CloudParams &cloud_params = player->getCloudParams();
 
        lua_newtable(L);
@@ -1809,41 +2180,40 @@ int ObjectRef::l_get_clouds(lua_State *L)
        lua_pushnumber(L, cloud_params.speed.Y);
        lua_setfield(L, -2, "y");
        lua_setfield(L, -2, "speed");
-
        return 1;
 }
 
 
-// override_day_night_ratio(self, brightness=0...1)
+// override_day_night_ratio(self, ratio)
 int ObjectRef::l_override_day_night_ratio(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
        bool do_override = false;
        float ratio = 0.0f;
+
        if (!lua_isnil(L, 2)) {
                do_override = true;
-               ratio = luaL_checknumber(L, 2);
+               ratio = readParam<float>(L, 2);
+               luaL_argcheck(L, ratio >= 0.0f && ratio <= 1.0f, 1,
+                       "value must be between 0 and 1");
        }
 
-       if (!getServer(L)->overrideDayNightRatio(player, do_override, ratio))
-               return 0;
-
-       lua_pushboolean(L, true);
-       return 1;
+       getServer(L)->overrideDayNightRatio(player, do_override, ratio);
+       return 0;
 }
 
 // get_day_night_ratio(self)
 int ObjectRef::l_get_day_night_ratio(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
        RemotePlayer *player = getplayer(ref);
-       if (player == NULL)
+       if (player == nullptr)
                return 0;
 
        bool do_override;
@@ -1858,68 +2228,148 @@ int ObjectRef::l_get_day_night_ratio(lua_State *L)
        return 1;
 }
 
-ObjectRef::ObjectRef(ServerActiveObject *object):
-       m_object(object)
+// set_minimap_modes(self, modes, selected_mode)
+int ObjectRef::l_set_minimap_modes(lua_State *L)
 {
-       //infostream<<"ObjectRef created for id="<<m_object->getId()<<std::endl;
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       luaL_checktype(L, 2, LUA_TTABLE);
+       std::vector<MinimapMode> modes;
+       s16 selected_mode = readParam<s16>(L, 3);
+
+       lua_pushnil(L);
+       while (lua_next(L, 2) != 0) {
+               /* key is at index -2, value is at index -1 */
+               if (lua_istable(L, -1)) {
+                       bool ok = true;
+                       MinimapMode mode;
+                       std::string type = getstringfield_default(L, -1, "type", "");
+                       if (type == "off")
+                               mode.type = MINIMAP_TYPE_OFF;
+                       else if (type == "surface")
+                               mode.type = MINIMAP_TYPE_SURFACE;
+                       else if (type == "radar")
+                               mode.type = MINIMAP_TYPE_RADAR;
+                       else if (type == "texture") {
+                               mode.type = MINIMAP_TYPE_TEXTURE;
+                               mode.texture = getstringfield_default(L, -1, "texture", "");
+                               mode.scale = getintfield_default(L, -1, "scale", 1);
+                       } else {
+                               warningstream << "Minimap mode of unknown type \"" << type.c_str()
+                                       << "\" ignored.\n" << std::endl;
+                               ok = false;
+                       }
+
+                       if (ok) {
+                               mode.label = getstringfield_default(L, -1, "label", "");
+                               // Size is limited to 512. Performance gets poor if size too large, and
+                               // segfaults have been experienced.
+                               mode.size = rangelim(getintfield_default(L, -1, "size", 0), 1, 512);
+                               modes.push_back(mode);
+                       }
+               }
+               /* removes 'value'; keeps 'key' for next iteration */
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 1); // Remove key
+
+       getServer(L)->SendMinimapModes(player->getPeerId(), modes, selected_mode);
+       return 0;
 }
 
-ObjectRef::~ObjectRef()
+// set_lighting(self, lighting)
+int ObjectRef::l_set_lighting(lua_State *L)
 {
-       /*if (m_object)
-               infostream<<"ObjectRef destructing for id="
-                               <<m_object->getId()<<std::endl;
-       else
-               infostream<<"ObjectRef destructing for id=unknown"<<std::endl;*/
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       luaL_checktype(L, 2, LUA_TTABLE);
+       Lighting lighting = player->getLighting();
+       lua_getfield(L, 2, "shadows");
+       if (lua_istable(L, -1)) {
+               getfloatfield(L, -1, "intensity", lighting.shadow_intensity);
+       }
+       lua_pop(L, 1); // shadows
+       getfloatfield(L, -1, "saturation", lighting.saturation);
+
+       getServer(L)->setLighting(player, lighting);
+       return 0;
+}
+
+// get_lighting(self)
+int ObjectRef::l_get_lighting(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       const Lighting &lighting = player->getLighting();
+
+       lua_newtable(L); // result
+       lua_newtable(L); // "shadows"
+       lua_pushnumber(L, lighting.shadow_intensity);
+       lua_setfield(L, -2, "intensity");
+       lua_setfield(L, -2, "shadows");
+       lua_pushnumber(L, lighting.saturation);
+       lua_setfield(L, -2, "saturation");
+       return 1;
 }
 
+// respawn(self)
+int ObjectRef::l_respawn(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkObject<ObjectRef>(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == nullptr)
+               return 0;
+
+       getServer(L)->RespawnPlayer(player->getPeerId());
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+
+ObjectRef::ObjectRef(ServerActiveObject *object):
+       m_object(object)
+{}
+
 // Creates an ObjectRef and leaves it on top of stack
 // Not callable from Lua; all references are created on the C side.
 void ObjectRef::create(lua_State *L, ServerActiveObject *object)
 {
-       ObjectRef *o = new ObjectRef(object);
-       //infostream<<"ObjectRef::create: o="<<o<<std::endl;
-       *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+       ObjectRef *obj = new ObjectRef(object);
+       *(void **)(lua_newuserdata(L, sizeof(void *))) = obj;
        luaL_getmetatable(L, className);
        lua_setmetatable(L, -2);
 }
 
 void ObjectRef::set_null(lua_State *L)
 {
-       ObjectRef *o = checkobject(L, -1);
-       o->m_object = NULL;
+       ObjectRef *obj = checkObject<ObjectRef>(L, -1);
+       obj->m_object = nullptr;
 }
 
 void ObjectRef::Register(lua_State *L)
 {
-       lua_newtable(L);
-       int methodtable = lua_gettop(L);
-       luaL_newmetatable(L, className);
-       int metatable = lua_gettop(L);
-
-       lua_pushliteral(L, "__metatable");
-       lua_pushvalue(L, methodtable);
-       lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
-
-       lua_pushliteral(L, "__index");
-       lua_pushvalue(L, methodtable);
-       lua_settable(L, metatable);
-
-       lua_pushliteral(L, "__gc");
-       lua_pushcfunction(L, gc_object);
-       lua_settable(L, metatable);
-
-       lua_pop(L, 1);  // drop metatable
-
-       luaL_openlib(L, 0, methods, 0);  // fill methodtable
-       lua_pop(L, 1);  // drop methodtable
-
-       // Cannot be created from Lua
-       //lua_register(L, className, create_object);
+       static const luaL_Reg metamethods[] = {
+               {"__gc", gc_object},
+               {0, 0}
+       };
+       registerClass(L, className, methods, metamethods);
 }
 
 const char ObjectRef::className[] = "ObjectRef";
-const luaL_Reg ObjectRef::methods[] = {
+luaL_Reg ObjectRef::methods[] = {
        // ServerActiveObject
        luamethod(ObjectRef, remove),
        luamethod_aliased(ObjectRef, get_pos, getpos),
@@ -1938,31 +2388,39 @@ const luaL_Reg ObjectRef::methods[] = {
        luamethod(ObjectRef, get_armor_groups),
        luamethod(ObjectRef, set_animation),
        luamethod(ObjectRef, get_animation),
+       luamethod(ObjectRef, set_animation_frame_speed),
        luamethod(ObjectRef, set_bone_position),
        luamethod(ObjectRef, get_bone_position),
        luamethod(ObjectRef, set_attach),
        luamethod(ObjectRef, get_attach),
+       luamethod(ObjectRef, get_children),
        luamethod(ObjectRef, set_detach),
        luamethod(ObjectRef, set_properties),
        luamethod(ObjectRef, get_properties),
        luamethod(ObjectRef, set_nametag_attributes),
        luamethod(ObjectRef, get_nametag_attributes),
-       // LuaEntitySAO-only
+
        luamethod_aliased(ObjectRef, set_velocity, setvelocity),
+       luamethod_aliased(ObjectRef, add_velocity, add_player_velocity),
        luamethod_aliased(ObjectRef, get_velocity, getvelocity),
+       luamethod_dep(ObjectRef, get_velocity, get_player_velocity),
+
+       // LuaEntitySAO-only
        luamethod_aliased(ObjectRef, set_acceleration, setacceleration),
        luamethod_aliased(ObjectRef, get_acceleration, getacceleration),
        luamethod_aliased(ObjectRef, set_yaw, setyaw),
        luamethod_aliased(ObjectRef, get_yaw, getyaw),
+       luamethod(ObjectRef, set_rotation),
+       luamethod(ObjectRef, get_rotation),
        luamethod_aliased(ObjectRef, set_texture_mod, settexturemod),
+       luamethod(ObjectRef, get_texture_mod),
        luamethod_aliased(ObjectRef, set_sprite, setsprite),
        luamethod(ObjectRef, get_entity_name),
        luamethod(ObjectRef, get_luaentity),
+
        // Player-only
        luamethod(ObjectRef, is_player),
-       luamethod(ObjectRef, is_player_connected),
        luamethod(ObjectRef, get_player_name),
-       luamethod(ObjectRef, get_player_velocity),
        luamethod(ObjectRef, get_look_dir),
        luamethod(ObjectRef, get_look_pitch),
        luamethod(ObjectRef, get_look_yaw),
@@ -1972,12 +2430,17 @@ const luaL_Reg ObjectRef::methods[] = {
        luamethod(ObjectRef, set_look_vertical),
        luamethod(ObjectRef, set_look_yaw),
        luamethod(ObjectRef, set_look_pitch),
+       luamethod(ObjectRef, get_fov),
+       luamethod(ObjectRef, set_fov),
        luamethod(ObjectRef, get_breath),
        luamethod(ObjectRef, set_breath),
        luamethod(ObjectRef, get_attribute),
        luamethod(ObjectRef, set_attribute),
+       luamethod(ObjectRef, get_meta),
        luamethod(ObjectRef, set_inventory_formspec),
        luamethod(ObjectRef, get_inventory_formspec),
+       luamethod(ObjectRef, set_formspec_prepend),
+       luamethod(ObjectRef, get_formspec_prepend),
        luamethod(ObjectRef, get_player_control),
        luamethod(ObjectRef, get_player_control_bits),
        luamethod(ObjectRef, set_physics_override),
@@ -1996,6 +2459,13 @@ const luaL_Reg ObjectRef::methods[] = {
        luamethod(ObjectRef, hud_get_hotbar_selected_image),
        luamethod(ObjectRef, set_sky),
        luamethod(ObjectRef, get_sky),
+       luamethod(ObjectRef, get_sky_color),
+       luamethod(ObjectRef, set_sun),
+       luamethod(ObjectRef, get_sun),
+       luamethod(ObjectRef, set_moon),
+       luamethod(ObjectRef, get_moon),
+       luamethod(ObjectRef, set_stars),
+       luamethod(ObjectRef, get_stars),
        luamethod(ObjectRef, set_clouds),
        luamethod(ObjectRef, get_clouds),
        luamethod(ObjectRef, override_day_night_ratio),
@@ -2004,5 +2474,11 @@ const luaL_Reg ObjectRef::methods[] = {
        luamethod(ObjectRef, get_local_animation),
        luamethod(ObjectRef, set_eye_offset),
        luamethod(ObjectRef, get_eye_offset),
+       luamethod(ObjectRef, send_mapblock),
+       luamethod(ObjectRef, set_minimap_modes),
+       luamethod(ObjectRef, set_lighting),
+       luamethod(ObjectRef, get_lighting),
+       luamethod(ObjectRef, respawn),
+
        {0,0}
 };