Tune caves
[oweals/minetest.git] / src / scriptapi.cpp
index b617626a0bc3a2fb05359992bd40de5719ae4f0a..3c7b9bb3eed1c4c88938051a763a0c77a29bd87a 100644 (file)
@@ -36,16 +36,17 @@ extern "C" {
 //#include "luna.h"
 #include "luaentity_common.h"
 #include "content_sao.h" // For LuaEntitySAO
-#include "tooldef.h"
+#include "itemdef.h"
 #include "nodedef.h"
 #include "craftdef.h"
-#include "craftitemdef.h"
 #include "main.h" // For g_settings
 #include "settings.h" // For accessing g_settings
 #include "nodemetadata.h"
 #include "mapblock.h" // For getNodeBlockPos
 #include "content_nodemeta.h"
 #include "utility.h"
+#include "tool.h"
+#include "daynightratio.h"
 
 static void stackDump(lua_State *L, std::ostream &o)
 {
@@ -127,243 +128,55 @@ public:
        }
 };
 
-std::string get_current_modname(lua_State *L)
-{
-       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
-       std::string modname = "";
-       if(lua_type(L, -1) == LUA_TSTRING)
-               modname = lua_tostring(L, -1);
-       lua_pop(L, 1);
-       return modname;
-}
-
-void check_modname_prefix(lua_State *L, std::string &name)
-{
-       if(name.size() == 0)
-               throw LuaError(L, std::string("Name is empty"));
-       
-       if(name[0] == ':'){
-               name = name.substr(1);
-               return;
-       }
-       
-       std::string modname = get_current_modname(L);
-       assert(modname != "");
-       
-       // For __builtin, anything goes
-       if(modname == "__builtin")
-               return;
-       
-       if(name.substr(0, modname.size()+1) != modname + ":")
-               throw LuaError(L, std::string("Name \"")+name
-                               +"\" does not follow naming conventions: "
-                               +"\"modname:\" or \":\" prefix required)");
-       
-       std::string subname = name.substr(modname.size()+1);
-       if(!string_allowed(subname, "abcdefghijklmnopqrstuvwxyz"
-                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"))
-               throw LuaError(L, std::string("Name \"")+name
-                               +"\" does not follow naming conventions: "
-                               +"\"contains unallowed characters");
-}
-
-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;
-}
+/*
+       Getters for stuff in main tables
+*/
 
 static Server* get_server(lua_State *L)
 {
        // Get server from registry
        lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
-       return (Server*)lua_touserdata(L, -1);
+       Server *server = (Server*)lua_touserdata(L, -1);
+       lua_pop(L, 1);
+       return server;
 }
 
 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);
-       lua_getfield(L, index, "x");
-       pos.X = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       lua_getfield(L, index, "y");
-       pos.Y = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       lua_getfield(L, index, "z");
-       pos.Z = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       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);
+       ServerEnvironment *env = (ServerEnvironment*)lua_touserdata(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;
-       push_v3f(L, p);
-}
-
-static v3f checkFloatPos(lua_State *L, int index)
-{
-       return check_v3f(L, index) * BS;
-}
-
-static void push_v3s16(lua_State *L, v3s16 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 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 = check_v3f(L, index);
-       return floatToInt(pf, 1.0);
-}
-
-static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
-{
-       lua_newtable(L);
-       lua_pushstring(L, ndef->get(n).name.c_str());
-       lua_setfield(L, -2, "name");
-       lua_pushnumber(L, n.getParam1());
-       lua_setfield(L, -2, "param1");
-       lua_pushnumber(L, n.getParam2());
-       lua_setfield(L, -2, "param2");
+       return env;
 }
 
-static MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
+static void objectref_get(lua_State *L, u16 id)
 {
-       lua_getfield(L, index, "name");
-       const char *name = luaL_checkstring(L, -1);
-       lua_pop(L, 1);
-       u8 param1;
-       lua_getfield(L, index, "param1");
-       if(lua_isnil(L, -1))
-               param1 = 0;
-       else
-               param1 = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       u8 param2;
-       lua_getfield(L, index, "param2");
-       if(lua_isnil(L, -1))
-               param2 = 0;
-       else
-               param2 = lua_tonumber(L, -1);
-       lua_pop(L, 1);
-       return MapNode(ndef, name, param1, param2);
+       // 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 video::SColor readARGB8(lua_State *L, int index)
+static void luaentity_get(lua_State *L, u16 id)
 {
-       video::SColor color;
-       luaL_checktype(L, index, LUA_TTABLE);
-       lua_getfield(L, index, "a");
-       if(lua_isnumber(L, -1))
-               color.setAlpha(lua_tonumber(L, -1));
-       lua_pop(L, 1);
-       lua_getfield(L, index, "r");
-       color.setRed(lua_tonumber(L, -1));
-       lua_pop(L, 1);
-       lua_getfield(L, index, "g");
-       color.setGreen(lua_tonumber(L, -1));
-       lua_pop(L, 1);
-       lua_getfield(L, index, "b");
-       color.setBlue(lua_tonumber(L, -1));
-       lua_pop(L, 1);
-       return color;
+       // 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
 }
 
-static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index, f32 scale)
-{
-       core::aabbox3d<f32> box;
-       if(lua_istable(L, -1)){
-               lua_rawgeti(L, -1, 1);
-               box.MinEdge.X = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-               lua_rawgeti(L, -1, 2);
-               box.MinEdge.Y = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-               lua_rawgeti(L, -1, 3);
-               box.MinEdge.Z = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-               lua_rawgeti(L, -1, 4);
-               box.MaxEdge.X = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-               lua_rawgeti(L, -1, 5);
-               box.MaxEdge.Y = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-               lua_rawgeti(L, -1, 6);
-               box.MaxEdge.Z = lua_tonumber(L, -1) * scale;
-               lua_pop(L, 1);
-       }
-       return box;
-}
+/*
+       Table field getters
+*/
 
 static bool getstringfield(lua_State *L, int table,
                const char *fieldname, std::string &result)
@@ -371,7 +184,9 @@ static bool getstringfield(lua_State *L, int table,
        lua_getfield(L, table, fieldname);
        bool got = false;
        if(lua_isstring(L, -1)){
-               result = lua_tostring(L, -1);
+               size_t len = 0;
+               const char *ptr = lua_tolstring(L, -1, &len);
+               result.assign(ptr, len);
                got = true;
        }
        lua_pop(L, 1);
@@ -442,13 +257,13 @@ static int getintfield_default(lua_State *L, int table,
        return result;
 }
 
-/*static float getfloatfield_default(lua_State *L, int table,
+static float getfloatfield_default(lua_State *L, int table,
                const char *fieldname, float default_)
 {
        float result = default_;
        getfloatfield(L, table, fieldname, result);
        return result;
-}*/
+}
 
 static bool getboolfield_default(lua_State *L, int table,
                const char *fieldname, bool default_)
@@ -501,6 +316,15 @@ static int getenumfield(lua_State *L, int table,
        return result;
 }
 
+static void setintfield(lua_State *L, int table,
+               const char *fieldname, int value)
+{
+       lua_pushinteger(L, value);
+       if(table < 0)
+               table -= 1;
+       lua_setfield(L, table, fieldname);
+}
+
 static void setfloatfield(lua_State *L, int table,
                const char *fieldname, float value)
 {
@@ -510,6 +334,15 @@ static void setfloatfield(lua_State *L, int table,
        lua_setfield(L, table, fieldname);
 }
 
+static void setboolfield(lua_State *L, int table,
+               const char *fieldname, bool value)
+{
+       lua_pushboolean(L, value);
+       if(table < 0)
+               table -= 1;
+       lua_setfield(L, table, fieldname);
+}
+
 static void warn_if_field_exists(lua_State *L, int table,
                const char *fieldname, const std::string &message)
 {
@@ -523,214 +356,17 @@ static void warn_if_field_exists(lua_State *L, int table,
 }
 
 /*
-       Inventory stuff
+       EnumString definitions
 */
 
-static void inventory_set_list_from_lua(Inventory *inv, const char *name,
-               lua_State *L, int tableindex, IGameDef *gamedef, int forcesize=-1)
+struct EnumString es_ItemType[] =
 {
-       if(tableindex < 0)
-               tableindex = lua_gettop(L) + 1 + tableindex;
-       // If nil, delete list
-       if(lua_isnil(L, tableindex)){
-               inv->deleteList(name);
-               return;
-       }
-       // Otherwise set list
-       std::list<std::string> items;
-       luaL_checktype(L, tableindex, LUA_TTABLE);
-       int table = tableindex;
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TSTRING);
-               std::string itemstring = luaL_checkstring(L, -1);
-               items.push_back(itemstring);
-               // removes value, keeps key for next iteration
-               lua_pop(L, 1);
-       }
-       int listsize = (forcesize != -1) ? forcesize : items.size();
-       InventoryList *invlist = inv->addList(name, listsize);
-       int index = 0;
-       for(std::list<std::string>::const_iterator
-                       i = items.begin(); i != items.end(); i++){
-               if(forcesize != -1 && index == forcesize)
-                       break;
-               const std::string &itemstring = *i;
-               InventoryItem *newitem = NULL;
-               if(itemstring != "")
-                       newitem = InventoryItem::deSerialize(itemstring,
-                                       gamedef);
-               InventoryItem *olditem = invlist->changeItem(index, newitem);
-               delete olditem;
-               index++;
-       }
-       while(forcesize != -1 && index < forcesize){
-               InventoryItem *olditem = invlist->changeItem(index, NULL);
-               delete olditem;
-               index++;
-       }
-}
-
-static void inventory_get_list_to_lua(Inventory *inv, const char *name,
-               lua_State *L)
-{
-       InventoryList *invlist = inv->getList(name);
-       if(invlist == NULL){
-               lua_pushnil(L);
-               return;
-       }
-       // Get the table insert function
-       lua_getglobal(L, "table");
-       lua_getfield(L, -1, "insert");
-       int table_insert = lua_gettop(L);
-       // Create and fill table
-       lua_newtable(L);
-       int table = lua_gettop(L);
-       for(u32 i=0; i<invlist->getSize(); i++){
-               InventoryItem *item = invlist->getItem(i);
-               lua_pushvalue(L, table_insert);
-               lua_pushvalue(L, table);
-               if(item == NULL){
-                       lua_pushstring(L, "");
-               } else {
-                       lua_pushstring(L, item->getItemString().c_str());
-               }
-               if(lua_pcall(L, 2, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-       }
-}
-
-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
-*/
-
-static ToolDiggingProperties read_tool_digging_properties(
-               lua_State *L, int table)
-{
-       ToolDiggingProperties prop;
-       getfloatfield(L, table, "full_punch_interval", prop.full_punch_interval);
-       getfloatfield(L, table, "basetime", prop.basetime);
-       getfloatfield(L, table, "dt_weight", prop.dt_weight);
-       getfloatfield(L, table, "dt_crackiness", prop.dt_crackiness);
-       getfloatfield(L, table, "dt_crumbliness", prop.dt_crumbliness);
-       getfloatfield(L, table, "dt_cuttability", prop.dt_cuttability);
-       getfloatfield(L, table, "basedurability", prop.basedurability);
-       getfloatfield(L, table, "dd_weight", prop.dd_weight);
-       getfloatfield(L, table, "dd_crackiness", prop.dd_crackiness);
-       getfloatfield(L, table, "dd_crumbliness", prop.dd_crumbliness);
-       getfloatfield(L, table, "dd_cuttability", prop.dd_cuttability);
-       return prop;
-}
-
-static void set_tool_digging_properties(lua_State *L, int table,
-               const ToolDiggingProperties &prop)
-{
-       setfloatfield(L, table, "full_punch_interval", prop.full_punch_interval);
-       setfloatfield(L, table, "basetime", prop.basetime);
-       setfloatfield(L, table, "dt_weight", prop.dt_weight);
-       setfloatfield(L, table, "dt_crackiness", prop.dt_crackiness);
-       setfloatfield(L, table, "dt_crumbliness", prop.dt_crumbliness);
-       setfloatfield(L, table, "dt_cuttability", prop.dt_cuttability);
-       setfloatfield(L, table, "basedurability", prop.basedurability);
-       setfloatfield(L, table, "dd_weight", prop.dd_weight);
-       setfloatfield(L, table, "dd_crackiness", prop.dd_crackiness);
-       setfloatfield(L, table, "dd_crumbliness", prop.dd_crumbliness);
-       setfloatfield(L, table, "dd_cuttability", prop.dd_cuttability);
-}
-
-static void push_tool_digging_properties(lua_State *L,
-               const ToolDiggingProperties &prop)
-{
-       lua_newtable(L);
-       set_tool_digging_properties(L, -1, prop);
-}
-
-/*
-       ToolDefinition
-*/
-
-static ToolDefinition read_tool_definition(lua_State *L, int table)
-{
-       ToolDefinition def;
-       getstringfield(L, table, "image", def.imagename);
-       def.properties = read_tool_digging_properties(L, table);
-       return def;
-}
-
-static void push_tool_definition(lua_State *L, const ToolDefinition &def)
-{
-       lua_newtable(L);
-       lua_pushstring(L, def.imagename.c_str());
-       lua_setfield(L, -2, "image");
-       set_tool_digging_properties(L, -1, def.properties);
-}
-
-/*
-       EnumString definitions
-*/
+       {ITEM_NONE, "none"},
+       {ITEM_NODE, "node"},
+       {ITEM_CRAFT, "craft"},
+       {ITEM_TOOL, "tool"},
+       {0, NULL},
+};
 
 struct EnumString es_DrawType[] =
 {
@@ -753,8 +389,16 @@ struct EnumString es_ContentParamType[] =
 {
        {CPT_NONE, "none"},
        {CPT_LIGHT, "light"},
-       {CPT_MINERAL, "mineral"},
-       {CPT_FACEDIR_SIMPLE, "facedir_simple"},
+       {0, NULL},
+};
+
+struct EnumString es_ContentParamType2[] =
+{
+       {CPT2_NONE, "none"},
+       {CPT2_FULL, "full"},
+       {CPT2_FLOWINGLIQUID, "flowingliquid"},
+       {CPT2_FACEDIR, "facedir"},
+       {CPT2_WALLMOUNTED, "wallmounted"},
        {0, NULL},
 };
 
@@ -774,189 +418,1033 @@ struct EnumString es_NodeBoxType[] =
        {0, NULL},
 };
 
-struct EnumString es_Diggability[] =
-{
-       {DIGGABLE_NOT, "not"},
-       {DIGGABLE_NORMAL, "normal"},
-       {DIGGABLE_CONSTANT, "constant"},
-       {0, NULL},
-};
-
 /*
-       Getters for stuff in main tables
+       C struct <-> Lua table converter functions
 */
 
-static void objectref_get(lua_State *L, u16 id)
+static void push_v3f(lua_State *L, v3f p)
 {
-       // 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
+       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 void luaentity_get(lua_State *L, u16 id)
+static v2s16 read_v2s16(lua_State *L, int index)
 {
-       // 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
+       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;
 }
 
-/*
-       Object wrappers
-*/
+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;
+}
 
-#define method(class, name) {#name, class::l_##name}
+static v3f read_v3f(lua_State *L, int index)
+{
+       v3f pos;
+       luaL_checktype(L, index, LUA_TTABLE);
+       lua_getfield(L, index, "x");
+       pos.X = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "y");
+       pos.Y = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       lua_getfield(L, index, "z");
+       pos.Z = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       return pos;
+}
 
