Exposing the zoom key to Lua API (#9903)
[oweals/minetest.git] / src / script / lua_api / l_object.cpp
index 0f3848aace75f2bf22c53e2d962be0040b1d5369..e7394133a728766ba0ae1b642cfc280140480ab2 100644 (file)
@@ -18,54 +18,22 @@ 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"
-
-
-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"},
-       {0, NULL},
-};
+#include "scripting_server.h"
+#include "server/luaentity_sao.h"
+#include "server/player_sao.h"
+#include "server/serverinventorymgr.h"
 
 /*
        ObjectRef
@@ -76,22 +44,24 @@ 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);
+       if (!ud) luaL_typerror(L, narg, className);
        return *(ObjectRef**)ud;  // unbox pointer
 }
 
 ServerActiveObject* ObjectRef::getobject(ObjectRef *ref)
 {
        ServerActiveObject *co = ref->m_object;
+       if (co && co->isGone())
+               return NULL;
        return co;
 }
 
 LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 {
        ServerActiveObject *obj = getobject(ref);
-       if(obj == NULL)
+       if (obj == NULL)
                return NULL;
-       if(obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
+       if (obj->getType() != ACTIVEOBJECT_TYPE_LUAENTITY)
                return NULL;
        return (LuaEntitySAO*)obj;
 }
@@ -99,17 +69,17 @@ LuaEntitySAO* ObjectRef::getluaobject(ObjectRef *ref)
 PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
 {
        ServerActiveObject *obj = getobject(ref);
-       if(obj == NULL)
+       if (obj == NULL)
                return NULL;
-       if(obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
+       if (obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
                return NULL;
        return (PlayerSAO*)obj;
 }
 
-Player* ObjectRef::getplayer(ObjectRef *ref)
+RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
        PlayerSAO *playersao = getplayersao(ref);
-       if(playersao == NULL)
+       if (playersao == NULL)
                return NULL;
        return playersao->getPlayer();
 }
@@ -127,43 +97,42 @@ int ObjectRef::gc_object(lua_State *L) {
 // remove(self)
 int ObjectRef::l_remove(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
-       if(co->getType() == ACTIVEOBJECT_TYPE_PLAYER) return 0;
-       verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
-       co->m_removed = true;
+       if (co == NULL)
+               return 0;
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+               return 0;
+
+       co->clearChildAttachments();
+       co->clearParentAttachment();
+
+       verbosestream << "ObjectRef::l_remove(): id=" << co->getId() << std::endl;
+       co->m_pending_removal = true;
        return 0;
 }
 
-// getpos(self)
+// get_pos(self)
 // returns: {x=num, y=num, z=num}
-int ObjectRef::l_getpos(lua_State *L)
+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");
+       if (co == NULL) return 0;
+       push_v3f(L, co->getBasePosition() / BS);
        return 1;
 }
 
-// setpos(self, pos)
-int ObjectRef::l_setpos(lua_State *L)
+// set_pos(self, pos)
+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;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // Do it
@@ -171,18 +140,17 @@ int ObjectRef::l_setpos(lua_State *L)
        return 0;
 }
 
-// moveto(self, pos, continuous=false)
-int ObjectRef::l_moveto(lua_State *L)
+// move_to(self, pos, continuous=false)
+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;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // continuous
-       bool continuous = lua_toboolean(L, 3);
+       bool continuous = readParam<bool>(L, 3);
        // Do it
        co->moveTo(pos, continuous);
        return 0;
@@ -196,39 +164,40 @@ int ObjectRef::l_punch(lua_State *L)
        ObjectRef *puncher_ref = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *puncher = getobject(puncher_ref);
-       if(co == NULL) return 0;
-       if(puncher == NULL) return 0;
+       if (!co || !puncher)
+               return 0;
        v3f dir;
-       if(lua_type(L, 5) != LUA_TTABLE)
+       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))
+       if (lua_isnumber(L, 3))
                time_from_last_punch = lua_tonumber(L, 3);
        ToolCapabilities toolcap = read_tool_capabilities(L, 4);
        dir.normalize();
 
-       s16 src_original_hp = co->getHP();
-       s16 dst_origin_hp = puncher->getHP();
+       u16 src_original_hp = co->getHP();
+       u16 dst_origin_hp = puncher->getHP();
 
        // Do it
-       co->punch(dir, &toolcap, puncher, time_from_last_punch);
+       u16 wear = co->punch(dir, &toolcap, puncher, time_from_last_punch);
+       lua_pushnumber(L, wear);
 
        // 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)->getPeerID(),
-                               co->getHP() == 0);
+               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co,
+                               PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, puncher));
        }
 
        // 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)->getPeerID(),
-                               puncher->getHP() == 0);
+               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)puncher,
+                               PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, co));
        }
-       return 0;
+       return 1;
 }
 
 // right_click(self, clicker); clicker = an another ObjectRef
@@ -239,8 +208,8 @@ int ObjectRef::l_right_click(lua_State *L)
        ObjectRef *ref2 = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *co2 = getobject(ref2);
-       if(co == NULL) return 0;
-       if(co2 == NULL) return 0;
+       if (co == NULL) return 0;
+       if (co2 == NULL) return 0;
        // Do it
        co->rightClick(co2);
        return 0;
@@ -252,18 +221,41 @@ int ObjectRef::l_right_click(lua_State *L)
 int ObjectRef::l_set_hp(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       // Get Object
        ObjectRef *ref = checkobject(L, 1);
        luaL_checknumber(L, 2);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
+       if (co == NULL)
+               return 0;
+
+       // Get HP
        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)->getPeerID(), co->getHP() == 0);
+
+       // Get Reason
+       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);
        }
+
+       // Do it
+       co->setHP(hp, reason);
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
+               getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, reason);
+
+       if (reason.hasLuaReference())
+               luaL_unref(L, LUA_REGISTRYINDEX, reason.lua_reference);
+
        // Return
        return 0;
 }
@@ -276,7 +268,7 @@ int ObjectRef::l_get_hp(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL){
+       if (co == NULL) {
                // Default hp is 1
                lua_pushnumber(L, 1);
                return 1;
@@ -295,10 +287,10 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        InventoryLocation loc = co->getInventoryLocation();
-       if(getServer(L)->getInventory(loc) != NULL)
+       if (getServerInventoryMgr(L)->getInventory(loc) != NULL)
                InvRef::create(L, loc);
        else
                lua_pushnil(L); // An object may have no inventory (nil)
@@ -311,8 +303,9 @@ 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
+       if (!co)
+               return 0;
+
        lua_pushstring(L, co->getWieldList().c_str());
        return 1;
 }
@@ -323,8 +316,9 @@ 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
+       if (!co)
+               return 0;
+
        lua_pushinteger(L, co->getWieldIndex() + 1);
        return 1;
 }
@@ -335,13 +329,15 @@ 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){
+       if (!co) {
                // Empty ItemStack
                LuaItemStack::create(L, ItemStack());
                return 1;
        }
-       // Do it
-       LuaItemStack::create(L, co->getWieldedItem());
+
+       ItemStack selected_item;
+       co->getWieldedItem(&selected_item, nullptr);
+       LuaItemStack::create(L, selected_item);
        return 1;
 }
 
@@ -351,12 +347,12 @@ 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;
+       if (co == NULL) return 0;
        // Do it
-       ItemStack item = read_item(L, 2, getServer(L));
+       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)->getPeerID());
+               getServer(L)->SendInventory((PlayerSAO *)co, true);
        }
        lua_pushboolean(L, success);
        return 1;
@@ -368,7 +364,7 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        ItemGroupList groups;
        read_groups(L, 2, groups);
@@ -376,32 +372,53 @@ int ObjectRef::l_set_armor_groups(lua_State *L)
        return 0;
 }
 
+// get_armor_groups(self)
+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)
+               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)
+//                      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;
+       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_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)){
+               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)){
+               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)){
+               if (!lua_isnil(L, 4)) {
                        co->m_physics_override_gravity = lua_tonumber(L, 4);
                        co->m_physics_override_sent = false;
                }
@@ -409,67 +426,136 @@ int ObjectRef::l_set_physics_override(lua_State *L)
        return 0;
 }
 
-// set_animation(self, frame_range, frame_speed, frame_blend)
+// 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");
+       return 1;
+}
+
+// set_animation(self, frame_range, frame_speed, frame_blend, frame_loop)
 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;
+       if (co == NULL) return 0;
        // Do it
        v2f frames = v2f(1, 1);
-       if(!lua_isnil(L, 2))
-               frames = read_v2f(L, 2);
+       if (!lua_isnil(L, 2))
+               frames = readParam<v2f>(L, 2);
        float frame_speed = 15;
-       if(!lua_isnil(L, 3))
+       if (!lua_isnil(L, 3))
                frame_speed = lua_tonumber(L, 3);
        float frame_blend = 0;
-       if(!lua_isnil(L, 4))
+       if (!lua_isnil(L, 4))
                frame_blend = lua_tonumber(L, 4);
-       co->setAnimation(frames, frame_speed, frame_blend);
+       bool frame_loop = true;
+       if (lua_isboolean(L, 5))
+               frame_loop = readParam<bool>(L, 5);
+       co->setAnimation(frames, frame_speed, frame_blend, frame_loop);
        return 0;
 }
 
+// get_animation(self)
+int ObjectRef::l_get_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);
+       float frame_speed = 15;
+       float frame_blend = 0;
+       bool frame_loop = true;
+       co->getAnimation(&frames, &frame_speed, &frame_blend, &frame_loop);
+
+       push_v2f(L, frames);
+       lua_pushnumber(L, frame_speed);
+       lua_pushnumber(L, frame_blend);
+       lua_pushboolean(L, frame_loop);
+       return 4;
+}
+
 // set_local_animation(self, {stand/idle}, {walk}, {dig}, {walk+dig}, frame_speed)
 int ObjectRef::l_set_local_animation(lua_State *L)
 {
-       //NO_MAP_LOCK_REQUIRED;
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
        // Do it
        v2s32 frames[4];
        for (int i=0;i<4;i++) {
-               if(!lua_isnil(L, 2+1))
+               if (!lua_isnil(L, 2+1))
                        frames[i] = read_v2s32(L, 2+i);
        }
        float frame_speed = 30;
-       if(!lua_isnil(L, 6))
+       if (!lua_isnil(L, 6))
                frame_speed = lua_tonumber(L, 6);
 
-       if (!getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed))
+       getServer(L)->setLocalPlayerAnimations(player, frames, frame_speed);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_local_animation(self)
+int ObjectRef::l_get_local_animation(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
                return 0;
 
-       lua_pushboolean(L, true);
-       return 0;
+       v2s32 frames[4];
+       float frame_speed;
+       player->getLocalAnimations(frames, &frame_speed);
+
+       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)
 int ObjectRef::l_set_eye_offset(lua_State *L)
 {
-       //NO_MAP_LOCK_REQUIRED;
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
        // Do it
        v3f offset_first = v3f(0, 0, 0);
        v3f offset_third = v3f(0, 0, 0);
 
-       if(!lua_isnil(L, 2))
+       if (!lua_isnil(L, 2))
                offset_first = read_v3f(L, 2);
-       if(!lua_isnil(L, 3))
+       if (!lua_isnil(L, 3))
                offset_third = read_v3f(L, 3);
 
        // Prevent abuse of offset values (keep player always visible)
@@ -478,11 +564,61 @@ int ObjectRef::l_set_eye_offset(lua_State *L)
        /* TODO: if possible: improve the camera colision detetion 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))
+       getServer(L)->setPlayerEyeOffset(player, offset_first, offset_third);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_eye_offset(self)
+int ObjectRef::l_get_eye_offset(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
                return 0;
+       // Do it
+       push_v3f(L, player->eye_offset_first);
+       push_v3f(L, player->eye_offset_third);
+       return 2;
+}
 
-       lua_pushboolean(L, true);
-       return 0;
+// send_mapblock(self, pos)
+int ObjectRef::l_send_mapblock(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       v3s16 p = read_v3s16(L, 2);
+
+       session_t peer_id = player->getPeerId();
+       bool r = getServer(L)->SendBlock(peer_id, p);
+
+       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(L, 1);
+       ServerActiveObject *co = getobject(ref);
+       if (co == NULL)
+               return 0;
+
+       // Do it
+       if (!lua_isnil(L, 2)) {
+               float frame_speed = lua_tonumber(L, 2);
+               co->setAnimationSpeed(frame_speed);
+               lua_pushboolean(L, true);
+       } else {
+               lua_pushboolean(L, false);
+       }
+       return 1;
 }
 
 // set_bone_position(self, std::string bone, v3f position, v3f rotation)
@@ -491,54 +627,124 @@ 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;
+       if (co == NULL) return 0;
        // Do it
-       std::string bone = "";
-       if(!lua_isnil(L, 2))
-               bone = lua_tostring(L, 2);
+       std::string bone;
+       if (!lua_isnil(L, 2))
+               bone = readParam<std::string>(L, 2);
        v3f position = v3f(0, 0, 0);
-       if(!lua_isnil(L, 3))
-               position = read_v3f(L, 3);
+       if (!lua_isnil(L, 3))
+               position = check_v3f(L, 3);
        v3f rotation = v3f(0, 0, 0);
-       if(!lua_isnil(L, 4))
-               rotation = read_v3f(L, 4);
+       if (!lua_isnil(L, 4))
+               rotation = check_v3f(L, 4);
        co->setBonePosition(bone, position, rotation);
        return 0;
 }
 
+// get_bone_position(self, bone)
+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)
+               return 0;
+       // Do it
+       std::string bone;
+       if (!lua_isnil(L, 2))
+               bone = readParam<std::string>(L, 2);
+
+       v3f position = v3f(0, 0, 0);
+       v3f rotation = v3f(0, 0, 0);
+       co->getBonePosition(bone, &position, &rotation);
+
+       push_v3f(L, position);
+       push_v3f(L, rotation);
+       return 2;
+}
+
 // set_attach(self, parent, bone, position, rotation)
 int ObjectRef::l_set_attach(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ObjectRef *parent_ref = checkobject(L, 2);
        ServerActiveObject *co = getobject(ref);
        ServerActiveObject *parent = getobject(parent_ref);
-       if(co == NULL) return 0;
-       if(parent == NULL) return 0;
+       if (co == NULL)
+               return 0;
+
+       if (parent == NULL)
+               return 0;
+
+       if (co == parent)
+               throw LuaError("ObjectRef::set_attach: attaching object to itself is not allowed.");
+
        // Do it
-       std::string bone = "";
-       if(!lua_isnil(L, 3))
-               bone = lua_tostring(L, 3);
+       int parent_id = 0;
+       std::string bone;
        v3f position = v3f(0, 0, 0);
-       if(!lua_isnil(L, 4))
-               position = read_v3f(L, 4);
        v3f rotation = v3f(0, 0, 0);
-       if(!lua_isnil(L, 5))
+       co->getAttachment(&parent_id, &bone, &position, &rotation);
+       if (parent_id) {
+               ServerActiveObject *old_parent = env->getActiveObject(parent_id);
+               old_parent->removeAttachmentChild(co->getId());
+       }
+
+       bone = "";
+       if (!lua_isnil(L, 3))
+               bone = readParam<std::string>(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());
        return 0;
 }
 
+// get_attach(self)
+int ObjectRef::l_get_attach(lua_State *L)
+{
+       GET_ENV_PTR;
+
+       ObjectRef *ref = checkobject(L, 1);
+       ServerActiveObject *co = getobject(ref);
+       if (co == 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 (!parent_id)
+               return 0;
+       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;
+}
+
 // set_detach(self)
 int ObjectRef::l_set_detach(lua_State *L)
 {
-       NO_MAP_LOCK_REQUIRED;
+       GET_ENV_PTR;
+
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if(co == NULL) return 0;
-       // Do it
-       co->setAttachment(0, "", v3f(0,0,0), v3f(0,0,0));
+       if (co == NULL)
+               return 0;
+
+       co->clearParentAttachment();
        return 0;
 }
 
@@ -548,50 +754,144 @@ 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;
+       if (!co)
+               return 0;
+
        ObjectProperties *prop = co->accessObjectProperties();
-       if(!prop)
+       if (!prop)
                return 0;
-       read_object_properties(L, 2, prop);
+
+       read_object_properties(L, 2, co, prop, getServer(L)->idef());
        co->notifyObjectPropertiesModified();
        return 0;
 }
 
+// get_properties(self)
+int ObjectRef::l_get_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)
+               return 0;
+       push_object_properties(L, prop);
+       return 1;
+}
+
+// is_player(self)
+int ObjectRef::l_is_player(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       lua_pushboolean(L, (player != NULL));
+       return 1;
+}
+
+// set_nametag_attributes(self, attributes)
+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)
+               return 0;
+       ObjectProperties *prop = co->accessObjectProperties();
+       if (!prop)
+               return 0;
+
+       lua_getfield(L, 2, "color");
+       if (!lua_isnil(L, -1)) {
+               video::SColor color = prop->nametag_color;
+               read_color(L, -1, &color);
+               prop->nametag_color = color;
+       }
+       lua_pop(L, 1);
+
+       std::string nametag = getstringfield_default(L, 2, "text", "");
+       prop->nametag = nametag;
+
+       co->notifyObjectPropertiesModified();
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// 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)
+               return 0;
+       ObjectProperties *prop = co->accessObjectProperties();
+       if (!prop)
+               return 0;
+
+       video::SColor color = prop->nametag_color;
+
+       lua_newtable(L);
+       push_ARGB8(L, color);
+       lua_setfield(L, -2, "color");
+       lua_pushstring(L, prop->nametag.c_str());
+       lua_setfield(L, -2, "text");
+       return 1;
+}
+
 /* LuaEntitySAO-only */
 
