Support packing arbitrary graphs (#12289)

[minetest.git] / src / script / lua_api / l_craft.cpp

diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp
index 7bf1d314b543c2e476008e2d301d1deaf2452d30..137b210be2a8c13876ef5715b8ed4a06cdaa1f84 100644 (file)
--- a/src/script/lua_api/l_craft.cpp
+++ b/src/script/lua_api/l_craft.cpp
@@ -57,7 +57,7 @@ bool ModApiCraft::readCraftRecipeShaped(lua_State *L, int index,
                        // key at index -2 and value at index -1
                        if(!lua_isstring(L, -1))
                                return false;
-                       recipe.emplace_back(lua_tostring(L, -1));
+                       recipe.emplace_back(readParam<std::string>(L, -1));
                        // removes value, keeps key for next iteration
                        lua_pop(L, 1);
                        colcount++;
@@ -90,7 +90,7 @@ bool ModApiCraft::readCraftRecipeShapeless(lua_State *L, int index,
                // key at index -2 and value at index -1
                if(!lua_isstring(L, -1))
                        return false;
-               recipe.emplace_back(lua_tostring(L, -1));
+               recipe.emplace_back(readParam<std::string>(L, -1));
                // removes value, keeps key for next iteration
                lua_pop(L, 1);
        }
@@ -115,12 +115,12 @@ bool ModApiCraft::readCraftReplacements(lua_State *L, int index,
                lua_rawgeti(L, -1, 1);
                if(!lua_isstring(L, -1))
                        return false;
-               std::string replace_from = lua_tostring(L, -1);
+               std::string replace_from = readParam<std::string>(L, -1);
                lua_pop(L, 1);
                lua_rawgeti(L, -1, 2);
                if(!lua_isstring(L, -1))
                        return false;
-               std::string replace_to = lua_tostring(L, -1);
+               std::string replace_to = readParam<std::string>(L, -1);
                lua_pop(L, 1);
                replacements.pairs.emplace_back(replace_from, replace_to);
                // removes value, keeps key for next iteration
@@ -294,11 +294,14 @@ int ModApiCraft::l_clear_craft(lua_State *L)
        std::string type = getstringfield_default(L, table, "type", "shaped");
        CraftOutput c_output(output, 0);
        if (!output.empty()) {
-               if (craftdef->clearCraftRecipesByOutput(c_output, getServer(L)))
-                       return 0;
+               if (craftdef->clearCraftsByOutput(c_output, getServer(L))) {
+                       lua_pushboolean(L, true);
+                       return 1;
+               }
 
-               throw LuaError("No craft recipe known for output"
-                               " (output=\"" + output + "\")");
+               warningstream << "No craft recipe known for output" << std::endl;
+               lua_pushboolean(L, false);
+               return 1;
        }
        std::vector<std::string> recipe;
        int width = 0;
@@ -347,18 +350,30 @@ int ModApiCraft::l_clear_craft(lua_State *L)
        } else {
                throw LuaError("Unknown crafting definition type: \"" + type + "\"");
        }
-       if (!craftdef->clearCraftRecipesByInput(method, width, recipe, getServer(L)))
-               throw LuaError("No crafting specified for input");
-       lua_pop(L, 1);
-       return 0;
+
+       std::vector<ItemStack> items;
+       items.reserve(recipe.size());
+       for (const auto &item : recipe)
+               items.emplace_back(item, 1, 0, getServer(L)->idef());
+       CraftInput input(method, width, items);
+
+       if (!craftdef->clearCraftsByInput(input, getServer(L))) {
+               warningstream << "No craft recipe matches input" << std::endl;
+               lua_pushboolean(L, false);
+               return 1;
+       }
+
+       lua_pushboolean(L, true);
+       return 1;
 }
 
 // get_craft_result(input)
 int ModApiCraft::l_get_craft_result(lua_State *L)
 {
        NO_MAP_LOCK_REQUIRED;
+       IGameDef *gdef = getGameDef(L);
 
-       int input_i = 1;
+       const int input_i = 1;
        std::string method_s = getstringfield_default(L, input_i, "method", "normal");
        enum CraftMethod method = (CraftMethod)getenumfield(L, input_i, "method",
                                es_CraftMethod, CRAFT_METHOD_NORMAL);
@@ -368,10 +383,9 @@ int ModApiCraft::l_get_craft_result(lua_State *L)
                width = luaL_checkinteger(L, -1);
        lua_pop(L, 1);
        lua_getfield(L, input_i, "items");
-       std::vector<ItemStack> items = read_items(L, -1,getServer(L));
+       std::vector<ItemStack> items = read_items(L, -1, gdef);
        lua_pop(L, 1); // items
 
-       IGameDef *gdef = getServer(L);
        ICraftDefManager *cdef = gdef->cdef();
        CraftInput input(method, width, items);
        CraftOutput output;
@@ -451,13 +465,13 @@ static void push_craft_recipes(lua_State *L, IGameDef *gdef,
                const std::vector<CraftDefinition*> &recipes,
                const CraftOutput &output)
 {
-       lua_createtable(L, recipes.size(), 0);
-
        if (recipes.empty()) {
                lua_pushnil(L);
                return;
        }
 
+       lua_createtable(L, recipes.size(), 0);
+
        std::vector<CraftDefinition*>::const_iterator it = recipes.begin();
        for (unsigned i = 0; it != recipes.end(); ++it) {
                lua_newtable(L);
@@ -473,10 +487,9 @@ int ModApiCraft::l_get_craft_recipe(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
 
        std::string item = luaL_checkstring(L, 1);
-       Server *server = getServer(L);
+       IGameDef *gdef = getGameDef(L);
        CraftOutput output(item, 0);
-       std::vector<CraftDefinition*> recipes = server->cdef()
-                       ->getCraftRecipes(output, server, 1);
+       auto recipes = gdef->cdef()->getCraftRecipes(output, gdef, 1);
 
        lua_createtable(L, 1, 0);
 
@@ -486,7 +499,7 @@ int ModApiCraft::l_get_craft_recipe(lua_State *L)
                setintfield(L, -1, "width", 0);
                return 1;
        }
-       push_craft_recipe(L, server, recipes[0], output);
+       push_craft_recipe(L, gdef, recipes[0], output);
        return 1;
 }
 
@@ -496,12 +509,11 @@ int ModApiCraft::l_get_all_craft_recipes(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
 
        std::string item = luaL_checkstring(L, 1);
-       Server *server = getServer(L);
+       IGameDef *gdef = getGameDef(L);
        CraftOutput output(item, 0);
-       std::vector<CraftDefinition*> recipes = server->cdef()
-                       ->getCraftRecipes(output, server);
+       auto recipes = gdef->cdef()->getCraftRecipes(output, gdef);
 
-       push_craft_recipes(L, server, recipes, output);
+       push_craft_recipes(L, gdef, recipes, output);
        return 1;
 }
 
@@ -513,3 +525,11 @@ void ModApiCraft::Initialize(lua_State *L, int top)
        API_FCT(register_craft);
        API_FCT(clear_craft);
 }
+
+void ModApiCraft::InitializeAsync(lua_State *L, int top)
+{
+       // all read-only functions
+       API_FCT(get_all_craft_recipes);
+       API_FCT(get_craft_recipe);
+       API_FCT(get_craft_result);
+}