-/*
-       ItemStack
-*/
+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;
+}
 
-class ItemStack
+static void pushFloatPos(lua_State *L, v3f p)
 {
-private:
-       InventoryItem *m_stack;
+       p /= BS;
+       push_v3f(L, p);
+}
 
-       static const char className[];
-       static const luaL_reg methods[];
+static v3f checkFloatPos(lua_State *L, int index)
+{
+       return check_v3f(L, index) * BS;
+}
 
-       // Exported functions
-       
-       // garbage collector
-       static int gc_object(lua_State *L) {
-               ItemStack *o = *(ItemStack **)(lua_touserdata(L, 1));
-               delete o;
-               return 0;
-       }
+static void push_v3s16(lua_State *L, v3s16 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");
+}
 
-       // 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;
-       }
+static v3s16 read_v3s16(lua_State *L, int index)
+{
+       // Correct rounding at <0
+       v3f pf = read_v3f(L, index);
+       return floatToInt(pf, 1.0);
+}
 
-       // take_item(self)
-       static int l_take_item(lua_State *L)
-       {
-               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;
-       }
+static v3s16 check_v3s16(lua_State *L, int index)
+{
+       // Correct rounding at <0
+       v3f pf = check_v3f(L, index);
+       return floatToInt(pf, 1.0);
+}
 
-       // put_item(self, item) -> true/false
-       static int l_put_item(lua_State *L)
-       {
-               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;
-       }
+static void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
+{
+       lua_newtable(L);
+       lua_pushstring(L, ndef->get(n).name.c_str());
+       lua_setfield(L, -2, "name");
+       lua_pushnumber(L, n.getParam1());
+       lua_setfield(L, -2, "param1");
+       lua_pushnumber(L, n.getParam2());
+       lua_setfield(L, -2, "param2");
+}
 