-// setvelocity(self, {x=num, y=num, z=num})
-int ObjectRef::l_setvelocity(lua_State *L)
+// set_velocity(self, {x=num, y=num, z=num})
+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;
+       if (co == NULL) return 0;
        v3f pos = checkFloatPos(L, 2);
        // Do it
        co->setVelocity(pos);
        return 0;
 }
 
-// getvelocity(self)
-int ObjectRef::l_getvelocity(lua_State *L)
+// add_velocity(self, {x=num, y=num, z=num})
+int ObjectRef::l_add_velocity(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       LuaEntitySAO *co = getluaobject(ref);
+       if (!co)
+               return 0;
+       v3f pos = checkFloatPos(L, 2);
+       // Do it
+       co->addVelocity(pos);
+       return 0;
+}
+
+// get_velocity(self)
+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;
+       if (co == NULL) return 0;
        // Do it
        v3f v = co->getVelocity();
        pushFloatPos(L, v);
        return 1;
 }
 
-// setacceleration(self, {x=num, y=num, z=num})
-int ObjectRef::l_setacceleration(lua_State *L)
+// set_acceleration(self, {x=num, y=num, z=num})
+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;
+       if (co == NULL) return 0;
        // pos
        v3f pos = checkFloatPos(L, 2);
        // Do it
