WIP node metadata, node timers
[oweals/minetest.git] / src / scriptapi.cpp
index 8350c75f19b63aa1480f901cb1cbd1745db00db8..72a47308341caf8b27dc80ba518ce5f8aa5fca16 100644 (file)
@@ -33,9 +33,8 @@ extern "C" {
 #include "filesys.h"
 #include "serverobject.h"
 #include "script.h"
-//#include "luna.h"
-#include "luaentity_common.h"
-#include "content_sao.h" // For LuaEntitySAO
+#include "object_properties.h"
+#include "content_sao.h" // For LuaEntitySAO and PlayerSAO
 #include "itemdef.h"
 #include "nodedef.h"
 #include "craftdef.h"
@@ -45,6 +44,9 @@ extern "C" {
 #include "mapblock.h" // For getNodeBlockPos
 #include "content_nodemeta.h"
 #include "utility.h"
+#include "tool.h"
+#include "daynightratio.h"
+#include "noise.h" // PseudoRandom for LuaPseudoRandom
 
 static void stackDump(lua_State *L, std::ostream &o)
 {
@@ -139,14 +141,14 @@ static Server* get_server(lua_State *L)
        return server;
 }
 
-static ServerEnvironment* get_env(lua_State *L)
+/*static ServerEnvironment* get_env(lua_State *L)
 {
        // Get environment from registry
        lua_getfield(L, LUA_REGISTRYINDEX, "minetest_env");
        ServerEnvironment *env = (ServerEnvironment*)lua_touserdata(L, -1);
        lua_pop(L, 1);
        return env;
-}
+}*/
 
 static void objectref_get(lua_State *L, u16 id)
 {
@@ -416,14 +418,6 @@ struct EnumString es_NodeBoxType[] =
        {0, NULL},
 };
 
-struct EnumString es_Diggability[] =
-{
-       {DIGGABLE_NOT, "not"},
-       {DIGGABLE_NORMAL, "normal"},
-       {DIGGABLE_CONSTANT, "constant"},
-       {0, NULL},
-};
-
 /*
        C struct <-> Lua table converter functions
 */
@@ -612,6 +606,7 @@ static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index, f32 scale)
        return box;
 }
 
+#if 0
 /*
        MaterialProperties
 */
@@ -630,87 +625,188 @@ static MaterialProperties read_material_properties(
        getfloatfield(L, -1, "flammability", prop.flammability);
        return prop;
 }
+#endif
+
+/*
+       Groups
+*/
+static void read_groups(lua_State *L, int index,
+               std::map<std::string, int> &result)
+{
+       result.clear();
+       lua_pushnil(L);
+       if(index < 0)
+               index -= 1;
+       while(lua_next(L, index) != 0){
+               // key at index -2 and value at index -1
+               std::string name = luaL_checkstring(L, -2);
+               int rating = luaL_checkinteger(L, -1);
+               result[name] = rating;
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+       }
+}
+
+/*
+       Privileges
+*/
+static void read_privileges(lua_State *L, int index,
+               std::set<std::string> &result)
+{
+       result.clear();
+       lua_pushnil(L);
+       if(index < 0)
+               index -= 1;
+       while(lua_next(L, index) != 0){
+               // key at index -2 and value at index -1
+               std::string key = luaL_checkstring(L, -2);
+               bool value = lua_toboolean(L, -1);
+               if(value)
+                       result.insert(key);
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+       }
+}
 
 /*
-       ToolDiggingProperties
+       ToolCapabilities
 */
 
-static ToolDiggingProperties read_tool_digging_properties(
+static ToolCapabilities read_tool_capabilities(
                lua_State *L, int table)
 {
-       ToolDiggingProperties prop;
-       getfloatfield(L, table, "full_punch_interval", prop.full_punch_interval);
-       getfloatfield(L, table, "basetime", prop.basetime);
-       getfloatfield(L, table, "dt_weight", prop.dt_weight);
-       getfloatfield(L, table, "dt_crackiness", prop.dt_crackiness);
-       getfloatfield(L, table, "dt_crumbliness", prop.dt_crumbliness);
-       getfloatfield(L, table, "dt_cuttability", prop.dt_cuttability);
-       getfloatfield(L, table, "basedurability", prop.basedurability);
-       getfloatfield(L, table, "dd_weight", prop.dd_weight);
-       getfloatfield(L, table, "dd_crackiness", prop.dd_crackiness);
-       getfloatfield(L, table, "dd_crumbliness", prop.dd_crumbliness);
-       getfloatfield(L, table, "dd_cuttability", prop.dd_cuttability);
-       return prop;
+       ToolCapabilities toolcap;
+       getfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
+       getintfield(L, table, "max_drop_level", toolcap.max_drop_level);
+       lua_getfield(L, table, "groupcaps");
+       if(lua_istable(L, -1)){
+               int table_groupcaps = lua_gettop(L);
+               lua_pushnil(L);
+               while(lua_next(L, table_groupcaps) != 0){
+                       // key at index -2 and value at index -1
+                       std::string groupname = luaL_checkstring(L, -2);
+                       if(lua_istable(L, -1)){
+                               int table_groupcap = lua_gettop(L);
+                               // This will be created
+                               ToolGroupCap groupcap;
+                               // Read simple parameters
+                               getintfield(L, table_groupcap, "maxlevel", groupcap.maxlevel);
+                               getintfield(L, table_groupcap, "uses", groupcap.uses);
+                               // DEPRECATED: maxwear
+                               float maxwear = 0;
+                               if(getfloatfield(L, table_groupcap, "maxwear", maxwear)){
+                                       if(maxwear != 0)
+                                               groupcap.uses = 1.0/maxwear;
+                                       else
+                                               groupcap.uses = 0;
+                                       infostream<<script_get_backtrace(L)<<std::endl;
+                                       infostream<<"WARNING: field \"maxwear\" is deprecated; "
+                                                       <<"should replace with uses=1/maxwear"<<std::endl;
+                               }
+                               // Read "times" table
+                               lua_getfield(L, table_groupcap, "times");
+                               if(lua_istable(L, -1)){
+                                       int table_times = lua_gettop(L);
+                                       lua_pushnil(L);
+                                       while(lua_next(L, table_times) != 0){
+                                               // key at index -2 and value at index -1
+                                               int rating = luaL_checkinteger(L, -2);
+                                               float time = luaL_checknumber(L, -1);
+                                               groupcap.times[rating] = time;
+                                               // removes value, keeps key for next iteration
+                                               lua_pop(L, 1);
+                                       }
+                               }
+                               lua_pop(L, 1);
+                               // Insert groupcap into toolcap
+                               toolcap.groupcaps[groupname] = groupcap;
+                       }
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+               }
+       }
+       lua_pop(L, 1);
+       return toolcap;
 }
 
-static void set_tool_digging_properties(lua_State *L, int table,
-               const ToolDiggingProperties &prop)
-{
-       setfloatfield(L, table, "full_punch_interval", prop.full_punch_interval);
-       setfloatfield(L, table, "basetime", prop.basetime);
-       setfloatfield(L, table, "dt_weight", prop.dt_weight);
-       setfloatfield(L, table, "dt_crackiness", prop.dt_crackiness);
-       setfloatfield(L, table, "dt_crumbliness", prop.dt_crumbliness);
-       setfloatfield(L, table, "dt_cuttability", prop.dt_cuttability);
-       setfloatfield(L, table, "basedurability", prop.basedurability);
-       setfloatfield(L, table, "dd_weight", prop.dd_weight);
-       setfloatfield(L, table, "dd_crackiness", prop.dd_crackiness);
-       setfloatfield(L, table, "dd_crumbliness", prop.dd_crumbliness);
-       setfloatfield(L, table, "dd_cuttability", prop.dd_cuttability);
+static void set_tool_capabilities(lua_State *L, int table,
+               const ToolCapabilities &toolcap)
+{
+       setfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
+       setintfield(L, table, "max_drop_level", toolcap.max_drop_level);
+       // Create groupcaps table
+       lua_newtable(L);
+       // For each groupcap
+       for(std::map<std::string, ToolGroupCap>::const_iterator
+                       i = toolcap.groupcaps.begin(); i != toolcap.groupcaps.end(); i++){
+               // Create groupcap table
+               lua_newtable(L);
+               const std::string &name = i->first;
+               const ToolGroupCap &groupcap = i->second;
+               // Create subtable "times"
+               lua_newtable(L);
+               for(std::map<int, float>::const_iterator
+                               i = groupcap.times.begin(); i != groupcap.times.end(); i++){
+                       int rating = i->first;
+                       float time = i->second;
+                       lua_pushinteger(L, rating);
+                       lua_pushnumber(L, time);
+                       lua_settable(L, -3);
+               }
+               // Set subtable "times"
+               lua_setfield(L, -2, "times");
+               // Set simple parameters
+               setintfield(L, -1, "maxlevel", groupcap.maxlevel);
+               setintfield(L, -1, "uses", groupcap.uses);
+               // Insert groupcap table into groupcaps table
+               lua_setfield(L, -2, name.c_str());
+       }
+       // Set groupcaps table
+       lua_setfield(L, -2, "groupcaps");
 }
 
-static void push_tool_digging_properties(lua_State *L,
-               const ToolDiggingProperties &prop)
+static void push_tool_capabilities(lua_State *L,
+               const ToolCapabilities &prop)
 {
        lua_newtable(L);
-       set_tool_digging_properties(L, -1, prop);
+       set_tool_capabilities(L, -1, prop);
 }
 
 /*
-       DiggingProperties
+       DigParams
 */
 
-static void set_digging_properties(lua_State *L, int table,
-               const DiggingProperties &prop)
+static void set_dig_params(lua_State *L, int table,
+               const DigParams &params)
 {
-       setboolfield(L, table, "diggable", prop.diggable);
-       setfloatfield(L, table, "time", prop.time);
-       setintfield(L, table, "wear", prop.wear);
+       setboolfield(L, table, "diggable", params.diggable);
+       setfloatfield(L, table, "time", params.time);
+       setintfield(L, table, "wear", params.wear);
 }
 
-static void push_digging_properties(lua_State *L,
-               const DiggingProperties &prop)
+static void push_dig_params(lua_State *L,
+               const DigParams &params)
 {
        lua_newtable(L);
-       set_digging_properties(L, -1, prop);
+       set_dig_params(L, -1, params);
 }
 
 /*
-       HittingProperties
+       HitParams
 */
 
-static void set_hitting_properties(lua_State *L, int table,
-               const HittingProperties &prop)
+static void set_hit_params(lua_State *L, int table,
+               const HitParams &params)
 {
-       setintfield(L, table, "hp", prop.hp);
-       setintfield(L, table, "wear", prop.wear);
+       setintfield(L, table, "hp", params.hp);
+       setintfield(L, table, "wear", params.wear);
 }
 
-static void push_hitting_properties(lua_State *L,
-               const HittingProperties &prop)
+static void push_hit_params(lua_State *L,
+               const HitParams &params)
 {
        lua_newtable(L);
-       set_hitting_properties(L, -1, prop);
+       set_hit_params(L, -1, params);
 }
 
 /*
@@ -743,6 +839,85 @@ static void push_pointed_thing(lua_State *L, const PointedThing& pointed)
        }
 }
 
+/*
+       SimpleSoundSpec
+*/
+
+static void read_soundspec(lua_State *L, int index, SimpleSoundSpec &spec)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       if(lua_isnil(L, index)){
+       } else if(lua_istable(L, index)){
+               getstringfield(L, index, "name", spec.name);
+               getfloatfield(L, index, "gain", spec.gain);
+       } else if(lua_isstring(L, index)){
+               spec.name = lua_tostring(L, index);
+       }
+}
+
+/*
+       ObjectProperties
+*/
+
+static void read_object_properties(lua_State *L, int index,
+               ObjectProperties *prop)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       if(!lua_istable(L, index))
+               return;
+
+       prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
+
+       getboolfield(L, -1, "physical", prop->physical);
+
+       getfloatfield(L, -1, "weight", prop->weight);
+
+       lua_getfield(L, -1, "collisionbox");
+       if(lua_istable(L, -1))
+               prop->collisionbox = read_aabbox3df32(L, -1, 1.0);
+       lua_pop(L, 1);
+
+       getstringfield(L, -1, "visual", prop->visual);
+       
+       lua_getfield(L, -1, "visual_size");
+       if(lua_istable(L, -1))
+               prop->visual_size = read_v2f(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, -1, "textures");
+       if(lua_istable(L, -1)){
+               prop->textures.clear();
+               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))
+                               prop->textures.push_back(lua_tostring(L, -1));
+                       else
+                               prop->textures.push_back("");
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+               }
+       }
+       lua_pop(L, 1);
+       
+       lua_getfield(L, -1, "spritediv");
+       if(lua_istable(L, -1))
+               prop->spritediv = read_v2s16(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, -1, "initial_sprite_basepos");
+       if(lua_istable(L, -1))
+               prop->initial_sprite_basepos = read_v2s16(L, -1);
+       lua_pop(L, 1);
+       
+       getboolfield(L, -1, "is_visible", prop->is_visible);
+       getboolfield(L, -1, "makes_footstep_sound", prop->makes_footstep_sound);
+       getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);
+}
+
 /*
        ItemDefinition
 */