-       // put_stackstring(self, stackstring) -> true/false
-       static int l_put_stackstring(lua_State *L)
-       {
-               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;
+static MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
+{
+       lua_getfield(L, index, "name");
+       const char *name = luaL_checkstring(L, -1);
+       lua_pop(L, 1);
+       u8 param1;
+       lua_getfield(L, index, "param1");
+       if(lua_isnil(L, -1))
+               param1 = 0;
+       else
+               param1 = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       u8 param2;
+       lua_getfield(L, index, "param2");
+       if(lua_isnil(L, -1))
+               param2 = 0;
+       else
+               param2 = lua_tonumber(L, -1);
+       lua_pop(L, 1);
+       return MapNode(ndef, name, param1, param2);
+}
+
+static video::SColor readARGB8(lua_State *L, int index)
+{
+       video::SColor color;
+       luaL_checktype(L, index, LUA_TTABLE);
+       lua_getfield(L, index, "a");
+       if(lua_isnumber(L, -1))
+               color.setAlpha(lua_tonumber(L, -1));
+       lua_pop(L, 1);
+       lua_getfield(L, index, "r");
+       color.setRed(lua_tonumber(L, -1));
+       lua_pop(L, 1);
+       lua_getfield(L, index, "g");
+       color.setGreen(lua_tonumber(L, -1));
+       lua_pop(L, 1);
+       lua_getfield(L, index, "b");
+       color.setBlue(lua_tonumber(L, -1));
+       lua_pop(L, 1);
+       return color;
+}
+
+static core::aabbox3d<f32> read_aabbox3df32(lua_State *L, int index, f32 scale)
+{
+       core::aabbox3d<f32> box;
+       if(lua_istable(L, -1)){
+               lua_rawgeti(L, -1, 1);
+               box.MinEdge.X = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+               lua_rawgeti(L, -1, 2);
+               box.MinEdge.Y = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+               lua_rawgeti(L, -1, 3);
+               box.MinEdge.Z = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+               lua_rawgeti(L, -1, 4);
+               box.MaxEdge.X = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+               lua_rawgeti(L, -1, 5);
+               box.MaxEdge.Y = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+               lua_rawgeti(L, -1, 6);
+               box.MaxEdge.Z = lua_tonumber(L, -1) * scale;
+               lua_pop(L, 1);
+       }
+       return box;
+}
+
+#if 0
+/*
+       MaterialProperties
+*/
+
+static MaterialProperties read_material_properties(
+               lua_State *L, int table)
+{
+       MaterialProperties prop;
+       prop.diggability = (Diggability)getenumfield(L, -1, "diggability",
+                       es_Diggability, DIGGABLE_NORMAL);
+       getfloatfield(L, -1, "constant_time", prop.constant_time);
+       getfloatfield(L, -1, "weight", prop.weight);
+       getfloatfield(L, -1, "crackiness", prop.crackiness);
+       getfloatfield(L, -1, "crumbliness", prop.crumbliness);
+       getfloatfield(L, -1, "cuttability", prop.cuttability);
+       getfloatfield(L, -1, "flammability", prop.flammability);
+       return prop;
+}
+#endif
+
+/*
+       Groups
+*/
+static void read_groups(lua_State *L, int index,
+               std::map<std::string, int> &result)
+{
+       result.clear();
+       lua_pushnil(L);
+       if(index < 0)
+               index -= 1;
+       while(lua_next(L, index) != 0){
+               // key at index -2 and value at index -1
+               std::string name = luaL_checkstring(L, -2);
+               int rating = luaL_checkinteger(L, -1);
+               result[name] = rating;
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+       }
+}
+
+/*
+       ToolCapabilities
+*/
+
+static ToolCapabilities read_tool_capabilities(
+               lua_State *L, int table)
+{
+       ToolCapabilities toolcap;
+       getfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
+       getintfield(L, table, "max_drop_level", toolcap.max_drop_level);
+       lua_getfield(L, table, "groupcaps");
+       if(lua_istable(L, -1)){
+               int table_groupcaps = lua_gettop(L);
+               lua_pushnil(L);
+               while(lua_next(L, table_groupcaps) != 0){
+                       // key at index -2 and value at index -1
+                       std::string groupname = luaL_checkstring(L, -2);
+                       if(lua_istable(L, -1)){
+                               int table_groupcap = lua_gettop(L);
+                               // This will be created
+                               ToolGroupCap groupcap;
+                               // Read simple parameters
+                               getfloatfield(L, table_groupcap, "maxwear", groupcap.maxwear);
+                               getintfield(L, table_groupcap, "maxlevel", groupcap.maxlevel);
+                               // Read "times" table
+                               lua_getfield(L, table_groupcap, "times");
+                               if(lua_istable(L, -1)){
+                                       int table_times = lua_gettop(L);
+                                       lua_pushnil(L);
+                                       while(lua_next(L, table_times) != 0){
+                                               // key at index -2 and value at index -1
+                                               int rating = luaL_checkinteger(L, -2);
+                                               float time = luaL_checknumber(L, -1);
+                                               groupcap.times[rating] = time;
+                                               // removes value, keeps key for next iteration
+                                               lua_pop(L, 1);
+                                       }
+                               }
+                               lua_pop(L, 1);
+                               // Insert groupcap into toolcap
+                               toolcap.groupcaps[groupname] = groupcap;
+                       }
+                       // removes value, keeps key for next iteration
+                       lua_pop(L, 1);
+               }
+       }
+       lua_pop(L, 1);
+       return toolcap;
+}
+
+static void set_tool_capabilities(lua_State *L, int table,
+               const ToolCapabilities &toolcap)
+{
+       setfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
+       setintfield(L, table, "max_drop_level", toolcap.max_drop_level);
+       // Create groupcaps table
+       lua_newtable(L);
+       // For each groupcap
+       for(std::map<std::string, ToolGroupCap>::const_iterator
+                       i = toolcap.groupcaps.begin(); i != toolcap.groupcaps.end(); i++){
+               // Create groupcap table
+               lua_newtable(L);
+               const std::string &name = i->first;
+               const ToolGroupCap &groupcap = i->second;
+               // Create subtable "times"
+               lua_newtable(L);
+               for(std::map<int, float>::const_iterator
+                               i = groupcap.times.begin(); i != groupcap.times.end(); i++){
+                       int rating = i->first;
+                       float time = i->second;
+                       lua_pushinteger(L, rating);
+                       lua_pushnumber(L, time);
+                       lua_settable(L, -3);
+               }
+               // Set subtable "times"
+               lua_setfield(L, -2, "times");
+               // Set simple parameters
+               setfloatfield(L, -1, "maxwear", groupcap.maxwear);
+               setintfield(L, -1, "maxlevel", groupcap.maxlevel);
+               // Insert groupcap table into groupcaps table
+               lua_setfield(L, -2, name.c_str());
+       }
+       // Set groupcaps table
+       lua_setfield(L, -2, "groupcaps");
+}
+
+static void push_tool_capabilities(lua_State *L,
+               const ToolCapabilities &prop)
+{
+       lua_newtable(L);
+       set_tool_capabilities(L, -1, prop);
+}
+
+/*
+       DigParams
+*/
+
+static void set_dig_params(lua_State *L, int table,
+               const DigParams &params)
+{
+       setboolfield(L, table, "diggable", params.diggable);
+       setfloatfield(L, table, "time", params.time);
+       setintfield(L, table, "wear", params.wear);
+}
+
+static void push_dig_params(lua_State *L,
+               const DigParams &params)
+{
+       lua_newtable(L);
+       set_dig_params(L, -1, params);
+}
+
+/*
+       HitParams
+*/
+
+static void set_hit_params(lua_State *L, int table,
+               const HitParams &params)
+{
+       setintfield(L, table, "hp", params.hp);
+       setintfield(L, table, "wear", params.wear);
+}
+
+static void push_hit_params(lua_State *L,
+               const HitParams &params)
+{
+       lua_newtable(L);
+       set_hit_params(L, -1, params);
+}
+
+/*
+       PointedThing
+*/
+
+static void push_pointed_thing(lua_State *L, const PointedThing& pointed)
+{
+       lua_newtable(L);
+       if(pointed.type == POINTEDTHING_NODE)
+       {
+               lua_pushstring(L, "node");
+               lua_setfield(L, -2, "type");
+               push_v3s16(L, pointed.node_undersurface);
+               lua_setfield(L, -2, "under");
+               push_v3s16(L, pointed.node_abovesurface);
+               lua_setfield(L, -2, "above");
+       }
+       else if(pointed.type == POINTEDTHING_OBJECT)
+       {
+               lua_pushstring(L, "object");
+               lua_setfield(L, -2, "type");
+               objectref_get(L, pointed.object_id);
+               lua_setfield(L, -2, "ref");
+       }
+       else
+       {
+               lua_pushstring(L, "nothing");
+               lua_setfield(L, -2, "type");
+       }
+}
+
+/*
+       SimpleSoundSpec
+*/
+
+static void read_soundspec(lua_State *L, int index, SimpleSoundSpec &spec)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       if(lua_isnil(L, index)){
+       } else if(lua_istable(L, index)){
+               getstringfield(L, index, "name", spec.name);
+               getfloatfield(L, index, "gain", spec.gain);
+       } else if(lua_isstring(L, index)){
+               spec.name = lua_tostring(L, index);
+       }
+}
+
+/*
+       ItemDefinition
+*/
+
+static ItemDefinition read_item_definition(lua_State *L, int index)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+
+       // Read the item definition
+       ItemDefinition def;
+
+       def.type = (ItemType)getenumfield(L, index, "type",
+                       es_ItemType, ITEM_NONE);
+       getstringfield(L, index, "name", def.name);
+       getstringfield(L, index, "description", def.description);
+       getstringfield(L, index, "inventory_image", def.inventory_image);
+       getstringfield(L, index, "wield_image", def.wield_image);
+
+       lua_getfield(L, index, "wield_scale");
+       if(lua_istable(L, -1)){
+               def.wield_scale = check_v3f(L, -1);
+       }
+       lua_pop(L, 1);
+
+       def.stack_max = getintfield_default(L, index, "stack_max", def.stack_max);
+       if(def.stack_max == 0)
+               def.stack_max = 1;
+
+       lua_getfield(L, index, "on_use");
+       def.usable = lua_isfunction(L, -1);
+       lua_pop(L, 1);
+
+       getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
+
+       warn_if_field_exists(L, index, "tool_digging_properties",
+                       "deprecated: use tool_capabilities");
+       
+       lua_getfield(L, index, "tool_capabilities");
+       if(lua_istable(L, -1)){
+               def.tool_capabilities = new ToolCapabilities(
+                               read_tool_capabilities(L, -1));
+       }
+
+       // If name is "" (hand), ensure there are ToolCapabilities
+       // because it will be looked up there whenever any other item has
+       // no ToolCapabilities
+       if(def.name == "" && def.tool_capabilities == NULL){
+               def.tool_capabilities = new ToolCapabilities();
+       }
+
+       lua_getfield(L, index, "groups");
+       read_groups(L, -1, def.groups);
+       lua_pop(L, 1);
+
+       return def;
+}
+
+/*
+       ContentFeatures
+*/
+
+static ContentFeatures read_content_features(lua_State *L, int index)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+
+       ContentFeatures f;
+       /* Name */
+       getstringfield(L, index, "name", f.name);
+
+       /* Groups */
+       lua_getfield(L, index, "groups");
+       read_groups(L, -1, f.groups);
+       lua_pop(L, 1);
+
+       /* Visual definition */
+
+       f.drawtype = (NodeDrawType)getenumfield(L, index, "drawtype", es_DrawType,
+                       NDT_NORMAL);
+       getfloatfield(L, index, "visual_scale", f.visual_scale);
+
+       lua_getfield(L, index, "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);
+
+       lua_getfield(L, index, "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.mspec_special[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, index, "alpha", 255);
+
+       /* Other stuff */
+       
+       lua_getfield(L, index, "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, index, "paramtype",
+                       es_ContentParamType, CPT_NONE);
+       f.param_type_2 = (ContentParamType2)getenumfield(L, index, "paramtype2",
+                       es_ContentParamType2, CPT2_NONE);
+
+       // Warn about some deprecated fields
+       warn_if_field_exists(L, index, "wall_mounted",
+                       "deprecated: use paramtype2 = 'wallmounted'");
+       warn_if_field_exists(L, index, "light_propagates",
+                       "deprecated: determined from paramtype");
+       warn_if_field_exists(L, index, "dug_item",
+                       "deprecated: use 'drop' field");
+       warn_if_field_exists(L, index, "extra_dug_item",
+                       "deprecated: use 'drop' field");
+       warn_if_field_exists(L, index, "extra_dug_item_rarity",
+                       "deprecated: use 'drop' field");
+       
+       // True for all ground-like things like stone and mud, false for eg. trees
+       getboolfield(L, index, "is_ground_content", f.is_ground_content);
+       f.light_propagates = (f.param_type == CPT_LIGHT);
+       getboolfield(L, index, "sunlight_propagates", f.sunlight_propagates);
+       // This is used for collision detection.
+       // Also for general solidness queries.
+       getboolfield(L, index, "walkable", f.walkable);
+       // Player can point to these
+       getboolfield(L, index, "pointable", f.pointable);
+       // Player can dig these
+       getboolfield(L, index, "diggable", f.diggable);
+       // Player can climb these
+       getboolfield(L, index, "climbable", f.climbable);
+       // Player can build on these
+       getboolfield(L, index, "buildable_to", f.buildable_to);
+       // Metadata name of node (eg. "furnace")
+       getstringfield(L, index, "metadata_name", f.metadata_name);
+       // Whether the node is non-liquid, source liquid or flowing liquid
+       f.liquid_type = (LiquidType)getenumfield(L, index, "liquidtype",
+                       es_LiquidType, LIQUID_NONE);
+       // If the content is liquid, this is the flowing version of the liquid.
+       getstringfield(L, index, "liquid_alternative_flowing",
+                       f.liquid_alternative_flowing);
+       // If the content is liquid, this is the source version of the liquid.
+       getstringfield(L, index, "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, index,
+                       "liquid_viscosity", f.liquid_viscosity);
+       // Amount of light the node emits
+       f.light_source = getintfield_default(L, index,
+                       "light_source", f.light_source);
+       f.damage_per_second = getintfield_default(L, index,
+                       "damage_per_second", f.damage_per_second);
+       
+       lua_getfield(L, index, "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);
+
+       // Set to true if paramtype used to be 'facedir_simple'
+       getboolfield(L, index, "legacy_facedir_simple", f.legacy_facedir_simple);
+       // Set to true if wall_mounted used to be set to true
+       getboolfield(L, index, "legacy_wallmounted", f.legacy_wallmounted);
+       
+       // Sound table
+       lua_getfield(L, index, "sounds");
+       if(lua_istable(L, -1)){
+               lua_getfield(L, -1, "footstep");
+               read_soundspec(L, -1, f.sound_footstep);
+               lua_pop(L, 1);
+               lua_getfield(L, -1, "dig");
+               read_soundspec(L, -1, f.sound_dig);
+               lua_pop(L, 1);
+               lua_getfield(L, -1, "dug");
+               read_soundspec(L, -1, f.sound_dug);
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 1);
+
+       return f;
+}
+
+/*
+       Inventory stuff
+*/
+
+static ItemStack read_item(lua_State *L, int index);
+
+static void inventory_set_list_from_lua(Inventory *inv, const char *name,
+               lua_State *L, int tableindex, int forcesize=-1)
+{
+       dstream<<"inventory_set_list_from_lua\n";
+       if(tableindex < 0)
+               tableindex = lua_gettop(L) + 1 + tableindex;
+       // If nil, delete list
+       if(lua_isnil(L, tableindex)){
+               inv->deleteList(name);
+               return;
+       }
+       // Otherwise set list
+       std::vector<ItemStack> items;
+       luaL_checktype(L, tableindex, LUA_TTABLE);
+       lua_pushnil(L);
+       while(lua_next(L, tableindex) != 0){
+               // key at index -2 and value at index -1
+               items.push_back(read_item(L, -1));
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+       }
+       int listsize = (forcesize != -1) ? forcesize : items.size();
+       InventoryList *invlist = inv->addList(name, listsize);
+       int index = 0;
+       for(std::vector<ItemStack>::const_iterator
+                       i = items.begin(); i != items.end(); i++){
+               if(forcesize != -1 && index == forcesize)
+                       break;
+               invlist->changeItem(index, *i);
+               index++;
+       }
+       while(forcesize != -1 && index < forcesize){
+               invlist->deleteItem(index);
+               index++;
+       }
+       dstream<<"inventory_set_list_from_lua done\n";
+}
+
+static void inventory_get_list_to_lua(Inventory *inv, const char *name,
+               lua_State *L)
+{
+       InventoryList *invlist = inv->getList(name);
+       if(invlist == NULL){
+               lua_pushnil(L);
+               return;
+       }
+       // Get the table insert function
+       lua_getglobal(L, "table");
+       lua_getfield(L, -1, "insert");
+       int table_insert = lua_gettop(L);
+       // Create and fill table
+       lua_newtable(L);
+       int table = lua_gettop(L);
+       for(u32 i=0; i<invlist->getSize(); i++){
+               ItemStack item = invlist->getItem(i);
+               lua_pushvalue(L, table_insert);
+               lua_pushvalue(L, table);
+               lua_pushstring(L, item.getItemString().c_str());
+               if(lua_pcall(L, 2, 0, 0))
+                       script_error(L, "error: %s", lua_tostring(L, -1));
+       }
+}
+
+/*
+       Helpful macros for userdata classes
+*/
+
+#define method(class, name) {#name, class::l_##name}
+
+/*
+       LuaItemStack
+*/
+
+class LuaItemStack
+{
+private:
+       ItemStack m_stack;
+
+       static const char className[];
+       static const luaL_reg methods[];
+
+       // Exported functions
+       
+       // garbage collector
+       static int gc_object(lua_State *L)
+       {
+               LuaItemStack *o = *(LuaItemStack **)(lua_touserdata(L, 1));
+               delete o;
+               return 0;
+       }
+
+       // is_empty(self) -> true/false
+       static int l_is_empty(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushboolean(L, item.empty());
+               return 1;
+       }
+
+       // get_name(self) -> string
+       static int l_get_name(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushstring(L, item.name.c_str());
+               return 1;
+       }
+
+       // get_count(self) -> number
+       static int l_get_count(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushinteger(L, item.count);
+               return 1;
+       }
+
+       // get_wear(self) -> number
+       static int l_get_wear(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushinteger(L, item.wear);
+               return 1;
+       }
+
+       // get_metadata(self) -> string
+       static int l_get_metadata(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushlstring(L, item.metadata.c_str(), item.metadata.size());
+               return 1;
+       }
+
+       // clear(self) -> true
+       static int l_clear(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               o->m_stack.clear();
+               lua_pushboolean(L, true);
+               return 1;
+       }
+
+       // replace(self, itemstack or itemstring or table or nil) -> true
+       static int l_replace(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               o->m_stack = read_item(L, 2);
+               lua_pushboolean(L, true);
+               return 1;
+       }
+
+       // to_string(self) -> string
+       static int l_to_string(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               std::string itemstring = o->m_stack.getItemString();
+               lua_pushstring(L, itemstring.c_str());
+               return 1;
+       }
+
+       // to_table(self) -> table or nil
+       static int l_to_table(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               const ItemStack &item = o->m_stack;
+               if(item.empty())
+               {
+                       lua_pushnil(L);
+               }
+               else
+               {
+                       lua_newtable(L);
+                       lua_pushstring(L, item.name.c_str());
+                       lua_setfield(L, -2, "name");
+                       lua_pushinteger(L, item.count);
+                       lua_setfield(L, -2, "count");
+                       lua_pushinteger(L, item.wear);
+                       lua_setfield(L, -2, "wear");
+                       lua_pushlstring(L, item.metadata.c_str(), item.metadata.size());
+                       lua_setfield(L, -2, "metadata");
+               }
+               return 1;
+       }
+
+       // get_stack_max(self) -> number
+       static int l_get_stack_max(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushinteger(L, item.getStackMax(get_server(L)->idef()));
+               return 1;
+       }
+
+       // get_free_space(self) -> number
+       static int l_get_free_space(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               lua_pushinteger(L, item.freeSpace(get_server(L)->idef()));
+               return 1;
+       }
+
+       // is_known(self) -> true/false
+       // Checks if the item is defined.
+       static int l_is_known(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               bool is_known = item.isKnown(get_server(L)->idef());
+               lua_pushboolean(L, is_known);
+               return 1;
+       }
+
+       // get_definition(self) -> table
+       // Returns the item definition table from minetest.registered_items,
+       // or a fallback one (name="unknown")
+       static int l_get_definition(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+
+               // Get minetest.registered_items[name]
+               lua_getglobal(L, "minetest");
+               lua_getfield(L, -1, "registered_items");
+               luaL_checktype(L, -1, LUA_TTABLE);
+               lua_getfield(L, -1, item.name.c_str());
+               if(lua_isnil(L, -1))
+               {
+                       lua_pop(L, 1);
+                       lua_getfield(L, -1, "unknown");
                }
+               return 1;
+       }
+
+       // get_tool_capabilities(self) -> table
+       // Returns the effective tool digging properties.
+       // Returns those of the hand ("") if this item has none associated.
+       static int l_get_tool_capabilities(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               const ToolCapabilities &prop =
+                       item.getToolCapabilities(get_server(L)->idef());
+               push_tool_capabilities(L, prop);
+               return 1;
+       }
+
+       // add_wear(self, amount) -> true/false
+       // The range for "amount" is [0,65535]. Wear is only added if the item
+       // is a tool. Adding wear might destroy the item.
+       // Returns true if the item is (or was) a tool.
+       static int l_add_wear(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               int amount = lua_tointeger(L, 2);
+               bool result = item.addWear(amount, get_server(L)->idef());
+               lua_pushboolean(L, result);
+               return 1;
+       }
+
+       // add_item(self, itemstack or itemstring or table or nil) -> itemstack
+       // Returns leftover item stack
+       static int l_add_item(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               ItemStack newitem = read_item(L, 2);
+               ItemStack leftover = item.addItem(newitem, get_server(L)->idef());
+               create(L, leftover);
+               return 1;
+       }
+
+       // item_fits(self, itemstack or itemstring or table or nil) -> true/false, itemstack
+       // First return value is true iff the new item fits fully into the stack
+       // Second return value is the would-be-left-over item stack
+       static int l_item_fits(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               ItemStack newitem = read_item(L, 2);
+               ItemStack restitem;
+               bool fits = item.itemFits(newitem, &restitem, get_server(L)->idef());
+               lua_pushboolean(L, fits);  // first return value
+               create(L, restitem);       // second return value
+               return 2;
+       }
+
+       // take_item(self, takecount=1) -> itemstack
+       static int l_take_item(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               u32 takecount = 1;
+               if(!lua_isnone(L, 2))
+                       takecount = lua_tointeger(L, 2);
+               ItemStack taken = item.takeItem(takecount);
+               create(L, taken);
+               return 1;
+       }
+
+       // peek_item(self, peekcount=1) -> itemstack
+       static int l_peek_item(lua_State *L)
+       {
+               LuaItemStack *o = checkobject(L, 1);
+               ItemStack &item = o->m_stack;
+               u32 peekcount = 1;
+               if(!lua_isnone(L, 2))
+                       peekcount = lua_tointeger(L, 2);
+               ItemStack peekaboo = item.peekItem(peekcount);
+               create(L, peekaboo);
+               return 1;
        }
 
 public:
-       ItemStack(InventoryItem *item=NULL):
+       LuaItemStack(const ItemStack &item):
                m_stack(item)
        {
        }
 
-       ~ItemStack()
+       ~LuaItemStack()
        {
-               delete m_stack;
        }
 
-       static ItemStack* checkobject(lua_State *L, int narg)
+       const ItemStack& getItem() const
        {
-               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
+               return m_stack;
        }
-
-       InventoryItem* getItemCopy()
+       ItemStack& getItem()
        {
-               if(!m_stack)
-                       return NULL;
-               return m_stack->clone();
+               return m_stack;
        }
        
-       // Creates an ItemStack and leaves it on top of stack
+       // LuaItemStack(itemstack or itemstring or table or nil)
+       // Creates an LuaItemStack 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);
+               ItemStack item = read_item(L, 1);
+               LuaItemStack *o = new LuaItemStack(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)
+       static int create(lua_State *L, const ItemStack &item)
        {
-               ItemStack *o = new ItemStack(item);
+               LuaItemStack *o = new LuaItemStack(item);
                *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
                luaL_getmetatable(L, className);
                lua_setmetatable(L, -2);
                return 1;
        }
 
+       static LuaItemStack* 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 *(LuaItemStack**)ud;  // unbox pointer
+       }
+
        static void Register(lua_State *L)
        {
                lua_newtable(L);
@@ -981,19 +1469,83 @@ public:
                luaL_openlib(L, 0, methods, 0);  // fill methodtable
                lua_pop(L, 1);  // drop methodtable
 
-               // Can be created from Lua (ItemStack::create(itemstring))
+               // Can be created from Lua (LuaItemStack(itemstack or itemstring or table or nil))
                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),
+const char LuaItemStack::className[] = "ItemStack";
+const luaL_reg LuaItemStack::methods[] = {
+       method(LuaItemStack, is_empty),
+       method(LuaItemStack, get_name),
+       method(LuaItemStack, get_count),
+       method(LuaItemStack, get_wear),
+       method(LuaItemStack, get_metadata),
+       method(LuaItemStack, clear),
+       method(LuaItemStack, replace),
+       method(LuaItemStack, to_string),
+       method(LuaItemStack, to_table),
+       method(LuaItemStack, get_stack_max),
+       method(LuaItemStack, get_free_space),
+       method(LuaItemStack, is_known),
+       method(LuaItemStack, get_definition),
+       method(LuaItemStack, get_tool_capabilities),
+       method(LuaItemStack, add_wear),
+       method(LuaItemStack, add_item),
+       method(LuaItemStack, item_fits),
+       method(LuaItemStack, take_item),
+       method(LuaItemStack, peek_item),
        {0,0}
 };
 
+static ItemStack read_item(lua_State *L, int index)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+
+       if(lua_isnil(L, index))
+       {
+               return ItemStack();
+       }
+       else if(lua_isuserdata(L, index))
+       {
+               // Convert from LuaItemStack
+               LuaItemStack *o = LuaItemStack::checkobject(L, index);
+               return o->getItem();
+       }
+       else if(lua_isstring(L, index))
+       {
+               // Convert from itemstring
+               std::string itemstring = lua_tostring(L, index);
+               IItemDefManager *idef = get_server(L)->idef();
+               try
+               {
+                       ItemStack item;
+                       item.deSerialize(itemstring, idef);
+                       return item;
+               }
+               catch(SerializationError &e)
+               {
+                       infostream<<"WARNING: unable to create item from itemstring"
+                                       <<": "<<itemstring<<std::endl;
+                       return ItemStack();
+               }
+       }
+       else if(lua_istable(L, index))
+       {
+               // Convert from table
+               IItemDefManager *idef = get_server(L)->idef();
+               std::string name = getstringfield_default(L, index, "name", "");
+               int count = getintfield_default(L, index, "count", 1);
+               int wear = getintfield_default(L, index, "wear", 0);
+               std::string metadata = getstringfield_default(L, index, "metadata", "");
+               return ItemStack(name, count, wear, metadata, idef);
+       }
+       else
+       {
+               throw LuaError(L, "Expecting itemstack, itemstring, table or nil");
+       }
+}
+
 /*
        InvRef
 */
@@ -1028,15 +1580,6 @@ private:
                return inv->getList(listname);
        }
 
