Merge branch 'main' of https://github.com/minetest-mods/i3
OldCoder
commit
5792c70211
|
|
@ -10,6 +10,7 @@ read_globals = {
|
|||
"armor",
|
||||
"skins",
|
||||
"awards",
|
||||
"hb",
|
||||
"vector",
|
||||
"string",
|
||||
"table",
|
||||
|
|
|
|||
4
API.md
4
API.md
|
|
@ -17,9 +17,7 @@ i3.new_tab("stuff", {
|
|||
-- Determine if the tab is visible by a player, `false` or `nil` hide the tab
|
||||
access = function(player, data)
|
||||
local name = player:get_player_name()
|
||||
if name == "singleplayer" then
|
||||
return false
|
||||
end
|
||||
return name == "singleplayer"
|
||||
end,
|
||||
|
||||
formspec = function(player, data, fs)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
This mod features a modern, powerful inventory menu with a good user experience.
|
||||
**`i3`** provides a rich [**API**](https://github.com/minetest-mods/i3/blob/master/API.md) for mod developers who want to extend it.
|
||||
|
||||
This mod requires **Minetest 5.4+**
|
||||
This mod requires **Minetest 5.6+**
|
||||
|
||||
#### List of features:
|
||||
- Crafting Guide (survival mode only)
|
||||
|
|
@ -43,6 +43,8 @@ To use this mod in the best conditions:
|
|||
If the inventory's font size is too big on certain setups (namely Windows 10/11 or 144 DPI display), you should lower the
|
||||
value of the setting `display_density_factor` in your `minetest.conf`. Note that the change is applied after restart.
|
||||
|
||||
You can also use the font size slider in the inventory, settings window.
|
||||
|
||||
#### Notes
|
||||
|
||||
`i3` uses a larger inventory than the usual inventories in Minetest games.
|
||||
|
|
@ -53,4 +55,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
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
18
init.lua
18
init.lua
|
|
@ -13,22 +13,24 @@ 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 _loadfile = dofile(modpath .. "/src/preprocessor.lua")
|
||||
|
||||
local function lf(path)
|
||||
return assert(_loadfile(modpath .. path))
|
||||
end
|
||||
|
||||
i3 = {
|
||||
version = 1113,
|
||||
data = core.deserialize(storage:get_string"data") or {},
|
||||
|
||||
settings = {
|
||||
debug_mode = false,
|
||||
max_favs = 6,
|
||||
max_waypoints = 30,
|
||||
min_fs_version = 4,
|
||||
min_fs_version = 6,
|
||||
item_btn_size = 1.1,
|
||||
drop_bag_on_die = true,
|
||||
wielditem_fade_after = 3,
|
||||
save_interval = 600, -- Player data save interval (in seconds)
|
||||
|
||||
hud_speed = 1,
|
||||
|
|
@ -36,7 +38,6 @@ i3 = {
|
|||
|
||||
damage_enabled = core.settings:get_bool"enable_damage",
|
||||
progressive_mode = core.settings:get_bool"i3_progressive_mode",
|
||||
legacy_inventory = core.settings:get_bool"i3_legacy_inventory",
|
||||
item_compression = core.settings:get_bool("i3_item_compression", true),
|
||||
},
|
||||
|
||||
|
|
@ -51,10 +52,13 @@ i3 = {
|
|||
saves = { -- Metadata to save
|
||||
bag = true,
|
||||
home = true,
|
||||
font_size = true,
|
||||
hide_tabs = true,
|
||||
waypoints = true,
|
||||
inv_items = true,
|
||||
drop_items = true,
|
||||
known_recipes = true,
|
||||
wielditem_hud = true,
|
||||
legacy_inventory = true,
|
||||
},
|
||||
|
||||
files = {
|
||||
|
|
@ -63,7 +67,7 @@ i3 = {
|
|||
caches = lf"/src/caches.lua",
|
||||
callbacks = lf"/src/callbacks.lua",
|
||||
common = lf"/src/common.lua",
|
||||
compress = lf"/src/compress.lua",
|
||||
compress = lf"/src/compression.lua",
|
||||
detached = lf"/src/detached_inv.lua",
|
||||
fields = lf"/src/fields.lua",
|
||||
groups = lf"/src/groups.lua",
|
||||
|
|
@ -82,6 +86,7 @@ i3 = {
|
|||
|
||||
tabs = {},
|
||||
cubes = {},
|
||||
groups = {},
|
||||
plants = {},
|
||||
modules = {},
|
||||
craft_types = {},
|
||||
|
|
@ -91,9 +96,6 @@ i3 = {
|
|||
sorting_methods = {},
|
||||
}
|
||||
|
||||
i3.settings.hotbar_len = i3.settings.legacy_inventory and 8 or 9
|
||||
i3.settings.inv_size = 4 * i3.settings.hotbar_len
|
||||
|
||||
i3.files.common()
|
||||
i3.files.api(http)
|
||||
i3.files.compress()
|
||||
|
|
|
|||
2
mod.conf
2
mod.conf
|
|
@ -1,4 +1,4 @@
|
|||
name = i3
|
||||
description = Next-generation inventory
|
||||
optional_depends = 3d_armor, skinsdb, awards
|
||||
min_minetest_version = 5.4
|
||||
min_minetest_version = 5.6
|
||||
|
|
|
|||
|
|
@ -3,6 +3,3 @@ i3_progressive_mode (Learn crafting recipes progressively) bool false
|
|||
|
||||
# Regroup the items of the same type in the item list.
|
||||
i3_item_compression (Regroup items of the same type) bool true
|
||||
|
||||
# Set the inventory size to common chests size (8*4).
|
||||
i3_legacy_inventory (Legacy inventory size) bool false
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15
src/api.lua
15
src/api.lua
|
|
@ -167,6 +167,13 @@ function i3.set_fs(player)
|
|||
sort_inventory(player, data)
|
||||
end
|
||||
|
||||
for i, tab in ipairs(i3.tabs) do
|
||||
if data.tab == i and tab.access and not tab.access(player, data) then
|
||||
data.tab = 1
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
local fs = make_fs(player, data)
|
||||
player:set_inventory_formspec(fs)
|
||||
end
|
||||
|
|
@ -221,8 +228,8 @@ function i3.set_tab(player, tabname)
|
|||
return
|
||||
end
|
||||
|
||||
for i, def in ipairs(i3.tabs) do
|
||||
if def.name == tabname then
|
||||
for i, tab in ipairs(i3.tabs) do
|
||||
if tab.name == tabname then
|
||||
data.tab = i
|
||||
return
|
||||
end
|
||||
|
|
@ -337,7 +344,7 @@ end
|
|||
i3.add_sorting_method("alphabetical", {
|
||||
description = S"Sort items by name (A-Z)",
|
||||
func = function(list, data)
|
||||
sorter(list, data.reverse_sorting, 1)
|
||||
sorter(list, data, 1)
|
||||
return list
|
||||
end
|
||||
})
|
||||
|
|
@ -345,7 +352,7 @@ i3.add_sorting_method("alphabetical", {
|
|||
i3.add_sorting_method("numerical", {
|
||||
description = S"Sort items by number of items per stack",
|
||||
func = function(list, data)
|
||||
sorter(list, data.reverse_sorting, 2)
|
||||
sorter(list, data, 2)
|
||||
return list
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
local PNG = i3.files.styles()
|
||||
local replacements = {fuel = {}}
|
||||
local http = ...
|
||||
|
||||
IMPORT("maxn", "copy", "insert", "sort", "match", "sub")
|
||||
IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items")
|
||||
IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "draw_cube", "ItemStack")
|
||||
IMPORT("true_str", "true_table", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
|
||||
IMPORT("true_str", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
|
||||
IMPORT("fmt", "reg_items", "reg_aliases", "reg_nodes", "is_cube", "get_cube", "ItemStack")
|
||||
IMPORT("is_group", "extract_groups", "item_has_groups", "groups_to_items", "get_group_stereotype")
|
||||
|
||||
local function get_burntime(item)
|
||||
return core.get_craft_result{method = "fuel", items = {item}}.time
|
||||
|
|
@ -23,10 +22,55 @@ local function cache_fuel(item)
|
|||
end
|
||||
end
|
||||
|
||||
local function get_item_usages(item, recipe, added)
|
||||
local groups = extract_groups(item)
|
||||
local function cache_groups(group, groups)
|
||||
i3.groups[group] = {}
|
||||
i3.groups[group].groups = groups
|
||||
i3.groups[group].items = groups_to_items(groups)
|
||||
|
||||
if #groups == 1 then
|
||||
i3.groups[group].stereotype = get_group_stereotype(groups[1])
|
||||
end
|
||||
|
||||
local items = i3.groups[group].items
|
||||
if #items <= 1 then return end
|
||||
|
||||
local px, lim, c = 64, 10, 0
|
||||
local sprite = "[combine:WxH"
|
||||
|
||||
for _, item in ipairs(items) do
|
||||
local def = reg_items[item]
|
||||
local tiles = def.tiles or def.tile_images
|
||||
local texture = true_str(def.inventory_image) and def.inventory_image --or tiles[1]
|
||||
|
||||
if def.drawtype and is_cube(def.drawtype) then
|
||||
texture = get_cube(tiles)
|
||||
end
|
||||
|
||||
if texture then
|
||||
texture = texture:gsub("%^", "\\^"):gsub(":", "\\:") .. fmt("\\^[resize\\:%ux%u", px, px)
|
||||
sprite = sprite .. fmt(":0,%u=%s", c * px, texture)
|
||||
c++
|
||||
if c == lim then break end
|
||||
end
|
||||
end
|
||||
|
||||
if c > 1 then
|
||||
sprite = sprite:gsub("WxH", px .. "x" .. px * c)
|
||||
i3.groups[group].sprite = sprite
|
||||
i3.groups[group].count = c
|
||||
end
|
||||
end
|
||||
|
||||
local function get_item_usages(item, recipe, added)
|
||||
if is_group(item) then
|
||||
local group = item:sub(7)
|
||||
local group_cache = i3.groups[group]
|
||||
local groups = group_cache and group_cache.groups or extract_groups(item)
|
||||
|
||||
if not group_cache then
|
||||
cache_groups(group, groups)
|
||||
end
|
||||
|
||||
if groups then
|
||||
for name, def in pairs(reg_items) do
|
||||
if not added[name] and valid_item(def) and item_has_groups(def.groups, groups) then
|
||||
local usage = copy(recipe)
|
||||
|
|
@ -181,7 +225,7 @@ core.register_craft = function(def)
|
|||
|
||||
if is_group(output[1]) then
|
||||
groups = extract_groups(output[1])
|
||||
output = groups_to_items(groups, true)
|
||||
output = groups_to_items(groups)
|
||||
end
|
||||
|
||||
for i = 1, #output do
|
||||
|
|
@ -242,7 +286,7 @@ local function resolve_aliases(hash)
|
|||
end
|
||||
end
|
||||
|
||||
if newname ~= "" and i3.recipes_cache[oldname] and not hash[newname] then
|
||||
if newname ~= "" and i3.recipes_cache[oldname] and reg_items[newname] and not hash[newname] then
|
||||
insert(i3.init_items, newname)
|
||||
end
|
||||
end
|
||||
|
|
@ -284,40 +328,20 @@ local function init_recipes()
|
|||
end
|
||||
end
|
||||
|
||||
local function get_cube(tiles)
|
||||
if not true_table(tiles) then
|
||||
return PNG.blank
|
||||
end
|
||||
|
||||
local top = tiles[1] or PNG.blank
|
||||
if is_table(top) then
|
||||
top = top.name or top.image
|
||||
end
|
||||
|
||||
local left = tiles[3] or top or PNG.blank
|
||||
if is_table(left) then
|
||||
left = left.name or left.image
|
||||
end
|
||||
|
||||
local right = tiles[5] or left or PNG.blank
|
||||
if is_table(right) then
|
||||
right = right.name or right.image
|
||||
end
|
||||
|
||||
return draw_cube(top, left, right)
|
||||
end
|
||||
|
||||
local function init_cubes()
|
||||
for name, def in pairs(reg_nodes) do
|
||||
if def then
|
||||
local id = core.get_content_id(name)
|
||||
local tiles = def.tiles or def.tile_images
|
||||
|
||||
if def.drawtype == "normal" or def.drawtype == "liquid" or
|
||||
sub(def.drawtype, 1, 9) == "glasslike" or
|
||||
sub(def.drawtype, 1, 8) == "allfaces" then
|
||||
i3.cubes[id] = get_cube(def.tiles)
|
||||
if is_cube(def.drawtype) then
|
||||
i3.cubes[id] = get_cube(tiles)
|
||||
elseif sub(def.drawtype, 1, 9) == "plantlike" or sub(def.drawtype, 1, 8) == "firelike" then
|
||||
i3.plants[id] = def.inventory_image .. "^\\[resize:16x16"
|
||||
local texture = true_str(def.inventory_image) and def.inventory_image or tiles[1]
|
||||
|
||||
if texture then
|
||||
i3.plants[id] = texture
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ local init_detached = i3.files.detached()
|
|||
local init_hud = i3.files.hud()
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
IMPORT("slz", "min", "copy", "ItemStack")
|
||||
IMPORT("spawn_item", "reset_data", "get_detached_inv")
|
||||
IMPORT("slz", "min", "insert", "copy", "ItemStack")
|
||||
IMPORT("spawn_item", "reset_data", "get_detached_inv", "play_sound", "update_inv_size")
|
||||
|
||||
core.register_on_player_hpchange(function(player, hpchange)
|
||||
local name = player:get_player_name()
|
||||
|
|
@ -66,16 +66,93 @@ core.register_on_player_inventory_action(function(player, _, _, info)
|
|||
end
|
||||
end)
|
||||
|
||||
if core.global_exists("armor") then
|
||||
if core.global_exists"armor" then
|
||||
i3.modules.armor = true
|
||||
armor:register_on_update(set_fs)
|
||||
|
||||
local group_indexes = {
|
||||
{"armor_head", "i3_heavy_helmet"},
|
||||
{"armor_torso", "i3_heavy_armor"},
|
||||
{"armor_legs", "i3_heavy_leggings"},
|
||||
{"armor_feet", "i3_heavy_boots"},
|
||||
{"armor_shield", "i3_heavy_shield"},
|
||||
}
|
||||
|
||||
local function check_group(def, group)
|
||||
return def.groups[group] and def.groups[group] > 0
|
||||
end
|
||||
|
||||
armor:register_on_equip(function(player, idx, stack)
|
||||
local _, armor_inv = armor:get_valid_player(player, "3d_armor")
|
||||
local def = stack:get_definition()
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
|
||||
for i, v in ipairs(group_indexes) do
|
||||
local group, sound = unpack(v)
|
||||
local stackname = stack:get_name()
|
||||
|
||||
if stackname:find"wood" or stackname:find"stone" or stackname:find"cactus" then
|
||||
sound = sound:gsub("heavy", "light")
|
||||
end
|
||||
|
||||
if i == idx and check_group(def, group) then
|
||||
data.armor_allow = sound
|
||||
return armor:register_on_update(set_fs)
|
||||
end
|
||||
end
|
||||
|
||||
data.armor_disallow = true
|
||||
armor_inv:remove_item("armor", stack)
|
||||
end)
|
||||
|
||||
armor:register_on_update(function(player)
|
||||
local _, armor_inv = armor:get_valid_player(player, "3d_armor")
|
||||
if not armor_inv then return end
|
||||
|
||||
for i = 1, 5 do
|
||||
local stack = armor_inv:get_stack("armor", i)
|
||||
local def = stack:get_definition()
|
||||
|
||||
for j, v in ipairs(group_indexes) do
|
||||
local group = v[1]
|
||||
|
||||
if check_group(def, group) and i ~= j then
|
||||
armor_inv:set_stack("armor", i, armor_inv:get_stack("armor", j))
|
||||
armor_inv:set_stack("armor", j, stack)
|
||||
|
||||
return play_sound(player:get_player_name(), "i3_cannot", 0.8)
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
core.register_on_player_inventory_action(function(player, action, _, info)
|
||||
if action ~= "take" then return end
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
|
||||
if data.armor_disallow then
|
||||
local inv = player:get_inventory()
|
||||
inv:set_stack("main", info.index, info.stack)
|
||||
data.armor_disallow = nil
|
||||
play_sound(name, "i3_cannot", 0.8)
|
||||
|
||||
elseif data.armor_allow then
|
||||
play_sound(name, data.armor_allow, 0.8)
|
||||
data.armor_allow = nil
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
if core.global_exists("skins") then
|
||||
if core.global_exists"skins" then
|
||||
i3.modules.skins = true
|
||||
end
|
||||
|
||||
if core.global_exists("awards") then
|
||||
if core.global_exists"hb" then
|
||||
i3.modules.hudbars = true
|
||||
end
|
||||
|
||||
if core.global_exists"awards" then
|
||||
i3.modules.awards = true
|
||||
|
||||
core.register_on_craft(function(_, player)
|
||||
|
|
@ -134,25 +211,26 @@ local function init_data(player, info)
|
|||
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.crafting_counts = {}
|
||||
data.sort = 1
|
||||
data.tab = 1
|
||||
data.itab = 1
|
||||
data.subcat = 1
|
||||
data.scrbar_inv = 0
|
||||
data.font_size = data.font_size or 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)
|
||||
update_inv_size(player, data)
|
||||
|
||||
core.after(0, set_fs, player)
|
||||
end
|
||||
|
|
@ -175,7 +253,7 @@ local function save_data(player_name)
|
|||
storage:set_string("data", slz(_data))
|
||||
end
|
||||
|
||||
core.register_on_joinplayer(function(player)
|
||||
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)
|
||||
|
||||
|
|
|
|||
168
src/common.lua
168
src/common.lua
|
|
@ -9,6 +9,14 @@ local fmt, find, match, gmatch, sub, split, lower, upper =
|
|||
string.format, string.find, string.match, string.gmatch,
|
||||
string.sub, string.split, string.lower, string.upper
|
||||
|
||||
if not core.registered_privileges.creative then
|
||||
core.register_privilege("creative", {
|
||||
description = "Allow player to use creative inventory",
|
||||
give_to_singleplayer = false,
|
||||
give_to_admin = false,
|
||||
})
|
||||
end
|
||||
|
||||
local old_is_creative_enabled = core.is_creative_enabled
|
||||
|
||||
function core.is_creative_enabled(name)
|
||||
|
|
@ -69,6 +77,16 @@ local function toupper(str)
|
|||
return str:gsub("%f[%w]%l", upper):gsub("_", " ")
|
||||
end
|
||||
|
||||
local function utf8_len(str)
|
||||
local c = 0
|
||||
|
||||
for _ in str:gmatch"[%z\1-\127\194-\244][\128-\191]*" do -- Arguably working duct-tape code
|
||||
c++
|
||||
end
|
||||
|
||||
return c
|
||||
end
|
||||
|
||||
local function get_bag_description(data, stack)
|
||||
local desc = translate(data.lang_code, stack:get_description())
|
||||
desc = split(desc, "(")[1] or desc
|
||||
|
|
@ -101,7 +119,7 @@ local function search(data)
|
|||
for i = 1, #data.items_raw do
|
||||
local item = data.items_raw[i]
|
||||
local def = reg_items[item]
|
||||
local desc = lower(translate(data.lang_code, def and def.description)) or ""
|
||||
local desc = lower(translate(data.lang_code, def.description)) or ""
|
||||
local search_in = fmt("%s %s", item, desc)
|
||||
local temp, j, to_add = {}, 1
|
||||
|
||||
|
|
@ -228,9 +246,7 @@ local function is_group(item)
|
|||
end
|
||||
|
||||
local function extract_groups(str)
|
||||
if sub(str, 1, 6) == "group:" then
|
||||
return split(sub(str, 7), ",")
|
||||
end
|
||||
return split(sub(str, 7), ",")
|
||||
end
|
||||
|
||||
local function item_has_groups(item_groups, groups)
|
||||
|
|
@ -247,30 +263,56 @@ local function valid_item(def)
|
|||
def.description and def.description ~= ""
|
||||
end
|
||||
|
||||
local function groups_to_items(groups, get_all)
|
||||
if not get_all and #groups == 1 then
|
||||
local group = groups[1]
|
||||
local stereotype = i3.group_stereotypes[group]
|
||||
local def = reg_items[stereotype]
|
||||
local function get_group_stereotype(group)
|
||||
local stereotype = i3.group_stereotypes[group]
|
||||
local def = reg_items[stereotype]
|
||||
|
||||
if valid_item(def) then
|
||||
return stereotype
|
||||
end
|
||||
if valid_item(def) then
|
||||
return stereotype
|
||||
end
|
||||
end
|
||||
|
||||
local function groups_to_items(groups)
|
||||
local names = {}
|
||||
|
||||
for name, def in pairs(reg_items) do
|
||||
if valid_item(def) and item_has_groups(def.groups, groups) then
|
||||
if get_all then
|
||||
insert(names, name)
|
||||
else
|
||||
return name
|
||||
end
|
||||
insert(names, name)
|
||||
end
|
||||
end
|
||||
|
||||
return get_all and names or ""
|
||||
sort(names)
|
||||
|
||||
return names
|
||||
end
|
||||
|
||||
local function is_cube(drawtype)
|
||||
return drawtype == "normal" or drawtype == "liquid" or
|
||||
sub(drawtype, 1, 9) == "glasslike" or
|
||||
sub(drawtype, 1, 8) == "allfaces"
|
||||
end
|
||||
|
||||
local function get_cube(tiles)
|
||||
if not true_table(tiles) then
|
||||
return "i3_blank.png"
|
||||
end
|
||||
|
||||
local top = tiles[1] or "i3_blank.png"
|
||||
if is_table(top) then
|
||||
top = top.name or top.image
|
||||
end
|
||||
|
||||
local left = tiles[3] or top or "i3_blank.png"
|
||||
if is_table(left) then
|
||||
left = left.name or left.image
|
||||
end
|
||||
|
||||
local right = tiles[5] or left or "i3_blank.png"
|
||||
if is_table(right) then
|
||||
right = right.name or right.image
|
||||
end
|
||||
|
||||
return core.inventorycube(top, left, right)
|
||||
end
|
||||
|
||||
local function apply_recipe_filters(recipes, player)
|
||||
|
|
@ -366,22 +408,24 @@ end
|
|||
local function craft_stack(player, data, craft_rcp)
|
||||
local inv = player:get_inventory()
|
||||
local rcp_usg = craft_rcp and "recipe" or "usage"
|
||||
local rcp_def = rcp_usg == "recipe" and data.recipes[data.rnum] or data.usages[data.unum]
|
||||
local output = craft_rcp and data.recipes[data.rnum].output or data.usages[data.unum].output
|
||||
output = ItemStack(output)
|
||||
local stackname, stackcount, stackmax = output:get_name(), output:get_count(), output:get_stack_max()
|
||||
local scrbar_val = data[fmt("scrbar_%s", craft_rcp and "rcp" or "usg")] or 1
|
||||
|
||||
for name, count in pairs(data.export_counts[rcp_usg].rcp) do
|
||||
for name, count in pairs(data.crafting_counts[rcp_usg].rcp) do
|
||||
local items = {[name] = count}
|
||||
|
||||
if is_group(name) then
|
||||
items = {}
|
||||
local groups = extract_groups(name)
|
||||
local item_groups = groups_to_items(groups, true)
|
||||
local groupname = name:sub(7)
|
||||
local item_groups = i3.groups[groupname].items or groups_to_items(groups)
|
||||
local remaining = count
|
||||
|
||||
for _, item in ipairs(item_groups) do
|
||||
for _name, _count in pairs(data.export_counts[rcp_usg].inv) do
|
||||
for _name, _count in pairs(data.crafting_counts[rcp_usg].inv) do
|
||||
if item == _name and remaining > 0 then
|
||||
local c = min(remaining, _count)
|
||||
items[item] = c
|
||||
|
|
@ -398,6 +442,12 @@ local function craft_stack(player, data, craft_rcp)
|
|||
end
|
||||
end
|
||||
|
||||
if rcp_def.replacements then
|
||||
for _, pair in ipairs(rcp_def.replacements) do
|
||||
get_stack(player, ItemStack(pair[2]))
|
||||
end
|
||||
end
|
||||
|
||||
local count = stackcount * scrbar_val
|
||||
local iter = ceil(count / stackmax)
|
||||
local leftover = count
|
||||
|
|
@ -427,27 +477,16 @@ local function safe_teleport(player, pos)
|
|||
player:set_pos(p)
|
||||
end
|
||||
|
||||
local function get_sorting_idx(name)
|
||||
local idx = 1
|
||||
|
||||
for i, def in ipairs(i3.sorting_methods) do
|
||||
if name == def.name then
|
||||
idx = i
|
||||
end
|
||||
end
|
||||
|
||||
return idx
|
||||
end
|
||||
|
||||
local function sorter(inv, reverse, mode)
|
||||
local function sorter(inv, data, mode)
|
||||
sort(inv, function(a, b)
|
||||
if mode == 1 then
|
||||
a, b = a:get_name(), b:get_name()
|
||||
a = translate(data.lang_code, a:get_short_description())
|
||||
b = translate(data.lang_code, b:get_short_description())
|
||||
else
|
||||
a, b = a:get_count(), b:get_count()
|
||||
end
|
||||
|
||||
if reverse then
|
||||
if data.reverse_sorting then
|
||||
return a > b
|
||||
end
|
||||
|
||||
|
|
@ -514,31 +553,11 @@ local function compress_items(list, start_i)
|
|||
return new_inv
|
||||
end
|
||||
|
||||
local function drop_items(player, inv, list, start_i, rej)
|
||||
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
|
||||
spawn_item(player, stack)
|
||||
inv:set_stack("main", i, ItemStack(""))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return inv:get_list"main"
|
||||
end
|
||||
|
||||
local function sort_inventory(player, data)
|
||||
local inv = player:get_inventory()
|
||||
local list = inv:get_list"main"
|
||||
local size = inv:get_size"main"
|
||||
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)
|
||||
end
|
||||
local start_i = data.ignore_hotbar and (data.hotbar_len + 1) or 1
|
||||
|
||||
if data.inv_compress then
|
||||
list = compress_items(list, start_i)
|
||||
|
|
@ -546,8 +565,7 @@ local function sort_inventory(player, data)
|
|||
list = pre_sorting(list, start_i)
|
||||
end
|
||||
|
||||
local idx = get_sorting_idx(data.sort)
|
||||
local new_inv = i3.sorting_methods[idx].func(list, data)
|
||||
local new_inv = i3.sorting_methods[data.sort].func(list, data)
|
||||
if not new_inv then return end
|
||||
|
||||
if not data.ignore_hotbar then
|
||||
|
|
@ -570,10 +588,12 @@ local function reset_data(data)
|
|||
data.scrbar_rcp = 1
|
||||
data.scrbar_usg = 1
|
||||
data.query_item = nil
|
||||
data.enable_search = nil
|
||||
data.goto_page = nil
|
||||
data.recipes = nil
|
||||
data.usages = nil
|
||||
data.export_rcp = nil
|
||||
data.export_usg = nil
|
||||
data.crafting_rcp = nil
|
||||
data.crafting_usg = nil
|
||||
data.alt_items = nil
|
||||
data.confirm_trash = nil
|
||||
data.show_settings = nil
|
||||
|
|
@ -589,7 +609,7 @@ local function add_hud_waypoint(player, name, pos, color)
|
|||
return player:hud_add {
|
||||
hud_elem_type = "waypoint",
|
||||
name = name,
|
||||
text = " m",
|
||||
text = "m",
|
||||
world_pos = pos,
|
||||
number = color,
|
||||
z_index = -300,
|
||||
|
|
@ -603,6 +623,24 @@ local function get_detached_inv(name, player_name)
|
|||
}
|
||||
end
|
||||
|
||||
local function update_inv_size(player, data)
|
||||
data.hotbar_len = data.legacy_inventory and 8 or 9
|
||||
data.inv_size = 4 * data.hotbar_len
|
||||
|
||||
local inv = player:get_inventory()
|
||||
inv:set_size("main", data.inv_size)
|
||||
|
||||
player:hud_set_hotbar_itemcount(data.hotbar_len)
|
||||
|
||||
core.after(0, function()
|
||||
if data.legacy_inventory then
|
||||
player:hud_set_hotbar_image"gui_hotbar.png"
|
||||
else
|
||||
player:hud_set_hotbar_image"i3_hotbar.png"
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
-- Much faster implementation of `unpack`
|
||||
local function createunpack(n)
|
||||
local ret = {"local t = ... return "}
|
||||
|
|
@ -630,6 +668,7 @@ local _ = {
|
|||
extract_groups = extract_groups,
|
||||
item_has_groups = item_has_groups,
|
||||
groups_to_items = groups_to_items,
|
||||
get_group_stereotype = get_group_stereotype,
|
||||
|
||||
-- Compression
|
||||
compressible = compressible,
|
||||
|
|
@ -640,7 +679,6 @@ local _ = {
|
|||
sorter = sorter,
|
||||
get_recipes = get_recipes,
|
||||
sort_inventory = sort_inventory,
|
||||
get_sorting_idx = get_sorting_idx,
|
||||
sort_by_category = sort_by_category,
|
||||
apply_recipe_filters = apply_recipe_filters,
|
||||
|
||||
|
|
@ -657,6 +695,8 @@ local _ = {
|
|||
msg = msg,
|
||||
|
||||
-- Misc. functions
|
||||
is_cube = is_cube,
|
||||
get_cube = get_cube,
|
||||
ItemStack = ItemStack,
|
||||
valid_item = valid_item,
|
||||
spawn_item = spawn_item,
|
||||
|
|
@ -682,6 +722,7 @@ local _ = {
|
|||
-- Inventory
|
||||
get_stack = get_stack,
|
||||
craft_stack = craft_stack,
|
||||
update_inv_size = update_inv_size,
|
||||
get_detached_inv = get_detached_inv,
|
||||
get_bag_description = get_bag_description,
|
||||
create_inventory = core.create_detached_inventory,
|
||||
|
|
@ -709,6 +750,7 @@ local _ = {
|
|||
match = string.match,
|
||||
gmatch = string.gmatch,
|
||||
toupper = toupper,
|
||||
utf8_len = utf8_len,
|
||||
|
||||
-- Table
|
||||
maxn = table.maxn,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,9 @@ local trash = create_inventory("i3_trash", {
|
|||
inv:set_list(listname, {})
|
||||
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
data.armor_allow = nil
|
||||
|
||||
play_sound(name, "i3_trash", 1.0)
|
||||
|
||||
if not core.is_creative_enabled(name) then
|
||||
|
|
|
|||
917
src/fields.lua
917
src/fields.lua
|
|
@ -1,446 +1,471 @@
|
|||
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 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 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_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
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
IMPORT("reg_items", "reg_aliases")
|
||||
IMPORT("min", "max", "vec_eq", "vec_round")
|
||||
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", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv", "update_inv_size")
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
if str == "legacy_inventory" then
|
||||
update_inv_size(player, data)
|
||||
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
|
||||
data.goto_page = nil
|
||||
|
||||
if data.filter == "" then
|
||||
data.enable_search = nil
|
||||
end
|
||||
|
||||
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.dd_sorting_method then
|
||||
data.sort = tonumber(fields.dd_sorting_method)
|
||||
|
||||
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.sb_font_size then
|
||||
data.font_size = tonumber(fields.sb_font_size:match"-?%d+$")
|
||||
|
||||
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 have 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, fields)
|
||||
local item
|
||||
|
||||
for field in pairs(fields) 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.crafting_rcp = nil
|
||||
data.crafting_usg = nil
|
||||
end
|
||||
end
|
||||
|
||||
local function rcp_fields(player, data, fields)
|
||||
local sb_rcp, sb_usg = fields.scrbar_rcp, fields.scrbar_usg
|
||||
|
||||
if not data.hide_tabs and fields.filter and fields.filter == "" then
|
||||
data.enable_search = nil
|
||||
end
|
||||
|
||||
if fields.cancel then
|
||||
reset_data(data)
|
||||
|
||||
elseif fields.exit then
|
||||
data.query_item = nil
|
||||
|
||||
elseif fields.enable_search then
|
||||
if data.hide_tabs then
|
||||
data.enable_search = not data.enable_search
|
||||
else
|
||||
data.enable_search = true
|
||||
end
|
||||
|
||||
elseif fields.filter and (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.pagenum then
|
||||
data.goto_page = not data.goto_page
|
||||
|
||||
elseif fields.goto_page then
|
||||
local pagenum = tonumber(fields.goto_page)
|
||||
data.pagenum = max(1, min(data.pagemax, pagenum or data.pagenum))
|
||||
data.goto_page = nil
|
||||
|
||||
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.crafting_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.crafting_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.crafting_rcp or fields.crafting_usg then
|
||||
if fields.crafting_rcp then
|
||||
data.crafting_rcp = not data.crafting_rcp
|
||||
|
||||
if not data.crafting_rcp then
|
||||
data.scrbar_rcp = 1
|
||||
end
|
||||
else
|
||||
data.crafting_usg = not data.crafting_usg
|
||||
|
||||
if not data.crafting_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.crafting_rcp = nil
|
||||
data.scrbar_rcp = 1
|
||||
else
|
||||
data.crafting_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.no_item or
|
||||
fields.no_rcp or fields.select_sorting or fields.sort_method or fields.bg_content or
|
||||
fields.quick_crafting 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
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ i3.group_stereotypes = {
|
|||
stone = "default:stone",
|
||||
leaves = "default:leaves",
|
||||
coal = "default:coal_lump",
|
||||
fence = "default:fence_wood",
|
||||
vessel = "vessels:glass_bottle",
|
||||
flower = "flowers:dandelion_yellow",
|
||||
water_bucket = "bucket:bucket_water",
|
||||
|
|
@ -26,6 +27,7 @@ i3.group_names = {
|
|||
glass = S"Any glass",
|
||||
stick = S"Any stick",
|
||||
stone = S"Any stone",
|
||||
fence = S"Any fence",
|
||||
carpet = S"Any carpet",
|
||||
flower = S"Any flower",
|
||||
leaves = S"Any leaves",
|
||||
|
|
|
|||
773
src/gui.lua
773
src/gui.lua
File diff suppressed because it is too large
Load Diff
60
src/hud.lua
60
src/hud.lua
|
|
@ -1,4 +1,4 @@
|
|||
IMPORT("get_connected_players", "str_to_pos", "add_hud_waypoint")
|
||||
IMPORT("ceil", "get_connected_players", "str_to_pos", "add_hud_waypoint")
|
||||
|
||||
local function init_hud(player)
|
||||
local name = player:get_player_name()
|
||||
|
|
@ -32,14 +32,18 @@ local function init_hud(player)
|
|||
z_index = 0xDEAD,
|
||||
style = 1,
|
||||
},
|
||||
}
|
||||
|
||||
if not i3.settings.legacy_inventory then
|
||||
core.after(0, function()
|
||||
player:hud_set_hotbar_itemcount(i3.settings.hotbar_len)
|
||||
player:hud_set_hotbar_image"i3_hotbar.png"
|
||||
end)
|
||||
end
|
||||
wielditem = player:hud_add {
|
||||
hud_elem_type = "text",
|
||||
position = {x = 0.5, y = 1},
|
||||
offset = {x = 0, y = -65 - (i3.modules.hudbars and (ceil(hb.hudbars_count / 2) * 25) or 25)},
|
||||
alignment = {x = 0, y = -1},
|
||||
number = 0xffffff,
|
||||
text = "",
|
||||
z_index = 0xDEAD,
|
||||
style = 1,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
local function show_hud(player, data)
|
||||
|
|
@ -91,6 +95,46 @@ local function show_hud(player, data)
|
|||
end
|
||||
end
|
||||
|
||||
core.register_globalstep(function(dt)
|
||||
local players = get_connected_players()
|
||||
players[0] = #players
|
||||
|
||||
for i = 1, players[0] do
|
||||
local player = players[i]
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
if not data then return end
|
||||
|
||||
if not data.wielditem_hud then
|
||||
player:hud_change(data.hud.wielditem, "text", "")
|
||||
return
|
||||
end
|
||||
|
||||
data.timer = (data.timer or 0) + dt
|
||||
local wieldidx = player:get_wield_index()
|
||||
|
||||
if wieldidx == data.old_wieldidx then
|
||||
if data.timer >= i3.settings.wielditem_fade_after then
|
||||
player:hud_change(data.hud.wielditem, "text", "")
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
data.timer = 0
|
||||
data.old_wieldidx = wieldidx
|
||||
|
||||
local wielditem = player:get_wielded_item()
|
||||
local meta = wielditem:get_meta()
|
||||
|
||||
local meta_desc = meta:get_string"short_description"
|
||||
meta_desc = meta_desc:gsub("\27", "")
|
||||
meta_desc = core.strip_colors(meta_desc)
|
||||
|
||||
local desc = meta_desc ~= "" and meta_desc or wielditem:get_short_description()
|
||||
player:hud_change(data.hud.wielditem, "text", desc:trim())
|
||||
end
|
||||
end)
|
||||
|
||||
core.register_globalstep(function()
|
||||
local players = get_connected_players()
|
||||
players[0] = #players
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
|
||||
local fmt, split = string.format, string.split
|
||||
local var = "[%w%.%[%]\"\'_]"
|
||||
local modpath = core.get_modpath"i3"
|
||||
local _,_, fs_elements = dofile(modpath .. "/src/styles.lua")
|
||||
|
||||
local operators = {
|
||||
["([%+%-%*%^/&|])="] = function(a, b, c)
|
||||
|
|
@ -43,6 +45,16 @@ local function compile(data)
|
|||
return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
|
||||
end)
|
||||
|
||||
data = data:gsub("([%w_]+)%(", function(a)
|
||||
if fs_elements[a] then
|
||||
return fmt("fs('%s',", a)
|
||||
end
|
||||
end)
|
||||
|
||||
data = data:gsub("([%w_]+)-%-\n", function(a)
|
||||
return fmt("%s = %s - 1", a, a)
|
||||
end)
|
||||
|
||||
for op, func in pairs(operators) do
|
||||
data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
|
||||
end
|
||||
|
|
@ -32,7 +32,9 @@ local function item_in_inv(item, inv_items)
|
|||
local inv_items_size = #inv_items
|
||||
|
||||
if is_group(item) then
|
||||
local groups = extract_groups(item)
|
||||
local groupname = item:sub(7)
|
||||
local group_cache = i3.groups[groupname]
|
||||
local groups = group_cache and group_cache.groups or extract_groups(item)
|
||||
|
||||
for i = 1, inv_items_size do
|
||||
local def = core.registered_items[inv_items[i]]
|
||||
|
|
@ -89,6 +91,10 @@ local item_lists = {"main", "craft", "craftpreview"}
|
|||
|
||||
local function get_inv_items(player)
|
||||
local inv = player:get_inventory()
|
||||
if not inv then
|
||||
return {}
|
||||
end
|
||||
|
||||
local stacks = {}
|
||||
|
||||
for i = 1, #item_lists do
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
local fmt = string.format
|
||||
|
||||
local PNG = {
|
||||
blank = "i3_blank.png",
|
||||
bg = "i3_bg.png",
|
||||
bg_full = "i3_bg_full.png",
|
||||
bg_goto = "i3_bg_goto.png",
|
||||
bg_content = "i3_bg_content.png",
|
||||
bar = "i3_bar.png",
|
||||
hotbar = "i3_hotbar.png",
|
||||
highlight = "i3_highlight.png",
|
||||
search = "i3_search.png",
|
||||
heart = "i3_heart.png",
|
||||
heart_half = "i3_heart_half.png",
|
||||
|
|
@ -22,8 +26,9 @@ local PNG = {
|
|||
book = "i3_book.png",
|
||||
sign = "i3_sign.png",
|
||||
cancel = "i3_cancel.png",
|
||||
export = "i3_export.png",
|
||||
slot = "i3_slot.png",
|
||||
crafting = "i3_crafting.png",
|
||||
slot = "i3_slot.png^\\[resize:128x128",
|
||||
pagenum_hover = "i3_slot.png^\\[resize:128x128^\\[opacity:130",
|
||||
tab = "i3_tab.png",
|
||||
tab_small = "i3_tab_small.png",
|
||||
tab_top = "i3_tab.png^\\[transformFY",
|
||||
|
|
@ -42,10 +47,17 @@ local PNG = {
|
|||
home = "i3_home.png",
|
||||
flag = "i3_flag.png",
|
||||
edit = "i3_edit.png",
|
||||
no_result = "i3_no_result.png",
|
||||
find_more = "i3_find_more.png",
|
||||
search_outline = "i3_search_outline.png",
|
||||
search_outline_trim = "i3_search_outline_trim.png",
|
||||
all = "i3_all.png",
|
||||
node = "i3_node.png",
|
||||
item = "i3_item.png",
|
||||
|
||||
cancel_hover = "i3_cancel.png^\\[brighten",
|
||||
search_hover = "i3_search.png^\\[brighten",
|
||||
export_hover = "i3_export.png^\\[brighten",
|
||||
crafting_hover = "i3_crafting.png^\\[brighten",
|
||||
trash_hover = "i3_trash.png^\\[brighten^\\[colorize:#f00:100",
|
||||
compress_hover = "i3_compress.png^\\[brighten",
|
||||
sort_hover = "i3_sort.png^\\[brighten",
|
||||
|
|
@ -65,6 +77,9 @@ local PNG = {
|
|||
exit_hover = "i3_exit.png^\\[brighten",
|
||||
home_hover = "i3_home.png^\\[brighten",
|
||||
edit_hover = "i3_edit.png^\\[brighten",
|
||||
all_hover = "i3_all_on.png^\\[brighten",
|
||||
node_hover = "i3_node_on.png^\\[brighten",
|
||||
item_hover = "i3_item_on.png^\\[brighten",
|
||||
}
|
||||
|
||||
local styles = string.format([[
|
||||
|
|
@ -72,19 +87,19 @@ local styles = string.format([[
|
|||
style_type[label,field;font_size=16]
|
||||
style_type[button;border=false;content_offset=0]
|
||||
style_type[image_button,item_image_button,checkbox,dropdown;border=false;sound=i3_click]
|
||||
style_type[item_image_button;bgimg_hovered=%s]
|
||||
style_type[item_image_button;bgimg_middle=9;padding=-9]
|
||||
style_type[item_image_button:hovered;bgimg=%s]
|
||||
|
||||
style[;sound=]
|
||||
style[nofav;sound=i3_cannot]
|
||||
style[search;content_offset=0]
|
||||
style[pagenum,no_item,no_rcp;font=bold;font_size=18]
|
||||
style[enable_search:hovered;bgimg=%s]
|
||||
style[enable_search:pressed;bgimg=%s^[opacity:178]
|
||||
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]
|
||||
|
|
@ -97,17 +112,13 @@ local styles = string.format([[
|
|||
style[confirm_trash_yes;sound=i3_trash]
|
||||
]],
|
||||
PNG.slot,
|
||||
PNG.exit, PNG.exit_hover,
|
||||
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)
|
||||
PNG.search_outline, PNG.search_outline,
|
||||
PNG.exit, PNG.exit_hover,
|
||||
PNG.cancel, PNG.cancel_hover,
|
||||
PNG.prev, PNG.prev_hover,
|
||||
PNG.next, PNG.next_hover,
|
||||
PNG.add, PNG.add_hover,
|
||||
PNG.edit, PNG.edit_hover)
|
||||
|
||||
local fs_elements = {
|
||||
label = "label[%f,%f;%s]",
|
||||
|
|
@ -116,9 +127,10 @@ local fs_elements = {
|
|||
tooltip = "tooltip[%f,%f;%f,%f;%s]",
|
||||
button = "button[%f,%f;%f,%f;%s;%s]",
|
||||
checkbox = "checkbox[%f,%f;%s;%s;%s]",
|
||||
slot = "image[%f,%f;%f,%f;" .. fmt("%s;9]", PNG.slot),
|
||||
item_image = "item_image[%f,%f;%f,%f;%s]",
|
||||
hypertext = "hypertext[%f,%f;%f,%f;%s;%s]",
|
||||
bg9 = "background9[%f,%f;%f,%f;%s;false;%u]",
|
||||
bg9 = "background9[%f,%f;%f,%f;%s;false;12]",
|
||||
scrollbar = "scrollbar[%f,%f;%f,%f;%s;%s;%u]",
|
||||
model = "model[%f,%f;%f,%f;%s;%s;%s;%s;%s;%s;%s]",
|
||||
image_button = "image_button[%f,%f;%f,%f;%s;%s;%s]",
|
||||
|
|
|
|||
|
|
@ -16,30 +16,18 @@ i3.new_tab("test2", {
|
|||
end,
|
||||
})
|
||||
|
||||
i3.new_tab("test3", {
|
||||
description = "Test 3",
|
||||
i3.new_tab("test_creative", {
|
||||
description = "Test creative",
|
||||
|
||||
access = function(player, data)
|
||||
local name = player:get_player_name()
|
||||
if name == "singleplayer" then
|
||||
return true
|
||||
end
|
||||
return core.is_creative_enabled(name)
|
||||
end,
|
||||
|
||||
formspec = function(player, data, fs)
|
||||
fs("label[3,1;Test 3]")
|
||||
fs("label[3,1;Creative enabled]")
|
||||
end,
|
||||
|
||||
fields = function(player, data, fields)
|
||||
i3.set_fs(player, "label[3,2;Test extra_fs]")
|
||||
end,
|
||||
fields = i3.set_fs,
|
||||
})
|
||||
|
||||
i3.override_tab("test2", {
|
||||
description = "Test override",
|
||||
image = "i3_mesepick.png",
|
||||
|
||||
formspec = function(player, data, fs)
|
||||
fs("label[3,1;Override!]")
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 186 B |
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
Binary file not shown.
|
After Width: | Height: | Size: 175 B |
Binary file not shown.
|
After Width: | Height: | Size: 167 B |
Binary file not shown.
|
After Width: | Height: | Size: 141 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 70 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 507 B |
Binary file not shown.
|
After Width: | Height: | Size: 304 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 2.4 KiB |
|
|
@ -1,6 +1,7 @@
|
|||
local exec = os.execute
|
||||
local fmt, find, sub = string.format, string.find, string.sub
|
||||
local var = "[%w%.%[%]\"\'_]"
|
||||
local _,_, fs_elements = dofile("../src/styles.lua")
|
||||
|
||||
exec "clear"
|
||||
|
||||
|
|
@ -34,7 +35,7 @@ local files = {
|
|||
"caches",
|
||||
"callbacks",
|
||||
"common",
|
||||
"compress",
|
||||
"compression",
|
||||
"detached_inv",
|
||||
"fields",
|
||||
"groups",
|
||||
|
|
@ -84,6 +85,16 @@ local function compile(data)
|
|||
return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
|
||||
end)
|
||||
|
||||
data = data:gsub("([%w_]+)%(", function(a)
|
||||
if fs_elements[a] then
|
||||
return fmt("fs('%s',", a)
|
||||
end
|
||||
end)
|
||||
|
||||
data = data:gsub("([%w_]+)-%-\n", function(a)
|
||||
return fmt("%s = %s - 1", a, a)
|
||||
end)
|
||||
|
||||
for op, func in pairs(operators) do
|
||||
data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
|
||||
end
|
||||
|
|
@ -116,7 +127,7 @@ for _, p in ipairs(files) do
|
|||
end
|
||||
end
|
||||
|
||||
local _file = io.open(path:match("(.*)%.") .. ".l", "w")
|
||||
local _file = io.open(path:match("(.*)%.") .. ".lc", "w")
|
||||
_file:write(data)
|
||||
_file:close()
|
||||
end
|
||||
|
|
@ -125,6 +136,6 @@ for _, p in ipairs(files) do
|
|||
end
|
||||
|
||||
exec "luacheck ../init.lua"
|
||||
exec "luacheck ../src/operators.lua"
|
||||
exec "luacheck ../src/*.l"
|
||||
exec "rm ../src/*.l"
|
||||
exec "luacheck ../src/preprocessor.lua"
|
||||
exec "luacheck ../src/*.lc"
|
||||
exec "rm ../src/*.lc"
|
||||
|
|
|
|||
Loading…
Reference in New Issue