@@ -778,20 +953,26 @@ static ItemDefinition read_item_definition(lua_State *L, int index)
 
        getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
 
-       lua_getfield(L, index, "tool_digging_properties");
+       warn_if_field_exists(L, index, "tool_digging_properties",
+                       "deprecated: use tool_capabilities");
+       
+       lua_getfield(L, index, "tool_capabilities");
        if(lua_istable(L, -1)){
-               def.tool_digging_properties = new ToolDiggingProperties(
-                               read_tool_digging_properties(L, -1));
+               def.tool_capabilities = new ToolCapabilities(
+                               read_tool_capabilities(L, -1));
        }
-       lua_pop(L, 1);
 
-       // If name is "" (hand), ensure there are ToolDiggingProperties
+       // If name is "" (hand), ensure there are ToolCapabilities
        // because it will be looked up there whenever any other item has
-       // no ToolDiggingProperties
-       if(def.name == "" && def.tool_digging_properties == NULL){
-               def.tool_digging_properties = new ToolDiggingProperties();
+       // no ToolCapabilities
+       if(def.name == "" && def.tool_capabilities == NULL){
+               def.tool_capabilities = new ToolCapabilities();
        }
 
+       lua_getfield(L, index, "groups");
+       read_groups(L, -1, def.groups);
+       lua_pop(L, 1);
+
        return def;
 }
 
@@ -805,8 +986,14 @@ static ContentFeatures read_content_features(lua_State *L, int index)
                index = lua_gettop(L) + 1 + index;
 
        ContentFeatures f;
+       /* Name */
        getstringfield(L, index, "name", f.name);
 
+       /* Groups */
+       lua_getfield(L, index, "groups");
+       read_groups(L, -1, f.groups);
+       lua_pop(L, 1);
+
        /* Visual definition */
 
        f.drawtype = (NodeDrawType)getenumfield(L, index, "drawtype", es_DrawType,
@@ -893,6 +1080,8 @@ static ContentFeatures read_content_features(lua_State *L, int index)
                        "deprecated: use 'drop' field");
        warn_if_field_exists(L, index, "extra_dug_item_rarity",
                        "deprecated: use 'drop' field");
+       warn_if_field_exists(L, index, "metadata_name",
+                       "deprecated: use on_add and metadata callbacks");
        
        // True for all ground-like things like stone and mud, false for eg. trees
        getboolfield(L, index, "is_ground_content", f.is_ground_content);
@@ -909,8 +1098,6 @@ static ContentFeatures read_content_features(lua_State *L, int index)
        getboolfield(L, index, "climbable", f.climbable);
        // Player can build on these
        getboolfield(L, index, "buildable_to", f.buildable_to);
-       // Metadata name of node (eg. "furnace")
-       getstringfield(L, index, "metadata_name", f.metadata_name);
        // Whether the node is non-liquid, source liquid or flowing liquid
        f.liquid_type = (LiquidType)getenumfield(L, index, "liquidtype",
                        es_LiquidType, LIQUID_NONE);
@@ -958,16 +1145,25 @@ static ContentFeatures read_content_features(lua_State *L, int index)
        }
        lua_pop(L, 1);
 
-       lua_getfield(L, index, "material");
-       if(lua_istable(L, -1)){
-               f.material = read_material_properties(L, -1);
-       }
-       lua_pop(L, 1);
-
        // Set to true if paramtype used to be 'facedir_simple'
        getboolfield(L, index, "legacy_facedir_simple", f.legacy_facedir_simple);
        // Set to true if wall_mounted used to be set to true
        getboolfield(L, index, "legacy_wallmounted", f.legacy_wallmounted);
+       
+       // Sound table
+       lua_getfield(L, index, "sounds");
+       if(lua_istable(L, -1)){
+               lua_getfield(L, -1, "footstep");
+               read_soundspec(L, -1, f.sound_footstep);
+               lua_pop(L, 1);
+               lua_getfield(L, -1, "dig");
+               read_soundspec(L, -1, f.sound_dig);
+               lua_pop(L, 1);
+               lua_getfield(L, -1, "dug");
+               read_soundspec(L, -1, f.sound_dug);
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 1);
 
        return f;
 }
@@ -981,7 +1177,6 @@ static ItemStack read_item(lua_State *L, int index);
 static void inventory_set_list_from_lua(Inventory *inv, const char *name,
                lua_State *L, int tableindex, int forcesize=-1)
 {
-       dstream<<"inventory_set_list_from_lua\n";
        if(tableindex < 0)
                tableindex = lua_gettop(L) + 1 + tableindex;
        // If nil, delete list
@@ -1013,7 +1208,6 @@ static void inventory_set_list_from_lua(Inventory *inv, const char *name,
                invlist->deleteItem(index);
                index++;
        }
-       dstream<<"inventory_set_list_from_lua done\n";
 }
 
 static void inventory_get_list_to_lua(Inventory *inv, const char *name,
@@ -1215,16 +1409,16 @@ private:
                return 1;
        }
 
-       // get_tool_digging_properties(self) -> table
+       // get_tool_capabilities(self) -> table
        // Returns the effective tool digging properties.
        // Returns those of the hand ("") if this item has none associated.
-       static int l_get_tool_digging_properties(lua_State *L)
+       static int l_get_tool_capabilities(lua_State *L)
        {
                LuaItemStack *o = checkobject(L, 1);
                ItemStack &item = o->m_stack;
-               const ToolDiggingProperties &prop =
-                       item.getToolDiggingProperties(get_server(L)->idef());
-               push_tool_digging_properties(L, prop);
+               const ToolCapabilities &prop =
+                       item.getToolCapabilities(get_server(L)->idef());
+               push_tool_capabilities(L, prop);
                return 1;
        }
 
@@ -1386,7 +1580,7 @@ const luaL_reg LuaItemStack::methods[] = {
        method(LuaItemStack, get_free_space),
        method(LuaItemStack, is_known),
        method(LuaItemStack, get_definition),
-       method(LuaItemStack, get_tool_digging_properties),
+       method(LuaItemStack, get_tool_capabilities),
        method(LuaItemStack, add_wear),
        method(LuaItemStack, add_item),
        method(LuaItemStack, item_fits),
@@ -1753,22 +1947,17 @@ private:
                return *(NodeMetaRef**)ud;  // unbox pointer
        }
        
-       static NodeMetadata* getmeta(NodeMetaRef *ref)
+       static NodeMetadata* getmeta(NodeMetaRef *ref, bool auto_create)
        {
                NodeMetadata *meta = ref->m_env->getMap().getNodeMetadata(ref->m_p);
+               if(meta == NULL && auto_create)
+               {
+                       meta = new NodeMetadata(ref->m_env->getGameDef());
+                       ref->m_env->getMap().setNodeMetadata(ref->m_p, meta);
+               }
                return meta;
        }
 
-       /*static IGenericNodeMetadata* getgenericmeta(NodeMetaRef *ref)
-       {
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL)
-                       return NULL;
-               if(meta->typeId() != NODEMETA_GENERIC)
-                       return NULL;
-               return (IGenericNodeMetadata*)meta;
-       }*/
-
        static void reportMetadataChange(NodeMetaRef *ref)
        {
                // Inform other things that the metadata has changed
@@ -1793,106 +1982,99 @@ private:
                return 0;
        }
 
-       // get_type(self)
-       static int l_get_type(lua_State *L)
+       // get_string(self, name)
+       static int l_get_string(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
+               std::string name = luaL_checkstring(L, 2);
+
+               NodeMetadata *meta = getmeta(ref, false);
                if(meta == NULL){
-                       lua_pushnil(L);
+                       lua_pushlstring(L, "", 0);
                        return 1;
                }
-               // Do it
-               lua_pushstring(L, meta->typeName());
+               std::string str = meta->getString(name);
+               lua_pushlstring(L, str.c_str(), str.size());
                return 1;
        }
 