-       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);
-       }
-
        static void reportInventoryChange(lua_State *L, InvRef *ref)
        {
                // Inform other things that the inventory has changed
@@ -1088,39 +1631,35 @@ private:
                return 0;
        }
 
-       // get_stack(self, listname, i)
+       // get_stack(self, listname, i) -> itemstack
        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());
+               InventoryList *list = getlist(L, ref, listname);
+               ItemStack item;
+               if(list != NULL && i >= 0 && i < (int) list->getSize())
+                       item = list->getItem(i);
+               LuaItemStack::create(L, item);
                return 1;
        }
 
-       // set_stack(self, listname, i, stack)
+       // set_stack(self, listname, i, stack) -> true/false
        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);
+               ItemStack newitem = read_item(L, 4);
                InventoryList *list = getlist(L, ref, listname);
-               if(!list){
+               if(list != NULL && i >= 0 && i < (int) list->getSize()){
+                       list->changeItem(i, newitem);
+                       reportInventoryChange(L, ref);
+                       lua_pushboolean(L, true);
+               } else {
                        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;
        }
 
@@ -1143,57 +1682,79 @@ private:
                InventoryList *list = inv->getList(listname);
                if(list)
                        inventory_set_list_from_lua(inv, listname, L, 3,
-                                       get_server(L), list->getSize());
+                                       list->getSize());
                else
-                       inventory_set_list_from_lua(inv, listname, L, 3,
-                                       get_server(L));
+                       inventory_set_list_from_lua(inv, listname, L, 3);
                reportInventoryChange(L, ref);
                return 0;
        }
 