@@ -599,79 +899,128 @@ int ObjectRef::l_setacceleration(lua_State *L)
        return 0;
 }
 
-// getacceleration(self)
-int ObjectRef::l_getacceleration(lua_State *L)
+// get_acceleration(self)
+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;
+       if (co == NULL) return 0;
        // Do it
        v3f v = co->getAcceleration();
        pushFloatPos(L, v);
        return 1;
 }
 
-// setyaw(self, radians)
-int ObjectRef::l_setyaw(lua_State *L)
+// set_rotation(self, {x=num, y=num, z=num})
+// Each 'num' is in radians
+int ObjectRef::l_set_rotation(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);
+       if (!co)
+               return 0;
+
+       v3f rotation = check_v3f(L, 2) * core::RADTODEG;
+       co->setRotation(rotation);
        return 0;
 }
 
-// getyaw(self)
-int ObjectRef::l_getyaw(lua_State *L)
+// get_rotation(self)
+// returns: {x=num, y=num, z=num}
+// Each 'num' is in radians
+int ObjectRef::l_get_rotation(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;
-       lua_pushnumber(L, yaw);
+       if (!co)
+               return 0;
+
+       lua_newtable(L);
+       v3f rotation = co->getRotation() * core::DEGTORAD;
+       push_v3f(L, rotation);
        return 1;
 }
 
