From e3d391d63f8d6409bdded5c80fe1f5f2de442595 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 21 Sep 2013 21:40:20 +0200 Subject: Update mod --- api.lua | 656 ++++++++++++++++++++ bags.lua | 89 +++ depends.txt | 1 + init.lua | 11 + sounds/birds.ogg | Bin 0 -> 14797 bytes sounds/click.ogg | Bin 0 -> 4869 bytes sounds/dingdong.ogg | Bin 0 -> 27849 bytes sounds/electricity.ogg | Bin 0 -> 18175 bytes sounds/owl.ogg | Bin 0 -> 50950 bytes sounds/paperflip1.ogg | Bin 0 -> 19880 bytes sounds/paperflip2.ogg | Bin 0 -> 20582 bytes sounds/teleport.ogg | Bin 0 -> 59041 bytes sounds/trash.ogg | Bin 0 -> 33615 bytes sounds/trash_all.ogg | Bin 0 -> 32753 bytes textures/bags_large.png | Bin 0 -> 572 bytes textures/bags_medium.png | Bin 0 -> 797 bytes textures/bags_small.png | Bin 0 -> 572 bytes textures/ui_bags_icon.png | Bin 0 -> 4564 bytes textures/ui_bags_lg_form.png | Bin 0 -> 13920 bytes textures/ui_bags_main_form.png | Bin 0 -> 10390 bytes textures/ui_bags_med_form.png | Bin 0 -> 12230 bytes textures/ui_bags_sm_form.png | Bin 0 -> 10885 bytes textures/ui_colorbutton0.png | Bin 0 -> 147 bytes textures/ui_colorbutton1.png | Bin 0 -> 148 bytes textures/ui_colorbutton10.png | Bin 0 -> 148 bytes textures/ui_colorbutton11.png | Bin 0 -> 148 bytes textures/ui_colorbutton12.png | Bin 0 -> 148 bytes textures/ui_colorbutton13.png | Bin 0 -> 148 bytes textures/ui_colorbutton14.png | Bin 0 -> 148 bytes textures/ui_colorbutton15.png | Bin 0 -> 3562 bytes textures/ui_colorbutton2.png | Bin 0 -> 148 bytes textures/ui_colorbutton3.png | Bin 0 -> 140 bytes textures/ui_colorbutton4.png | Bin 0 -> 148 bytes textures/ui_colorbutton5.png | Bin 0 -> 148 bytes textures/ui_colorbutton6.png | Bin 0 -> 148 bytes textures/ui_colorbutton7.png | Bin 0 -> 148 bytes textures/ui_colorbutton8.png | Bin 0 -> 148 bytes textures/ui_colorbutton9.png | Bin 0 -> 148 bytes textures/ui_craft_icon.png | Bin 0 -> 3152 bytes textures/ui_craftguide_form.png | Bin 0 -> 14631 bytes textures/ui_craftguide_icon.png | Bin 0 -> 3303 bytes textures/ui_crafting_form.png | Bin 0 -> 15015 bytes textures/ui_doubleleft_icon.png | Bin 0 -> 2393 bytes textures/ui_doubleright_icon.png | Bin 0 -> 2347 bytes textures/ui_form_bg.png | Bin 0 -> 6404 bytes textures/ui_gohome_icon.png | Bin 0 -> 3017 bytes textures/ui_home_icon.png | Bin 0 -> 2833 bytes textures/ui_left_icon.png | Bin 0 -> 2030 bytes textures/ui_main_inventory.png | Bin 0 -> 7646 bytes textures/ui_misc_form.png | Bin 0 -> 9354 bytes textures/ui_moon_icon.png | Bin 0 -> 4366 bytes textures/ui_right_icon.png | Bin 0 -> 1988 bytes textures/ui_search_icon.png | Bin 0 -> 3345 bytes textures/ui_sethome_icon.png | Bin 0 -> 2984 bytes textures/ui_skip_backward_icon.png | Bin 0 -> 2827 bytes textures/ui_skip_forward_icon.png | Bin 0 -> 2839 bytes textures/ui_sun_icon.png | Bin 0 -> 5422 bytes textures/ui_trash_icon.png | Bin 0 -> 4388 bytes unified_inventory/aaa_recipeshook/depends.txt | 1 - unified_inventory/aaa_recipeshook/init.lua | 29 - unified_inventory/modpack.txt | 1 - unified_inventory/unified_inventory/api.lua | 687 --------------------- unified_inventory/unified_inventory/bags.lua | 89 --- unified_inventory/unified_inventory/depends.txt | 1 - unified_inventory/unified_inventory/init.lua | 4 - .../unified_inventory/sounds/birds.ogg | Bin 14797 -> 0 bytes .../unified_inventory/sounds/click.ogg | Bin 4869 -> 0 bytes .../unified_inventory/sounds/dingdong.ogg | Bin 27849 -> 0 bytes .../unified_inventory/sounds/electricity.ogg | Bin 18175 -> 0 bytes unified_inventory/unified_inventory/sounds/owl.ogg | Bin 50950 -> 0 bytes .../unified_inventory/sounds/paperflip1.ogg | Bin 19880 -> 0 bytes .../unified_inventory/sounds/paperflip2.ogg | Bin 20582 -> 0 bytes .../unified_inventory/sounds/teleport.ogg | Bin 59041 -> 0 bytes .../unified_inventory/sounds/trash.ogg | Bin 33615 -> 0 bytes .../unified_inventory/sounds/trash_all.ogg | Bin 32753 -> 0 bytes .../unified_inventory/textures/bags_large.png | Bin 572 -> 0 bytes .../unified_inventory/textures/bags_medium.png | Bin 797 -> 0 bytes .../unified_inventory/textures/bags_small.png | Bin 572 -> 0 bytes .../unified_inventory/textures/ui_bags_icon.png | Bin 4564 -> 0 bytes .../unified_inventory/textures/ui_bags_lg_form.png | Bin 11442 -> 0 bytes .../textures/ui_bags_main_form.png | Bin 8286 -> 0 bytes .../textures/ui_bags_med_form.png | Bin 9999 -> 0 bytes .../unified_inventory/textures/ui_bags_sm_form.png | Bin 8554 -> 0 bytes .../unified_inventory/textures/ui_craft_icon.png | Bin 3152 -> 0 bytes .../textures/ui_craftguide_form.png | Bin 10500 -> 0 bytes .../textures/ui_craftguide_icon.png | Bin 3303 -> 0 bytes .../textures/ui_crafting_form.png | Bin 10743 -> 0 bytes .../textures/ui_doubleleft_icon.png | Bin 2393 -> 0 bytes .../textures/ui_doubleright_icon.png | Bin 2347 -> 0 bytes .../unified_inventory/textures/ui_form_bg.png | Bin 6404 -> 0 bytes .../unified_inventory/textures/ui_gohome_icon.png | Bin 3017 -> 0 bytes .../unified_inventory/textures/ui_home_icon.png | Bin 2833 -> 0 bytes .../unified_inventory/textures/ui_left_icon.png | Bin 2030 -> 0 bytes .../unified_inventory/textures/ui_misc_form.png | Bin 7098 -> 0 bytes .../unified_inventory/textures/ui_moon_icon.png | Bin 4366 -> 0 bytes .../unified_inventory/textures/ui_right_icon.png | Bin 1988 -> 0 bytes .../unified_inventory/textures/ui_search_icon.png | Bin 3345 -> 0 bytes .../unified_inventory/textures/ui_sethome_icon.png | Bin 2984 -> 0 bytes .../textures/ui_skip_backward_icon.png | Bin 2827 -> 0 bytes .../textures/ui_skip_forward_icon.png | Bin 2839 -> 0 bytes .../unified_inventory/textures/ui_sun_icon.png | Bin 5422 -> 0 bytes .../unified_inventory/textures/ui_trash_icon.png | Bin 4388 -> 0 bytes 102 files changed, 757 insertions(+), 812 deletions(-) create mode 100644 api.lua create mode 100644 bags.lua create mode 100644 depends.txt create mode 100644 init.lua create mode 100644 sounds/birds.ogg create mode 100644 sounds/click.ogg create mode 100644 sounds/dingdong.ogg create mode 100644 sounds/electricity.ogg create mode 100644 sounds/owl.ogg create mode 100644 sounds/paperflip1.ogg create mode 100644 sounds/paperflip2.ogg create mode 100644 sounds/teleport.ogg create mode 100644 sounds/trash.ogg create mode 100644 sounds/trash_all.ogg create mode 100644 textures/bags_large.png create mode 100644 textures/bags_medium.png create mode 100644 textures/bags_small.png create mode 100644 textures/ui_bags_icon.png create mode 100644 textures/ui_bags_lg_form.png create mode 100644 textures/ui_bags_main_form.png create mode 100644 textures/ui_bags_med_form.png create mode 100644 textures/ui_bags_sm_form.png create mode 100644 textures/ui_colorbutton0.png create mode 100644 textures/ui_colorbutton1.png create mode 100644 textures/ui_colorbutton10.png create mode 100644 textures/ui_colorbutton11.png create mode 100644 textures/ui_colorbutton12.png create mode 100644 textures/ui_colorbutton13.png create mode 100644 textures/ui_colorbutton14.png create mode 100644 textures/ui_colorbutton15.png create mode 100644 textures/ui_colorbutton2.png create mode 100644 textures/ui_colorbutton3.png create mode 100644 textures/ui_colorbutton4.png create mode 100644 textures/ui_colorbutton5.png create mode 100644 textures/ui_colorbutton6.png create mode 100644 textures/ui_colorbutton7.png create mode 100644 textures/ui_colorbutton8.png create mode 100644 textures/ui_colorbutton9.png create mode 100644 textures/ui_craft_icon.png create mode 100644 textures/ui_craftguide_form.png create mode 100644 textures/ui_craftguide_icon.png create mode 100644 textures/ui_crafting_form.png create mode 100644 textures/ui_doubleleft_icon.png create mode 100644 textures/ui_doubleright_icon.png create mode 100644 textures/ui_form_bg.png create mode 100644 textures/ui_gohome_icon.png create mode 100644 textures/ui_home_icon.png create mode 100644 textures/ui_left_icon.png create mode 100644 textures/ui_main_inventory.png create mode 100644 textures/ui_misc_form.png create mode 100644 textures/ui_moon_icon.png create mode 100644 textures/ui_right_icon.png create mode 100644 textures/ui_search_icon.png create mode 100644 textures/ui_sethome_icon.png create mode 100644 textures/ui_skip_backward_icon.png create mode 100644 textures/ui_skip_forward_icon.png create mode 100644 textures/ui_sun_icon.png create mode 100644 textures/ui_trash_icon.png delete mode 100644 unified_inventory/aaa_recipeshook/depends.txt delete mode 100644 unified_inventory/aaa_recipeshook/init.lua delete mode 100644 unified_inventory/modpack.txt delete mode 100644 unified_inventory/unified_inventory/api.lua delete mode 100644 unified_inventory/unified_inventory/bags.lua delete mode 100644 unified_inventory/unified_inventory/depends.txt delete mode 100644 unified_inventory/unified_inventory/init.lua delete mode 100644 unified_inventory/unified_inventory/sounds/birds.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/click.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/dingdong.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/electricity.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/owl.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/paperflip1.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/paperflip2.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/teleport.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/trash.ogg delete mode 100644 unified_inventory/unified_inventory/sounds/trash_all.ogg delete mode 100644 unified_inventory/unified_inventory/textures/bags_large.png delete mode 100644 unified_inventory/unified_inventory/textures/bags_medium.png delete mode 100644 unified_inventory/unified_inventory/textures/bags_small.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_bags_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_bags_lg_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_bags_main_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_bags_med_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_bags_sm_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_craft_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_craftguide_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_craftguide_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_crafting_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_doubleright_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_form_bg.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_gohome_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_home_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_left_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_misc_form.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_moon_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_right_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_search_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_sethome_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_sun_icon.png delete mode 100644 unified_inventory/unified_inventory/textures/ui_trash_icon.png diff --git a/api.lua b/api.lua new file mode 100644 index 0000000..5d04d62 --- /dev/null +++ b/api.lua @@ -0,0 +1,656 @@ +--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 = {} +unified_inventory.crafts_table ={} +unified_inventory.crafts_table_count=0 + +-- 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) + 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 + --print(dump(unified_inventory.crafts_table)) + 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() + 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, "") + 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)) + +--crafting guide inventories +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) + if minetest.setting_getbool("creative_mode") 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, + }) +inv:set_size("output", 1) +inv:set_size("build", 3*3) + +-- refill slot +unified_inventory.refill = minetest.create_detached_inventory(player_name.."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())) + minetest.sound_play("electricity", {to_player=player_name, gain = 1.0}) + end, +}) +unified_inventory.refill:set_size("main", 1) + +-- 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) + local player_name=player:get_player_name() + minetest.sound_play("trash", {to_player=player_name, gain = 1.0}) + end, +}) +unified_inventory.trash:set_size("main", 1) +end) + +-- set_inventory_formspec +unified_inventory.set_inventory_formspec = function(player,formspec) + if player then + player:set_inventory_formspec(formspec) + 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;]" + + -- backgrounds + formspec = formspec .. "background[-0.19,-0.2;14.38,10.55;ui_form_bg.png]" + if page=="craft" then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_crafting_form.png]" + end + if page=="craftguide" then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_craftguide_form.png]" + end + if page=="misc" then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_misc_form.png]" + end + if page=="bags" then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]" + end + + for i=1,4 do + if page=="bag"..i then + local slots = player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots + if slots == 8 then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]" + elseif slots == 16 then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]" + elseif slots == 24 then + formspec = formspec .. "background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]" + end + end + end + + -- main buttons + local start_x=0 + formspec = formspec .. "image_button["..(start_x+.65*0)..",9;.8,.8;ui_craft_icon.png;craft;]" + formspec = formspec .. "image_button["..(start_x+.65*1)..",9;.8,.8;ui_craftguide_icon.png;craftguide;]" + formspec = formspec .. "image_button["..(start_x+.65*2)..",9;.8,.8;ui_bags_icon.png;bags;]" + formspec = formspec .. "image_button["..(start_x+.65*3)..",9;.8,.8;ui_sethome_icon.png;home_gui_set;]" + formspec = formspec .. "image_button["..(start_x+.65*4)..",9;.8,.8;ui_gohome_icon.png;home_gui_go;]" + if minetest.setting_getbool("creative_mode") then + formspec = formspec .. "image_button["..(start_x+.65*5)..",9;.8,.8;ui_sun_icon.png;misc_set_day;]" + formspec = formspec .. "image_button["..(start_x+.65*6)..",9;.8,.8;ui_moon_icon.png;misc_set_night;]" + formspec = formspec .. "image_button["..(start_x+.65*7)..",9;.8,.8;ui_trash_icon.png;clear_inv;]" + end + + --controls to flip items pages + start_x=9.2 + formspec = formspec .. "image_button["..(start_x+.6*0)..",9;.8,.8;ui_skip_backward_icon.png;start_list;]" + formspec = formspec .. "image_button["..(start_x+.6*1)..",9;.8,.8;ui_doubleleft_icon.png;rewind3;]" + formspec = formspec .. "image_button["..(start_x+.6*2)..",9;.8,.8;ui_left_icon.png;rewind1;]" + formspec = formspec .. "image_button["..(start_x+.6*3)..",9;.8,.8;ui_right_icon.png;forward1;]" + formspec = formspec .. "image_button["..(start_x+.6*4)..",9;.8,.8;ui_doubleright_icon.png;forward3;]" + formspec = formspec .. "image_button["..(start_x+.6*5)..",9;.8,.8;ui_skip_forward_icon.png;end_list;]" + + -- search box + formspec = formspec .. "field[9.5,8.325;3,1;searchbox;;]" + formspec = formspec .. "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]" + + -- 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:"..player_name.."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] + if item_name then + formspec = formspec.."label[2,0;"..item_name.."]" + local alternates = 0 + local alternate = unified_inventory.alternate[player_name] + local crafts = unified_inventory.crafts_table[item_name] + + if crafts ~= nil and #crafts>0 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 + if craft.type == "extracting" then + method="Extracting" + end + if craft.type == "compressing" then + method="Compressing" + 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 + + --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 + +-- 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")) + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + return + end + + if fields.craftguide then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + return + end + + if fields.bags then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"bags")) + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + 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)) + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + return + end + end + + -- Miscellaneous + if fields.home_gui_set then + unified_inventory.set_home(player, player:getpos()) + local home = homepos[player_name] + if home ~= nil then + minetest.sound_play("dingdong", {to_player=player_name, gain = 1.0}) + minetest.chat_send_player(player_name, "Home position set to: "..math.floor(home.x)..","..math.floor(home.y)..","..math.floor(home.z)) + end + end + if fields.home_gui_go then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) + minetest.sound_play("teleport", {to_player=player_name, gain = 1.0}) + unified_inventory.go_home(player) + end + if fields.misc_set_day then + if minetest.get_player_privs(player_name).settime==true then + minetest.sound_play("birds", {to_player=player_name, gain = 1.0}) + minetest.env:set_timeofday((6000 % 24000) / 24000) + minetest.chat_send_player(player_name, "Time of day set to 6am") + else + minetest.chat_send_player(player_name, "You don't have settime priviledge!") + end + end + if fields.misc_set_night then + if minetest.get_player_privs(player_name).settime==true then + minetest.sound_play("owl", {to_player=player_name, gain = 1.0}) + minetest.env:set_timeofday((21000 % 24000) / 24000) + minetest.chat_send_player(player_name, "Time of day set to 9pm") + else + minetest.chat_send_player(player_name, "You don't have settime priviledge!") + end + end + + if fields.clear_inv then + local inventory = {} + player:get_inventory():set_list("main", inventory) + minetest.chat_send_player(player_name, 'Inventory Cleared!') + minetest.sound_play("trash_all", {to_player=player_name, gain = 1.0}) + 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 + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + start_i = 1 + end + if fields.rewind1 then + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + start_i = start_i - 1 + end + if fields.forward1 then + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + start_i = start_i + 1 + end + if fields.rewind3 then + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + start_i = start_i - 3 + end + if fields.forward3 then + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + start_i = start_i + 3 + end + if fields.end_list then + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) + 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 + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + if minetest.setting_getbool("creative_mode")==false then + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) + page="craftguide" + end + 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, fields.searchbox) + unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) + minetest.sound_play("paperflip2", {to_player=player_name, gain = 1.0}) + end + + -- alternate button + if fields.alternate then + minetest.sound_play("click", {to_player=player_name, gain = 0.1}) + 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 = unified_inventory.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) + local player_name=player:get_player_name() + homepos[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,filter) + local player_name = player:get_player_name() + local size=0 + local str_temp1=string.lower(filter) + if str_temp1 ~= "" then + for i=1,str_temp1:len(),1 do + if string.byte(str_temp1,i) == 91 then + str_temp1="" + end + end + end + 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) + 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("output", 1, nil) + alternate = tonumber(alternate) or 1 + local crafts = unified_inventory.crafts_table[stack_name] + print(dump(crafts)) + local next=next + if next(crafts) == nil then return end -- no craft recipes + if alternate < 1 or alternate > #crafts then + alternate = 1 + end + local craft = crafts[alternate] + inv:set_stack("output", 1, craft.output) + local items=craft.items + + -- cooking, fuel, grinding, and extracting recipes + if craft.type == "cooking" or + craft.type == "fuel" or + craft.type == "grinding" or + craft.type == "extracting" or + craft.type == "compressing" then + def=unified_inventory.find_item_def(craft["items"][1]) + if def then + inv:set_stack("build", 1, def) + end + return + end + if craft.width==0 then + local build_table={1,2,3} + for i=1,3,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], def) end + end + end + end + if craft.width==1 then + local build_table={1,4,7} + for i=1,3,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], def) end + 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], 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, def) end + end + 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, '\"', "") + local items=unified_inventory.items_in_group(def1) + return items[1] + else + return def1 + end +end +return nil +end + +unified_inventory.items_in_group = function(group) + local items = {} + for name, item in pairs(minetest.registered_items) do + for _, g in ipairs(group:split(',')) do + if item.groups[g] then + table.insert(items,name) + end + end + end + return items +end + +-- register_craft +unified_inventory.register_craft = function(options) + if options.output == nil then + return + end + local itemstack = ItemStack(options.output) + if itemstack:is_empty() then + return + end + if unified_inventory.crafts_table[itemstack:get_name()]==nil then + unified_inventory.crafts_table[itemstack:get_name()] = {} + end + table.insert(unified_inventory.crafts_table[itemstack:get_name()],options) + --crafts_table_count=crafts_table_count+1 +end diff --git a/bags.lua b/bags.lua new file mode 100644 index 0000000..4d269db --- /dev/null +++ b/bags.lua @@ -0,0 +1,89 @@ +-- Bags for Minetest + +-- Copyright (c) 2012 cornernote, Brett O'Donnell +-- License: GPLv3 + +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", ""}, + {"group:wood", "group:wood", "group:wood"}, + {"group:wood", "group:wood", "group:wood"}, + }, +}) + +minetest.register_craft({ + output = "unified_inventory:bag_medium", + recipe = { + {"", "", ""}, + {"default:stick", "unified_inventory:bag_small", "default:stick"}, + {"default:stick", "unified_inventory:bag_small", "default:stick"}, + }, +}) + +minetest.register_craft({ + output = "unified_inventory:bag_large", + recipe = { + {"", "", ""}, + {"default:stick", "unified_inventory:bag_medium", "default:stick"}, + {"default:stick", "unified_inventory:bag_medium", "default:stick"}, + }, +}) + diff --git a/depends.txt b/depends.txt new file mode 100644 index 0000000..8d390c8 --- /dev/null +++ b/depends.txt @@ -0,0 +1 @@ +creative? diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..cc170a0 --- /dev/null +++ b/init.lua @@ -0,0 +1,11 @@ +-- Unified Inventory mod 0.4.6 + +-- disable default creative inventory +if creative_inventory then + creative_inventory.set_creative_formspec = function(player, start_i, pagenum) + return + end +end + +dofile(minetest.get_modpath("unified_inventory").."/api.lua") +dofile(minetest.get_modpath("unified_inventory").."/bags.lua") diff --git a/sounds/birds.ogg b/sounds/birds.ogg new file mode 100644 index 0000000..4a93395 Binary files /dev/null and b/sounds/birds.ogg differ diff --git a/sounds/click.ogg b/sounds/click.ogg new file mode 100644 index 0000000..3db63a0 Binary files /dev/null and b/sounds/click.ogg differ diff --git a/sounds/dingdong.ogg b/sounds/dingdong.ogg new file mode 100644 index 0000000..2c9d7ef Binary files /dev/null and b/sounds/dingdong.ogg differ diff --git a/sounds/electricity.ogg b/sounds/electricity.ogg new file mode 100644 index 0000000..4cd7c84 Binary files /dev/null and b/sounds/electricity.ogg differ diff --git a/sounds/owl.ogg b/sounds/owl.ogg new file mode 100644 index 0000000..f30d0b3 Binary files /dev/null and b/sounds/owl.ogg differ diff --git a/sounds/paperflip1.ogg b/sounds/paperflip1.ogg new file mode 100644 index 0000000..eaed13f Binary files /dev/null and b/sounds/paperflip1.ogg differ diff --git a/sounds/paperflip2.ogg b/sounds/paperflip2.ogg new file mode 100644 index 0000000..321bc48 Binary files /dev/null and b/sounds/paperflip2.ogg differ diff --git a/sounds/teleport.ogg b/sounds/teleport.ogg new file mode 100644 index 0000000..ca32f74 Binary files /dev/null and b/sounds/teleport.ogg differ diff --git a/sounds/trash.ogg b/sounds/trash.ogg new file mode 100644 index 0000000..51e4f24 Binary files /dev/null and b/sounds/trash.ogg differ diff --git a/sounds/trash_all.ogg b/sounds/trash_all.ogg new file mode 100644 index 0000000..85c3f66 Binary files /dev/null and b/sounds/trash_all.ogg differ diff --git a/textures/bags_large.png b/textures/bags_large.png new file mode 100644 index 0000000..c26f075 Binary files /dev/null and b/textures/bags_large.png differ diff --git a/textures/bags_medium.png b/textures/bags_medium.png new file mode 100644 index 0000000..7bc8030 Binary files /dev/null and b/textures/bags_medium.png differ diff --git a/textures/bags_small.png b/textures/bags_small.png new file mode 100644 index 0000000..e9656a5 Binary files /dev/null and b/textures/bags_small.png differ diff --git a/textures/ui_bags_icon.png b/textures/ui_bags_icon.png new file mode 100644 index 0000000..d75ff8b Binary files /dev/null and b/textures/ui_bags_icon.png differ diff --git a/textures/ui_bags_lg_form.png b/textures/ui_bags_lg_form.png new file mode 100644 index 0000000..15f511d Binary files /dev/null and b/textures/ui_bags_lg_form.png differ diff --git a/textures/ui_bags_main_form.png b/textures/ui_bags_main_form.png new file mode 100644 index 0000000..26e6938 Binary files /dev/null and b/textures/ui_bags_main_form.png differ diff --git a/textures/ui_bags_med_form.png b/textures/ui_bags_med_form.png new file mode 100644 index 0000000..f786806 Binary files /dev/null and b/textures/ui_bags_med_form.png differ diff --git a/textures/ui_bags_sm_form.png b/textures/ui_bags_sm_form.png new file mode 100644 index 0000000..c77ff7c Binary files /dev/null and b/textures/ui_bags_sm_form.png differ diff --git a/textures/ui_colorbutton0.png b/textures/ui_colorbutton0.png new file mode 100644 index 0000000..35b7db2 Binary files /dev/null and b/textures/ui_colorbutton0.png differ diff --git a/textures/ui_colorbutton1.png b/textures/ui_colorbutton1.png new file mode 100644 index 0000000..cbf095d Binary files /dev/null and b/textures/ui_colorbutton1.png differ diff --git a/textures/ui_colorbutton10.png b/textures/ui_colorbutton10.png new file mode 100644 index 0000000..8dfc5f0 Binary files /dev/null and b/textures/ui_colorbutton10.png differ diff --git a/textures/ui_colorbutton11.png b/textures/ui_colorbutton11.png new file mode 100644 index 0000000..3b279e0 Binary files /dev/null and b/textures/ui_colorbutton11.png differ diff --git a/textures/ui_colorbutton12.png b/textures/ui_colorbutton12.png new file mode 100644 index 0000000..a387b5f Binary files /dev/null and b/textures/ui_colorbutton12.png differ diff --git a/textures/ui_colorbutton13.png b/textures/ui_colorbutton13.png new file mode 100644 index 0000000..b1e7790 Binary files /dev/null and b/textures/ui_colorbutton13.png differ diff --git a/textures/ui_colorbutton14.png b/textures/ui_colorbutton14.png new file mode 100644 index 0000000..c4ad486 Binary files /dev/null and b/textures/ui_colorbutton14.png differ diff --git a/textures/ui_colorbutton15.png b/textures/ui_colorbutton15.png new file mode 100644 index 0000000..b7060d6 Binary files /dev/null and b/textures/ui_colorbutton15.png differ diff --git a/textures/ui_colorbutton2.png b/textures/ui_colorbutton2.png new file mode 100644 index 0000000..caf1fc6 Binary files /dev/null and b/textures/ui_colorbutton2.png differ diff --git a/textures/ui_colorbutton3.png b/textures/ui_colorbutton3.png new file mode 100644 index 0000000..6ac79a3 Binary files /dev/null and b/textures/ui_colorbutton3.png differ diff --git a/textures/ui_colorbutton4.png b/textures/ui_colorbutton4.png new file mode 100644 index 0000000..dc43592 Binary files /dev/null and b/textures/ui_colorbutton4.png differ diff --git a/textures/ui_colorbutton5.png b/textures/ui_colorbutton5.png new file mode 100644 index 0000000..98b8c67 Binary files /dev/null and b/textures/ui_colorbutton5.png differ diff --git a/textures/ui_colorbutton6.png b/textures/ui_colorbutton6.png new file mode 100644 index 0000000..66478bc Binary files /dev/null and b/textures/ui_colorbutton6.png differ diff --git a/textures/ui_colorbutton7.png b/textures/ui_colorbutton7.png new file mode 100644 index 0000000..85f6b93 Binary files /dev/null and b/textures/ui_colorbutton7.png differ diff --git a/textures/ui_colorbutton8.png b/textures/ui_colorbutton8.png new file mode 100644 index 0000000..868c35d Binary files /dev/null and b/textures/ui_colorbutton8.png differ diff --git a/textures/ui_colorbutton9.png b/textures/ui_colorbutton9.png new file mode 100644 index 0000000..50eac0b Binary files /dev/null and b/textures/ui_colorbutton9.png differ diff --git a/textures/ui_craft_icon.png b/textures/ui_craft_icon.png new file mode 100644 index 0000000..727b645 Binary files /dev/null and b/textures/ui_craft_icon.png differ diff --git a/textures/ui_craftguide_form.png b/textures/ui_craftguide_form.png new file mode 100644 index 0000000..c0078de Binary files /dev/null and b/textures/ui_craftguide_form.png differ diff --git a/textures/ui_craftguide_icon.png b/textures/ui_craftguide_icon.png new file mode 100644 index 0000000..079aacb Binary files /dev/null and b/textures/ui_craftguide_icon.png differ diff --git a/textures/ui_crafting_form.png b/textures/ui_crafting_form.png new file mode 100644 index 0000000..bd21046 Binary files /dev/null and b/textures/ui_crafting_form.png differ diff --git a/textures/ui_doubleleft_icon.png b/textures/ui_doubleleft_icon.png new file mode 100644 index 0000000..b9dcfc4 Binary files /dev/null and b/textures/ui_doubleleft_icon.png differ diff --git a/textures/ui_doubleright_icon.png b/textures/ui_doubleright_icon.png new file mode 100644 index 0000000..f56d404 Binary files /dev/null and b/textures/ui_doubleright_icon.png differ diff --git a/textures/ui_form_bg.png b/textures/ui_form_bg.png new file mode 100644 index 0000000..37683f0 Binary files /dev/null and b/textures/ui_form_bg.png differ diff --git a/textures/ui_gohome_icon.png b/textures/ui_gohome_icon.png new file mode 100644 index 0000000..57b448c Binary files /dev/null and b/textures/ui_gohome_icon.png differ diff --git a/textures/ui_home_icon.png b/textures/ui_home_icon.png new file mode 100644 index 0000000..6e1efca Binary files /dev/null and b/textures/ui_home_icon.png differ diff --git a/textures/ui_left_icon.png b/textures/ui_left_icon.png new file mode 100644 index 0000000..2534c77 Binary files /dev/null and b/textures/ui_left_icon.png differ diff --git a/textures/ui_main_inventory.png b/textures/ui_main_inventory.png new file mode 100644 index 0000000..b65dabb Binary files /dev/null and b/textures/ui_main_inventory.png differ diff --git a/textures/ui_misc_form.png b/textures/ui_misc_form.png new file mode 100644 index 0000000..d34d326 Binary files /dev/null and b/textures/ui_misc_form.png differ diff --git a/textures/ui_moon_icon.png b/textures/ui_moon_icon.png new file mode 100644 index 0000000..f43fff8 Binary files /dev/null and b/textures/ui_moon_icon.png differ diff --git a/textures/ui_right_icon.png b/textures/ui_right_icon.png new file mode 100644 index 0000000..5c2e7c5 Binary files /dev/null and b/textures/ui_right_icon.png differ diff --git a/textures/ui_search_icon.png b/textures/ui_search_icon.png new file mode 100644 index 0000000..b7284d1 Binary files /dev/null and b/textures/ui_search_icon.png differ diff --git a/textures/ui_sethome_icon.png b/textures/ui_sethome_icon.png new file mode 100644 index 0000000..7dbf1dc Binary files /dev/null and b/textures/ui_sethome_icon.png differ diff --git a/textures/ui_skip_backward_icon.png b/textures/ui_skip_backward_icon.png new file mode 100644 index 0000000..695d410 Binary files /dev/null and b/textures/ui_skip_backward_icon.png differ diff --git a/textures/ui_skip_forward_icon.png b/textures/ui_skip_forward_icon.png new file mode 100644 index 0000000..bd6948e Binary files /dev/null and b/textures/ui_skip_forward_icon.png differ diff --git a/textures/ui_sun_icon.png b/textures/ui_sun_icon.png new file mode 100644 index 0000000..89bb77c Binary files /dev/null and b/textures/ui_sun_icon.png differ diff --git a/textures/ui_trash_icon.png b/textures/ui_trash_icon.png new file mode 100644 index 0000000..180c827 Binary files /dev/null and b/textures/ui_trash_icon.png differ diff --git a/unified_inventory/aaa_recipeshook/depends.txt b/unified_inventory/aaa_recipeshook/depends.txt deleted file mode 100644 index 8b13789..0000000 --- a/unified_inventory/aaa_recipeshook/depends.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/unified_inventory/aaa_recipeshook/init.lua b/unified_inventory/aaa_recipeshook/init.lua deleted file mode 100644 index 733edd1..0000000 --- a/unified_inventory/aaa_recipeshook/init.lua +++ /dev/null @@ -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 - - diff --git a/unified_inventory/modpack.txt b/unified_inventory/modpack.txt deleted file mode 100644 index 8b13789..0000000 --- a/unified_inventory/modpack.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/unified_inventory/unified_inventory/api.lua b/unified_inventory/unified_inventory/api.lua deleted file mode 100644 index 4a85dc6..0000000 --- a/unified_inventory/unified_inventory/api.lua +++ /dev/null @@ -1,687 +0,0 @@ ---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() - 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.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, "") - 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)) - ---crafting guide inventories -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) - if minetest.setting_getbool("creative_mode") 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, - }) - inv:set_size("output", 1) - inv:set_size("build", 3*3) - --- refill slot -unified_inventory.refill = minetest.create_detached_inventory(player_name.."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())) - minetest.sound_play("electricity", {to_player=player_name, gain = 1.0}) - end, -}) -unified_inventory.refill:set_size("main", 1) -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) - local player_name=player:get_player_name() - minetest.sound_play("trash", {to_player=player_name, gain = 1.0}) - end, -}) -unified_inventory.trash:set_size("main", 1) - --- 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;]" - - -- backgrounds - formspec = formspec .. "background[-0.19,-0.2,;14.38,10.55;ui_form_bg.png]" - if page=="craft" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_crafting_form.png]" - end - if page=="craftguide" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_craftguide_form.png]" - end - if page=="misc" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_misc_form.png]" - end - if page=="bags" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_main_form.png]" - end - - for i=1,4 do - if page=="bag"..i then - local slots = player:get_inventory():get_stack(page, 1):get_definition().groups.bagslots - if slots == 8 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_sm_form.png]" - elseif slots == 16 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_med_form.png]" - elseif slots == 24 then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_bags_lg_form.png]" - end - end - end - - -- main buttons - local start_x=0 - formspec = formspec .. "image_button["..(start_x+.65*0)..",9;.8,.8;ui_craft_icon.png;craft;]" - formspec = formspec .. "image_button["..(start_x+.65*1)..",9;.8,.8;ui_craftguide_icon.png;craftguide;]" - formspec = formspec .. "image_button["..(start_x+.65*2)..",9;.8,.8;ui_bags_icon.png;bags;]" - formspec = formspec .. "image_button["..(start_x+.65*3)..",9;.8,.8;ui_sethome_icon.png;home_gui_set;]" - formspec = formspec .. "image_button["..(start_x+.65*4)..",9;.8,.8;ui_gohome_icon.png;home_gui_go;]" - if minetest.setting_getbool("creative_mode") then - formspec = formspec .. "image_button["..(start_x+.65*5)..",9;.8,.8;ui_sun_icon.png;misc_set_day;]" - formspec = formspec .. "image_button["..(start_x+.65*6)..",9;.8,.8;ui_moon_icon.png;misc_set_night;]" - formspec = formspec .. "image_button["..(start_x+.65*7)..",9;.8,.8;ui_trash_icon.png;clear_inv;]" - end - - --controls to flip items pages - start_x=9.2 - formspec = formspec .. "image_button["..(start_x+.6*0)..",9;.8,.8;ui_skip_backward_icon.png;start_list;]" - formspec = formspec .. "image_button["..(start_x+.6*1)..",9;.8,.8;ui_doubleleft_icon.png;rewind3;]" - formspec = formspec .. "image_button["..(start_x+.6*2)..",9;.8,.8;ui_left_icon.png;rewind1;]" - formspec = formspec .. "image_button["..(start_x+.6*3)..",9;.8,.8;ui_right_icon.png;forward1;]" - formspec = formspec .. "image_button["..(start_x+.6*4)..",9;.8,.8;ui_doubleright_icon.png;forward3;]" - formspec = formspec .. "image_button["..(start_x+.6*5)..",9;.8,.8;ui_skip_forward_icon.png;end_list;]" - - -- search box - formspec = formspec .. "field[9.5,8.325;3,1;searchbox;;]" - formspec = formspec .. "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]" - - -- 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:"..player_name.."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] - if item_name then - formspec = formspec.."label[2,0;"..item_name.."]" - 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 - - --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 - --- 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")) - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - return - end - - if fields.craftguide then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - return - end - - if fields.bags then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"bags")) - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - 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)) - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - return - end - end - - -- Miscellaneous - if fields.home_gui_set then - unified_inventory.set_home(player, player:getpos()) - local home = homepos[player_name] - if home ~= nil then - minetest.sound_play("dingdong", {to_player=player_name, gain = 1.0}) - minetest.chat_send_player(player_name, "Home position set to: "..math.floor(home.x)..","..math.floor(home.y)..","..math.floor(home.z)) - end - end - if fields.home_gui_go then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craft")) - minetest.sound_play("teleport", {to_player=player_name, gain = 1.0}) - unified_inventory.go_home(player) - end - if fields.misc_set_day then - if minetest.get_player_privs(player_name).settime==true then - minetest.sound_play("birds", {to_player=player_name, gain = 1.0}) - minetest.env:set_timeofday((6000 % 24000) / 24000) - minetest.chat_send_player(player_name, "Time of day set to 6am") - else - minetest.chat_send_player(player_name, "You don't have settime priviledge!") - end - end - if fields.misc_set_night then - if minetest.get_player_privs(player_name).settime==true then - minetest.sound_play("owl", {to_player=player_name, gain = 1.0}) - minetest.env:set_timeofday((21000 % 24000) / 24000) - minetest.chat_send_player(player_name, "Time of day set to 9pm") - else - minetest.chat_send_player(player_name, "You don't have settime priviledge!") - end - end - - if fields.clear_inv then - local inventory = {} - player:get_inventory():set_list("main", inventory) - minetest.chat_send_player(player_name, 'Inventory Cleared!') - minetest.sound_play("trash_all", {to_player=player_name, gain = 1.0}) - 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 - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - start_i = 1 - end - if fields.rewind1 then - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - start_i = start_i - 1 - end - if fields.forward1 then - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - start_i = start_i + 1 - end - if fields.rewind3 then - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - start_i = start_i - 3 - end - if fields.forward3 then - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - start_i = start_i + 3 - end - if fields.end_list then - minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) - 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 - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - if minetest.setting_getbool("creative_mode")==false then - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,"craftguide")) - page="craftguide" - end - 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, fields.searchbox) - unified_inventory.set_inventory_formspec(player, unified_inventory.get_formspec(player,unified_inventory.current_page[player_name])) - minetest.sound_play("paperflip2", {to_player=player_name, gain = 1.0}) - end - - -- alternate button - if fields.alternate then - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - 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) - local player_name=player:get_player_name() - homepos[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,filter) - local player_name = player:get_player_name() - local size=0 - local str_temp1=string.lower(filter) - if str_temp1 ~= "" then - for i=1,str_temp1:len(),1 do - if string.byte(str_temp1,i) == 91 then - str_temp1="" - end - end - end - 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, fuel, grinding recipes - if craft.type == "cooking" or craft.type == "fuel" or craft.type == "grinding" 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 deleted file mode 100644 index b0ec4b8..0000000 --- a/unified_inventory/unified_inventory/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/unified_inventory/unified_inventory/depends.txt b/unified_inventory/unified_inventory/depends.txt deleted file mode 100644 index 4be0815..0000000 --- a/unified_inventory/unified_inventory/depends.txt +++ /dev/null @@ -1 +0,0 @@ -aaa_recipeshook diff --git a/unified_inventory/unified_inventory/init.lua b/unified_inventory/unified_inventory/init.lua deleted file mode 100644 index 80855b3..0000000 --- a/unified_inventory/unified_inventory/init.lua +++ /dev/null @@ -1,4 +0,0 @@ --- 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/sounds/birds.ogg b/unified_inventory/unified_inventory/sounds/birds.ogg deleted file mode 100644 index 4a93395..0000000 Binary files a/unified_inventory/unified_inventory/sounds/birds.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/click.ogg b/unified_inventory/unified_inventory/sounds/click.ogg deleted file mode 100644 index 3db63a0..0000000 Binary files a/unified_inventory/unified_inventory/sounds/click.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/dingdong.ogg b/unified_inventory/unified_inventory/sounds/dingdong.ogg deleted file mode 100644 index 2c9d7ef..0000000 Binary files a/unified_inventory/unified_inventory/sounds/dingdong.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/electricity.ogg b/unified_inventory/unified_inventory/sounds/electricity.ogg deleted file mode 100644 index 4cd7c84..0000000 Binary files a/unified_inventory/unified_inventory/sounds/electricity.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/owl.ogg b/unified_inventory/unified_inventory/sounds/owl.ogg deleted file mode 100644 index f30d0b3..0000000 Binary files a/unified_inventory/unified_inventory/sounds/owl.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/paperflip1.ogg b/unified_inventory/unified_inventory/sounds/paperflip1.ogg deleted file mode 100644 index eaed13f..0000000 Binary files a/unified_inventory/unified_inventory/sounds/paperflip1.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/paperflip2.ogg b/unified_inventory/unified_inventory/sounds/paperflip2.ogg deleted file mode 100644 index 321bc48..0000000 Binary files a/unified_inventory/unified_inventory/sounds/paperflip2.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/teleport.ogg b/unified_inventory/unified_inventory/sounds/teleport.ogg deleted file mode 100644 index ca32f74..0000000 Binary files a/unified_inventory/unified_inventory/sounds/teleport.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/trash.ogg b/unified_inventory/unified_inventory/sounds/trash.ogg deleted file mode 100644 index 51e4f24..0000000 Binary files a/unified_inventory/unified_inventory/sounds/trash.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/sounds/trash_all.ogg b/unified_inventory/unified_inventory/sounds/trash_all.ogg deleted file mode 100644 index 85c3f66..0000000 Binary files a/unified_inventory/unified_inventory/sounds/trash_all.ogg and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/bags_large.png b/unified_inventory/unified_inventory/textures/bags_large.png deleted file mode 100644 index c26f075..0000000 Binary files a/unified_inventory/unified_inventory/textures/bags_large.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/bags_medium.png b/unified_inventory/unified_inventory/textures/bags_medium.png deleted file mode 100644 index 7bc8030..0000000 Binary files a/unified_inventory/unified_inventory/textures/bags_medium.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/bags_small.png b/unified_inventory/unified_inventory/textures/bags_small.png deleted file mode 100644 index e9656a5..0000000 Binary files a/unified_inventory/unified_inventory/textures/bags_small.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_icon.png b/unified_inventory/unified_inventory/textures/ui_bags_icon.png deleted file mode 100644 index d75ff8b..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png b/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png deleted file mode 100644 index de62e21..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_lg_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_main_form.png b/unified_inventory/unified_inventory/textures/ui_bags_main_form.png deleted file mode 100644 index 11cb05d..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_main_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_med_form.png b/unified_inventory/unified_inventory/textures/ui_bags_med_form.png deleted file mode 100644 index 77b89df..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_med_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png b/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png deleted file mode 100644 index f0af238..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_bags_sm_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_craft_icon.png b/unified_inventory/unified_inventory/textures/ui_craft_icon.png deleted file mode 100644 index 727b645..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_craft_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_craftguide_form.png b/unified_inventory/unified_inventory/textures/ui_craftguide_form.png deleted file mode 100644 index 7dbfa61..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_craftguide_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_craftguide_icon.png b/unified_inventory/unified_inventory/textures/ui_craftguide_icon.png deleted file mode 100644 index 079aacb..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_craftguide_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_crafting_form.png b/unified_inventory/unified_inventory/textures/ui_crafting_form.png deleted file mode 100644 index 1eaea56..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_crafting_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png b/unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png deleted file mode 100644 index b9dcfc4..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_doubleleft_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_doubleright_icon.png b/unified_inventory/unified_inventory/textures/ui_doubleright_icon.png deleted file mode 100644 index f56d404..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_doubleright_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_form_bg.png b/unified_inventory/unified_inventory/textures/ui_form_bg.png deleted file mode 100644 index 37683f0..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_form_bg.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_gohome_icon.png b/unified_inventory/unified_inventory/textures/ui_gohome_icon.png deleted file mode 100644 index 57b448c..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_gohome_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_home_icon.png b/unified_inventory/unified_inventory/textures/ui_home_icon.png deleted file mode 100644 index 6e1efca..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_home_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_left_icon.png b/unified_inventory/unified_inventory/textures/ui_left_icon.png deleted file mode 100644 index 2534c77..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_left_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_misc_form.png b/unified_inventory/unified_inventory/textures/ui_misc_form.png deleted file mode 100644 index 103900c..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_misc_form.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_moon_icon.png b/unified_inventory/unified_inventory/textures/ui_moon_icon.png deleted file mode 100644 index f43fff8..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_moon_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_right_icon.png b/unified_inventory/unified_inventory/textures/ui_right_icon.png deleted file mode 100644 index 5c2e7c5..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_right_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_search_icon.png b/unified_inventory/unified_inventory/textures/ui_search_icon.png deleted file mode 100644 index b7284d1..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_search_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_sethome_icon.png b/unified_inventory/unified_inventory/textures/ui_sethome_icon.png deleted file mode 100644 index 7dbf1dc..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_sethome_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png b/unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png deleted file mode 100644 index 695d410..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_skip_backward_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png b/unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png deleted file mode 100644 index bd6948e..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_skip_forward_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_sun_icon.png b/unified_inventory/unified_inventory/textures/ui_sun_icon.png deleted file mode 100644 index 89bb77c..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_sun_icon.png and /dev/null differ diff --git a/unified_inventory/unified_inventory/textures/ui_trash_icon.png b/unified_inventory/unified_inventory/textures/ui_trash_icon.png deleted file mode 100644 index 180c827..0000000 Binary files a/unified_inventory/unified_inventory/textures/ui_trash_icon.png and /dev/null differ -- cgit v1.2.3