]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/scriptapi.cpp
Add name field to registered entities
[dragonfireclient.git] / src / scriptapi.cpp
index 9b37c53b4cb1aad5a9000c02602ef73e112701d8..dbbaf3dc9493477a49d427621d8547abaf6f36ba 100644 (file)
@@ -164,10 +164,61 @@ void check_modname_prefix(lua_State *L, std::string &name)
                        "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"))
                throw LuaError(L, std::string("Name \"")+name
                                +"\" does not follow naming conventions: "
-                               +"\"contains unallowed characters)");
+                               +"\"contains unallowed characters");
 }
 
-static v3f readFloatPos(lua_State *L, int index)
+static void push_v3f(lua_State *L, v3f p)
+{
+       lua_newtable(L);
+       lua_pushnumber(L, p.X);
+       lua_setfield(L, -2, "x");
+       lua_pushnumber(L, p.Y);
+       lua_setfield(L, -2, "y");
+       lua_pushnumber(L, p.Z);
+       lua_setfield(L, -2, "z");
+}
+
+static v2s16 read_v2s16(lua_State *L, int index)
+{
+       v2s16 p;
+       luaL_checktype(L, index, LUA_TTABLE);
+       lua_getfield(L, index, "x");
+       p.X = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       p.Y = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       return p;
+}
+
+static v2f read_v2f(lua_State *L, int index)
+{
+       v2f p;
+       luaL_checktype(L, index, LUA_TTABLE);
+       lua_getfield(L, index, "x");
+       p.X = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       p.Y = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       return p;
+}
+
+static Server* get_server(lua_State *L)
+{
+       // Get server from registry
+       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+       return (Server*)lua_touserdata(L, -1);
+}
+
+static ServerEnvironment* get_env(lua_State *L)
+{
+       // Get environment from registry
+       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_env");
+       return (ServerEnvironment*)lua_touserdata(L, -1);
+}
+
+static v3f read_v3f(lua_State *L, int index)
 {
        v3f pos;
        luaL_checktype(L, index, LUA_TTABLE);
@@ -180,23 +231,37 @@ static v3f readFloatPos(lua_State *L, int index)
        lua_getfield(L, index, "z");
        pos.Z = lua_tonumber(L, -1);
        lua_pop(L, 1);
-       pos *= BS; // Scale to internal format
+       return pos;
+}
+
+static v3f check_v3f(lua_State *L, int index)
+{
+       v3f pos;
+       luaL_checktype(L, index, LUA_TTABLE);
+       lua_getfield(L, index, "x");
+       pos.X = luaL_checknumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       pos.Y = luaL_checknumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "z");
+       pos.Z = luaL_checknumber(L, -1);
+       lua_pop(L, 1);
        return pos;
 }
 
 static void pushFloatPos(lua_State *L, v3f p)
 {
        p /= BS;
-       lua_newtable(L);
-       lua_pushnumber(L, p.X);
-       lua_setfield(L, -2, "x");
-       lua_pushnumber(L, p.Y);
-       lua_setfield(L, -2, "y");
-       lua_pushnumber(L, p.Z);
-       lua_setfield(L, -2, "z");
+       push_v3f(L, p);
+}
+
+static v3f checkFloatPos(lua_State *L, int index)
+{
+       return check_v3f(L, index) * BS;
 }
 
-static void pushpos(lua_State *L, v3s16 p)
+static void push_v3s16(lua_State *L, v3s16 p)
 {
        lua_newtable(L);
        lua_pushnumber(L, p.X);
@@ -207,11 +272,18 @@ static void pushpos(lua_State *L, v3s16 p)
        lua_setfield(L, -2, "z");
 }
 
-static v3s16 readpos(lua_State *L, int index)
+static v3s16 read_v3s16(lua_State *L, int index)
+{
+       // Correct rounding at <0
+       v3f pf = read_v3f(L, index);
+       return floatToInt(pf, 1.0);
+}
+
+static v3s16 check_v3s16(lua_State *L, int index)
 {
        // Correct rounding at <0
-       v3f pf = readFloatPos(L, index);
-       return floatToInt(pf, BS);
+       v3f pf = check_v3f(L, index);
+       return floatToInt(pf, 1.0);
 }
 
 static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
@@ -228,7 +300,7 @@ static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
 static MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
 {
        lua_getfield(L, index, "name");
-       const char *name = lua_tostring(L, -1);
+       const char *name = luaL_checkstring(L, -1);
        lua_pop(L, 1);
        u8 param1;
        lua_getfield(L, index, "param1");
@@ -293,32 +365,6 @@ static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index, f32 scale)
        return box;
 }
 
-static v2s16 read_v2s16(lua_State *L, int index)
-{
-       v2s16 p;
-       luaL_checktype(L, index, LUA_TTABLE);
-       lua_getfield(L, index, "x");
-       p.X = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       lua_getfield(L, index, "y");
-       p.Y = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       return p;
-}
-
-static v2f read_v2f(lua_State *L, int index)
-{
-       v2f p;
-       luaL_checktype(L, index, LUA_TTABLE);
-       lua_getfield(L, index, "x");
-       p.X = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       lua_getfield(L, index, "y");
-       p.Y = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       return p;
-}
-
 static bool getstringfield(lua_State *L, int table,
                const char *fieldname, std::string &result)
 {
@@ -371,6 +417,15 @@ static bool getboolfield(lua_State *L, int table,
        return got;
 }
 
+static std::string checkstringfield(lua_State *L, int table,
+               const char *fieldname)
+{
+       lua_getfield(L, table, fieldname);
+       std::string s = luaL_checkstring(L, -1);
+       lua_pop(L, 1);
+       return s;
+}
+
 static std::string getstringfield_default(lua_State *L, int table,
                const char *fieldname, const std::string &default_)
 {
@@ -489,7 +544,7 @@ static void inventory_set_list_from_lua(Inventory *inv, const char *name,
        while(lua_next(L, table) != 0){
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TSTRING);
-               std::string itemstring = lua_tostring(L, -1);
+               std::string itemstring = luaL_checkstring(L, -1);
                items.push_back(itemstring);
                // removes value, keeps key for next iteration
                lua_pop(L, 1);
@@ -546,6 +601,68 @@ static void inventory_get_list_to_lua(Inventory *inv, const char *name,
        }
 }
 
+static void push_stack_item(lua_State *L, InventoryItem *item0)
+{
+       if(item0 == NULL){
+               lua_pushnil(L);
+       }
+       else if(std::string("MaterialItem") == item0->getName()){
+               MaterialItem *item = (MaterialItem*)item0;
+               lua_newtable(L);
+               lua_pushstring(L, "node");
+               lua_setfield(L, -2, "type");
+               lua_pushstring(L, item->getNodeName().c_str());
+               lua_setfield(L, -2, "name");
+       }
+       else if(std::string("CraftItem") == item0->getName()){
+               CraftItem *item = (CraftItem*)item0;
+               lua_newtable(L);
+               lua_pushstring(L, "craft");
+               lua_setfield(L, -2, "type");
+               lua_pushstring(L, item->getSubName().c_str());
+               lua_setfield(L, -2, "name");
+       }
+       else if(std::string("ToolItem") == item0->getName()){
+               ToolItem *item = (ToolItem*)item0;
+               lua_newtable(L);
+               lua_pushstring(L, "tool");
+               lua_setfield(L, -2, "type");
+               lua_pushstring(L, item->getToolName().c_str());
+               lua_setfield(L, -2, "name");
+               lua_pushstring(L, itos(item->getWear()).c_str());
+               lua_setfield(L, -2, "wear");
+       }
+       else{
+               errorstream<<"push_stack_item: Unknown item name: \""
+                               <<item0->getName()<<"\""<<std::endl;
+               lua_pushnil(L);
+       }
+}
+
+static InventoryItem* check_stack_item(lua_State *L, int index)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       if(lua_isnil(L, index))
+               return NULL;
+       if(!lua_istable(L, index))
+               throw LuaError(L, "check_stack_item: Item not nil or table");
+       // A very crappy implementation for now
+       // Will be replaced when unified namespace for items is made
+       std::string type = getstringfield_default(L, index, "type", "");
+       std::string name = getstringfield_default(L, index, "name", "");
+       std::string num = getstringfield_default(L, index, "wear", "_");
+       if(num == "_")
+               num = 1;
+       std::string itemstring = type + " \"" + name + "\" " + num;
+       try{
+               return InventoryItem::deSerialize(itemstring, get_server(L));
+       }catch(SerializationError &e){
+               throw LuaError(L, std::string("check_stack_item: "
+                               "internal error (itemstring=\"")+itemstring+"\")");
+       }
+}
+
 /*
        ToolDiggingProperties
 */
@@ -666,747 +783,506 @@ struct EnumString es_Diggability[] =
 };
 
 /*
-       Global functions
+       Getters for stuff in main tables
 */
 
-static int l_register_nodedef_defaults(lua_State *L)
+static void objectref_get(lua_State *L, u16 id)
 {
-       luaL_checktype(L, 1, LUA_TTABLE);
-
-       lua_pushvalue(L, 1); // Explicitly put parameter 1 on top of stack
-       lua_setfield(L, LUA_REGISTRYINDEX, "minetest_nodedef_default");
-
-       return 0;
+       // Get minetest.object_refs[i]
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "object_refs");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       lua_pushnumber(L, id);
+       lua_gettable(L, -2);
+       lua_remove(L, -2); // object_refs
+       lua_remove(L, -2); // minetest
 }
 
-// Register new object prototype
-// register_entity(name, prototype)
-static int l_register_entity(lua_State *L)
+static void luaentity_get(lua_State *L, u16 id)
 {
-       std::string name = luaL_checkstring(L, 1);
-       check_modname_prefix(L, name);
-       //infostream<<"register_entity: "<<name<<std::endl;
-       luaL_checktype(L, 2, LUA_TTABLE);
-
-       // Get minetest.registered_entities
+       // Get minetest.luaentities[i]
        lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_entities");
+       lua_getfield(L, -1, "luaentities");
        luaL_checktype(L, -1, LUA_TTABLE);
-       int registered_entities = lua_gettop(L);
-       lua_pushvalue(L, 2); // Object = param 2 -> stack top
-       // registered_entities[name] = object
-       lua_setfield(L, registered_entities, name.c_str());
-       
-       // Get registered object to top of stack
-       lua_pushvalue(L, 2);
-       
-       // Set __index to point to itself
-       lua_pushvalue(L, -1);
-       lua_setfield(L, -2, "__index");
+       lua_pushnumber(L, id);
+       lua_gettable(L, -2);
+       lua_remove(L, -2); // luaentities
+       lua_remove(L, -2); // minetest
+}
 
-       // Set metatable.__index = metatable
-       luaL_getmetatable(L, "minetest.entity");
-       lua_pushvalue(L, -1); // duplicate metatable
-       lua_setfield(L, -2, "__index");
-       // Set object metatable
-       lua_setmetatable(L, -2);
+/*
+       Object wrappers
+*/
 
-       return 0; /* number of results */
-}
+#define method(class, name) {#name, class::l_##name}
 