-       // autoinsert_stack(self, listname, stack)
-       static int l_autoinsert_stack(lua_State *L)
+       // add_item(self, listname, itemstack or itemstring or table or nil) -> itemstack
+       // Returns the leftover stack
+       static int l_add_item(lua_State *L)
        {
                InvRef *ref = checkobject(L, 1);
                const char *listname = luaL_checkstring(L, 2);
-               ItemStack *stack = ItemStack::checkobject(L, 3);
+               ItemStack item = read_item(L, 3);
                InventoryList *list = getlist(L, ref, listname);
-               if(!list){
-                       lua_pushboolean(L, false);
-                       return 1;
+               if(list){
+                       ItemStack leftover = list->addItem(item);
+                       if(leftover.count != item.count)
+                               reportInventoryChange(L, ref);
+                       LuaItemStack::create(L, leftover);
+               } else {
+                       LuaItemStack::create(L, item);
                }
-               InventoryItem *item = stack->getItemCopy();
-               if(list->roomForItem(item)){
-                       delete list->addItem(item);
-                       lua_pushboolean(L, true);
-                       reportInventoryChange(L, ref);
+               return 1;
+       }
+
+       // room_for_item(self, listname, itemstack or itemstring or table or nil) -> true/false
+       // Returns true if the item completely fits into the list
+       static int l_room_for_item(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               ItemStack item = read_item(L, 3);
+               InventoryList *list = getlist(L, ref, listname);
+               if(list){
+                       lua_pushboolean(L, list->roomForItem(item));
                } else {
-                       delete item;
                        lua_pushboolean(L, false);
                }
                return 1;
        }
 
-       // autoinsert_stackstring(self, listname, stackstring)
-       static int l_autoinsert_stackstring(lua_State *L)
+       // contains_item(self, listname, itemstack or itemstring or table or nil) -> true/false
+       // Returns true if the list contains the given count of the given item name
+       static int l_contains_item(lua_State *L)
        {
                InvRef *ref = checkobject(L, 1);
                const char *listname = luaL_checkstring(L, 2);
-               const char *stackstring = luaL_checkstring(L, 3);
+               ItemStack item = read_item(L, 3);
                InventoryList *list = getlist(L, ref, listname);
-               if(!list){
+               if(list){
+                       lua_pushboolean(L, list->containsItem(item));
+               } else {
                        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);
+               return 1;
+       }
+
+       // remove_item(self, listname, itemstack or itemstring or table or nil) -> itemstack
+       // Returns the items that were actually removed
+       static int l_remove_item(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               ItemStack item = read_item(L, 3);
+               InventoryList *list = getlist(L, ref, listname);
+               if(list){
+                       ItemStack removed = list->removeItem(item);
+                       if(!removed.empty())
+                               reportInventoryChange(L, ref);
+                       LuaItemStack::create(L, removed);
                } else {
-                       delete item;
-                       lua_pushboolean(L, false);
+                       LuaItemStack::create(L, ItemStack());
                }
                return 1;
        }
@@ -1266,8 +1827,10 @@ const luaL_reg InvRef::methods[] = {
        method(InvRef, set_stack),
        method(InvRef, get_list),
        method(InvRef, set_list),
-       method(InvRef, autoinsert_stack),
-       method(InvRef, autoinsert_stackstring),
+       method(InvRef, add_item),
+       method(InvRef, room_for_item),
+       method(InvRef, contains_item),
+       method(InvRef, remove_item),
        {0,0}
 };
 
@@ -1394,59 +1957,56 @@ private:
                return 1;
        }
 
-       /* IGenericNodeMetadata interface */
-       
-       // set_infotext(self, text)
-       static int l_set_infotext(lua_State *L)
+       // set_owner(self, string)
+       static int l_set_owner(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
                NodeMetadata *meta = getmeta(ref);
                if(meta == NULL) return 0;
                // Do it
-               std::string text = luaL_checkstring(L, 2);
-               meta->setInfoText(text);
+               std::string owner = luaL_checkstring(L, 2);
+               meta->setOwner(owner);
                reportMetadataChange(ref);
-               return 0;
+               return 1;
        }
 
-       // get_inventory(self)
-       static int l_get_inventory(lua_State *L)
+       // get_allow_removal(self)
+       static int l_get_allow_removal(lua_State *L)
        {
                NodeMetaRef *ref = checkobject(L, 1);
                NodeMetadata *meta = getmeta(ref);
-               if(meta == NULL) return 0;
+               if(meta == NULL){
+                       lua_pushboolean(L, true);
+                       return 1;
+               }
                // Do it
-               InvRef::createNodeMeta(L, ref->m_p);
+               lua_pushboolean(L, !meta->nodeRemovalDisabled());
                return 1;
        }
 
-       // deprecated: inventory_set_list(self, name, {item1, item2, ...})
-       static int l_inventory_set_list(lua_State *L)
+       /* IGenericNodeMetadata interface */
+       
+       // set_infotext(self, text)
+       static int l_set_infotext(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 = luaL_checkstring(L, 2);
-               inventory_set_list_from_lua(inv, name, L, 3,
-                               ref->m_env->getGameDef());
+               std::string text = luaL_checkstring(L, 2);
+               meta->setInfoText(text);
                reportMetadataChange(ref);
                return 0;
        }
 
-       // deprecated: inventory_get_list(self, name)
-       static int l_inventory_get_list(lua_State *L)
+       // get_inventory(self)
+       static int l_get_inventory(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 = luaL_checkstring(L, 2);
-               inventory_get_list_to_lua(inv, name, L);
+               InvRef::createNodeMeta(L, ref->m_p);
                return 1;
        }
 
@@ -1634,10 +2194,10 @@ const luaL_reg NodeMetaRef::methods[] = {
        method(NodeMetaRef, set_text),
        method(NodeMetaRef, get_text),
        method(NodeMetaRef, get_owner),
+       method(NodeMetaRef, set_owner),
+       method(NodeMetaRef, get_allow_removal),
        method(NodeMetaRef, set_infotext),
        method(NodeMetaRef, get_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),
@@ -1662,7 +2222,7 @@ private:
 
        static const char className[];
        static const luaL_reg methods[];
-
+public:
        static ObjectRef *checkobject(lua_State *L, int narg)
        {
                luaL_checktype(L, narg, LUA_TUSERDATA);
@@ -1676,7 +2236,7 @@ private:
                ServerActiveObject *co = ref->m_object;
                return co;
        }
-       
+private:
        static LuaEntitySAO* getluaobject(ObjectRef *ref)
        {
                ServerActiveObject *obj = getobject(ref);
@@ -1713,7 +2273,7 @@ private:
                ObjectRef *ref = checkobject(L, 1);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               infostream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
+               verbosestream<<"ObjectRef::l_remove(): id="<<co->getId()<<std::endl;
                co->m_removed = true;
                return 0;
        }
@@ -1770,17 +2330,22 @@ private:
                return 0;
        }
 
-       // punch(self, puncher); puncher = an another ObjectRef
+       // punch(self, puncher, tool_capabilities, direction, time_from_last_punch)
        static int l_punch(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               ObjectRef *ref2 = checkobject(L, 2);
+               ObjectRef *puncher_ref = checkobject(L, 2);
                ServerActiveObject *co = getobject(ref);
-               ServerActiveObject *co2 = getobject(ref2);
+               ServerActiveObject *puncher = getobject(puncher_ref);
                if(co == NULL) return 0;
-               if(co2 == NULL) return 0;
+               if(puncher == NULL) return 0;
+               ToolCapabilities toolcap = read_tool_capabilities(L, 3);
+               v3f dir = read_v3f(L, 4);
+               float time_from_last_punch = 1000000;
+               if(lua_isnumber(L, 5))
+                       time_from_last_punch = lua_tonumber(L, 5);
                // Do it
-               co->punch(co2);
+               puncher->punch(dir, &toolcap, puncher, time_from_last_punch);
                return 0;
        }
 
@@ -1798,122 +2363,98 @@ private:
                return 0;
        }
 
-       // get_wield_digging_properties(self)
-       static int l_get_wield_digging_properties(lua_State *L)
+       // set_hp(self, hp)
+       // hp = number of hitpoints (2 * number of hearts)
+       // returns: nil
+       static int l_set_hp(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
+               luaL_checknumber(L, 2);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
+               int hp = lua_tonumber(L, 2);
+               /*infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
+                               <<" hp="<<hp<<std::endl;*/
                // Do it
-               ToolDiggingProperties prop;
-               co->getWieldDiggingProperties(&prop);
-               push_tool_digging_properties(L, prop);
+               co->setHP(hp);
+               // Return
+               return 0;
+       }
+
+       // get_hp(self)
+       // returns: number of hitpoints (2 * number of hearts)
+       // 0 if not applicable to this type of object
+       static int l_get_hp(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerActiveObject *co = getobject(ref);
+               if(co == NULL) return 0;
+               int hp = co->getHP();
+               /*infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
+                               <<" hp="<<hp<<std::endl;*/
+               // Return
+               lua_pushnumber(L, hp);
                return 1;
        }
 
-       // damage_wielded_item(self, amount)
-       static int l_damage_wielded_item(lua_State *L)
+       // get_inventory(self)
+       static int l_get_inventory(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
                // Do it
-               int amount = lua_tonumber(L, 2);
-               co->damageWieldedItem(amount);
-               return 0;
+               InventoryLocation loc = co->getInventoryLocation();
+               if(get_server(L)->getInventory(loc) != NULL)
+                       InvRef::create(L, loc);
+               else
+                       lua_pushnil(L);
+               return 1;
        }
 
-       // add_to_inventory(self, itemstring)
-       // returns: true if item was added, (false, "reason") otherwise
-       static int l_add_to_inventory(lua_State *L)
+       // get_wield_list(self)
+       static int l_get_wield_list(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               luaL_checkstring(L, 2);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               // itemstring
-               const char *itemstring = luaL_checkstring(L, 2);
-               infostream<<"ObjectRef::l_add_to_inventory(): id="<<co->getId()
-                               <<" itemstring=\""<<itemstring<<"\""<<std::endl;
                // Do it
-               std::istringstream is(itemstring, std::ios::binary);
-               ServerEnvironment *env = co->getEnv();
-               assert(env);
-               IGameDef *gamedef = env->getGameDef();
-               try{
-                       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-                       if(item->getCount() == 0)
-                               item->setCount(1);
-                       bool added = co->addToInventory(item);
-                       // Return
-                       lua_pushboolean(L, added);
-                       if(!added)
-                               lua_pushstring(L, "failed to add item");
-                       return 2;
-               } catch(SerializationError &e){
-                       // Return
-                       lua_pushboolean(L, false);
-                       lua_pushstring(L, (std::string("Invalid item: ")
-                                       + e.what()).c_str());
-                       return 2;
-               }
+               lua_pushstring(L, co->getWieldList().c_str());
+               return 1;
        }
 
-       // add_to_inventory_later(self, itemstring)
-       // returns: nil
-       static int l_add_to_inventory_later(lua_State *L)
+       // get_wield_index(self)
+       static int l_get_wield_index(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               luaL_checkstring(L, 2);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               // itemstring
-               const char *itemstring = luaL_checkstring(L, 2);
-               infostream<<"ObjectRef::l_add_to_inventory_later(): id="<<co->getId()
-                               <<" itemstring=\""<<itemstring<<"\""<<std::endl;
                // Do it
-               std::istringstream is(itemstring, std::ios::binary);
-               ServerEnvironment *env = co->getEnv();
-               assert(env);
-               IGameDef *gamedef = env->getGameDef();
-               InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
-               infostream<<"item="<<env<<std::endl;
-               co->addToInventoryLater(item);
-               // Return
-               return 0;
+               lua_pushinteger(L, co->getWieldIndex() + 1);
+               return 1;
        }
 
-       // set_hp(self, hp)
-       // hp = number of hitpoints (2 * number of hearts)
-       // returns: nil
-       static int l_set_hp(lua_State *L)
+       // get_wielded_item(self)
+       static int l_get_wielded_item(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
-               luaL_checknumber(L, 2);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               int hp = lua_tonumber(L, 2);
-               infostream<<"ObjectRef::l_set_hp(): id="<<co->getId()
-                               <<" hp="<<hp<<std::endl;
                // Do it
-               co->setHP(hp);
-               // Return
-               return 0;
+               LuaItemStack::create(L, co->getWieldedItem());
+               return 1;
        }
 
-       // get_hp(self)
-       // returns: number of hitpoints (2 * number of hearts)
-       // 0 if not applicable to this type of object
-       static int l_get_hp(lua_State *L)
+       // set_wielded_item(self, itemstack or itemstring or table or nil)
+       static int l_set_wielded_item(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
                ServerActiveObject *co = getobject(ref);
                if(co == NULL) return 0;
-               int hp = co->getHP();
-               infostream<<"ObjectRef::l_get_hp(): id="<<co->getId()
-                               <<" hp="<<hp<<std::endl;
-               // Return
-               lua_pushnumber(L, hp);
+               // Do it
+               ItemStack item = read_item(L, 2);
+               bool success = co->setWieldedItem(item);
+               lua_pushboolean(L, success);
                return 1;
        }
 
@@ -2030,6 +2571,19 @@ private:
                return 0;
        }
 
+       // set_armor_groups(self, groups)
+       static int l_set_armor_groups(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               LuaEntitySAO *co = getluaobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               ItemGroupList groups;
+               read_groups(L, 2, groups);
+               co->setArmorGroups(groups);
+               return 0;
+       }
+
        // DEPRECATED
        // get_entity_name(self)
        static int l_get_entity_name(lua_State *L)
@@ -2070,73 +2624,6 @@ private:
                return 1;
        }
        
-       // 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 = luaL_checkstring(L, 2);
-               // Do it
-               inventory_set_list_from_lua(&player->inventory, name, L, 3,
-                               player->getEnv()->getGameDef(), PLAYER_INVENTORY_SIZE);
-               player->m_inventory_not_sent = true;
-               return 0;
-       }
-
-       // 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 = luaL_checkstring(L, 2);
-               // Do it
-               inventory_get_list_to_lua(&player->inventory, name, L);
-               return 1;
-       }
-
-       // get_wielded_itemstring(self)
-       static int l_get_wielded_itemstring(lua_State *L)
-       {
-               ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
-               if(player == NULL) return 0;
-               // Do it
-               InventoryItem *item = player->getWieldedItem();
-               if(item == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               lua_pushstring(L, item->getItemString().c_str());
-               return 1;
-       }
-
-       // get_wielded_item(self)
-       static int l_get_wielded_item(lua_State *L)
-       {
-               ObjectRef *ref = checkobject(L, 1);
-               ServerRemotePlayer *player = getplayer(ref);
-               if(player == NULL) return 0;
-               // Do it
-               InventoryItem *item0 = player->getWieldedItem();
-               push_stack_item(L, item0);
-               return 1;
-       }
-
        // get_look_dir(self)
        static int l_get_look_dir(lua_State *L)
        {
@@ -2243,12 +2730,13 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, moveto),
        method(ObjectRef, punch),
        method(ObjectRef, right_click),
-       method(ObjectRef, get_wield_digging_properties),
-       method(ObjectRef, damage_wielded_item),
-       method(ObjectRef, add_to_inventory),
-       method(ObjectRef, add_to_inventory_later),
        method(ObjectRef, set_hp),
        method(ObjectRef, get_hp),
+       method(ObjectRef, get_inventory),
+       method(ObjectRef, get_wield_list),
+       method(ObjectRef, get_wield_index),
+       method(ObjectRef, get_wielded_item),
+       method(ObjectRef, set_wielded_item),
        // LuaEntitySAO-only
        method(ObjectRef, setvelocity),
        method(ObjectRef, getvelocity),
@@ -2258,15 +2746,11 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, getyaw),
        method(ObjectRef, settexturemod),
        method(ObjectRef, setsprite),
+       method(ObjectRef, set_armor_groups),
        method(ObjectRef, get_entity_name),
        method(ObjectRef, get_luaentity),
        // Player-only
        method(ObjectRef, get_player_name),
-       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),
@@ -2408,7 +2892,7 @@ private:
                }
        }
 
-       // EnvRef:add_entity(pos, entityname)
+       // EnvRef:add_entity(pos, entityname) -> ObjectRef or nil
        // pos = {x=num, y=num, z=num}
        static int l_add_entity(lua_State *L)
        {
@@ -2431,37 +2915,37 @@ private:
                return 1;
        }
 
