From c687e8cb7b9e624474353b0cc10acc5db14192f8 Mon Sep 17 00:00:00 2001 From: Jordan Snelling <jordach.snelling@gmail.com> Date: Thu, 27 Jun 2013 09:40:03 +0200 Subject: [PATCH] Merge pull request #36 from ObKo/blocks --- unified_inventory/api.lua | 54 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 20 deletions(-) diff --git a/unified_inventory/api.lua b/unified_inventory/api.lua index 824cdfa..029ae68 100644 --- a/unified_inventory/api.lua +++ b/unified_inventory/api.lua @@ -78,6 +78,7 @@ 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) @@ -128,27 +129,27 @@ -- 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]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_crafting_form.png]" end if page=="craftguide" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_craftguide_form.png]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_craftguide_form.png]" end if page=="misc" then - formspec = formspec .. "background[0.12,1.05,;7.8,7.4;ui_misc_form.png]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;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]" + 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.12,1.05,;7.8,7.4;ui_bags_sm_form.png]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;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]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;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]" + formspec = formspec .. "background[0.06,0.99,;7.92,7.52;ui_bags_lg_form.png]" end end end @@ -282,25 +283,26 @@ -- 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 @@ -309,20 +311,23 @@ 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 @@ -357,27 +362,27 @@ local pagemax = math.floor((unified_inventory.filtered_items_list_size[player_name]-1) / (80) + 1) if fields.start_list then - minetest.sound_play("click", {to_player=player_name, gain = 0.3}) + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) start_i = 1 end if fields.rewind1 then - minetest.sound_play("click", {to_player=player_name, gain = 0.3}) + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) start_i = start_i - 1 end if fields.forward1 then - minetest.sound_play("click", {to_player=player_name, gain = 0.3}) + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) start_i = start_i + 1 end if fields.rewind3 then - minetest.sound_play("click", {to_player=player_name, gain = 0.3}) + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) start_i = start_i - 3 end if fields.forward3 then - minetest.sound_play("click", {to_player=player_name, gain = 0.3}) + 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("click", {to_player=player_name, gain = 0.3}) + minetest.sound_play("paperflip1", {to_player=player_name, gain = 1.0}) start_i = pagemax end if start_i < 1 then @@ -397,7 +402,7 @@ 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.3}) + 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" @@ -425,10 +430,12 @@ 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 @@ -498,6 +505,13 @@ 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]={} -- Gitblit v1.8.0