-class LuaABM : public ActiveBlockModifier
+/*
+       ItemStack
+*/
+
+class ItemStack
 {
 private:
-       lua_State *m_lua;
-       int m_id;
+       InventoryItem *m_stack;
 
-       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) {
+               ItemStack *o = *(ItemStack **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
+
+       // peek_item(self)
+       static int l_peek_item(lua_State *L)
        {
+               ItemStack *o = checkobject(L, 1);
+               push_stack_item(L, o->m_stack);
+               return 1;
        }
-       virtual std::set<std::string> getTriggerContents()
+
+       // take_item(self)
+       static int l_take_item(lua_State *L)
        {
-               return m_trigger_contents;
+               ItemStack *o = checkobject(L, 1);
+               push_stack_item(L, o->m_stack);
+               if(o->m_stack->getCount() <= 1){
+                       delete o->m_stack;
+                       o->m_stack = NULL;
+               } else {
+                       o->m_stack->remove(1);
+               }
+               return 1;
        }
-       virtual std::set<std::string> getRequiredNeighbors()
+
+       // put_item(self, item) -> true/false
+       static int l_put_item(lua_State *L)
        {
-               return m_required_neighbors;
+               ItemStack *o = checkobject(L, 1);
+               InventoryItem *item = check_stack_item(L, 2);
+               if(!item){ // nil can always be inserted
+                       lua_pushboolean(L, true);
+                       return 1;
+               }
+               if(!item->addableTo(o->m_stack)){
+                       lua_pushboolean(L, false);
+                       return 1;
+               }
+               o->m_stack->add(1);
+               delete item;
+               lua_pushboolean(L, true);
+               return 1;
        }
-       virtual float getTriggerInterval()
+
+       // put_stackstring(self, stackstring) -> true/false
+       static int l_put_stackstring(lua_State *L)
        {
-               return m_trigger_interval;
+               ItemStack *o = checkobject(L, 1);
+               std::string stackstring = luaL_checkstring(L, 2);
+               try{
+                       InventoryItem *item = InventoryItem::deSerialize(stackstring,
+                                       get_server(L));
+                       if(!item->addableTo(o->m_stack)){
+                               lua_pushboolean(L, false);
+                               return 1;
+                       }
+                       o->m_stack->add(1);
+                       delete item;
+                       lua_pushboolean(L, true);
+                       return 1;
+               }
+               catch(SerializationError &e){
+                       lua_pushboolean(L, false);
+                       return 1;
+               }
        }
-       virtual u32 getTriggerChance()
+
+public:
+       ItemStack(InventoryItem *item=NULL):
+               m_stack(item)
        {
-               return m_trigger_chance;
        }
-       virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
-                       u32 active_object_count, u32 active_object_count_wider)
+
+       ~ItemStack()
        {
-               lua_State *L = m_lua;
-       
-               realitycheck(L);
-               assert(lua_checkstack(L, 20));
-               StackUnroller stack_unroller(L);
+               delete m_stack;
+       }
 
-               // Get minetest.registered_abms
-               lua_getglobal(L, "minetest");
-               lua_getfield(L, -1, "registered_abms");
-               luaL_checktype(L, -1, LUA_TTABLE);
-               int registered_abms = lua_gettop(L);
-
-               // Get minetest.registered_abms[m_id]
-               lua_pushnumber(L, m_id);
-               lua_gettable(L, registered_abms);
-               if(lua_isnil(L, -1))
-                       assert(0);
-               
-               // Call action
-               luaL_checktype(L, -1, LUA_TTABLE);
-               lua_getfield(L, -1, "action");
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               pushpos(L, p);
-               pushnode(L, n, env->getGameDef()->ndef());
-               lua_pushnumber(L, active_object_count);
-               lua_pushnumber(L, active_object_count_wider);
-               if(lua_pcall(L, 4, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
+       static ItemStack* 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 *(ItemStack**)ud;  // unbox pointer
        }
-};
-
-// register_abm({...})
-static int l_register_abm(lua_State *L)
-{
-       //infostream<<"register_abm"<<std::endl;
-       luaL_checktype(L, 1, LUA_TTABLE);
-
-       // Get minetest.registered_abms
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_abms");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int registered_abms = lua_gettop(L);
 
-       int id = 1;
-       // Find free id
-       for(;;){
-               lua_pushnumber(L, id);
-               lua_gettable(L, registered_abms);
-               if(lua_isnil(L, -1))
-                       break;
-               lua_pop(L, 1);
-               id++;
+       InventoryItem* getItemCopy()
+       {
+               if(!m_stack)
+                       return NULL;
+               return m_stack->clone();
        }
-       lua_pop(L, 1);
-
-       infostream<<"register_abm: id="<<id<<std::endl;
-
-       // registered_abms[id] = spec
-       lua_pushnumber(L, id);
-       lua_pushvalue(L, 1);
-       lua_settable(L, registered_abms);
-       
-       return 0; /* number of results */
-}
-
-// register_tool(name, {lots of stuff})
-static int l_register_tool(lua_State *L)
-{
-       std::string name = luaL_checkstring(L, 1);
-       check_modname_prefix(L, name);
-       //infostream<<"register_tool: "<<name<<std::endl;
-       luaL_checktype(L, 2, LUA_TTABLE);
-       int table = 2;
-
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable tool definition manager from the server
-       IWritableToolDefManager *tooldef =
-                       server->getWritableToolDefManager();
        
-       ToolDefinition def = read_tool_definition(L, table);
-
-       tooldef->registerTool(name, def);
-       return 0; /* number of results */
-}
+       // Creates an ItemStack and leaves it on top of stack
+       static int create_object(lua_State *L)
+       {
+               InventoryItem *item = NULL;
+               if(lua_isstring(L, 1)){
+                       std::string itemstring = lua_tostring(L, 1);
+                       if(itemstring != ""){
+                               try{
+                                       IGameDef *gdef = get_server(L);
+                                       item = InventoryItem::deSerialize(itemstring, gdef);
+                               }catch(SerializationError &e){
+                               }
+                       }
+               }
+               ItemStack *o = new ItemStack(item);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+               return 1;
+       }
+       // Not callable from Lua
+       static int create(lua_State *L, InventoryItem *item)
+       {
+               ItemStack *o = new ItemStack(item);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+               return 1;
+       }
 
-// register_craftitem(name, {lots of stuff})
-static int l_register_craftitem(lua_State *L)
-{
-       std::string name = luaL_checkstring(L, 1);
-       check_modname_prefix(L, name);
-       //infostream<<"register_craftitem: "<<name<<std::endl;
-       luaL_checktype(L, 2, LUA_TTABLE);
-       int table = 2;
+       static void Register(lua_State *L)
+       {
+               lua_newtable(L);
+               int methodtable = lua_gettop(L);
+               luaL_newmetatable(L, className);
+               int metatable = lua_gettop(L);
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable CraftItem definition manager from the server
-       IWritableCraftItemDefManager *craftitemdef =
-                       server->getWritableCraftItemDefManager();
-       
-       // Check if on_drop is defined
-       lua_getfield(L, table, "on_drop");
-       bool got_on_drop = !lua_isnil(L, -1);
-       lua_pop(L, 1);
+               lua_pushliteral(L, "__metatable");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
 
-       // Check if on_use is defined
-       lua_getfield(L, table, "on_use");
-       bool got_on_use = !lua_isnil(L, -1);
-       lua_pop(L, 1);
+               lua_pushliteral(L, "__index");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);
 
-       CraftItemDefinition def;
-       
-       getstringfield(L, table, "image", def.imagename);
-       getstringfield(L, table, "cookresult_itemstring", def.cookresult_item);
-       getfloatfield(L, table, "furnace_cooktime", def.furnace_cooktime);
-       getfloatfield(L, table, "furnace_burntime", def.furnace_burntime);
-       def.usable = getboolfield_default(L, table, "usable", got_on_use);
-       getboolfield(L, table, "liquids_pointable", def.liquids_pointable);
-       def.dropcount = getintfield_default(L, table, "dropcount", def.dropcount);
-       def.stack_max = getintfield_default(L, table, "stack_max", def.stack_max);
+               lua_pushliteral(L, "__gc");
+               lua_pushcfunction(L, gc_object);
+               lua_settable(L, metatable);
 
-       // If an on_drop callback is defined, force dropcount to 1
-       if (got_on_drop)
-               def.dropcount = 1;
+               lua_pop(L, 1);  // drop metatable
 
-       // Register it
-       craftitemdef->registerCraftItem(name, def);
+               luaL_openlib(L, 0, methods, 0);  // fill methodtable
+               lua_pop(L, 1);  // drop methodtable
 
-       lua_pushvalue(L, table);
-       scriptapi_add_craftitem(L, name.c_str());
+               // Can be created from Lua (ItemStack::create(itemstring))
+               lua_register(L, className, create_object);
+       }
+};
+const char ItemStack::className[] = "ItemStack";
+const luaL_reg ItemStack::methods[] = {
+       method(ItemStack, peek_item),
+       method(ItemStack, take_item),
+       method(ItemStack, put_item),
+       method(ItemStack, put_stackstring),
+       {0,0}
+};
 
-       return 0; /* number of results */
-}
+/*
+       InvRef
+*/
 
-// register_node(name, {lots of stuff})
-static int l_register_node(lua_State *L)
+class InvRef
 {
-       std::string name = luaL_checkstring(L, 1);
-       check_modname_prefix(L, name);
-       //infostream<<"register_node: "<<name<<std::endl;
-       luaL_checktype(L, 2, LUA_TTABLE);
-       int nodedef_table = 2;
+private:
+       InventoryLocation m_loc;
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable node definition manager from the server
-       IWritableNodeDefManager *nodedef =
-                       server->getWritableNodeDefManager();
-       
-       // Get default node definition from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_nodedef_default");
-       int nodedef_default = lua_gettop(L);
+       static const char className[];
+       static const luaL_reg methods[];
 
-       /*
-               Add to minetest.registered_nodes with default as metatable
-       */
+       static InvRef *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 *(InvRef**)ud;  // unbox pointer
+       }
        
-       // Get the node definition table given as parameter
-       lua_pushvalue(L, nodedef_table);
+       static Inventory* getinv(lua_State *L, InvRef *ref)
+       {
+               return get_server(L)->getInventory(ref->m_loc);
+       }
 
-       // Set __index to point to itself
-       lua_pushvalue(L, -1);
-       lua_setfield(L, -2, "__index");
+       static InventoryList* getlist(lua_State *L, InvRef *ref,
+                       const char *listname)
+       {
+               Inventory *inv = getinv(L, ref);
+               if(!inv)
+                       return NULL;
+               return inv->getList(listname);
+       }
 
-       // Set nodedef_default as metatable for the definition
-       lua_pushvalue(L, nodedef_default);
-       lua_setmetatable(L, nodedef_table);
-       
-       // minetest.registered_nodes[name] = nodedef
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_nodes");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       lua_pushstring(L, name.c_str());
-       lua_pushvalue(L, nodedef_table);
-       lua_settable(L, -3);
+       static InventoryItem* getitem(lua_State *L, InvRef *ref,
+                       const char *listname, int i)
+       {
+               InventoryList *list = getlist(L, ref, listname);
+               if(!list)
+                       return NULL;
+               return list->getItem(i);
+       }
 
-       /*
-               Create definition
-       */
+       static void reportInventoryChange(lua_State *L, InvRef *ref)
+       {
+               // Inform other things that the inventory has changed
+               get_server(L)->setInventoryModified(ref->m_loc);
+       }
        
-       ContentFeatures f;
-
-       // Default to getting the corresponding NodeItem when dug
-       f.dug_item = std::string("NodeItem \"")+name+"\" 1";
+       // Exported functions
        