-       // EnvRef:add_item(pos, inventorystring)
+       // EnvRef:add_item(pos, itemstack or itemstring or table) -> ObjectRef or nil
        // pos = {x=num, y=num, z=num}
        static int l_add_item(lua_State *L)
        {
-               infostream<<"EnvRef::l_add_item()"<<std::endl;
+               //infostream<<"EnvRef::l_add_item()"<<std::endl;
                EnvRef *o = checkobject(L, 1);
                ServerEnvironment *env = o->m_env;
                if(env == NULL) return 0;
                // pos
                v3f pos = checkFloatPos(L, 2);
-               // inventorystring
-               const char *inventorystring = luaL_checkstring(L, 3);
+               // item
+               ItemStack item = read_item(L, 3);
+               if(item.empty() || !item.isKnown(get_server(L)->idef()))
+                       return 0;
                // Do it
-               ServerActiveObject *obj = new ItemSAO(env, pos, inventorystring);
-               env->addActiveObject(obj);
-               return 0;
+               ServerActiveObject *obj = createItemSAO(env, pos, item.getItemString());
+               int objectid = env->addActiveObject(obj);
+               // If failed to add, return nothing (reads as nil)
+               if(objectid == 0)
+                       return 0;
+               // Return ObjectRef
+               objectref_get_or_create(L, obj);
+               return 1;
        }
 
        // EnvRef:add_rat(pos)
        // pos = {x=num, y=num, z=num}
        static int l_add_rat(lua_State *L)
        {
-               infostream<<"EnvRef::l_add_rat()"<<std::endl;
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // pos
-               v3f pos = checkFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new RatSAO(env, pos);
-               env->addActiveObject(obj);
+               infostream<<"EnvRef::l_add_rat(): C++ mobs have been removed."
+                               <<" Doing nothing."<<std::endl;
                return 0;
        }
 
@@ -2469,15 +2953,8 @@ private:
        // pos = {x=num, y=num, z=num}
        static int l_add_firefly(lua_State *L)
        {
-               infostream<<"EnvRef::l_add_firefly()"<<std::endl;
-               EnvRef *o = checkobject(L, 1);
-               ServerEnvironment *env = o->m_env;
-               if(env == NULL) return 0;
-               // pos
-               v3f pos = checkFloatPos(L, 2);
-               // Do it
-               ServerActiveObject *obj = new FireflySAO(env, pos);
-               env->addActiveObject(obj);
+               infostream<<"EnvRef::l_add_firefly(): C++ mobs have been removed."
+                               <<" Doing nothing."<<std::endl;
                return 0;
        }
 
@@ -2543,6 +3020,38 @@ private:
                return 1;
        }
 
+       // EnvRef:set_timeofday(val)
+       // val = 0...1
+       static int l_set_timeofday(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               // Do it
+               float timeofday_f = luaL_checknumber(L, 2);
+               assert(timeofday_f >= 0.0 && timeofday_f <= 1.0);
+               int timeofday_mh = (int)(timeofday_f * 24000.0);
+               // This should be set directly in the environment but currently
+               // such changes aren't immediately sent to the clients, so call
+               // the server instead.
+               //env->setTimeOfDay(timeofday_mh);
+               get_server(L)->setTimeOfDay(timeofday_mh);
+               return 0;
+       }
+
+       // EnvRef:get_timeofday() -> 0...1
+       static int l_get_timeofday(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               ServerEnvironment *env = o->m_env;
+               if(env == NULL) return 0;
+               // Do it
+               int timeofday_mh = env->getTimeOfDay();
+               float timeofday_f = (float)timeofday_mh / 24000.0;
+               lua_pushnumber(L, timeofday_f);
+               return 1;
+       }
+
        static int gc_object(lua_State *L) {
                EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
                delete o;
@@ -2553,12 +3062,12 @@ public:
        EnvRef(ServerEnvironment *env):
                m_env(env)
        {
-               infostream<<"EnvRef created"<<std::endl;
+               //infostream<<"EnvRef created"<<std::endl;
        }
 
        ~EnvRef()
        {
-               infostream<<"EnvRef destructing"<<std::endl;
+               //infostream<<"EnvRef destructing"<<std::endl;
        }
 
        // Creates an EnvRef and leaves it on top of stack
@@ -2620,62 +3129,11 @@ const luaL_reg EnvRef::methods[] = {
        method(EnvRef, get_meta),
        method(EnvRef, get_player_by_name),
        method(EnvRef, get_objects_inside_radius),
+       method(EnvRef, set_timeofday),
+       method(EnvRef, get_timeofday),
        {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:
@@ -2747,456 +3205,361 @@ public:
                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;
+/*
+       ServerSoundParams
+*/
+
+static void read_server_sound_params(lua_State *L, int index,
+               ServerSoundParams &params)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
+       // Clear
+       params = ServerSoundParams();
+       if(lua_istable(L, index)){
+               getfloatfield(L, index, "gain", params.gain);
+               getstringfield(L, index, "to_player", params.to_player);
+               lua_getfield(L, index, "pos");
+               if(!lua_isnil(L, -1)){
+                       v3f p = read_v3f(L, -1)*BS;
+                       params.pos = p;
+                       params.type = ServerSoundParams::SSP_POSITIONAL;
+               }
+               lua_pop(L, 1);
+               lua_getfield(L, index, "object");
+               if(!lua_isnil(L, -1)){
+                       ObjectRef *ref = ObjectRef::checkobject(L, -1);
+                       ServerActiveObject *sao = ObjectRef::getobject(ref);
+                       if(sao){
+                               params.object = sao->getId();
+                               params.type = ServerSoundParams::SSP_OBJECT;
+                       }
+               }
                lua_pop(L, 1);
-               id++;
+               params.max_hear_distance = BS*getfloatfield_default(L, index,
+                               "max_hear_distance", params.max_hear_distance/BS);
+               getboolfield(L, index, "loop", params.loop);
        }
-       lua_pop(L, 1);
+}
 
-       infostream<<"register_abm: id="<<id<<std::endl;
+/*
+       Global functions
+*/
 
-       // registered_abms[id] = spec
-       lua_pushnumber(L, id);
-       lua_pushvalue(L, 1);
-       lua_settable(L, registered_abms);
-       
-       return 0; /* number of results */
+// debug(text)
+// Writes a line to dstream
+static int l_debug(lua_State *L)
+{
+       std::string text = lua_tostring(L, 1);
+       dstream << text << std::endl;
+       return 0;
 }
 
-// register_tool(name, {lots of stuff})
-static int l_register_tool(lua_State *L)
+// log([level,] text)
+// Writes a line to the logger.
+// The one-argument version logs to infostream.
+// The two-argument version accept a log level: error, action, info, or verbose.
+static int l_log(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 */
+       std::string text;
+       LogMessageLevel level = LMT_INFO;
+       if(lua_isnone(L, 2))
+       {
+               text = lua_tostring(L, 1);
+       }
+       else
+       {
+               std::string levelname = lua_tostring(L, 1);
+               text = lua_tostring(L, 2);
+               if(levelname == "error")
+                       level = LMT_ERROR;
+               else if(levelname == "action")
+                       level = LMT_ACTION;
+               else if(levelname == "verbose")
+                       level = LMT_VERBOSE;
+       }
+       log_printline(level, text);
+       return 0;
 }
 
-// register_craftitem(name, {lots of stuff})
-static int l_register_craftitem(lua_State *L)
+// register_item_raw({lots of stuff})
+static int l_register_item_raw(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);
+       luaL_checktype(L, 1, LUA_TTABLE);
+       int table = 1;
+
+       // Get the writable item and node definition managers from the server
+       IWritableItemDefManager *idef =
+                       get_server(L)->getWritableItemDefManager();
+       IWritableNodeDefManager *ndef =
+                       get_server(L)->getWritableNodeDefManager();
+
+       // Check if name is defined
+       lua_getfield(L, table, "name");
+       if(lua_isstring(L, -1)){
+               std::string name = lua_tostring(L, -1);
+               verbosestream<<"register_item_raw: "<<name<<std::endl;
+       } else {
+               throw LuaError(L, "register_item_raw: name is not defined or not a string");
+       }
 
        // 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);
+       // Read the item definition and register it
+       ItemDefinition def = read_item_definition(L, table);
+       idef->registerItem(def);
 
-       lua_pushvalue(L, table);
-       scriptapi_add_craftitem(L, name.c_str());
+       // Read the node definition (content features) and register it
+       if(def.type == ITEM_NODE)
+       {
+               ContentFeatures f = read_content_features(L, table);
+               ndef->set(f.name, f);
+       }
 
        return 0; /* number of results */
 }
 
-// register_node(name, {lots of stuff})
-static int l_register_node(lua_State *L)
+// register_alias_raw(name, convert_to_name)
+static int l_register_alias_raw(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);
+       std::string convert_to = luaL_checkstring(L, 2);
 
-       /*
-               Create definition
-       */
+       // Get the writable item definition manager from the server
+       IWritableItemDefManager *idef =
+                       get_server(L)->getWritableItemDefManager();
        
-       ContentFeatures f;
-
-       // Default to getting the corresponding NodeItem when dug
-       f.dug_item = std::string("NodeItem \"")+name+"\" 1";
+       idef->registerAlias(name, convert_to);
        
-       // Default to unknown_block.png as all textures
-       f.setAllTextures("unknown_block.png");
-
-       /*
-               Read definiton from Lua
-       */
+       return 0; /* number of results */
+}
 
-       f.name = name;
-       
-       /* Visual definition */
+// helper for register_craft
+static bool read_craft_recipe_shaped(lua_State *L, int index,
+               int &width, std::vector<std::string> &recipe)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
 
-       f.drawtype = (NodeDrawType)getenumfield(L, nodedef_table, "drawtype", es_DrawType,
-                       NDT_NORMAL);
-       getfloatfield(L, nodedef_table, "visual_scale", f.visual_scale);
+       if(!lua_istable(L, index))
+               return false;
 
-       lua_getfield(L, nodedef_table, "tile_images");
-       if(lua_istable(L, -1)){
-               int table = lua_gettop(L);
+       lua_pushnil(L);
+       int rowcount = 0;
+       while(lua_next(L, index) != 0){
+               int colcount = 0;
+               // key at index -2 and value at index -1
+               if(!lua_istable(L, -1))
+                       return false;
+               int table2 = lua_gettop(L);
                lua_pushnil(L);
-               int i = 0;
-               while(lua_next(L, table) != 0){
+               while(lua_next(L, table2) != 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] = "";
+                       if(!lua_isstring(L, -1))
+                               return false;
+                       recipe.push_back(lua_tostring(L, -1));
                        // removes value, keeps key for next iteration
                        lua_pop(L, 1);
-                       i++;
-                       if(i==6){
-                               lua_pop(L, 1);
-                               break;
-                       }
+                       colcount++;
                }
-               // 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++;
-                       }
+               if(rowcount == 0){
+                       width = colcount;
+               } else {
+                       if(colcount != width)
+                               return false;
                }
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+               rowcount++;
        }
-       lua_pop(L, 1);
-
-       getstringfield(L, nodedef_table, "inventory_image", f.tname_inventory);
+       return width != 0;
+}
 
-       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);
+// helper for register_craft
+static bool read_craft_recipe_shapeless(lua_State *L, int index,
+               std::vector<std::string> &recipe)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
 
-       f.alpha = getintfield_default(L, nodedef_table, "alpha", 255);
+       if(!lua_istable(L, index))
+               return false;
 
-       /* 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);
+       lua_pushnil(L);
+       while(lua_next(L, index) != 0){
+               // key at index -2 and value at index -1
+               if(!lua_isstring(L, -1))
+                       return false;
+               recipe.push_back(lua_tostring(L, -1));
+               // removes value, keeps key for next iteration
+               lua_pop(L, 1);
+       }
+       return true;
+}
 
-       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);
+// helper for register_craft
+static bool read_craft_replacements(lua_State *L, int index,
+               CraftReplacements &replacements)
+{
+       if(index < 0)
+               index = lua_gettop(L) + 1 + index;
 
-               lua_getfield(L, -1, "fixed");
-               if(lua_istable(L, -1))
-                       f.selection_box.fixed = read_aabbox3df32(L, -1, BS);
-               lua_pop(L, 1);
+       if(!lua_istable(L, index))
+               return false;
 
-               lua_getfield(L, -1, "wall_top");
-               if(lua_istable(L, -1))
-                       f.selection_box.wall_top = read_aabbox3df32(L, -1, BS);
+       lua_pushnil(L);
+       while(lua_next(L, index) != 0){
+               // key at index -2 and value at index -1
+               if(!lua_istable(L, -1))
+                       return false;
+               lua_rawgeti(L, -1, 1);
+               if(!lua_isstring(L, -1))
+                       return false;
+               std::string replace_from = lua_tostring(L, -1);
                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_rawgeti(L, -1, 2);
+               if(!lua_isstring(L, -1))
+                       return false;
+               std::string replace_to = lua_tostring(L, -1);
                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);
+               replacements.pairs.push_back(
+                               std::make_pair(replace_from, replace_to));
+               // removes value, keeps key for next iteration
                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 */
+       return true;
 }
