minetest-mods/craftguide
1
0
Fork 1
mirror of https://github.com/minetest-mods/craftguide.git synced 2024-12-14 02:30:17 +01:00
Code Issues Releases Wiki Activity

Final(?) missing recipes fix

Browse Source
This commit is contained in:
Jean-Patrick Guerrero 2020-07-19 23:51:51 +02:00
parent 1fb7790c4e
commit c30db91662
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
init.lua
View File

@ -7,6 +7,7 @@ local searches = {}
local recipes_cache = {} local recipes_cache = {}
local usages_cache = {} local usages_cache = {}
local fuel_cache = {} local fuel_cache = {}
local replacements = {fuel = {}}
local toolrepair local toolrepair
local progressive_mode = core.settings:get_bool "craftguide_progressive_mode" local progressive_mode = core.settings:get_bool "craftguide_progressive_mode"
@ -572,6 +573,7 @@ local function cache_fuel(item)
type = "fuel", type = "fuel",
items = {item}, items = {item},
burntime = burntime, burntime = burntime,
replacements = replacements.fuel[item],
} }
end end
end end
@ -584,7 +586,6 @@ end
local function get_usages(recipe) local function get_usages(recipe)
local added = {} local added = {}
for _, item in pairs(recipe.items) do for _, item in pairs(recipe.items) do
item = reg_aliases[item] or item item = reg_aliases[item] or item
if not added[item] then if not added[item] then
@ -697,7 +698,24 @@ local function cache_drops(name, drop)
end end
local function cache_recipes(item) local function cache_recipes(item)
recipes_cache[item] = get_all_recipes(item) local recipes = get_all_recipes(item)
local _recipes
if replacements[item] then
_recipes = {}
for k, v in ipairs(recipes or {}) do
_recipes[#recipes + 1 - k] = v
end
for k, v in pairs(replacements[item]) do
if v.type ~= "fuel" then
_recipes[k].replacements = v
end
end
end
recipes_cache[item] = _recipes or recipes
end end
local function get_recipes(item, data, player) local function get_recipes(item, data, player)
@ -1056,7 +1074,13 @@ local function get_grid_fs(lang_code, fs, rcp, spacing)
fs[#fs + 1] = fmt(FMT.image, X, Y, btn_size, btn_size, PNG.selected) fs[#fs + 1] = fmt(FMT.image, X, Y, btn_size, btn_size, PNG.selected)
end end
local btn_name = item ~= "" and item or (groups and groups[1] or "") local btn_name = ""
if groups then
btn_name = groups[1]
elseif item ~= "" then
btn_name = item
end
fs[#fs + 1] = fmt(FMT.item_image_button, fs[#fs + 1] = fmt(FMT.item_image_button,
X, Y, btn_size, btn_size, item, btn_name, label) X, Y, btn_size, btn_size, item, btn_name, label)
@ -1439,6 +1463,7 @@ end)
See engine's issues #4901, #5745 and #8920. ]] See engine's issues #4901, #5745 and #8920. ]]
local old_register_craft = core.register_craft local old_register_craft = core.register_craft
local rcp_num = {}
core.register_craft = function(def) core.register_craft = function(def)
old_register_craft(def) old_register_craft(def)
@ -1460,11 +1485,15 @@ core.register_craft = function(def)
for i = 1, #output do for i = 1, #output do
local name = output[i] local name = output[i]
rcp_num[name] = (rcp_num[name] or 0) + 1
if def.replacements then
if def.type == "fuel" then if def.type == "fuel" then
def.replacements = def.replacements replacements.fuel[name] = def.replacements
def.items = {def.recipe} else
fuel_cache[name] = def replacements[name] = replacements[name] or {}
replacements[name][rcp_num[name]] = def.replacements
end
end end
end end
end end