changes to CraftingGuide

This commit is contained in:
RealBadAngel 2013-04-14 06:12:49 +02:00
parent 895ee322d2
commit 69ae366f60
3 changed files with 54 additions and 144 deletions

View File

@ -1 +0,0 @@

View File

@ -1,29 +0,0 @@
crafts_table ={}
crafts_table_count=0
UI_recipes_hook=true
-- override minetest.register_craft
local minetest_register_craft = minetest.register_craft
minetest.register_craft = function (options)
register_craft(options)
if options.type=="alloy" or options.type=="grinding" then return end
minetest_register_craft(options)
end
-- register_craft
register_craft = function(options)
if options.output == nil then
return
end
local itemstack = ItemStack(options.output)
if itemstack:is_empty() then
return
end
if crafts_table[itemstack:get_name()]==nil then
crafts_table[itemstack:get_name()] = {}
end
table.insert(crafts_table[itemstack:get_name()],options)
crafts_table_count=crafts_table_count+1
end

View File

@ -10,6 +10,8 @@ unified_inventory.filtered_items_list = {}
unified_inventory.activefilter = {} unified_inventory.activefilter = {}
unified_inventory.alternate = {} unified_inventory.alternate = {}
unified_inventory.current_item = {} unified_inventory.current_item = {}
unified_inventory.crafts_table ={}
unified_inventory.crafts_table_count=0
-- default inventory page -- default inventory page
unified_inventory.default = "craft" unified_inventory.default = "craft"
@ -26,8 +28,18 @@ minetest.after(0.01, function()
if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
and def.description and def.description ~= "" then and def.description and def.description ~= "" then
table.insert(unified_inventory.items_list, name) table.insert(unified_inventory.items_list, name)
local recipes=minetest.get_all_craft_recipes(name)
if unified_inventory.crafts_table[name]==nil then
unified_inventory.crafts_table[name] = {}
end
if recipes then
for i=1,#recipes,1 do
table.insert(unified_inventory.crafts_table[name],recipes[i])
end
end
end end
end end
--print(dump(unified_inventory.crafts_table))
table.sort(unified_inventory.items_list) table.sort(unified_inventory.items_list)
unified_inventory.items_list_size = #unified_inventory.items_list unified_inventory.items_list_size = #unified_inventory.items_list
print ("Unified Inventory. inventory size: "..unified_inventory.items_list_size) print ("Unified Inventory. inventory size: "..unified_inventory.items_list_size)
@ -37,7 +49,6 @@ end)
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local player_name = player:get_player_name() local player_name = player:get_player_name()
unified_inventory.players[player_name]={} unified_inventory.players[player_name]={}
unified_inventory.players[player_name]["sound_volume"]=minetest.setting_get("sound_volume")*10
unified_inventory.current_index[player_name] = 1 unified_inventory.current_index[player_name] = 1
unified_inventory.filtered_items_list[player_name] = {} unified_inventory.filtered_items_list[player_name] = {}
unified_inventory.filtered_items_list[player_name] = unified_inventory.items_list unified_inventory.filtered_items_list[player_name] = unified_inventory.items_list
@ -206,9 +217,9 @@ unified_inventory.get_formspec = function(player,page)
formspec = formspec.."label[2,0;"..item_name.."]" formspec = formspec.."label[2,0;"..item_name.."]"
local alternates = 0 local alternates = 0
local alternate = unified_inventory.alternate[player_name] local alternate = unified_inventory.alternate[player_name]
local crafts = crafts_table[item_name] local crafts = unified_inventory.crafts_table[item_name]
if crafts ~= nil then if crafts ~= nil and #crafts>0 then
alternates = #crafts alternates = #crafts
local craft = crafts[alternate] local craft = crafts[alternate]
local method = "Crafting" local method = "Crafting"
@ -440,7 +451,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
if item_name then if item_name then
local alternates = 0 local alternates = 0
local alternate=unified_inventory.alternate[player_name] local alternate=unified_inventory.alternate[player_name]
local crafts = crafts_table[item_name] local crafts = unified_inventory.crafts_table[item_name]
if crafts ~= nil then if crafts ~= nil then
alternates = #crafts alternates = #crafts
end end
@ -537,134 +548,63 @@ end
-- update_recipe -- update_recipe
unified_inventory.update_recipe = function(player, stack_name, alternate) unified_inventory.update_recipe = function(player, stack_name, alternate)
--print("Lookup:"..stack_name)
local inv = minetest.get_inventory({type="detached", name=player:get_player_name().."craftrecipe"}) local inv = minetest.get_inventory({type="detached", name=player:get_player_name().."craftrecipe"})
for i=0,inv:get_size("build"),1 do for i=0,inv:get_size("build"),1 do
inv:set_stack("build", i, nil) inv:set_stack("build", i, nil)
end end
inv:set_stack("cook", 1, nil) inv:set_stack("output", 1, nil)
inv:set_stack("fuel", 1, nil)
inv:set_stack("output", 1, stack_name)
local def
alternate = tonumber(alternate) or 1 alternate = tonumber(alternate) or 1
local crafts = crafts_table[stack_name] local crafts = unified_inventory.crafts_table[stack_name]
if crafts == nil then print(dump(crafts))
--minetest.chat_send_player(player:get_player_name(), "no recipe available for "..stack_name) local next=next
return if next(crafts) == nil then return end -- no craft recipes
end
if alternate < 1 or alternate > #crafts then if alternate < 1 or alternate > #crafts then
alternate = 1 alternate = 1
end end
local craft = crafts[alternate] local craft = crafts[alternate]
--print (dump(craft)) inv:set_stack("output", 1, craft.output)
--minetest.chat_send_player(player:get_player_name(), "recipe for "..stack_name..": "..dump(craft)) local items=craft.items
local itemstack = ItemStack(craft.output)
inv:set_stack("output", 1, itemstack)
-- cook, fuel, grinding recipes -- cook, fuel, grinding recipes
if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" then if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" then
def=unified_inventory.find_item_def(craft.recipe) def=unified_inventory.find_item_def(craft["items"][1])
if def then if def then
inv:set_stack("build", 1, def) inv:set_stack("build", 1, def)
end end
return return
end end
if craft.width==0 then
-- build (shaped or shapeless) local build_table={1,2,3}
if craft.recipe[1] then for i=1,3,1 do
def=unified_inventory.find_item_def(craft.recipe[1]) if craft.items[i] then
if def then def=unified_inventory.find_item_def(craft.items[i])
inv:set_stack("build", 1, def) if def then inv:set_stack("build", build_table[i], {name=def}) end
else
def=unified_inventory.find_item_def(craft.recipe[1][1])
if def then
inv:set_stack("build", 1, def)
end
def=unified_inventory.find_item_def(craft.recipe[1][2])
if def then
inv:set_stack("build", 2, def)
end
def=unified_inventory.find_item_def(craft.recipe[1][3])
if def then
inv:set_stack("build", 3, def)
end
end end
end end
if craft.recipe[2] then end
def=unified_inventory.find_item_def(craft.recipe[2]) if craft.width==1 then
if def then local build_table={1,4,7}
inv:set_stack("build", 2, def) for i=1,3,1 do
else if craft.items[i] then
def=unified_inventory.find_item_def(craft.recipe[2][1]) def=unified_inventory.find_item_def(craft.items[i])
if def then if def then inv:set_stack("build", build_table[i], {name=def}) end
inv:set_stack("build", 4, def) end
end
end
if craft.width==2 then
local build_table={1,2,4,5,7,8}
for i=1,6,1 do
if craft.items[i] then
def=unified_inventory.find_item_def(craft.items[i])
if def then inv:set_stack("build", build_table[i], {name=def}) end
end
end
end
if craft.width==3 then
for i=1,9,1 do
if craft.items[i] then
def=unified_inventory.find_item_def(craft.items[i])
if def then inv:set_stack("build", i, {name=def}) end
end end
def=unified_inventory.find_item_def(craft.recipe[2][2])
if def then
inv:set_stack("build", 5, def)
end
def=unified_inventory.find_item_def(craft.recipe[2][3])
if def then
inv:set_stack("build", 6, def)
end
end
end
if craft.recipe[3] then
def=unified_inventory.find_item_def(craft.recipe[3])
if def then
inv:set_stack("build", 3, def)
else
def=unified_inventory.find_item_def(craft.recipe[3][1])
if def then
inv:set_stack("build", 7, def)
end
def=unified_inventory.find_item_def(craft.recipe[3][2])
if def then
inv:set_stack("build", 8, def)
end
def=unified_inventory.find_item_def(craft.recipe[3][3])
if def then
inv:set_stack("build", 9, def)
end
end
end
if craft.recipe[4] then
def=unified_inventory.find_item_def(craft.recipe[4])
if def then
inv:set_stack("build", 4, def)
end
end
if craft.recipe[5] then
def=unified_inventory.find_item_def(craft.recipe[5])
if def then
inv:set_stack("build", 5, def)
end
end
if craft.recipe[6] then
def=unified_inventory.find_item_def(craft.recipe[6])
if def then
inv:set_stack("build", 6, def)
end
end
if craft.recipe[7] then
def=unified_inventory.find_item_def(craft.recipe[7])
if def then
inv:set_stack("build", 7, def)
end
end
if craft.recipe[8] then
def=unified_inventory.find_item_def(craft.recipe[8])
if def then
inv:set_stack("build", 8, def)
end
end
if craft.recipe[9] then
def=unified_inventory.find_item_def(craft.recipe[9])
if def then
inv:set_stack("build", 9, def)
end end
end end
end end