-       // Default to unknown_block.png as all textures
-       f.setAllTextures("unknown_block.png");
+       // garbage collector
+       static int gc_object(lua_State *L) {
+               InvRef *o = *(InvRef **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
 
-       /*
-               Read definiton from Lua
-       */
+       // get_size(self, listname)
+       static int l_get_size(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               InventoryList *list = getlist(L, ref, listname);
+               if(list){
+                       lua_pushinteger(L, list->getSize());
+               } else {
+                       lua_pushinteger(L, 0);
+               }
+               return 1;
+       }
 
-       f.name = name;
-       
-       /* Visual definition */
+       // set_size(self, listname, size)
+       static int l_set_size(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               int newsize = luaL_checknumber(L, 3);
+               Inventory *inv = getinv(L, ref);
+               if(newsize == 0){
+                       inv->deleteList(listname);
+                       reportInventoryChange(L, ref);
+                       return 0;
+               }
+               InventoryList *list = inv->getList(listname);
+               if(list){
+                       list->setSize(newsize);
+               } else {
+                       list = inv->addList(listname, newsize);
+               }
+               reportInventoryChange(L, ref);
+               return 0;
+       }
 
-       f.drawtype = (NodeDrawType)getenumfield(L, nodedef_table, "drawtype", es_DrawType,
-                       NDT_NORMAL);
-       getfloatfield(L, nodedef_table, "visual_scale", f.visual_scale);
+       // get_stack(self, listname, i)
+       static int l_get_stack(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               int i = luaL_checknumber(L, 3) - 1;
+               InventoryItem *item = getitem(L, ref, listname, i);
+               if(!item){
+                       ItemStack::create(L, NULL);
+                       return 1;
+               }
+               ItemStack::create(L, item->clone());
+               return 1;
+       }
 
-       lua_getfield(L, nodedef_table, "tile_images");
-       if(lua_istable(L, -1)){
-               int table = lua_gettop(L);
-               lua_pushnil(L);
-               int i = 0;
-               while(lua_next(L, table) != 0){
-                       // key at index -2 and value at index -1
-                       if(lua_isstring(L, -1))
-                               f.tname_tiles[i] = lua_tostring(L, -1);
-                       else
-                               f.tname_tiles[i] = "";
-                       // removes value, keeps key for next iteration
-                       lua_pop(L, 1);
-                       i++;
-                       if(i==6){
-                               lua_pop(L, 1);
-                               break;
-                       }
-               }
-               // Copy last value to all remaining textures
-               if(i >= 1){
-                       std::string lastname = f.tname_tiles[i-1];
-                       while(i < 6){
-                               f.tname_tiles[i] = lastname;
-                               i++;
-                       }
+       // set_stack(self, listname, i, stack)
+       static int l_set_stack(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               int i = luaL_checknumber(L, 3) - 1;
+               ItemStack *stack = ItemStack::checkobject(L, 4);
+               InventoryList *list = getlist(L, ref, listname);
+               if(!list){
+                       lua_pushboolean(L, false);
+                       return 1;
                }
+               InventoryItem *newitem = stack->getItemCopy();
+               InventoryItem *olditem = list->changeItem(i, newitem);
+               bool success = (olditem != newitem);
+               delete olditem;
+               lua_pushboolean(L, success);
+               reportInventoryChange(L, ref);
+               return 1;
        }
-       lua_pop(L, 1);
 
-       getstringfield(L, nodedef_table, "inventory_image", f.tname_inventory);
+       // get_list(self, listname) -> list or nil
+       static int l_get_list(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               Inventory *inv = getinv(L, ref);
+               inventory_get_list_to_lua(inv, listname, L);
+               return 1;
+       }
 
-       lua_getfield(L, nodedef_table, "special_materials");
-       if(lua_istable(L, -1)){
-               int table = lua_gettop(L);
-               lua_pushnil(L);
-               int i = 0;
-               while(lua_next(L, table) != 0){
-                       // key at index -2 and value at index -1
-                       int smtable = lua_gettop(L);
-                       std::string tname = getstringfield_default(
-                                       L, smtable, "image", "");
-                       bool backface_culling = getboolfield_default(
-                                       L, smtable, "backface_culling", true);
-                       MaterialSpec mspec(tname, backface_culling);
-                       f.setSpecialMaterial(i, mspec);
-                       // removes value, keeps key for next iteration
-                       lua_pop(L, 1);
-                       i++;
-                       if(i==6){
-                               lua_pop(L, 1);
-                               break;
-                       }
+       // set_list(self, listname, list)
+       static int l_set_list(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               Inventory *inv = getinv(L, ref);
+               InventoryList *list = inv->getList(listname);
+               if(list)
+                       inventory_set_list_from_lua(inv, listname, L, 3,
+                                       get_server(L), list->getSize());
+               else
+                       inventory_set_list_from_lua(inv, listname, L, 3,
+                                       get_server(L));
+               reportInventoryChange(L, ref);
+               return 0;
+       }
+
+       // autoinsert_stack(self, listname, stack)
+       static int l_autoinsert_stack(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               ItemStack *stack = ItemStack::checkobject(L, 3);
+               InventoryList *list = getlist(L, ref, listname);
+               if(!list){
+                       lua_pushboolean(L, false);
+                       return 1;
+               }
+               InventoryItem *item = stack->getItemCopy();
+               if(list->roomForItem(item)){
+                       delete list->addItem(item);
+                       lua_pushboolean(L, true);
+                       reportInventoryChange(L, ref);
+               } else {
+                       delete item;
+                       lua_pushboolean(L, false);
                }
+               return 1;
        }
-       lua_pop(L, 1);
 
-       f.alpha = getintfield_default(L, nodedef_table, "alpha", 255);
+       // autoinsert_stackstring(self, listname, stackstring)
+       static int l_autoinsert_stackstring(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               const char *stackstring = luaL_checkstring(L, 3);
+               InventoryList *list = getlist(L, ref, listname);
+               if(!list){
+                       lua_pushboolean(L, false);
+                       return 1;
+               }
+               InventoryItem *item = InventoryItem::deSerialize(stackstring,
+                               get_server(L));
+               if(list->roomForItem(item)){
+                       delete list->addItem(item);
+                       lua_pushboolean(L, true);
+                       reportInventoryChange(L, ref);
+               } else {
+                       delete item;
+                       lua_pushboolean(L, false);
+               }
+               return 1;
+       }
 
-       /* Other stuff */
-       
-       lua_getfield(L, nodedef_table, "post_effect_color");
-       if(!lua_isnil(L, -1))
-               f.post_effect_color = readARGB8(L, -1);
-       lua_pop(L, 1);
+public:
+       InvRef(const InventoryLocation &loc):
+               m_loc(loc)
+       {
+       }
 
-       f.param_type = (ContentParamType)getenumfield(L, nodedef_table, "paramtype",
-                       es_ContentParamType, CPT_NONE);
-       
-       // True for all ground-like things like stone and mud, false for eg. trees
-       getboolfield(L, nodedef_table, "is_ground_content", f.is_ground_content);
-       f.light_propagates = (f.param_type == CPT_LIGHT);
-       warn_if_field_exists(L, nodedef_table, "light_propagates",
-                       "deprecated: determined from paramtype");
-       getboolfield(L, nodedef_table, "sunlight_propagates", f.sunlight_propagates);
-       // This is used for collision detection.
-       // Also for general solidness queries.
-       getboolfield(L, nodedef_table, "walkable", f.walkable);
-       // Player can point to these
-       getboolfield(L, nodedef_table, "pointable", f.pointable);
-       // Player can dig these
-       getboolfield(L, nodedef_table, "diggable", f.diggable);
-       // Player can climb these
-       getboolfield(L, nodedef_table, "climbable", f.climbable);
-       // Player can build on these
-       getboolfield(L, nodedef_table, "buildable_to", f.buildable_to);
-       // If true, param2 is set to direction when placed. Used for torches.
-       // NOTE: the direction format is quite inefficient and should be changed
-       getboolfield(L, nodedef_table, "wall_mounted", f.wall_mounted);
-       // Whether this content type often contains mineral.
-       // Used for texture atlas creation.
-       // Currently only enabled for CONTENT_STONE.
-       getboolfield(L, nodedef_table, "often_contains_mineral", f.often_contains_mineral);
-       // Inventory item string as which the node appears in inventory when dug.
-       // Mineral overrides this.
-       getstringfield(L, nodedef_table, "dug_item", f.dug_item);
-       // Extra dug item and its rarity
-       getstringfield(L, nodedef_table, "extra_dug_item", f.extra_dug_item);
-       // Usual get interval for extra dug item
-       getintfield(L, nodedef_table, "extra_dug_item_rarity", f.extra_dug_item_rarity);
-       // Metadata name of node (eg. "furnace")
-       getstringfield(L, nodedef_table, "metadata_name", f.metadata_name);
-       // Whether the node is non-liquid, source liquid or flowing liquid
-       f.liquid_type = (LiquidType)getenumfield(L, nodedef_table, "liquidtype",
-                       es_LiquidType, LIQUID_NONE);
-       // If the content is liquid, this is the flowing version of the liquid.
-       getstringfield(L, nodedef_table, "liquid_alternative_flowing",
-                       f.liquid_alternative_flowing);
-       // If the content is liquid, this is the source version of the liquid.
-       getstringfield(L, nodedef_table, "liquid_alternative_source",
-                       f.liquid_alternative_source);
-       // Viscosity for fluid flow, ranging from 1 to 7, with
-       // 1 giving almost instantaneous propagation and 7 being
-       // the slowest possible
-       f.liquid_viscosity = getintfield_default(L, nodedef_table,
-                       "liquid_viscosity", f.liquid_viscosity);
-       // Amount of light the node emits
-       f.light_source = getintfield_default(L, nodedef_table,
-                       "light_source", f.light_source);
-       f.damage_per_second = getintfield_default(L, nodedef_table,
-                       "damage_per_second", f.damage_per_second);
-       
-       lua_getfield(L, nodedef_table, "selection_box");
-       if(lua_istable(L, -1)){
-               f.selection_box.type = (NodeBoxType)getenumfield(L, -1, "type",
-                               es_NodeBoxType, NODEBOX_REGULAR);
+       ~InvRef()
+       {
+       }
 
-               lua_getfield(L, -1, "fixed");
-               if(lua_istable(L, -1))
-                       f.selection_box.fixed = read_aabbox3df32(L, -1, BS);
-               lua_pop(L, 1);
+       // Creates an InvRef and leaves it on top of stack
+       // Not callable from Lua; all references are created on the C side.
+       static void create(lua_State *L, const InventoryLocation &loc)
+       {
+               InvRef *o = new InvRef(loc);
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+       }
+       static void createPlayer(lua_State *L, Player *player)
+       {
+               InventoryLocation loc;
+               loc.setPlayer(player->getName());
+               create(L, loc);
+       }
+       static void createNodeMeta(lua_State *L, v3s16 p)
+       {
+               InventoryLocation loc;
+               loc.setNodeMeta(p);
+               create(L, loc);
+       }
 
-               lua_getfield(L, -1, "wall_top");
-               if(lua_istable(L, -1))
-                       f.selection_box.wall_top = read_aabbox3df32(L, -1, BS);
-               lua_pop(L, 1);
+       static void Register(lua_State *L)
+       {
+               lua_newtable(L);
+               int methodtable = lua_gettop(L);
+               luaL_newmetatable(L, className);
+               int metatable = lua_gettop(L);
 
-               lua_getfield(L, -1, "wall_bottom");
-               if(lua_istable(L, -1))
-                       f.selection_box.wall_bottom = read_aabbox3df32(L, -1, BS);
-               lua_pop(L, 1);
+               lua_pushliteral(L, "__metatable");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);  // hide metatable from Lua getmetatable()
 
-               lua_getfield(L, -1, "wall_side");
-               if(lua_istable(L, -1))
-                       f.selection_box.wall_side = read_aabbox3df32(L, -1, BS);
-               lua_pop(L, 1);
-       }
-       lua_pop(L, 1);
+               lua_pushliteral(L, "__index");
+               lua_pushvalue(L, methodtable);
+               lua_settable(L, metatable);
 
-       lua_getfield(L, nodedef_table, "material");
-       if(lua_istable(L, -1)){
-               f.material.diggability = (Diggability)getenumfield(L, -1, "diggability",
-                               es_Diggability, DIGGABLE_NORMAL);
-               
-               getfloatfield(L, -1, "constant_time", f.material.constant_time);
-               getfloatfield(L, -1, "weight", f.material.weight);
-               getfloatfield(L, -1, "crackiness", f.material.crackiness);
-               getfloatfield(L, -1, "crumbliness", f.material.crumbliness);
-               getfloatfield(L, -1, "cuttability", f.material.cuttability);
-               getfloatfield(L, -1, "flammability", f.material.flammability);
-       }
-       lua_pop(L, 1);
+               lua_pushliteral(L, "__gc");
+               lua_pushcfunction(L, gc_object);
+               lua_settable(L, metatable);
 
-       getstringfield(L, nodedef_table, "cookresult_itemstring", f.cookresult_item);
-       getfloatfield(L, nodedef_table, "furnace_cooktime", f.furnace_cooktime);
-       getfloatfield(L, nodedef_table, "furnace_burntime", f.furnace_burntime);
-       
-       /*
-               Register it
-       */
-       
-       nodedef->set(name, f);
-       
-       return 0; /* number of results */
-}
+               lua_pop(L, 1);  // drop metatable
 
-// alias_node(name, convert_to_name)
-static int l_alias_node(lua_State *L)
-{
-       std::string name = luaL_checkstring(L, 1);
-       std::string convert_to = luaL_checkstring(L, 2);
+               luaL_openlib(L, 0, methods, 0);  // fill methodtable
+               lua_pop(L, 1);  // drop methodtable
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable node definition manager from the server
-       IWritableNodeDefManager *nodedef =
-                       server->getWritableNodeDefManager();
-       
-       nodedef->setAlias(name, convert_to);
-       
-       return 0; /* number of results */
-}
+               // Cannot be created from Lua
+               //lua_register(L, className, create_object);
+       }
+};
+const char InvRef::className[] = "InvRef";
+const luaL_reg InvRef::methods[] = {
+       method(InvRef, get_size),
+       method(InvRef, set_size),
+       method(InvRef, get_stack),
+       method(InvRef, set_stack),
+       method(InvRef, get_list),
+       method(InvRef, set_list),
+       method(InvRef, autoinsert_stack),
+       method(InvRef, autoinsert_stackstring),
+       {0,0}
+};
 
-// alias_tool(name, convert_to_name)
-static int l_alias_tool(lua_State *L)
-{
-       std::string name = luaL_checkstring(L, 1);
-       std::string convert_to = luaL_checkstring(L, 2);
+/*
+       NodeMetaRef
+*/
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable tool definition manager from the server
-       IWritableToolDefManager *tooldef =
-                       server->getWritableToolDefManager();
-       
-       tooldef->setAlias(name, convert_to);
+class NodeMetaRef
+{
+private:
+       v3s16 m_p;
+       ServerEnvironment *m_env;
 
-       return 0; /* number of results */
-}
-
-// alias_craftitem(name, convert_to_name)
-static int l_alias_craftitem(lua_State *L)
-{
-       std::string name = luaL_checkstring(L, 1);
-       std::string convert_to = luaL_checkstring(L, 2);
-
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable CraftItem definition manager from the server
-       IWritableCraftItemDefManager *craftitemdef =
-                       server->getWritableCraftItemDefManager();
-       
-       craftitemdef->setAlias(name, convert_to);
-
-       return 0; /* number of results */
-}
-
-// register_craft({output=item, recipe={{item00,item10},{item01,item11}})
-static int l_register_craft(lua_State *L)
-{
-       //infostream<<"register_craft"<<std::endl;
-       luaL_checktype(L, 1, LUA_TTABLE);
-       int table0 = 1;
-
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable craft definition manager from the server
-       IWritableCraftDefManager *craftdef =
-                       server->getWritableCraftDefManager();
-       
-       std::string output;
-       int width = 0;
-       std::vector<std::string> input;
-
-       lua_getfield(L, table0, "output");
-       luaL_checktype(L, -1, LUA_TSTRING);
-       if(lua_isstring(L, -1))
-               output = lua_tostring(L, -1);
-       lua_pop(L, 1);
-
-       lua_getfield(L, table0, "recipe");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       if(lua_istable(L, -1)){
-               int table1 = lua_gettop(L);
-               lua_pushnil(L);
-               int rowcount = 0;
-               while(lua_next(L, table1) != 0){
-                       int colcount = 0;
-                       // key at index -2 and value at index -1
-                       luaL_checktype(L, -1, LUA_TTABLE);
-                       if(lua_istable(L, -1)){
-                               int table2 = lua_gettop(L);
-                               lua_pushnil(L);
-                               while(lua_next(L, table2) != 0){
-                                       // key at index -2 and value at index -1
-                                       luaL_checktype(L, -1, LUA_TSTRING);
-                                       input.push_back(lua_tostring(L, -1));
-                                       // removes value, keeps key for next iteration
-                                       lua_pop(L, 1);
-                                       colcount++;
-                               }
-                       }
-                       if(rowcount == 0){
-                               width = colcount;
-                       } else {
-                               if(colcount != width){
-                                       std::string error;
-                                       error += "Invalid crafting recipe (output=\""
-                                                       + output + "\")";
-                                       throw LuaError(L, error);
-                               }
-                       }
-                       // removes value, keeps key for next iteration
-                       lua_pop(L, 1);
-                       rowcount++;
-               }
-       }
-       lua_pop(L, 1);
-
-       CraftDefinition def(output, width, input);
-       craftdef->registerCraft(def);
-
-       return 0; /* number of results */
-}
-
-// setting_get(name)
-static int l_setting_get(lua_State *L)
-{
-       const char *name = luaL_checkstring(L, 1);
-       try{
-               std::string value = g_settings->get(name);
-               lua_pushstring(L, value.c_str());
-       } catch(SettingNotFoundException &e){
-               lua_pushnil(L);
-       }
-       return 1;
-}
-
-// setting_getbool(name)
-static int l_setting_getbool(lua_State *L)
-{
-       const char *name = luaL_checkstring(L, 1);
-       try{
-               bool value = g_settings->getBool(name);
-               lua_pushboolean(L, value);
-       } catch(SettingNotFoundException &e){
-               lua_pushnil(L);
-       }
-       return 1;
-}
-
-// chat_send_all(text)
-static int l_chat_send_all(lua_State *L)
-{
-       const char *text = luaL_checkstring(L, 1);
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // Send
-       server->notifyPlayers(narrow_to_wide(text));
-       return 0;
-}
-
-// chat_send_player(name, text)
-static int l_chat_send_player(lua_State *L)
-{
-       const char *name = luaL_checkstring(L, 1);
-       const char *text = luaL_checkstring(L, 2);
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // Send
-       server->notifyPlayer(name, narrow_to_wide(text));
-       return 0;
-}
-
-// get_player_privs(name, text)
-static int l_get_player_privs(lua_State *L)
-{
-       const char *name = luaL_checkstring(L, 1);
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // 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);
-       for(std::set<std::string>::const_iterator
-                       i = privs_s.begin(); i != privs_s.end(); i++){
-               lua_pushboolean(L, true);
-               lua_setfield(L, table, i->c_str());
-       }
-       lua_pushvalue(L, table);
-       return 1;
-}
-
-static const struct luaL_Reg minetest_f [] = {
-       {"register_nodedef_defaults", l_register_nodedef_defaults},
-       {"register_entity", l_register_entity},
-       {"register_tool", l_register_tool},
-       {"register_craftitem", l_register_craftitem},
-       {"register_node", l_register_node},
-       {"register_craft", l_register_craft},
-       {"register_abm", l_register_abm},
-       {"alias_node", l_alias_node},
-       {"alias_tool", l_alias_tool},
-       {"alias_craftitem", l_alias_craftitem},
-       {"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},
-       {NULL, NULL}
-};
-
-/*
-       LuaEntity functions
-*/
-
-static const struct luaL_Reg minetest_entity_m [] = {
-       {NULL, NULL}
-};
-
-/*
-       Getters for stuff in main tables
-*/
-
-static void objectref_get(lua_State *L, u16 id)
-{
-       // Get minetest.object_refs[i]
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "object_refs");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       lua_pushnumber(L, id);
-       lua_gettable(L, -2);
-       lua_remove(L, -2); // object_refs
-       lua_remove(L, -2); // minetest
-}
-
-static void luaentity_get(lua_State *L, u16 id)
-{
-       // Get minetest.luaentities[i]
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "luaentities");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       lua_pushnumber(L, id);
-       lua_gettable(L, -2);
-       lua_remove(L, -2); // luaentities
-       lua_remove(L, -2); // minetest
-}
-
-/*
-       Reference wrappers
-*/
-
-#define method(class, name) {#name, class::l_##name}
-
-/*
-       NodeMetaRef
-*/
-
-class NodeMetaRef
-{
-private:
-       v3s16 m_p;
-       ServerEnvironment *m_env;
-
-       static const char className[];
-       static const luaL_reg methods[];
+       static const char className[];
+       static const luaL_reg methods[];
 
        static NodeMetaRef *checkobject(lua_State *L, int narg)
        {
@@ -1488,7 +1364,7 @@ class NodeMetaRef
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string text = lua_tostring(L, 2);
+               std::string text = luaL_checkstring(L, 2);
                meta->setText(text);
                reportMetadataChange(ref);
                return 0;
@@ -1523,41 +1399,53 @@ class NodeMetaRef
        // set_infotext(self, text)
        static int l_set_infotext(lua_State *L)
        {
-               infostream<<__FUNCTION_NAME<<std::endl;
                NodeMetaRef *ref = checkobject(L, 1);
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string text = lua_tostring(L, 2);
+               std::string text = luaL_checkstring(L, 2);
                meta->setInfoText(text);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // inventory_set_list(self, name, {item1, item2, ...})
+       // get_inventory(self)
+       static int l_get_inventory(lua_State *L)
+       {
+               NodeMetaRef *ref = checkobject(L, 1);
+               NodeMetadata *meta = getmeta(ref);
+               if(meta == NULL) return 0;
+               // Do it
+               InvRef::createNodeMeta(L, ref->m_p);
+               return 1;
+       }
+
+       // deprecated: inventory_set_list(self, name, {item1, item2, ...})
        static int l_inventory_set_list(lua_State *L)
        {
+               infostream<<"Deprecated: inventory_set_list"<<std::endl;
                NodeMetaRef *ref = checkobject(L, 1);
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
                Inventory *inv = meta->getInventory();
-               const char *name = lua_tostring(L, 2);
+               const char *name = luaL_checkstring(L, 2);
                inventory_set_list_from_lua(inv, name, L, 3,
                                ref->m_env->getGameDef());
                reportMetadataChange(ref);
                return 0;
        }
 
-       // inventory_get_list(self, name)
+       // deprecated: inventory_get_list(self, name)
        static int l_inventory_get_list(lua_State *L)
        {
+               infostream<<"Deprecated: inventory_get_list"<<std::endl;
                NodeMetaRef *ref = checkobject(L, 1);
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
                Inventory *inv = meta->getInventory();
-               const char *name = lua_tostring(L, 2);
+               const char *name = luaL_checkstring(L, 2);
                inventory_get_list_to_lua(inv, name, L);
                return 1;
        }
@@ -1569,7 +1457,7 @@ class NodeMetaRef
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string text = lua_tostring(L, 2);
+               std::string text = luaL_checkstring(L, 2);
                meta->setInventoryDrawSpec(text);
                reportMetadataChange(ref);
                return 0;
@@ -1667,7 +1555,7 @@ class NodeMetaRef
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string name = lua_tostring(L, 2);
+               std::string name = luaL_checkstring(L, 2);
                size_t len = 0;
                const char *s = lua_tolstring(L, 3, &len);
                std::string str(s, len);
@@ -1683,7 +1571,7 @@ class NodeMetaRef
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string name = lua_tostring(L, 2);
+               std::string name = luaL_checkstring(L, 2);
                std::string str = meta->getString(name);
                lua_pushlstring(L, str.c_str(), str.size());
                return 1;
@@ -1747,8 +1635,9 @@ const luaL_reg NodeMetaRef::methods[] = {
        method(NodeMetaRef, get_text),
        method(NodeMetaRef, get_owner),
        method(NodeMetaRef, set_infotext),
-       method(NodeMetaRef, inventory_set_list),
-       method(NodeMetaRef, inventory_get_list),
+       method(NodeMetaRef, get_inventory),
+       method(NodeMetaRef, inventory_set_list), // deprecated
+       method(NodeMetaRef, inventory_get_list), // deprecated
        method(NodeMetaRef, set_inventory_draw_spec),
        method(NodeMetaRef, set_allow_text_input),
        method(NodeMetaRef, set_allow_removal),
@@ -1855,7 +1744,7 @@ class ObjectRef
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // Do it
                co->setPos(pos);
                return 0;
@@ -1869,7 +1758,7 @@ class ObjectRef
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // continuous
                bool continuous = lua_toboolean(L, 3);
                // Do it
@@ -1939,7 +1828,7 @@ class ObjectRef
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                // itemstring
-               const char *itemstring = lua_tostring(L, 2);
+               const char *itemstring = luaL_checkstring(L, 2);
                infostream<<"ObjectRef::l_add_to_inventory(): id="<<co->getId()
                                <<" itemstring=\""<<itemstring<<"\""<<std::endl;
                // Do it
@@ -1975,7 +1864,7 @@ class ObjectRef
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                // itemstring
-               const char *itemstring = lua_tostring(L, 2);
+               const char *itemstring = luaL_checkstring(L, 2);
                infostream<<"ObjectRef::l_add_to_inventory_later(): id="<<co->getId()
                                <<" itemstring=\""<<itemstring<<"\""<<std::endl;
                // Do it
@@ -2033,12 +1922,24 @@ class ObjectRef
                LuaEntitySAO *co = getluaobject(ref);
                if(co == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // Do it
                co->setVelocity(pos);
                return 0;
        }
        
+       // getvelocity(self)
+       static int l_getvelocity(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               v3f v = co->getVelocity();
+               pushFloatPos(L, v);
+               return 1;
+       }
+       
        // setacceleration(self, {x=num, y=num, z=num})
        static int l_setacceleration(lua_State *L)
        {
@@ -2046,7 +1947,7 @@ class ObjectRef
                LuaEntitySAO *co = getluaobject(ref);
                if(co == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // Do it
                co->setAcceleration(pos);
                return 0;
@@ -2064,28 +1965,53 @@ class ObjectRef
                return 1;
        }
        
-       // settexturemod(self, mod)
-       static int l_settexturemod(lua_State *L)
+       // setyaw(self, radians)
+       static int l_setyaw(lua_State *L)
        {
                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
-               std::string mod = lua_tostring(L, 2);
-               co->setTextureMod(mod);
+               co->setYaw(yaw);
                return 0;
        }
        
-       // setsprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
-       //           select_horiz_by_yawpitch=false)
-       static int l_setsprite(lua_State *L)
+       // getyaw(self)
+       static int l_getyaw(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
                LuaEntitySAO *co = getluaobject(ref);
                if(co == NULL) return 0;
                // Do it
-               v2s16 p(0,0);
-               if(!lua_isnil(L, 2))
+               float yaw = co->getYaw() * core::DEGTORAD;
+               lua_pushnumber(L, yaw);
+               return 1;
+       }
+       
+       // settexturemod(self, mod)
+       static int l_settexturemod(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               std::string mod = luaL_checkstring(L, 2);
+               co->setTextureMod(mod);
+               return 0;
+       }
+       
+       // setsprite(self, p={x=0,y=0}, num_frames=1, framelength=0.2,
+       //           select_horiz_by_yawpitch=false)
+       static int l_setsprite(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               v2s16 p(0,0);
+               if(!lua_isnil(L, 2))
                        p = read_v2s16(L, 2);
                int num_frames = 1;
                if(!lua_isnil(L, 3))
@@ -2100,6 +2026,29 @@ class ObjectRef
                return 0;
        }
 
+       // get_entity_name(self)
+       static int l_get_entity_name(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               std::string name = co->getName();
+               lua_pushstring(L, name.c_str());
+               return 1;
+       }
+       
+       // get_luaentity(self)
+       static int l_get_luaentity(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               luaentity_get(L, co->getId());
+               return 1;
+       }
+       
        /* Player-only */
        
        // get_player_name(self)
@@ -2116,13 +2065,25 @@ class ObjectRef
                return 1;
        }
        
-       // inventory_set_list(self, name, {item1, item2, ...})
+       // get_inventory(self)
+       static int l_get_inventory(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               // Do it
+               InvRef::createPlayer(L, player);
+               return 1;
+       }
+
+       // deprecated: inventory_set_list(self, name, {item1, item2, ...})
        static int l_inventory_set_list(lua_State *L)
        {
+               infostream<<"Deprecated: inventory_set_list"<<std::endl;
                ObjectRef *ref = checkobject(L, 1);
                ServerRemotePlayer *player = getplayer(ref);
                if(player == NULL) return 0;
-               const char *name = lua_tostring(L, 2);
+               const char *name = luaL_checkstring(L, 2);
                // Do it
                inventory_set_list_from_lua(&player->inventory, name, L, 3,
                                player->getEnv()->getGameDef(), PLAYER_INVENTORY_SIZE);
@@ -2130,13 +2091,14 @@ class ObjectRef
                return 0;
        }
 
-       // inventory_get_list(self, name)
+       // deprecated: inventory_get_list(self, name)
        static int l_inventory_get_list(lua_State *L)
        {
+               infostream<<"Deprecated: inventory_get_list"<<std::endl;
                ObjectRef *ref = checkobject(L, 1);
                ServerRemotePlayer *player = getplayer(ref);
                if(player == NULL) return 0;
-               const char *name = lua_tostring(L, 2);
+               const char *name = luaL_checkstring(L, 2);
                // Do it
                inventory_get_list_to_lua(&player->inventory, name, L);
                return 1;
@@ -2166,41 +2128,43 @@ class ObjectRef
                if(player == NULL) return 0;
                // Do it
                InventoryItem *item0 = player->getWieldedItem();
-               if(item0 == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               if(std::string("MaterialItem") == item0->getName()){
-                       MaterialItem *item = (MaterialItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "NodeItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getNodeName().c_str());
-                       lua_setfield(L, -2, "name");
-               }
-               else if(std::string("CraftItem") == item0->getName()){
-                       CraftItem *item = (CraftItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "CraftItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getSubName().c_str());
-                       lua_setfield(L, -2, "name");
-               }
-               else if(std::string("ToolItem") == item0->getName()){
-                       ToolItem *item = (ToolItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "ToolItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getToolName().c_str());
-                       lua_setfield(L, -2, "name");
-                       lua_pushstring(L, itos(item->getWear()).c_str());
-                       lua_setfield(L, -2, "wear");
-               }
-               else{
-                       errorstream<<"l_get_wielded_item: Unknown item name: \""
-                                       <<item0->getName()<<"\""<<std::endl;
-                       lua_pushnil(L);
-               }
+               push_stack_item(L, item0);
+               return 1;
+       }
+
+       // get_look_dir(self)
+       static int l_get_look_dir(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               // Do it
+               float pitch = player->getRadPitch();
+               float yaw = player->getRadYaw();
+               v3f v(cos(pitch)*cos(yaw), sin(pitch), cos(pitch)*sin(yaw));
+               push_v3f(L, v);
+               return 1;
+       }
+
+       // get_look_pitch(self)
+       static int l_get_look_pitch(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               // Do it
+               lua_pushnumber(L, player->getRadPitch());
+               return 1;
+       }
+
+       // get_look_yaw(self)
+       static int l_get_look_yaw(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               // Do it
+               lua_pushnumber(L, player->getRadYaw());
                return 1;
        }
 
@@ -2282,16 +2246,25 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, get_hp),
        // LuaEntitySAO-only
        method(ObjectRef, setvelocity),
+       method(ObjectRef, getvelocity),
        method(ObjectRef, setacceleration),
        method(ObjectRef, getacceleration),
+       method(ObjectRef, setyaw),
+       method(ObjectRef, getyaw),
        method(ObjectRef, settexturemod),
        method(ObjectRef, setsprite),
+       method(ObjectRef, get_entity_name),
+       method(ObjectRef, get_luaentity),
        // Player-only
        method(ObjectRef, get_player_name),
-       method(ObjectRef, inventory_set_list),
-       method(ObjectRef, inventory_get_list),
+       method(ObjectRef, get_inventory),
+       method(ObjectRef, inventory_set_list), // deprecated
+       method(ObjectRef, inventory_get_list), // deprecated
        method(ObjectRef, get_wielded_itemstring),
        method(ObjectRef, get_wielded_item),
+       method(ObjectRef, get_look_dir),
+       method(ObjectRef, get_look_pitch),
+       method(ObjectRef, get_look_yaw),
        {0,0}
 };
 
@@ -2337,7 +2310,7 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3s16 pos = readpos(L, 2);
+               v3s16 pos = read_v3s16(L, 2);
                // content
                MapNode n = readnode(L, 3, env->getGameDef()->ndef());
                // Do it
@@ -2355,7 +2328,7 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3s16 pos = readpos(L, 2);
+               v3s16 pos = read_v3s16(L, 2);
                // Do it
                bool succeeded = env->getMap().removeNodeWithEvent(pos);
                lua_pushboolean(L, succeeded);
@@ -2371,7 +2344,7 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3s16 pos = readpos(L, 2);
+               v3s16 pos = read_v3s16(L, 2);
                // Do it
                MapNode n = env->getMap().getNodeNoEx(pos);
                // Return node
@@ -2388,7 +2361,7 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3s16 pos = readpos(L, 2);
+               v3s16 pos = read_v3s16(L, 2);
                // Do it
                try{
                        MapNode n = env->getMap().getNode(pos);
@@ -2411,7 +2384,7 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // Do it
-               v3s16 pos = readpos(L, 2);
+               v3s16 pos = read_v3s16(L, 2);
                u32 time_of_day = env->getTimeOfDay();
                if(lua_isnumber(L, 3))
                        time_of_day = 24000.0 * lua_tonumber(L, 3);
@@ -2430,22 +2403,27 @@ class EnvRef
                }
        }
 
-       // EnvRef:add_luaentity(pos, entityname)
+       // EnvRef:add_entity(pos, entityname)
        // pos = {x=num, y=num, z=num}
-       static int l_add_luaentity(lua_State *L)
+       static int l_add_entity(lua_State *L)
        {
-               //infostream<<"EnvRef::l_add_luaentity()"<<std::endl;
+               //infostream<<"EnvRef::l_add_entity()"<<std::endl;
                EnvRef *o = checkobject(L, 1);
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // content
-               const char *name = lua_tostring(L, 3);
+               const char *name = luaL_checkstring(L, 3);
                // Do it
                ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, "");
-               env->addActiveObject(obj);
-               return 0;
+               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;
        }
 
        // EnvRef:add_item(pos, inventorystring)
@@ -2457,156 +2435,904 @@ class EnvRef
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
-               v3f pos = readFloatPos(L, 2);
+               v3f pos = checkFloatPos(L, 2);
                // inventorystring
-               const char *inventorystring = lua_tostring(L, 3);
+               const char *inventorystring = luaL_checkstring(L, 3);
                // Do it
                ServerActiveObject *obj = new ItemSAO(env, pos, inventorystring);
                env->addActiveObject(obj);
                return 0;
        }
 
-       // 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 = readFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new RatSAO(env, pos);
-               env->addActiveObject(obj);
-               return 0;
-       }
+       // 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);
+               return 0;
+       }
+
+       // EnvRef:add_firefly(pos)
+       // 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);
+               return 0;
+       }
+
+       // EnvRef:get_meta(pos)
+       static int l_get_meta(lua_State *L)
+       {
+               //infostream<<"EnvRef::l_get_meta()"<<std::endl;
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               // Do it
+               v3s16 p = read_v3s16(L, 2);
+               NodeMetaRef::create(L, p, env);
+               return 1;
+       }
+
+       // EnvRef:get_player_by_name(name)
+       static int l_get_player_by_name(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               // Do it
+               const char *name = luaL_checkstring(L, 2);
+               ServerRemotePlayer *player =
+                               static_cast<ServerRemotePlayer*>(env->getPlayer(name));
+               if(player == NULL){
+                       lua_pushnil(L);
+                       return 1;
+               }
+               // Put player on stack
+               objectref_get_or_create(L, player);
+               return 1;
+       }
+
+       // EnvRef:get_objects_inside_radius(pos, radius)
+       static int l_get_objects_inside_radius(lua_State *L)
+       {
+               // Get the table insert function
+               lua_getglobal(L, "table");
+               lua_getfield(L, -1, "insert");
+               int table_insert = lua_gettop(L);
+               // Get environemnt
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               // Do it
+               v3f pos = checkFloatPos(L, 2);
+               float radius = luaL_checknumber(L, 3) * BS;
+               std::set<u16> ids = env->getObjectsInsideRadius(pos, radius);
+               lua_newtable(L);
+               int table = lua_gettop(L);
+               for(std::set<u16>::const_iterator
+                               i = ids.begin(); i != ids.end(); i++){
+                       ServerActiveObject *obj = env->getActiveObject(*i);
+                       // Insert object reference into table
+                       lua_pushvalue(L, table_insert);
+                       lua_pushvalue(L, table);
+                       objectref_get_or_create(L, obj);
+                       if(lua_pcall(L, 2, 0, 0))
+                               script_error(L, "error: %s", lua_tostring(L, -1));
+               }
+               return 1;
+       }
+
+       static int gc_object(lua_State *L) {
+               EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
+
+public:
+       EnvRef(ServerEnvironment *env):
+               m_env(env)
+       {
+               infostream<<"EnvRef created"<<std::endl;
+       }
+
+       ~EnvRef()
+       {
+               infostream<<"EnvRef destructing"<<std::endl;
+       }
+
+       // Creates an EnvRef and leaves it on top of stack
+       // Not callable from Lua; all references are created on the C side.
+       static void create(lua_State *L, ServerEnvironment *env)
+       {
+               EnvRef *o = new EnvRef(env);
+               //infostream<<"EnvRef::create: o="<<o<<std::endl;
+               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
+               luaL_getmetatable(L, className);
+               lua_setmetatable(L, -2);
+       }
+
+       static void set_null(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, -1);
+               o->m_env = NULL;
+       }
+       
+       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
+
+               // Cannot be created from Lua
+               //lua_register(L, className, create_object);
+       }
+};
+const char EnvRef::className[] = "EnvRef";
+const luaL_reg EnvRef::methods[] = {
+       method(EnvRef, add_node),
+       method(EnvRef, remove_node),
+       method(EnvRef, get_node),
+       method(EnvRef, get_node_or_nil),
+       method(EnvRef, get_node_light),
+       method(EnvRef, add_entity),
+       method(EnvRef, add_item),
+       method(EnvRef, add_rat),
+       method(EnvRef, add_firefly),
+       method(EnvRef, get_meta),
+       method(EnvRef, get_player_by_name),
+       method(EnvRef, get_objects_inside_radius),
+       {0,0}
+};
+
+/*
+       Global functions
+*/
+
+static int l_register_nodedef_defaults(lua_State *L)
+{
+       luaL_checktype(L, 1, LUA_TTABLE);
+
+       lua_pushvalue(L, 1); // Explicitly put parameter 1 on top of stack
+       lua_setfield(L, LUA_REGISTRYINDEX, "minetest_nodedef_default");
+
+       return 0;
+}
+
+// Register new object prototype
+// register_entity(name, prototype)
+static int l_register_entity(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       check_modname_prefix(L, name);
+       //infostream<<"register_entity: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
+
+       // Get minetest.registered_entities
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_entities");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       int registered_entities = lua_gettop(L);
+       lua_pushvalue(L, 2); // Object = param 2 -> stack top
+       // registered_entities[name] = object
+       lua_setfield(L, registered_entities, name.c_str());
+       
+       // Get registered object to top of stack
+       lua_pushvalue(L, 2);
+
+       // Set name field
+       lua_pushvalue(L, 1);
+       lua_setfield(L, -2, "name");
+       
+       // Set __index to point to itself
+       lua_pushvalue(L, -1);
+       lua_setfield(L, -2, "__index");
+
+       // Set metatable.__index = metatable
+       luaL_getmetatable(L, "minetest.entity");
+       lua_pushvalue(L, -1); // duplicate metatable
+       lua_setfield(L, -2, "__index");
+       // Set object metatable
+       lua_setmetatable(L, -2);
+
+       return 0; /* number of results */
+}
+
+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;
+       }
+       virtual float getTriggerInterval()
+       {
+               return m_trigger_interval;
+       }
+       virtual u32 getTriggerChance()
+       {
+               return m_trigger_chance;
+       }
+       virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
+                       u32 active_object_count, u32 active_object_count_wider)
+       {
+               lua_State *L = m_lua;
+       
+               realitycheck(L);
+               assert(lua_checkstack(L, 20));
+               StackUnroller stack_unroller(L);
+
+               // Get minetest.registered_abms
+               lua_getglobal(L, "minetest");
+               lua_getfield(L, -1, "registered_abms");
+               luaL_checktype(L, -1, LUA_TTABLE);
+               int registered_abms = lua_gettop(L);
+
+               // Get minetest.registered_abms[m_id]
+               lua_pushnumber(L, m_id);
+               lua_gettable(L, registered_abms);
+               if(lua_isnil(L, -1))
+                       assert(0);
+               
+               // Call action
+               luaL_checktype(L, -1, LUA_TTABLE);
+               lua_getfield(L, -1, "action");
+               luaL_checktype(L, -1, LUA_TFUNCTION);
+               push_v3s16(L, p);
+               pushnode(L, n, env->getGameDef()->ndef());
+               lua_pushnumber(L, active_object_count);
+               lua_pushnumber(L, active_object_count_wider);
+               if(lua_pcall(L, 4, 0, 0))
+                       script_error(L, "error: %s", lua_tostring(L, -1));
+       }
+};
+
+// register_abm({...})
+static int l_register_abm(lua_State *L)
+{
+       //infostream<<"register_abm"<<std::endl;
+       luaL_checktype(L, 1, LUA_TTABLE);
+
+       // Get minetest.registered_abms
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_abms");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       int registered_abms = lua_gettop(L);
+
+       int id = 1;
+       // Find free id
+       for(;;){
+               lua_pushnumber(L, id);
+               lua_gettable(L, registered_abms);
+               if(lua_isnil(L, -1))
+                       break;
+               lua_pop(L, 1);
+               id++;
+       }
+       lua_pop(L, 1);
+
+       infostream<<"register_abm: id="<<id<<std::endl;
+
+       // registered_abms[id] = spec
+       lua_pushnumber(L, id);
+       lua_pushvalue(L, 1);
+       lua_settable(L, registered_abms);
+       
+       return 0; /* number of results */
+}
+
+// register_tool(name, {lots of stuff})
+static int l_register_tool(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       check_modname_prefix(L, name);
+       //infostream<<"register_tool: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
+       int table = 2;
+
+       // Get the writable tool definition manager from the server
+       IWritableToolDefManager *tooldef =
+                       get_server(L)->getWritableToolDefManager();
+       
+       ToolDefinition def = read_tool_definition(L, table);
+
+       tooldef->registerTool(name, def);
+       return 0; /* number of results */
+}
+
+// register_craftitem(name, {lots of stuff})
+static int l_register_craftitem(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       check_modname_prefix(L, name);
+       //infostream<<"register_craftitem: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
+       int table = 2;
+
+       // Get the writable CraftItem definition manager from the server
+       IWritableCraftItemDefManager *craftitemdef =
+                       get_server(L)->getWritableCraftItemDefManager();
+       
+       // Check if on_drop is defined
+       lua_getfield(L, table, "on_drop");
+       bool got_on_drop = !lua_isnil(L, -1);
+       lua_pop(L, 1);
+
+       // Check if on_use is defined
+       lua_getfield(L, table, "on_use");
+       bool got_on_use = !lua_isnil(L, -1);
+       lua_pop(L, 1);
+
+       CraftItemDefinition def;
+       
+       getstringfield(L, table, "image", def.imagename);
+       getstringfield(L, table, "cookresult_itemstring", def.cookresult_item);
+       getfloatfield(L, table, "furnace_cooktime", def.furnace_cooktime);
+       getfloatfield(L, table, "furnace_burntime", def.furnace_burntime);
+       def.usable = getboolfield_default(L, table, "usable", got_on_use);
+       getboolfield(L, table, "liquids_pointable", def.liquids_pointable);
+       def.dropcount = getintfield_default(L, table, "dropcount", def.dropcount);
+       def.stack_max = getintfield_default(L, table, "stack_max", def.stack_max);
+
+       // If an on_drop callback is defined, force dropcount to 1
+       if (got_on_drop)
+               def.dropcount = 1;
+
+       // Register it
+       craftitemdef->registerCraftItem(name, def);
+
+       lua_pushvalue(L, table);
+       scriptapi_add_craftitem(L, name.c_str());
+
+       return 0; /* number of results */
+}
+
+// register_node(name, {lots of stuff})
+static int l_register_node(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       check_modname_prefix(L, name);
+       //infostream<<"register_node: "<<name<<std::endl;
+       luaL_checktype(L, 2, LUA_TTABLE);
+       int nodedef_table = 2;
+
+       // Get the writable node definition manager from the server
+       IWritableNodeDefManager *nodedef =
+                       get_server(L)->getWritableNodeDefManager();
+       
+       // Get default node definition from registry
+       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_nodedef_default");
+       int nodedef_default = lua_gettop(L);
+
+       /*
+               Add to minetest.registered_nodes with default as metatable
+       */
+       
+       // Get the node definition table given as parameter
+       lua_pushvalue(L, nodedef_table);
+
+       // Set __index to point to itself
+       lua_pushvalue(L, -1);
+       lua_setfield(L, -2, "__index");
+
+       // Set nodedef_default as metatable for the definition
+       lua_pushvalue(L, nodedef_default);
+       lua_setmetatable(L, nodedef_table);
+       
+       // minetest.registered_nodes[name] = nodedef
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "registered_nodes");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       lua_pushstring(L, name.c_str());
+       lua_pushvalue(L, nodedef_table);
+       lua_settable(L, -3);
+
+       /*
+               Create definition
+       */
+       
+       ContentFeatures f;
+
+       // Default to getting the corresponding NodeItem when dug
+       f.dug_item = std::string("NodeItem \"")+name+"\" 1";
+       
+       // Default to unknown_block.png as all textures
+       f.setAllTextures("unknown_block.png");
+
+       /*
+               Read definiton from Lua
+       */
+
+       f.name = name;
+       
+       /* Visual definition */
+
+       f.drawtype = (NodeDrawType)getenumfield(L, nodedef_table, "drawtype", es_DrawType,
+                       NDT_NORMAL);
+       getfloatfield(L, nodedef_table, "visual_scale", f.visual_scale);
+
+       lua_getfield(L, nodedef_table, "tile_images");
+       if(lua_istable(L, -1)){
+               int table = lua_gettop(L);
+               lua_pushnil(L);
+               int i = 0;
+               while(lua_next(L, table) != 0){
+                       // key at index -2 and value at index -1
+                       if(lua_isstring(L, -1))
+                               f.tname_tiles[i] = lua_tostring(L, -1);
+                       else
+                               f.tname_tiles[i] = "";
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+                       i++;
+                       if(i==6){
+                               lua_pop(L, 1);
+                               break;
+                       }
+               }
+               // Copy last value to all remaining textures
+               if(i >= 1){
+                       std::string lastname = f.tname_tiles[i-1];
+                       while(i < 6){
+                               f.tname_tiles[i] = lastname;
+                               i++;
+                       }
+               }
+       }
+       lua_pop(L, 1);
+
+       getstringfield(L, nodedef_table, "inventory_image", f.tname_inventory);
+
+       lua_getfield(L, nodedef_table, "special_materials");
+       if(lua_istable(L, -1)){
+               int table = lua_gettop(L);
+               lua_pushnil(L);
+               int i = 0;
+               while(lua_next(L, table) != 0){
+                       // key at index -2 and value at index -1
+                       int smtable = lua_gettop(L);
+                       std::string tname = getstringfield_default(
+                                       L, smtable, "image", "");
+                       bool backface_culling = getboolfield_default(
+                                       L, smtable, "backface_culling", true);
+                       MaterialSpec mspec(tname, backface_culling);
+                       f.setSpecialMaterial(i, mspec);
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+                       i++;
+                       if(i==6){
+                               lua_pop(L, 1);
+                               break;
+                       }
+               }
+       }
+       lua_pop(L, 1);
+
+       f.alpha = getintfield_default(L, nodedef_table, "alpha", 255);
+
+       /* Other stuff */
+       
+       lua_getfield(L, nodedef_table, "post_effect_color");
+       if(!lua_isnil(L, -1))
+               f.post_effect_color = readARGB8(L, -1);
+       lua_pop(L, 1);
+
+       f.param_type = (ContentParamType)getenumfield(L, nodedef_table, "paramtype",
+                       es_ContentParamType, CPT_NONE);
+       
+       // True for all ground-like things like stone and mud, false for eg. trees
+       getboolfield(L, nodedef_table, "is_ground_content", f.is_ground_content);
+       f.light_propagates = (f.param_type == CPT_LIGHT);
+       warn_if_field_exists(L, nodedef_table, "light_propagates",
+                       "deprecated: determined from paramtype");
+       getboolfield(L, nodedef_table, "sunlight_propagates", f.sunlight_propagates);
+       // This is used for collision detection.
+       // Also for general solidness queries.
+       getboolfield(L, nodedef_table, "walkable", f.walkable);
+       // Player can point to these
+       getboolfield(L, nodedef_table, "pointable", f.pointable);
+       // Player can dig these
+       getboolfield(L, nodedef_table, "diggable", f.diggable);
+       // Player can climb these
+       getboolfield(L, nodedef_table, "climbable", f.climbable);
+       // Player can build on these
+       getboolfield(L, nodedef_table, "buildable_to", f.buildable_to);
+       // If true, param2 is set to direction when placed. Used for torches.
+       // NOTE: the direction format is quite inefficient and should be changed
+       getboolfield(L, nodedef_table, "wall_mounted", f.wall_mounted);
+       // Whether this content type often contains mineral.
+       // Used for texture atlas creation.
+       // Currently only enabled for CONTENT_STONE.
+       getboolfield(L, nodedef_table, "often_contains_mineral", f.often_contains_mineral);
+       // Inventory item string as which the node appears in inventory when dug.
+       // Mineral overrides this.
+       getstringfield(L, nodedef_table, "dug_item", f.dug_item);
+       // Extra dug item and its rarity
+       getstringfield(L, nodedef_table, "extra_dug_item", f.extra_dug_item);
+       // Usual get interval for extra dug item
+       getintfield(L, nodedef_table, "extra_dug_item_rarity", f.extra_dug_item_rarity);
+       // Metadata name of node (eg. "furnace")
+       getstringfield(L, nodedef_table, "metadata_name", f.metadata_name);
+       // Whether the node is non-liquid, source liquid or flowing liquid
+       f.liquid_type = (LiquidType)getenumfield(L, nodedef_table, "liquidtype",
+                       es_LiquidType, LIQUID_NONE);
+       // If the content is liquid, this is the flowing version of the liquid.
+       getstringfield(L, nodedef_table, "liquid_alternative_flowing",
+                       f.liquid_alternative_flowing);
+       // If the content is liquid, this is the source version of the liquid.
+       getstringfield(L, nodedef_table, "liquid_alternative_source",
+                       f.liquid_alternative_source);
+       // Viscosity for fluid flow, ranging from 1 to 7, with
+       // 1 giving almost instantaneous propagation and 7 being
+       // the slowest possible
+       f.liquid_viscosity = getintfield_default(L, nodedef_table,
+                       "liquid_viscosity", f.liquid_viscosity);
+       // Amount of light the node emits
+       f.light_source = getintfield_default(L, nodedef_table,
+                       "light_source", f.light_source);
+       f.damage_per_second = getintfield_default(L, nodedef_table,
+                       "damage_per_second", f.damage_per_second);
+       
+       lua_getfield(L, nodedef_table, "selection_box");
+       if(lua_istable(L, -1)){
+               f.selection_box.type = (NodeBoxType)getenumfield(L, -1, "type",
+                               es_NodeBoxType, NODEBOX_REGULAR);
+
+               lua_getfield(L, -1, "fixed");
+               if(lua_istable(L, -1))
+                       f.selection_box.fixed = read_aabbox3df32(L, -1, BS);
+               lua_pop(L, 1);
+
+               lua_getfield(L, -1, "wall_top");
+               if(lua_istable(L, -1))
+                       f.selection_box.wall_top = read_aabbox3df32(L, -1, BS);
+               lua_pop(L, 1);
+
+               lua_getfield(L, -1, "wall_bottom");
+               if(lua_istable(L, -1))
+                       f.selection_box.wall_bottom = read_aabbox3df32(L, -1, BS);
+               lua_pop(L, 1);
+
+               lua_getfield(L, -1, "wall_side");
+               if(lua_istable(L, -1))
+                       f.selection_box.wall_side = read_aabbox3df32(L, -1, BS);
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 1);
+
+       lua_getfield(L, nodedef_table, "material");
+       if(lua_istable(L, -1)){
+               f.material.diggability = (Diggability)getenumfield(L, -1, "diggability",
+                               es_Diggability, DIGGABLE_NORMAL);
+               
+               getfloatfield(L, -1, "constant_time", f.material.constant_time);
+               getfloatfield(L, -1, "weight", f.material.weight);
+               getfloatfield(L, -1, "crackiness", f.material.crackiness);
+               getfloatfield(L, -1, "crumbliness", f.material.crumbliness);
+               getfloatfield(L, -1, "cuttability", f.material.cuttability);
+               getfloatfield(L, -1, "flammability", f.material.flammability);
+       }
+       lua_pop(L, 1);
+
+       getstringfield(L, nodedef_table, "cookresult_itemstring", f.cookresult_item);
+       getfloatfield(L, nodedef_table, "furnace_cooktime", f.furnace_cooktime);
+       getfloatfield(L, nodedef_table, "furnace_burntime", f.furnace_burntime);
+       
+       /*
+               Register it
+       */
+       
+       nodedef->set(name, f);
+       
+       return 0; /* number of results */
+}
+
+// alias_node(name, convert_to_name)
+static int l_alias_node(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       std::string convert_to = luaL_checkstring(L, 2);
+
+       // Get the writable node definition manager from the server
+       IWritableNodeDefManager *nodedef =
+                       get_server(L)->getWritableNodeDefManager();
+       
+       nodedef->setAlias(name, convert_to);
+       
+       return 0; /* number of results */
+}
+
+// alias_tool(name, convert_to_name)
+static int l_alias_tool(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       std::string convert_to = luaL_checkstring(L, 2);
+
+       // Get the writable tool definition manager from the server
+       IWritableToolDefManager *tooldef =
+                       get_server(L)->getWritableToolDefManager();
+       
+       tooldef->setAlias(name, convert_to);
+
+       return 0; /* number of results */
+}
+
+// alias_craftitem(name, convert_to_name)
+static int l_alias_craftitem(lua_State *L)
+{
+       std::string name = luaL_checkstring(L, 1);
+       std::string convert_to = luaL_checkstring(L, 2);
+
+       // Get the writable CraftItem definition manager from the server
+       IWritableCraftItemDefManager *craftitemdef =
+                       get_server(L)->getWritableCraftItemDefManager();
+       
+       craftitemdef->setAlias(name, convert_to);
+
+       return 0; /* number of results */
+}
+
+// register_craft({output=item, recipe={{item00,item10},{item01,item11}})
+static int l_register_craft(lua_State *L)
+{
+       //infostream<<"register_craft"<<std::endl;
+       luaL_checktype(L, 1, LUA_TTABLE);
+       int table0 = 1;
+
+       // Get the writable craft definition manager from the server
+       IWritableCraftDefManager *craftdef =
+                       get_server(L)->getWritableCraftDefManager();
+       
+       std::string output;
+       int width = 0;
+       std::vector<std::string> input;
+
+       lua_getfield(L, table0, "output");
+       luaL_checktype(L, -1, LUA_TSTRING);
+       if(lua_isstring(L, -1))
+               output = lua_tostring(L, -1);
+       lua_pop(L, 1);
+
+       lua_getfield(L, table0, "recipe");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       if(lua_istable(L, -1)){
+               int table1 = lua_gettop(L);
+               lua_pushnil(L);
+               int rowcount = 0;
+               while(lua_next(L, table1) != 0){
+                       int colcount = 0;
+                       // key at index -2 and value at index -1
+                       luaL_checktype(L, -1, LUA_TTABLE);
+                       if(lua_istable(L, -1)){
+                               int table2 = lua_gettop(L);
+                               lua_pushnil(L);
+                               while(lua_next(L, table2) != 0){
+                                       // key at index -2 and value at index -1
+                                       luaL_checktype(L, -1, LUA_TSTRING);
+                                       input.push_back(lua_tostring(L, -1));
+                                       // removes value, keeps key for next iteration
+                                       lua_pop(L, 1);
+                                       colcount++;
+                               }
+                       }
+                       if(rowcount == 0){
+                               width = colcount;
+                       } else {
+                               if(colcount != width){
+                                       std::string error;
+                                       error += "Invalid crafting recipe (output=\""
+                                                       + output + "\")";
+                                       throw LuaError(L, error);
+                               }
+                       }
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+                       rowcount++;
+               }
+       }
+       lua_pop(L, 1);
+
+       CraftDefinition def(output, width, input);
+       craftdef->registerCraft(def);
 
-       // EnvRef:add_firefly(pos)
-       // 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 = readFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new FireflySAO(env, pos);
-               env->addActiveObject(obj);
-               return 0;
-       }
+       return 0; /* number of results */
+}
 