-// settexturemod(self, mod)
-int ObjectRef::l_settexturemod(lua_State *L)
+// set_yaw(self, radians)
+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;
-       // Do it
-       std::string mod = luaL_checkstring(L, 2);
-       co->setTextureMod(mod);
+
+       if (co == NULL) return 0;
+       if (isNaN(L, 2))
+               throw LuaError("ObjectRef::set_yaw: NaN value is not allowed.");
+
+       float yaw = readParam<float>(L, 2) * core::RADTODEG;
+       co->setRotation(v3f(0, yaw, 0));
        return 0;
 }
 
-// setsprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
-//           select_horiz_by_yawpitch=false)
-int ObjectRef::l_setsprite(lua_State *L)
+// get_yaw(self)
+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
-       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);
+       if (!co)
+               return 0;
+
+       float yaw = co->getRotation().Y * core::DEGTORAD;
+       lua_pushnumber(L, yaw);
+       return 1;
+}
+
+// set_texture_mod(self, mod)
+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);
+       return 0;
+}
+
+// get_texture_mod(self)
+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();
+       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)
+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 = readParam<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);
+       if (!lua_isnil(L, 5))
+               select_horiz_by_yawpitch = readParam<bool>(L, 5);
        co->setSprite(p, num_frames, framelength, select_horiz_by_yawpitch);
        return 0;
 }
@@ -684,7 +1033,7 @@ int ObjectRef::l_get_entity_name(lua_State *L)
        ObjectRef *ref = checkobject(L, 1);
        LuaEntitySAO *co = getluaobject(ref);
        log_deprecated(L,"Deprecated call to \"get_entity_name");
-       if(co == NULL) return 0;
+       if (co == NULL) return 0;
        // Do it
        std::string name = co->getName();
        lua_pushstring(L, name.c_str());
@@ -697,7 +1046,7 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        luaentity_get(L, co->getId());
        return 1;
@@ -705,23 +1054,16 @@ int ObjectRef::l_get_luaentity(lua_State *L)
 
 /* Player-only */
 
-// is_player(self)
-int ObjectRef::l_is_player(lua_State *L)
-{
-       NO_MAP_LOCK_REQUIRED;
-       ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       lua_pushboolean(L, (player != NULL));
-       return 1;
-}
-
 // is_player_connected(self)
 int ObjectRef::l_is_player_connected(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+       // This method was once added for a bugfix, but never documented
+       log_deprecated(L, "is_player_connected is undocumented and "
+               "will be removed in a future release");
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       lua_pushboolean(L, (player != NULL && player->peer_id != 0));
+       RemotePlayer *player = getplayer(ref);
+       lua_pushboolean(L, (player != NULL && player->getPeerId() != PEER_ID_INEXISTENT));
        return 1;
 }
 
@@ -730,8 +1072,8 @@ int ObjectRef::l_get_player_name(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
@@ -740,86 +1082,220 @@ int ObjectRef::l_get_player_name(lua_State *L)
        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);
+       return 1;
+}
+
+// add_player_velocity(self, {x=num, y=num, z=num})
+int ObjectRef::l_add_player_velocity(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       v3f vel = checkFloatPos(L, 2);
+
+       PlayerSAO *co = getplayersao(ref);
+       if (!co)
+               return 0;
+
+       // Do it
+       co->setMaxSpeedOverride(vel);
+       getServer(L)->SendPlayerSpeed(co->getPeerID(), vel);
+       return 0;
+}
+
 // get_look_dir(self)
 int ObjectRef::l_get_look_dir(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
        // Do it
-       float pitch = player->getRadPitch();
-       float yaw = player->getRadYaw();
-       v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
+       float pitch = co->getRadLookPitchDep();
+       float yaw = co->getRadYawDep();
+       v3f v(std::cos(pitch) * std::cos(yaw), std::sin(pitch), std::cos(pitch) *
+               std::sin(yaw));
        push_v3f(L, v);
        return 1;
 }
 
+// DEPRECATED
 // get_look_pitch(self)
 int ObjectRef::l_get_look_pitch(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       log_deprecated(L,
+               "Deprecated call to get_look_pitch, use get_look_vertical instead");
+
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
        // Do it
-       lua_pushnumber(L, player->getRadPitch());
+       lua_pushnumber(L, co->getRadLookPitchDep());
        return 1;
 }
 