-       // allows_text_input(self)
-       static int l_allows_text_input(lua_State *L)
+       // set_string(self, name, var)
+       static int l_set_string(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               lua_pushboolean(L, meta->allowsTextInput());
-               return 1;
-       }
+               std::string name = luaL_checkstring(L, 2);
+               size_t len = 0;
+               const char *s = lua_tolstring(L, 3, &len);
+               std::string str(s, len);
 
-       // set_text(self, text)
-       static int l_set_text(lua_State *L)
-       {
-               NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string text = luaL_checkstring(L, 2);
-               meta->setText(text);
+               NodeMetadata *meta = getmeta(ref, !str.empty());
+               if(meta == NULL || str == meta->getString(name))
+                       return 0;
+               meta->setString(name, str);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // get_text(self)
-       static int l_get_text(lua_State *L)
+       // get_int(self, name)
+       static int l_get_int(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string text = meta->getText();
-               lua_pushstring(L, text.c_str());
-               return 1;
-       }
+               std::string name = lua_tostring(L, 2);
 
-       // get_owner(self)
-       static int l_get_owner(lua_State *L)
-       {
-               NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string owner = meta->getOwner();
-               lua_pushstring(L, owner.c_str());
+               NodeMetadata *meta = getmeta(ref, false);
+               if(meta == NULL){
+                       lua_pushnumber(L, 0);
+                       return 1;
+               }
+               std::string str = meta->getString(name);
+               lua_pushnumber(L, stoi(str));
                return 1;
        }
 
-       // set_owner(self, string)
-       static int l_set_owner(lua_State *L)
+       // set_int(self, name, var)
+       static int l_set_int(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string owner = luaL_checkstring(L, 2);
-               meta->setOwner(owner);
+               std::string name = lua_tostring(L, 2);
+               int a = lua_tointeger(L, 3);
+               std::string str = itos(a);
+
+               NodeMetadata *meta = getmeta(ref, true);
+               if(meta == NULL || str == meta->getString(name))
+                       return 0;
+               meta->setString(name, str);
                reportMetadataChange(ref);
-               return 1;
+               return 0;
        }
 
-       // get_allow_removal(self)
-       static int l_get_allow_removal(lua_State *L)
+       // get_float(self, name)
+       static int l_get_float(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
+               std::string name = lua_tostring(L, 2);
+
+               NodeMetadata *meta = getmeta(ref, false);
                if(meta == NULL){
-                       lua_pushboolean(L, true);
+                       lua_pushnumber(L, 0);
                        return 1;
                }
-               // Do it
-               lua_pushboolean(L, !meta->nodeRemovalDisabled());
+               std::string str = meta->getString(name);
+               lua_pushnumber(L, stof(str));
                return 1;
        }
 
-       /* IGenericNodeMetadata interface */
-       
-       // set_infotext(self, text)
-       static int l_set_infotext(lua_State *L)
+       // set_float(self, name, var)
+       static int l_set_float(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string text = luaL_checkstring(L, 2);
-               meta->setInfoText(text);
+               std::string name = lua_tostring(L, 2);
+               float a = lua_tonumber(L, 3);
+               std::string str = ftos(a);
+
+               NodeMetadata *meta = getmeta(ref, true);
+               if(meta == NULL || str == meta->getString(name))
+                       return 0;
+               meta->setString(name, str);
                reportMetadataChange(ref);
                return 0;
        }
@@ -1901,144 +2083,136 @@ private:
        static int l_get_inventory(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
+               getmeta(ref, true);  // try to ensure the metadata exists
                InvRef::createNodeMeta(L, ref->m_p);
                return 1;
        }
 
-       // set_inventory_draw_spec(self, text)
-       static int l_set_inventory_draw_spec(lua_State *L)
+       // get_inventory_draw_spec(self)
+       static int l_get_inventory_draw_spec(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string text = luaL_checkstring(L, 2);
-               meta->setInventoryDrawSpec(text);
-               reportMetadataChange(ref);
-               return 0;
+
+               NodeMetadata *meta = getmeta(ref, false);
+               if(meta == NULL){
+                       lua_pushlstring(L, "", 0);
+                       return 1;
+               }
+               std::string str = meta->getInventoryDrawSpec();
+               lua_pushlstring(L, str.c_str(), str.size());
+               return 1;
        }
 
-       // set_allow_text_input(self, text)
-       static int l_set_allow_text_input(lua_State *L)
+       // set_inventory_draw_spec(self, text)
+       static int l_set_inventory_draw_spec(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               bool b = lua_toboolean(L, 2);
-               meta->setAllowTextInput(b);
+               size_t len = 0;
+               const char *s = lua_tolstring(L, 2, &len);
+               std::string str(s, len);
+
+               NodeMetadata *meta = getmeta(ref, !str.empty());
+               if(meta == NULL || str == meta->getInventoryDrawSpec())
+                       return 0;
+               meta->setInventoryDrawSpec(str);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // set_allow_removal(self, text)
-       static int l_set_allow_removal(lua_State *L)
+       // get_form_spec(self)
+       static int l_get_form_spec(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               bool b = lua_toboolean(L, 2);
-               meta->setRemovalDisabled(!b);
-               reportMetadataChange(ref);
-               return 0;
+
+               NodeMetadata *meta = getmeta(ref, false);
+               if(meta == NULL){
+                       lua_pushlstring(L, "", 0);
+                       return 1;
+               }
+               std::string str = meta->getFormSpec();
+               lua_pushlstring(L, str.c_str(), str.size());
+               return 1;
        }
 
-       // set_enforce_owner(self, text)
-       static int l_set_enforce_owner(lua_State *L)
+       // set_form_spec(self, text)
+       static int l_set_form_spec(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               bool b = lua_toboolean(L, 2);
-               meta->setEnforceOwner(b);
+               size_t len = 0;
+               const char *s = lua_tolstring(L, 2, &len);
+               std::string str(s, len);
+
+               NodeMetadata *meta = getmeta(ref, !str.empty());
+               if(meta == NULL || str == meta->getFormSpec())
+                       return 0;
+               meta->setFormSpec(str);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // is_inventory_modified(self)
-       static int l_is_inventory_modified(lua_State *L)
+       // get_infotext(self)
+       static int l_get_infotext(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               lua_pushboolean(L, meta->isInventoryModified());
+
+               NodeMetadata *meta = getmeta(ref, false);
+               if(meta == NULL){
+                       lua_pushlstring(L, "", 0);
+                       return 1;
+               }
+               std::string str = meta->getInfoText();
+               lua_pushlstring(L, str.c_str(), str.size());
                return 1;
        }
 
-       // reset_inventory_modified(self)
-       static int l_reset_inventory_modified(lua_State *L)
+       // set_infotext(self, text)
+       static int l_set_infotext(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               meta->resetInventoryModified();
+               size_t len = 0;
+               const char *s = lua_tolstring(L, 2, &len);
+               std::string str(s, len);
+
+               NodeMetadata *meta = getmeta(ref, !str.empty());
+               if(meta == NULL || str == meta->getInfoText())
+                       return 0;
+               meta->setInfoText(str);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // is_text_modified(self)
-       static int l_is_text_modified(lua_State *L)
+       // get_allow_removal(self)
+       static int l_get_allow_removal(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               lua_pushboolean(L, meta->isTextModified());
+
+               NodeMetadata *meta = getmeta(ref, false);
+               if(meta == NULL){
+                       lua_pushboolean(L, true);
+                       return 1;
+               }
+               lua_pushboolean(L, meta->getAllowRemoval());
                return 1;
        }
 
-       // reset_text_modified(self)
-       static int l_reset_text_modified(lua_State *L)
+       // set_allow_removal(self, flag)
+       static int l_set_allow_removal(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               meta->resetTextModified();
+               bool flag = lua_toboolean(L, 2);
+
+               NodeMetadata *meta = getmeta(ref, flag != true);
+               if(meta == NULL || flag == meta->getAllowRemoval())
+                       return 0;
+               meta->setAllowRemoval(flag);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // set_string(self, name, var)
-       static int l_set_string(lua_State *L)
-       {
-               NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string name = luaL_checkstring(L, 2);
-               size_t len = 0;
-               const char *s = lua_tolstring(L, 3, &len);
-               std::string str(s, len);
-               meta->setString(name, str);
-               reportMetadataChange(ref);
-               return 0;
-       }
-
-       // get_string(self, name)
-       static int l_get_string(lua_State *L)
-       {
-               NodeMetaRef *ref = checkobject(L, 1);
-               NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
-               // Do it
-               std::string name = luaL_checkstring(L, 2);
-               std::string str = meta->getString(name);
-               lua_pushlstring(L, str.c_str(), str.size());
-               return 1;
-       }
-
-public:
-       NodeMetaRef(v3s16 p, ServerEnvironment *env):
-               m_p(p),
-               m_env(env)
+public:
+       NodeMetaRef(v3s16 p, ServerEnvironment *env):
+               m_p(p),
+               m_env(env)
        {
        }
 
@@ -2087,25 +2261,21 @@ public:
 };
 const char NodeMetaRef::className[] = "NodeMetaRef";
 const luaL_reg NodeMetaRef::methods[] = {
-       method(NodeMetaRef, get_type),
-       method(NodeMetaRef, allows_text_input),
-       method(NodeMetaRef, set_text),
-       method(NodeMetaRef, get_text),
-       method(NodeMetaRef, get_owner),
-       method(NodeMetaRef, set_owner),
-       method(NodeMetaRef, get_allow_removal),
-       method(NodeMetaRef, set_infotext),
+       method(NodeMetaRef, get_string),
+       method(NodeMetaRef, set_string),
+       method(NodeMetaRef, get_int),
+       method(NodeMetaRef, set_int),
+       method(NodeMetaRef, get_float),
+       method(NodeMetaRef, set_float),
        method(NodeMetaRef, get_inventory),
+       method(NodeMetaRef, get_inventory_draw_spec),
        method(NodeMetaRef, set_inventory_draw_spec),
-       method(NodeMetaRef, set_allow_text_input),
+       method(NodeMetaRef, get_form_spec),
+       method(NodeMetaRef, set_form_spec),
+       method(NodeMetaRef, get_infotext),
+       method(NodeMetaRef, set_infotext),
+       method(NodeMetaRef, get_allow_removal),
        method(NodeMetaRef, set_allow_removal),
-       method(NodeMetaRef, set_enforce_owner),
-       method(NodeMetaRef, is_inventory_modified),
-       method(NodeMetaRef, reset_inventory_modified),
-       method(NodeMetaRef, is_text_modified),
-       method(NodeMetaRef, reset_text_modified),
-       method(NodeMetaRef, set_string),
-       method(NodeMetaRef, get_string),
        {0,0}
 };
 
@@ -2120,7 +2290,7 @@ private:
 
        static const char className[];
        static const luaL_reg methods[];
-
+public:
        static ObjectRef *checkobject(lua_State *L, int narg)
        {
                luaL_checktype(L, narg, LUA_TUSERDATA);
@@ -2134,7 +2304,7 @@ private:
                ServerActiveObject *co = ref->m_object;
                return co;
        }
-       
+private:
        static LuaEntitySAO* getluaobject(ObjectRef *ref)
        {
                ServerActiveObject *obj = getobject(ref);
@@ -2145,14 +2315,22 @@ private:
                return (LuaEntitySAO*)obj;
        }
        
-       static ServerRemotePlayer* getplayer(ObjectRef *ref)
+       static PlayerSAO* getplayersao(ObjectRef *ref)
        {
                ServerActiveObject *obj = getobject(ref);
                if(obj == NULL)
                        return NULL;
                if(obj->getType() != ACTIVEOBJECT_TYPE_PLAYER)
                        return NULL;
-               return static_cast<ServerRemotePlayer*>(obj);
+               return (PlayerSAO*)obj;
+       }
+       
+       static Player* getplayer(ObjectRef *ref)
+       {
+               PlayerSAO *playersao = getplayersao(ref);
+               if(playersao == NULL)
+                       return NULL;
+               return playersao->getPlayer();
        }
        
        // Exported functions
@@ -2171,7 +2349,7 @@ private:
                ObjectRef *ref = checkobject(L, 1);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               infostream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
+               verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
                co->m_removed = true;
                return 0;
        }
@@ -2205,10 +2383,6 @@ private:
                v3f pos = checkFloatPos(L, 2);
                // Do it
                co->setPos(pos);
-               // Move player if applicable
-               ServerRemotePlayer *player = getplayer(ref);
-               if(player != NULL)
-                       get_server(L)->SendMovePlayer(player);
                return 0;
        }
        
@@ -2228,17 +2402,22 @@ private:
                return 0;
        }
 
-       // punch(self, puncher); puncher = an another ObjectRef
+       // punch(self, puncher, tool_capabilities, direction, time_from_last_punch)
        static int l_punch(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ObjectRef *ref2 = checkobject(L, 2);
+               ObjectRef *puncher_ref = checkobject(L, 2);
                ServerActiveObject *co = getobject(ref);
-               ServerActiveObject *co2 = getobject(ref2);
+               ServerActiveObject *puncher = getobject(puncher_ref);
                if(co == NULL) return 0;
-               if(co2 == NULL) return 0;
+               if(puncher == NULL) return 0;
+               ToolCapabilities toolcap = read_tool_capabilities(L, 3);
+               v3f dir = read_v3f(L, 4);
+               float time_from_last_punch = 1000000;
+               if(lua_isnumber(L, 5))
+                       time_from_last_punch = lua_tonumber(L, 5);
                // Do it
-               co->punch(co2);
+               puncher->punch(dir, &toolcap, puncher, time_from_last_punch);
                return 0;
        }
 
@@ -2266,8 +2445,8 @@ private:
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                int hp = lua_tonumber(L, 2);
-               infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
-                               <<" hp="<<hp<<std::endl;
+               /*infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
+                               <<" hp="<<hp<<std::endl;*/
                // Do it
                co->setHP(hp);
                // Return
@@ -2283,8 +2462,8 @@ private:
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                int hp = co->getHP();
-               infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
-                               <<" hp="<<hp<<std::endl;
+               /*infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
+                               <<" hp="<<hp<<std::endl;*/
                // Return
                lua_pushnumber(L, hp);
                return 1;
@@ -2351,6 +2530,33 @@ private:
                return 1;
        }
 