-       // EnvRef:get_meta(pos)
-       static int l_get_meta(lua_State *L)
-       {
-               //infostream<<"EnvRef::l_get_meta()"<<std::endl;
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // Do it
-               v3s16 p = readpos(L, 2);
-               NodeMetaRef::create(L, p, env);
-               return 1;
+// setting_get(name)
+static int l_setting_get(lua_State *L)
+{
+       const char *name = luaL_checkstring(L, 1);
+       try{
+               std::string value = g_settings->get(name);
+               lua_pushstring(L, value.c_str());
+       } catch(SettingNotFoundException &e){
+               lua_pushnil(L);
        }
+       return 1;
+}
 
-       // EnvRef:get_player_by_name(name)
-       static int l_get_player_by_name(lua_State *L)
-       {
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // Do it
-               const char *name = lua_tostring(L, 2);
-               ServerRemotePlayer *player =
-                               static_cast<ServerRemotePlayer*>(env->getPlayer(name));
-               if(player == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               // Put player on stack
-               objectref_get_or_create(L, player);
-               return 1;
+// setting_getbool(name)
+static int l_setting_getbool(lua_State *L)
+{
+       const char *name = luaL_checkstring(L, 1);
+       try{
+               bool value = g_settings->getBool(name);
+               lua_pushboolean(L, value);
+       } catch(SettingNotFoundException &e){
+               lua_pushnil(L);
        }
+       return 1;
+}
 
-       static int gc_object(lua_State *L) {
-               EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
-               delete o;
-               return 0;
-       }
+// chat_send_all(text)
+static int l_chat_send_all(lua_State *L)
+{
+       const char *text = luaL_checkstring(L, 1);
+       // Get server from registry
+       Server *server = get_server(L);
+       // Send
+       server->notifyPlayers(narrow_to_wide(text));
+       return 0;
+}
 
-public:
-       EnvRef(ServerEnvironment *env):
-               m_env(env)
-       {
-               infostream<<"EnvRef created"<<std::endl;
-       }
+// chat_send_player(name, text)
+static int l_chat_send_player(lua_State *L)
+{
+       const char *name = luaL_checkstring(L, 1);
+       const char *text = luaL_checkstring(L, 2);
+       // Get server from registry
+       Server *server = get_server(L);
+       // Send
+       server->notifyPlayer(name, narrow_to_wide(text));
+       return 0;
+}
 
-       ~EnvRef()
-       {
-               infostream<<"EnvRef destructing"<<std::endl;
+// get_player_privs(name, text)
+static int l_get_player_privs(lua_State *L)
+{
+       const char *name = luaL_checkstring(L, 1);
+       // Get server from registry
+       Server *server = get_server(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);
+       for(std::set<std::string>::const_iterator
+                       i = privs_s.begin(); i != privs_s.end(); i++){
+               lua_pushboolean(L, true);
+               lua_setfield(L, table, i->c_str());
        }
+       lua_pushvalue(L, table);
+       return 1;
+}
 
-       // Creates an EnvRef and leaves it on top of stack
-       // Not callable from Lua; all references are created on the C side.
-       static void create(lua_State *L, ServerEnvironment *env)
-       {
-               EnvRef *o = new EnvRef(env);
-               //infostream<<"EnvRef::create: o="<<o<<std::endl;
-               *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
-               luaL_getmetatable(L, className);
-               lua_setmetatable(L, -2);
-       }
+// get_inventory(location)
+static int l_get_inventory(lua_State *L)
+{
+       InventoryLocation loc;
 
-       static void set_null(lua_State *L)
-       {
-               EnvRef *o = checkobject(L, -1);
-               o->m_env = NULL;
+       std::string type = checkstringfield(L, 1, "type");
+       if(type == "player"){
+               std::string name = checkstringfield(L, 1, "name");
+               loc.setPlayer(name);
+       } else if(type == "node"){
+               lua_getfield(L, 1, "pos");
+               v3s16 pos = check_v3s16(L, -1);
+               loc.setNodeMeta(pos);
        }
        
-       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);
+       if(get_server(L)->getInventory(loc) != NULL)
+               InvRef::create(L, loc);
+       else
+               lua_pushnil(L);
+       return 1;
+}
 
-               lua_pushliteral(L, "__gc");
-               lua_pushcfunction(L, gc_object);
-               lua_settable(L, metatable);
+// get_modpath(modname)
+static int l_get_modpath(lua_State *L)
+{
+       const char *modname = luaL_checkstring(L, 1);
+       // Get server from registry
+       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
+       Server *server = (Server*)lua_touserdata(L, -1);
+       // Do it
+       const ModSpec *mod = server->getModSpec(modname);
+       if(!mod){
+               lua_pushnil(L);
+               return 1;
+       }
+       lua_pushstring(L, mod->path.c_str());
+       return 1;
+}
 
-               lua_pop(L, 1);  // drop metatable
+static const struct luaL_Reg minetest_f [] = {
+       {"register_nodedef_defaults", l_register_nodedef_defaults},
+       {"register_entity", l_register_entity},
+       {"register_tool", l_register_tool},
+       {"register_craftitem", l_register_craftitem},
+       {"register_node", l_register_node},
+       {"register_craft", l_register_craft},
+       {"register_abm", l_register_abm},
+       {"alias_node", l_alias_node},
+       {"alias_tool", l_alias_tool},
+       {"alias_craftitem", l_alias_craftitem},
+       {"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_modpath", l_get_modpath},
+       {NULL, NULL}
+};
 
-               luaL_openlib(L, 0, methods, 0);  // fill methodtable
-               lua_pop(L, 1);  // drop methodtable
+/*
+       LuaEntity functions
+*/
 
-               // Cannot be created from Lua
-               //lua_register(L, className, create_object);
-       }
-};
-const char EnvRef::className[] = "EnvRef";
-const luaL_reg EnvRef::methods[] = {
-       method(EnvRef, add_node),
-       method(EnvRef, remove_node),
-       method(EnvRef, get_node),
-       method(EnvRef, get_node_or_nil),
-       method(EnvRef, get_node_light),
-       method(EnvRef, add_luaentity),
-       method(EnvRef, add_item),
-       method(EnvRef, add_rat),
-       method(EnvRef, add_firefly),
-       method(EnvRef, get_meta),
-       method(EnvRef, get_player_by_name),
-       {0,0}
+static const struct luaL_Reg minetest_entity_m [] = {
+       {NULL, NULL}
 };
 
 /*
@@ -2661,10 +3387,12 @@ void scriptapi_export(lua_State *L, Server *server)
        luaL_register(L, NULL, minetest_entity_m);
        // Put other stuff in metatable
        
-       // Register reference wrappers
+       // Register wrappers
+       ItemStack::Register(L);
+       InvRef::Register(L);
        NodeMetaRef::Register(L);
-       EnvRef::Register(L);
        ObjectRef::Register(L);
+       EnvRef::Register(L);
 }
 
 bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
@@ -2672,6 +3400,14 @@ bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
 {
        ModNameStorer modnamestorer(L, modname);
 
+       if(!string_allowed(modname, "abcdefghijklmnopqrstuvwxyz"
+                       "0123456789_")){
+               errorstream<<"Error loading mod \""<<modname
+                               <<"\": modname does not follow naming conventions: "
+                               <<"Only chararacters [a-z0-9_] are allowed."<<std::endl;
+               return false;
+       }
+       
        bool success = false;
 
        try{
@@ -2952,9 +3688,9 @@ static void pushPointedThing(lua_State *L, const PointedThing& pointed)
        {
                lua_pushstring(L, "node");
                lua_setfield(L, -2, "type");
-               pushpos(L, pointed.node_undersurface);
+               push_v3s16(L, pointed.node_undersurface);
                lua_setfield(L, -2, "under");
-               pushpos(L, pointed.node_abovesurface);
+               push_v3s16(L, pointed.node_abovesurface);
                lua_setfield(L, -2, "above");
        }
        else if(pointed.type == POINTEDTHING_OBJECT)
@@ -3135,12 +3871,9 @@ void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode,
        //infostream<<"scriptapi_environment_on_placenode"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable node definition manager from the server
+       // Get the writable node definition manager from the server
        IWritableNodeDefManager *ndef =
-                       server->getWritableNodeDefManager();
+                       get_server(L)->getWritableNodeDefManager();
        
        // Get minetest.registered_on_placenodes
        lua_getglobal(L, "minetest");
@@ -3153,7 +3886,7 @@ void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode,
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TFUNCTION);
                // Call function
-               pushpos(L, p);
+               push_v3s16(L, p);
                pushnode(L, newnode, ndef);
                objectref_get_or_create(L, placer);
                if(lua_pcall(L, 3, 0, 0))
@@ -3170,12 +3903,9 @@ void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode,
        //infostream<<"scriptapi_environment_on_dignode"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable node definition manager from the server
+       // Get the writable node definition manager from the server
        IWritableNodeDefManager *ndef =
-                       server->getWritableNodeDefManager();
+                       get_server(L)->getWritableNodeDefManager();
        
        // Get minetest.registered_on_dignodes
        lua_getglobal(L, "minetest");
@@ -3188,7 +3918,7 @@ void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode,
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TFUNCTION);
                // Call function
-               pushpos(L, p);
+               push_v3s16(L, p);
                pushnode(L, oldnode, ndef);
                objectref_get_or_create(L, digger);
                if(lua_pcall(L, 3, 0, 0))
@@ -3205,12 +3935,9 @@ void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node,
        //infostream<<"scriptapi_environment_on_punchnode"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get server from registry
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       Server *server = (Server*)lua_touserdata(L, -1);
-       // And get the writable node definition manager from the server
+       // Get the writable node definition manager from the server
        IWritableNodeDefManager *ndef =
-                       server->getWritableNodeDefManager();
+                       get_server(L)->getWritableNodeDefManager();
        
        // Get minetest.registered_on_punchnodes
        lua_getglobal(L, "minetest");
@@ -3223,7 +3950,7 @@ void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node,
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TFUNCTION);
                // Call function
-               pushpos(L, p);
+               push_v3s16(L, p);
                pushnode(L, node, ndef);
                objectref_get_or_create(L, puncher);
                if(lua_pcall(L, 3, 0, 0))
@@ -3250,8 +3977,8 @@ void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp)
                // key at index -2 and value at index -1
                luaL_checktype(L, -1, LUA_TFUNCTION);
                // Call function
-               pushpos(L, minp);
-               pushpos(L, maxp);
+               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