+// DEPRECATED
 // get_look_yaw(self)
 int ObjectRef::l_get_look_yaw(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+
+       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());
+       return 1;
+}
+
+// get_look_pitch2(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->getRadLookPitch());
+       return 1;
+}
+
+// get_look_yaw2(self)
+int ObjectRef::l_get_look_horizontal(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL) return 0;
        // Do it
-       lua_pushnumber(L, player->getRadYaw());
+       lua_pushnumber(L, co->getRadRotation().Y);
        return 1;
 }
 
+// set_look_vertical(self, radians)
+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 = readParam<float>(L, 2) * core::RADTODEG;
+       // Do it
+       co->setLookPitchAndSend(pitch);
+       return 1;
+}
+
+// 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 = readParam<float>(L, 2) * core::RADTODEG;
+       // Do it
+       co->setPlayerYawAndSend(yaw);
+       return 1;
+}
+
+// DEPRECATED
 // set_look_pitch(self, radians)
 int ObjectRef::l_set_look_pitch(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       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;
+       if (co == NULL) return 0;
+       float pitch = readParam<float>(L, 2) * core::RADTODEG;
        // Do it
-       co->setPitch(pitch);
+       co->setLookPitchAndSend(pitch);
        return 1;
 }
 
+// DEPRECATED
 // set_look_yaw(self, radians)
 int ObjectRef::l_set_look_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+
+       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;
+       if (co == NULL) return 0;
+       float yaw = readParam<float>(L, 2) * core::RADTODEG;
        // Do it
-       co->setYaw(yaw);
+       co->setPlayerYawAndSend(yaw);
        return 1;
 }
 
+// set_fov(self, degrees[, is_multiplier, transition_time])
+int ObjectRef::l_set_fov(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+
+       player->setFov({
+               static_cast<f32>(luaL_checknumber(L, 2)),
+               readParam<bool>(L, 3, false),
+               lua_isnumber(L, 4) ? static_cast<f32>(luaL_checknumber(L, 4)) : 0.0f
+       });
+       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(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               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;
+       if (co == NULL) return 0;
        u16 breath = luaL_checknumber(L, 2);
-       // Do it
        co->setBreath(breath);
 
-       // If the object is a player sent the breath to client
-       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
-                       getServer(L)->SendPlayerBreath(((PlayerSAO*)co)->getPeerID());
-
        return 0;
 }
 
@@ -829,20 +1305,77 @@ 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;
+       if (co == NULL) return 0;
        // Do it
        u16 breath = co->getBreath();
        lua_pushinteger (L, breath);
        return 1;
 }
 
+// set_attribute(self, attribute, value)
+int ObjectRef::l_set_attribute(lua_State *L)
+{
+       log_deprecated(L,
+               "Deprecated call to set_attribute, use MetaDataRef methods instead.");
+
+       ObjectRef *ref = checkobject(L, 1);
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL)
+               return 0;
+
+       std::string attr = luaL_checkstring(L, 2);
+       if (lua_isnil(L, 3)) {
+               co->getMeta().removeString(attr);
+       } else {
+               std::string value = luaL_checkstring(L, 3);
+               co->getMeta().setString(attr, value);
+       }
+       return 1;
+}
+
+// get_attribute(self, attribute)
+int ObjectRef::l_get_attribute(lua_State *L)
+{
+       log_deprecated(L,
+               "Deprecated call to get_attribute, use MetaDataRef methods instead.");
+
+       ObjectRef *ref = checkobject(L, 1);
+       PlayerSAO* co = getplayersao(ref);
+       if (co == NULL)
+               return 0;
+
+       std::string attr = luaL_checkstring(L, 2);
+
+       std::string value;
+       if (co->getMeta().getStringToRef(attr, value)) {
+               lua_pushstring(L, value.c_str());
+               return 1;
+       }
+
+       return 0;
+}
+
+
+// get_meta(self, attribute)
+int ObjectRef::l_get_meta(lua_State *L)
+{
+       ObjectRef *ref = checkobject(L, 1);
+       PlayerSAO *co = getplayersao(ref);
+       if (co == NULL)
+               return 0;
+
+       PlayerMetaRef::create(L, &co->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);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) return 0;
        std::string formspec = luaL_checkstring(L, 2);
 
        player->inventory_formspec = formspec;
@@ -856,26 +1389,57 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL) return 0;
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) 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(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+               return 0;
+
+       std::string formspec = luaL_checkstring(L, 2);
+
+       player->formspec_prepend = formspec;
+       getServer(L)->reportFormspecPrependModified(player->getName());
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_formspec_prepend(self) -> formspec
+int ObjectRef::l_get_formspec_prepend(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+                return 0;
+
+       std::string formspec = player->formspec_prepend;
+       lua_pushlstring(L, formspec.c_str(), formspec.size());
+       return 1;
+}
+
 // get_player_control(self)
 int ObjectRef::l_get_player_control(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
-       // Do it
-       PlayerControl control = player->getPlayerControl();
+
+       const PlayerControl &control = player->getPlayerControl();
        lua_newtable(L);
        lua_pushboolean(L, control.up);
        lua_setfield(L, -2, "up");
@@ -895,6 +1459,8 @@ int ObjectRef::l_get_player_control(lua_State *L)
        lua_setfield(L, -2, "LMB");
        lua_pushboolean(L, control.RMB);
        lua_setfield(L, -2, "RMB");
+       lua_pushboolean(L, control.zoom);
+       lua_setfield(L, -2, "zoom");
        return 1;
 }
 
@@ -903,8 +1469,8 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
-       if(player == NULL){
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
        }
@@ -916,57 +1482,17 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 // hud_add(self, form)
 int ObjectRef::l_hud_add(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                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);
-
-       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);
-
-       // Deprecated, only for compatibility's sake
-       if (elem->dir == 0)
-               elem->dir = getintfield_default(L, 2, "dir", 0);
-
-       lua_getfield(L, 2, "alignment");
-       elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
-
-       lua_getfield(L, 2, "offset");
-       elem->offset = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
-       lua_pop(L, 1);
-
-       lua_getfield(L, 2, "world_pos");
-       elem->world_pos = lua_istable(L, -1) ? read_v3f(L, -1) : v3f();
-       lua_pop(L, 1);
-
-       /* check for known deprecated element usage */
-       if ((elem->type  == HUD_ELEM_STATBAR) && (elem->size == v2s32())) {
-               log_deprecated(L,"Deprecated usage of statbar without size!");
-       }
+       read_hud_element(L, elem);
 
        u32 id = getServer(L)->hudAdd(player, elem);
