Minor fix
This commit is contained in:
parent
b6b97aa284
commit
d55994c535
|
@ -408,6 +408,11 @@ local function get_stack(player, stack)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function get_group_items(name)
|
||||||
|
local groups = extract_groups(name)
|
||||||
|
return i3.groups[name:sub(7)].items or groups_to_items(groups)
|
||||||
|
end
|
||||||
|
|
||||||
local function craft_stack(player, data, craft_rcp)
|
local function craft_stack(player, data, craft_rcp)
|
||||||
local inv = player:get_inventory()
|
local inv = player:get_inventory()
|
||||||
local rcp_usg = craft_rcp and "recipe" or "usage"
|
local rcp_usg = craft_rcp and "recipe" or "usage"
|
||||||
|
@ -422,9 +427,7 @@ local function craft_stack(player, data, craft_rcp)
|
||||||
|
|
||||||
if is_group(name) then
|
if is_group(name) then
|
||||||
items = {}
|
items = {}
|
||||||
local groups = extract_groups(name)
|
local item_groups = get_group_items(name)
|
||||||
local groupname = name:sub(7)
|
|
||||||
local item_groups = i3.groups[groupname].items or groups_to_items(groups)
|
|
||||||
local remaining = count
|
local remaining = count
|
||||||
|
|
||||||
for _, item in ipairs(item_groups) do
|
for _, item in ipairs(item_groups) do
|
||||||
|
@ -448,9 +451,7 @@ local function craft_stack(player, data, craft_rcp)
|
||||||
local old_name, new_name = unpack(pair)
|
local old_name, new_name = unpack(pair)
|
||||||
|
|
||||||
if is_group(old_name) then
|
if is_group(old_name) then
|
||||||
local groups = extract_groups(old_name)
|
local item_groups = get_group_items(old_name)
|
||||||
local groupname = old_name:sub(7)
|
|
||||||
local item_groups = i3.groups[groupname].items or groups_to_items(groups)
|
|
||||||
|
|
||||||
for _, it in ipairs(item_groups) do
|
for _, it in ipairs(item_groups) do
|
||||||
if item == it then
|
if item == it then
|
||||||
|
|
|
@ -1061,12 +1061,17 @@ local function get_grid_fs(fs, data, rcp, is_recipe, is_usage)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not added then
|
if not added then
|
||||||
label = fmt("%s%s\nR", label ~= "" and "\n" or "", label)
|
label = fmt("%s\nR", label)
|
||||||
insert(replace.items, replacement[2])
|
insert(replace.items, replacement[2])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local _, count_sub = label:gsub("\n", "")
|
||||||
|
if count_sub == 2 then
|
||||||
|
label = label:sub(2)
|
||||||
|
end
|
||||||
|
|
||||||
if not large_recipe then
|
if not large_recipe then
|
||||||
slot(X, Y, btn_size, btn_size)
|
slot(X, Y, btn_size, btn_size)
|
||||||
end
|
end
|
||||||
|
|
Ŝarĝante…
Reference in New Issue