mirror of
https://github.com/minetest-mods/i3.git
synced 2025-07-03 09:00:23 +02:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e9b8085fde | |||
| 6dc12390db | |||
| 44610b879e | |||
| b0c9bcf3b9 | |||
| de70846d6c | |||
| 8b6f50b387 | |||
| 55c6d09389 | |||
| e3941a7b71 | |||
| 5e8ecf9903 | |||
| 2fa971acb4 | |||
| 617ef40a1d | |||
| 6b8e64b532 | |||
| eedc77086f | |||
| ea10743255 | |||
| 4fe094f3ba | |||
| 364534d154 | |||
| 11e19dd80a | |||
| f0d1caa1b4 |
24
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
24
.github/ISSUE_TEMPLATE/bug_report.md
vendored
Normal file
@ -0,0 +1,24 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: ''
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
|
||||
**Additional context**
|
||||
- Mod version? Release or git?
|
||||
- Engine version?
|
||||
- LuaJIT enabled?
|
||||
- Operating system?
|
||||
- Did you try to disable other mods except i3?
|
||||
2
.github/workflows/luacheck.yml
vendored
2
.github/workflows/luacheck.yml
vendored
@ -18,4 +18,4 @@ jobs:
|
||||
- name: Setup ‘luacheck’
|
||||
run: luarocks install luacheck
|
||||
- name: Run ‘luacheck’ linter
|
||||
run: lua luacheck.lua .
|
||||
run: cd util; lua luacheck.lua
|
||||
|
||||
2
API.md
2
API.md
@ -280,7 +280,7 @@ A table containing all sorting methods.
|
||||
|
||||
Adds a new group of items to compress.
|
||||
|
||||
- `item` is the item that serve as stereotype for the group of compressed items.
|
||||
- `item` is the item which represent the group of compressed items.
|
||||
- `def` is a table specifying the substring replace patterns to be used.
|
||||
|
||||
Example:
|
||||
|
||||
@ -53,4 +53,4 @@ Report bugs on the [**Bug Tracker**](https://github.com/minetest-mods/i3/issues)
|
||||
|
||||
**Video review on YouTube:** https://www.youtube.com/watch?v=Xd14BCdEZ3o
|
||||
|
||||
|
||||
|
||||
|
||||
155
init.lua
155
init.lua
@ -12,6 +12,7 @@ print[[
|
||||
|
||||
local modpath = core.get_modpath"i3"
|
||||
local http = core.request_http_api()
|
||||
local storage = core.get_mod_storage()
|
||||
local _loadfile = dofile(modpath .. "/src/operators.lua")
|
||||
|
||||
local function lf(path)
|
||||
@ -19,9 +20,12 @@ local function lf(path)
|
||||
end
|
||||
|
||||
i3 = {
|
||||
data = core.deserialize(storage:get_string"data") or {},
|
||||
|
||||
settings = {
|
||||
debug_mode = false,
|
||||
max_favs = 6,
|
||||
max_waypoints = 30,
|
||||
min_fs_version = 4,
|
||||
item_btn_size = 1.1,
|
||||
drop_bag_on_die = true,
|
||||
@ -61,6 +65,7 @@ i3 = {
|
||||
common = lf"/src/common.lua",
|
||||
compress = lf"/src/compress.lua",
|
||||
detached = lf"/src/detached_inv.lua",
|
||||
fields = lf"/src/fields.lua",
|
||||
groups = lf"/src/groups.lua",
|
||||
gui = lf"/src/gui.lua",
|
||||
hud = lf"/src/hud.lua",
|
||||
@ -93,155 +98,7 @@ i3.files.common()
|
||||
i3.files.api(http)
|
||||
i3.files.compress()
|
||||
i3.files.groups()
|
||||
i3.files.callbacks()
|
||||
|
||||
local storage = core.get_mod_storage()
|
||||
local slz, dslz, copy = i3.get("slz", "dslz", "copy")
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
i3.data = dslz(storage:get_string"data") or {}
|
||||
|
||||
local init_bags = i3.files.bags()
|
||||
local init_detached = i3.files.detached()
|
||||
local fill_caches = i3.files.caches(http)
|
||||
local init_hud = i3.files.hud()
|
||||
|
||||
local function get_lang_code(info)
|
||||
return info and info.lang_code
|
||||
end
|
||||
|
||||
local function get_formspec_version(info)
|
||||
return info and info.formspec_version or 1
|
||||
end
|
||||
|
||||
local function outdated(name)
|
||||
core.show_formspec(name, "i3_outdated",
|
||||
("size[6.5,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
|
||||
"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game."))
|
||||
end
|
||||
|
||||
if rawget(_G, "armor") then
|
||||
i3.modules.armor = true
|
||||
armor:register_on_update(set_fs)
|
||||
end
|
||||
|
||||
if rawget(_G, "skins") then
|
||||
i3.modules.skins = true
|
||||
end
|
||||
|
||||
if rawget(_G, "awards") then
|
||||
i3.modules.awards = true
|
||||
|
||||
core.register_on_craft(function(_, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_dignode(function(_, _, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_placenode(function(_, _, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_chat_message(function(name)
|
||||
local player = core.get_player_by_name(name)
|
||||
set_fs(player)
|
||||
end)
|
||||
end
|
||||
|
||||
local function disable_inventories()
|
||||
if rawget(_G, "sfinv") then
|
||||
function sfinv.set_player_inventory_formspec() return end
|
||||
sfinv.enabled = false
|
||||
end
|
||||
|
||||
if rawget(_G, "unified_inventory") then
|
||||
function unified_inventory.set_inventory_formspec() return end
|
||||
end
|
||||
end
|
||||
|
||||
local function init_data(player, info)
|
||||
local name = player:get_player_name()
|
||||
i3.data[name] = i3.data[name] or {}
|
||||
local data = i3.data[name]
|
||||
|
||||
data.player_name = name
|
||||
data.filter = ""
|
||||
data.pagenum = 1
|
||||
data.items = i3.init_items
|
||||
data.items_raw = i3.init_items
|
||||
data.favs = {}
|
||||
data.sort = "alphabetical"
|
||||
data.show_setting = "home"
|
||||
data.ignore_hotbar = false
|
||||
data.auto_sorting = false
|
||||
data.reverse_sorting = false
|
||||
data.inv_compress = true
|
||||
data.export_counts = {}
|
||||
data.tab = 1
|
||||
data.itab = 1
|
||||
data.subcat = 1
|
||||
data.scrbar_inv = 0
|
||||
data.lang_code = get_lang_code(info)
|
||||
data.fs_version = info.formspec_version
|
||||
|
||||
local inv = player:get_inventory()
|
||||
inv:set_size("main", i3.settings.inv_size)
|
||||
|
||||
core.after(0, set_fs, player)
|
||||
end
|
||||
|
||||
local function save_data(player_name)
|
||||
local _data = copy(i3.data)
|
||||
|
||||
for name, v in pairs(_data) do
|
||||
for dat in pairs(v) do
|
||||
if not i3.saves[dat] then
|
||||
_data[name][dat] = nil
|
||||
|
||||
if player_name and i3.data[player_name] then
|
||||
i3.data[player_name][dat] = nil -- To free up some memory
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
storage:set_string("data", slz(_data))
|
||||
end
|
||||
|
||||
core.register_on_mods_loaded(function()
|
||||
fill_caches()
|
||||
disable_inventories()
|
||||
end)
|
||||
|
||||
core.register_on_joinplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
local info = core.get_player_information and core.get_player_information(name)
|
||||
|
||||
if not info or get_formspec_version(info) < i3.settings.min_fs_version then
|
||||
return outdated(name)
|
||||
end
|
||||
|
||||
init_data(player, info)
|
||||
init_bags(player)
|
||||
init_detached(player)
|
||||
init_hud(player)
|
||||
end)
|
||||
|
||||
core.register_on_leaveplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
save_data(name)
|
||||
end)
|
||||
|
||||
core.register_on_shutdown(save_data)
|
||||
|
||||
local function routine()
|
||||
save_data()
|
||||
core.after(i3.settings.save_interval, routine)
|
||||
end
|
||||
|
||||
core.after(i3.settings.save_interval, routine)
|
||||
i3.files.callbacks(http, storage)
|
||||
|
||||
if i3.settings.progressive_mode then
|
||||
i3.files.progressive()
|
||||
|
||||
3
mod.conf
3
mod.conf
@ -1,3 +1,4 @@
|
||||
name = i3
|
||||
description = Tiling inventory for Minetest
|
||||
description = Next-generation inventory
|
||||
optional_depends = 3d_armor, skinsdb, awards
|
||||
min_minetest_version = 5.4
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
local http = ...
|
||||
local make_fs = i3.files.gui()
|
||||
local make_fs, get_inventory_fs = i3.files.gui()
|
||||
|
||||
IMPORT("gmatch", "split")
|
||||
IMPORT("S", "err", "fmt", "reg_items")
|
||||
@ -186,6 +186,12 @@ function i3.new_tab(name, def)
|
||||
insert(i3.tabs, def)
|
||||
end
|
||||
|
||||
i3.new_tab("inventory", {
|
||||
description = S"Inventory",
|
||||
formspec = get_inventory_fs,
|
||||
fields = i3.files.fields(),
|
||||
})
|
||||
|
||||
function i3.remove_tab(name)
|
||||
if not true_str(name) then
|
||||
return err "i3.remove_tab: tab name missing"
|
||||
|
||||
@ -1,470 +1,12 @@
|
||||
local _, get_inventory_fs = i3.files.gui()
|
||||
local http, storage = ...
|
||||
local init_bags = i3.files.bags()
|
||||
local fill_caches = i3.files.caches(http)
|
||||
local init_detached = i3.files.detached()
|
||||
local init_hud = i3.files.hud()
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
IMPORT("vec_eq", "vec_round")
|
||||
IMPORT("reg_items", "reg_aliases")
|
||||
IMPORT("sort", "copy", "insert", "remove", "indexof")
|
||||
IMPORT("S", "min", "random", "translate", "ItemStack")
|
||||
IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
|
||||
IMPORT("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "spawn_item")
|
||||
IMPORT("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv")
|
||||
IMPORT("valid_item", "get_stack", "craft_stack", "clean_name", "compressible", "check_privs", "safe_teleport")
|
||||
|
||||
local function reset_data(data)
|
||||
data.filter = ""
|
||||
data.expand = ""
|
||||
data.pagenum = 1
|
||||
data.rnum = 1
|
||||
data.unum = 1
|
||||
data.scrbar_rcp = 1
|
||||
data.scrbar_usg = 1
|
||||
data.query_item = nil
|
||||
data.recipes = nil
|
||||
data.usages = nil
|
||||
data.export_rcp = nil
|
||||
data.export_usg = nil
|
||||
data.alt_items = nil
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = nil
|
||||
data.show_setting = "home"
|
||||
data.items = data.items_raw
|
||||
|
||||
if data.itab > 1 then
|
||||
sort_by_category(data)
|
||||
end
|
||||
end
|
||||
|
||||
i3.new_tab("inventory", {
|
||||
description = S"Inventory",
|
||||
formspec = get_inventory_fs,
|
||||
|
||||
fields = function(player, data, fields)
|
||||
local name = data.player_name
|
||||
local inv = player:get_inventory()
|
||||
local sb_inv = fields.scrbar_inv
|
||||
|
||||
if fields.skins then
|
||||
local id = tonumber(fields.skins)
|
||||
local _skins = skins.get_skinlist_for_player(name)
|
||||
skins.set_player_skin(player, _skins[id])
|
||||
end
|
||||
|
||||
if fields.drop_items then
|
||||
local items = split(fields.drop_items, ",")
|
||||
data.drop_items = items
|
||||
end
|
||||
|
||||
for field in pairs(fields) do
|
||||
if sub(field, 1, 4) == "btn_" then
|
||||
data.subcat = indexof(i3.categories, sub(field, 5))
|
||||
break
|
||||
|
||||
elseif sub(field, 1, 3) == "cb_" then
|
||||
local str = sub(field, 4)
|
||||
data[str] = false
|
||||
|
||||
if fields[field] == "true" then
|
||||
data[str] = true
|
||||
end
|
||||
|
||||
elseif sub(field, 1, 8) == "setting_" then
|
||||
data.show_setting = match(field, "_(%w+)$")
|
||||
|
||||
elseif find(field, "waypoint_%d+") then
|
||||
local id, action = match(field, "_(%d+)_(%w+)$")
|
||||
id = tonumber(id)
|
||||
local waypoint = data.waypoints[id]
|
||||
if not waypoint then return end
|
||||
|
||||
if action == "see" then
|
||||
if data.waypoint_see and data.waypoint_see == id then
|
||||
data.waypoint_see = nil
|
||||
else
|
||||
data.waypoint_see = id
|
||||
end
|
||||
|
||||
elseif action == "delete" then
|
||||
player:hud_remove(waypoint.id)
|
||||
remove(data.waypoints, id)
|
||||
|
||||
elseif action == "teleport" then
|
||||
local pos = str_to_pos(waypoint.pos)
|
||||
safe_teleport(player, pos)
|
||||
msg(name, S("Teleported to: @1", waypoint.name))
|
||||
|
||||
elseif action == "refresh" then
|
||||
local color = random(0xffffff)
|
||||
waypoint.color = color
|
||||
player:hud_change(waypoint.id, "number", color)
|
||||
|
||||
elseif action == "hide" then
|
||||
if waypoint.hide then
|
||||
local new_id = add_hud_waypoint(
|
||||
player, waypoint.name, str_to_pos(waypoint.pos), waypoint.color)
|
||||
|
||||
waypoint.id = new_id
|
||||
waypoint.hide = nil
|
||||
else
|
||||
player:hud_remove(waypoint.id)
|
||||
waypoint.hide = true
|
||||
end
|
||||
end
|
||||
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if fields.quit then
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = nil
|
||||
data.waypoint_see = nil
|
||||
data.bag_rename = nil
|
||||
|
||||
elseif fields.trash then
|
||||
data.show_settings = nil
|
||||
data.confirm_trash = true
|
||||
|
||||
elseif fields.settings then
|
||||
if not data.show_settings then
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = true
|
||||
else
|
||||
data.show_settings = nil
|
||||
end
|
||||
|
||||
elseif fields.confirm_trash_yes or fields.confirm_trash_no then
|
||||
if fields.confirm_trash_yes then
|
||||
inv:set_list("main", {})
|
||||
inv:set_list("craft", {})
|
||||
end
|
||||
|
||||
data.confirm_trash = nil
|
||||
|
||||
elseif fields.close_settings then
|
||||
data.show_settings = nil
|
||||
|
||||
elseif fields.close_preview then
|
||||
data.waypoint_see = nil
|
||||
|
||||
elseif fields.sort then
|
||||
sort_inventory(player, data)
|
||||
|
||||
elseif fields.prev_sort or fields.next_sort then
|
||||
local idx = get_sorting_idx(data.sort)
|
||||
local tot = #i3.sorting_methods
|
||||
|
||||
idx -= (fields.prev_sort and 1 or -1)
|
||||
|
||||
if idx > tot then
|
||||
idx = 1
|
||||
elseif idx == 0 then
|
||||
idx = tot
|
||||
end
|
||||
|
||||
data.sort = i3.sorting_methods[idx].name
|
||||
|
||||
elseif fields.home then
|
||||
if not data.home then
|
||||
return msg(name, "No home set")
|
||||
elseif not check_privs(name, {home = true}) then
|
||||
return msg(name, "'home' privilege missing")
|
||||
end
|
||||
|
||||
safe_teleport(player, str_to_pos(data.home))
|
||||
msg(name, S"Welcome back home!")
|
||||
|
||||
elseif fields.set_home then
|
||||
data.home = pos_to_str(player:get_pos(), 1)
|
||||
|
||||
elseif fields.bag_rename then
|
||||
data.bag_rename = true
|
||||
|
||||
elseif fields.confirm_rename then
|
||||
local bag = get_detached_inv("bag", name)
|
||||
local bagstack = bag:get_stack("main", 1)
|
||||
local meta = bagstack:get_meta()
|
||||
local desc = translate(data.lang_code, bagstack:get_description())
|
||||
local fill = split(desc, "(")[2]
|
||||
local newname = fields.bag_newname:gsub("([%(%)])", "")
|
||||
newname = toupper(newname:trim())
|
||||
|
||||
if fill then
|
||||
newname = fmt("%s (%s", newname, fill)
|
||||
end
|
||||
|
||||
meta:set_string("description", newname)
|
||||
bag:set_stack("main", 1, bagstack)
|
||||
|
||||
data.bag = bagstack:to_string()
|
||||
data.bag_rename = nil
|
||||
|
||||
elseif sb_inv and sub(sb_inv, 1, 3) == "CHG" then
|
||||
data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
|
||||
return
|
||||
|
||||
elseif fields.waypoint_add then
|
||||
local pos = player:get_pos()
|
||||
|
||||
for _, v in ipairs(data.waypoints) do
|
||||
if vec_eq(vec_round(pos), vec_round(str_to_pos(v.pos))) then
|
||||
play_sound(name, "i3_cannot", 0.8)
|
||||
return msg(name, "You already set a waypoint at this position")
|
||||
end
|
||||
end
|
||||
|
||||
local waypoint = fields.waypoint_name
|
||||
|
||||
if fields.waypoint_name == "" then
|
||||
waypoint = "Waypoint"
|
||||
end
|
||||
|
||||
local color = random(0xffffff)
|
||||
local id = add_hud_waypoint(player, waypoint, pos, color)
|
||||
|
||||
insert(data.waypoints, {
|
||||
name = waypoint,
|
||||
pos = pos_to_str(pos, 1),
|
||||
color = color,
|
||||
id = id,
|
||||
})
|
||||
|
||||
data.scrbar_inv += 1000
|
||||
|
||||
elseif fields.hide_debug_grid then
|
||||
data.hide_debug_grid = not data.hide_debug_grid
|
||||
end
|
||||
|
||||
return set_fs(player)
|
||||
end,
|
||||
})
|
||||
|
||||
local function select_item(player, data, _f)
|
||||
local item
|
||||
|
||||
for field in pairs(_f) do
|
||||
if find(field, ":") then
|
||||
item = field
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if not item then return end
|
||||
|
||||
if compressible(item, data) then
|
||||
local idx
|
||||
|
||||
for i = 1, #data.items do
|
||||
local it = data.items[i]
|
||||
if it == item then
|
||||
idx = i
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if data.expand ~= "" then
|
||||
data.alt_items = nil
|
||||
|
||||
if item == data.expand then
|
||||
data.expand = nil
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if idx and item ~= data.expand then
|
||||
data.alt_items = copy(data.items)
|
||||
data.expand = item
|
||||
|
||||
if i3.compress_groups[item] then
|
||||
local items = copy(i3.compress_groups[item])
|
||||
insert(items, fmt("_%s", item))
|
||||
|
||||
sort(items, function(a, b)
|
||||
if a:sub(1, 1) == "_" then
|
||||
a = a:sub(2)
|
||||
end
|
||||
|
||||
return a < b
|
||||
end)
|
||||
|
||||
local i = 1
|
||||
|
||||
for _, v in ipairs(items) do
|
||||
if valid_item(reg_items[clean_name(v)]) then
|
||||
insert(data.alt_items, idx + i, v)
|
||||
i++
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
if sub(item, 1, 1) == "_" then
|
||||
item = sub(item, 2)
|
||||
elseif sub(item, 1, 6) == "group!" then
|
||||
item = match(item, "([%w:_]+)$")
|
||||
end
|
||||
|
||||
item = reg_aliases[item] or item
|
||||
if not reg_items[item] then return end
|
||||
|
||||
if core.is_creative_enabled(data.player_name) then
|
||||
local stack = ItemStack(item)
|
||||
local stackmax = stack:get_stack_max()
|
||||
stack = fmt("%s %s", item, stackmax)
|
||||
|
||||
return get_stack(player, stack)
|
||||
end
|
||||
|
||||
if item == data.query_item then return end
|
||||
local recipes, usages = get_recipes(player, item)
|
||||
|
||||
data.query_item = item
|
||||
data.recipes = recipes
|
||||
data.usages = usages
|
||||
data.rnum = 1
|
||||
data.unum = 1
|
||||
data.scrbar_rcp = 1
|
||||
data.scrbar_usg = 1
|
||||
data.export_rcp = nil
|
||||
data.export_usg = nil
|
||||
end
|
||||
end
|
||||
|
||||
local function rcp_fields(player, data, fields)
|
||||
local sb_rcp, sb_usg = fields.scrbar_rcp, fields.scrbar_usg
|
||||
|
||||
if fields.cancel then
|
||||
reset_data(data)
|
||||
|
||||
elseif fields.exit then
|
||||
data.query_item = nil
|
||||
|
||||
elseif fields.key_enter_field == "filter" or fields.search then
|
||||
if fields.filter == "" then
|
||||
reset_data(data)
|
||||
return set_fs(player)
|
||||
end
|
||||
|
||||
local str = lower(fields.filter)
|
||||
if data.filter == str then return end
|
||||
|
||||
data.filter = str
|
||||
data.pagenum = 1
|
||||
|
||||
search(data)
|
||||
|
||||
if data.itab > 1 then
|
||||
sort_by_category(data)
|
||||
end
|
||||
|
||||
elseif fields.prev_page or fields.next_page then
|
||||
if data.pagemax == 1 then return end
|
||||
data.pagenum -= (fields.prev_page and 1 or -1)
|
||||
|
||||
if data.pagenum > data.pagemax then
|
||||
data.pagenum = 1
|
||||
elseif data.pagenum == 0 then
|
||||
data.pagenum = data.pagemax
|
||||
end
|
||||
|
||||
elseif fields.prev_recipe or fields.next_recipe then
|
||||
local num = data.rnum + (fields.prev_recipe and -1 or 1)
|
||||
data.rnum = data.recipes[num] and num or (fields.prev_recipe and #data.recipes or 1)
|
||||
data.export_rcp = nil
|
||||
data.scrbar_rcp = 1
|
||||
|
||||
elseif fields.prev_usage or fields.next_usage then
|
||||
local num = data.unum + (fields.prev_usage and -1 or 1)
|
||||
data.unum = data.usages[num] and num or (fields.prev_usage and #data.usages or 1)
|
||||
data.export_usg = nil
|
||||
data.scrbar_usg = 1
|
||||
|
||||
elseif fields.fav then
|
||||
local fav = is_fav(data)
|
||||
|
||||
if #data.favs < i3.settings.max_favs and not fav then
|
||||
insert(data.favs, data.query_item)
|
||||
elseif fav then
|
||||
remove(data.favs, fav)
|
||||
end
|
||||
|
||||
elseif fields.export_rcp or fields.export_usg then
|
||||
if fields.export_rcp then
|
||||
data.export_rcp = not data.export_rcp
|
||||
|
||||
if not data.export_rcp then
|
||||
data.scrbar_rcp = 1
|
||||
end
|
||||
else
|
||||
data.export_usg = not data.export_usg
|
||||
|
||||
if not data.export_usg then
|
||||
data.scrbar_usg = 1
|
||||
end
|
||||
end
|
||||
|
||||
elseif (sb_rcp and sub(sb_rcp, 1, 3) == "CHG") or (sb_usg and sub(sb_usg, 1, 3) == "CHG") then
|
||||
data.scrbar_rcp = sb_rcp and tonumber(match(sb_rcp, "%d+"))
|
||||
data.scrbar_usg = sb_usg and tonumber(match(sb_usg, "%d+"))
|
||||
|
||||
elseif fields.craft_rcp or fields.craft_usg then
|
||||
craft_stack(player, data, fields.craft_rcp)
|
||||
|
||||
if fields.craft_rcp then
|
||||
data.export_rcp = nil
|
||||
data.scrbar_rcp = 1
|
||||
else
|
||||
data.export_usg = nil
|
||||
data.scrbar_usg = 1
|
||||
end
|
||||
else
|
||||
select_item(player, data, fields)
|
||||
end
|
||||
end
|
||||
|
||||
core.register_on_player_receive_fields(function(player, formname, fields)
|
||||
local name = player:get_player_name()
|
||||
|
||||
if formname == "i3_outdated" then
|
||||
return false, core.kick_player(name,
|
||||
S"Come back when your Minetest client is up-to-date (www.minetest.net).")
|
||||
elseif formname ~= "" then
|
||||
return false
|
||||
end
|
||||
|
||||
-- No-op buttons
|
||||
if fields.player_name or fields.awards or fields.home_pos or fields.pagenum or
|
||||
fields.no_item or fields.no_rcp or fields.select_sorting or fields.sort_method or
|
||||
fields.bg_content then
|
||||
return false
|
||||
end
|
||||
|
||||
--print(dump(fields))
|
||||
local data = i3.data[name]
|
||||
if not data then return end
|
||||
|
||||
for f in pairs(fields) do
|
||||
if sub(f, 1, 4) == "tab_" then
|
||||
local tabname = sub(f, 5)
|
||||
i3.set_tab(player, tabname)
|
||||
break
|
||||
elseif sub(f, 1, 5) == "itab_" then
|
||||
data.pagenum = 1
|
||||
data.itab = tonumber(f:sub(-1))
|
||||
sort_by_category(data)
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
rcp_fields(player, data, fields)
|
||||
|
||||
local tab = i3.tabs[data.tab]
|
||||
|
||||
if tab and tab.fields then
|
||||
return true, tab.fields(player, data, fields)
|
||||
end
|
||||
|
||||
return true, set_fs(player)
|
||||
end)
|
||||
IMPORT("slz", "min", "insert", "copy", "ItemStack")
|
||||
IMPORT("spawn_item", "reset_data", "get_detached_inv")
|
||||
|
||||
core.register_on_player_hpchange(function(player, hpchange)
|
||||
local name = player:get_player_name()
|
||||
@ -523,3 +65,141 @@ core.register_on_player_inventory_action(function(player, _, _, info)
|
||||
set_fs(player)
|
||||
end
|
||||
end)
|
||||
|
||||
if core.global_exists("armor") then
|
||||
i3.modules.armor = true
|
||||
armor:register_on_update(set_fs)
|
||||
end
|
||||
|
||||
if core.global_exists("skins") then
|
||||
i3.modules.skins = true
|
||||
end
|
||||
|
||||
if core.global_exists("awards") then
|
||||
i3.modules.awards = true
|
||||
|
||||
core.register_on_craft(function(_, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_dignode(function(_, _, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_placenode(function(_, _, player)
|
||||
set_fs(player)
|
||||
end)
|
||||
|
||||
core.register_on_chat_message(function(name)
|
||||
local player = core.get_player_by_name(name)
|
||||
set_fs(player)
|
||||
end)
|
||||
end
|
||||
|
||||
local function disable_inventories()
|
||||
if rawget(_G, "sfinv") then
|
||||
function sfinv.set_player_inventory_formspec() return end
|
||||
sfinv.enabled = false
|
||||
end
|
||||
|
||||
if rawget(_G, "unified_inventory") then
|
||||
function unified_inventory.set_inventory_formspec() return end
|
||||
end
|
||||
end
|
||||
|
||||
core.register_on_mods_loaded(function()
|
||||
fill_caches()
|
||||
disable_inventories()
|
||||
end)
|
||||
|
||||
local function get_lang_code(info)
|
||||
return info and info.lang_code
|
||||
end
|
||||
|
||||
local function get_formspec_version(info)
|
||||
return info and info.formspec_version or 1
|
||||
end
|
||||
|
||||
local function outdated(name)
|
||||
core.show_formspec(name, "i3_outdated",
|
||||
("size[6.5,1.3]image[0,0;1,1;i3_book.png]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]"):format(
|
||||
"Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game."))
|
||||
end
|
||||
|
||||
local function init_data(player, info)
|
||||
local name = player:get_player_name()
|
||||
i3.data[name] = i3.data[name] or {}
|
||||
local data = i3.data[name]
|
||||
|
||||
data.player_name = name
|
||||
data.filter = ""
|
||||
data.pagenum = 1
|
||||
data.skin_pagenum = 1
|
||||
data.items = i3.init_items
|
||||
data.items_raw = i3.init_items
|
||||
data.favs = {}
|
||||
data.sort = "alphabetical"
|
||||
data.show_setting = "home"
|
||||
data.ignore_hotbar = false
|
||||
data.auto_sorting = false
|
||||
data.reverse_sorting = false
|
||||
data.inv_compress = true
|
||||
data.export_counts = {}
|
||||
data.tab = 1
|
||||
data.itab = 1
|
||||
data.subcat = 1
|
||||
data.scrbar_inv = 0
|
||||
data.lang_code = get_lang_code(info)
|
||||
data.fs_version = info.formspec_version
|
||||
|
||||
local inv = player:get_inventory()
|
||||
inv:set_size("main", i3.settings.inv_size)
|
||||
|
||||
core.after(0, set_fs, player)
|
||||
end
|
||||
|
||||
local function save_data(player_name)
|
||||
local _data = copy(i3.data)
|
||||
|
||||
for name, v in pairs(_data) do
|
||||
for dat in pairs(v) do
|
||||
if not i3.saves[dat] then
|
||||
_data[name][dat] = nil
|
||||
|
||||
if player_name and i3.data[player_name] then
|
||||
i3.data[player_name][dat] = nil -- To free up some memory
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
storage:set_string("data", slz(_data))
|
||||
end
|
||||
|
||||
insert(core.registered_on_joinplayers, 1, function(player)
|
||||
local name = player:get_player_name()
|
||||
local info = core.get_player_information and core.get_player_information(name)
|
||||
|
||||
if not info or get_formspec_version(info) < i3.settings.min_fs_version then
|
||||
return outdated(name)
|
||||
end
|
||||
|
||||
init_data(player, info)
|
||||
init_bags(player)
|
||||
init_detached(player)
|
||||
init_hud(player)
|
||||
end)
|
||||
|
||||
core.register_on_leaveplayer(function(player)
|
||||
local name = player:get_player_name()
|
||||
save_data(name)
|
||||
end)
|
||||
|
||||
core.register_on_shutdown(save_data)
|
||||
|
||||
local function routine()
|
||||
save_data()
|
||||
core.after(i3.settings.save_interval, routine)
|
||||
end
|
||||
|
||||
core.after(i3.settings.save_interval, routine)
|
||||
|
||||
@ -514,14 +514,17 @@ local function compress_items(list, start_i)
|
||||
return new_inv
|
||||
end
|
||||
|
||||
local function drop_items(player, inv, list, start_i, rej)
|
||||
local function drop_items(player, inv, list, start_i, rej, remove)
|
||||
for i = start_i, #list do
|
||||
local stack = list[i]
|
||||
local name = stack:get_name()
|
||||
|
||||
for _, it in ipairs(rej) do
|
||||
if name == it then
|
||||
if not remove then
|
||||
spawn_item(player, stack)
|
||||
end
|
||||
|
||||
inv:set_stack("main", i, ItemStack(""))
|
||||
end
|
||||
end
|
||||
@ -537,7 +540,7 @@ local function sort_inventory(player, data)
|
||||
local start_i = data.ignore_hotbar and (i3.settings.hotbar_len + 1) or 1
|
||||
|
||||
if true_table(data.drop_items) then
|
||||
list = drop_items(player, inv, list, start_i, data.drop_items)
|
||||
list = drop_items(player, inv, list, start_i, data.drop_items, true)
|
||||
end
|
||||
|
||||
if data.inv_compress then
|
||||
@ -561,6 +564,30 @@ local function sort_inventory(player, data)
|
||||
end
|
||||
end
|
||||
|
||||
local function reset_data(data)
|
||||
data.filter = ""
|
||||
data.expand = ""
|
||||
data.pagenum = 1
|
||||
data.rnum = 1
|
||||
data.unum = 1
|
||||
data.scrbar_rcp = 1
|
||||
data.scrbar_usg = 1
|
||||
data.query_item = nil
|
||||
data.recipes = nil
|
||||
data.usages = nil
|
||||
data.export_rcp = nil
|
||||
data.export_usg = nil
|
||||
data.alt_items = nil
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = nil
|
||||
data.show_setting = "home"
|
||||
data.items = data.items_raw
|
||||
|
||||
if data.itab > 1 then
|
||||
sort_by_category(data)
|
||||
end
|
||||
end
|
||||
|
||||
local function add_hud_waypoint(player, name, pos, color)
|
||||
return player:hud_add {
|
||||
hud_elem_type = "waypoint",
|
||||
@ -638,6 +665,7 @@ local _ = {
|
||||
spawn_item = spawn_item,
|
||||
clean_name = clean_name,
|
||||
play_sound = play_sound,
|
||||
reset_data = reset_data,
|
||||
safe_teleport = safe_teleport,
|
||||
add_hud_waypoint = add_hud_waypoint,
|
||||
|
||||
|
||||
@ -277,13 +277,7 @@ for _, nodename in ipairs(v) do
|
||||
t[nodename] = {}
|
||||
|
||||
for _, shape in ipairs(circular_saw_names) do
|
||||
local to_add = true
|
||||
|
||||
if shape[1] == "slope" and shape[2] == "" then
|
||||
to_add = nil
|
||||
end
|
||||
|
||||
if to_add then
|
||||
if shape[1] ~= "slope" or shape[2] ~= "" then
|
||||
insert(t[nodename], fmt("%s_%s%s", shape[1], nodename, shape[2]))
|
||||
end
|
||||
end
|
||||
@ -292,7 +286,7 @@ for _, nodename in ipairs(v) do
|
||||
|
||||
to_compress[fmt("%s:%s", mod, slope_name)] = {
|
||||
replace = slope_name,
|
||||
by = t[nodename]
|
||||
by = t[nodename],
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
456
src/fields.lua
Normal file
456
src/fields.lua
Normal file
@ -0,0 +1,456 @@
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
IMPORT("vec_eq", "vec_round")
|
||||
IMPORT("reg_items", "reg_aliases")
|
||||
IMPORT("S", "random", "translate", "ItemStack")
|
||||
IMPORT("sort", "copy", "insert", "remove", "indexof")
|
||||
IMPORT("fmt", "find", "match", "sub", "lower", "split", "toupper")
|
||||
IMPORT("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "reset_data")
|
||||
IMPORT("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv")
|
||||
IMPORT("valid_item", "get_stack", "craft_stack", "clean_name", "compressible", "check_privs", "safe_teleport")
|
||||
|
||||
local function inv_fields(player, data, fields)
|
||||
local name = data.player_name
|
||||
local inv = player:get_inventory()
|
||||
local sb_inv = fields.scrbar_inv
|
||||
|
||||
if sb_inv and sub(sb_inv, 1, 3) == "CHG" then
|
||||
data.scrbar_inv = tonumber(match(sb_inv, "%d+"))
|
||||
return
|
||||
end
|
||||
|
||||
if fields.drop_items then
|
||||
local items = split(fields.drop_items, ",")
|
||||
data.drop_items = items
|
||||
end
|
||||
|
||||
for field in pairs(fields) do
|
||||
if sub(field, 1, 4) == "btn_" then
|
||||
data.subcat = indexof(i3.categories, sub(field, 5))
|
||||
break
|
||||
|
||||
elseif sub(field, 1, 3) == "cb_" then
|
||||
local str = sub(field, 4)
|
||||
data[str] = false
|
||||
|
||||
if fields[field] == "true" then
|
||||
data[str] = true
|
||||
end
|
||||
|
||||
elseif sub(field, 1, 8) == "setting_" then
|
||||
data.show_setting = match(field, "_(%w+)$")
|
||||
|
||||
elseif sub(field, 1, 9) == "skin_btn_" then
|
||||
local id = tonumber(field:match("%d+"))
|
||||
local _skins = skins.get_skinlist_for_player(name)
|
||||
skins.set_player_skin(player, _skins[id])
|
||||
|
||||
elseif find(field, "waypoint_%d+") then
|
||||
local id, action = match(field, "_(%d+)_(%w+)$")
|
||||
id = tonumber(id)
|
||||
local waypoint = data.waypoints[id]
|
||||
if not waypoint then return end
|
||||
|
||||
if action == "see" then
|
||||
if data.waypoint_see and data.waypoint_see == id then
|
||||
data.waypoint_see = nil
|
||||
else
|
||||
data.waypoint_see = id
|
||||
end
|
||||
|
||||
elseif action == "delete" then
|
||||
player:hud_remove(waypoint.id)
|
||||
remove(data.waypoints, id)
|
||||
|
||||
elseif action == "teleport" then
|
||||
local pos = str_to_pos(waypoint.pos)
|
||||
safe_teleport(player, pos)
|
||||
msg(name, S("Teleported to: @1", waypoint.name))
|
||||
|
||||
elseif action == "refresh" then
|
||||
local color = random(0xffffff)
|
||||
waypoint.color = color
|
||||
player:hud_change(waypoint.id, "number", color)
|
||||
|
||||
elseif action == "hide" then
|
||||
if waypoint.hide then
|
||||
local new_id = add_hud_waypoint(
|
||||
player, waypoint.name, str_to_pos(waypoint.pos), waypoint.color)
|
||||
|
||||
waypoint.id = new_id
|
||||
waypoint.hide = nil
|
||||
else
|
||||
player:hud_remove(waypoint.id)
|
||||
waypoint.hide = true
|
||||
end
|
||||
end
|
||||
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if fields.quit then
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = nil
|
||||
data.waypoint_see = nil
|
||||
data.bag_rename = nil
|
||||
|
||||
elseif fields.trash then
|
||||
data.show_settings = nil
|
||||
data.confirm_trash = true
|
||||
|
||||
elseif fields.settings then
|
||||
if not data.show_settings then
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = true
|
||||
else
|
||||
data.show_settings = nil
|
||||
end
|
||||
|
||||
elseif fields.confirm_trash_yes or fields.confirm_trash_no then
|
||||
if fields.confirm_trash_yes then
|
||||
inv:set_list("main", {})
|
||||
inv:set_list("craft", {})
|
||||
end
|
||||
|
||||
data.confirm_trash = nil
|
||||
|
||||
elseif fields.close_settings then
|
||||
data.show_settings = nil
|
||||
|
||||
elseif fields.close_preview then
|
||||
data.waypoint_see = nil
|
||||
|
||||
elseif fields.sort then
|
||||
sort_inventory(player, data)
|
||||
|
||||
elseif fields.prev_sort or fields.next_sort then
|
||||
local idx = get_sorting_idx(data.sort)
|
||||
local tot = #i3.sorting_methods
|
||||
|
||||
idx -= (fields.prev_sort and 1 or -1)
|
||||
|
||||
if idx > tot then
|
||||
idx = 1
|
||||
elseif idx == 0 then
|
||||
idx = tot
|
||||
end
|
||||
|
||||
data.sort = i3.sorting_methods[idx].name
|
||||
|
||||
elseif fields.home then
|
||||
if not data.home then
|
||||
return msg(name, "No home set")
|
||||
elseif not check_privs(name, {home = true}) then
|
||||
return msg(name, "'home' privilege missing")
|
||||
end
|
||||
|
||||
safe_teleport(player, str_to_pos(data.home))
|
||||
msg(name, S"Welcome back home!")
|
||||
|
||||
elseif fields.set_home then
|
||||
data.home = pos_to_str(player:get_pos(), 1)
|
||||
|
||||
elseif fields.bag_rename then
|
||||
data.bag_rename = true
|
||||
|
||||
elseif fields.confirm_rename then
|
||||
local bag = get_detached_inv("bag", name)
|
||||
local bagstack = bag:get_stack("main", 1)
|
||||
local meta = bagstack:get_meta()
|
||||
local desc = translate(data.lang_code, bagstack:get_description())
|
||||
local fill = split(desc, "(")[2]
|
||||
local newname = fields.bag_newname:gsub("([%(%)])", "")
|
||||
newname = toupper(newname:trim())
|
||||
|
||||
if fill then
|
||||
newname = fmt("%s (%s", newname, fill)
|
||||
end
|
||||
|
||||
meta:set_string("description", newname)
|
||||
bag:set_stack("main", 1, bagstack)
|
||||
|
||||
data.bag = bagstack:to_string()
|
||||
data.bag_rename = nil
|
||||
|
||||
elseif fields.waypoint_add then
|
||||
local max_waypoints = i3.settings.max_waypoints
|
||||
|
||||
if #data.waypoints >= max_waypoints then
|
||||
play_sound(name, "i3_cannot", 0.8)
|
||||
return msg(name, fmt("Waypoints limit reached (%u)", max_waypoints))
|
||||
end
|
||||
|
||||
local pos = player:get_pos()
|
||||
|
||||
for _, v in ipairs(data.waypoints) do
|
||||
if vec_eq(vec_round(pos), vec_round(str_to_pos(v.pos))) then
|
||||
play_sound(name, "i3_cannot", 0.8)
|
||||
return msg(name, S"You already set a waypoint at this position")
|
||||
end
|
||||
end
|
||||
|
||||
local waypoint = fields.waypoint_name
|
||||
|
||||
if fields.waypoint_name == "" then
|
||||
waypoint = "Waypoint"
|
||||
end
|
||||
|
||||
local color = random(0xffffff)
|
||||
local id = add_hud_waypoint(player, waypoint, pos, color)
|
||||
|
||||
insert(data.waypoints, {
|
||||
name = waypoint,
|
||||
pos = pos_to_str(pos, 1),
|
||||
color = color,
|
||||
id = id,
|
||||
})
|
||||
|
||||
data.scrbar_inv += 1000
|
||||
|
||||
elseif fields.hide_debug_grid then
|
||||
data.hide_debug_grid = not data.hide_debug_grid
|
||||
end
|
||||
|
||||
return set_fs(player)
|
||||
end
|
||||
|
||||
local function select_item(player, data, _f)
|
||||
local item
|
||||
|
||||
for field in pairs(_f) do
|
||||
if find(field, ":") then
|
||||
item = field
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if not item then return end
|
||||
|
||||
if compressible(item, data) then
|
||||
local idx
|
||||
|
||||
for i = 1, #data.items do
|
||||
local it = data.items[i]
|
||||
if it == item then
|
||||
idx = i
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if data.expand ~= "" then
|
||||
data.alt_items = nil
|
||||
|
||||
if item == data.expand then
|
||||
data.expand = nil
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if idx and item ~= data.expand then
|
||||
data.alt_items = copy(data.items)
|
||||
data.expand = item
|
||||
|
||||
if i3.compress_groups[item] then
|
||||
local items = copy(i3.compress_groups[item])
|
||||
insert(items, fmt("_%s", item))
|
||||
|
||||
sort(items, function(a, b)
|
||||
if a:sub(1, 1) == "_" then
|
||||
a = a:sub(2)
|
||||
end
|
||||
|
||||
return a < b
|
||||
end)
|
||||
|
||||
local i = 1
|
||||
|
||||
for _, v in ipairs(items) do
|
||||
if valid_item(reg_items[clean_name(v)]) then
|
||||
insert(data.alt_items, idx + i, v)
|
||||
i++
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
if sub(item, 1, 1) == "_" then
|
||||
item = sub(item, 2)
|
||||
elseif sub(item, 1, 6) == "group!" then
|
||||
item = match(item, "([%w:_]+)$")
|
||||
end
|
||||
|
||||
item = reg_aliases[item] or item
|
||||
if not reg_items[item] then return end
|
||||
|
||||
if core.is_creative_enabled(data.player_name) then
|
||||
local stack = ItemStack(item)
|
||||
local stackmax = stack:get_stack_max()
|
||||
stack = fmt("%s %s", item, stackmax)
|
||||
|
||||
return get_stack(player, stack)
|
||||
end
|
||||
|
||||
if item == data.query_item then return end
|
||||
local recipes, usages = get_recipes(player, item)
|
||||
|
||||
data.query_item = item
|
||||
data.recipes = recipes
|
||||
data.usages = usages
|
||||
data.rnum = 1
|
||||
data.unum = 1
|
||||
data.scrbar_rcp = 1
|
||||
data.scrbar_usg = 1
|
||||
data.export_rcp = nil
|
||||
data.export_usg = nil
|
||||
end
|
||||
end
|
||||
|
||||
local function rcp_fields(player, data, fields)
|
||||
local sb_rcp, sb_usg = fields.scrbar_rcp, fields.scrbar_usg
|
||||
|
||||
if fields.cancel then
|
||||
reset_data(data)
|
||||
|
||||
elseif fields.exit then
|
||||
data.query_item = nil
|
||||
|
||||
elseif fields.key_enter_field == "filter" or fields.search then
|
||||
if fields.filter == "" then
|
||||
reset_data(data)
|
||||
return set_fs(player)
|
||||
end
|
||||
|
||||
local str = lower(fields.filter)
|
||||
if data.filter == str then return end
|
||||
|
||||
data.filter = str
|
||||
data.pagenum = 1
|
||||
|
||||
search(data)
|
||||
|
||||
if data.itab > 1 then
|
||||
sort_by_category(data)
|
||||
end
|
||||
|
||||
elseif fields.prev_page or fields.next_page then
|
||||
if data.pagemax == 1 then return end
|
||||
data.pagenum -= (fields.prev_page and 1 or -1)
|
||||
|
||||
if data.pagenum > data.pagemax then
|
||||
data.pagenum = 1
|
||||
elseif data.pagenum == 0 then
|
||||
data.pagenum = data.pagemax
|
||||
end
|
||||
|
||||
elseif fields.prev_skin or fields.next_skin then
|
||||
if data.skin_pagemax == 1 then return end
|
||||
data.skin_pagenum -= (fields.prev_skin and 1 or -1)
|
||||
|
||||
if data.skin_pagenum > data.skin_pagemax then
|
||||
data.skin_pagenum = 1
|
||||
elseif data.skin_pagenum == 0 then
|
||||
data.skin_pagenum = data.skin_pagemax
|
||||
end
|
||||
|
||||
elseif fields.prev_recipe or fields.next_recipe then
|
||||
local num = data.rnum + (fields.prev_recipe and -1 or 1)
|
||||
data.rnum = data.recipes[num] and num or (fields.prev_recipe and #data.recipes or 1)
|
||||
data.export_rcp = nil
|
||||
data.scrbar_rcp = 1
|
||||
|
||||
elseif fields.prev_usage or fields.next_usage then
|
||||
local num = data.unum + (fields.prev_usage and -1 or 1)
|
||||
data.unum = data.usages[num] and num or (fields.prev_usage and #data.usages or 1)
|
||||
data.export_usg = nil
|
||||
data.scrbar_usg = 1
|
||||
|
||||
elseif fields.fav then
|
||||
local fav = is_fav(data)
|
||||
|
||||
if #data.favs < i3.settings.max_favs and not fav then
|
||||
insert(data.favs, data.query_item)
|
||||
elseif fav then
|
||||
remove(data.favs, fav)
|
||||
end
|
||||
|
||||
elseif fields.export_rcp or fields.export_usg then
|
||||
if fields.export_rcp then
|
||||
data.export_rcp = not data.export_rcp
|
||||
|
||||
if not data.export_rcp then
|
||||
data.scrbar_rcp = 1
|
||||
end
|
||||
else
|
||||
data.export_usg = not data.export_usg
|
||||
|
||||
if not data.export_usg then
|
||||
data.scrbar_usg = 1
|
||||
end
|
||||
end
|
||||
|
||||
elseif (sb_rcp and sub(sb_rcp, 1, 3) == "CHG") or (sb_usg and sub(sb_usg, 1, 3) == "CHG") then
|
||||
data.scrbar_rcp = sb_rcp and tonumber(match(sb_rcp, "%d+"))
|
||||
data.scrbar_usg = sb_usg and tonumber(match(sb_usg, "%d+"))
|
||||
|
||||
elseif fields.craft_rcp or fields.craft_usg then
|
||||
craft_stack(player, data, fields.craft_rcp)
|
||||
|
||||
if fields.craft_rcp then
|
||||
data.export_rcp = nil
|
||||
data.scrbar_rcp = 1
|
||||
else
|
||||
data.export_usg = nil
|
||||
data.scrbar_usg = 1
|
||||
end
|
||||
else
|
||||
select_item(player, data, fields)
|
||||
end
|
||||
end
|
||||
|
||||
core.register_on_player_receive_fields(function(player, formname, fields)
|
||||
local name = player:get_player_name()
|
||||
|
||||
if formname == "i3_outdated" then
|
||||
return false, core.kick_player(name,
|
||||
S"Come back when your Minetest client is up-to-date (www.minetest.net).")
|
||||
elseif formname ~= "" then
|
||||
return false
|
||||
end
|
||||
|
||||
-- No-op buttons
|
||||
if fields.player_name or fields.awards or fields.home_pos or fields.pagenum or
|
||||
fields.no_item or fields.no_rcp or fields.select_sorting or fields.sort_method or
|
||||
fields.bg_content then
|
||||
return false
|
||||
end
|
||||
|
||||
--print(dump(fields))
|
||||
local data = i3.data[name]
|
||||
if not data then return end
|
||||
|
||||
for f in pairs(fields) do
|
||||
if sub(f, 1, 4) == "tab_" then
|
||||
local tabname = sub(f, 5)
|
||||
i3.set_tab(player, tabname)
|
||||
break
|
||||
elseif sub(f, 1, 5) == "itab_" then
|
||||
data.pagenum = 1
|
||||
data.itab = tonumber(f:sub(-1))
|
||||
sort_by_category(data)
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
rcp_fields(player, data, fields)
|
||||
|
||||
local tab = i3.tabs[data.tab]
|
||||
|
||||
if tab and tab.fields then
|
||||
return true, tab.fields(player, data, fields)
|
||||
end
|
||||
|
||||
return true, set_fs(player)
|
||||
end)
|
||||
|
||||
return inv_fields
|
||||
72
src/gui.lua
72
src/gui.lua
@ -1,5 +1,6 @@
|
||||
local damage_enabled = i3.settings.damage_enabled
|
||||
local hotbar_len = i3.settings.hotbar_len
|
||||
local debug_mode = i3.settings.debug_mode
|
||||
|
||||
local model_aliases = i3.files.model_alias()
|
||||
local PNG, styles, fs_elements, colors = i3.files.styles()
|
||||
@ -493,20 +494,41 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
|
||||
|
||||
local _skins = skins.get_skinlist_for_player(name)
|
||||
local skin_name = skins.get_player_skin(player).name
|
||||
local sks, id = {}, 1
|
||||
local btn_y = yextra + 0.75
|
||||
local spp = 24
|
||||
|
||||
for i, skin in ipairs(_skins) do
|
||||
if skin.name == skin_name then
|
||||
id = i
|
||||
data.skin_pagemax = max(1, ceil(#_skins / spp))
|
||||
|
||||
fs("image_button", 1.5, btn_y, 0.35, 0.35, "", "prev_skin", "")
|
||||
fs("image_button", 3.85, btn_y, 0.35, 0.35, "", "next_skin", "")
|
||||
|
||||
fs"style[skin_page;font=bold;font_size=18]"
|
||||
fs("button", 1.85, btn_y - 0.23, 2, 0.8, "skin_page",
|
||||
fmt("%s / %u", clr(colors.yellow, data.skin_pagenum), data.skin_pagemax))
|
||||
|
||||
local first = (data.skin_pagenum - 1) * spp
|
||||
local last = first + spp - 1
|
||||
|
||||
for i = first, last do
|
||||
local skin = _skins[i + 1]
|
||||
if not skin then break end
|
||||
local btn_name = fmt("skin_btn_%u", i + 1)
|
||||
|
||||
fs(fmt([[ style[%s;padding=10;
|
||||
fgimg=%s;bgimg=%s;bgimg_hovered=i3_btn9_hovered.png;
|
||||
bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6] ]],
|
||||
btn_name, skin:get_preview(),
|
||||
skin.name == skin_name and "i3_btn9_hovered.png" or "i3_btn9.png"))
|
||||
|
||||
local X = (i % 3) * 1.93
|
||||
|
||||
local Y = ceil((i % spp - X) / 3 + 1)
|
||||
Y += (Y * 2.45) + yextra - 2.15
|
||||
|
||||
fs("image_button", X, Y, 1.86, 3.4, "", btn_name, "")
|
||||
fs(fmt("tooltip[%s;%s]", btn_name, ESC(skin.name)))
|
||||
end
|
||||
|
||||
insert(sks, skin.name)
|
||||
end
|
||||
|
||||
sks = concat(sks, ","):gsub(";", "")
|
||||
fs("label", 0, yextra + 0.85, fmt("%s:", ES"Select a skin"))
|
||||
fs(fmt("dropdown[0,%f;4,0.6;skins;%s;%u;true]", yextra + 1.1, sks, id))
|
||||
|
||||
elseif data.subcat == 4 then
|
||||
if not i3.modules.awards then
|
||||
return not_installed "awards"
|
||||
@ -578,9 +600,6 @@ local function show_popup(fs, data)
|
||||
elseif show_sorting then
|
||||
fs("button", 2.1, 9.7, 6, 0.8, "select_sorting", ES"Select the inventory sorting method:")
|
||||
|
||||
fs(fmt("style[prev_sort;fgimg=%s;fgimg_hovered=%s]", PNG.prev, PNG.prev_hover),
|
||||
fmt("style[next_sort;fgimg=%s;fgimg_hovered=%s]", PNG.next, PNG.next_hover))
|
||||
|
||||
fs("image_button", 2.2, 10.6, 0.35, 0.35, "", "prev_sort", "")
|
||||
fs("image_button", 7.65, 10.6, 0.35, 0.35, "", "next_sort", "")
|
||||
|
||||
@ -605,7 +624,7 @@ local function show_popup(fs, data)
|
||||
end
|
||||
|
||||
fs("style[drop_items;font_size=15;font=mono;textcolor=#dbeeff]",
|
||||
fmt("field[5.4,10.68;2.4,0.45;drop_items;Drop items:;%s]",
|
||||
fmt("field[5.4,10.68;2.4,0.45;drop_items;Remove items:;%s]",
|
||||
ESC(concat(data.drop_items or {}, ","))),
|
||||
"field_close_on_enter[drop_items;false]")
|
||||
|
||||
@ -618,7 +637,7 @@ local function show_popup(fs, data)
|
||||
fmt("tooltip[cb_auto_sorting;%s;#707070;#fff]",
|
||||
ES"Enable this option to sort your inventory automatically"),
|
||||
fmt("tooltip[drop_items;%s;#707070;#fff]",
|
||||
"Add a comma-separated list of items to drop on inventory sorting.\n" ..
|
||||
"Add a comma-separated list of items to remove on inventory sorting.\n" ..
|
||||
"Format: " .. ("mod:item,mod:item, ..."):gsub("(%a+:%a+)", clr("#bddeff", "%1"))))
|
||||
end
|
||||
end
|
||||
@ -666,6 +685,13 @@ local function get_inventory_fs(player, data, fs)
|
||||
|
||||
max_val += 10
|
||||
|
||||
elseif i3.modules.skins and data.subcat == 3 then
|
||||
local spp = 24
|
||||
local _skins = skins.get_skinlist_for_player(data.player_name)
|
||||
local num = max(1, min(spp, #_skins - ((data.skin_pagenum - 1) * spp)))
|
||||
|
||||
max_val += ceil(num / 3) * 34
|
||||
|
||||
elseif i3.modules.awards and data.subcat == 4 then
|
||||
award_list = awards.get_award_states(data.player_name)
|
||||
award_list_nb = #award_list
|
||||
@ -1195,9 +1221,10 @@ local function get_export_fs(fs, data, is_recipe, is_usage, max_stacks_rcp, max_
|
||||
|
||||
fs(fmt("style[scrbar_%s;noclip=true]", name),
|
||||
fmt("scrollbaroptions[min=1;max=%u;smallstep=1]", craft_max))
|
||||
fs("scrollbar", data.inv_width + 8.1, data.yoffset, 3, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
|
||||
fs("button", data.inv_width + 8.1, data.yoffset + 0.4, 3, 0.7,
|
||||
fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
|
||||
|
||||
local x = data.inv_width + 8.1
|
||||
fs("scrollbar", x, data.yoffset, 2.5, 0.35, "horizontal", fmt("scrbar_%s", name), stack_fs)
|
||||
fs("button", x, data.yoffset + 0.4, 2.5, 0.7, fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
|
||||
end
|
||||
|
||||
local function get_rcp_extra(fs, data, player, panel, is_recipe, is_usage)
|
||||
@ -1460,7 +1487,7 @@ local function get_debug_grid(data, fs, full_height)
|
||||
end
|
||||
|
||||
local function make_fs(player, data)
|
||||
local start = i3.settings.debug_mode and os.clock() or nil
|
||||
local start = debug_mode and core.get_us_time() or nil
|
||||
|
||||
local fs = setmetatable({}, {
|
||||
__call = function(t, ...)
|
||||
@ -1484,7 +1511,6 @@ local function make_fs(player, data)
|
||||
fs("bg9", 0, 0, data.inv_width, full_height, PNG.bg_full, 10)
|
||||
|
||||
local tab = i3.tabs[data.tab]
|
||||
|
||||
if tab then
|
||||
tab.formspec(player, data, fs)
|
||||
end
|
||||
@ -1499,9 +1525,9 @@ local function make_fs(player, data)
|
||||
get_tabs_fs(fs, player, data, full_height)
|
||||
end
|
||||
|
||||
if i3.settings.debug_mode then
|
||||
if debug_mode then
|
||||
get_debug_grid(data, fs, full_height)
|
||||
msg(data.player_name, fmt("make_fs(): %.2f ms", (os.clock() - start) * 1000))
|
||||
msg(data.player_name, fmt("make_fs(): %.2f ms", (core.get_us_time() - start) / 1000))
|
||||
msg(data.player_name, fmt("#fs elements: %u", #fs))
|
||||
end
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
local model_alias = {
|
||||
return {
|
||||
["boats:boat"] = {name = "boats:boat", drawtype = "entity"},
|
||||
["carts:cart"] = {name = "carts:cart", drawtype = "entity", frames = "0,0"},
|
||||
["default:chest"] = {name = "default:chest_open"},
|
||||
@ -9,5 +9,3 @@ local model_alias = {
|
||||
["doors:door_steel"] = {name = "doors:door_steel_a"},
|
||||
["xpanes:door_steel_bar"] = {name = "xpanes:door_steel_bar_a"},
|
||||
}
|
||||
|
||||
return model_alias
|
||||
|
||||
@ -79,12 +79,8 @@ local styles = string.format([[
|
||||
style[exit;fgimg=%s;fgimg_hovered=%s;content_offset=0]
|
||||
style[cancel;fgimg=%s;fgimg_hovered=%s;content_offset=0]
|
||||
style[search;fgimg=%s;fgimg_hovered=%s;content_offset=0]
|
||||
style[prev_page;fgimg=%s;fgimg_hovered=%s]
|
||||
style[next_page;fgimg=%s;fgimg_hovered=%s]
|
||||
style[prev_recipe;fgimg=%s;fgimg_hovered=%s]
|
||||
style[next_recipe;fgimg=%s;fgimg_hovered=%s]
|
||||
style[prev_usage;fgimg=%s;fgimg_hovered=%s]
|
||||
style[next_usage;fgimg=%s;fgimg_hovered=%s]
|
||||
style[prev_page,prev_recipe,prev_usage,prev_sort,prev_skin;fgimg=%s;fgimg_hovered=%s]
|
||||
style[next_page,next_recipe,next_usage,next_sort,next_skin;fgimg=%s;fgimg_hovered=%s]
|
||||
style[waypoint_add;fgimg=%s;fgimg_hovered=%s;content_offset=0]
|
||||
style[bag_rename;fgimg=%s;fgimg_hovered=%s;content_offset=0]
|
||||
style[btn_bag,btn_armor,btn_skins;font=bold;font_size=18;content_offset=0;sound=i3_click]
|
||||
@ -102,10 +98,6 @@ PNG.cancel, PNG.cancel_hover,
|
||||
PNG.search, PNG.search_hover,
|
||||
PNG.prev, PNG.prev_hover,
|
||||
PNG.next, PNG.next_hover,
|
||||
PNG.prev, PNG.prev_hover,
|
||||
PNG.next, PNG.next_hover,
|
||||
PNG.prev, PNG.prev_hover,
|
||||
PNG.next, PNG.next_hover,
|
||||
PNG.add, PNG.add_hover,
|
||||
PNG.edit, PNG.edit_hover)
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ local exec = os.execute
|
||||
local fmt, find, sub = string.format, string.find, string.sub
|
||||
local var = "[%w%.%[%]\"\'_]"
|
||||
|
||||
exec("reset")
|
||||
exec "clear"
|
||||
|
||||
local function split(str, delim, include_empty, max_splits, sep_is_pattern)
|
||||
delim = delim or ","
|
||||
@ -36,6 +36,7 @@ local files = {
|
||||
"common",
|
||||
"compress",
|
||||
"detached_inv",
|
||||
"fields",
|
||||
"groups",
|
||||
"gui",
|
||||
"hud",
|
||||
@ -120,10 +121,10 @@ for _, p in ipairs(files) do
|
||||
_file:close()
|
||||
end
|
||||
|
||||
_load("./src/" .. p .. ".lua")
|
||||
_load("../src/" .. p .. ".lua")
|
||||
end
|
||||
|
||||
exec("luacheck init.lua")
|
||||
exec("luacheck ./src/operators.lua")
|
||||
exec("luacheck ./src/*.l")
|
||||
exec("rm ./src/*.l")
|
||||
exec "luacheck ../init.lua"
|
||||
exec "luacheck ../src/operators.lua"
|
||||
exec "luacheck ../src/*.l"
|
||||
exec "rm ../src/*.l"
|
||||
7
util/optipng.sh
Normal file
7
util/optipng.sh
Normal file
@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Colors with 0 alpha need to be preserved, because opaque leaves ignore alpha.
|
||||
# For that purpose, the use of indexed colors is disabled (-nc).
|
||||
|
||||
cd ../textures
|
||||
find -name '*.png' -print0 | xargs -0 optipng -o7 -zm1-9 -nc -strip all -clobber
|
||||
23
util/servers.lua
Normal file
23
util/servers.lua
Normal file
@ -0,0 +1,23 @@
|
||||
local JSON = require"JSON" -- luarocks install json-lua
|
||||
os.execute "clear"
|
||||
|
||||
local list = io.popen("curl -s -H 'Accept: text/html' http://servers.minetest.net/list"):read("*a")
|
||||
list = JSON:decode(list).list
|
||||
|
||||
local servers = {}
|
||||
|
||||
for _, server in ipairs(list) do
|
||||
if server.mods then
|
||||
for _, mod in ipairs(server.mods) do
|
||||
if mod == "i3" then
|
||||
table.insert(servers, server.name)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if #servers > 0 then
|
||||
print(("=> %u/%u servers using [i3]:\n\t• %s"):format(#servers, #list, table.concat(servers, "\n\t• ")))
|
||||
else
|
||||
print"No server using [i3]"
|
||||
end
|
||||
Reference in New Issue
Block a user