-       if (id == (u32)-1) {
+       if (id == U32_MAX) {
                delete elem;
                return 0;
        }
@@ -978,8 +1504,9 @@ int ObjectRef::l_hud_add(lua_State *L)
 // hud_remove(self, id)
 int ObjectRef::l_hud_remove(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -997,8 +1524,9 @@ int ObjectRef::l_hud_remove(lua_State *L)
 // hud_change(self, id, stat, data)
 int ObjectRef::l_hud_change(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -1008,61 +1536,8 @@ int ObjectRef::l_hud_change(lua_State *L)
        if (!e)
                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;
-       }
-
        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;
-       }
+       HudElementStat stat = read_hud_change(L, e, &value);
 
        getServer(L)->hudChange(player, id, stat, value);
 
@@ -1073,8 +1548,9 @@ int ObjectRef::l_hud_change(lua_State *L)
 // hud_get(self, id)
 int ObjectRef::l_hud_get(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -1083,48 +1559,16 @@ int ObjectRef::l_hud_get(lua_State *L)
        HudElement *e = player->getHud(id);
        if (!e)
                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, e);
        return 1;
 }
 
 // hud_set_flags(self, flags)
 int ObjectRef::l_hud_set_flags(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -1148,8 +1592,9 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
 
 int ObjectRef::l_hud_get_flags(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -1164,6 +1609,10 @@ int ObjectRef::l_hud_get_flags(lua_State *L)
        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");
+       lua_pushboolean(L, player->hud_flags & HUD_FLAG_MINIMAP_RADAR_VISIBLE);
+       lua_setfield(L, -2, "minimap_radar");
 
        return 1;
 }
@@ -1171,8 +1620,9 @@ int ObjectRef::l_hud_get_flags(lua_State *L)
 // hud_set_hotbar_itemcount(self, hotbar_itemcount)
 int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
@@ -1185,92 +1635,569 @@ int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
        return 1;
 }
 
+// hud_get_hotbar_itemcount(self)
+int ObjectRef::l_hud_get_hotbar_itemcount(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+               return 0;
+
+       lua_pushnumber(L, player->getHotbarItemcount());
+       return 1;
+}
+
 // hud_set_hotbar_image(self, name)
 int ObjectRef::l_hud_set_hotbar_image(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
-       std::string name = lua_tostring(L, 2);
+       std::string name = readParam<std::string>(L, 2);
 
        getServer(L)->hudSetHotbarImage(player, name);
        return 1;
 }
 
+// hud_get_hotbar_image(self)
+int ObjectRef::l_hud_get_hotbar_image(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
+               return 0;
+
+       const std::string &name = player->getHotbarImage();
+       lua_pushlstring(L, name.c_str(), name.size());
+       return 1;
+}
+
 // hud_set_hotbar_selected_image(self, name)
 int ObjectRef::l_hud_set_hotbar_selected_image(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
-       std::string name = lua_tostring(L, 2);
+       std::string name = readParam<std::string>(L, 2);
 
        getServer(L)->hudSetHotbarSelectedImage(player, name);
        return 1;
 }
 
-// set_sky(self, bgcolor, type, list)
-int ObjectRef::l_set_sky(lua_State *L)
+// hud_get_hotbar_selected_image(self)
+int ObjectRef::l_hud_get_hotbar_selected_image(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
-       video::SColor bgcolor(255,255,255,255);
-       if (!lua_isnil(L, 2))
-               bgcolor = readARGB8(L, 2);
+       const std::string &name = player->getHotbarSelectedImage();
+       lua_pushlstring(L, name.c_str(), name.size());
+       return 1;
+}
 