+       // set_armor_groups(self, groups)
+       static int l_set_armor_groups(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerActiveObject *co = getobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               ItemGroupList groups;
+               read_groups(L, 2, groups);
+               co->setArmorGroups(groups);
+               return 0;
+       }
+
+       // set_properties(self, properties)
+       static int l_set_properties(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerActiveObject *co = getobject(ref);
+               if(co == NULL) return 0;
+               ObjectProperties *prop = co->accessObjectProperties();
+               if(!prop)
+                       return 0;
+               read_object_properties(L, 2, prop);
+               co->notifyObjectPropertiesModified();
+               return 0;
+       }
+
        /* LuaEntitySAO-only */
 
        // setvelocity(self, {x=num, y=num, z=num})
@@ -2359,7 +2565,6 @@ private:
                ObjectRef *ref = checkobject(L, 1);
                LuaEntitySAO *co = getluaobject(ref);
                if(co == NULL) return 0;
-               // pos
                v3f pos = checkFloatPos(L, 2);
                // Do it
                co->setVelocity(pos);
@@ -2409,7 +2614,6 @@ private:
                ObjectRef *ref = checkobject(L, 1);
                LuaEntitySAO *co = getluaobject(ref);
                if(co == NULL) return 0;
-               // pos
                float yaw = luaL_checknumber(L, 2) * core::RADTODEG;
                // Do it
                co->setYaw(yaw);
