diff --git a/.gitmodules b/.gitmodules index bc7baabb..ff01dd88 100755 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "mods/time_regulation"] path = mods/time_regulation url = git://github.com/MinetestForFun/time_regulation.git +[submodule "mods/unified_inventory"] + path = mods/unified_inventory + url = git://github.com/MinetestForFun/unified_inventory.git diff --git a/mods/unified_inventory b/mods/unified_inventory new file mode 160000 index 00000000..79121842 --- /dev/null +++ b/mods/unified_inventory @@ -0,0 +1 @@ +Subproject commit 79121842182d11260daa75da0516c08e6a71e6f5 diff --git a/mods/unified_inventory/.gitignore b/mods/unified_inventory/.gitignore deleted file mode 100755 index 5236e1e4..00000000 --- a/mods/unified_inventory/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ - diff --git a/mods/unified_inventory/README.md b/mods/unified_inventory/README.md deleted file mode 100755 index 6f5e2d41..00000000 --- a/mods/unified_inventory/README.md +++ /dev/null @@ -1,22 +0,0 @@ -Unified inventory -================= - -Unified Inventory replaces the default survival and creative inventory. -It adds a nicer interface and a number of features, such as a crafting guide. - -License -======= - -Copyright (C) 2012-2014 Maciej Kasatkin (RealBadAngel) - -Unified inventory code is licensed under the GNU LGPLv2+. - -Licenses for textures: - -VanessaE: (WTFPL) - * ui\_group.png - -RealBadAngel: (WTFPL) - * Everything else. - - diff --git a/mods/unified_inventory/api.lua b/mods/unified_inventory/api.lua deleted file mode 100755 index 80946982..00000000 --- a/mods/unified_inventory/api.lua +++ /dev/null @@ -1,239 +0,0 @@ -local S = unified_inventory.gettext - --- Create detached creative inventory after loading all mods -minetest.after(0.01, function() - local rev_aliases = {} - for source, target in pairs(minetest.registered_aliases) do - if not rev_aliases[target] then rev_aliases[target] = {} end - table.insert(rev_aliases[target], source) - end - 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 all_names = rev_aliases[name] or {} - table.insert(all_names, name) - for _, name in ipairs(all_names) do - local recipes = minetest.get_all_craft_recipes(name) - if recipes then - for _, recipe in ipairs(recipes) do - - local unknowns - - for _,chk in pairs(recipe.items) do - local groupchk = string.find(chk, "group:") - if groupchk then - for _,groupname in pairs(string.gsub(chk, "group:", ""):split(",")) do - if not unified_inventory.get_group_item(groupname).item then - unknowns = true - if minetest.setting_getbool("show_unknown_craftrecipes") then - minetest.log("error", "Recipe for item " .. recipe.output .. " contains unknown group " .. groupname) - end - break - end - end - elseif not minetest.registered_items[chk] then - unknowns = true - if minetest.setting_getbool("show_unknown_craftrecipes") then - minetest.log("error", "Recipe for item " .. recipe.output .. " contains unknown item " .. chk) - end - break - end - end - - if not unknowns then - unified_inventory.register_craft(recipe) - end - end - end - end - end - end - table.sort(unified_inventory.items_list) - unified_inventory.items_list_size = #unified_inventory.items_list - minetest.log("Unified Inventory. inventory size: "..unified_inventory.items_list_size) - for _, name in ipairs(unified_inventory.items_list) do - local def = minetest.registered_items[name] - if type(def.drop) == "string" then - local dstack = ItemStack(def.drop) - if not dstack:is_empty() and dstack:get_name() ~= name then - unified_inventory.register_craft({ - type = "digging", - items = {name}, - output = def.drop, - width = 0, - }) - - end - end - end - for _, recipes in pairs(unified_inventory.crafts_for.recipe) do - for _, recipe in ipairs(recipes) do - local ingredient_items = {} - for _, spec in ipairs(recipe.items) do - local matches_spec = unified_inventory.canonical_item_spec_matcher(spec) - for _, name in ipairs(unified_inventory.items_list) do - if matches_spec(name) then - ingredient_items[name] = true - end - end - end - for name, _ in pairs(ingredient_items) do - if unified_inventory.crafts_for.usage[name] == nil then - unified_inventory.crafts_for.usage[name] = {} - end - table.insert(unified_inventory.crafts_for.usage[name], recipe) - end - end - end -end) - - --- load_home -local function load_home() - local input = io.open(unified_inventory.home_filename, "r") - if not input then - unified_inventory.home_pos = {} - return - end - while true do - local x = input:read("*n") - if not x then break end - local y = input:read("*n") - local z = input:read("*n") - local name = input:read("*l") - unified_inventory.home_pos[name:sub(2)] = {x = x, y = y, z = z} - end - io.close(input) -end -load_home() - -function unified_inventory.set_home(player, pos) - local player_name = player:get_player_name() - unified_inventory.home_pos[player_name] = vector.round(pos) - -- save the home data from the table to the file - local output = io.open(unified_inventory.home_filename, "w") - for k, v in pairs(unified_inventory.home_pos) do - output:write(v.x.." "..v.y.." "..v.z.." "..k.."\n") - end - io.close(output) -end - -function unified_inventory.go_home(player) - local pos = unified_inventory.home_pos[player:get_player_name()] - if pos then - player:setpos(pos) - end -end - --- register_craft -function unified_inventory.register_craft(options) - if not options.output then - return - end - local itemstack = ItemStack(options.output) - if itemstack:is_empty() then - return - end - if options.type == "normal" and options.width == 0 then - options = { type = "shapeless", items = options.items, output = options.output, width = 0 } - end - if not unified_inventory.crafts_for.recipe[itemstack:get_name()] then - unified_inventory.crafts_for.recipe[itemstack:get_name()] = {} - end - table.insert(unified_inventory.crafts_for.recipe[itemstack:get_name()],options) -end - - -local craft_type_defaults = { - width = 3, - height = 3, - uses_crafting_grid = false, -} - - -function unified_inventory.craft_type_defaults(name, options) - if not options.description then - options.description = name - end - setmetatable(options, {__index = craft_type_defaults}) - return options -end - - -function unified_inventory.register_craft_type(name, options) - unified_inventory.registered_craft_types[name] = - unified_inventory.craft_type_defaults(name, options) -end - - -unified_inventory.register_craft_type("normal", { - description = "Crafting", - icon = "ui_craftgrid_icon.png", - width = 3, - height = 3, - get_shaped_craft_width = function (craft) return craft.width end, - dynamic_display_size = function (craft) - local w = craft.width - local h = math.ceil(table.maxn(craft.items) / craft.width) - local g = w < h and h or w - return { width = g, height = g } - end, - uses_crafting_grid = true, -}) - - -unified_inventory.register_craft_type("shapeless", { - description = "Mixing", - icon = "ui_craftgrid_icon.png", - width = 3, - height = 3, - dynamic_display_size = function (craft) - local maxn = table.maxn(craft.items) - local g = 1 - while g*g < maxn do g = g + 1 end - return { width = g, height = g } - end, - uses_crafting_grid = true, -}) - - -unified_inventory.register_craft_type("cooking", { - description = "Cooking", - icon = "default_furnace_front.png", - width = 1, - height = 1, -}) - - -unified_inventory.register_craft_type("digging", { - description = "Digging", - icon = "default_tool_steelpick.png", - width = 1, - height = 1, -}) - - -function unified_inventory.register_page(name, def) - unified_inventory.pages[name] = def -end - - -function unified_inventory.register_button(name, def) - if not def.action then - def.action = function(player) - unified_inventory.set_inventory_formspec(player, name) - end - end - def.name = name - table.insert(unified_inventory.buttons, def) -end - - -function unified_inventory.is_creative(playername) - return minetest.check_player_privs(playername, {creative=true}) - or minetest.setting_getbool("creative_mode") -end - diff --git a/mods/unified_inventory/bags.lua b/mods/unified_inventory/bags.lua deleted file mode 100755 index 9ffafa9c..00000000 --- a/mods/unified_inventory/bags.lua +++ /dev/null @@ -1,257 +0,0 @@ --- Bags for Minetest - --- Copyright (c) 2012 cornernote, Brett O'Donnell --- License: GPLv3 - -local S = unified_inventory.gettext - -unified_inventory.register_page("bags", { - get_formspec = function(player) - local player_name = player:get_player_name() - local formspec = "background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]" - formspec = formspec.."label[0,0;"..S("Bags").."]" - formspec = formspec.."button[0,2;2,0.5;bag1;Bag 1]" .. "button[0,3;2,0.5;unequip_bag1;Unequip]" - formspec = formspec.."button[2,2;2,0.5;bag2;Bag 2]" .. "button[2,3;2,0.5;unequip_bag2;Unequip]" - formspec = formspec.."button[4,2;2,0.5;bag3;Bag 3]" .. "button[4,3;2,0.5;unequip_bag3;Unequip]" - formspec = formspec.."button[6,2;2,0.5;bag4;Bag 4]" .. "button[6,3;2,0.5;unequip_bag4;Unequip]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag1;0.5,1;1,1;]" - formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag2;2.5,1;1,1;]" - formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag3;4.5,1;1,1;]" - formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."_bags;bag4;6.5,1;1,1;]" - return {formspec=formspec} - end, -}) - -unified_inventory.register_button("bags", { - type = "image", - image = "ui_bags_icon.png", - tooltip = S("Bags"), - hide_lite=true, - show_with = false, --Modif MFF (Crabman 30/06/2015) -}) - - - unified_inventory.register_page("bag1", { - get_formspec = function(player) - local stack = player:get_inventory():get_stack("bag1", 1) - local image = stack:get_definition().inventory_image - local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;Bag 1]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[current_player;bag1contents;0,1;8,3;]" - formspec = formspec.."listring[current_name;bag1contents]" - formspec = formspec.."listring[current_player;main]" - local slots = stack: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 - return {formspec=formspec} - end, - }) - unified_inventory.register_page("bag2", { - get_formspec = function(player) - local stack = player:get_inventory():get_stack("bag2", 1) - local image = stack:get_definition().inventory_image - local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;Bag 2]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[current_player;bag2contents;0,1;8,3;]" - formspec = formspec.."listring[current_name;bag2contents]" - formspec = formspec.."listring[current_player;main]" - local slots = stack: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 - return {formspec=formspec} - end, - }) - unified_inventory.register_page("bag3", { - get_formspec = function(player) - local stack = player:get_inventory():get_stack("bag3", 1) - local image = stack:get_definition().inventory_image - local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;Bag 3]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[current_player;bag3contents;0,1;8,3;]" - formspec = formspec.."listring[current_name;bag3contents]" - formspec = formspec.."listring[current_player;main]" - local slots = stack: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 - return {formspec=formspec} - end, - }) - unified_inventory.register_page("bag4", { - get_formspec = function(player) - local stack = player:get_inventory():get_stack("bag4", 1) - local image = stack:get_definition().inventory_image - local formspec = "image[7,0;1,1;"..image.."]" - formspec = formspec.."label[0,0;Bag 4]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[current_player;bag4contents;0,1;8,3;]" - formspec = formspec.."listring[current_name;bag4contents]" - formspec = formspec.."listring[current_player;main]" - local slots = stack: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 - return {formspec=formspec} - end, - }) - -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "" then - return - end - for i = 1, 4 do - if fields["bag"..i] then - local stack = player:get_inventory():get_stack("bag"..i, 1) - if not stack:get_definition().groups.bagslots then - return - end - unified_inventory.set_inventory_formspec(player, "bag"..i) - return - elseif fields["unequip_bag" .. i] then - local stack = unified_inventory.extract_bag(player, i) - if not stack then - return - elseif not player:get_inventory():room_for_item("main", stack) then - minetest.chat_send_player(player:get_player_name(), "You need one free slot in your main inventory") - return - end - player:get_inventory():add_item("main", stack) - end - end -end) - -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) - local pinv = player:get_inventory() - pinv:set_stack(listname, index, stack) - pinv:set_size(listname.."contents", - stack:get_definition().groups.bagslots) - - -- Retrieve the serialized inventory if any - if stack:get_metadata() ~= "" then - for i, item in pairs(minetest.deserialize(stack:get_metadata())) do - pinv:set_stack(listname .. "contents", i, ItemStack(item)) - end - end - end, - allow_take = function() - return 0 - end, - allow_put = function(inv, listname, index, stack, player) - if stack:get_definition().groups.bagslots then - return 1 - 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 = S("Small Bag"), - inventory_image = "bags_small.png", - groups = {bagslots=8}, -}) - -minetest.register_tool("unified_inventory:bag_medium", { - description = S("Medium Bag"), - inventory_image = "bags_medium.png", - groups = {bagslots=16}, -}) - -minetest.register_tool("unified_inventory:bag_large", { - description = S("Large Bag"), - inventory_image = "bags_large.png", - groups = {bagslots=24}, -}) - --- register bag crafts -minetest.register_craft({ - output = "unified_inventory:bag_small", - recipe = { - {"", "farming:cotton", ""}, - {"group:wool", "group:wool", "group:wool"}, - {"group:wool", "group:wool", "group:wool"}, - }, -}) - -minetest.register_craft({ - output = "unified_inventory:bag_medium", - recipe = { - {"", "", ""}, - {"farming:cotton", "unified_inventory:bag_small", "farming:cotton"}, - {"farming:cotton", "unified_inventory:bag_small", "farming:cotton"}, - }, -}) - -minetest.register_craft({ - output = "unified_inventory:bag_large", - recipe = { - {"", "", ""}, - {"farming:cotton", "unified_inventory:bag_medium", "farming:cotton"}, - {"farming:cotton", "unified_inventory:bag_medium", "farming:cotton"}, - }, -}) - -function unified_inventory.extract_bag(player, id) - if not player then - minetest.log("error", "[u_inv] Invalid player for bag extraction : nil") - return - end - if tonumber(id) == nil or id > 4 or id < 0 then - minetest.log("error", "Invalid id: " .. (id or 'nil')) - return - end - - local stack = player:get_inventory():get_stack("bag"..id, 1) - if not stack:get_definition().groups.bagslots then - return - end - local pinv = player:get_inventory() - local inv = pinv:get_list("bag" .. id .. "contents") - local list = {} - for i, item in pairs(inv) do - list[i] = item:to_table() - end - - pinv:remove_item("bag" .. id, stack) - minetest.get_inventory({type = "detached", name = minetest.formspec_escape(player:get_player_name()) .. "_bags"}):set_stack("bag" .. id, 1, nil) - pinv:set_list("bag" .. id .. "contents", {}) - - stack:set_metadata(minetest.serialize(list)) - return stack -end diff --git a/mods/unified_inventory/callbacks.lua b/mods/unified_inventory/callbacks.lua deleted file mode 100755 index 42a5e240..00000000 --- a/mods/unified_inventory/callbacks.lua +++ /dev/null @@ -1,199 +0,0 @@ -local function default_refill(stack) - stack:set_count(stack:get_stack_max()) - local itemdef = minetest.registered_items[stack:get_name()] - if itemdef - and (itemdef.wear_represents or "mechanical_wear") == "mechanical_wear" - and stack:get_wear() ~= 0 then - stack:set_wear(0) - end - return stack -end - -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.items_list - unified_inventory.activefilter[player_name] = "" - unified_inventory.active_search_direction[player_name] = "nochange" - unified_inventory.apply_filter(player, "", "nochange") - unified_inventory.current_searchbox[player_name] = "" - unified_inventory.alternate[player_name] = 1 - unified_inventory.current_item[player_name] = nil - unified_inventory.current_craft_direction[player_name] = "recipe" - unified_inventory.set_inventory_formspec(player, - unified_inventory.default) - - -- Refill slot - local refill = minetest.create_detached_inventory(player_name.."refill", { - allow_put = function(inv, listname, index, stack, player) - local player_name = player:get_player_name() - if unified_inventory.is_creative(player_name) then - return stack:get_count() - else - return 0 - end - end, - on_put = function(inv, listname, index, stack, player) - local player_name = player:get_player_name() - local handle_refill = (minetest.registered_items[stack:get_name()] or {}).on_refill or default_refill - stack = handle_refill(stack) - inv:set_stack(listname, index, stack) - minetest.sound_play("electricity", - {to_player=player_name, gain = 1.0}) - end, - }) - refill:set_size("main", 1) -end) - -minetest.register_on_player_receive_fields(function(player, formname, fields) - local player_name = player:get_player_name() - - local ui_peruser,draw_lite_mode = unified_inventory.get_per_player_formspec(player_name) - - if formname ~= "" then - return - end - - if fields.hidebutton then --MFF crabman(29/11/2015) hide guide, textfield bug - if not unified_inventory.hidden_guide[player_name] then - unified_inventory.hidden_guide[player_name] = true - else - unified_inventory.hidden_guide[player_name] = false - end - unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name]) - return - end - - -- always take new search text, even if not searching on it yet - if fields.searchbox - and fields.searchbox ~= unified_inventory.current_searchbox[player_name] then - unified_inventory.current_searchbox[player_name] = fields.searchbox - unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name]) - end - - for i, def in pairs(unified_inventory.buttons) do - if fields[def.name] then - def.action(player) - minetest.sound_play("click", - {to_player=player_name, gain = 0.1}) - return - end - end - - -- Inventory page controls - local start = math.floor( - unified_inventory.current_index[player_name] / ui_peruser.items_per_page + 1) - local start_i = start - local pagemax = math.floor( - (#unified_inventory.filtered_items_list[player_name] - 1) - / (ui_peruser.items_per_page) + 1) - - if fields.start_list then - start_i = 1 - end - if fields.rewind1 then - start_i = start_i - 1 - end - if fields.forward1 then - start_i = start_i + 1 - end - if fields.rewind3 then - start_i = start_i - 3 - end - if fields.forward3 then - start_i = start_i + 3 - end - if fields.end_list then - start_i = pagemax - end - if start_i < 1 then - start_i = 1 - end - if start_i > pagemax then - start_i = pagemax - end - if start_i ~= start then - minetest.sound_play("paperflip1", - {to_player=player_name, gain = 1.0}) - unified_inventory.current_index[player_name] = (start_i - 1) * ui_peruser.items_per_page + 1 - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) - end - - local clicked_item - for name, value in pairs(fields) do - if string.sub(name, 1, 12) == "item_button_" then - local new_dir, mangled_item = string.match(name, "^item_button_([a-z]+)_(.*)$") - clicked_item = unified_inventory.demangle_for_formspec(mangled_item) - if string.sub(clicked_item, 1, 6) == "group:" then - minetest.sound_play("click", {to_player=player_name, gain = 0.1}) - unified_inventory.apply_filter(player, clicked_item, new_dir) - return - end - if new_dir == "recipe" - or new_dir == "usage" then - unified_inventory.current_craft_direction[player_name] = new_dir - end - break - end - end - if clicked_item then - minetest.sound_play("click", - {to_player=player_name, gain = 0.1}) - local page = unified_inventory.current_page[player_name] - local player_creative = unified_inventory.is_creative(player_name) - if not player_creative then - page = "craftguide" - end - if page == "craftguide" then - unified_inventory.current_item[player_name] = clicked_item - unified_inventory.alternate[player_name] = 1 - unified_inventory.set_inventory_formspec(player, "craftguide") - elseif player_creative then - local inv = player:get_inventory() - local stack = ItemStack(clicked_item) - stack:set_count(stack:get_stack_max()) - if inv:room_for_item("main", stack) then - inv:add_item("main", stack) - end - end - end - - if fields.searchbutton then - unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange") - unified_inventory.current_searchbox[player_name] = "" - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) - minetest.sound_play("paperflip2", - {to_player=player_name, gain = 1.0}) - end - - -- alternate button - if not fields.alternate then - return - end - minetest.sound_play("click", - {to_player=player_name, gain = 0.1}) - local item_name = unified_inventory.current_item[player_name] - if not item_name then - return - end - local crafts = unified_inventory.crafts_for[unified_inventory.current_craft_direction[player_name]][item_name] - if not crafts then - return - end - local alternates = #crafts - if alternates <= 1 then - return - end - local alternate = unified_inventory.alternate[player_name] + 1 - if alternate > alternates then - alternate = 1 - end - unified_inventory.alternate[player_name] = alternate - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) -end) - diff --git a/mods/unified_inventory/depends.txt b/mods/unified_inventory/depends.txt deleted file mode 100755 index 2b728903..00000000 --- a/mods/unified_inventory/depends.txt +++ /dev/null @@ -1,5 +0,0 @@ -sethome -creative? -intllib? -datastorage? - diff --git a/mods/unified_inventory/group.lua b/mods/unified_inventory/group.lua deleted file mode 100755 index 9bf6895e..00000000 --- a/mods/unified_inventory/group.lua +++ /dev/null @@ -1,108 +0,0 @@ -function unified_inventory.canonical_item_spec_matcher(spec) - local specname = ItemStack(spec):get_name() - if specname:sub(1, 6) == "group:" then - local group_names = specname:sub(7):split(",") - return function (itemname) - local itemdef = minetest.registered_items[itemname] - for _, group_name in ipairs(group_names) do - if (itemdef.groups[group_name] or 0) == 0 then - return false - end - end - return true - end - else - return function (itemname) return itemname == specname end - end -end - -function unified_inventory.item_matches_spec(item, spec) - local itemname = ItemStack(item):get_name() - return unified_inventory.canonical_item_spec_matcher(spec)(itemname) -end - -unified_inventory.registered_group_items = { - mesecon_conductor_craftable = "mesecons:wire_00000000_off", - stone = "default:cobble", - wool = "wool:white", -} - -function unified_inventory.register_group_item(groupname, itemname) - unified_inventory.registered_group_items[groupname] = itemname -end - - --- This is used when displaying craft recipes, where an ingredient is --- specified by group rather than as a specific item. A single-item group --- is represented by that item, with the single-item status signalled --- in the "sole" field. If the group contains no items at all, the item --- field will be nil. --- --- Within a multiple-item group, we prefer to use an item that has the --- same specific name as the group, and if there are more than one of --- those items we prefer the one registered for the group by a mod. --- Among equally-preferred items, we just pick the one with the --- lexicographically earliest name. --- --- The parameter to this function isn't just a single group name. --- It may be a comma-separated list of group names. This is really a --- "group:..." ingredient specification, minus the "group:" prefix. - -local function compute_group_item(group_name_list) - local group_names = group_name_list:split(",") - local candidate_items = {} - for itemname, itemdef in pairs(minetest.registered_items) do - if (itemdef.groups.not_in_creative_inventory or 0) == 0 then - local all = true - for _, group_name in ipairs(group_names) do - if (itemdef.groups[group_name] or 0) == 0 then - all = false - end - end - if all then table.insert(candidate_items, itemname) end - end - end - local num_candidates = #candidate_items - if num_candidates == 0 then - return {sole = true} - elseif num_candidates == 1 then - return {item = candidate_items[1], sole = true} - end - local is_group = {} - local registered_rep = {} - for _, group_name in ipairs(group_names) do - is_group[group_name] = true - local rep = unified_inventory.registered_group_items[group_name] - if rep then registered_rep[rep] = true end - end - local bestitem = "" - local bestpref = 0 - for _, item in ipairs(candidate_items) do - local pref - if registered_rep[item] then - pref = 4 - elseif string.sub(item, 1, 8) == "default:" and is_group[string.sub(item, 9)] then - pref = 3 - elseif is_group[item:gsub("^[^:]*:", "")] then - pref = 2 - else - pref = 1 - end - if pref > bestpref or (pref == bestpref and item < bestitem) then - bestitem = item - bestpref = pref - end - end - return {item = bestitem, sole = false} -end - - -local group_item_cache = {} - -function unified_inventory.get_group_item(group_name) - if not group_item_cache[group_name] then - group_item_cache[group_name] = compute_group_item(group_name) - end - return group_item_cache[group_name] -end - diff --git a/mods/unified_inventory/image_credits.txt b/mods/unified_inventory/image_credits.txt deleted file mode 100755 index b1489e4f..00000000 --- a/mods/unified_inventory/image_credits.txt +++ /dev/null @@ -1,66 +0,0 @@ -bags_small.png: - http://www.clker.com/clipart-moneybag-empty.html - -bags_medium.png: - http://www.clker.com/clipart-backpack-1.html - -bags_large.png / ui_bags_icon.png: - http://www.clker.com/clipart-backpack-green-brown.html - -ui_craftguide_icon.png / ui_craft_icon.png - http://commons.wikimedia.org/wiki/File:Advancedsettings.png - -ui_doubleleft_icon.png - http://commons.wikimedia.org/wiki/File:Media-seek-backward.svg - -ui_doubleright_icon.png - http://commons.wikimedia.org/wiki/File:Media-seek-forward.svg - -ui_left_icon.png / ui_right_icon.png - http://commons.wikimedia.org/wiki/File:Media-playback-start.svg - -ui_skip_backward_icon.png - http://commons.wikimedia.org/wiki/File:Media-skip-backward.svg - -ui_skip_forward_icon.png - http://commons.wikimedia.org/wiki/File:Media-skip-forward.svg - -ui_gohome_icon.png / ui_home_icon.png / ui_sethome_icon.png - http://commons.wikimedia.org/wiki/File:Home_256x256.png - -ui_moon_icon.png - http://commons.wikimedia.org/wiki/File:FullMoon2010.jpg - -ui_sun_icon.png - http://commons.wikimedia.org/wiki/File:2012-10-13_15-29-35-sun.jpg - -ui_trash_icon.png - http://www.clker.com/clipart-29090.html - http://www.clker.com/clipart-trash.html - -ui_search_icon.png - http://www.clker.com/clipart-24887.html - -ui_off_icon.png / ui_on_icon.png - http://www.clker.com/clipart-on-off-switches.html - -ui_waypoints_icon.png - http://www.clker.com/clipart-map-pin-red.html - -ui_circular_arrows_icon.png - http://www.clker.com/clipart-circular-arrow-pattern.html - -ui_pencil_icon.pnc - http://www.clker.com/clipart-2256.html - -ui_waypoint_set_icon.png - http://www.clker.com/clipart-larger-flag.html - -ui_xyz_off_icon.png - http://commons.wikimedia.org/wiki/File:No_sign.svg - -ui_ok_icon.png - http://commons.wikimedia.org/wiki/File:Yes_check.svg - -inventory_plus_worldedit_gui.png - http://commons.wikimedia.org/wiki/File:Erioll_world_2.svg diff --git a/mods/unified_inventory/init.lua b/mods/unified_inventory/init.lua deleted file mode 100755 index 00b66e03..00000000 --- a/mods/unified_inventory/init.lua +++ /dev/null @@ -1,70 +0,0 @@ --- Unified Inventory for Minetest 0.4.8+ - -local modpath = minetest.get_modpath(minetest.get_current_modname()) -local worldpath = minetest.get_worldpath() - --- Data tables definitions -unified_inventory = { - activefilter = {}, - active_search_direction = {}, - alternate = {}, - current_page = {}, - current_searchbox = {}, - current_index = {}, - current_item = {}, - current_craft_direction = {}, - registered_craft_types = {}, - crafts_for = {usage = {}, recipe = {} }, - players = {}, - items_list_size = 0, - items_list = {}, - filtered_items_list_size = {}, - filtered_items_list = {}, - pages = {}, - buttons = {}, - hidden_guide = {}, --MFF crabman(29/11/2015) hide guide, textfield bug - - -- Homepos stuff - home_pos = {}, - home_filename = worldpath.."/unified_inventory_home.home", - - -- Default inventory page - default = "craft", - - -- intllib - gettext = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end, - - -- "Lite" mode - lite_mode = minetest.setting_getbool("unified_inventory_lite"), - - pagecols = 8, - pagerows = 10, - page_y = 0, - formspec_y = 1, - main_button_x = 0, - main_button_y = 9, - craft_result_x = 0.3, - craft_result_y = 0.5, - form_header_y = 0 -} - --- Disable default creative inventory -if rawget(_G, "creative_inventory") then - function creative_inventory.set_creative_formspec(player, start_i, pagenum) - return - end -end - -dofile(modpath.."/group.lua") -dofile(modpath.."/api.lua") -dofile(modpath.."/internal.lua") -dofile(modpath.."/callbacks.lua") -dofile(modpath.."/register.lua") -dofile(modpath.."/bags.lua") - -dofile(modpath.."/item_names.lua") - -if minetest.get_modpath("datastorage") then - dofile(modpath.."/waypoints.lua") -end - diff --git a/mods/unified_inventory/internal.lua b/mods/unified_inventory/internal.lua deleted file mode 100755 index f3475423..00000000 --- a/mods/unified_inventory/internal.lua +++ /dev/null @@ -1,355 +0,0 @@ -local S = unified_inventory.gettext - --- This pair of encoding functions is used where variable text must go in --- button names, where the text might contain formspec metacharacters. --- We can escape button names for the formspec, to avoid screwing up --- form structure overall, but they then don't get de-escaped, and so --- the input we get back from the button contains the formspec escaping. --- This is a game engine bug, and in the anticipation that it might be --- fixed some day we don't want to rely on it. So for safety we apply --- an encoding that avoids all formspec metacharacters. -function unified_inventory.mangle_for_formspec(str) - return string.gsub(str, "([^A-Za-z0-9])", function (c) return string.format("_%d_", string.byte(c)) end) -end -function unified_inventory.demangle_for_formspec(str) - return string.gsub(str, "_([0-9]+)_", function (v) return string.char(v) end) -end - -function unified_inventory.get_per_player_formspec(player_name) - local lite = unified_inventory.lite_mode and not minetest.check_player_privs(player_name, {ui_full=true}) - - local ui = {} - ui.pagecols = unified_inventory.pagecols - ui.pagerows = unified_inventory.pagerows - ui.page_y = unified_inventory.page_y - ui.formspec_y = unified_inventory.formspec_y - ui.main_button_x = unified_inventory.main_button_x - ui.main_button_y = unified_inventory.main_button_y - ui.craft_result_x = unified_inventory.craft_result_x - ui.craft_result_y = unified_inventory.craft_result_y - ui.form_header_y = unified_inventory.form_header_y - - if lite then - ui.pagecols = 4 - ui.pagerows = 6 - ui.page_y = 0.25 - ui.formspec_y = 0.47 - ui.main_button_x = 8.2 - ui.main_button_y = 6.5 - ui.craft_result_x = 2.8 - ui.craft_result_y = 3.4 - ui.form_header_y = -0.1 - end - - ui.items_per_page = ui.pagecols * ui.pagerows - return ui, lite -end - -function unified_inventory.get_formspec(player, page) - - if not player then - return "" - end - - local player_name = player:get_player_name() - local ui_peruser,draw_lite_mode = unified_inventory.get_per_player_formspec(player_name) - - unified_inventory.current_page[player_name] = page - local pagedef = unified_inventory.pages[page] - - local formspec = { - "size[14,10]", - "background[-0.19,-0.25;14.4,10.75;ui_form_bg.png]" -- Background - } - local n = 3 - - if draw_lite_mode then - formspec[1] = "size[11,7.7]" - formspec[2] = "background[-0.19,-0.2;11.4,8.4;ui_form_bg.png]" - end - - if unified_inventory.is_creative(player_name) - and page == "craft" then - formspec[n] = "background[0,"..(ui_peruser.formspec_y + 2)..";1,1;ui_single_slot.png]" - n = n+1 - end - - -- Current page - if not unified_inventory.pages[page] then - return "" -- Invalid page name - end - - local perplayer_formspec = unified_inventory.get_per_player_formspec(player_name) - local fsdata = pagedef.get_formspec(player, perplayer_formspec) - - formspec[n] = fsdata.formspec - n = n+1 - - local privs = minetest.get_player_privs(player_name) --Modif MFF (Crabman 13/10/2015) not show if player has not privs requiered - local button_row = 0 - local button_col = 0 - - -- Main buttons - - local filtered_inv_buttons = {} - - for i, def in pairs(unified_inventory.buttons) do - if not (draw_lite_mode and def.hide_lite) and (not def.show_with or (privs[def.show_with] and privs[def.show_with] == true)) then --Modif MFF (Crabman 13/10/2015) not show if player has not privs requiered - table.insert(filtered_inv_buttons, def) - end - end - - local i = 1 --Modif MFF (Crabman 13/10/2015) 12 buttons max by row - for _, def in pairs(filtered_inv_buttons) do --Modif MFF (Crabman 13/10/2015) - - if draw_lite_mode and i > 4 then - button_row = 1 - button_col = 1 - elseif not draw_lite_mode and i > 12 then --Modif MFF (Crabman 13/10/2015) - button_row = 1 - i = 1 - end - - if def.type == "image" then - formspec[n] = "image_button[" - formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4) - formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;" - formspec[n+3] = minetest.formspec_escape(def.image)..";" - formspec[n+4] = minetest.formspec_escape(def.name)..";]" - formspec[n+5] = "tooltip["..minetest.formspec_escape(def.name) - formspec[n+6] = ";"..(def.tooltip or "").."]" - n = n+7 - end - i = i + 1 --Modif MFF (Crabman 13/10/2015) - end - - if fsdata.draw_inventory ~= false then - -- Player inventory - formspec[n] = "listcolors[#00000000;#00000000]" - formspec[n+1] = "list[current_player;main;0,"..(ui_peruser.formspec_y + 3.5)..";8,4;]" - n = n+2 - end - - if fsdata.draw_item_list == false then - return table.concat(formspec, "") - end - - if not unified_inventory.hidden_guide[player_name] then --MFF crabman(29/11/2015) hide guide, textfield bug - formspec[n] = "image_button[13.2,0.1;.8,.8;ui_on_icon.png;hidebutton;]" - .. "tooltip[hidebutton;" ..S("Hide guide") .. "]" - n = n+1 - else - formspec[n] = "image_button[13.2,0.1;.8,.8;ui_off_icon.png;hidebutton;]" - .. "tooltip[hidebutton;" ..S("Show guide") .. "]" - return table.concat(formspec, "") - end - - -- Controls to flip items pages - local start_x = 9.2 - - if not draw_lite_mode then - formspec[n] = - "image_button[" .. (start_x + 0.6 * 0) - .. ",9;.8,.8;ui_skip_backward_icon.png;start_list;]" - .. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]" - - .. "image_button[" .. (start_x + 0.6 * 1) - .. ",9;.8,.8;ui_doubleleft_icon.png;rewind3;]" - .. "tooltip[rewind3;" .. minetest.formspec_escape(S("Back three pages")) .. "]" - .. "image_button[" .. (start_x + 0.6 * 2) - .. ",9;.8,.8;ui_left_icon.png;rewind1;]" - .. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]" - - .. "image_button[" .. (start_x + 0.6 * 3) - .. ",9;.8,.8;ui_right_icon.png;forward1;]" - .. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]" - .. "image_button[" .. (start_x + 0.6 * 4) - .. ",9;.8,.8;ui_doubleright_icon.png;forward3;]" - .. "tooltip[forward3;" .. minetest.formspec_escape(S("Forward three pages")) .. "]" - - .. "image_button[" .. (start_x + 0.6 * 5) - .. ",9;.8,.8;ui_skip_forward_icon.png;end_list;]" - .. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]" - else - formspec[n] = - "image_button[" .. (8.2 + 0.65 * 0) - .. ",5.8;.8,.8;ui_skip_backward_icon.png;start_list;]" - .. "tooltip[start_list;" .. minetest.formspec_escape(S("First page")) .. "]" - .. "image_button[" .. (8.2 + 0.65 * 1) - .. ",5.8;.8,.8;ui_left_icon.png;rewind1;]" - .. "tooltip[rewind1;" .. minetest.formspec_escape(S("Back one page")) .. "]" - .. "image_button[" .. (8.2 + 0.65 * 2) - .. ",5.8;.8,.8;ui_right_icon.png;forward1;]" - .. "tooltip[forward1;" .. minetest.formspec_escape(S("Forward one page")) .. "]" - .. "image_button[" .. (8.2 + 0.65 * 3) - .. ",5.8;.8,.8;ui_skip_forward_icon.png;end_list;]" - .. "tooltip[end_list;" .. minetest.formspec_escape(S("Last page")) .. "]" - end - n = n+1 - - -- Search box - - if not draw_lite_mode then - formspec[n] = "field[9.5,8.325;3,1;searchbox;;" - .. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]" - formspec[n+1] = "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]" - .. "tooltip[searchbutton;" ..S("Search") .. "]" - else - formspec[n] = "field[8.5,5.225;2.2,1;searchbox;;" - .. minetest.formspec_escape(unified_inventory.current_searchbox[player_name]) .. "]" - formspec[n+1] = "image_button[10.3,5;.8,.8;ui_search_icon.png;searchbutton;]" - .. "tooltip[searchbutton;" ..S("Search") .. "]" - end - n = n+2 - - local no_matches = "No matching items" - if draw_lite_mode then - no_matches = "No matches." - end - - -- Items list - if #unified_inventory.filtered_items_list[player_name] == 0 then - formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. S(no_matches) .. "]" - else - local dir = unified_inventory.active_search_direction[player_name] - local list_index = unified_inventory.current_index[player_name] - local page = math.floor(list_index / (ui_peruser.items_per_page) + 1) - local pagemax = math.floor( - (#unified_inventory.filtered_items_list[player_name] - 1) - / (ui_peruser.items_per_page) + 1) - local item = {} - for y = 0, ui_peruser.pagerows - 1 do - for x = 0, ui_peruser.pagecols - 1 do - local name = unified_inventory.filtered_items_list[player_name][list_index] - if minetest.registered_items[name] then - formspec[n] = "item_image_button[" - ..(8.2 + x * 0.7).."," - ..(ui_peruser.formspec_y + ui_peruser.page_y + y * 0.7)..";.81,.81;" - ..name..";item_button_"..dir.."_" - ..unified_inventory.mangle_for_formspec(name)..";]" - n = n+1 - list_index = list_index + 1 - end - end - end - formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..S("Page") .. ": " - .. S("%s of %s"):format(page,pagemax).."]" - end - n= n+1 - - if unified_inventory.activefilter[player_name] ~= "" then - formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. S("Filter") .. ":]" - formspec[n+1] = "label[9.1,"..(ui_peruser.form_header_y + 0.4)..";"..minetest.formspec_escape(unified_inventory.activefilter[player_name]).."]" - end - return table.concat(formspec, "") -end - -function unified_inventory.set_inventory_formspec(player, page) - if player then - player:set_inventory_formspec(unified_inventory.get_formspec(player, page)) - end -end - ---apply filter to the inventory list (create filtered copy of full one) -function unified_inventory.apply_filter(player, filter, search_dir) - if not player then - return false - end - local player_name = player:get_player_name() - local lfilter = string.lower(filter) - local ffilter - if lfilter:sub(1, 6) == "group:" then - local groups = lfilter:sub(7):split(",") - ffilter = function(name, def) - for _, group in ipairs(groups) do - if not def.groups[group] - or def.groups[group] <= 0 then - return false - end - end - return true - end - else - ffilter = function(name, def) - local lname = string.lower(name) - local ldesc = string.lower(def.description) - return string.find(lname, lfilter, 1, true) or string.find(ldesc, lfilter, 1, true) - end - end - 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 ~= "" - and ffilter(name, def) - and (unified_inventory.is_creative(player_name) - or unified_inventory.crafts_for.recipe[def.name]) then - table.insert(unified_inventory.filtered_items_list[player_name], name) - end - end - table.sort(unified_inventory.filtered_items_list[player_name]) - unified_inventory.filtered_items_list_size[player_name] = #unified_inventory.filtered_items_list[player_name] - unified_inventory.current_index[player_name] = 1 - unified_inventory.activefilter[player_name] = filter - unified_inventory.active_search_direction[player_name] = search_dir - unified_inventory.set_inventory_formspec(player, - unified_inventory.current_page[player_name]) -end - -function unified_inventory.items_in_group(groups) - local items = {} - for name, item in pairs(minetest.registered_items) do - for _, group in pairs(groups:split(',')) do - if item.groups[group] then - table.insert(items, name) - end - end - end - return items -end - -function unified_inventory.sort_inventory(inv) - local inlist = inv:get_list("main") - local typecnt = {} - local typekeys = {} - for _, st in ipairs(inlist) do - if not st:is_empty() then - local n = st:get_name() - local w = st:get_wear() - local m = st:get_metadata() - local k = string.format("%s %05d %s", n, w, m) - if not typecnt[k] then - typecnt[k] = { - name = n, - wear = w, - metadata = m, - stack_max = st:get_stack_max(), - count = 0, - } - table.insert(typekeys, k) - end - typecnt[k].count = typecnt[k].count + st:get_count() - end - end - table.sort(typekeys) - local outlist = {} - for _, k in ipairs(typekeys) do - local tc = typecnt[k] - while tc.count > 0 do - local c = math.min(tc.count, tc.stack_max) - table.insert(outlist, ItemStack({ - name = tc.name, - wear = tc.wear, - metadata = tc.metadata, - count = c, - })) - tc.count = tc.count - c - end - end - if #outlist > #inlist then return end - while #outlist < #inlist do - table.insert(outlist, ItemStack(nil)) - end - inv:set_list("main", outlist) -end diff --git a/mods/unified_inventory/item_names.lua b/mods/unified_inventory/item_names.lua deleted file mode 100755 index 31af81bc..00000000 --- a/mods/unified_inventory/item_names.lua +++ /dev/null @@ -1,53 +0,0 @@ --- Based on 4itemnames mod by 4aiman - -local wield = {} -local huds = {} -local dtimes = {} -local dlimit = 3 -- HUD element will be hidden after this many seconds -local air_hud_mod = minetest.get_modpath("4air") -local hud_mod = minetest.get_modpath("hud") - -local function set_hud(player) - local player_name = player:get_player_name() - local off = {x=0, y=-70} - if air_hud_mod or hud_mod then - off.y = off.y - 20 - end - huds[player_name] = player:hud_add({ - hud_elem_type = "text", - position = {x=0.5, y=1}, - offset = off, - alignment = {x=0, y=0}, - number = 0xFFFFFF , - text = "", - }) -end - -minetest.register_on_joinplayer(function(player) - minetest.after(0, set_hud, player) -end) - -minetest.register_globalstep(function(dtime) - for _, player in pairs(minetest.get_connected_players()) do - local player_name = player:get_player_name() - local wstack = player:get_wielded_item():get_name() - - if dtimes[player_name] and dtimes[player_name] < dlimit then - dtimes[player_name] = dtimes[player_name] + dtime - if dtimes[player_name] > dlimit and huds[player_name] then - player:hud_change(huds[player_name], 'text', "") - end - end - - if wstack ~= wield[player_name] then - wield[player_name] = wstack - dtimes[player_name] = 0 - if huds[player_name] then - local def = minetest.registered_items[wstack] - local desc = def and def.description or "" - player:hud_change(huds[player_name], 'text', desc) - end - end - end -end) - diff --git a/mods/unified_inventory/locale/de.txt b/mods/unified_inventory/locale/de.txt deleted file mode 100755 index d678b683..00000000 --- a/mods/unified_inventory/locale/de.txt +++ /dev/null @@ -1,71 +0,0 @@ -# Translation mostly by Xanthin - -### bags.lua ### -Bags = Rucksaecke -Bag 1 = Rucksack 1 -Bag 2 = Rucksack 2 -Bag 3 = Rucksack 3 -Bag 4 = Rucksack 4 -Small Bag = Rucksack (klein) -Medium Bag = Rucksack (mittel) -Large Bag = Rucksack (gross) - -### inernal.lua ### -First page = Erste Seite -Back three pages = Drei Seiten zurueckblaettern -Back one page = Eine Seiten zurueckblaettern -Forward one page = Eine Seiten vorblaettern -Forward three pages = Drei Seiten vorblaettern -Last page = Letzte Seite -No matching items = Keine passenden Gegenstände -Page = Seite -%s of %s = %s von %s -Filter = Suche -Search = Suchen - -### register.lua ### -Can use the creative inventory = Kann das Kreativinventar nutzen -Home position set to: %s = Ausgangsposition nach: %s gesetzt -Time of day set to 6am = Tageszeit auf 6 Uhr morgens geaendert -You don't have the settime privilege! = Du hast nicht das "settime" Privileg! -Time of day set to 9pm = Tageszeit auf 9 Uhr abends geaendert -This button has been disabled outside of creative mode to prevent accidental inventory trashing. Use the trash slot instead. = Diese Funktion ist ausserhalb des Kreativmodus deaktiviert um ein versehentliches Loeschen des ganzen Inventars zu verhindern.\nNutze stattdessen das Muellfeld. -Inventory Cleared! = Inventar geleert! -Crafting = Bauen -Trash: = Muell: -Refill: = Nachfuellen: -Crafting Guide = Bauanleitung -Method: = Methode: -Result: %s = Ergebnis: %s -crafting = Bauen -shapeless crafting = Formloses Bauen -cooking = Kochen -alloy cooking = Legierung Kochen -Copy to craft grid: = Kopiere ins Baufeld: -All = Alles -Recipe %s of %s = Rezept %s von %s -Alternate = Alternative -Crafting Grid = - -### waypoints.lua ### -White = Weiß -Yellow = Gelb -Red = Rot -Green = Gruen -Blue = Blau -Waypoints = Markierungen -Waypoint active = Markierung aktiv -Waypoint inactive = Markierung inaktiv -World position = Welt Position -Name = -HUD text color = -Edit waypoint name = Name der Markierung aendern -Rename waypoint = Markierung umbenennen -Change color of waypoint display = Farbe der Darstellung der Markierung aendern -Set waypoint to current location = Setze Markierung zur derzeitigen Position -Make waypoint visible = Markierung sichtbar machen -Make waypoint invisible = Markierung verstecken -Disable display of waypoint coordinates = -Enable display of waypoint coordinates = -Finish editing = -Select Waypoint #%d = diff --git a/mods/unified_inventory/locale/es.txt b/mods/unified_inventory/locale/es.txt deleted file mode 100755 index 9382c79c..00000000 --- a/mods/unified_inventory/locale/es.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Translation by Diego Martínez - -# Template -### bags.lua ### -Bags = Bolsas -Bag 1 = Bolsa 1 -Bag 2 = Bolsa 2 -Bag 3 = Bolsa 3 -Bag 4 = Bolsa 4 -Small Bag = Bolsa Pequeña -Medium Bag = Bolsa Mediana -Large Bag = Bolsa Grande - -### inernal.lua ### -First page = -Back three pages = -Back one page = -Forward one page = -Forward three pages = -Last page = -No matching items = -Page = Página -%s of %s = %s de %s -Filter = Filtro -Search = - -### register.lua ### -Can use the creative inventory = Puede usar el inventario creativo -Home position set to: %s = Posición de hogar cambiada a: %s -Time of day set to 6am = Hora del día cambiada a 6AM -You don't have the settime priviledge! = ¡No tienes el privilegio `settime'! -Time of day set to 9pm = Hora del día cambiada a 9PM -This button has been disabled outside of creative mode to prevent accidental inventory trashing. Use the trash slot instead. = Éste botón ha sido deshabilitado para prevenir la destrucción accidental del inventario.\nUsa la ranura para basura en su lugar. -Inventory Cleared! = ¡Inventario limpio! -Crafting = Elaboración -Trash: = Basura: -Refill: = Rellenar: -Crafting Guide = Guía de Elaboración -Method: = Método: -Result: %s = Resultado: %s -crafting = elaboración -shapeless crafting = elaboración sin forma -cooking = hornear -alloy cooking = horneado de aleación -Copy to craft grid: = Copiar al cuadro de elaboración -All = Todos -Recipe %s of %s = Receta %s de %s -Alternate = Alternar -Crafting Grid = - -### waypoints.lua ### -White = Blanco -Yellow = Amarillo -Red = Rojo -Green = Verde -Blue = Azul -Waypoints = Puntos de paso -Waypoint active = Punto de paso activo -Waypoint inactive = Punto de paso inactivo -World position = Posición en el mundo -Name = Nombre -HUD text color = Color del HUD -Edit waypoint name = -Rename waypoint = -Change color of waypoint display = -Set waypoint to current location = -Make waypoint visible = -Make waypoint invisible = -Disable display of waypoint coordinates = -Enable display of waypoint coordinates = -Finish editing = -Select Waypoint #%d = diff --git a/mods/unified_inventory/locale/fr.txt b/mods/unified_inventory/locale/fr.txt deleted file mode 100755 index 01e975e1..00000000 --- a/mods/unified_inventory/locale/fr.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Translation by kilbith - -# Template -### bags.lua ### -Bags = Sacs -Bag 1 = Sac 1 -Bag 2 = Sac 2 -Bag 3 = Sac 3 -Bag 4 = Sac 4 -Small Bag = Petit sac -Medium Bag = Sac moyen -Large Bag = Grand sac - -### inernal.lua ### -First page = 1ère page -Back three pages = 3 pages en arrière -Back one page = Page précédente -Forward one page = Page suivante -Forward three pages = 3 pages en avant -Last page = Dernière page -No matching items = Aucun élément correspondant -Page = Page -%s of %s = %s de %s -Filter = Filtre -Search = Rechercher - -### register.lua ### -Can use the creative inventory = Vous pouvez utiliser l'inventaire créatif -Home position set to: %s = Position de votre base fixée à : %s -Time of day set to 6am = Heure fixée à 6h -You don't have the settime priviledge! = Vous n'avez pas le privilège 'settime' ! -Time of day set to 9pm = Heure fixée à 21h -This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Ce bouton a été désactivé en dehors du mode créatif pour éviter des saccages dans l'inventaire.\nUtilisez plutôt la case poubelle. -Inventory Cleared! = Inventaire vidé ! -Crafting = Création -Trash: = Poubelle : -Refill: = Remplir : -Crafting Guide = Guide de création -Method: = Méthode : -Result: %s = Résultat : %s -crafting = fabrication -shapeless crafting = fabrication sans forme -cooking = cuisson -alloy cooking = cuisson des métaux -Copy to craft grid: = Copier sur la grille de création -All = Tout -Recipe %s of %s = Recette %s de %d -Alternate = Alternative -Crafting Grid = Grille de création - -### waypoints.lua ### -White = Blanc -Yellow = Jaune -Red = Rouge -Green = Vert -Blue = Bleu -Waypoints = Point de passage -Waypoint active = Point de passage actif -Waypoint inactive = Point de passage inactif -World position = Position dans le monde -Name = Nom -HUD text color = Couleur de texte du HUD -Edit waypoint name = Editer le nom du point de passage -Rename waypoint = Renommer le point de passage -Change color of waypoint display = Changer la couleur du point de passage -Set waypoint to current location = Marquer un point de passage à la position actuelle -Make waypoint visible = Rendre visible le point de passage -Make waypoint invisible = Rendre invisible le point de passage -Disable display of waypoint coordinates = Masquer les coordonnées des points de passages -Enable display of waypoint coordinates = Montrer les coordonnées des points de passages -Finish editing = Terminer l'édition -Select Waypoint #%d = Choisir un point de passage #%d diff --git a/mods/unified_inventory/locale/pl.txt b/mods/unified_inventory/locale/pl.txt deleted file mode 100755 index 33003d8d..00000000 --- a/mods/unified_inventory/locale/pl.txt +++ /dev/null @@ -1,71 +0,0 @@ -# Translation by RealBadAngel - -### bags.lua ### -Bags = Plecaki -Bag 1 = Plecak 1 -Bag 2 = Plecak 2 -Bag 3 = Plecak 3 -Bag 4 = Plecak 4 -Small Bag = Maly plecak -Medium Bag = Sredni plecak -Large Bag = Duzy plecak - -### inernal.lua ### -First page = Pierwsza strona -Back three pages = 3 strony w tyl -Back one page = 1 strona w tyl -Forward one page = 1 strona do przodu -Forward three pages = 3 strony do przodu -Last page = Ostatnia strona -No matching items = Brak pasujacych przedmiotow -Page = Strona -%s of %s = %s z %s -Filter = Filtr -Search = Szukaj - -### register.lua ### -Can use the creative inventory = -Home position set to: %s = Pozycja domowa ustawiona na: %s -Time of day set to 6am = Czas ustawiony na 6:00 -You don't have the settime priviledge! = Nie masz uprawnien do zmiany czasu (settime)! -Time of day set to 9pm = Czas ustawiony na 21:00 -This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = -Inventory Cleared! = -Crafting = -Trash: = Smietnik: -Refill: = Uzupelnianie: -Crafting Guide = -Method: = Metoda: -Result: %s = Wynik: %s -crafting = -shapeless crafting = -cooking = -alloy cooking = -Copy to craft grid: = -All = Wszystko -Recipe %s of %s = Recepta %s z %s -Alternate = Alternatywa -Crafting Grid = - -### waypoints.lua ### -White = Bialy -Yellow = Zolty -Red = Czerwony -Green = Zielony -Blue = Niebieski -Waypoints = Punkty orientacyjne -Waypoint active = Punkt wlaczony -Waypoint inactive = Punkt wylaczony -World position = Pozycja -Name = Nazwa -HUD text color = Kolor tekstu HUD -Edit waypoint name = Edytuj nazwe punktu -Rename waypoint = Zmien nazwe punktu -Change color of waypoint display = Zmien kolor punktu -Set waypoint to current location = Ustaw punkt orientacyjny na biezacej pozycji -Make waypoint visible = Pokaz punkt -Make waypoint invisible = Nie pokazuj punktu -Disable display of waypoint coordinates = Pokazuj koordynaty punktu -Enable display of waypoint coordinates = Nie pokazuj koordynatow punktu -Finish editing = Zakoncz edycje -Select Waypoint #%d = Wybierz punkt #%d diff --git a/mods/unified_inventory/locale/ru.txt b/mods/unified_inventory/locale/ru.txt deleted file mode 100755 index 19481554..00000000 --- a/mods/unified_inventory/locale/ru.txt +++ /dev/null @@ -1,76 +0,0 @@ -# Translation by eternal_sorrow - -# Template -### bags.lua ### -Bags = Сумки -Bag 1 = Сумка 1 -Bag 2 = Сумка 2 -Bag 3 = Сумка 3 -Bag 4 = Сумка 4 -Small Bag = Малая сумка -Medium Bag = Средняя сумка -Large Bag = Большая сумка - -### inernal.lua ### -First page = Первая страница -Back three pages = Назад на три страницы -Back one page = Назад на одну страницу -Forward one page = Вперед на одну страницу -Forward three pages = Вперед на три страницы -Last page = Последняя страница -No matching items = Совпадений нет -Page = Страница -%s of %s = %s из %s -Filter = Фильтр -Search = Поиск - -### register.lua ### -Can use the creative inventory = Можно использовать инвентарь творческого режима -Home position set to: %s = Дом теперь расположен по коодинатам: %s -Time of day set to 6am = Установлено время 6 утра -You don't have the settime priviledge! = Вам не разрешено устанавливать время! -Time of day set to 9pm = Установлено время 9 вечера -This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Эта кнопка отключена вне творческого режима, чтобы предотвратить случайное уничтожение предметов.\nИспользуйте слот корзины вместо нее. -Inventory Cleared! = Инвентарь очищен! -Crafting = Крафт -Trash: = Корзина: -Refill: = Размножить: -Crafting Guide = Книга рецептов -Method: = Способ: -Result: %s = Результат: %s -crafting = крафт -shapeless crafting = бесформенный крафт -cooking = жарка -alloy cooking = приготовление сплавов -Copy to craft grid: = В решетку крафта: -All = Все -Recipe %s of %s = Рецепт %s из %s -Alternate = Следующий -Crafting Grid = Решетка крафта -Go home = Отправиться домой -Set time to day = День -Set time to night = Ночь -Clear inventory = Очистить инвентарь - -### waypoints.lua ### -White = Белый -Yellow = Желтый -Red = Красный -Green = Зелёный -Blue = Синий -Waypoints = Путевые точки -Waypoint active = Путевая точка активна -Waypoint inactive = Путевая точка неактивна -World position = Позиция -Name = Имя -HUD text color = Цвет текста -Edit waypoint name = Редактировать имя путевой точки -Rename waypoint = Переименовать путевую точку -Change color of waypoint display = Изменить цвет путевой точки -Set waypoint to current location = Установить путевую точку в текущем местоположении -Make waypoint visible = Сделать путевую точку видимой -Make waypoint invisible = Сделать путевую точку невидимой -Disable display of waypoint coordinates = Отключить отображение координат путевой точки -Enable display of waypoint coordinates = Включить отображение координат путевой точки -Finish editing = Завершить редактирование -Select Waypoint #%d = Выбрать путевую точку №%d diff --git a/mods/unified_inventory/locale/template.txt b/mods/unified_inventory/locale/template.txt deleted file mode 100755 index ae382e32..00000000 --- a/mods/unified_inventory/locale/template.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Translation by - -# Template -### bags.lua ### -Bags = -Bag 1 = -Bag 2 = -Bag 3 = -Bag 4 = -Small Bag = -Medium Bag = -Large Bag = - -### inernal.lua ### -First page = -Back three pages = -Back one page = -Forward one page = -Forward three pages = -Last page = -No matching items = -Page = -%s of %s = -Filter = -Search = - -### register.lua ### -Can use the creative inventory = -Home position set to: %s = -Time of day set to 6am = -You don't have the settime priviledge! = -Time of day set to 9pm = -This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = -Inventory Cleared! = -Crafting = -Trash: = -Refill: = -Crafting Guide = -Method: = -Result: %s = -crafting = -shapeless crafting = -cooking = -alloy cooking = -Copy to craft grid: = -All = -Recipe %s of %s = -Alternate = -Crafting Grid = - -### waypoints.lua ### -White = -Yellow = -Red = -Green = -Blue = -Waypoints = -Waypoint active = -Waypoint inactive = -World position = -Name = -HUD text color = -Edit waypoint name = -Rename waypoint = -Change color of waypoint display = -Set waypoint to current location = -Make waypoint visible = -Make waypoint invisible = -Disable display of waypoint coordinates = -Enable display of waypoint coordinates = -Finish editing = -Select Waypoint #%d = diff --git a/mods/unified_inventory/locale/tr.txt b/mods/unified_inventory/locale/tr.txt deleted file mode 100755 index c1d3207b..00000000 --- a/mods/unified_inventory/locale/tr.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Translation by Mahmutelmas06@hotmail.com - -# Template -### bags.lua ### -Bags = Çantalarım -Bag 1 = 1. Çanta -Bag 2 = 2. Çanta -Bag 3 = 3. Çanta -Bag 4 = 4. Çanta -Small Bag = Küçük Çanta -Medium Bag = Çanta -Large Bag = Büyük Çanta - -### inernal.lua ### -First page = İlk Sayfa -Back three pages = 3 Sayfa Gerile -Back one page = Geri -Forward one page = İleri -Forward three pages = 3 Sayfa İlerile -Last page = Son Sayfa -No matching items = Eşleşme yok -Page = Sayfa -%s of %s = %s dan %s -Filter = Süzgeç -Search = Ara - -### register.lua ### -Can use the creative inventory = Yaratıcı envanteri kullanabilir -Home position set to: %s = Yeni eviniz: %s -Time of day set to 6am = Saat 06:00 olarak ayarlandı -You don't have the settime priviledge = Saati düzenleme yetkiniz yok! -Time of day set to 9pm = Saat 19:00 olarak ayarlandı -This button has been disabled outside of creative mode to prevent accidental inventory trashing.\nUse the trash slot instead. = Yaratıcı modu dışında iken bu tuş kullanılamaz. -Inventory Cleared! = Envanter temizlendi! -Crafting = Üretim -Trash: = Çöp -Refill: = Doldur -Crafting Guide = Kılavuz -Method: = Yöntem -Result: %s = Çıktı: %s -crafting = üretim -shapeless crafting = şekilsiz üretim -cooking = pişirme -alloy cooking = karıştırma -Copy to craft grid: = Üretim tablosuna kopyala -All = Tümü -Recipe %s of %s = %s dan %s tarifi -Alternate = Altarnatif -Crafting Grid = Üretim tablosu - -### waypoints.lua ### -White = Beyaz -Yellow = Sarı -Red = Kırmızı -Green = Yeşil -Blue = Mavi -Waypoints = Konum Noktaları -Waypoint active = Konum Etkin -Waypoint inactive = Konum Devredışı -World position = Dünya konumu -Name = İsim -HUD text color = Metin rengi -Edit waypoint name = Konum Noktasını Düzenle -Rename waypoint = Konum Noktasını Adlandır -Change color of waypoint display = Konum Gösterge Rengi -Set waypoint to current location = Bulunduğun noktayı işaretle -Make waypoint visible = Konumlar görünür -Make waypoint invisible = Konumlar gözükmez -Disable display of waypoint coordinates = Koordinatları gizle -Enable display of waypoint coordinates = Koordinatları göster -Finish editing = Düzenleme bitti -Select Waypoint #%d = #%d konum noktası seç diff --git a/mods/unified_inventory/register.lua b/mods/unified_inventory/register.lua deleted file mode 100755 index 068eb239..00000000 --- a/mods/unified_inventory/register.lua +++ /dev/null @@ -1,492 +0,0 @@ -local S = unified_inventory.gettext - -minetest.register_privilege("creative", { - description = "Can use the creative inventory", - give_to_singleplayer = false, -}) - -minetest.register_privilege("ui_full", { - description = "Forces UI to display in Full mode when Lite mode is configured globally", - give_to_singleplayer = false, -}) - - -local trash = minetest.create_detached_inventory("trash", { - --allow_put = function(inv, listname, index, stack, player) - -- if unified_inventory.is_creative(player:get_player_name()) 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, -}) -trash:set_size("main", 1) - -unified_inventory.register_button("craft", { - type = "image", - image = "ui_craft_icon.png", - tooltip = S("Crafting Grid"), - show_with = false, --Modif MFF (Crabman 30/06/2015) -}) - -unified_inventory.register_button("craftguide", { - type = "image", - image = "ui_craftguide_icon.png", - tooltip = S("Crafting Guide"), - show_with = false, --Modif MFF (Crabman 30/06/2015) -}) - -unified_inventory.register_button("home_gui_set", { - type = "image", - image = "ui_sethome_icon.png", - tooltip = S("Set home position"), - hide_lite=true, - show_with = "interact", --Modif MFF (Crabman 30/06/2015) - action = function(player) - if home.sethome(player:get_player_name()) == true then --modif MFF - minetest.sound_play("dingdong", - {to_player=player:get_player_name(), gain = 1.0}) - end - end, -}) - - - - -unified_inventory.register_button("home_gui_go", { - type = "image", - image = "ui_gohome_icon.png", - tooltip = S("Go home"), - hide_lite=true, - show_with = "interact", --Modif MFF (Crabman 30/06/2015) - action = function(player) - if home.tohome(player:get_player_name()) == true then --modif MFF - minetest.sound_play("teleport", - {to_player=player:get_player_name(), gain = 1.0}) - end - end, -}) - -unified_inventory.register_button("misc_set_day", { - type = "image", - image = "ui_sun_icon.png", - tooltip = S("Set time to day"), - hide_lite=true, - show_with = "settime", --Modif MFF (Crabman 30/06/2015) - action = function(player) - local player_name = player:get_player_name() - if minetest.check_player_privs(player_name, {settime=true}) then - minetest.sound_play("birds", - {to_player=player_name, gain = 1.0}) - minetest.set_timeofday((6000 % 24000) / 24000) - minetest.chat_send_player(player_name, - S("Time of day set to 6am")) - else - minetest.chat_send_player(player_name, - S("You don't have the settime privilege!")) - end - end, -}) - -unified_inventory.register_button("misc_set_night", { - type = "image", - image = "ui_moon_icon.png", - tooltip = S("Set time to night"), - hide_lite=true, - show_with = "settime", --Modif MFF (Crabman 30/06/2015) - action = function(player) - local player_name = player:get_player_name() - if minetest.check_player_privs(player_name, {settime=true}) then - minetest.sound_play("owl", - {to_player=player_name, gain = 1.0}) - minetest.set_timeofday((21000 % 24000) / 24000) - minetest.chat_send_player(player_name, - S("Time of day set to 9pm")) - else - minetest.chat_send_player(player_name, - S("You don't have the settime privilege!")) - end - end, -}) - -unified_inventory.register_button("clear_inv", { - type = "image", - image = "ui_trash_icon.png", - tooltip = S("Clear inventory"), - show_with = "creative", --Modif MFF (Crabman 30/06/2015) - action = function(player) - local player_name = player:get_player_name() - if not unified_inventory.is_creative(player_name) then - minetest.chat_send_player(player_name, - S("This button has been disabled outside" - .." of creative mode to prevent" - .." accidental inventory trashing." - .."\nUse the trash slot instead.")) - return - end - player:get_inventory():set_list("main", {}) - minetest.chat_send_player(player_name, 'Inventory Cleared!') - minetest.sound_play("trash_all", - {to_player=player_name, gain = 1.0}) - end, -}) - -unified_inventory.register_page("craft", { - get_formspec = function(player, perplayer_formspec) - - local formspecy = perplayer_formspec.formspec_y - local formheadery = perplayer_formspec.form_header_y - - local player_name = player:get_player_name() - local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]" - formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]" - formspec = formspec.."label[0,"..formheadery..";Crafting]" - formspec = formspec.."listcolors[#00000000;#00000000]" - formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]" - formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]" - formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. S("Trash:") .. "]" - formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]" - formspec = formspec.."listring[current_name;craft]" - formspec = formspec.."listring[current_player;main]" - if unified_inventory.is_creative(player_name) then - formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. S("Refill:") .. "]" - formspec = formspec.."list[detached:"..minetest.formspec_escape(player_name).."refill;main;0,"..(formspecy +2)..";1,1;]" - end - return {formspec=formspec} - end, -}) - --- stack_image_button(): generate a form button displaying a stack of items --- --- Normally a simple item_image_button[] is used. If the stack contains --- more than one item, item_image_button[] doesn't have an option to --- display an item count in the way that an inventory slot does, so --- we have to fake it using the label facility. --- --- The specified item may be a group. In that case, the group will be --- represented by some item in the group, along with a flag indicating --- that it's a group. If the group contains only one item, it will be --- treated as if that item had been specified directly. - -local function stack_image_button(x, y, w, h, buttonname_prefix, item) - local name = item:get_name() - local count = item:get_count() - local show_is_group = false - local displayitem = name - local selectitem = name - if name:sub(1, 6) == "group:" then - local group_name = name:sub(7) - local group_item = unified_inventory.get_group_item(group_name) - show_is_group = not group_item.sole - displayitem = group_item.item or "unknown" - selectitem = group_item.sole and displayitem or name - end - local label = string.format("\n\n%s%7d", show_is_group and " G\n" or " ", count):gsub(" 1$", " .") - if label == "\n\n ." then label = "" end - return string.format("item_image_button[%f,%f;%u,%u;%s;%s;%s]", - x, y, w, h, - minetest.formspec_escape(displayitem), - minetest.formspec_escape(buttonname_prefix..unified_inventory.mangle_for_formspec(selectitem)), - label) -end - -local recipe_text = { - recipe = "Recipe", - usage = "Usage", -} -local no_recipe_text = { - recipe = "No recipes", - usage = "No usages", -} -local role_text = { - recipe = "Result", - usage = "Ingredient", -} -local other_dir = { - recipe = "usage", - usage = "recipe", -} - -unified_inventory.register_page("craftguide", { - get_formspec = function(player, perplayer_formspec) - - local formspecy = perplayer_formspec.formspec_y - local formheadery = perplayer_formspec.form_header_y - local craftresultx = perplayer_formspec.craft_result_x - local craftresulty = perplayer_formspec.craft_result_y - - local player_name = player:get_player_name() - local player_privs = minetest.get_player_privs(player_name) - local formspec = "" - formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]" - formspec = formspec.."label[0,"..formheadery..";" .. S("Crafting Guide") .. "]" - formspec = formspec.."listcolors[#00000000;#00000000]" - local item_name = unified_inventory.current_item[player_name] - if not item_name then return {formspec=formspec} end - - local dir = unified_inventory.current_craft_direction[player_name] - local rdir - if dir == "recipe" then rdir = "usage" end - if dir == "usage" then rdir = "recipe" end - local crafts = unified_inventory.crafts_for[dir][item_name] - local alternate = unified_inventory.alternate[player_name] - local alternates, craft - if crafts ~= nil and #crafts > 0 then - alternates = #crafts - craft = crafts[alternate] - end - - formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]" - formspec = formspec.."textarea["..craftresultx..","..craftresulty - ..";10,1;;"..minetest.formspec_escape(role_text[dir]..": "..item_name)..";]" - formspec = formspec..stack_image_button(0, formspecy, 1.1, 1.1, "item_button_" - .. rdir .. "_", ItemStack(item_name)) - - if not craft then - formspec = formspec.."label[5.5,"..(formspecy + 2.35)..";" - ..minetest.formspec_escape(no_recipe_text[dir]).."]" - local no_pos = dir == "recipe" and 4.5 or 6.5 - local item_pos = dir == "recipe" and 6.5 or 4.5 - formspec = formspec.."image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]" - formspec = formspec..stack_image_button(item_pos, formspecy, 1.1, 1.1, "item_button_" - ..other_dir[dir].."_", ItemStack(item_name)) - if player_privs.give == true then - formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. S("Give me:") .. "]" - .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" - .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" - .."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]" - end - return {formspec = formspec} - end - - local craft_type = unified_inventory.registered_craft_types[craft.type] or - unified_inventory.craft_type_defaults(craft.type, {}) - if craft_type.icon then - formspec = formspec..string.format(" image[%f,%f;%f,%f;%s]",5.7,(formspecy + 0.05),0.5,0.5,craft_type.icon) - end - formspec = formspec.."label[5.5,"..(formspecy + 1)..";" .. minetest.formspec_escape(craft_type.description).."]" - formspec = formspec..stack_image_button(6.5, formspecy, 1.1, 1.1, "item_button_usage_", ItemStack(craft.output)) - local display_size = craft_type.dynamic_display_size and craft_type.dynamic_display_size(craft) or { width = craft_type.width, height = craft_type.height } - local craft_width = craft_type.get_shaped_craft_width and craft_type.get_shaped_craft_width(craft) or display_size.width - - -- This keeps recipes aligned to the right, - -- so that they're close to the arrow. - local xoffset = 1.5 + (3 - display_size.width) - for y = 1, display_size.height do - for x = 1, display_size.width do - local item - if craft and x <= craft_width then - item = craft.items[(y-1) * craft_width + x] - end - if item then - formspec = formspec..stack_image_button( - xoffset + x, formspecy - 1 + y, 1.1, 1.1, - "item_button_recipe_", - ItemStack(item)) - else - -- Fake buttons just to make grid - formspec = formspec.."image_button[" - ..tostring(xoffset + x)..","..tostring(formspecy - 1 + y) - ..";1,1;ui_blank_image.png;;]" - end - end - end - - if craft_type.uses_crafting_grid then - formspec = formspec.."label[0,"..(formspecy + 0.9)..";" .. S("To craft grid:") .. "]" - .."button[0, "..(formspecy + 1.5)..";0.6,0.5;craftguide_craft_1;1]" - .."button[0.6,"..(formspecy + 1.5)..";0.7,0.5;craftguide_craft_10;10]" - .."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. S("All") .. "]" - end - if player_privs.give then - formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. S("Give me:") .. "]" - .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" - .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" - .."button[1.3,"..(formspecy + 2.7)..";0.8,0.5;craftguide_giveme_99;99]" - end - - if alternates and alternates > 1 then - formspec = formspec.."label[5.5,"..(formspecy + 1.6)..";"..recipe_text[dir].." " - ..tostring(alternate).." of " - ..tostring(alternates).."]" - .."button[5.5,"..(formspecy + 2)..";2,1;alternate;" .. S("Alternate") .. "]" - end - return {formspec = formspec} - end, -}) - -local function craftguide_giveme(player, formname, fields) - local amount - for k, v in pairs(fields) do - amount = k:match("craftguide_giveme_(.*)") - if amount then break end - end - if not amount then return end - - amount = tonumber(amount) - if amount == 0 then return end - - local player_name = player:get_player_name() - - local output = unified_inventory.current_item[player_name] - if (not output) or (output == "") then return end - - local player_inv = player:get_inventory() - - player_inv:add_item("main", {name = output, count = amount}) -end - --- tells if an item can be moved and returns an index if so -local function item_fits(player_inv, craft_item, needed_item) - local need_group = string.sub(needed_item, 1, 6) == "group:" - if need_group then - need_group = string.sub(needed_item, 7) - end - if craft_item - and not craft_item:is_empty() then - local ciname = craft_item:get_name() - - -- abort if the item there isn't usable - if ciname ~= needed_item - and not need_group then - return - end - - -- abort if no item fits onto it - if craft_item:get_count() >= craft_item:get_definition().stack_max then - return - end - - -- use the item there if it's in the right group and a group item is needed - if need_group then - if minetest.get_item_group(ciname, need_group) == 0 then - return - end - needed_item = ciname - need_group = false - end - end - - if need_group then - -- search an item of the specific group - for i,item in pairs(player_inv:get_list("main")) do - if not item:is_empty() - and minetest.get_item_group(item:get_name(), need_group) > 0 then - return i - end - end - - -- no index found - return - end - - -- search an item with a the name needed_item - for i,item in pairs(player_inv:get_list("main")) do - if not item:is_empty() - and item:get_name() == needed_item then - return i - end - end - - -- no index found -end - --- modifies the player inventory and returns the changed craft_item if possible -local function move_item(player_inv, craft_item, needed_item) - local stackid = item_fits(player_inv, craft_item, needed_item) - if not stackid then - return - end - local wanted_stack = player_inv:get_stack("main", stackid) - local taken_item = wanted_stack:take_item() - player_inv:set_stack("main", stackid, wanted_stack) - - if not craft_item - or craft_item:is_empty() then - return taken_item - end - - craft_item:add_item(taken_item) - return craft_item -end - -local function craftguide_craft(player, formname, fields) - local amount - for k, v in pairs(fields) do - amount = k:match("craftguide_craft_(.*)") - if amount then break end - end - if not amount then return end - local player_name = player:get_player_name() - - local output = unified_inventory.current_item[player_name] - if (not output) or (output == "") then return end - - local player_inv = player:get_inventory() - - local crafts = unified_inventory.crafts_for[unified_inventory.current_craft_direction[player_name]][output] - if (not crafts) or (#crafts == 0) then return end - - local alternate = unified_inventory.alternate[player_name] - - local craft = crafts[alternate] - if craft.width > 3 then return end - - local needed = craft.items - - local craft_list = player_inv:get_list("craft") - - local width = craft.width - if width == 0 then - -- Shapeless recipe - width = 3 - end - - amount = tonumber(amount) or 99 - --[[ - if amount == "max" then - amount = 99 -- Arbitrary; need better way to do this. - else - amount = tonumber(amount) - end--]] - - for iter = 1, amount do - local index = 1 - for y = 1, 3 do - for x = 1, width do - local needed_item = needed[index] - if needed_item then - local craft_index = ((y - 1) * 3) + x - local craft_item = craft_list[craft_index] - local newitem = move_item(player_inv, craft_item, needed_item) - if newitem then - craft_list[craft_index] = newitem - end - end - index = index + 1 - end - end - end - - player_inv:set_list("craft", craft_list) - - unified_inventory.set_inventory_formspec(player, "craft") -end - -minetest.register_on_player_receive_fields(function(player, formname, fields) - for k, v in pairs(fields) do - if k:match("craftguide_craft_") then - craftguide_craft(player, formname, fields) - return - end - if k:match("craftguide_giveme_") then - craftguide_giveme(player, formname, fields) - return - end - end -end) diff --git a/mods/unified_inventory/sounds/birds.ogg b/mods/unified_inventory/sounds/birds.ogg deleted file mode 100755 index 76f75ed7..00000000 Binary files a/mods/unified_inventory/sounds/birds.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/click.ogg b/mods/unified_inventory/sounds/click.ogg deleted file mode 100755 index 245f9ea2..00000000 Binary files a/mods/unified_inventory/sounds/click.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/dingdong.ogg b/mods/unified_inventory/sounds/dingdong.ogg deleted file mode 100755 index f1021797..00000000 Binary files a/mods/unified_inventory/sounds/dingdong.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/electricity.ogg b/mods/unified_inventory/sounds/electricity.ogg deleted file mode 100755 index a1ec9717..00000000 Binary files a/mods/unified_inventory/sounds/electricity.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/owl.ogg b/mods/unified_inventory/sounds/owl.ogg deleted file mode 100755 index d3247939..00000000 Binary files a/mods/unified_inventory/sounds/owl.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/paperflip1.ogg b/mods/unified_inventory/sounds/paperflip1.ogg deleted file mode 100755 index 22556ab2..00000000 Binary files a/mods/unified_inventory/sounds/paperflip1.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/paperflip2.ogg b/mods/unified_inventory/sounds/paperflip2.ogg deleted file mode 100755 index 7b4e02c2..00000000 Binary files a/mods/unified_inventory/sounds/paperflip2.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/teleport.ogg b/mods/unified_inventory/sounds/teleport.ogg deleted file mode 100755 index 10d64cb8..00000000 Binary files a/mods/unified_inventory/sounds/teleport.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/trash.ogg b/mods/unified_inventory/sounds/trash.ogg deleted file mode 100755 index 35d37290..00000000 Binary files a/mods/unified_inventory/sounds/trash.ogg and /dev/null differ diff --git a/mods/unified_inventory/sounds/trash_all.ogg b/mods/unified_inventory/sounds/trash_all.ogg deleted file mode 100755 index d2d9f387..00000000 Binary files a/mods/unified_inventory/sounds/trash_all.ogg and /dev/null differ diff --git a/mods/unified_inventory/textures/bags_large.png b/mods/unified_inventory/textures/bags_large.png deleted file mode 100755 index 6d562993..00000000 Binary files a/mods/unified_inventory/textures/bags_large.png and /dev/null differ diff --git a/mods/unified_inventory/textures/bags_medium.png b/mods/unified_inventory/textures/bags_medium.png deleted file mode 100755 index 59ba11df..00000000 Binary files a/mods/unified_inventory/textures/bags_medium.png and /dev/null differ diff --git a/mods/unified_inventory/textures/bags_small.png b/mods/unified_inventory/textures/bags_small.png deleted file mode 100755 index d48ffcbe..00000000 Binary files a/mods/unified_inventory/textures/bags_small.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_1_icon.png b/mods/unified_inventory/textures/ui_1_icon.png deleted file mode 100755 index 5dfab9ed..00000000 Binary files a/mods/unified_inventory/textures/ui_1_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_2_icon.png b/mods/unified_inventory/textures/ui_2_icon.png deleted file mode 100755 index dd645109..00000000 Binary files a/mods/unified_inventory/textures/ui_2_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_3_icon.png b/mods/unified_inventory/textures/ui_3_icon.png deleted file mode 100755 index 7c53c115..00000000 Binary files a/mods/unified_inventory/textures/ui_3_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_4_icon.png b/mods/unified_inventory/textures/ui_4_icon.png deleted file mode 100755 index 9f800ae0..00000000 Binary files a/mods/unified_inventory/textures/ui_4_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_5_icon.png b/mods/unified_inventory/textures/ui_5_icon.png deleted file mode 100755 index e35a375b..00000000 Binary files a/mods/unified_inventory/textures/ui_5_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_bags_icon.png b/mods/unified_inventory/textures/ui_bags_icon.png deleted file mode 100755 index 6d562993..00000000 Binary files a/mods/unified_inventory/textures/ui_bags_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_bags_lg_form.png b/mods/unified_inventory/textures/ui_bags_lg_form.png deleted file mode 100755 index 4ae4621f..00000000 Binary files a/mods/unified_inventory/textures/ui_bags_lg_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_bags_main_form.png b/mods/unified_inventory/textures/ui_bags_main_form.png deleted file mode 100755 index 54532a4c..00000000 Binary files a/mods/unified_inventory/textures/ui_bags_main_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_bags_med_form.png b/mods/unified_inventory/textures/ui_bags_med_form.png deleted file mode 100755 index 3d31d458..00000000 Binary files a/mods/unified_inventory/textures/ui_bags_med_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_bags_sm_form.png b/mods/unified_inventory/textures/ui_bags_sm_form.png deleted file mode 100755 index 2311cf39..00000000 Binary files a/mods/unified_inventory/textures/ui_bags_sm_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_blank_image.png b/mods/unified_inventory/textures/ui_blank_image.png deleted file mode 100755 index c7f427aa..00000000 Binary files a/mods/unified_inventory/textures/ui_blank_image.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_blue_icon_background.png b/mods/unified_inventory/textures/ui_blue_icon_background.png deleted file mode 100755 index 94342173..00000000 Binary files a/mods/unified_inventory/textures/ui_blue_icon_background.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_circular_arrows_icon.png b/mods/unified_inventory/textures/ui_circular_arrows_icon.png deleted file mode 100755 index d687bbf2..00000000 Binary files a/mods/unified_inventory/textures/ui_circular_arrows_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_craft_icon.png b/mods/unified_inventory/textures/ui_craft_icon.png deleted file mode 100755 index fbe4cc74..00000000 Binary files a/mods/unified_inventory/textures/ui_craft_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_craftgrid_icon.png b/mods/unified_inventory/textures/ui_craftgrid_icon.png deleted file mode 100755 index 2d46427a..00000000 Binary files a/mods/unified_inventory/textures/ui_craftgrid_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_craftguide_form.png b/mods/unified_inventory/textures/ui_craftguide_form.png deleted file mode 100755 index ebc0d0c1..00000000 Binary files a/mods/unified_inventory/textures/ui_craftguide_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_craftguide_icon.png b/mods/unified_inventory/textures/ui_craftguide_icon.png deleted file mode 100755 index 5866b7b2..00000000 Binary files a/mods/unified_inventory/textures/ui_craftguide_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_crafting_form.png b/mods/unified_inventory/textures/ui_crafting_form.png deleted file mode 100755 index 420323c2..00000000 Binary files a/mods/unified_inventory/textures/ui_crafting_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_doubleleft_icon.png b/mods/unified_inventory/textures/ui_doubleleft_icon.png deleted file mode 100755 index 370dd96d..00000000 Binary files a/mods/unified_inventory/textures/ui_doubleleft_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_doubleright_icon.png b/mods/unified_inventory/textures/ui_doubleright_icon.png deleted file mode 100755 index c0d18d60..00000000 Binary files a/mods/unified_inventory/textures/ui_doubleright_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_form_bg.png b/mods/unified_inventory/textures/ui_form_bg.png deleted file mode 100755 index adb06943..00000000 Binary files a/mods/unified_inventory/textures/ui_form_bg.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_gohome_icon.png b/mods/unified_inventory/textures/ui_gohome_icon.png deleted file mode 100755 index b3397ef7..00000000 Binary files a/mods/unified_inventory/textures/ui_gohome_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_green_icon_background.png b/mods/unified_inventory/textures/ui_green_icon_background.png deleted file mode 100755 index b06c29cb..00000000 Binary files a/mods/unified_inventory/textures/ui_green_icon_background.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_group.png b/mods/unified_inventory/textures/ui_group.png deleted file mode 100755 index 555a84b0..00000000 Binary files a/mods/unified_inventory/textures/ui_group.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_home_icon.png b/mods/unified_inventory/textures/ui_home_icon.png deleted file mode 100755 index e44419d6..00000000 Binary files a/mods/unified_inventory/textures/ui_home_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_left_icon.png b/mods/unified_inventory/textures/ui_left_icon.png deleted file mode 100755 index 68cffb8f..00000000 Binary files a/mods/unified_inventory/textures/ui_left_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_main_inventory.png b/mods/unified_inventory/textures/ui_main_inventory.png deleted file mode 100755 index 3d380de4..00000000 Binary files a/mods/unified_inventory/textures/ui_main_inventory.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_misc_form.png b/mods/unified_inventory/textures/ui_misc_form.png deleted file mode 100755 index c6a6057d..00000000 Binary files a/mods/unified_inventory/textures/ui_misc_form.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_moon_icon.png b/mods/unified_inventory/textures/ui_moon_icon.png deleted file mode 100755 index 5db6bd6b..00000000 Binary files a/mods/unified_inventory/textures/ui_moon_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_no.png b/mods/unified_inventory/textures/ui_no.png deleted file mode 100755 index aa98ed62..00000000 Binary files a/mods/unified_inventory/textures/ui_no.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_off_icon.png b/mods/unified_inventory/textures/ui_off_icon.png deleted file mode 100755 index 319fc6ea..00000000 Binary files a/mods/unified_inventory/textures/ui_off_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_ok_icon.png b/mods/unified_inventory/textures/ui_ok_icon.png deleted file mode 100755 index dcbda1d7..00000000 Binary files a/mods/unified_inventory/textures/ui_ok_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_on_icon.png b/mods/unified_inventory/textures/ui_on_icon.png deleted file mode 100755 index a9884cf8..00000000 Binary files a/mods/unified_inventory/textures/ui_on_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_pencil_icon.png b/mods/unified_inventory/textures/ui_pencil_icon.png deleted file mode 100755 index a73b7409..00000000 Binary files a/mods/unified_inventory/textures/ui_pencil_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_red_icon_background.png b/mods/unified_inventory/textures/ui_red_icon_background.png deleted file mode 100755 index f2201508..00000000 Binary files a/mods/unified_inventory/textures/ui_red_icon_background.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_right_icon.png b/mods/unified_inventory/textures/ui_right_icon.png deleted file mode 100755 index 1f11868a..00000000 Binary files a/mods/unified_inventory/textures/ui_right_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_search_icon.png b/mods/unified_inventory/textures/ui_search_icon.png deleted file mode 100755 index 7ddf4b49..00000000 Binary files a/mods/unified_inventory/textures/ui_search_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_sethome_icon.png b/mods/unified_inventory/textures/ui_sethome_icon.png deleted file mode 100755 index 5c56d641..00000000 Binary files a/mods/unified_inventory/textures/ui_sethome_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_single_slot.png b/mods/unified_inventory/textures/ui_single_slot.png deleted file mode 100755 index ef2a2465..00000000 Binary files a/mods/unified_inventory/textures/ui_single_slot.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_skip_backward_icon.png b/mods/unified_inventory/textures/ui_skip_backward_icon.png deleted file mode 100755 index fde4fea2..00000000 Binary files a/mods/unified_inventory/textures/ui_skip_backward_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_skip_forward_icon.png b/mods/unified_inventory/textures/ui_skip_forward_icon.png deleted file mode 100755 index 182e7ed7..00000000 Binary files a/mods/unified_inventory/textures/ui_skip_forward_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_sun_icon.png b/mods/unified_inventory/textures/ui_sun_icon.png deleted file mode 100755 index 8300b74e..00000000 Binary files a/mods/unified_inventory/textures/ui_sun_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_trash_icon.png b/mods/unified_inventory/textures/ui_trash_icon.png deleted file mode 100755 index d03508f2..00000000 Binary files a/mods/unified_inventory/textures/ui_trash_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_waypoint_set_icon.png b/mods/unified_inventory/textures/ui_waypoint_set_icon.png deleted file mode 100755 index f3ed235f..00000000 Binary files a/mods/unified_inventory/textures/ui_waypoint_set_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_waypoints_icon.png b/mods/unified_inventory/textures/ui_waypoints_icon.png deleted file mode 100755 index 530c1d79..00000000 Binary files a/mods/unified_inventory/textures/ui_waypoints_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_xyz_icon.png b/mods/unified_inventory/textures/ui_xyz_icon.png deleted file mode 100755 index 9b48acb4..00000000 Binary files a/mods/unified_inventory/textures/ui_xyz_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_xyz_off_icon.png b/mods/unified_inventory/textures/ui_xyz_off_icon.png deleted file mode 100755 index 3c1836eb..00000000 Binary files a/mods/unified_inventory/textures/ui_xyz_off_icon.png and /dev/null differ diff --git a/mods/unified_inventory/textures/ui_xyz_on_icon.png b/mods/unified_inventory/textures/ui_xyz_on_icon.png deleted file mode 100755 index 9b48acb4..00000000 Binary files a/mods/unified_inventory/textures/ui_xyz_on_icon.png and /dev/null differ diff --git a/mods/unified_inventory/waypoints.lua b/mods/unified_inventory/waypoints.lua deleted file mode 100755 index 4e99d75f..00000000 --- a/mods/unified_inventory/waypoints.lua +++ /dev/null @@ -1,247 +0,0 @@ -local S = unified_inventory.gettext - -local hud_colors = { - {"#FFFFFF", 0xFFFFFF, S("White")}, - {"#DBBB00", 0xf1d32c, S("Yellow")}, - {"#DD0000", 0xDD0000, S("Red")}, - {"#2cf136", 0x2cf136, S("Green")}, - {"#2c4df1", 0x2c4df1, S("Blue")}, -} - -local hud_colors_max = #hud_colors - --- Stores temporary player data (persists until player leaves) -local waypoints_temp = {} - -unified_inventory.register_page("waypoints", { - get_formspec = function(player) - local player_name = player:get_player_name() - - -- build a "fake" temp entry if the server took too long - -- during sign-on and returned an empty entry - if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end - - local waypoints = datastorage.get(player_name, "waypoints") - local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" .. - "image[0,0;1,1;ui_waypoints_icon.png]" .. - "label[1,0;" .. S("Waypoints") .. "]" - - -- Tabs buttons: - for i = 1, 5, 1 do - formspec = formspec .. - "image_button[0.0," .. 0.2 + i * 0.7 .. ";.8,.8;" .. - (i == waypoints.selected and "ui_blue_icon_background.png^" or "") .. - "ui_" .. i .. "_icon.png;" .. - "select_waypoint" .. i .. ";]" .. - "tooltip[select_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Select Waypoint #%d"):format(i)).."]" - end - - local i = waypoints.selected or 1 - local waypoint = waypoints[i] or {} - local temp = waypoints_temp[player_name][i] or {} - local default_name = "Waypoint "..i - - -- Main buttons: - formspec = formspec .. - "image_button[4.5,3.7;.8,.8;".. - "ui_waypoint_set_icon.png;".. - "set_waypoint"..i..";]".. - "tooltip[set_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Set waypoint to current location")).."]" - - formspec = formspec .. - "image_button[5.2,3.7;.8,.8;".. - (waypoint.active and "ui_on_icon.png" or "ui_off_icon.png")..";".. - "toggle_waypoint"..i..";]".. - "tooltip[toggle_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Make waypoint " - ..(waypoint.active and "invisible" or "visible"))).."]" - - formspec = formspec .. - "image_button[5.9,3.7;.8,.8;".. - (waypoint.display_pos and "ui_green_icon_background.png" or "ui_red_icon_background.png").."^ui_xyz_icon.png;".. - "toggle_display_pos" .. i .. ";]".. - "tooltip[toggle_display_pos" .. i .. ";" - .. minetest.formspec_escape(S((waypoint.display_pos and "Disable" or "Enable") - .." display of waypoint coordinates")).."]" - - formspec = formspec .. - "image_button[6.6,3.7;.8,.8;".. - "ui_circular_arrows_icon.png;".. - "toggle_color"..i..";]".. - "tooltip[toggle_color" .. i .. ";" - .. minetest.formspec_escape(S("Change color of waypoint display")).."]" - - formspec = formspec .. - "image_button[7.3,3.7;.8,.8;".. - "ui_pencil_icon.png;".. - "rename_waypoint"..i..";]".. - "tooltip[rename_waypoint" .. i .. ";" - .. minetest.formspec_escape(S("Edit waypoint name")).."]" - - -- Waypoint's info: - if waypoint.active then - formspec = formspec .. "label[1,0.8;"..S("Waypoint active").."]" - else - formspec = formspec .. "label[1,0.8;"..S("Waypoint inactive").."]" - end - - if temp.edit then - formspec = formspec .. - "field[1.3,3.2;6,.8;rename_box" .. i .. ";;" - ..(waypoint.name or default_name).."]" .. - "image_button[7.3,2.9;.8,.8;".. - "ui_ok_icon.png;".. - "confirm_rename"..i.. ";]".. - "tooltip[confirm_rename" .. i .. ";" - .. minetest.formspec_escape(S("Finish editing")).."]" - end - - formspec = formspec .. "label[1,1.3;"..S("World position")..": " .. - minetest.pos_to_string(waypoint.world_pos or vector.new()) .. "]" .. - "label[1,1.8;"..S("Name")..": ".. (waypoint.name or default_name) .. "]" .. - "label[1,2.3;"..S("HUD text color")..": " .. - hud_colors[waypoint.color or 1][3] .. "]" - - return {formspec=formspec} - end, -}) - -unified_inventory.register_button("waypoints", { - type = "image", - image = "ui_waypoints_icon.png", - tooltip = S("Waypoints"), - hide_lite=true, - show_with = false, --Modif MFF (Crabman 30/06/2015) -}) - -local function update_hud(player, waypoints, temp, i) - local waypoint = waypoints[i] - if not waypoint then return end - temp[i] = temp[i] or {} - temp = temp[i] - local pos = waypoint.world_pos or vector.new() - local name - if waypoint.display_pos then - name = minetest.pos_to_string(pos) - if waypoint.name then - name = name..", "..waypoint.name - end - else - name = waypoint.name or "Waypoint "..i - end - if temp.hud then - player:hud_remove(temp.hud) - end - if waypoint.active then - temp.hud = player:hud_add({ - hud_elem_type = "waypoint", - number = hud_colors[waypoint.color or 1][2] , - name = name, - text = "m", - world_pos = pos - }) - else - temp.hud = nil - end -end - -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "" then return end - - local player_name = player:get_player_name() - local update_formspec = false - local need_update_hud = false - local hit = false - - local waypoints = datastorage.get(player_name, "waypoints") - local temp = waypoints_temp[player_name] - for i = 1, 5, 1 do - if fields["select_waypoint"..i] then - hit = true - waypoints.selected = i - update_formspec = true - end - - if fields["toggle_waypoint"..i] then - hit = true - waypoints[i] = waypoints[i] or {} - waypoints[i].active = not (waypoints[i].active) - need_update_hud = true - update_formspec = true - end - - if fields["set_waypoint"..i] then - hit = true - local pos = player:getpos() - pos.x = math.floor(pos.x) - pos.y = math.floor(pos.y) - pos.z = math.floor(pos.z) - waypoints[i] = waypoints[i] or {} - waypoints[i].world_pos = pos - need_update_hud = true - update_formspec = true - end - - if fields["rename_waypoint"..i] then - hit = true - temp[i] = temp[i] or {} - temp[i].edit = true - update_formspec = true - end - - if fields["toggle_display_pos"..i] then - hit = true - waypoints[i] = waypoints[i] or {} - waypoints[i].display_pos = not waypoints[i].display_pos - need_update_hud = true - update_formspec = true - end - - if fields["toggle_color"..i] then - hit = true - waypoints[i] = waypoints[i] or {} - local color = waypoints[i].color or 1 - color = color + 1 - if color > hud_colors_max then - color = 1 - end - waypoints[i].color = color - need_update_hud = true - update_formspec = true - end - - if fields["confirm_rename"..i] then - hit = true - waypoints[i] = waypoints[i] or {} - temp[i].edit = false - waypoints[i].name = fields["rename_box"..i] - need_update_hud = true - update_formspec = true - end - if need_update_hud then - update_hud(player, waypoints, temp, i) - end - if update_formspec then - unified_inventory.set_inventory_formspec(player, "waypoints") - end - if hit then return end - end -end) - - -minetest.register_on_joinplayer(function(player) - local player_name = player:get_player_name() - local waypoints = datastorage.get(player_name, "waypoints") - local temp = {} - waypoints_temp[player_name] = temp - for i = 1, 5 do - update_hud(player, waypoints, temp, i) - end -end) - -minetest.register_on_leaveplayer(function(player) - waypoints_temp[player:get_player_name()] = nil -end) -