-       std::string type = luaL_checkstring(L, 3);
+// set_sky(self, {base_color=, type=, textures=, clouds=, sky_colors={}})
+int ObjectRef::l_set_sky(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
 
-       std::vector<std::string> params;
-       if (lua_istable(L, 4)) {
-               int table = lua_gettop(L);
-               lua_pushnil(L);
-               while (lua_next(L, table) != 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
+       bool is_colorspec = is_color_table(L, 2);
+
+       SkyboxParams skybox_params = player->getSkyParams();
+       if (lua_istable(L, 2) && !is_colorspec) {
+               lua_getfield(L, 2, "base_color");
+               if (!lua_isnil(L, -1))
+                       read_color(L, -1, &skybox_params.bgcolor);
+               lua_pop(L, 1);
+
+               lua_getfield(L, 2, "type");
+               if (!lua_isnil(L, -1))
+                       skybox_params.type = luaL_checkstring(L, -1);
+               lua_pop(L, 1);
+
+               lua_getfield(L, 2, "textures");
+               skybox_params.textures.clear();
+               if (lua_istable(L, -1) && skybox_params.type == "skybox") {
+                       lua_pushnil(L);
+                       while (lua_next(L, -2) != 0) {
+                               // Key is at index -2 and value at index -1
+                               skybox_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);
+
+               /*
+               We want to avoid crashes, so we're checking even if we're not using them.
+               However, we want to ensure that the skybox can be set to nil when
+               using "regular" or "plain" skybox modes as textures aren't needed.
+               */
+
+               if (skybox_params.textures.size() != 6 && skybox_params.textures.size() > 0)
+                       throw LuaError("Skybox expects 6 textures!");
+
+               skybox_params.clouds = getboolfield_default(L, 2,
+                       "clouds", skybox_params.clouds);
+
+               lua_getfield(L, 2, "sky_color");
+               if (lua_istable(L, -1)) {
+                       lua_getfield(L, -1, "day_sky");
+                       read_color(L, -1, &skybox_params.sky_color.day_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "day_horizon");
+                       read_color(L, -1, &skybox_params.sky_color.day_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "dawn_sky");
+                       read_color(L, -1, &skybox_params.sky_color.dawn_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "dawn_horizon");
+                       read_color(L, -1, &skybox_params.sky_color.dawn_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "night_sky");
+                       read_color(L, -1, &skybox_params.sky_color.night_sky);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "night_horizon");
+                       read_color(L, -1, &skybox_params.sky_color.night_horizon);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "indoors");
+                       read_color(L, -1, &skybox_params.sky_color.indoors);
+                       lua_pop(L, 1);
+
+                       // Prevent flickering clouds at dawn/dusk:
+                       skybox_params.fog_sun_tint = video::SColor(255, 255, 255, 255);
+                       lua_getfield(L, -1, "fog_sun_tint");
+                       read_color(L, -1, &skybox_params.fog_sun_tint);
+                       lua_pop(L, 1);
+
+                       skybox_params.fog_moon_tint = video::SColor(255, 255, 255, 255);
+                       lua_getfield(L, -1, "fog_moon_tint");
+                       read_color(L, -1, &skybox_params.fog_moon_tint);
+                       lua_pop(L, 1);
+
+                       lua_getfield(L, -1, "fog_tint_type");
+                       if (!lua_isnil(L, -1))
+                               skybox_params.fog_tint_type = luaL_checkstring(L, -1);
+                       lua_pop(L, 1);
+
+                       // Because we need to leave the "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
+               skybox_params.bgcolor = video::SColor(255, 255, 255, 255);
+               read_color(L, 2, &skybox_params.bgcolor);
+
+               skybox_params.type = luaL_checkstring(L, 3);
+
+               // Preserve old behaviour of the sun, moon and stars
+               // when using the old set_sky call.
+               if (skybox_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;
+               }
+
+               skybox_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
+                               if (lua_isstring(L, -1))
+                                       skybox_params.textures.emplace_back(readParam<std::string>(L, -1));
+                               else
+                                       skybox_params.textures.emplace_back("");
+                               // Remove the value, keep the key for the next iteration
+                               lua_pop(L, 1);
+                       }
+               }
+               if (skybox_params.type == "skybox" && skybox_params.textures.size() != 6)
+                       throw LuaError("Skybox expects 6 textures.");
+
+               skybox_params.clouds = true;
+               if (lua_isboolean(L, 5))
+                       skybox_params.clouds = readParam<bool>(L, 5);
+
+               getServer(L)->setSun(player, sun_params);
+               getServer(L)->setMoon(player, moon_params);
+               getServer(L)->setStars(player, star_params);
+       }
+       getServer(L)->setSky(player, skybox_params);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_sky(self)
+int ObjectRef::l_get_sky(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+
+       if (!player)
+               return 0;
+       SkyboxParams skybox_params;
+       skybox_params = player->getSkyParams();
+
+       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;
+}
 
-       if (type == "skybox" && params.size() != 6)
-               throw LuaError("skybox expects 6 textures");
+// get_sky_color(self)
+int ObjectRef::l_get_sky_color(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
 
-       if (!getServer(L)->setSky(player, bgcolor, type, params))
+       if (!player)
                return 0;
 
+       const SkyboxParams& skybox_params = player->getSkyParams();
+
+       lua_newtable(L);
+       if (skybox_params.type == "regular") {
+               push_ARGB8(L, skybox_params.sky_color.day_sky);
+               lua_setfield(L, -2, "day_sky");
+               push_ARGB8(L, skybox_params.sky_color.day_horizon);
+               lua_setfield(L, -2, "day_horizon");
+               push_ARGB8(L, skybox_params.sky_color.dawn_sky);
+               lua_setfield(L, -2, "dawn_sky");
+               push_ARGB8(L, skybox_params.sky_color.dawn_horizon);
+               lua_setfield(L, -2, "dawn_horizon");
+               push_ARGB8(L, skybox_params.sky_color.night_sky);
+               lua_setfield(L, -2, "night_sky");
+               push_ARGB8(L, skybox_params.sky_color.night_horizon);
+               lua_setfield(L, -2, "night_horizon");
+               push_ARGB8(L, skybox_params.sky_color.indoors);
+               lua_setfield(L, -2, "indoors");
+       }
+       push_ARGB8(L, skybox_params.fog_sun_tint);
+       lua_setfield(L, -2, "fog_sun_tint");
+       push_ARGB8(L, skybox_params.fog_moon_tint);
+       lua_setfield(L, -2, "fog_moon_tint");
+       lua_pushstring(L, skybox_params.fog_tint_type.c_str());
+       lua_setfield(L, -2, "fog_tint_type");
+       return 1;
+}
+
+// set_sun(self, {visible, texture=, tonemap=, sunrise=, rotation=, scale=})
+int ObjectRef::l_set_sun(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+
+       if (!lua_istable(L, 2))
+               return 0;
+
+       SunParams sun_params = player->getSunParams();
+
+       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);
+
+       getServer(L)->setSun(player, sun_params);
        lua_pushboolean(L, true);
        return 1;
 }
 
+//get_sun(self)
+int ObjectRef::l_get_sun(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       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, {visible, texture=, tonemap=, sunrise=, rotation=, scale=})
+int ObjectRef::l_set_moon(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       if (!lua_istable(L, 2))
+               return 0;
+
+       MoonParams moon_params = player->getMoonParams();
+
+       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);
+
+       getServer(L)->setMoon(player, moon_params);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_moon(self)
+int ObjectRef::l_get_moon(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       const MoonParams &moon_params = player->getMoonParams();
+
+       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, {visible, count=, starcolor=, rotation=, scale=})
+int ObjectRef::l_set_stars(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       if (!lua_istable(L, 2))
+               return 0;
+
+       StarParams star_params = player->getStarParams();
+
+       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);
+
+       getServer(L)->setStars(player, star_params);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_stars(self)
+int ObjectRef::l_get_stars(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               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");
+
+       return 1;
+}
+
+// set_clouds(self, {density=, color=, ambient=, height=, thickness=, speed=})
+int ObjectRef::l_set_clouds(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       if (!lua_istable(L, 2))
+               return 0;
+
+       CloudParams cloud_params = player->getCloudParams();
+
+       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);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+int ObjectRef::l_get_clouds(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (!player)
+               return 0;
+       const CloudParams &cloud_params = player->getCloudParams();
+
+       lua_newtable(L);
+       lua_pushnumber(L, cloud_params.density);
+       lua_setfield(L, -2, "density");
+       push_ARGB8(L, cloud_params.color_bright);
+       lua_setfield(L, -2, "color");
+       push_ARGB8(L, cloud_params.color_ambient);
+       lua_setfield(L, -2, "ambient");
+       lua_pushnumber(L, cloud_params.height);
+       lua_setfield(L, -2, "height");
+       lua_pushnumber(L, cloud_params.thickness);
+       lua_setfield(L, -2, "thickness");
+       lua_newtable(L);
+       lua_pushnumber(L, cloud_params.speed.X);
+       lua_setfield(L, -2, "x");
+       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)
 int ObjectRef::l_override_day_night_ratio(lua_State *L)
 {
+       NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL)
                return 0;
 
        bool do_override = false;
        float ratio = 0.0f;
