commit bca53b0b55b4cf5bccd4eb51ee43be5056d0a023 Author: BlockMen Date: Tue Aug 12 16:36:38 2014 +0200 Initial commit diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..0bf68db --- /dev/null +++ b/README.txt @@ -0,0 +1,34 @@ +Minetest mod "Inventory Tweaks" +=============================== +version: 2.0 + +License of source code: WTFPL +----------------------------- +Written 2013-2014 by BlockMen + +This program is free software. It comes without any warranty, to +the extent permitted by applicable law. You can redistribute it +and/or modify it under the terms of the Do What The Fuck You Want +To Public License, Version 2, as published by Sam Hocevar. See +http://sam.zoy.org/wtfpl/COPYING for more details. + +License of sounds: +------------------ +invtweak_break_tool.ogg by EdgardEdition (CC BY 3.0), http://www.freesound.org/people/EdgardEdition + + +~About~ +------- +This mod add different new functions to Minetest. + +First: This mod adds 3 different buttons to player inventory. With those buttons you can sort your inventory easily. +"›•"-Button concernates all stacks to their maximum size. +"^"-Button sorts all items in an ascending order +"v"-Button sorts all items in an descending order + +Furthermore this mod has the ability to refill your wielded items automaticly. For example your current tool +break and you have one more of the same type (e.g. a stone pickaxe) this mod put it right in you hand +and you can keep digging our placing nodes without opening the inventory. +You can disable this setting by adding/changing following to your minetest.conf file: "invtweak_autorefill = false" + +As a small gimic it adds also a sound when a tool breaks, to improve the atmosphere of the gameplay. diff --git a/depends.txt b/depends.txt new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/depends.txt @@ -0,0 +1 @@ +default diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..60f159c --- /dev/null +++ b/init.lua @@ -0,0 +1,262 @@ +local auto_refill = minetest.setting_getbool("invtweak_auto_refill") or true + +local tweak = {} +tweak.formspec = {} + +tweak.buttons = { +--sort_asc +"0.55,0.6;sort_asc;^]", +--sort_desc +"0.55,0.6;sort_desc;v]", +--concatenate +"0.65,0.6;sort;›•]" +} + +local function get_formspec_size(formspec) + local w = 8 + local h = 7.5 + local sstring = string.find(formspec,"size[",1,true) + if sstring ~= nil then + sstring = string.sub(formspec, sstring+5) + local p = string.find(sstring,",") + w = string.sub(sstring,1,p-1) + sstring = string.sub(sstring,p+1,string.find(sstring,"]")+2) + p = string.find(sstring,",") + if p == nil then p = string.find(sstring,"]") end + h = string.sub(sstring,1,p-1) + end + return w,h +end + +local function add_buttons(player) + local name = player:get_player_name() + local formspec = player:get_inventory_formspec() + local w,h = get_formspec_size(formspec) + for i=1,#tweak.buttons do + formspec = formspec .. "button["..w-2+(i*0.5)..",-0.2;" .. tweak.buttons[i] + end + player:set_inventory_formspec(formspec) +end + +minetest.register_on_joinplayer(function(player) + minetest.after(0.65,function() + add_buttons(player) + end) +end) + + +local function comp_asc(w1,w2) + if w1.name < w2.name then + return true + end +end + +local function comp_desc(w1,w2) + if w1.name > w2.name then + return true + end +end + +minetest.register_on_player_receive_fields(function(player, formname, fields) + if fields.sort_asc then + tweak.sort(player, comp_asc) + end + if fields.sort_desc then + tweak.sort(player, comp_desc) + end + if fields.sort then + tweak.sort(player, comp_asc, true) + end + + -- player inventory + if minetest.setting_getbool("creative_mode") then + add_buttons(player) + end +end) + +-- sort asc without mod prefix +local function comp_in(w1, w2) + local w11 = string.find(w1.name, ":") + local w22 = string.find(w2.name, ":") + if w11 ~= nil then + w11 = string.sub(w1.name,w11) + else + w11 = w1.name + end + if w22 ~= nil then + w22 = string.sub(w2.name,w22) + else + w22 = w2.name + end + if w11 < w22 then + return true + end +end + +tweak.concatenate = function(list) + local last = nil + local last_cnt = 100 + local refresh = false + for _,stack in ipairs(list) do + local i = _ + if refresh then + refresh = false + table.sort(list, comp_asc) + list = tweak.concatenate(list) + break + end + if stack.name ~= "zztmpsortname" and last == stack.name then + if last_cnt < stack.max then + local diff = stack.max - last_cnt + local add = stack.count + if stack.count > diff then + stack.count = stack.count - diff + add = diff + else + stack.name = "zztmpsortname" + refresh = true + end + list[i-1].count = list[i-1].count + add + end + end + last = stack.name + last_cnt = stack.count + end + return list +end + +tweak.sort = function(player, mode, con) + local inv = player:get_inventory() + if inv then + local list = inv:get_list("main") + local tmp_list = {} + + --write whole list as table + for _,stack in ipairs(list) do + local tbl_stack = stack:to_table() + if tbl_stack == nil then tbl_stack = {name="zztmpsortname"} end + tbl_stack.max = stack:get_stack_max() + tmp_list[_]=tbl_stack + end + + -- sort asc/desc + table.sort(tmp_list, mode) + + if con then + tmp_list = tweak.concatenate(tmp_list) + table.sort(tmp_list, comp_in) + end + + --write back to inventory + for _,stack in ipairs(tmp_list) do + stack.max = nil + if stack.name ~= "zztmpsortname" then + inv:set_stack("main", _, ItemStack(stack)) + else + inv:set_stack("main", _, ItemStack(nil)) + end + end + end +end + + +-- tool break sound + autorefill +function refill(player, stck_name, index) + local inv = player:get_inventory() + for i,stack in ipairs(inv:get_list("main")) do + if stack:get_name() == stck_name then + inv:set_stack("main", index, stack) + stack:clear() + inv:set_stack("main", i, stack) + minetest.log("action", "Inventory Tweaks: refilled stack("..stck_name..") of " .. player:get_player_name() ) + return + end + end +end + +if auto_refill == true then + minetest.register_on_placenode(function(pos, newnode, placer, oldnode) + if not placer then return end + local index = placer:get_wield_index() + local cnt = placer:get_wielded_item():get_count()-1 + if minetest.setting_getbool("creative_mode") then + return true + else + if cnt == 0 then + minetest.after(0.01, refill, placer, newnode.name, index) + end + end + end) +end + +local wielded = {} +wielded.name = {} +wielded.wear = {} + +minetest.register_on_punchnode(function(pos, node, puncher) + if not puncher or minetest.setting_getbool("creative_mode") then + return + end + local name = puncher:get_player_name() + + local item = puncher:get_wielded_item() + local tname = item:get_name() + local def = minetest.registered_tools[tname] + + wielded.name[name] = tname + + if not item or not tname or tname == "" or not def then + return + end + local typ = def.type + if not typ or typ ~= "tool" then + return + end + wielded.wear[name] = item:get_wear() + -- TODO: re-add for costum tools like lighter +end) + +minetest.register_on_dignode(function(pos, oldnode, digger) + if not digger then return end + + local name = digger:get_player_name() + local item = digger:get_wielded_item() + local index = digger:get_wield_index() + local tname = item:get_name() + local def = minetest.registered_tools[tname] + + + if not item then + return + end + if tname ~= "" then + if not def then + return + end + end + + local old_name = wielded.name[name] + if tname == old_name and tname == "" then + return + end + + local old = wielded.wear[name] + if not old and tname == "" then + old = 0 + end + local new = item:get_wear() + + if old ~= new then + if old > 0 and new == 0 then + wielded.wear[name] = new + minetest.sound_play("invtweak_tool_break", { + pos = digger:getpos(), + gain = 0.9, + max_hear_distance = 5 + }) + if auto_refill == true then + minetest.after(0.01, refill, digger, old_name, index) + end + end + end +end) diff --git a/sounds/invtweak_tool_break.ogg b/sounds/invtweak_tool_break.ogg new file mode 100644 index 0000000..c68522c Binary files /dev/null and b/sounds/invtweak_tool_break.ogg differ