]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/script/lua_api/l_object.cpp
Clouds API: change speed from 'y' to 'z', ColorSpecs in Lua docs (#6164)
[dragonfireclient.git] / src / script / lua_api / l_object.cpp
index 4e1a1c1598c37bdb52a079c4600fecdd6e218446..7d2eba8e252e28a5e46075ec3227d7b61e512781 100644 (file)
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_sao.h"
 #include "server.h"
 #include "hud.h"
-#include "scripting_game.h"
+#include "scripting_server.h"
 
 struct EnumString es_HudElementType[] =
 {
@@ -107,7 +107,7 @@ PlayerSAO* ObjectRef::getplayersao(ObjectRef *ref)
        return (PlayerSAO*)obj;
 }
 
-RemotePlayerObjectRef::getplayer(ObjectRef *ref)
+RemotePlayer *ObjectRef::getplayer(ObjectRef *ref)
 {
        PlayerSAO *playersao = getplayersao(ref);
        if (playersao == NULL)
@@ -137,11 +137,12 @@ int ObjectRef::l_remove(lua_State *L)
        if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
                return 0;
 
-       std::set<int> child_ids = co->getAttachmentChildIds();
-       std::set<int>::iterator it;
+       const std::unordered_set<int> &child_ids = co->getAttachmentChildIds();
+       std::unordered_set<int>::const_iterator it;
        for (it = child_ids.begin(); it != child_ids.end(); ++it) {
-               ServerActiveObject *child = env->getActiveObject(*it);
-               child->setAttachment(0, "", v3f(0, 0, 0), v3f(0, 0, 0));
+               // 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));
        }
 
        verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
@@ -149,9 +150,9 @@ int ObjectRef::l_remove(lua_State *L)
        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);
@@ -168,8 +169,8 @@ int ObjectRef::l_getpos(lua_State *L)
        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);
@@ -183,8 +184,8 @@ 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);
@@ -363,7 +364,7 @@ int ObjectRef::l_set_wielded_item(lua_State *L)
        ServerActiveObject *co = getobject(ref);
        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));
@@ -395,13 +396,12 @@ int ObjectRef::l_get_armor_groups(lua_State *L)
        if (co == NULL)
                return 0;
        // Do it
-       ItemGroupList groups = co->getArmorGroups();
-       push_groups(L, groups);
+       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;
@@ -410,11 +410,18 @@ int ObjectRef::l_set_physics_override(lua_State *L)
        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
@@ -454,6 +461,8 @@ int ObjectRef::l_get_physics_override(lua_State *L)
        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;
 }
 