-       if (!lua_isnil(L, 2)){
+       if (!lua_isnil(L, 2)) {
                do_override = true;
-               ratio = luaL_checknumber(L, 2);
+               ratio = readParam<float>(L, 2);
        }
 
-       if (!getServer(L)->overrideDayNightRatio(player, do_override, ratio))
+       getServer(L)->overrideDayNightRatio(player, do_override, ratio);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// get_day_night_ratio(self)
+int ObjectRef::l_get_day_night_ratio(lua_State *L)
+{
+       NO_MAP_LOCK_REQUIRED;
+       ObjectRef *ref = checkobject(L, 1);
+       RemotePlayer *player = getplayer(ref);
+       if (player == NULL)
                return 0;
 
-       lua_pushboolean(L, true);
+       bool do_override;
+       float ratio;
+       player->getDayNightRatio(&do_override, &ratio);
+
+       if (do_override)
+               lua_pushnumber(L, ratio);
+       else
+               lua_pushnil(L);
+
        return 1;
 }
 
@@ -1280,15 +2207,6 @@ ObjectRef::ObjectRef(ServerActiveObject *object):
        //infostream<<"ObjectRef created for id="<<m_object->getId()<<std::endl;
 }
 
-ObjectRef::~ObjectRef()
-{
-       /*if(m_object)
-               infostream<<"ObjectRef destructing for id="
-                               <<m_object->getId()<<std::endl;
-       else
-               infostream<<"ObjectRef destructing for id=unknown"<<std::endl;*/
-}
-
 // 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)
@@ -1327,6 +2245,7 @@ void ObjectRef::Register(lua_State *L)
 
        lua_pop(L, 1);  // drop metatable
 
+       markAliasDeprecated(methods);
        luaL_openlib(L, 0, methods, 0);  // fill methodtable
        lua_pop(L, 1);  // drop methodtable
 
@@ -1335,12 +2254,12 @@ void ObjectRef::Register(lua_State *L)
 }
 
 const char ObjectRef::className[] = "ObjectRef";
-const luaL_reg ObjectRef::methods[] = {
+luaL_Reg ObjectRef::methods[] = {
        // ServerActiveObject
        luamethod(ObjectRef, remove),
-       luamethod(ObjectRef, getpos),
-       luamethod(ObjectRef, setpos),
-       luamethod(ObjectRef, moveto),
+       luamethod_aliased(ObjectRef, get_pos, getpos),
+       luamethod_aliased(ObjectRef, set_pos, setpos),
+       luamethod_aliased(ObjectRef, move_to, moveto),
        luamethod(ObjectRef, punch),
        luamethod(ObjectRef, right_click),
        luamethod(ObjectRef, set_hp),
@@ -1351,38 +2270,63 @@ const luaL_reg ObjectRef::methods[] = {
        luamethod(ObjectRef, get_wielded_item),
        luamethod(ObjectRef, set_wielded_item),
        luamethod(ObjectRef, set_armor_groups),
-       luamethod(ObjectRef, set_physics_override),
+       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, set_detach),
        luamethod(ObjectRef, set_properties),
+       luamethod(ObjectRef, get_properties),
+       luamethod(ObjectRef, set_nametag_attributes),
+       luamethod(ObjectRef, get_nametag_attributes),
        // LuaEntitySAO-only
-       luamethod(ObjectRef, setvelocity),
-       luamethod(ObjectRef, getvelocity),
-       luamethod(ObjectRef, setacceleration),
-       luamethod(ObjectRef, getacceleration),
-       luamethod(ObjectRef, setyaw),
-       luamethod(ObjectRef, getyaw),
-       luamethod(ObjectRef, settexturemod),
-       luamethod(ObjectRef, setsprite),
+       luamethod_aliased(ObjectRef, set_velocity, setvelocity),
+       luamethod(ObjectRef, add_velocity),
+       luamethod_aliased(ObjectRef, get_velocity, getvelocity),
+       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_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, add_player_velocity),
        luamethod(ObjectRef, get_look_dir),
        luamethod(ObjectRef, get_look_pitch),
        luamethod(ObjectRef, get_look_yaw),
+       luamethod(ObjectRef, get_look_vertical),
+       luamethod(ObjectRef, get_look_horizontal),
+       luamethod(ObjectRef, set_look_horizontal),
+       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),
+       luamethod(ObjectRef, get_physics_override),
        luamethod(ObjectRef, hud_add),
        luamethod(ObjectRef, hud_remove),
        luamethod(ObjectRef, hud_change),
@@ -1390,11 +2334,28 @@ const luaL_reg ObjectRef::methods[] = {
        luamethod(ObjectRef, hud_set_flags),
        luamethod(ObjectRef, hud_get_flags),
        luamethod(ObjectRef, hud_set_hotbar_itemcount),
+       luamethod(ObjectRef, hud_get_hotbar_itemcount),
        luamethod(ObjectRef, hud_set_hotbar_image),
+       luamethod(ObjectRef, hud_get_hotbar_image),
        luamethod(ObjectRef, hud_set_hotbar_selected_image),
+       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),
+       luamethod(ObjectRef, get_day_night_ratio),
        luamethod(ObjectRef, set_local_animation),
+       luamethod(ObjectRef, get_local_animation),
        luamethod(ObjectRef, set_eye_offset),
+       luamethod(ObjectRef, get_eye_offset),
+       luamethod(ObjectRef, send_mapblock),
        {0,0}
 };