From 43e308a815aff3417d7e4c93c774a52a94af500b Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Tue, 11 Dec 2012 00:48:23 +0100 Subject: New version: another structure, its a modpack now searches are not case sensitive --- bags.lua | 89 --- depends.txt | 1 - init.lua | 389 ------------- textures/bags_large.png | Bin 572 -> 0 bytes textures/bags_medium.png | Bin 797 -> 0 bytes textures/bags_small.png | Bin 572 -> 0 bytes unified_inventory/aaa_recipeshook/depends.txt | 1 + unified_inventory/aaa_recipeshook/init.lua | 27 + unified_inventory/modpack.txt | 1 + unified_inventory/unified_inventory/api.lua | 626 +++++++++++++++++++++ unified_inventory/unified_inventory/bags.lua | 89 +++ unified_inventory/unified_inventory/depends.txt | 1 + unified_inventory/unified_inventory/init.lua | 4 + .../unified_inventory/textures/bags_large.png | Bin 0 -> 572 bytes .../unified_inventory/textures/bags_medium.png | Bin 0 -> 797 bytes .../unified_inventory/textures/bags_small.png | Bin 0 -> 572 bytes 16 files changed, 749 insertions(+), 479 deletions(-) delete mode 100644 bags.lua delete mode 100644 depends.txt delete mode 100644 init.lua delete mode 100644 textures/bags_large.png delete mode 100644 textures/bags_medium.png delete mode 100644 textures/bags_small.png create mode 100644 unified_inventory/aaa_recipeshook/depends.txt create mode 100644 unified_inventory/aaa_recipeshook/init.lua create mode 100644 unified_inventory/modpack.txt create mode 100644 unified_inventory/unified_inventory/api.lua create mode 100644 unified_inventory/unified_inventory/bags.lua create mode 100644 unified_inventory/unified_inventory/depends.txt create mode 100644 unified_inventory/unified_inventory/init.lua create mode 100644 unified_inventory/unified_inventory/textures/bags_large.png create mode 100644 unified_inventory/unified_inventory/textures/bags_medium.png create mode 100644 unified_inventory/unified_inventory/textures/bags_small.png diff --git a/bags.lua b/bags.lua deleted file mode 100644 index b0ec4b8..0000000 --- a/bags.lua +++ /dev/null @@ -1,89 +0,0 @@ ---[[ - -Bags for Minetest - -Copyright (c) 2012 cornernote, Brett O'Donnell -Source Code: https://github.com/cornernote/minetest-particles -License: GPLv3 - -]]-- - --- register_on_joinplayer -minetest.register_on_joinplayer(function(player) - local player_inv = player:get_inventory() - local bags_inv = minetest.create_detached_inventory(player:get_player_name().."_bags",{ - on_put = function(inv, listname, index, stack, player) - player:get_inventory():set_stack(listname, index, stack) - player:get_inventory():set_size(listname.."contents", stack:get_definition().groups.bagslots) - end, - on_take = function(inv, listname, index, stack, player) - player:get_inventory():set_stack(listname, index, nil) - end, - allow_put = function(inv, listname, index, stack, player) - if stack:get_definition().groups.bagslots then - return 1 - else - return 0 - end - end, - allow_take = function(inv, listname, index, stack, player) - if player:get_inventory():is_empty(listname.."contents")==true then - return stack:get_count() - else - return 0 - end - end, - allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) - return 0 - end, - }) - for i=1,4 do - local bag = "bag"..i - player_inv:set_size(bag, 1) - bags_inv:set_size(bag, 1) - bags_inv:set_stack(bag,1,player_inv:get_stack(bag,1)) - end -end) - --- register bag tools -minetest.register_tool("unified_inventory:bag_small", { - description = "Small Bag", - inventory_image = "bags_small.png", - groups = {bagslots=8}, -}) -minetest.register_tool("unified_inventory:bag_medium", { - description = "Medium Bag", - inventory_image = "bags_medium.png", - groups = {bagslots=16}, -}) -minetest.register_tool("unified_inventory:bag_large", { - description = "Large Bag", - inventory_image = "bags_large.png", - groups = {bagslots=24}, -}) - --- register bag crafts -minetest.register_craft({ - output = "unified_inventory:bag_small", - recipe = { - {"", "default:stick", ""}, - {"default:wood", "default:wood", "default:wood"}, - {"default:wood", "default:wood", "default:wood"}, - }, -}) -minetest.register_craft({ - output = "unified_inventory:bag_medium", - recipe = { - {"", "default:stick", ""}, - {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, - {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, - }, -}) -minetest.register_craft({ - output = "unified_inventory:bag_large", - recipe = { - {"", "default:stick", ""}, - {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, - {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, - }, -}) diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 562cf63..0000000 --- a/depends.txt +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/init.lua b/init.lua deleted file mode 100644 index ec96e89..0000000 --- a/init.lua +++ /dev/null @@ -1,389 +0,0 @@ ---loading modules -modpath=minetest.get_modpath("unified_inventory") -dofile(modpath.."/bags.lua") - --- expose api -unified_inventory = {} --- define buttons -unified_inventory.buttons = {} -unified_inventory.control_buttons = {} -unified_inventory.players = {} -unified_inventory.current_page = {} -unified_inventory.current_index = {} -unified_inventory.items_list_size = 0 -unified_inventory.items_list = {} -unified_inventory.filtered_items_list_size = {} -unified_inventory.filtered_items_list = {} -unified_inventory.activefilter = {} - --- default inventory page -unified_inventory.default = "craft" - - -local home_gui = {} -local homepos = {} -unified_inventory.home_filename = minetest.get_worldpath()..'/unified_inventory_home' - --- Create detached creative inventory after loading all mods -minetest.after(0.01, function() - unified_inventory.items_list = {} - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) - and def.description and def.description ~= "" then - table.insert(unified_inventory.items_list, name) - end - end - table.sort(unified_inventory.items_list) - unified_inventory.items_list_size = #unified_inventory.items_list - print ("Unified Inventory. inventory size: "..unified_inventory.items_list_size) -end) - --- register_on_joinplayer -minetest.register_on_joinplayer(function(player) - local player_name = player:get_player_name() - table.insert(unified_inventory.players, player_name) - unified_inventory.current_index[player_name] = 1 - unified_inventory.filtered_items_list[player_name] = {} - unified_inventory.filtered_items_list[player_name] = unified_inventory.items_list - unified_inventory.filtered_items_list_size[player_name]=unified_inventory.items_list_size - unified_inventory.activefilter[player_name]="" - unified_inventory.apply_filter(player_name, "") - unified_inventory.set_inventory_formspec(player,unified_inventory.get_formspec(player, unified_inventory.default)) -end) - --- set_inventory_formspec -unified_inventory.set_inventory_formspec = function(player,formspec) - if player then - if minetest.setting_getbool("creative_mode") then - -- if creative mode is on then wait a bit - minetest.after(0.01,function() - player:set_inventory_formspec(formspec) - end) - else - player:set_inventory_formspec(formspec) - end - end -end - --- get_formspec -unified_inventory.get_formspec = function(player,page) - if player==nil then return "" end - local player_name = player:get_player_name() - unified_inventory.current_page[player_name]=page - - local formspec = "size[14,10]" - - -- player inventory - formspec = formspec .. "list[current_player;main;0,4.5;8,4;]" - - -- main buttons - formspec = formspec .. "button[0,9;1.8,.5;craft;Craft]" - formspec = formspec .. "button[1.6,9;1.8,.5;craftguide;Craft Guide]" - formspec = formspec .. "button[3.2,9;1.8,.5;bags;Bags]" - formspec = formspec .. "button[4.8,9;1.8,.5;misc;Misc.]" - - --controls to flip items pages - local start_x=9.2 - formspec = formspec .. "button["..(start_x+.6*0)..",9;.8,.5;start_list;|<]" - formspec = formspec .. "button["..(start_x+.6*1)..",9;.8,.5;rewind3;<<]" - formspec = formspec .. "button["..(start_x+.6*2)..",9;.8,.5;rewind1;<]" - formspec = formspec .. "button["..(start_x+.6*3)..",9;.8,.5;forward1;>]" - formspec = formspec .. "button["..(start_x+.6*4)..",9;.8,.5;forward3;>>]" - formspec = formspec .. "button["..(start_x+.6*5)..",9;.8,.5;end_list;>|]" - - -- search box - formspec = formspec .. "field[9.195,8.325;3,1;searchbox;;]" - formspec = formspec .. "button[12,8;1.2,1;searchbutton;Search]" - - if page=="main" then - return formspec - end - - -- craft page - if page=="craft" then - formspec = formspec.."label[0,0;Crafting]" - formspec = formspec.."list[current_player;craftpreview;5.25,2;1,1;]" - formspec = formspec.."list[current_player;craft;1.75,1;3,3;]" - if minetest.setting_getbool("creative_mode") then - formspec = formspec.."label[0,2.5;Refill:]" - formspec = formspec.."list[detached:refill;main;0,3;1,1;]" - formspec = formspec.."label[7,2.5;Trash:]" - formspec = formspec.."list[detached:trash;main;7,3;1,1;]" - end - end - - -- craft guide page - if page=="craftguide" then - formspec = formspec.."label[0,0;Crafting Guide]" - end - - -- bags - if page=="bags" then - formspec = formspec.."label[0,0;Bags]" - formspec=formspec.."button[0,2;2,0.5;bag1;Bag 1]" - formspec=formspec.."button[2,2;2,0.5;bag2;Bag 2]" - formspec=formspec.."button[4,2;2,0.5;bag3;Bag 3]" - formspec=formspec.."button[6,2;2,0.5;bag4;Bag 4]" - formspec=formspec.."list[detached:"..player:get_player_name().."_bags;bag1;0.5,1;1,1;]" - formspec=formspec.."list[detached:"..player:get_player_name().."_bags;bag2;2.5,1;1,1;]" - formspec=formspec.."list[detached:"..player:get_player_name().."_bags;bag3;4.5,1;1,1;]" - formspec=formspec.."list[detached:"..player:get_player_name().."_bags;bag4;6.5,1;1,1;]" - end - - for i=1,4 do - if page=="bag"..i then - local image = player:get_inventory():get_stack("bag"..i, 1):get_definition().inventory_image - formspec=formspec.."image[7,0;1,1;"..image.."]" - formspec=formspec.."list[current_player;bag"..i.."contents;0,1;8,3;]" - end - end - - -- Miscellaneous - if page=="misc" then - formspec = formspec.."label[0,0;Miscellaneous]" - formspec=formspec.."button[0,1;2,0.5;home_gui_set;Set Home]" - formspec=formspec.."button_exit[2,1;2,0.5;home_gui_go;Go Home]" - local home = homepos[player:get_player_name()] - if home ~= nil then - formspec = formspec - formspec=formspec.."label[4,.9;Home set to:]" - formspec=formspec.."label[5.7,.9;("..math.floor(home.x)..","..math.floor(home.y)..","..math.floor(home.z)..")]" - end - if minetest.setting_getbool("creative_mode") then - formspec=formspec.."button[0,2;2,0.5;misc_set_day;Set Day]" - formspec=formspec.."button[2,2;2,0.5;misc_set_night;Set Night]" - end - end - - --Items list - local list_index=unified_inventory.current_index[player_name] - local page=math.floor(list_index / (80) + 1) - local pagemax = math.floor((unified_inventory.filtered_items_list_size[player_name]-1) / (80) + 1) - local image - local item={} - for y=0,9,1 do - for x=0,7,1 do - name=unified_inventory.filtered_items_list[player_name][list_index] - if minetest.registered_items[name] then - formspec=formspec.."item_image_button["..(8.2+x*.7)..","..(1+y*.7)..";.81,.81;"..name..";item_button"..list_index..";]" - list_index=list_index+1 - end - end - end - formspec=formspec.."label[8.2,0;Page:]" - formspec=formspec.."label[9,0;"..page.."/"..pagemax.."]" - formspec=formspec.."label[8.2,0.4;Filter:]" - formspec=formspec.."label[9,0.4;"..unified_inventory.activefilter[player_name].."]" - return formspec -end - --- trash slot -unified_inventory.trash = minetest.create_detached_inventory("trash", { - allow_put = function(inv, listname, index, stack, player) - if minetest.setting_getbool("creative_mode") then - return stack:get_count() - else - return 0 - end - end, - on_put = function(inv, listname, index, stack, player) - inv:set_stack(listname, index, nil) - end, -}) -unified_inventory.trash:set_size("main", 1) - --- refill slot -unified_inventory.refill = minetest.create_detached_inventory("refill", { - allow_put = function(inv, listname, index, stack, player) - if minetest.setting_getbool("creative_mode") then - return stack:get_count() - else - return 0 - end - end, - on_put = function(inv, listname, index, stack, player) - inv:set_stack(listname, index, ItemStack(stack:get_name().." "..stack:get_stack_max())) - end, -}) -unified_inventory.refill:set_size("main", 1) - --- register_on_player_receive_fields -minetest.register_on_player_receive_fields(function(player, formname, fields) - local player_name = player:get_player_name() - - -- main - if fields.craft then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) - return - end - - if fields.craftguide then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) - return - end - - if fields.bags then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"bags")) - return - end - - if fields.misc then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"misc")) - return - end - - -- bags - for i=1,4 do - local page = "bag"..i - if fields[page] then - if player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots==nil then - page = "bags" - end - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,page)) - return - end - end - - -- Miscellanous - if fields.home_gui_set then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"misc")) - unified_inventory.set_home(player, player:getpos()) - end - if fields.home_gui_go then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) - unified_inventory.go_home(player) - end - if fields.misc_set_day then - minetest.env:set_timeofday((12000 % 24000) / 24000) - minetest.chat_send_player(player_name, "Time of day set to noon.") - end - if fields.misc_set_night then - minetest.env:set_timeofday(0) - minetest.chat_send_player(player_name, "Time of day set to midnight.") - end - - -- Inventory page controls - local start=math.floor(unified_inventory.current_index[player_name]/80 +1 ) - local start_i=start - local pagemax = math.floor((unified_inventory.filtered_items_list_size[player_name]-1) / (80) + 1) - - if fields.start_list then - start_i = 1 - end - if fields.rewind1 then - start_i = start_i - 1 - end - if fields.forward1 then - start_i = start_i + 1 - end - if fields.rewind3 then - start_i = start_i - 3 - end - if fields.forward3 then - start_i = start_i + 3 - end - if fields.end_list then - start_i = pagemax - end - if start_i < 1 then - start_i = 1 - end - if start_i > pagemax then - start_i = pagemax - end - if not (start_i ==start) then - unified_inventory.current_index[player_name] = (start_i-1)*80+1 - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) - end - - local list_index=unified_inventory.current_index[player_name] - for i=0,80,1 do - local button="item_button"..list_index - if fields[button] then - local input={} - input=minetest.get_craft_recipe(unified_inventory.filtered_items_list[player_name][list_index]) - print (dump(input)) - if minetest.setting_getbool("creative_mode") then - local inv = player:get_inventory() - dst_stack={} - dst_stack["name"] = unified_inventory.filtered_items_list[player_name][list_index] - dst_stack["count"]=99 - if inv:room_for_item("main",dst_stack) then - inv:add_item("main",dst_stack) - end - end - end - list_index=list_index+1 - end - - if fields.searchbutton then - unified_inventory.apply_filter(player_name, fields.searchbox) - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) - end - -end) - --- load_home -local load_home = function() - local input = io.open(unified_inventory.home_filename..".home", "r") - if input then - while true do - local x = input:read("*n") - if x == nil then - break - end - local y = input:read("*n") - local z = input:read("*n") - local name = input:read("*l") - homepos[name:sub(2)] = {x = x, y = y, z = z} - end - io.close(input) - else - homepos = {} - end -end -load_home() -- run it now - --- set_home -unified_inventory.set_home = function(player, pos) - homepos[player:get_player_name()] = pos - -- save the home data from the table to the file - local output = io.open(unified_inventory.home_filename..".home", "w") - for k, v in pairs(homepos) do - if v ~= nil then - output:write(math.floor(v.x).." "..math.floor(v.y).." "..math.floor(v.z).." "..k.."\n") - end - end - io.close(output) -end - --- go_home -unified_inventory.go_home = function(player) - local pos = homepos[player:get_player_name()] - if pos~=nil then - player:setpos(pos) - end -end - ---apply filter to the inventory list -unified_inventory.apply_filter = function(player_name,filter) - local size=0 - unified_inventory.filtered_items_list[player_name]={} - for name,def in pairs(minetest.registered_items) do - if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) - and def.description and def.description ~= "" then - if string.find(def.name, filter) or string.find(def.description, filter) then - table.insert(unified_inventory.filtered_items_list[player_name], name) - size=size+1 - end - end - - end - table.sort(unified_inventory.filtered_items_list[player_name]) - unified_inventory.filtered_items_list_size[player_name]=size - unified_inventory.current_index[player_name]=1 - unified_inventory.activefilter[player_name]=filter - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) -end - - diff --git a/textures/bags_large.png b/textures/bags_large.png deleted file mode 100644 index c26f075..0000000 Binary files a/textures/bags_large.png and /dev/null differ diff --git a/textures/bags_medium.png b/textures/bags_medium.png deleted file mode 100644 index 7bc8030..0000000 Binary files a/textures/bags_medium.png and /dev/null differ diff --git a/textures/bags_small.png b/textures/bags_small.png deleted file mode 100644 index e9656a5..0000000 Binary files a/textures/bags_small.png and /dev/null differ diff --git a/unified_inventory/aaa_recipeshook/depends.txt b/unified_inventory/aaa_recipeshook/depends.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/unified_inventory/aaa_recipeshook/depends.txt @@ -0,0 +1 @@ + diff --git a/unified_inventory/aaa_recipeshook/init.lua b/unified_inventory/aaa_recipeshook/init.lua new file mode 100644 index 0000000..d1ce1e9 --- /dev/null +++ b/unified_inventory/aaa_recipeshook/init.lua @@ -0,0 +1,27 @@ +-- override minetest.register_craft +crafts_table ={} +crafts_table_count=0 + +local minetest_register_craft = minetest.register_craft +minetest.register_craft = function (options) + minetest_register_craft(options) + 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 + + diff --git a/unified_inventory/modpack.txt b/unified_inventory/modpack.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/unified_inventory/modpack.txt @@ -0,0 +1 @@ + diff --git a/unified_inventory/unified_inventory/api.lua b/unified_inventory/unified_inventory/api.lua new file mode 100644 index 0000000..db0a069 --- /dev/null +++ b/unified_inventory/unified_inventory/api.lua @@ -0,0 +1,626 @@ +--data tables definitions +unified_inventory = {} +unified_inventory.players = {} +unified_inventory.current_page = {} +unified_inventory.current_index = {} +unified_inventory.items_list_size = 0 +unified_inventory.items_list = {} +unified_inventory.filtered_items_list_size = {} +unified_inventory.filtered_items_list = {} +unified_inventory.activefilter = {} +unified_inventory.alternate = {} +unified_inventory.current_item = {} + +-- default inventory page +unified_inventory.default = "craft" + +-- homepos stuff +local home_gui = {} +local homepos = {} +unified_inventory.home_filename = minetest.get_worldpath()..'/unified_inventory_home' + +-- Create detached creative inventory after loading all mods +minetest.after(0.01, function() + unified_inventory.items_list = {} + for name,def in pairs(minetest.registered_items) do + if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) + and def.description and def.description ~= "" then + table.insert(unified_inventory.items_list, name) + end + end + table.sort(unified_inventory.items_list) + unified_inventory.items_list_size = #unified_inventory.items_list + print ("Unified Inventory. inventory size: "..unified_inventory.items_list_size) +end) + +-- register_on_joinplayer +minetest.register_on_joinplayer(function(player) + local player_name = player:get_player_name() + table.insert(unified_inventory.players, player_name) + unified_inventory.current_index[player_name] = 1 + unified_inventory.filtered_items_list[player_name] = {} + unified_inventory.filtered_items_list[player_name] = unified_inventory.items_list + unified_inventory.filtered_items_list_size[player_name]=unified_inventory.items_list_size + unified_inventory.activefilter[player_name]="" + unified_inventory.apply_filter(player_name, "") + unified_inventory.alternate[player_name] = 1 + unified_inventory.current_item[player_name] =nil + unified_inventory.set_inventory_formspec(player,unified_inventory.get_formspec(player, unified_inventory.default)) + + local inv = minetest.create_detached_inventory(player:get_player_name().."craftrecipe",{ + allow_put = function(inv, listname, index, stack, player) + return 0 + end, + allow_take = function(inv, listname, index, stack, player) + return 0 + end, + allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + return 0 + end, + }) + inv:set_size("output", 1) + inv:set_size("build", 3*3) + inv:set_size("cook", 1) + inv:set_size("fuel", 1) +end) + +-- set_inventory_formspec +unified_inventory.set_inventory_formspec = function(player,formspec) + if player then + if minetest.setting_getbool("creative_mode") then + -- if creative mode is on then wait a bit + minetest.after(0.01,function() + player:set_inventory_formspec(formspec) + end) + else + player:set_inventory_formspec(formspec) + end + end +end + +-- get_formspec +unified_inventory.get_formspec = function(player,page) + if player==nil then return "" end + local player_name = player:get_player_name() + unified_inventory.current_page[player_name]=page + + local formspec = "size[14,10]" + + -- player inventory + formspec = formspec .. "list[current_player;main;0,4.5;8,4;]" + + -- main buttons + formspec = formspec .. "button[0,9;1.8,.5;craft;Craft]" + formspec = formspec .. "button[1.6,9;1.8,.5;craftguide;Craft Guide]" + formspec = formspec .. "button[3.2,9;1.8,.5;bags;Bags]" + formspec = formspec .. "button[4.8,9;1.8,.5;misc;Misc.]" + + --controls to flip items pages + local start_x=9.2 + formspec = formspec .. "button["..(start_x+.6*0)..",9;.8,.5;start_list;|<]" + formspec = formspec .. "button["..(start_x+.6*1)..",9;.8,.5;rewind3;<<]" + formspec = formspec .. "button["..(start_x+.6*2)..",9;.8,.5;rewind1;<]" + formspec = formspec .. "button["..(start_x+.6*3)..",9;.8,.5;forward1;>]" + formspec = formspec .. "button["..(start_x+.6*4)..",9;.8,.5;forward3;>>]" + formspec = formspec .. "button["..(start_x+.6*5)..",9;.8,.5;end_list;>|]" + + -- search box + formspec = formspec .. "field[9.195,8.325;3,1;searchbox;;]" + formspec = formspec .. "button[12,8;1.2,1;searchbutton;Search]" + + -- craft page + if page=="craft" then + formspec = formspec.."label[0,0;Crafting]" + formspec = formspec.."list[current_player;craftpreview;6,1;1,1;]" + formspec = formspec.."list[current_player;craft;2,1;3,3;]" + if minetest.setting_getbool("creative_mode") then + formspec = formspec.."label[0,2.5;Refill:]" + formspec = formspec.."list[detached:refill;main;0,3;1,1;]" + formspec = formspec.."label[7,2.5;Trash:]" + formspec = formspec.."list[detached:trash;main;7,3;1,1;]" + end + end + + -- craft guide page + if page=="craftguide" then + formspec = formspec.."label[0,0;Crafting Guide]" + formspec = formspec.."list[detached:"..player_name.."craftrecipe;build;2,1;3,3;]" + formspec = formspec.."list[detached:"..player_name.."craftrecipe;output;6,1;1,1;]" + formspec = formspec.."label[2,0.5;Input:]" + formspec = formspec.."label[6,0.5;Output:]" + formspec = formspec.."label[6,2.6;Method:]" + local item_name=unified_inventory.current_item[player_name] + --print (dump(item_name)) + if item_name then + local alternates = 0 + local alternate = unified_inventory.alternate[player_name] + local crafts = crafts_table[item_name] + + if crafts ~= nil then + alternates = #crafts + local craft = crafts[alternate] + local method = "Crafting" + if craft.type == "shapeless" then + method="Crafting" + end + if craft.type == "cooking" then + method="Cooking" + end + if craft.type == "fuel" then + method="Fuel" + end + if craft.type == "grinding" then + method="Grinding" + end + if craft.type == "alloy" then + method="Alloy cooking" + end + formspec = formspec.."label[6,3;"..method.."]" + end + + if alternates > 1 then + formspec = formspec.."label[0,2.6;Recipe "..tostring(alternate).." of "..tostring(alternates).."]" + formspec = formspec.."button[0,3.15;2,1;alternate;Alternate]" + end + end + end + + -- bags + if page=="bags" then + formspec = formspec.."label[0,0;Bags]" + formspec=formspec.."button[0,2;2,0.5;bag1;Bag 1]" + formspec=formspec.."button[2,2;2,0.5;bag2;Bag 2]" + formspec=formspec.."button[4,2;2,0.5;bag3;Bag 3]" + formspec=formspec.."button[6,2;2,0.5;bag4;Bag 4]" + formspec=formspec.."list[detached:"..player_name.."_bags;bag1;0.5,1;1,1;]" + formspec=formspec.."list[detached:"..player_name.."_bags;bag2;2.5,1;1,1;]" + formspec=formspec.."list[detached:"..player_name.."_bags;bag3;4.5,1;1,1;]" + formspec=formspec.."list[detached:"..player_name.."_bags;bag4;6.5,1;1,1;]" + end + + for i=1,4 do + if page=="bag"..i then + local image = player:get_inventory():get_stack("bag"..i, 1):get_definition().inventory_image + formspec=formspec.."image[7,0;1,1;"..image.."]" + formspec=formspec.."list[current_player;bag"..i.."contents;0,1;8,3;]" + end + end + + -- Miscellaneous + if page=="misc" then + formspec = formspec.."label[0,0;Miscellaneous]" + formspec=formspec.."button[0,1;2,0.5;home_gui_set;Set Home]" + formspec=formspec.."button_exit[2,1;2,0.5;home_gui_go;Go Home]" + local home = homepos[player_name] + if home ~= nil then + formspec = formspec + formspec=formspec.."label[4,.9;Home set to:]" + formspec=formspec.."label[5.7,.9;("..math.floor(home.x)..","..math.floor(home.y)..","..math.floor(home.z)..")]" + end + if minetest.setting_getbool("creative_mode") then + formspec=formspec.."button[0,2;2,0.5;misc_set_day;Set Day]" + formspec=formspec.."button[2,2;2,0.5;misc_set_night;Set Night]" + end + end + + --Items list + local list_index=unified_inventory.current_index[player_name] + local page=math.floor(list_index / (80) + 1) + local pagemax = math.floor((unified_inventory.filtered_items_list_size[player_name]-1) / (80) + 1) + local image + local item={} + for y=0,9,1 do + for x=0,7,1 do + name=unified_inventory.filtered_items_list[player_name][list_index] + if minetest.registered_items[name] then + formspec=formspec.."item_image_button["..(8.2+x*.7)..","..(1+y*.7)..";.81,.81;"..name..";item_button"..list_index..";]" + list_index=list_index+1 + end + end + end + formspec=formspec.."label[8.2,0;Page:]" + formspec=formspec.."label[9,0;"..page.." of "..pagemax.."]" + formspec=formspec.."label[8.2,0.4;Filter:]" + formspec=formspec.."label[9,0.4;"..unified_inventory.activefilter[player_name].."]" + return formspec +end + +-- trash slot +unified_inventory.trash = minetest.create_detached_inventory("trash", { + allow_put = function(inv, listname, index, stack, player) + if minetest.setting_getbool("creative_mode") then + return stack:get_count() + else + return 0 + end + end, + on_put = function(inv, listname, index, stack, player) + inv:set_stack(listname, index, nil) + end, +}) +unified_inventory.trash:set_size("main", 1) + +-- refill slot +unified_inventory.refill = minetest.create_detached_inventory("refill", { + allow_put = function(inv, listname, index, stack, player) + if minetest.setting_getbool("creative_mode") then + return stack:get_count() + else + return 0 + end + end, + on_put = function(inv, listname, index, stack, player) + inv:set_stack(listname, index, ItemStack(stack:get_name().." "..stack:get_stack_max())) + end, +}) +unified_inventory.refill:set_size("main", 1) + +-- register_on_player_receive_fields +minetest.register_on_player_receive_fields(function(player, formname, fields) + local player_name = player:get_player_name() + + -- main buttons + if fields.craft then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) + return + end + + if fields.craftguide then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) + return + end + + if fields.bags then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"bags")) + return + end + + if fields.misc then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"misc")) + return + end + + -- bags + for i=1,4 do + local page = "bag"..i + if fields[page] then + if player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots==nil then + page = "bags" + end + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,page)) + return + end + end + + -- Miscellaneous + if fields.home_gui_set then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"misc")) + unified_inventory.set_home(player, player:getpos()) + end + if fields.home_gui_go then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) + unified_inventory.go_home(player) + end + if fields.misc_set_day then + minetest.env:set_timeofday((6000 % 24000) / 24000) + minetest.chat_send_player(player_name, "Time of day set to 6am") + end + if fields.misc_set_night then + minetest.env:set_timeofday((21000 % 24000) / 24000) + minetest.chat_send_player(player_name, "Time of day set to 9pm") + end + + -- Inventory page controls + local start=math.floor(unified_inventory.current_index[player_name]/80 +1 ) + local start_i=start + local pagemax = math.floor((unified_inventory.filtered_items_list_size[player_name]-1) / (80) + 1) + + if fields.start_list then + start_i = 1 + end + if fields.rewind1 then + start_i = start_i - 1 + end + if fields.forward1 then + start_i = start_i + 1 + end + if fields.rewind3 then + start_i = start_i - 3 + end + if fields.forward3 then + start_i = start_i + 3 + end + if fields.end_list then + start_i = pagemax + end + if start_i < 1 then + start_i = 1 + end + if start_i > pagemax then + start_i = pagemax + end + if not (start_i ==start) then + unified_inventory.current_index[player_name] = (start_i-1)*80+1 + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) + end + + -- Item list buttons + local list_index=unified_inventory.current_index[player_name] + local page=unified_inventory.current_page[player_name] + for i=0,80,1 do + local button="item_button"..list_index + if fields[button] then + if page=="craftguide" then + unified_inventory.current_item[player_name] = unified_inventory.filtered_items_list[player_name][list_index] + unified_inventory.alternate[player_name] = 1 + unified_inventory.update_recipe (player, unified_inventory.filtered_items_list[player_name][list_index], 1) + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) + else + if minetest.setting_getbool("creative_mode") then + local inv = player:get_inventory() + dst_stack={} + dst_stack["name"] = unified_inventory.filtered_items_list[player_name][list_index] + dst_stack["count"]=99 + if inv:room_for_item("main",dst_stack) then + inv:add_item("main",dst_stack) + end + end + end + end + list_index=list_index+1 + end + + if fields.searchbutton then + unified_inventory.apply_filter(player_name, fields.searchbox) + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) + end + + -- alternate button + if fields.alternate then + local item_name=unified_inventory.current_item[player_name] + if item_name then + local alternates = 0 + local alternate=unified_inventory.alternate[player_name] + local crafts = crafts_table[item_name] + if crafts ~= nil then + alternates = #crafts + end + if alternates > 1 then + alternate=alternate+1 + if alternate>alternates then + alternate=1 + end + unified_inventory.alternate[player_name]=alternate + unified_inventory.update_recipe (player, unified_inventory.current_item[player_name], alternate) + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) + end + end + end +end) + +-- load_home +local load_home = function() + local input = io.open(unified_inventory.home_filename..".home", "r") + if input then + while true do + local x = input:read("*n") + if x == nil then + break + end + local y = input:read("*n") + local z = input:read("*n") + local name = input:read("*l") + homepos[name:sub(2)] = {x = x, y = y, z = z} + end + io.close(input) + else + homepos = {} + end +end +load_home() -- run it now + +-- set_home +unified_inventory.set_home = function(player, pos) + homepos[player:get_player_name()] = pos + -- save the home data from the table to the file + local output = io.open(unified_inventory.home_filename..".home", "w") + for k, v in pairs(homepos) do + if v ~= nil then + output:write(math.floor(v.x).." "..math.floor(v.y).." "..math.floor(v.z).." "..k.."\n") + end + end + io.close(output) +end + +-- go_home +unified_inventory.go_home = function(player) + local pos = homepos[player:get_player_name()] + if pos~=nil then + player:setpos(pos) + end +end + +--apply filter to the inventory list (create filtered copy of full one) +unified_inventory.apply_filter = function(player_name,filter) + local size=0 + local str_temp1=string.lower(filter) + local str_temp2 + local str_temp3 + unified_inventory.filtered_items_list[player_name]={} + for name,def in pairs(minetest.registered_items) do + if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0) + and def.description and def.description ~= "" then + str_temp2=string.lower(def.name) + str_temp3=string.lower(def.description) + if string.find(str_temp2, str_temp1) or string.find(str_temp3, str_temp1) then + table.insert(unified_inventory.filtered_items_list[player_name], name) + size=size+1 + end + end + + end + table.sort(unified_inventory.filtered_items_list[player_name]) + unified_inventory.filtered_items_list_size[player_name]=size + unified_inventory.current_index[player_name]=1 + unified_inventory.activefilter[player_name]=filter + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) +end + + +-- update_recipe +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"}) + for i=0,inv:get_size("build"),1 do + inv:set_stack("build", i, nil) + end + inv:set_stack("cook", 1, nil) + inv:set_stack("fuel", 1, nil) + + inv:set_stack("output", 1, stack_name) + local def + alternate = tonumber(alternate) or 1 + local crafts = crafts_table[stack_name] + if crafts == nil then + --minetest.chat_send_player(player:get_player_name(), "no recipe available for "..stack_name) + return + end + if alternate < 1 or alternate > #crafts then + alternate = 1 + end + local craft = crafts[alternate] + print (dump(craft)) + --minetest.chat_send_player(player:get_player_name(), "recipe for "..stack_name..": "..dump(craft)) + + local itemstack = ItemStack(craft.output) + inv:set_stack("output", 1, itemstack) + + -- cook + if craft.type == "cooking" then + def=unified_inventory.find_item_def(craft.recipe) + if def then + inv:set_stack("build", 1, def) + end + return + end + -- fuel + if craft.type == "fuel" then + def=unified_inventory.find_item_def(craft.recipe) + if def then + inv:set_stack("build", 1, def) + end + return + end + -- build (shaped or shapeless) + if craft.recipe[1] then + def=unified_inventory.find_item_def(craft.recipe[1]) + if def then + inv:set_stack("build", 1, def) + 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 + if craft.recipe[2] then + def=unified_inventory.find_item_def(craft.recipe[2]) + if def then + inv:set_stack("build", 2, def) + else + def=unified_inventory.find_item_def(craft.recipe[2][1]) + if def then + inv:set_stack("build", 4, def) + 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 + +unified_inventory.find_item_def = function(def1) +if type(def1)=="string" then + if string.find(def1, "group:") then + def1=string.gsub(def1, "group:", "") + def1=string.gsub(def1, '\"', "") + for name,def in pairs(minetest.registered_items) do + if def.groups[def1] == 1 and def.groups.not_in_creative_inventory ~= 1 then + return def + end + end + else + return def1 + end +end +return nil +end diff --git a/unified_inventory/unified_inventory/bags.lua b/unified_inventory/unified_inventory/bags.lua new file mode 100644 index 0000000..b0ec4b8 --- /dev/null +++ b/unified_inventory/unified_inventory/bags.lua @@ -0,0 +1,89 @@ +--[[ + +Bags for Minetest + +Copyright (c) 2012 cornernote, Brett O'Donnell +Source Code: https://github.com/cornernote/minetest-particles +License: GPLv3 + +]]-- + +-- register_on_joinplayer +minetest.register_on_joinplayer(function(player) + local player_inv = player:get_inventory() + local bags_inv = minetest.create_detached_inventory(player:get_player_name().."_bags",{ + on_put = function(inv, listname, index, stack, player) + player:get_inventory():set_stack(listname, index, stack) + player:get_inventory():set_size(listname.."contents", stack:get_definition().groups.bagslots) + end, + on_take = function(inv, listname, index, stack, player) + player:get_inventory():set_stack(listname, index, nil) + end, + allow_put = function(inv, listname, index, stack, player) + if stack:get_definition().groups.bagslots then + return 1 + else + return 0 + end + end, + allow_take = function(inv, listname, index, stack, player) + if player:get_inventory():is_empty(listname.."contents")==true then + return stack:get_count() + else + return 0 + end + end, + allow_move = function(inv, from_list, from_index, to_list, to_index, count, player) + return 0 + end, + }) + for i=1,4 do + local bag = "bag"..i + player_inv:set_size(bag, 1) + bags_inv:set_size(bag, 1) + bags_inv:set_stack(bag,1,player_inv:get_stack(bag,1)) + end +end) + +-- register bag tools +minetest.register_tool("unified_inventory:bag_small", { + description = "Small Bag", + inventory_image = "bags_small.png", + groups = {bagslots=8}, +}) +minetest.register_tool("unified_inventory:bag_medium", { + description = "Medium Bag", + inventory_image = "bags_medium.png", + groups = {bagslots=16}, +}) +minetest.register_tool("unified_inventory:bag_large", { + description = "Large Bag", + inventory_image = "bags_large.png", + groups = {bagslots=24}, +}) + +-- register bag crafts +minetest.register_craft({ + output = "unified_inventory:bag_small", + recipe = { + {"", "default:stick", ""}, + {"default:wood", "default:wood", "default:wood"}, + {"default:wood", "default:wood", "default:wood"}, + }, +}) +minetest.register_craft({ + output = "unified_inventory:bag_medium", + recipe = { + {"", "default:stick", ""}, + {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, + {"unified_inventory:bag_small", "unified_inventory:bag_small", "unified_inventory:bag_small"}, + }, +}) +minetest.register_craft({ + output = "unified_inventory:bag_large", + recipe = { + {"", "default:stick", ""}, + {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, + {"unified_inventory:bag_medium", "unified_inventory:bag_medium", "unified_inventory:bag_medium"}, + }, +}) diff --git a/unified_inventory/unified_inventory/depends.txt b/unified_inventory/unified_inventory/depends.txt new file mode 100644 index 0000000..2feb7d0 --- /dev/null +++ b/unified_inventory/unified_inventory/depends.txt @@ -0,0 +1 @@ +aaa_recipeshook diff --git a/unified_inventory/unified_inventory/init.lua b/unified_inventory/unified_inventory/init.lua new file mode 100644 index 0000000..80855b3 --- /dev/null +++ b/unified_inventory/unified_inventory/init.lua @@ -0,0 +1,4 @@ +-- load api +dofile(minetest.get_modpath("unified_inventory").."/api.lua") + +dofile(minetest.get_modpath("unified_inventory").."/bags.lua") diff --git a/unified_inventory/unified_inventory/textures/bags_large.png b/unified_inventory/unified_inventory/textures/bags_large.png new file mode 100644 index 0000000..c26f075 Binary files /dev/null and b/unified_inventory/unified_inventory/textures/bags_large.png differ diff --git a/unified_inventory/unified_inventory/textures/bags_medium.png b/unified_inventory/unified_inventory/textures/bags_medium.png new file mode 100644 index 0000000..7bc8030 Binary files /dev/null and b/unified_inventory/unified_inventory/textures/bags_medium.png differ diff --git a/unified_inventory/unified_inventory/textures/bags_small.png b/unified_inventory/unified_inventory/textures/bags_small.png new file mode 100644 index 0000000..e9656a5 Binary files /dev/null and b/unified_inventory/unified_inventory/textures/bags_small.png differ -- cgit v1.2.3