@@ -2494,7 +2698,7 @@ private:
        static int l_get_player_name(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
+               Player *player = getplayer(ref);
                if(player == NULL){
                        lua_pushnil(L);
                        return 1;
@@ -2508,7 +2712,7 @@ private:
        static int l_get_look_dir(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
+               Player *player = getplayer(ref);
                if(player == NULL) return 0;
                // Do it
                float pitch = player->getRadPitch();
@@ -2522,7 +2726,7 @@ private:
        static int l_get_look_pitch(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
+               Player *player = getplayer(ref);
                if(player == NULL) return 0;
                // Do it
                lua_pushnumber(L, player->getRadPitch());
@@ -2533,7 +2737,7 @@ private:
        static int l_get_look_yaw(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
+               Player *player = getplayer(ref);
                if(player == NULL) return 0;
                // Do it
                lua_pushnumber(L, player->getRadYaw());
@@ -2617,6 +2821,8 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, get_wield_index),
        method(ObjectRef, get_wielded_item),
        method(ObjectRef, set_wielded_item),
+       method(ObjectRef, set_armor_groups),
+       method(ObjectRef, set_properties),
        // LuaEntitySAO-only
        method(ObjectRef, setvelocity),
        method(ObjectRef, getvelocity),
@@ -2647,6 +2853,120 @@ static void objectref_get_or_create(lua_State *L,
        }
 }
 
+
+/*
+  PerlinNoise
+ */
+
+class LuaPerlinNoise
+{
+private:
+       int seed;
+       int octaves;
+       double persistence;
+       double scale;
+       static const char className[];
+       static const luaL_reg methods[];
+
+       // Exported functions
+
+       // garbage collector
+       static int gc_object(lua_State *L)
+       {
+               LuaPerlinNoise *o = *(LuaPerlinNoise **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
+
+       static int l_get2d(lua_State *L)
+       {
+               LuaPerlinNoise *o = checkobject(L, 1);
+               v2f pos2d = read_v2f(L,2);
+               lua_Number val = noise2d_perlin(pos2d.X/o->scale, pos2d.Y/o->scale, o->seed, o->octaves, o->persistence);
+               lua_pushnumber(L, val);
+               return 1;
+       }
+       static int l_get3d(lua_State *L)
+       {
+               LuaPerlinNoise *o = checkobject(L, 1);
+               v3f pos3d = read_v3f(L,2);
+               lua_Number val = noise3d_perlin(pos3d.X/o->scale, pos3d.Y/o->scale, pos3d.Z/o->scale, o->seed, o->octaves, o->persistence);
+               lua_pushnumber(L, val);
+               return 1;
+       }
+
+public:
+       LuaPerlinNoise(int a_seed, int a_octaves, double a_persistence,
+                       double a_scale):
+               seed(a_seed),
+               octaves(a_octaves),
+               persistence(a_persistence),
+               scale(a_scale)
+       {
+       }
+
+       ~LuaPerlinNoise()
+       {
+       }
+
+       // LuaPerlinNoise(seed, octaves, persistence, scale)
+       // Creates an LuaPerlinNoise and leaves it on top of stack
+       static int create_object(lua_State *L)
+       {
+               int seed = luaL_checkint(L, 1);
+               int octaves = luaL_checkint(L, 2);
+               double persistence = luaL_checknumber(L, 3);
+               double scale = luaL_checknumber(L, 4);
+               LuaPerlinNoise *o = new LuaPerlinNoise(seed, octaves, persistence, scale);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+               return 1;
+       }
+
+       static LuaPerlinNoise* checkobject(lua_State *L, int narg)
+       {
+               luaL_checktype(L, narg, LUA_TUSERDATA);
+               void *ud = luaL_checkudata(L, narg, className);
+               if(!ud) luaL_typerror(L, narg, className);
+               return *(LuaPerlinNoise**)ud;  // unbox pointer
+       }
+
+       static void Register(lua_State *L)
+       {
+               lua_newtable(L);
+               int methodtable = lua_gettop(L);
+               luaL_newmetatable(L, className);
+               int metatable = lua_gettop(L);
+
+               lua_pushliteral(L, "__metatable");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
+
+               lua_pushliteral(L, "__index");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);
+
+               lua_pushliteral(L, "__gc");
+               lua_pushcfunction(L, gc_object);
+               lua_settable(L, metatable);
+
+               lua_pop(L, 1);  // drop metatable
+
+               luaL_openlib(L, 0, methods, 0);  // fill methodtable
+               lua_pop(L, 1);  // drop methodtable
+
+               // Can be created from Lua (PerlinNoise(seed, octaves, persistence)
+               lua_register(L, className, create_object);
+       }
+};
+const char LuaPerlinNoise::className[] = "PerlinNoise";
+const luaL_reg LuaPerlinNoise::methods[] = {
+       method(LuaPerlinNoise, get2d),
+       method(LuaPerlinNoise, get3d),
+       {0,0}
+};
+
 /*
        EnvRef
 */
@@ -2659,6 +2979,12 @@ private:
        static const char className[];
        static const luaL_reg methods[];
 
+       static int gc_object(lua_State *L) {
+               EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
+
        static EnvRef *checkobject(lua_State *L, int narg)
        {
                luaL_checktype(L, narg, LUA_TUSERDATA);
@@ -2669,11 +2995,11 @@ private:
        
        // Exported functions
 
-       // EnvRef:add_node(pos, node)
+       // EnvRef:set_node(pos, node)
        // pos = {x=num, y=num, z=num}
-       static int l_add_node(lua_State *L)
+       static int l_set_node(lua_State *L)
        {
-               //infostream<<"EnvRef::l_add_node()"<<std::endl;
+               //infostream<<"EnvRef::l_set_node()"<<std::endl;
                EnvRef *o = checkobject(L, 1);
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
@@ -2687,6 +3013,11 @@ private:
                return 1;
        }
 
+       static int l_add_node(lua_State *L)
+       {
+               return l_set_node(L);
+       }
+
        // EnvRef:remove_node(pos)
        // pos = {x=num, y=num, z=num}
        static int l_remove_node(lua_State *L)
@@ -2808,30 +3139,37 @@ private:
                ItemStack item = read_item(L, 3);
                if(item.empty() || !item.isKnown(get_server(L)->idef()))
                        return 0;
-               // Do it
-               ServerActiveObject *obj = new ItemSAO(env, pos, item.getItemString());
+               // Use minetest.spawn_item to spawn a __builtin:item
+               lua_getglobal(L, "minetest");
+               lua_getfield(L, -1, "spawn_item");
+               if(lua_isnil(L, -1))
+                       return 0;
+               lua_pushvalue(L, 2);
+               lua_pushstring(L, item.getItemString().c_str());
+               if(lua_pcall(L, 2, 1, 0))
+                       script_error(L, "error: %s", lua_tostring(L, -1));
+               return 1;
+               /*lua_pushvalue(L, 1);
+               lua_pushstring(L, "__builtin:item");
+               lua_pushstring(L, item.getItemString().c_str());
+               return l_add_entity(L);*/
+               /*// Do it
+               ServerActiveObject *obj = createItemSAO(env, pos, item.getItemString());
                int objectid = env->addActiveObject(obj);
                // If failed to add, return nothing (reads as nil)
                if(objectid == 0)
                        return 0;
                // Return ObjectRef
                objectref_get_or_create(L, obj);
-               return 1;
+               return 1;*/
        }
 
        // EnvRef:add_rat(pos)
        // pos = {x=num, y=num, z=num}
        static int l_add_rat(lua_State *L)
        {
-               infostream<<"EnvRef::l_add_rat()"<<std::endl;
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // pos
-               v3f pos = checkFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new RatSAO(env, pos);
-               env->addActiveObject(obj);
+               infostream<<"EnvRef::l_add_rat(): C++ mobs have been removed."
+                               <<" Doing nothing."<<std::endl;
                return 0;
        }
 
@@ -2839,15 +3177,8 @@ private:
        // pos = {x=num, y=num, z=num}
        static int l_add_firefly(lua_State *L)
        {
-               infostream<<"EnvRef::l_add_firefly()"<<std::endl;
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // pos
-               v3f pos = checkFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new FireflySAO(env, pos);
-               env->addActiveObject(obj);
+               infostream<<"EnvRef::l_add_firefly(): C++ mobs have been removed."
+                               <<" Doing nothing."<<std::endl;
                return 0;
        }
 
@@ -2872,14 +3203,18 @@ private:
                if(env == NULL) return 0;
                // Do it
                const char *name = luaL_checkstring(L, 2);
-               ServerRemotePlayer *player =
-                               static_cast<ServerRemotePlayer*>(env->getPlayer(name));
+               Player *player = env->getPlayer(name);
                if(player == NULL){
                        lua_pushnil(L);
                        return 1;
                }
+               PlayerSAO *sao = player->getPlayerSAO();
+               if(sao == NULL){
+                       lua_pushnil(L);
+                       return 1;
+               }
                // Put player on stack
-               objectref_get_or_create(L, player);
+               objectref_get_or_create(L, sao);
                return 1;
        }
 
@@ -2945,22 +3280,127 @@ private:
                return 1;
        }
 
-       static int gc_object(lua_State *L) {
-               EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
-               delete o;
+
+       // EnvRef:find_node_near(pos, radius, nodenames) -> pos or nil
+       // nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+       static int l_find_node_near(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               INodeDefManager *ndef = get_server(L)->ndef();
+               v3s16 pos = read_v3s16(L, 2);
+               int radius = luaL_checkinteger(L, 3);
+               std::set<content_t> filter;
+               if(lua_istable(L, 4)){
+                       int table = 4;
+                       lua_pushnil(L);
+                       while(lua_next(L, table) != 0){
+                               // key at index -2 and value at index -1
+                               luaL_checktype(L, -1, LUA_TSTRING);
+                               ndef->getIds(lua_tostring(L, -1), filter);
+                               // removes value, keeps key for next iteration
+                               lua_pop(L, 1);
+                       }
+               } else if(lua_isstring(L, 4)){
+                       ndef->getIds(lua_tostring(L, 4), filter);
+               }
+
+               for(int d=1; d<=radius; d++){
+                       core::list<v3s16> list;
+                       getFacePositions(list, d);
+                       for(core::list<v3s16>::Iterator i = list.begin();
+                                       i != list.end(); i++){
+                               v3s16 p = pos + (*i);
+                               content_t c = env->getMap().getNodeNoEx(p).getContent();
+                               if(filter.count(c) != 0){
+                                       push_v3s16(L, p);
+                                       return 1;
+                               }
+                       }
+               }
                return 0;
        }
 
+       // EnvRef:find_nodes_in_area(minp, maxp, nodenames) -> list of positions
+       // nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+       static int l_find_nodes_in_area(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               INodeDefManager *ndef = get_server(L)->ndef();
+               v3s16 minp = read_v3s16(L, 2);
+               v3s16 maxp = read_v3s16(L, 3);
+               std::set<content_t> filter;
+               if(lua_istable(L, 4)){
+                       int table = 4;
+                       lua_pushnil(L);
+                       while(lua_next(L, table) != 0){
+                               // key at index -2 and value at index -1
+                               luaL_checktype(L, -1, LUA_TSTRING);
+                               ndef->getIds(lua_tostring(L, -1), filter);
+                               // removes value, keeps key for next iteration
+                               lua_pop(L, 1);
+                       }
+               } else if(lua_isstring(L, 4)){
+                       ndef->getIds(lua_tostring(L, 4), filter);
+               }
+
+               // Get the table insert function
+               lua_getglobal(L, "table");
+               lua_getfield(L, -1, "insert");
+               int table_insert = lua_gettop(L);
+               
+               lua_newtable(L);
+               int table = lua_gettop(L);
+               for(s16 x=minp.X; x<=maxp.X; x++)
+               for(s16 y=minp.Y; y<=maxp.Y; y++)
+               for(s16 z=minp.Z; z<=maxp.Z; z++)
+               {
+                       v3s16 p(x,y,z);
+                       content_t c = env->getMap().getNodeNoEx(p).getContent();
+                       if(filter.count(c) != 0){
+                               lua_pushvalue(L, table_insert);
+                               lua_pushvalue(L, table);
+                               push_v3s16(L, p);
+                               if(lua_pcall(L, 2, 0, 0))
+                                       script_error(L, "error: %s", lua_tostring(L, -1));
+                       }
+               }
+               return 1;
+       }
+
+       //      EnvRef:get_perlin(seeddiff, octaves, persistence, scale)
+       //  returns world-specific PerlinNoise
+       static int l_get_perlin(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+
+               int seeddiff = luaL_checkint(L, 2);
+               int octaves = luaL_checkint(L, 3);
+               double persistence = luaL_checknumber(L, 4);
+               double scale = luaL_checknumber(L, 5);
+
+               LuaPerlinNoise *n = new LuaPerlinNoise(seeddiff + int(env->getServerMap().getSeed()), octaves, persistence, scale);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = n;
+               luaL_getmetatable(L, "PerlinNoise");
+               lua_setmetatable(L, -2);
+               return 1;
+       }
+
 public:
        EnvRef(ServerEnvironment *env):
                m_env(env)
        {
-               infostream<<"EnvRef created"<<std::endl;
+               //infostream<<"EnvRef created"<<std::endl;
        }
 
        ~EnvRef()
        {
-               infostream<<"EnvRef destructing"<<std::endl;
+               //infostream<<"EnvRef destructing"<<std::endl;
        }
 
        // Creates an EnvRef and leaves it on top of stack
@@ -3010,6 +3450,7 @@ public:
 };
 const char EnvRef::className[] = "EnvRef";
 const luaL_reg EnvRef::methods[] = {
+       method(EnvRef, set_node),
        method(EnvRef, add_node),
        method(EnvRef, remove_node),
        method(EnvRef, get_node),
@@ -3024,41 +3465,162 @@ const luaL_reg EnvRef::methods[] = {
        method(EnvRef, get_objects_inside_radius),
        method(EnvRef, set_timeofday),
        method(EnvRef, get_timeofday),
+       method(EnvRef, find_node_near),
+       method(EnvRef, find_nodes_in_area),
+       method(EnvRef, get_perlin),
        {0,0}
 };
 
 /*
-       Global functions
+       LuaPseudoRandom
 */
 
-class LuaABM : public ActiveBlockModifier
+
+class LuaPseudoRandom
 {
 private:
-       lua_State *m_lua;
-       int m_id;
+       PseudoRandom m_pseudo;
 
-       std::set<std::string> m_trigger_contents;
-       std::set<std::string> m_required_neighbors;
-       float m_trigger_interval;
-       u32 m_trigger_chance;
-public:
-       LuaABM(lua_State *L, int id,
-                       const std::set<std::string> &trigger_contents,
-                       const std::set<std::string> &required_neighbors,
-                       float trigger_interval, u32 trigger_chance):
-               m_lua(L),
-               m_id(id),
-               m_trigger_contents(trigger_contents),
-               m_required_neighbors(required_neighbors),
-               m_trigger_interval(trigger_interval),
-               m_trigger_chance(trigger_chance)
+       static const char className[];
+       static const luaL_reg methods[];
+
+       // Exported functions
+       
+       // garbage collector
+       static int gc_object(lua_State *L)
        {
+               LuaPseudoRandom *o = *(LuaPseudoRandom **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
        }
-       virtual std::set<std::string> getTriggerContents()
+
+       // next(self, min=0, max=32767) -> get next value
+       static int l_next(lua_State *L)
        {
-               return m_trigger_contents;
-       }
-       virtual std::set<std::string> getRequiredNeighbors()
+               LuaPseudoRandom *o = checkobject(L, 1);
+               int min = 0;
+               int max = 32767;
+               lua_settop(L, 3); // Fill 2 and 3 with nil if they don't exist
+               if(!lua_isnil(L, 2))
+                       min = luaL_checkinteger(L, 2);
+               if(!lua_isnil(L, 3))
+                       max = luaL_checkinteger(L, 3);
+               if(max - min != 32767 && max - min > 32767/5)
+                       throw LuaError(L, "PseudoRandom.next() max-min is not 32767 and is > 32768/5. This is disallowed due to the bad random distribution the implementation would otherwise make.");
+               PseudoRandom &pseudo = o->m_pseudo;
+               int val = pseudo.next();
+               val = (val % (max-min+1)) + min;
+               lua_pushinteger(L, val);
+               return 1;
+       }
+
+public:
+       LuaPseudoRandom(int seed):
+               m_pseudo(seed)
+       {
+       }
+
+       ~LuaPseudoRandom()
+       {
+       }
+
+       const PseudoRandom& getItem() const
+       {
+               return m_pseudo;
+       }
+       PseudoRandom& getItem()
+       {
+               return m_pseudo;
+       }
+       
+       // LuaPseudoRandom(seed)
+       // Creates an LuaPseudoRandom and leaves it on top of stack
+       static int create_object(lua_State *L)
+       {
+               int seed = luaL_checknumber(L, 1);
+               LuaPseudoRandom *o = new LuaPseudoRandom(seed);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+               return 1;
+       }
+
+       static LuaPseudoRandom* checkobject(lua_State *L, int narg)
+       {
+               luaL_checktype(L, narg, LUA_TUSERDATA);
+               void *ud = luaL_checkudata(L, narg, className);
+               if(!ud) luaL_typerror(L, narg, className);
+               return *(LuaPseudoRandom**)ud;  // unbox pointer
+       }
+
+       static void Register(lua_State *L)
+       {
+               lua_newtable(L);
+               int methodtable = lua_gettop(L);
+               luaL_newmetatable(L, className);
+               int metatable = lua_gettop(L);
+
+               lua_pushliteral(L, "__metatable");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
+
+               lua_pushliteral(L, "__index");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);
+
+               lua_pushliteral(L, "__gc");
+               lua_pushcfunction(L, gc_object);
+               lua_settable(L, metatable);
+
+               lua_pop(L, 1);  // drop metatable
+
+               luaL_openlib(L, 0, methods, 0);  // fill methodtable
+               lua_pop(L, 1);  // drop methodtable
+
+               // Can be created from Lua (LuaPseudoRandom(seed))
+               lua_register(L, className, create_object);
+       }
+};
+const char LuaPseudoRandom::className[] = "PseudoRandom";
+const luaL_reg LuaPseudoRandom::methods[] = {
+       method(LuaPseudoRandom, next),
+       {0,0}
+};
+
+
+
+/*
+       LuaABM
+*/
+
+class LuaABM : public ActiveBlockModifier
+{
+private:
+       lua_State *m_lua;
+       int m_id;
+
+       std::set<std::string> m_trigger_contents;
+       std::set<std::string> m_required_neighbors;
+       float m_trigger_interval;
+       u32 m_trigger_chance;
+public:
+       LuaABM(lua_State *L, int id,
+                       const std::set<std::string> &trigger_contents,
+                       const std::set<std::string> &required_neighbors,
+                       float trigger_interval, u32 trigger_chance):
+               m_lua(L),
+               m_id(id),
+               m_trigger_contents(trigger_contents),
+               m_required_neighbors(required_neighbors),
+               m_trigger_interval(trigger_interval),
+               m_trigger_chance(trigger_chance)
+       {
+       }
+       virtual std::set<std::string> getTriggerContents()
+       {
+               return m_trigger_contents;
+       }
+       virtual std::set<std::string> getRequiredNeighbors()
        {
                return m_required_neighbors;
        }
@@ -3104,6 +3666,47 @@ public:
        }
 };
 