-
-// alias_tool(name, convert_to_name)
-static int l_alias_tool(lua_State *L)
+// register_craft({output=item, recipe={{item00,item10},{item01,item11}})
+static int l_register_craft(lua_State *L)
 {
-       std::string name = luaL_checkstring(L, 1);
-       std::string convert_to = luaL_checkstring(L, 2);
+       //infostream<<"register_craft"<<std::endl;
+       luaL_checktype(L, 1, LUA_TTABLE);
+       int table = 1;
 
-       // Get the writable tool definition manager from the server
-       IWritableToolDefManager *tooldef =
-                       get_server(L)->getWritableToolDefManager();
+       // Get the writable craft definition manager from the server
+       IWritableCraftDefManager *craftdef =
+                       get_server(L)->getWritableCraftDefManager();
        
-       tooldef->setAlias(name, convert_to);
+       std::string type = getstringfield_default(L, table, "type", "shaped");
 
-       return 0; /* number of results */
-}
+       /*
+               CraftDefinitionShaped
+       */
+       if(type == "shaped"){
+               std::string output = getstringfield_default(L, table, "output", "");
+               if(output == "")
+                       throw LuaError(L, "Crafting definition is missing an output");
+
+               int width = 0;
+               std::vector<std::string> recipe;
+               lua_getfield(L, table, "recipe");
+               if(lua_isnil(L, -1))
+                       throw LuaError(L, "Crafting definition is missing a recipe"
+                                       " (output=\"" + output + "\")");
+               if(!read_craft_recipe_shaped(L, -1, width, recipe))
+                       throw LuaError(L, "Invalid crafting recipe"
+                                       " (output=\"" + output + "\")");
+
+               CraftReplacements replacements;
+               lua_getfield(L, table, "replacements");
+               if(!lua_isnil(L, -1))
+               {
+                       if(!read_craft_replacements(L, -1, replacements))
+                               throw LuaError(L, "Invalid replacements"
+                                               " (output=\"" + output + "\")");
+               }
 
-// 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);
+               CraftDefinition *def = new CraftDefinitionShaped(
+                               output, width, recipe, replacements);
+               craftdef->registerCraft(def);
+       }
+       /*
+               CraftDefinitionShapeless
+       */
+       else if(type == "shapeless"){
+               std::string output = getstringfield_default(L, table, "output", "");
+               if(output == "")
+                       throw LuaError(L, "Crafting definition (shapeless)"
+                                       " is missing an output");
+
+               std::vector<std::string> recipe;
+               lua_getfield(L, table, "recipe");
+               if(lua_isnil(L, -1))
+                       throw LuaError(L, "Crafting definition (shapeless)"
+                                       " is missing a recipe"
+                                       " (output=\"" + output + "\")");
+               if(!read_craft_recipe_shapeless(L, -1, recipe))
+                       throw LuaError(L, "Invalid crafting recipe"
+                                       " (output=\"" + output + "\")");
+
+               CraftReplacements replacements;
+               lua_getfield(L, table, "replacements");
+               if(!lua_isnil(L, -1))
+               {
+                       if(!read_craft_replacements(L, -1, replacements))
+                               throw LuaError(L, "Invalid replacements"
+                                               " (output=\"" + output + "\")");
+               }
 
-       // Get the writable CraftItem definition manager from the server
-       IWritableCraftItemDefManager *craftitemdef =
-                       get_server(L)->getWritableCraftItemDefManager();
-       
-       craftitemdef->setAlias(name, convert_to);
+               CraftDefinition *def = new CraftDefinitionShapeless(
+                               output, recipe, replacements);
+               craftdef->registerCraft(def);
+       }
+       /*
+               CraftDefinitionToolRepair
+       */
+       else if(type == "toolrepair"){
+               float additional_wear = getfloatfield_default(L, table,
+                               "additional_wear", 0.0);
 
-       return 0; /* number of results */
-}
+               CraftDefinition *def = new CraftDefinitionToolRepair(
+                               additional_wear);
+               craftdef->registerCraft(def);
+       }
+       /*
+               CraftDefinitionCooking
+       */
+       else if(type == "cooking"){
+               std::string output = getstringfield_default(L, table, "output", "");
+               if(output == "")
+                       throw LuaError(L, "Crafting definition (cooking)"
+                                       " is missing an output");
 
-// 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;
+               std::string recipe = getstringfield_default(L, table, "recipe", "");
+               if(recipe == "")
+                       throw LuaError(L, "Crafting definition (cooking)"
+                                       " is missing a recipe"
+                                       " (output=\"" + output + "\")");
 
-       // 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);
+               float cooktime = getfloatfield_default(L, table, "cooktime", 3.0);
 
-       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++;
-               }
+               CraftDefinition *def = new CraftDefinitionCooking(
+                               output, recipe, cooktime);
+               craftdef->registerCraft(def);
        }
-       lua_pop(L, 1);
+       /*
+               CraftDefinitionFuel
+       */
+       else if(type == "fuel"){
+               std::string recipe = getstringfield_default(L, table, "recipe", "");
+               if(recipe == "")
+                       throw LuaError(L, "Crafting definition (fuel)"
+                                       " is missing a recipe");
+
+               float burntime = getfloatfield_default(L, table, "burntime", 1.0);
 
-       CraftDefinition def(output, width, input);
-       craftdef->registerCraft(def);
+               CraftDefinition *def = new CraftDefinitionFuel(
+                               recipe, burntime);
+               craftdef->registerCraft(def);
+       }
+       else
+       {
+               throw LuaError(L, "Unknown crafting definition type: \"" + type + "\"");
+       }
 
+       lua_pop(L, 1);
        return 0; /* number of results */
 }
 
@@ -3258,10 +3621,7 @@ static int l_get_player_privs(lua_State *L)
        // Do it
        lua_newtable(L);
        int table = lua_gettop(L);
-       u64 privs_i = server->getPlayerAuthPrivs(name);
-       // Special case for the "name" setting (local player / server owner)
-       if(name == g_settings->get("name"))
-               privs_i = PRIV_ALL;
+       u64 privs_i = server->getPlayerEffectivePrivs(name);
        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++){
@@ -3294,15 +3654,47 @@ static int l_get_inventory(lua_State *L)
        return 1;
 }
 
+// get_dig_params(groups, tool_capabilities[, time_from_last_punch])
+static int l_get_dig_params(lua_State *L)
+{
+       std::map<std::string, int> groups;
+       read_groups(L, 1, groups);
+       ToolCapabilities tp = read_tool_capabilities(L, 2);
+       if(lua_isnoneornil(L, 3))
+               push_dig_params(L, getDigParams(groups, &tp));
+       else
+               push_dig_params(L, getDigParams(groups, &tp,
+                                       luaL_checknumber(L, 3)));
+       return 1;
+}
+
+// get_hit_params(groups, tool_capabilities[, time_from_last_punch])
+static int l_get_hit_params(lua_State *L)
+{
+       std::map<std::string, int> groups;
+       read_groups(L, 1, groups);
+       ToolCapabilities tp = read_tool_capabilities(L, 2);
+       if(lua_isnoneornil(L, 3))
+               push_hit_params(L, getHitParams(groups, &tp));
+       else
+               push_hit_params(L, getHitParams(groups, &tp,
+                                       luaL_checknumber(L, 3)));
+       return 1;
+}
+
+// get_current_modname()
+static int l_get_current_modname(lua_State *L)
+{
+       lua_getfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+       return 1;
+}
+
 // 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);
+       const ModSpec *mod = get_server(L)->getModSpec(modname);
        if(!mod){
                lua_pushnil(L);
                return 1;
@@ -3311,32 +3703,53 @@ static int l_get_modpath(lua_State *L)
        return 1;
 }
 
+// get_worldpath()
+static int l_get_worldpath(lua_State *L)
+{
+       std::string worldpath = get_server(L)->getWorldPath();
+       lua_pushstring(L, worldpath.c_str());
+       return 1;
+}
+
+// sound_play(spec, parameters)
+static int l_sound_play(lua_State *L)
+{
+       SimpleSoundSpec spec;
+       read_soundspec(L, 1, spec);
+       ServerSoundParams params;
+       read_server_sound_params(L, 2, params);
+       s32 handle = get_server(L)->playSound(spec, params);
+       lua_pushinteger(L, handle);
+       return 1;
+}
+
+// sound_stop(handle)
+static int l_sound_stop(lua_State *L)
+{
+       int handle = luaL_checkinteger(L, 1);
+       get_server(L)->stopSound(handle);
+       return 0;
+}
+
 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},
+       {"debug", l_debug},
+       {"log", l_log},
+       {"register_item_raw", l_register_item_raw},
+       {"register_alias_raw", l_register_alias_raw},
        {"register_craft", l_register_craft},
-       {"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_dig_params", l_get_dig_params},
+       {"get_hit_params", l_get_hit_params},
+       {"get_current_modname", l_get_current_modname},
        {"get_modpath", l_get_modpath},
-       {NULL, NULL}
-};
-
-/*
-       LuaEntity functions
-*/
-
-static const struct luaL_Reg minetest_entity_m [] = {
+       {"get_worldpath", l_get_worldpath},
+       {"sound_play", l_sound_play},
+       {"sound_stop", l_sound_stop},
        {NULL, NULL}
 };
 
@@ -3348,17 +3761,13 @@ void scriptapi_export(lua_State *L, Server *server)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_export"<<std::endl;
+       verbosestream<<"scriptapi_export()"<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Store server as light userdata in registry
        lua_pushlightuserdata(L, server);
        lua_setfield(L, LUA_REGISTRYINDEX, "minetest_server");
 
-       // Store nil as minetest_nodedef_defaults in registry
-       lua_pushnil(L);
-       lua_setfield(L, LUA_REGISTRYINDEX, "minetest_nodedef_default");
-       
        // Register global functions in table minetest
        lua_newtable(L);
        luaL_register(L, NULL, minetest_f);
@@ -3369,31 +3778,13 @@ void scriptapi_export(lua_State *L, Server *server)
 
        // Add tables to minetest
        
-       lua_newtable(L);
-       lua_setfield(L, -2, "registered_nodes");
-       lua_newtable(L);
-       lua_setfield(L, -2, "registered_entities");
-       lua_newtable(L);
-       lua_setfield(L, -2, "registered_craftitems");
-       lua_newtable(L);
-       lua_setfield(L, -2, "registered_abms");
-       
        lua_newtable(L);
        lua_setfield(L, -2, "object_refs");
        lua_newtable(L);
        lua_setfield(L, -2, "luaentities");
 
-       // Create entity prototype
-       luaL_newmetatable(L, "minetest.entity");
-       // metatable.__index = metatable
-       lua_pushvalue(L, -1); // Duplicate metatable
-       lua_setfield(L, -2, "__index");
-       // Put functions in metatable
-       luaL_register(L, NULL, minetest_entity_m);
-       // Put other stuff in metatable
-       
        // Register wrappers
-       ItemStack::Register(L);
+       LuaItemStack::Register(L);
        InvRef::Register(L);
        NodeMetaRef::Register(L);
        ObjectRef::Register(L);
@@ -3430,7 +3821,7 @@ void scriptapi_add_environment(lua_State *L, ServerEnvironment *env)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_add_environment"<<std::endl;
+       verbosestream<<"scriptapi_add_environment"<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Create EnvRef on stack
@@ -3674,6 +4065,8 @@ bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player)
        assert(lua_checkstack(L, 20));
        StackUnroller stack_unroller(L);
 
+       dstream<<"player: "<<player<<"   id: "<<player->getId()<<std::endl;
+
        bool positioning_handled_by_some = false;
 
        // Get minetest.registered_on_respawnplayers
@@ -3705,62 +4098,22 @@ void scriptapi_get_creative_inventory(lua_State *L, ServerRemotePlayer *player)
        lua_getfield(L, -1, "creative_inventory");
        luaL_checktype(L, -1, LUA_TTABLE);
        inventory_set_list_from_lua(&player->inventory, "main", L, -1,
-                       player->getEnv()->getGameDef(), PLAYER_INVENTORY_SIZE);
+                       PLAYER_INVENTORY_SIZE);
 }
 
 /*
-       craftitem
+       item callbacks and node callbacks
 */
 