@@ -508,7 +517,7 @@ int ObjectRef::l_set_local_animation(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;
        // Do it
@@ -533,7 +542,7 @@ int ObjectRef::l_get_local_animation(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;
 
@@ -554,7 +563,7 @@ int ObjectRef::l_set_eye_offset(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;
        // Do it
@@ -584,7 +593,7 @@ int ObjectRef::l_get_eye_offset(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;
        // Do it
@@ -606,10 +615,10 @@ int ObjectRef::l_set_bone_position(lua_State *L)
                bone = lua_tostring(L, 2);
        v3f position = v3f(0, 0, 0);
        if (!lua_isnil(L, 3))
-               position = read_v3f(L, 3);
+               position = check_v3f(L, 3);
        v3f rotation = v3f(0, 0, 0);
        if (!lua_isnil(L, 4))
-               rotation = read_v3f(L, 4);
+               rotation = check_v3f(L, 4);
        co->setBonePosition(bone, position, rotation);
        return 0;
 }
@@ -717,11 +726,13 @@ int ObjectRef::l_set_detach(lua_State *L)
        v3f rotation;
        co->getAttachment(&parent_id, &bone, &position, &rotation);
        ServerActiveObject *parent = NULL;
-       if (parent_id)
+       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
-       co->setAttachment(0, "", v3f(0,0,0), v3f(0,0,0));
        if (parent != NULL)
                parent->removeAttachmentChild(co->getId());
        return 0;
@@ -737,7 +748,7 @@ int ObjectRef::l_set_properties(lua_State *L)
        ObjectProperties *prop = co->accessObjectProperties();
        if (!prop)
                return 0;
-       read_object_properties(L, 2, prop);
+       read_object_properties(L, 2, prop, getServer(L)->idef());
        co->notifyObjectPropertiesModified();
        return 0;
 }
@@ -762,7 +773,7 @@ int ObjectRef::l_is_player(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        lua_pushboolean(L, (player != NULL));
        return 1;
 }
@@ -789,8 +800,7 @@ int ObjectRef::l_set_nametag_attributes(lua_State *L)
        lua_pop(L, 1);
 
        std::string nametag = getstringfield_default(L, 2, "text", "");
-       if (nametag != "")
-               prop->nametag = nametag;
+       prop->nametag = nametag;
 
        co->notifyObjectPropertiesModified();
        lua_pushboolean(L, true);
@@ -822,8 +832,8 @@ int ObjectRef::l_get_nametag_attributes(lua_State *L)
 
 /* 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);
@@ -835,8 +845,8 @@ int ObjectRef::l_setvelocity(lua_State *L)
        return 0;
 }
 
-// getvelocity(self)
-int ObjectRef::l_getvelocity(lua_State *L)
+// get_velocity(self)
+int ObjectRef::l_get_velocity(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
@@ -848,8 +858,8 @@ int ObjectRef::l_getvelocity(lua_State *L)
        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);
@@ -862,8 +872,8 @@ 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);
@@ -875,8 +885,8 @@ int ObjectRef::l_getacceleration(lua_State *L)
        return 1;
 }
 
-// setyaw(self, radians)
-int ObjectRef::l_setyaw(lua_State *L)
+// set_yaw(self, radians)
+int ObjectRef::l_set_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
@@ -888,8 +898,8 @@ int ObjectRef::l_setyaw(lua_State *L)
        return 0;
 }
 
-// getyaw(self)
-int ObjectRef::l_getyaw(lua_State *L)
+// get_yaw(self)
+int ObjectRef::l_get_yaw(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
@@ -901,8 +911,8 @@ int ObjectRef::l_getyaw(lua_State *L)
        return 1;
 }
 
-// settexturemod(self, mod)
-int ObjectRef::l_settexturemod(lua_State *L)
+// set_texture_mod(self, mod)
+int ObjectRef::l_set_texture_mod(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
@@ -914,9 +924,22 @@ int ObjectRef::l_settexturemod(lua_State *L)
        return 0;
 }
 
-// setsprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
+// 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_setsprite(lua_State *L)
+int ObjectRef::l_set_sprite(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
@@ -973,7 +996,7 @@ int ObjectRef::l_is_player_connected(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        lua_pushboolean(L, (player != NULL && player->peer_id != 0));
        return 1;
 }
@@ -983,7 +1006,7 @@ int ObjectRef::l_get_player_name(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
@@ -998,7 +1021,7 @@ int ObjectRef::l_get_player_velocity(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL) {
                lua_pushnil(L);
                return 1;
@@ -1013,11 +1036,11 @@ 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->getRadPitchDep();
-       float yaw = player->getRadYawDep();
+       float pitch = co->getRadPitchDep();
+       float yaw = co->getRadYawDep();
        v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
        push_v3f(L, v);
        return 1;
@@ -1033,10 +1056,10 @@ int ObjectRef::l_get_look_pitch(lua_State *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->getRadPitchDep());
+       lua_pushnumber(L, co->getRadPitchDep());
        return 1;
 }
 
@@ -1050,10 +1073,10 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
                "Deprecated call to get_look_yaw, use get_look_horizontal 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->getRadYawDep());
+       lua_pushnumber(L, co->getRadYawDep());
        return 1;
 }
 
@@ -1062,10 +1085,10 @@ int ObjectRef::l_get_look_vertical(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->getRadPitch());
+       lua_pushnumber(L, co->getRadPitch());
        return 1;
 }
 
@@ -1074,10 +1097,10 @@ 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->getRadYaw());
        return 1;
 }
 
@@ -1090,7 +1113,7 @@ int ObjectRef::l_set_look_vertical(lua_State *L)
        if (co == NULL) return 0;
        float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setPitch(pitch);
+       co->setPitchAndSend(pitch);
        return 1;
 }
 
@@ -1103,7 +1126,7 @@ int ObjectRef::l_set_look_horizontal(lua_State *L)
        if (co == NULL) return 0;
        float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setYaw(yaw);
+       co->setYawAndSend(yaw);
        return 1;
 }
 
@@ -1121,7 +1144,7 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
        if (co == NULL) return 0;
        float pitch = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setPitch(pitch);
+       co->setPitchAndSend(pitch);
        return 1;
 }
 
@@ -1139,7 +1162,7 @@ int ObjectRef::l_set_look_yaw(lua_State *L)
        if (co == NULL) return 0;
        float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
        // Do it
-       co->setYaw(yaw);
+       co->setYawAndSend(yaw);
        return 1;
 }
 
@@ -1151,13 +1174,8 @@ int ObjectRef::l_set_breath(lua_State *L)
        PlayerSAO* co = getplayersao(ref);
        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;
 }
 
@@ -1174,12 +1192,52 @@ int ObjectRef::l_get_breath(lua_State *L)
        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) {
+               return 0;
+       }
+
+       std::string attr = luaL_checkstring(L, 2);
+       if (lua_isnil(L, 3)) {
+               co->removeExtendedAttribute(attr);
+       } else {
+               std::string value = luaL_checkstring(L, 3);
+               co->setExtendedAttribute(attr, value);
+       }
+       return 1;
+}
+
+// get_attribute(self, attribute)
+int ObjectRef::l_get_attribute(lua_State *L)
+{
+       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->getExtendedAttribute(attr, &value)) {
+               lua_pushstring(L, value.c_str());
+               return 1;
+       }
+
+       return 0;
+}
+
+
 // 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);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL) return 0;
        std::string formspec = luaL_checkstring(L, 2);
 
@@ -1194,7 +1252,7 @@ int ObjectRef::l_get_inventory_formspec(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 formspec = player->inventory_formspec;
@@ -1207,7 +1265,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
@@ -1241,7 +1299,7 @@ int ObjectRef::l_get_player_control_bits(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
-       Player *player = getplayer(ref);
+       RemotePlayer *player = getplayer(ref);
        if (player == NULL) {
                lua_pushlstring(L, "", 0);
                return 1;
@@ -1256,7 +1314,7 @@ 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;
 
@@ -1319,7 +1377,7 @@ 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;
 
@@ -1339,7 +1397,7 @@ 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;
 
@@ -1416,7 +1474,7 @@ 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;
 
@@ -1493,7 +1551,7 @@ 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;
 
@@ -1552,7 +1610,7 @@ 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;
 
@@ -1567,7 +1625,7 @@ int ObjectRef::l_hud_get_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;
 
@@ -1581,7 +1639,7 @@ 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;
 
@@ -1596,21 +1654,21 @@ 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;
 
-       std::string name = getServer(L)->hudGetHotbarSelectedImage(player);
+       const std::string &name = getServer(L)->hudGetHotbarSelectedImage(player);
        lua_pushlstring(L, name.c_str(), name.size());
        return 1;
 }
 
-// set_sky(self, bgcolor, type, list)
+// set_sky(self, bgcolor, type, list, clouds = true)
 int ObjectRef::l_set_sky(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;
 
@@ -1621,9 +1679,8 @@ int ObjectRef::l_set_sky(lua_State *L)
 
        std::vector<std::string> params;
        if (lua_istable(L, 4)) {
-               int table = lua_gettop(L);
                lua_pushnil(L);
-               while (lua_next(L, table) != 0) {
+               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));
@@ -1637,7 +1694,11 @@ int ObjectRef::l_set_sky(lua_State *L)
        if (type == "skybox" && params.size() != 6)
                throw LuaError("skybox expects 6 textures");
 
-       if (!getServer(L)->setSky(player, bgcolor, type, params))
+       bool clouds = true;
+       if (lua_isboolean(L, 5))
+               clouds = lua_toboolean(L, 5);
+
+       if (!getServer(L)->setSky(player, bgcolor, type, params, clouds))
                return 0;
 
        lua_pushboolean(L, true);
@@ -1649,14 +1710,15 @@ int ObjectRef::l_get_sky(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);
        std::string type;
        std::vector<std::string> params;
+       bool clouds;
 
-       player->getSky(&bgcolor, &type, &params);
+       player->getSky(&bgcolor, &type, &params, &clouds);
        type = type == "" ? "regular" : type;
 
        push_ARGB8(L, bgcolor);
@@ -1669,9 +1731,89 @@ int ObjectRef::l_get_sky(lua_State *L)
                lua_rawseti(L, -2, i);
                i++;
        }
-       return 3;
+       lua_pushboolean(L, clouds);
+       return 4;
 }
 
+// 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);
+
+       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))
+               return 0;
+
+       player->setCloudParams(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)
 {
@@ -1777,12 +1919,12 @@ void ObjectRef::Register(lua_State *L)
 }
 
 const char ObjectRef::className[] = "ObjectRef";
-const luaL_reg ObjectRef::methods[] = {
+const 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),
@@ -1806,14 +1948,14 @@ const luaL_reg ObjectRef::methods[] = {
        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_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_aliased(ObjectRef, set_texture_mod, settexturemod),
+       luamethod_aliased(ObjectRef, set_sprite, setsprite),
        luamethod(ObjectRef, get_entity_name),
        luamethod(ObjectRef, get_luaentity),
        // Player-only
@@ -1832,6 +1974,8 @@ const luaL_reg ObjectRef::methods[] = {
        luamethod(ObjectRef, set_look_pitch),
        luamethod(ObjectRef, get_breath),
        luamethod(ObjectRef, set_breath),
+       luamethod(ObjectRef, get_attribute),
+       luamethod(ObjectRef, set_attribute),
        luamethod(ObjectRef, set_inventory_formspec),
        luamethod(ObjectRef, get_inventory_formspec),
        luamethod(ObjectRef, get_player_control),
@@ -1852,6 +1996,8 @@ const luaL_reg ObjectRef::methods[] = {
        luamethod(ObjectRef, hud_get_hotbar_selected_image),
        luamethod(ObjectRef, set_sky),
        luamethod(ObjectRef, get_sky),
+       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),