+/*
+       ServerSoundParams
+*/
+
+static void read_server_sound_params(lua_State *L, int index,
+               ServerSoundParams &params)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       // Clear
+       params = ServerSoundParams();
+       if(lua_istable(L, index)){
+               getfloatfield(L, index, "gain", params.gain);
+               getstringfield(L, index, "to_player", params.to_player);
+               lua_getfield(L, index, "pos");
+               if(!lua_isnil(L, -1)){
+                       v3f p = read_v3f(L, -1)*BS;
+                       params.pos = p;
+                       params.type = ServerSoundParams::SSP_POSITIONAL;
+               }
+               lua_pop(L, 1);
+               lua_getfield(L, index, "object");
+               if(!lua_isnil(L, -1)){
+                       ObjectRef *ref = ObjectRef::checkobject(L, -1);
+                       ServerActiveObject *sao = ObjectRef::getobject(ref);
+                       if(sao){
+                               params.object = sao->getId();
+                               params.type = ServerSoundParams::SSP_OBJECT;
+                       }
+               }
+               lua_pop(L, 1);
+               params.max_hear_distance = BS*getfloatfield_default(L, index,
+                               "max_hear_distance", params.max_hear_distance/BS);
+               getboolfield(L, index, "loop", params.loop);
+       }
+}
+
+/*
+       Global functions
+*/
+
 // debug(text)
 // Writes a line to dstream
 static int l_debug(lua_State *L)
@@ -3156,7 +3759,7 @@ static int l_register_item_raw(lua_State *L)
        lua_getfield(L, table, "name");
        if(lua_isstring(L, -1)){
                std::string name = lua_tostring(L, -1);
-               infostream<<"register_item_raw: "<<name<<std::endl;
+               verbosestream<<"register_item_raw: "<<name<<std::endl;
        } else {
                throw LuaError(L, "register_item_raw: name is not defined or not a string");
        }
@@ -3419,6 +4022,15 @@ static int l_register_craft(lua_State *L)
        return 0; /* number of results */
 }
 