-static void pushPointedThing(lua_State *L, const PointedThing& pointed)
-{
-       lua_newtable(L);
-       if(pointed.type == POINTEDTHING_NODE)
-       {
-               lua_pushstring(L, "node");
-               lua_setfield(L, -2, "type");
-               push_v3s16(L, pointed.node_undersurface);
-               lua_setfield(L, -2, "under");
-               push_v3s16(L, pointed.node_abovesurface);
-               lua_setfield(L, -2, "above");
-       }
-       else if(pointed.type == POINTEDTHING_OBJECT)
-       {
-               lua_pushstring(L, "object");
-               lua_setfield(L, -2, "type");
-               objectref_get(L, pointed.object_id);
-               lua_setfield(L, -2, "ref");
-       }
-       else
-       {
-               lua_pushstring(L, "nothing");
-               lua_setfield(L, -2, "type");
-       }
-}
-
-void scriptapi_add_craftitem(lua_State *L, const char *name)
-{
-       StackUnroller stack_unroller(L);
-       assert(lua_gettop(L) > 0);
-
-       // Set minetest.registered_craftitems[name] = table on top of stack
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_craftitems");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       lua_pushvalue(L, -3); // push another reference to the table to be registered
-       lua_setfield(L, -2, name); // set minetest.registered_craftitems[name]
-}
-
-static bool get_craftitem_callback(lua_State *L, const char *name,
-               const char *callbackname)
+// Retrieves minetest.registered_items[name][callbackname]
+// If that is nil or on error, return false and stack is unchanged
+// If that is a function, returns true and pushes the
+// function onto the stack
+static bool get_item_callback(lua_State *L,
+               const char *name, const char *callbackname)
 {
-       // Get minetest.registered_craftitems[name][callbackname]
-       // If that is nil or on error, return false and stack is unchanged
-       // If that is a function, returns true and pushes the
-       // function onto the stack
-
        lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_craftitems");
+       lua_getfield(L, -1, "registered_items");
        lua_remove(L, -2);
        luaL_checktype(L, -1, LUA_TTABLE);
        lua_getfield(L, -1, name);
@@ -3768,7 +4121,7 @@ static bool get_craftitem_callback(lua_State *L, const char *name,
        // Should be a table
        if(lua_type(L, -1) != LUA_TTABLE)
        {
-               errorstream<<"CraftItem name \""<<name<<"\" not defined"<<std::endl;
+               errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
                lua_pop(L, 1);
                return false;
        }
@@ -3786,193 +4139,137 @@ static bool get_craftitem_callback(lua_State *L, const char *name,
        }
        else
        {
-               errorstream<<"CraftItem name \""<<name<<"\" callback \""
+               errorstream<<"Item \""<<name<<"\" callback \""
                        <<callbackname<<" is not a function"<<std::endl;
                lua_pop(L, 1);
                return false;
        }
 }
 
-bool scriptapi_craftitem_on_drop(lua_State *L, const char *name,
-               ServerActiveObject *dropper, v3f pos,
-               bool &callback_exists)
+bool scriptapi_item_on_drop(lua_State *L, ItemStack &item,
+               ServerActiveObject *dropper, v3f pos)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_craftitem_on_drop"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       bool result = false;
-       callback_exists = get_craftitem_callback(L, name, "on_drop");
-       if(callback_exists)
-       {
-               // Call function
-               lua_pushstring(L, name);
-               objectref_get_or_create(L, dropper);
-               pushFloatPos(L, pos);
-               if(lua_pcall(L, 3, 1, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               result = lua_toboolean(L, -1);
-       }
-       return result;
+       // Push callback function on stack
+       if(!get_item_callback(L, item.name.c_str(), "on_drop"))
+               return false;
+
+       // Call function
+       LuaItemStack::create(L, item);
+       objectref_get_or_create(L, dropper);
+       pushFloatPos(L, pos);
+       if(lua_pcall(L, 3, 1, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       if(!lua_isnil(L, -1))
+               item = read_item(L, -1);
+       return true;
 }
 
-bool scriptapi_craftitem_on_place_on_ground(lua_State *L, const char *name,
-               ServerActiveObject *placer, v3f pos,
-               bool &callback_exists)
+bool scriptapi_item_on_place(lua_State *L, ItemStack &item,
+               ServerActiveObject *placer, const PointedThing &pointed)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_craftitem_on_place_on_ground"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       bool result = false;
-       callback_exists = get_craftitem_callback(L, name, "on_place_on_ground");
-       if(callback_exists)
-       {
-               // Call function
-               lua_pushstring(L, name);
-               objectref_get_or_create(L, placer);
-               pushFloatPos(L, pos);
-               if(lua_pcall(L, 3, 1, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               result = lua_toboolean(L, -1);
-       }
-       return result;
+       // Push callback function on stack
+       if(!get_item_callback(L, item.name.c_str(), "on_place"))
+               return false;
+
+       // Call function
+       LuaItemStack::create(L, item);
+       objectref_get_or_create(L, placer);
+       push_pointed_thing(L, pointed);
+       if(lua_pcall(L, 3, 1, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       if(!lua_isnil(L, -1))
+               item = read_item(L, -1);
+       return true;
 }
 
-bool scriptapi_craftitem_on_use(lua_State *L, const char *name,
-               ServerActiveObject *user, const PointedThing& pointed,
-               bool &callback_exists)
+bool scriptapi_item_on_use(lua_State *L, ItemStack &item,
+               ServerActiveObject *user, const PointedThing &pointed)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_craftitem_on_use"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       bool result = false;
-       callback_exists = get_craftitem_callback(L, name, "on_use");
-       if(callback_exists)
-       {
-               // Call function
-               lua_pushstring(L, name);
-               objectref_get_or_create(L, user);
-               pushPointedThing(L, pointed);
-               if(lua_pcall(L, 3, 1, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               result = lua_toboolean(L, -1);
-       }
-       return result;
-}
+       // Push callback function on stack
+       if(!get_item_callback(L, item.name.c_str(), "on_use"))
+               return false;
 
-/*
-       environment
-*/
+       // Call function
+       LuaItemStack::create(L, item);
+       objectref_get_or_create(L, user);
+       push_pointed_thing(L, pointed);
+       if(lua_pcall(L, 3, 1, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       if(!lua_isnil(L, -1))
+               item = read_item(L, -1);
+       return true;
+}
 
-void scriptapi_environment_step(lua_State *L, float dtime)
+bool scriptapi_node_on_punch(lua_State *L, v3s16 pos, MapNode node,
+               ServerActiveObject *puncher)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_environment_step"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get minetest.registered_globalsteps
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_globalsteps");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               lua_pushnumber(L, dtime);
-               if(lua_pcall(L, 1, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
-}
+       INodeDefManager *ndef = get_server(L)->ndef();
 
-void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode,
-               ServerActiveObject *placer)
-{
-       realitycheck(L);
-       assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_environment_on_placenode"<<std::endl;
-       StackUnroller stack_unroller(L);
+       // Push callback function on stack
+       if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_punch"))
+               return false;
 
-       // Get the writable node definition manager from the server
-       IWritableNodeDefManager *ndef =
-                       get_server(L)->getWritableNodeDefManager();
-       
-       // Get minetest.registered_on_placenodes
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_on_placenodes");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               push_v3s16(L, p);
-               pushnode(L, newnode, ndef);
-               objectref_get_or_create(L, placer);
-               if(lua_pcall(L, 3, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
+       // Call function
+       push_v3s16(L, pos);
+       pushnode(L, node, ndef);
+       objectref_get_or_create(L, puncher);
+       if(lua_pcall(L, 3, 0, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       return true;
 }
 
-void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode,
+bool scriptapi_node_on_dig(lua_State *L, v3s16 pos, MapNode node,
                ServerActiveObject *digger)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_environment_on_dignode"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get the writable node definition manager from the server
-       IWritableNodeDefManager *ndef =
-                       get_server(L)->getWritableNodeDefManager();
-       
-       // Get minetest.registered_on_dignodes
-       lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_on_dignodes");
-       luaL_checktype(L, -1, LUA_TTABLE);
-       int table = lua_gettop(L);
-       // Foreach
-       lua_pushnil(L);
-       while(lua_next(L, table) != 0){
-               // key at index -2 and value at index -1
-               luaL_checktype(L, -1, LUA_TFUNCTION);
-               // Call function
-               push_v3s16(L, p);
-               pushnode(L, oldnode, ndef);
-               objectref_get_or_create(L, digger);
-               if(lua_pcall(L, 3, 0, 0))
-                       script_error(L, "error: %s", lua_tostring(L, -1));
-               // value removed, keep key for next iteration
-       }
+       INodeDefManager *ndef = get_server(L)->ndef();
+
+       // Push callback function on stack
+       if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_dig"))
+               return false;
+
+       // Call function
+       push_v3s16(L, pos);
+       pushnode(L, node, ndef);
+       objectref_get_or_create(L, digger);
+       if(lua_pcall(L, 3, 0, 0))
+               script_error(L, "error: %s", lua_tostring(L, -1));
+       return true;
 }
 
-void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node,
-               ServerActiveObject *puncher)
+/*
+       environment
+*/
+
+void scriptapi_environment_step(lua_State *L, float dtime)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       //infostream<<"scriptapi_environment_on_punchnode"<<std::endl;
+       //infostream<<"scriptapi_environment_step"<<std::endl;
        StackUnroller stack_unroller(L);
 
-       // Get the writable node definition manager from the server
-       IWritableNodeDefManager *ndef =
-                       get_server(L)->getWritableNodeDefManager();
-       
-       // Get minetest.registered_on_punchnodes
+       // Get minetest.registered_globalsteps
        lua_getglobal(L, "minetest");
-       lua_getfield(L, -1, "registered_on_punchnodes");
+       lua_getfield(L, -1, "registered_globalsteps");
        luaL_checktype(L, -1, LUA_TTABLE);
        int table = lua_gettop(L);
        // Foreach
@@ -3981,10 +4278,8 @@ 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
-               push_v3s16(L, p);
-               pushnode(L, node, ndef);
-               objectref_get_or_create(L, puncher);
-               if(lua_pcall(L, 3, 0, 0))
+               lua_pushnumber(L, dtime);
+               if(lua_pcall(L, 1, 0, 0))
                        script_error(L, "error: %s", lua_tostring(L, -1));
                // value removed, keep key for next iteration
        }
@@ -4020,12 +4315,11 @@ void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp)
        luaentity
 */
 
-bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
-               const std::string &staticdata)
+bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
+       verbosestream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
                        <<name<<"\""<<std::endl;
        StackUnroller stack_unroller(L);
        
@@ -4068,6 +4362,21 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
        lua_pushvalue(L, object); // Copy object to top of stack
        lua_settable(L, -3);
        
+       return true;
+}
+
+void scriptapi_luaentity_activate(lua_State *L, u16 id,
+               const std::string &staticdata)
+{
+       realitycheck(L);
+       assert(lua_checkstack(L, 20));
+       verbosestream<<"scriptapi_luaentity_activate: id="<<id<<std::endl;
+       StackUnroller stack_unroller(L);
+       
+       // Get minetest.luaentities[id]
+       luaentity_get(L, id);
+       int object = lua_gettop(L);
+       
        // Get on_activate function
        lua_pushvalue(L, object);
        lua_getfield(L, -1, "on_activate");
@@ -4077,18 +4386,16 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name,
                lua_pushlstring(L, staticdata.c_str(), staticdata.size());
                // Call with 2 arguments, 0 results
                if(lua_pcall(L, 2, 0, 0))
-                       script_error(L, "error running function %s:on_activate: %s\n",
-                                       name, lua_tostring(L, -1));
+                       script_error(L, "error running function on_activate: %s\n",
+                                       lua_tostring(L, -1));
        }
-       
-       return true;
 }
 
 void scriptapi_luaentity_rm(lua_State *L, u16 id)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
+       verbosestream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
 
        // Get minetest.luaentities table
        lua_getglobal(L, "minetest");
@@ -4108,7 +4415,7 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
+       //infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Get minetest.luaentities[id]
@@ -4138,7 +4445,7 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
-       infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
+       //infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
        StackUnroller stack_unroller(L);
 
        // Get minetest.luaentities[id]
@@ -4147,6 +4454,8 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
 
        /* Read stuff */
        
+       prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
+
        getboolfield(L, -1, "physical", prop->physical);
 
        getfloatfield(L, -1, "weight", prop->weight);
@@ -4214,9 +4523,11 @@ void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime)
                script_error(L, "error running function 'on_step': %s\n", lua_tostring(L, -1));
 }
 
-// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch)
+// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch,
+//                       tool_capabilities, direction)
 void scriptapi_luaentity_punch(lua_State *L, u16 id,
-               ServerActiveObject *puncher, float time_from_last_punch)
+               ServerActiveObject *puncher, float time_from_last_punch,
+               const ToolCapabilities *toolcap, v3f dir)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
@@ -4235,8 +4546,10 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id,
        lua_pushvalue(L, object); // self
        objectref_get_or_create(L, puncher); // Clicker reference
        lua_pushnumber(L, time_from_last_punch);
-       // Call with 2 arguments, 0 results
-       if(lua_pcall(L, 3, 0, 0))
+       push_tool_capabilities(L, *toolcap);
+       push_v3f(L, dir);
+       // Call with 5 arguments, 0 results
+       if(lua_pcall(L, 5, 0, 0))
                script_error(L, "error running function 'on_punch': %s\n", lua_tostring(L, -1));
 }