]> git.lizzy.rs Git - minetest.git/blobdiff - src/scriptapi.cpp
Fix script error reporting a bit
[minetest.git] / src / scriptapi.cpp
index fbdbf4a124df373e2b0030c141b6259436e6c4eb..db6b7e86e22ce27addaa58793eae9ed582c904ee 100644 (file)
@@ -386,6 +386,163 @@ static int getenumfield(lua_State *L, int table,
        return result;
 }
 
+static void setfloatfield(lua_State *L, int table,
+               const char *fieldname, float value)
+{
+       lua_pushnumber(L, value);
+       if(table < 0)
+               table -= 1;
+       lua_setfield(L, table, fieldname);
+}
+
+/*
+       Inventory stuff
+*/
+
+static void inventory_set_list_from_lua(Inventory *inv, const char *name,
+               lua_State *L, int tableindex, IGameDef *gamedef, int forcesize=-1)
+{
+       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 = lua_tostring(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\n", lua_tostring(L, -1));
+       }
+}
+
+/*
+       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
+*/
+
 struct EnumString es_DrawType[] =
 {
        {NDT_NORMAL, "normal"},
@@ -599,19 +756,7 @@ static int l_register_tool(lua_State *L)
        IWritableToolDefManager *tooldef =
                        server->getWritableToolDefManager();
        
-       ToolDefinition def;
-       
-       getstringfield(L, table, "image", def.imagename);
-       getfloatfield(L, table, "basetime", def.properties.basetime);
-       getfloatfield(L, table, "dt_weight", def.properties.dt_weight);
-       getfloatfield(L, table, "dt_crackiness", def.properties.dt_crackiness);
-       getfloatfield(L, table, "dt_crumbliness", def.properties.dt_crumbliness);
-       getfloatfield(L, table, "dt_cuttability", def.properties.dt_cuttability);
-       getfloatfield(L, table, "basedurability", def.properties.basedurability);
-       getfloatfield(L, table, "dd_weight", def.properties.dd_weight);
-       getfloatfield(L, table, "dd_crackiness", def.properties.dd_crackiness);
-       getfloatfield(L, table, "dd_crumbliness", def.properties.dd_crumbliness);
-       getfloatfield(L, table, "dd_cuttability", def.properties.dd_cuttability);
+       ToolDefinition def = read_tool_definition(L, table);
 
        tooldef->registerTool(name, def);
        return 0; /* number of results */
@@ -956,7 +1101,10 @@ static int l_register_craft(lua_State *L)
                                width = colcount;
                        } else {
                                if(colcount != width){
-                                       script_error(L, "error: %s\n", "Invalid crafting recipe");
+                                       std::string error;
+                                       error += "Invalid crafting recipe (output=\""
+                                                       + output + "\")";
+                                       throw LuaError(error);
                                }
                        }
                        // removes value, keeps key for next iteration
@@ -1252,41 +1400,9 @@ class NodeMetaRef
                if(meta == NULL) return 0;
                // Do it
                Inventory *inv = meta->getInventory();
-               std::string name = lua_tostring(L, 2);
-               // If nil, delete list
-               if(lua_isnil(L, 3)){
-                       inv->deleteList(name);
-                       return 0;
-               }
-               // Otherwise set list
-               std::list<std::string> items;
-               luaL_checktype(L, 3, LUA_TTABLE);
-               int table = 3;
-               lua_pushnil(L);
-               infostream<<"items: ";
-               while(lua_next(L, table) != 0){
-                       // key at index -2 and value at index -1
-                       luaL_checktype(L, -1, LUA_TSTRING);
-                       std::string itemstring = lua_tostring(L, -1);
-                       infostream<<"\""<<itemstring<<"\" ";
-                       items.push_back(itemstring);
-                       // removes value, keeps key for next iteration
-                       lua_pop(L, 1);
-               }
-               infostream<<std::endl;
-               InventoryList *invlist = inv->addList(name, items.size());
-               int index = 0;
-               for(std::list<std::string>::const_iterator
-                               i = items.begin(); i != items.end(); i++){
-                       const std::string &itemstring = *i;
-                       InventoryItem *newitem = NULL;
-                       if(itemstring != "")
-                               newitem = InventoryItem::deSerialize(itemstring,
-                                               ref->m_env->getGameDef());
-                       InventoryItem *olditem = invlist->changeItem(index, newitem);
-                       delete olditem;
-                       index++;
-               }
+               const char *name = lua_tostring(L, 2);
+               inventory_set_list_from_lua(inv, name, L, 3,
+                               ref->m_env->getGameDef());
                reportMetadataChange(ref);
                return 0;
        }
