Simplify group checking

This commit is contained in:
jp 2015-12-23 13:42:00 +01:00
parent b1a8732665
commit e7b6e7660d

View File

@ -124,18 +124,18 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, filter)
for k, def in pairs(stack_items) do for k, def in pairs(stack_items) do
craft[#craft+1] = def craft[#craft+1] = def
if def and def:sub(1, 6) == "group:" then if def and def:find("^group:") then
if def == "group:liquid" then if def:find("liquid$") then
def = "default:water_source" def = "default:water_source"
elseif def == "group:vessel" then elseif def:find("vessel$") then
def = "vessels:glass_bottle" def = "vessels:glass_bottle"
elseif def == "group:wool" then elseif def:find("wool$") then
def = "wool:white" def = "wool:white"
elseif def:find("group:dye") then elseif def:find("dye$") then
dye_color = def:match("group:dye,%w+_([%w_]+)") dye_color = def:match(".*_([%w_]+)")
def = "dye:"..dye_color def = "dye:"..dye_color
elseif def:find("group:flower") then elseif def:find("^group:flower") then
flower_color = def:match("group:flower,%w+_([%w_]+)") flower_color = def:match(".*_([%w_]+)")
if flower_color == "red" then if flower_color == "red" then
def = "flowers:rose" def = "flowers:rose"
elseif flower_color == "yellow" then elseif flower_color == "yellow" then
@ -149,11 +149,8 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, filter)
else else
def = "flowers:rose" def = "flowers:rose"
end end
elseif def:match("group:stone") or def:match("group:wood") or else
def:match("group:leaves") or def:match("group:stick") or def = def:gsub("group", "default")
def:match("group:sand") or def:match("group:tree") or
def:match("group:sapling") or def:match("group:book") then
def = "default:"..def:sub(7, def:len())
end end
end end