+// setting_set(name, value)
+static int l_setting_set(lua_State *L)
+{
+       const char *name = luaL_checkstring(L, 1);
+       const char *value = luaL_checkstring(L, 2);
+       g_settings->set(name, value);
+       return 0;
+}
+
 // setting_get(name)
 static int l_setting_get(lua_State *L)
 {
@@ -3477,11 +4089,7 @@ static int l_get_player_privs(lua_State *L)
        // Do it
        lua_newtable(L);
        int table = lua_gettop(L);
-       u64 privs_i = server->getPlayerAuthPrivs(name);
-       // Special case for the "name" setting (local player / server owner)
-       if(name == g_settings->get("name"))
-               privs_i = PRIV_ALL;
-       std::set<std::string> privs_s = privsToSet(privs_i);
+       std::set<std::string> privs_s = server->getPlayerEffectivePrivs(name);
        for(std::set<std::string>::const_iterator
                        i = privs_s.begin(); i != privs_s.end(); i++){
                lua_pushboolean(L, true);
@@ -3513,28 +4121,30 @@ static int l_get_inventory(lua_State *L)
        return 1;
 }
 
-// get_digging_properties(material_properties, tool_digging_properties[, time_from_last_punch])
-static int l_get_digging_properties(lua_State *L)
+// get_dig_params(groups, tool_capabilities[, time_from_last_punch])
+static int l_get_dig_params(lua_State *L)
 {
-       MaterialProperties mp = read_material_properties(L, 1);
-       ToolDiggingProperties tp = read_tool_digging_properties(L, 2);
+       std::map<std::string, int> groups;
+       read_groups(L, 1, groups);
+       ToolCapabilities tp = read_tool_capabilities(L, 2);
        if(lua_isnoneornil(L, 3))
-               push_digging_properties(L, getDiggingProperties(&mp, &tp));
+               push_dig_params(L, getDigParams(groups, &tp));
        else
-               push_digging_properties(L, getDiggingProperties(&mp, &tp,
+               push_dig_params(L, getDigParams(groups, &tp,
                                        luaL_checknumber(L, 3)));
        return 1;
 }
 
-// get_hitting_properties(material_properties, tool_digging_properties[, time_from_last_punch])
-static int l_get_hitting_properties(lua_State *L)
+// get_hit_params(groups, tool_capabilities[, time_from_last_punch])
+static int l_get_hit_params(lua_State *L)
 {
-       MaterialProperties mp = read_material_properties(L, 1);
-       ToolDiggingProperties tp = read_tool_digging_properties(L, 2);
+       std::map<std::string, int> groups;
+       read_groups(L, 1, groups);
+       ToolCapabilities tp = read_tool_capabilities(L, 2);
        if(lua_isnoneornil(L, 3))
-               push_hitting_properties(L, getHittingProperties(&mp, &tp));
+               push_hit_params(L, getHitParams(groups, &tp));
        else
-               push_hitting_properties(L, getHittingProperties(&mp, &tp,
+               push_hit_params(L, getHitParams(groups, &tp,
                                        luaL_checknumber(L, 3)));
        return 1;
 }
@@ -3549,8 +4159,13 @@ static int l_get_current_modname(lua_State *L)
 // get_modpath(modname)
 static int l_get_modpath(lua_State *L)
 {
-       const char *modname = luaL_checkstring(L, 1);
+       std::string modname = luaL_checkstring(L, 1);
        // Do it
+       if(modname == "__builtin"){
+               std::string path = get_server(L)->getBuiltinLuaPath();
+               lua_pushstring(L, path.c_str());
+               return 1;
+       }
        const ModSpec *mod = get_server(L)->getModSpec(modname);
        if(!mod){
                lua_pushnil(L);
@@ -3568,23 +4183,77 @@ static int l_get_worldpath(lua_State *L)
        return 1;
 }
 
+// sound_play(spec, parameters)
+static int l_sound_play(lua_State *L)
+{
+       SimpleSoundSpec spec;
+       read_soundspec(L, 1, spec);
+       ServerSoundParams params;
+       read_server_sound_params(L, 2, params);
+       s32 handle = get_server(L)->playSound(spec, params);
+       lua_pushinteger(L, handle);
+       return 1;
+}
+
+// sound_stop(handle)
+static int l_sound_stop(lua_State *L)
+{
+       int handle = luaL_checkinteger(L, 1);
+       get_server(L)->stopSound(handle);
+       return 0;
+}
+
+// is_singleplayer()
+static int l_is_singleplayer(lua_State *L)
+{
+       lua_pushboolean(L, get_server(L)->isSingleplayer());
+       return 1;
+}
+
+// get_password_hash(name, raw_password)
+static int l_get_password_hash(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       std::string raw_password = luaL_checkstring(L, 2);
+       std::string hash = translatePassword(name,
+                       narrow_to_wide(raw_password));
+       lua_pushstring(L, hash.c_str());
+       return 1;
+}
+
+// notify_authentication_modified(name)
+static int l_notify_authentication_modified(lua_State *L)
+{
+       std::string name = "";
+       if(lua_isstring(L, 1))
+               name = lua_tostring(L, 1);
+       get_server(L)->reportPrivsModified(name);
+       return 0;
+}
+
 static const struct luaL_Reg minetest_f [] = {
        {"debug", l_debug},
        {"log", l_log},
        {"register_item_raw", l_register_item_raw},
        {"register_alias_raw", l_register_alias_raw},
        {"register_craft", l_register_craft},
+       {"setting_set", l_setting_set},
        {"setting_get", l_setting_get},
        {"setting_getbool", l_setting_getbool},
        {"chat_send_all", l_chat_send_all},
        {"chat_send_player", l_chat_send_player},
        {"get_player_privs", l_get_player_privs},
        {"get_inventory", l_get_inventory},
-       {"get_digging_properties", l_get_digging_properties},
-       {"get_hitting_properties", l_get_hitting_properties},
+       {"get_dig_params", l_get_dig_params},
+       {"get_hit_params", l_get_hit_params},
        {"get_current_modname", l_get_current_modname},
        {"get_modpath", l_get_modpath},
        {"get_worldpath", l_get_worldpath},
+       {"sound_play", l_sound_play},
+       {"sound_stop", l_sound_stop},
+       {"is_singleplayer", l_is_singleplayer},
+       {"get_password_hash", l_get_password_hash},
+       {"notify_authentication_modified", l_notify_authentication_modified},
        {NULL, NULL}
 };
 
@@ -3596,7 +4265,7 @@ void scriptapi_export(lua_State *L, Server *server)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_export"<<std::endl;
+       verbosestream<<"scriptapi_export()"<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Store server as light userdata in registry
@@ -3624,6 +4293,8 @@ void scriptapi_export(lua_State *L, Server *server)
        NodeMetaRef::Register(L);
        ObjectRef::Register(L);
        EnvRef::Register(L);
+       LuaPseudoRandom::Register(L);
+       LuaPerlinNoise::Register(L);
 }
 
 bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
@@ -3656,7 +4327,7 @@ void scriptapi_add_environment(lua_State *L, ServerEnvironment *env)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_add_environment"<<std::endl;
+       verbosestream<<"scriptapi_add_environment"<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Create EnvRef on stack
@@ -3810,40 +4481,152 @@ void scriptapi_rm_object_reference(lua_State *L, ServerActiveObject *cobj)
        lua_settable(L, objectstable);
 }
 
-bool scriptapi_on_chat_message(lua_State *L, const std::string &name,
-               const std::string &message)
+/*
+       misc
+*/
+
+// What scriptapi_run_callbacks does with the return values of callbacks.
+// Regardless of the mode, if only one callback is defined,
+// its return value is the total return value.
+// Modes only affect the case where 0 or >= 2 callbacks are defined.
+enum RunCallbacksMode
 {
-       realitycheck(L);
-       assert(lua_checkstack(L, 20));
-       StackUnroller stack_unroller(L);
+       // Returns the return value of the first callback
+       // Returns nil if list of callbacks is empty
+       RUN_CALLBACKS_MODE_FIRST,
+       // Returns the return value of the last callback
+       // Returns nil if list of callbacks is empty
+       RUN_CALLBACKS_MODE_LAST,
+       // If any callback returns a false value, the first such is returned
+       // Otherwise, the first callback's return value (trueish) is returned
+       // Returns true if list of callbacks is empty
+       RUN_CALLBACKS_MODE_AND,
+       // Like above, but stops calling callbacks (short circuit)
+       // after seeing the first false value
+       RUN_CALLBACKS_MODE_AND_SC,
+       // If any callback returns a true value, the first such is returned
+       // Otherwise, the first callback's return value (falseish) is returned
+       // Returns false if list of callbacks is empty
+       RUN_CALLBACKS_MODE_OR,
+       // Like above, but stops calling callbacks (short circuit)
+       // after seeing the first true value
+       RUN_CALLBACKS_MODE_OR_SC,
+       // Note: "a true value" and "a false value" refer to values that
+       // are converted by lua_toboolean to true or false, respectively.
+};
+
+// Push the list of callbacks (a lua table).
+// Then push nargs arguments.
+// Then call this function, which
+// - runs the callbacks
+// - removes the table and arguments from the lua stack
+// - pushes the return value, computed depending on mode
+static void scriptapi_run_callbacks(lua_State *L, int nargs,
+               RunCallbacksMode mode)
+{
+       // Insert the return value into the lua stack, below the table
+       assert(lua_gettop(L) >= nargs + 1);
+       lua_pushnil(L);
+       lua_insert(L, -(nargs + 1) - 1);
+       // Stack now looks like this:
+       // ... <return value = nil> <table> <arg#1> <arg#2> ... <arg#n>
+
+       int rv = lua_gettop(L) - nargs - 1;
+       int table = rv + 1;
+       int arg = table + 1;
+
+       luaL_checktype(L, table, LUA_TTABLE);
 
-       // Get minetest.registered_on_chat_messages
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_on_chat_messages");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
        // Foreach
        lua_pushnil(L);
+       bool first_loop = true;
        while(lua_next(L, table) != 0){
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TFUNCTION);
                // Call function
-               lua_pushstring(L, name.c_str());
-               lua_pushstring(L, message.c_str());
-               if(lua_pcall(L, 2, 1, 0))
+               for(int i = 0; i < nargs; i++)
+                       lua_pushvalue(L, arg+i);
+               if(lua_pcall(L, nargs, 1, 0))
                        script_error(L, "error: %s", lua_tostring(L, -1));
-               bool ate = lua_toboolean(L, -1);
-               lua_pop(L, 1);
-               if(ate)
-                       return true;
+
+               // Move return value to designated space in stack
+               // Or pop it
+               if(first_loop){
+                       // Result of first callback is always moved
+                       lua_replace(L, rv);
+                       first_loop = false;
+               } else {
+                       // Otherwise, what happens depends on the mode
+                       if(mode == RUN_CALLBACKS_MODE_FIRST)
+                               lua_pop(L, 1);
+                       else if(mode == RUN_CALLBACKS_MODE_LAST)
+                               lua_replace(L, rv);
+                       else if(mode == RUN_CALLBACKS_MODE_AND ||
+                                       mode == RUN_CALLBACKS_MODE_AND_SC){
+                               if(lua_toboolean(L, rv) == true &&
+                                               lua_toboolean(L, -1) == false)
+                                       lua_replace(L, rv);
+                               else
+                                       lua_pop(L, 1);
+                       }
+                       else if(mode == RUN_CALLBACKS_MODE_OR ||
+                                       mode == RUN_CALLBACKS_MODE_OR_SC){
+                               if(lua_toboolean(L, rv) == false &&
+                                               lua_toboolean(L, -1) == true)
+                                       lua_replace(L, rv);
+                               else
+                                       lua_pop(L, 1);
+                       }
+                       else
+                               assert(0);
+               }
+
+               // Handle short circuit modes
+               if(mode == RUN_CALLBACKS_MODE_AND_SC &&
+                               lua_toboolean(L, rv) == false)
+                       break;
+               else if(mode == RUN_CALLBACKS_MODE_OR_SC &&
+                               lua_toboolean(L, rv) == true)
+                       break;
+
                // value removed, keep key for next iteration
        }
-       return false;
+
+       // Remove stuff from stack, leaving only the return value
+       lua_settop(L, rv);
+
+       // Fix return value in case no callbacks were called
+       if(first_loop){
+               if(mode == RUN_CALLBACKS_MODE_AND ||
+                               mode == RUN_CALLBACKS_MODE_AND_SC){
+                       lua_pop(L, 1);
+                       lua_pushboolean(L, true);
+               }
+               else if(mode == RUN_CALLBACKS_MODE_OR ||
+                               mode == RUN_CALLBACKS_MODE_OR_SC){
+                       lua_pop(L, 1);
+                       lua_pushboolean(L, false);
+               }
+       }
 }
 
-/*
-       misc
-*/
+bool scriptapi_on_chat_message(lua_State *L, const std::string &name,
+               const std::string &message)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+
+       // Get minetest.registered_on_chat_messages
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_on_chat_messages");
+       // Call callbacks
+       lua_pushstring(L, name.c_str());
+       lua_pushstring(L, message.c_str());
+       scriptapi_run_callbacks(L, 2, RUN_CALLBACKS_MODE_OR_SC);
+       bool ate = lua_toboolean(L, -1);
+       return ate;
+}
 
 void scriptapi_on_newplayer(lua_State *L, ServerActiveObject *player)
 {
@@ -3854,45 +4637,24 @@ void scriptapi_on_newplayer(lua_State *L, ServerActiveObject *player)
        // Get minetest.registered_on_newplayers
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "registered_on_newplayers");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               objectref_get_or_create(L, player);
-               if(lua_pcall(L, 1, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
+       // Call callbacks
+       objectref_get_or_create(L, player);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
 }
 
 void scriptapi_on_dieplayer(lua_State *L, ServerActiveObject *player)
 {
-    realitycheck(L);
-    assert(lua_checkstack(L, 20));
-    StackUnroller stack_unroller(L);
-    
-    // Get minetest.registered_on_dieplayers
-    lua_getglobal(L, "minetest");
-    lua_getfield(L, -1, "registered_on_dieplayers");
-    luaL_checktype(L, -1, LUA_TTABLE);
-    int table = lua_gettop(L);
-    // Foreach
-    lua_pushnil(L);
-    while(lua_next(L, table) != 0){
-        // key at index -2 and value at index -1
-       luaL_checktype(L, -1, LUA_TFUNCTION);
-        // Call function
-       objectref_get_or_create(L, player);
-        if(lua_pcall(L, 1, 0, 0))
-            script_error(L, "error: %s", lua_tostring(L, -1));
-        // value removed, keep key for next iteration
-    }
-}
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
 
+       // Get minetest.registered_on_dieplayers
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_on_dieplayers");
+       // Call callbacks
+       objectref_get_or_create(L, player);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
+}
 
 bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player)
 {
@@ -3900,40 +4662,142 @@ bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player)
        assert(lua_checkstack(L, 20));
        StackUnroller stack_unroller(L);
 
-       dstream<<"player: "<<player<<"   id: "<<player->getId()<<std::endl;
-
-       bool positioning_handled_by_some = false;
-
        // Get minetest.registered_on_respawnplayers
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "registered_on_respawnplayers");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               objectref_get_or_create(L, player);
-               if(lua_pcall(L, 1, 1, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               bool positioning_handled = lua_toboolean(L, -1);
-               lua_pop(L, 1);
-               if(positioning_handled)
-                       positioning_handled_by_some = true;
-               // value removed, keep key for next iteration
-       }
+       // Call callbacks
+       objectref_get_or_create(L, player);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_OR);
+       bool positioning_handled_by_some = lua_toboolean(L, -1);
        return positioning_handled_by_some;
 }
 