@@ -1299,31 +1415,8 @@ class NodeMetaRef
                if(meta == NULL) return 0;
                // Do it
                Inventory *inv = meta->getInventory();
-               std::string name = lua_tostring(L, 2);
-               InventoryList *invlist = inv->getList(name);
-               if(invlist == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               // 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_pushnil(L);
-                       } else {
-                               lua_pushstring(L, item->getItemString().c_str());
-                       }
-                       if(lua_pcall(L, 2, 0, 0))
-                               script_error(L, "error: %s\n", lua_tostring(L, -1));
-               }
+               const char *name = lua_tostring(L, 2);
+               inventory_get_list_to_lua(inv, name, L);
                return 1;
        }
 
@@ -1642,65 +1735,44 @@ class ObjectRef
                return 0;
        }
 
-       // get_wielded_itemstring(self)
-       static int l_get_wielded_itemstring(lua_State *L)
+       // punch(self, puncher); puncher = an another ObjectRef
+       static int l_punch(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
+               ObjectRef *ref2 = checkobject(L, 2);
                ServerActiveObject *co = getobject(ref);
+               ServerActiveObject *co2 = getobject(ref2);
                if(co == NULL) return 0;
+               if(co2 == NULL) return 0;
                // Do it
-               InventoryItem *item = co->getWieldedItem();
-               if(item == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               lua_pushstring(L, item->getItemString().c_str());
-               return 1;
+               co->punch(co2);
+               return 0;
        }
 
-       // get_wielded_item(self)
-       static int l_get_wielded_item(lua_State *L)
+       // right_click(self, clicker); clicker = an another ObjectRef
+       static int l_right_click(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
+               ObjectRef *ref2 = checkobject(L, 2);
                ServerActiveObject *co = getobject(ref);
+               ServerActiveObject *co2 = getobject(ref2);
                if(co == NULL) return 0;
+               if(co2 == NULL) return 0;
                // Do it
-               InventoryItem *item0 = co->getWieldedItem();
-               if(item0 == NULL){
-                       lua_pushnil(L);
-                       return 1;
-               }
-               if(std::string("MaterialItem") == item0->getName()){
-                       MaterialItem *item = (MaterialItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "NodeItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getNodeName().c_str());
-                       lua_setfield(L, -2, "name");
-               }
-               else if(std::string("CraftItem") == item0->getName()){
-                       CraftItem *item = (CraftItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "CraftItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getSubName().c_str());
-                       lua_setfield(L, -2, "name");
-               }
-               else if(std::string("ToolItem") == item0->getName()){
-                       ToolItem *item = (ToolItem*)item0;
-                       lua_newtable(L);
-                       lua_pushstring(L, "ToolItem");
-                       lua_setfield(L, -2, "type");
-                       lua_pushstring(L, item->getToolName().c_str());
-                       lua_setfield(L, -2, "name");
-                       lua_pushstring(L, itos(item->getWear()).c_str());
-                       lua_setfield(L, -2, "wear");
-               }
-               else{
-                       errorstream<<"l_get_wielded_item: Unknown item name: \""
-                                       <<item0->getName()<<"\""<<std::endl;
-                       lua_pushnil(L);
-               }
+               co->rightClick(co2);
+               return 0;
+       }
+
+       // get_wield_digging_properties(self)
+       static int l_get_wield_digging_properties(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerActiveObject *co = getobject(ref);
+               if(co == NULL) return 0;
+               // Do it
+               ToolDiggingProperties prop;
+               co->getWieldDiggingProperties(&prop);
+               push_tool_digging_properties(L, prop);
                return 1;
        }
 
@@ -1741,7 +1813,7 @@ class ObjectRef
                        // Return
                        lua_pushboolean(L, added);
                        if(!added)
-                               lua_pushstring(L, "does not fit");
+                               lua_pushstring(L, "failed to add item");
                        return 2;
                } catch(SerializationError &e){
                        // Return
@@ -1885,7 +1957,111 @@ class ObjectRef
                co->setSprite(p, num_frames, framelength, select_horiz_by_yawpitch);
                return 0;
        }
+
+       /* Player-only */
        
+       // get_player_name(self)
+       static int l_get_player_name(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL){
+                       lua_pushnil(L);
+                       return 1;
+               }
+               // Do it
+               lua_pushstring(L, player->getName());
+               return 1;
+       }
+       
+       // inventory_set_list(self, name, {item1, item2, ...})
+       static int l_inventory_set_list(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               const char *name = lua_tostring(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;
+       }
+
+       // inventory_get_list(self, name)
+       static int l_inventory_get_list(lua_State *L)
+       {
+               ObjectRef *ref = checkobject(L, 1);
+               ServerRemotePlayer *player = getplayer(ref);
+               if(player == NULL) return 0;
+               const char *name = lua_tostring(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();
+               if(item0 == NULL){
+                       lua_pushnil(L);
+                       return 1;
+               }
+               if(std::string("MaterialItem") == item0->getName()){
+                       MaterialItem *item = (MaterialItem*)item0;
+                       lua_newtable(L);
+                       lua_pushstring(L, "NodeItem");
+                       lua_setfield(L, -2, "type");
+                       lua_pushstring(L, item->getNodeName().c_str());
+                       lua_setfield(L, -2, "name");
+               }
+               else if(std::string("CraftItem") == item0->getName()){
+                       CraftItem *item = (CraftItem*)item0;
+                       lua_newtable(L);
+                       lua_pushstring(L, "CraftItem");
+                       lua_setfield(L, -2, "type");
+                       lua_pushstring(L, item->getSubName().c_str());
+                       lua_setfield(L, -2, "name");
+               }
+               else if(std::string("ToolItem") == item0->getName()){
+                       ToolItem *item = (ToolItem*)item0;
+                       lua_newtable(L);
+                       lua_pushstring(L, "ToolItem");
+                       lua_setfield(L, -2, "type");
+                       lua_pushstring(L, item->getToolName().c_str());
+                       lua_setfield(L, -2, "name");
+                       lua_pushstring(L, itos(item->getWear()).c_str());
+                       lua_setfield(L, -2, "wear");
+               }
+               else{
+                       errorstream<<"l_get_wielded_item: Unknown item name: \""
+                                       <<item0->getName()<<"\""<<std::endl;
+                       lua_pushnil(L);
+               }
+               return 1;
+       }
+
 public:
        ObjectRef(ServerActiveObject *object):
                m_object(object)
@@ -1954,8 +2130,9 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, getpos),
        method(ObjectRef, setpos),
        method(ObjectRef, moveto),
-       method(ObjectRef, get_wielded_itemstring),
-       method(ObjectRef, get_wielded_item),
+       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),
@@ -1967,6 +2144,12 @@ const luaL_reg ObjectRef::methods[] = {
        method(ObjectRef, getacceleration),
        method(ObjectRef, settexturemod),
        method(ObjectRef, setsprite),
+       // Player-only
+       method(ObjectRef, get_player_name),
+       method(ObjectRef, inventory_set_list),
+       method(ObjectRef, inventory_get_list),
+       method(ObjectRef, get_wielded_itemstring),
+       method(ObjectRef, get_wielded_item),
        {0,0}
 };
 
@@ -2289,6 +2472,21 @@ void scriptapi_export(lua_State *L, Server *server)
        ObjectRef::Register(L);
 }
 
+bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
+               const std::string &modname)
+{
+       bool success = false;
+
+       try{
+               success = script_load(L, scriptpath.c_str());
+       }
+       catch(LuaError &e){
+               errorstream<<"Error loading mod: "<<e.what()<<std::endl;
+       }
+
+       return success;
+}
+
 void scriptapi_add_environment(lua_State *L, ServerEnvironment *env)
 {
        realitycheck(L);
@@ -2515,6 +2713,15 @@ bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player)
        return positioning_handled_by_some;
 }
 
+void scriptapi_get_creative_inventory(lua_State *L, ServerRemotePlayer *player)
+{
+       lua_getglobal(L, "minetest");
+       lua_getfield(L, -1, "creative_inventory");
+       luaL_checktype(L, -1, LUA_TTABLE);
+       inventory_set_list_from_lua(&player->inventory, "main", L, -1,
+                       player->getEnv()->getGameDef(), PLAYER_INVENTORY_SIZE);
+}
+
 /*
        craftitem
 */
@@ -3030,9 +3237,9 @@ 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)
+// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch)
 void scriptapi_luaentity_punch(lua_State *L, u16 id,
-               ServerActiveObject *puncher)
+               ServerActiveObject *puncher, float time_from_last_punch)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
@@ -3050,8 +3257,9 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id,
        luaL_checktype(L, -1, LUA_TFUNCTION);
        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, 2, 0, 0))
+       if(lua_pcall(L, 3, 0, 0))
                script_error(L, "error running function 'on_punch': %s\n", lua_tostring(L, -1));
 }