-void scriptapi_get_creative_inventory(lua_State *L, ServerRemotePlayer *player)
+void scriptapi_on_joinplayer(lua_State *L, ServerActiveObject *player)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+
+       // Get minetest.registered_on_joinplayers
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_on_joinplayers");
+       // Call callbacks
+       objectref_get_or_create(L, player);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void scriptapi_on_leaveplayer(lua_State *L, ServerActiveObject *player)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+
+       // Get minetest.registered_on_leaveplayers
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_on_leaveplayers");
+       // Call callbacks
+       objectref_get_or_create(L, player);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void scriptapi_get_creative_inventory(lua_State *L, ServerActiveObject *player)
 {
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+       
+       Inventory *inv = player->getInventory();
+       assert(inv);
+
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "creative_inventory");
        luaL_checktype(L, -1, LUA_TTABLE);
-       inventory_set_list_from_lua(&player->inventory, "main", L, -1,
-                       PLAYER_INVENTORY_SIZE);
+       inventory_set_list_from_lua(inv, "main", L, -1, PLAYER_INVENTORY_SIZE);
+}
+
+static void get_auth_handler(lua_State *L)
+{
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_auth_handler");
+       if(lua_isnil(L, -1)){
+               lua_pop(L, 1);
+               lua_getfield(L, -1, "builtin_auth_handler");
+       }
+       if(lua_type(L, -1) != LUA_TTABLE)
+               throw LuaError(L, "Authentication handler table not valid");
+}
+
+bool scriptapi_get_auth(lua_State *L, const std::string &playername,
+               std::string *dst_password, std::set<std::string> *dst_privs)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+       
+       get_auth_handler(L);
+       lua_getfield(L, -1, "get_auth");
+       if(lua_type(L, -1) != LUA_TFUNCTION)
+               throw LuaError(L, "Authentication handler missing get_auth");
+       lua_pushstring(L, playername.c_str());
+       if(lua_pcall(L, 1, 1, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       
+       // nil = login not allowed
+       if(lua_isnil(L, -1))
+               return false;
+       luaL_checktype(L, -1, LUA_TTABLE);
+       
+       std::string password;
+       bool found = getstringfield(L, -1, "password", password);
+       if(!found)
+               throw LuaError(L, "Authentication handler didn't return password");
+       if(dst_password)
+               *dst_password = password;
+
+       lua_getfield(L, -1, "privileges");
+       if(!lua_istable(L, -1))
+               throw LuaError(L,
+                               "Authentication handler didn't return privilege table");
+       if(dst_privs)
+               read_privileges(L, -1, *dst_privs);
+       lua_pop(L, 1);
+       
+       return true;
+}
+
+void scriptapi_create_auth(lua_State *L, const std::string &playername,
+               const std::string &password)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+       
+       get_auth_handler(L);
+       lua_getfield(L, -1, "create_auth");
+       if(lua_type(L, -1) != LUA_TFUNCTION)
+               throw LuaError(L, "Authentication handler missing create_auth");
+       lua_pushstring(L, playername.c_str());
+       lua_pushstring(L, password.c_str());
+       if(lua_pcall(L, 2, 0, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+}
+
+bool scriptapi_set_password(lua_State *L, const std::string &playername,
+               const std::string &password)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       StackUnroller stack_unroller(L);
+       
+       get_auth_handler(L);
+       lua_getfield(L, -1, "set_password");
+       if(lua_type(L, -1) != LUA_TFUNCTION)
+               throw LuaError(L, "Authentication handler missing set_password");
+       lua_pushstring(L, playername.c_str());
+       lua_pushstring(L, password.c_str());
+       if(lua_pcall(L, 2, 1, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       return lua_toboolean(L, -1);
 }
 
 /*
@@ -4105,22 +4969,13 @@ void scriptapi_environment_step(lua_State *L, float dtime)
        // Get minetest.registered_globalsteps
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "registered_globalsteps");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               lua_pushnumber(L, dtime);
-               if(lua_pcall(L, 1, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
+       // Call callbacks
+       lua_pushnumber(L, dtime);
+       scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
 }
 
-void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp)
+void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp,
+               u32 blockseed)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
@@ -4130,32 +4985,22 @@ void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp)
        // Get minetest.registered_on_generateds
        lua_getglobal(L, "minetest");
        lua_getfield(L, -1, "registered_on_generateds");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               push_v3s16(L, minp);
-               push_v3s16(L, maxp);
-               if(lua_pcall(L, 2, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
+       // Call callbacks
+       push_v3s16(L, minp);
+       push_v3s16(L, maxp);
+       lua_pushnumber(L, blockseed);
+       scriptapi_run_callbacks(L, 3, RUN_CALLBACKS_MODE_FIRST);
 }
 
 /*
        luaentity
 */
 
-bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
-               const std::string &staticdata)
+bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
+       verbosestream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
                        <<name<<"\""<<std::endl;
        StackUnroller stack_unroller(L);
        
@@ -4198,6 +5043,21 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
        lua_pushvalue(L, object); // Copy object to top of stack
        lua_settable(L, -3);
        
+       return true;
+}
+
+void scriptapi_luaentity_activate(lua_State *L, u16 id,
+               const std::string &staticdata)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       verbosestream<<"scriptapi_luaentity_activate: id="<<id<<std::endl;
+       StackUnroller stack_unroller(L);
+       
+       // Get minetest.luaentities[id]
+       luaentity_get(L, id);
+       int object = lua_gettop(L);
+       
        // Get on_activate function
        lua_pushvalue(L, object);
        lua_getfield(L, -1, "on_activate");
@@ -4207,18 +5067,16 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
                lua_pushlstring(L, staticdata.c_str(), staticdata.size());
                // Call with 2 arguments, 0 results
                if(lua_pcall(L, 2, 0, 0))
-                       script_error(L, "error running function %s:on_activate: %s\n",
-                                       name, lua_tostring(L, -1));
+                       script_error(L, "error running function on_activate: %s\n",
+                                       lua_tostring(L, -1));
        }
-       
-       return true;
 }
 
 void scriptapi_luaentity_rm(lua_State *L, u16 id)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
+       verbosestream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
 
        // Get minetest.luaentities table
        lua_getglobal(L, "minetest");
@@ -4238,7 +5096,7 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
+       //infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Get minetest.luaentities[id]
@@ -4264,60 +5122,26 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
 }
 
 void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
-               LuaEntityProperties *prop)
+               ObjectProperties *prop)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
+       //infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Get minetest.luaentities[id]
        luaentity_get(L, id);
        //int object = lua_gettop(L);
 
-       /* Read stuff */
+       // Set default values that differ from ObjectProperties defaults
+       prop->hp_max = 10;
        
-       getboolfield(L, -1, "physical", prop->physical);
-
-       getfloatfield(L, -1, "weight", prop->weight);
-
-       lua_getfield(L, -1, "collisionbox");
-       if(lua_istable(L, -1))
-               prop->collisionbox = read_aabbox3df32(L, -1, 1.0);
-       lua_pop(L, 1);
-
-       getstringfield(L, -1, "visual", prop->visual);
-       
-       lua_getfield(L, -1, "visual_size");
-       if(lua_istable(L, -1))
-               prop->visual_size = read_v2f(L, -1);
-       lua_pop(L, 1);
-
-       lua_getfield(L, -1, "textures");
-       if(lua_istable(L, -1)){
-               prop->textures.clear();
-               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))
-                               prop->textures.push_back(lua_tostring(L, -1));
-                       else
-                               prop->textures.push_back("");
-                       // removes value, keeps key for next iteration
-                       lua_pop(L, 1);
-               }
-       }
-       lua_pop(L, 1);
+       // Deprecated: read object properties directly
+       read_object_properties(L, -1, prop);
        
-       lua_getfield(L, -1, "spritediv");
-       if(lua_istable(L, -1))
-               prop->spritediv = read_v2s16(L, -1);
-       lua_pop(L, 1);
-
-       lua_getfield(L, -1, "initial_sprite_basepos");
-       if(lua_istable(L, -1))
-               prop->initial_sprite_basepos = read_v2s16(L, -1);
+       // Read initial_properties
+       lua_getfield(L, -1, "initial_properties");
+       read_object_properties(L, -1, prop);
        lua_pop(L, 1);
 }
 
@@ -4344,9 +5168,11 @@ void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime)
                script_error(L, "error running function 'on_step': %s\n", lua_tostring(L, -1));
 }
 
-// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch)
+// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch,
+//                       tool_capabilities, direction)
 void scriptapi_luaentity_punch(lua_State *L, u16 id,
-               ServerActiveObject *puncher, float time_from_last_punch)
+               ServerActiveObject *puncher, float time_from_last_punch,
+               const ToolCapabilities *toolcap, v3f dir)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
@@ -4365,8 +5191,10 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id,
        lua_pushvalue(L, object); // self
        objectref_get_or_create(L, puncher); // Clicker reference
        lua_pushnumber(L, time_from_last_punch);
-       // Call with 2 arguments, 0 results
-       if(lua_pcall(L, 3, 0, 0))
+       push_tool_capabilities(L, *toolcap);
+       push_v3f(L, dir);
+       // Call with 5 arguments, 0 results
+       if(lua_pcall(L, 5, 0, 0))
                script_error(L, "error running function 'on_punch': %s\n", lua_tostring(L, -1));
 }