mirror of
https://github.com/minetest-mods/i3.git
synced 2025-07-03 00:50:22 +02:00
Compare commits
56 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b0c9bcf3b9 | |||
| de70846d6c | |||
| 8b6f50b387 | |||
| 55c6d09389 | |||
| e3941a7b71 | |||
| 5e8ecf9903 | |||
| 2fa971acb4 | |||
| 617ef40a1d | |||
| 6b8e64b532 | |||
| eedc77086f | |||
| ea10743255 | |||
| 4fe094f3ba | |||
| 364534d154 | |||
| 11e19dd80a | |||
| f0d1caa1b4 | |||
| b48c7862dc | |||
| d8e17687e1 | |||
| 2fadcdefdd | |||
| c7f6e1db62 | |||
| 16a1865e11 | |||
| 748cc9a7a1 | |||
| edf0867e6c | |||
| 7275767427 | |||
| c9f7e0a40e | |||
| 1f4cec3420 | |||
| 612bdc86d1 | |||
| 03968b70c5 | |||
| 10629aeb89 | |||
| 551a9d517d | |||
| bcca6f00be | |||
| 2fcd559261 | |||
| cffdf77e6a | |||
| cacb9a29fd | |||
| 382ff397a5 | |||
| e4fdfa60bf | |||
| b5bb00b90c | |||
| ab690398b7 | |||
| 0b4250b54b | |||
| b0ed0f8497 | |||
| 80b675f817 | |||
| 95b0434f95 | |||
| 94a86fc0c4 | |||
| d459521b67 | |||
| 939019f4c6 | |||
| 27226a0d1b | |||
| 91af3b73d2 | |||
| b92857b42a | |||
| eaf7c486b8 | |||
| 34548d8509 | |||
| b3f1cf255d | |||
| 54ba95ac80 | |||
| 40a8c548ab | |||
| eb5a0a68de | |||
| 3d9881fd6c | |||
| b0326dab43 | |||
| 02e66f368a |
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: luacheck .
|
||||
run: cd util; lua luacheck.lua
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
allow_defined_top = true
|
||||
|
||||
ignore = {
|
||||
"631", -- Line is too long.
|
||||
"get_debug_grid",
|
||||
}
|
||||
|
||||
@ -13,6 +14,8 @@ read_globals = {
|
||||
"string",
|
||||
"table",
|
||||
"ItemStack",
|
||||
"VoxelArea",
|
||||
"VoxelManip",
|
||||
}
|
||||
|
||||
globals = {
|
||||
@ -25,6 +28,7 @@ globals = {
|
||||
exclude_files = {
|
||||
"tests/test_compression.lua",
|
||||
"tests/test_custom_recipes.lua",
|
||||
"tests/test_operators.lua",
|
||||
"tests/test_tabs.lua",
|
||||
|
||||
".install",
|
||||
|
||||
10
API.md
10
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:
|
||||
@ -301,6 +301,14 @@ A map of all compressed item groups, indexed by stereotypes.
|
||||
|
||||
### Miscellaneous
|
||||
|
||||
#### `i3.hud_notif(name, msg[, img])`
|
||||
|
||||
Shows a Steam-like HUD notification on the bottom-right corner of the screen (experimental).
|
||||
|
||||
- `name` is the player name.
|
||||
- `msg` is the HUD message to show.
|
||||
- `img` (optional) is the HUD image to show (preferably 16x16 px).
|
||||
|
||||
#### `i3.get_recipes(item)`
|
||||
|
||||
Returns a table of recipes and usages of `item`.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# i3
|
||||
|
||||
|
||||
[](https://github.com/tterb/atomic-design-ui/blob/master/LICENSEs)  []() [](https://content.minetest.net/packages/jp/i3/) [](https://www.paypal.me/jpg84240)
|
||||
[](https://github.com/tterb/atomic-design-ui/blob/master/LICENSEs) []()  [](https://content.minetest.net/packages/jp/i3/) [](https://www.paypal.me/jpg84240)
|
||||
|
||||
#### **`i3`** is a next-generation inventory for Minetest.
|
||||
|
||||
@ -14,6 +14,7 @@ This mod requires **Minetest 5.4+**
|
||||
- Progressive Mode¹
|
||||
- Quick Crafting
|
||||
- 3D Player Model Real-Time Preview
|
||||
- Isometric Map Preview
|
||||
- Inventory Sorting (+ options: compression, reverse mode, automation, etc.)
|
||||
- Item List Compression (**`moreblocks`** is supported)
|
||||
- Item Bookmarks
|
||||
@ -50,4 +51,6 @@ The `i3` inventory is 9 slots wide by default, such as Minecraft.
|
||||
|
||||
Report bugs on the [**Bug Tracker**](https://github.com/minetest-mods/i3/issues).
|
||||
|
||||
|
||||
**Video review on YouTube:** https://www.youtube.com/watch?v=Xd14BCdEZ3o
|
||||
|
||||
|
||||
|
||||
274
init.lua
274
init.lua
@ -1,22 +1,46 @@
|
||||
print[[
|
||||
|
||||
Powered by
|
||||
|
||||
██╗██████╗
|
||||
██║╚════██╗
|
||||
██║ █████╔╝
|
||||
██║ ╚═══██╗
|
||||
██║██████╔╝
|
||||
╚═╝╚═════╝
|
||||
]]
|
||||
|
||||
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)
|
||||
return loadfile(modpath .. path)
|
||||
return assert(_loadfile(modpath .. path))
|
||||
end
|
||||
|
||||
i3 = {
|
||||
modules = {},
|
||||
http = core.request_http_api(),
|
||||
data = core.deserialize(storage:get_string"data") or {},
|
||||
|
||||
MAX_FAVS = 6,
|
||||
INV_SIZE = 4*9,
|
||||
HOTBAR_LEN = 9,
|
||||
ITEM_BTN_SIZE = 1.1,
|
||||
DROP_BAG_ON_DIE = true,
|
||||
MIN_FORMSPEC_VERSION = 4,
|
||||
SAVE_INTERVAL = 600, -- Player data save interval (in seconds)
|
||||
settings = {
|
||||
debug_mode = false,
|
||||
max_favs = 6,
|
||||
max_waypoints = 30,
|
||||
min_fs_version = 4,
|
||||
item_btn_size = 1.1,
|
||||
drop_bag_on_die = true,
|
||||
save_interval = 600, -- Player data save interval (in seconds)
|
||||
|
||||
SUBCAT = {
|
||||
hud_speed = 1,
|
||||
hud_timer_max = 1.5,
|
||||
|
||||
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),
|
||||
},
|
||||
|
||||
categories = {
|
||||
"bag",
|
||||
"armor",
|
||||
"skins",
|
||||
@ -24,7 +48,7 @@ i3 = {
|
||||
"waypoints",
|
||||
},
|
||||
|
||||
META_SAVES = {
|
||||
saves = { -- Metadata to save
|
||||
bag = true,
|
||||
home = true,
|
||||
waypoints = true,
|
||||
@ -33,6 +57,23 @@ i3 = {
|
||||
known_recipes = true,
|
||||
},
|
||||
|
||||
files = {
|
||||
api = lf"/src/api.lua",
|
||||
bags = lf"/src/bags.lua",
|
||||
caches = lf"/src/caches.lua",
|
||||
callbacks = lf"/src/callbacks.lua",
|
||||
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",
|
||||
model_alias = lf"/src/model_aliases.lua",
|
||||
progressive = lf"/src/progressive.lua",
|
||||
styles = lf"/src/styles.lua",
|
||||
},
|
||||
|
||||
-- Caches
|
||||
init_items = {},
|
||||
fuel_cache = {},
|
||||
@ -40,211 +81,32 @@ i3 = {
|
||||
recipes_cache = {},
|
||||
|
||||
tabs = {},
|
||||
cubes = {},
|
||||
plants = {},
|
||||
modules = {},
|
||||
craft_types = {},
|
||||
|
||||
recipe_filters = {},
|
||||
search_filters = {},
|
||||
sorting_methods = {},
|
||||
|
||||
files = {
|
||||
api = lf("/src/api.lua"),
|
||||
bags = lf("/src/bags.lua"),
|
||||
callbacks = lf("/src/callbacks.lua"),
|
||||
common = lf("/src/common.lua"),
|
||||
compress = lf("/src/compress.lua"),
|
||||
detached = lf("/src/detached_inv.lua"),
|
||||
groups = lf("/src/groups.lua"),
|
||||
gui = lf("/src/gui.lua"),
|
||||
model_alias = lf("/src/model_aliases.lua"),
|
||||
progressive = lf("/src/progressive.lua"),
|
||||
recipes = lf("/src/recipes.lua"),
|
||||
styles = lf("/src/styles.lua"),
|
||||
},
|
||||
|
||||
progressive_mode = core.settings:get_bool"i3_progressive_mode",
|
||||
item_compression = core.settings:get_bool("i3_item_compression", true),
|
||||
}
|
||||
|
||||
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()
|
||||
i3.files.api(http)
|
||||
i3.files.compress()
|
||||
i3.files.groups()
|
||||
i3.files.callbacks()
|
||||
i3.files.callbacks(http, storage)
|
||||
|
||||
local storage = core.get_mod_storage()
|
||||
local slz, dslz, copy = i3.get("slz", "dslz", "copy")
|
||||
local str_to_pos, add_hud_waypoint = i3.get("str_to_pos", "add_hud_waypoint")
|
||||
local set_fs = i3.set_fs
|
||||
|
||||
i3.data = dslz(storage:get_string"data") or {}
|
||||
|
||||
local init_bags = i3.files.bags()
|
||||
local init_inventories = i3.files.detached()
|
||||
local init_recipes = i3.files.recipes()
|
||||
|
||||
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)
|
||||
local fs = ("size[6.3,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.")
|
||||
|
||||
core.show_formspec(name, "i3_outdated", fs)
|
||||
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.INV_SIZE)
|
||||
|
||||
core.after(0, set_fs, player)
|
||||
end
|
||||
|
||||
local function init_waypoints(player)
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
data.waypoints = data.waypoints or {}
|
||||
|
||||
for _, v in ipairs(data.waypoints) do
|
||||
if not v.hide then
|
||||
local id = add_hud_waypoint(player, v.name, str_to_pos(v.pos), v.color)
|
||||
v.id = id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function init_hudbar(player)
|
||||
core.after(0, function()
|
||||
player:hud_set_hotbar_itemcount(i3.HOTBAR_LEN)
|
||||
player:hud_set_hotbar_image"i3_hotbar.png"
|
||||
end)
|
||||
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.META_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()
|
||||
init_recipes()
|
||||
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.MIN_FORMSPEC_VERSION then
|
||||
return outdated(name)
|
||||
end
|
||||
|
||||
init_data(player, info)
|
||||
init_bags(player)
|
||||
init_inventories(player)
|
||||
init_waypoints(player)
|
||||
init_hudbar(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.SAVE_INTERVAL, routine)
|
||||
end
|
||||
|
||||
core.after(i3.SAVE_INTERVAL, routine)
|
||||
|
||||
if i3.progressive_mode then
|
||||
if i3.settings.progressive_mode then
|
||||
i3.files.progressive()
|
||||
end
|
||||
|
||||
--dofile(modpath .. "/tests/test_tabs.lua")
|
||||
--dofile(modpath .. "/tests/test_compression.lua")
|
||||
--dofile(modpath .. "/tests/test_custom_recipes.lua")
|
||||
if i3.settings.debug_mode then
|
||||
lf("/tests/test_tabs.lua")()
|
||||
lf("/tests/test_operators.lua")()
|
||||
lf("/tests/test_compression.lua")()
|
||||
lf("/tests/test_custom_recipes.lua")()
|
||||
end
|
||||
|
||||
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
|
||||
|
||||
@ -2,4 +2,7 @@
|
||||
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
|
||||
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
|
||||
93
src/api.lua
93
src/api.lua
@ -1,11 +1,11 @@
|
||||
local make_fs = i3.files.gui()
|
||||
local http = ...
|
||||
local make_fs, get_inventory_fs = i3.files.gui()
|
||||
|
||||
local gmatch, split = i3.get("gmatch", "split")
|
||||
local S, err, fmt, reg_items = i3.get("S", "err", "fmt", "reg_items")
|
||||
local sorter, sort_inventory = i3.get("sorter", "sort_inventory")
|
||||
local sort, concat, copy, insert, remove = i3.get("sort", "concat", "copy", "insert", "remove")
|
||||
local true_str, true_table, is_str, is_func, is_table, clean_name =
|
||||
i3.get("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
|
||||
IMPORT("gmatch", "split")
|
||||
IMPORT("S", "err", "fmt", "reg_items")
|
||||
IMPORT("sorter", "sort_inventory")
|
||||
IMPORT("sort", "concat", "copy", "insert", "remove")
|
||||
IMPORT("true_str", "true_table", "is_str", "is_func", "is_table", "clean_name")
|
||||
|
||||
function i3.register_craft_type(name, def)
|
||||
if not true_str(name) then
|
||||
@ -22,14 +22,8 @@ end
|
||||
function i3.register_craft(def)
|
||||
local width, c = 0, 0
|
||||
|
||||
if true_str(def.url) then
|
||||
if not i3.http then
|
||||
return err(fmt([[i3.register_craft(): Unable to reach %s.
|
||||
No HTTP support for this mod: add it to the `secure.http_mods` or
|
||||
`secure.trusted_mods` setting.]], def.url))
|
||||
end
|
||||
|
||||
i3.http.fetch({url = def.url}, function(result)
|
||||
if http and true_str(def.url) then
|
||||
http.fetch({url = def.url}, function(result)
|
||||
if result.succeeded then
|
||||
local t = core.parse_json(result.data)
|
||||
if is_table(t) then
|
||||
@ -57,7 +51,7 @@ function i3.register_craft(def)
|
||||
def.result = nil
|
||||
end
|
||||
|
||||
if not true_str(def.output) then
|
||||
if not true_str(def.output) and not def.url then
|
||||
return err "i3.register_craft: output missing"
|
||||
end
|
||||
|
||||
@ -75,9 +69,7 @@ function i3.register_craft(def)
|
||||
end
|
||||
|
||||
local cp = copy(def.grid)
|
||||
sort(cp, function(a, b)
|
||||
return #a > #b
|
||||
end)
|
||||
sort(cp, function(a, b) return #a > #b end)
|
||||
|
||||
width = #cp[1]
|
||||
|
||||
@ -88,30 +80,33 @@ function i3.register_craft(def)
|
||||
end
|
||||
|
||||
for symbol in gmatch(concat(def.grid), ".") do
|
||||
c = c + 1
|
||||
c++
|
||||
def.items[c] = def.key[symbol]
|
||||
end
|
||||
else
|
||||
local items, len = def.items, #def.items
|
||||
local items = copy(def.items)
|
||||
local lines = {}
|
||||
def.items = {}
|
||||
|
||||
for i = 1, len do
|
||||
local rlen = #split(items[i], ",")
|
||||
for i = 1, #items do
|
||||
lines[i] = split(items[i], ",", true)
|
||||
|
||||
if rlen > width then
|
||||
width = rlen
|
||||
if #lines[i] > width then
|
||||
width = #lines[i]
|
||||
end
|
||||
end
|
||||
|
||||
for i = 1, len do
|
||||
while #split(items[i], ",") < width do
|
||||
items[i] = fmt("%s,", items[i])
|
||||
for i = 1, #items do
|
||||
while #lines[i] < width do
|
||||
insert(lines[i], items[i])
|
||||
end
|
||||
end
|
||||
|
||||
for name in gmatch(concat(items, ","), "[%s%w_:]+") do
|
||||
c = c + 1
|
||||
def.items[c] = clean_name(name)
|
||||
for _, line in ipairs(lines) do
|
||||
for _, v in ipairs(line) do
|
||||
c++
|
||||
def.items[c] = clean_name(v)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -155,10 +150,11 @@ function i3.add_search_filter(name, f)
|
||||
end
|
||||
|
||||
function i3.get_recipes(item)
|
||||
return {
|
||||
recipes = i3.recipes_cache[item],
|
||||
usages = i3.usages_cache[item]
|
||||
}
|
||||
item = core.registered_aliases[item] or item
|
||||
local recipes = i3.recipes_cache[item]
|
||||
local usages = i3.usages_cache[item]
|
||||
|
||||
return {recipes = recipes, usages = usages}
|
||||
end
|
||||
|
||||
function i3.set_fs(player)
|
||||
@ -190,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"
|
||||
@ -298,6 +300,27 @@ function i3.compress(item, def)
|
||||
end
|
||||
end
|
||||
|
||||
function i3.hud_notif(name, msg, img)
|
||||
if not true_str(name) then
|
||||
return err "i3.hud_notif: player name missing"
|
||||
elseif not true_str(msg) then
|
||||
return err "i3.hud_notif: message missing"
|
||||
end
|
||||
|
||||
local data = i3.data[name]
|
||||
|
||||
if not data then
|
||||
return err "i3.hud_notif: no player data initialized"
|
||||
end
|
||||
|
||||
data.show_hud = true
|
||||
data.hud_msg = msg
|
||||
|
||||
if img then
|
||||
data.hud_img = fmt("%s^[resize:16x16", img)
|
||||
end
|
||||
end
|
||||
|
||||
function i3.add_sorting_method(name, def)
|
||||
if not true_str(name) then
|
||||
return err "i3.add_sorting_method: name missing"
|
||||
|
||||
29
src/bags.lua
29
src/bags.lua
@ -1,8 +1,8 @@
|
||||
local set_fs = i3.set_fs
|
||||
local ItemStack = ItemStack
|
||||
local S, ES, fmt, msg, slz, dslz = i3.get("S", "ES", "fmt", "msg", "slz", "dslz")
|
||||
local get_group, play_sound, get_detached_inv, create_inventory =
|
||||
i3.get("get_group", "play_sound", "get_detached_inv", "create_inventory")
|
||||
|
||||
IMPORT("get_bag_description", "ItemStack")
|
||||
IMPORT("S", "ES", "fmt", "msg", "slz", "dslz")
|
||||
IMPORT("get_group", "play_sound", "get_detached_inv", "create_inventory")
|
||||
|
||||
local function get_content(content)
|
||||
local t = {}
|
||||
@ -52,6 +52,8 @@ local function init_bags(player)
|
||||
|
||||
on_take = function()
|
||||
data.bag = nil
|
||||
data.bag_rename = nil
|
||||
|
||||
local content = get_detached_inv("bag_content", name)
|
||||
content:set_list("main", {})
|
||||
|
||||
@ -68,9 +70,10 @@ local function init_bags(player)
|
||||
local function save_content(inv)
|
||||
local bagstack = bag:get_stack("main", 1)
|
||||
local meta = bagstack:get_meta()
|
||||
meta:set_string("description", "")
|
||||
local desc = get_bag_description(data, bagstack)
|
||||
|
||||
if inv:is_empty"main" then
|
||||
meta:set_string("description", desc)
|
||||
meta:set_string("content", "")
|
||||
else
|
||||
local list = inv:get_list"main"
|
||||
@ -80,7 +83,7 @@ local function init_bags(player)
|
||||
local stack = list[i]
|
||||
|
||||
if not stack:is_empty() then
|
||||
c = c + 1
|
||||
c++
|
||||
t[i] = stack:to_string()
|
||||
end
|
||||
end
|
||||
@ -88,7 +91,7 @@ local function init_bags(player)
|
||||
local bag_size = get_group(bagstack:get_name(), "bag")
|
||||
local percent = fmt("%d", (c * 100) / (bag_size * 4))
|
||||
|
||||
meta:set_string("description", ES("@1 (@2% full)", bagstack:get_description(), percent))
|
||||
meta:set_string("description", ES("@1 (@2% full)", desc, percent))
|
||||
meta:set_string("content", slz(t))
|
||||
end
|
||||
|
||||
@ -102,6 +105,18 @@ local function init_bags(player)
|
||||
on_move = save_content,
|
||||
on_put = save_content,
|
||||
on_take = save_content,
|
||||
|
||||
allow_put = function(_, _, _, stack)
|
||||
local meta = stack:get_meta()
|
||||
local content = dslz(meta:get_string"content")
|
||||
|
||||
if content then
|
||||
msg(name, "You cannot put a bag in another bag")
|
||||
return 0, play_sound(name, "i3_cannot", 0.8)
|
||||
end
|
||||
|
||||
return stack:get_count()
|
||||
end,
|
||||
}, name)
|
||||
|
||||
bag_content:set_size("main", 4*4)
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
local PNG = i3.files.styles()
|
||||
local replacements = {fuel = {}}
|
||||
local http = ...
|
||||
|
||||
local ItemStack = ItemStack
|
||||
local fmt, reg_items, reg_aliases = i3.get("fmt", "reg_items", "reg_aliases")
|
||||
local maxn, copy, insert, sort, match = i3.get("maxn", "copy", "insert", "sort", "match")
|
||||
|
||||
local is_group, extract_groups, item_has_groups, groups_to_items =
|
||||
i3.get("is_group", "extract_groups", "item_has_groups", "groups_to_items")
|
||||
local true_str, is_table, valid_item, table_merge, table_replace, rcp_eq =
|
||||
i3.get("true_str", "is_table", "valid_item", "table_merge", "table_replace", "rcp_eq")
|
||||
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")
|
||||
|
||||
local function get_burntime(item)
|
||||
return core.get_craft_result{method = "fuel", items = {item}}.time
|
||||
@ -103,7 +101,7 @@ local function drop_table(name, drop)
|
||||
end
|
||||
|
||||
if not di.rarity then
|
||||
count_sure = count_sure + 1
|
||||
count_sure++
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -145,7 +143,7 @@ local function cache_recipes(item)
|
||||
end
|
||||
|
||||
for k, v in pairs(replacements[item]) do
|
||||
k = k + shift
|
||||
k += shift
|
||||
|
||||
if _recipes[k] then
|
||||
_recipes[k].replacements = v
|
||||
@ -273,17 +271,59 @@ local function init_recipes()
|
||||
resolve_aliases(_select)
|
||||
sort(i3.init_items)
|
||||
|
||||
if i3.http and true_str(i3.export_url) then
|
||||
if http and true_str(i3.export_url) then
|
||||
local post_data = {
|
||||
recipes = i3.recipes_cache,
|
||||
usages = i3.usages_cache,
|
||||
}
|
||||
|
||||
i3.http.fetch_async {
|
||||
http.fetch_async {
|
||||
url = i3.export_url,
|
||||
post_data = core.write_json(post_data),
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
return init_recipes
|
||||
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)
|
||||
|
||||
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)
|
||||
elseif sub(def.drawtype, 1, 9) == "plantlike" or sub(def.drawtype, 1, 8) == "firelike" then
|
||||
i3.plants[id] = def.inventory_image .. "^\\[resize:16x16"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return function()
|
||||
init_recipes()
|
||||
init_cubes()
|
||||
end
|
||||
@ -1,439 +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
|
||||
local ItemStack = ItemStack
|
||||
local S, clr = i3.get("S", "clr")
|
||||
local min, random = i3.get("min", "random")
|
||||
local reg_items, reg_aliases = i3.get("reg_items", "reg_aliases")
|
||||
local fmt, find, match, sub, lower, split = i3.get("fmt", "find", "match", "sub", "lower", "split")
|
||||
local vec_new, vec_eq, vec_round = i3.get("vec_new", "vec_eq", "vec_round")
|
||||
local sort, copy, insert, remove, indexof = i3.get("sort", "copy", "insert", "remove", "indexof")
|
||||
|
||||
local msg, is_fav, pos_to_str, str_to_pos, add_hud_waypoint, play_sound, spawn_item =
|
||||
i3.get("msg", "is_fav", "pos_to_str", "str_to_pos", "add_hud_waypoint", "play_sound", "spawn_item")
|
||||
local search, get_sorting_idx, sort_inventory, sort_by_category, get_recipes, get_detached_inv =
|
||||
i3.get("search", "get_sorting_idx", "sort_inventory", "sort_by_category", "get_recipes", "get_detached_inv")
|
||||
local valid_item, get_stack, craft_stack, clean_name, compressible, check_privs, safe_teleport =
|
||||
i3.get("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.SUBCAT, 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 == "delete" then
|
||||
player:hud_remove(waypoint.id)
|
||||
remove(data.waypoints, id)
|
||||
|
||||
elseif action == "teleport" then
|
||||
local pos = vec_new(str_to_pos(waypoint.pos))
|
||||
safe_teleport(player, pos)
|
||||
msg(name, fmt("Teleported to %s", clr("#ff0", 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
|
||||
|
||||
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.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 = 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 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 = data.scrbar_inv + 1000
|
||||
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 = i + 1
|
||||
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 = 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, i = is_fav(data.favs, data.query_item)
|
||||
local total = #data.favs
|
||||
|
||||
if total < i3.MAX_FAVS and not fav then
|
||||
data.favs[total + 1] = data.query_item
|
||||
elseif fav then
|
||||
remove(data.favs, i)
|
||||
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 client is up-to-date.")
|
||||
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()
|
||||
@ -451,7 +24,7 @@ core.register_on_dieplayer(function(player)
|
||||
local data = i3.data[name]
|
||||
if not data then return end
|
||||
|
||||
if i3.DROP_BAG_ON_DIE then
|
||||
if i3.settings.drop_bag_on_die then
|
||||
local bagstack = ItemStack(data.bag)
|
||||
spawn_item(player, bagstack)
|
||||
end
|
||||
@ -492,3 +65,140 @@ 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.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)
|
||||
|
||||
115
src/common.lua
115
src/common.lua
@ -1,9 +1,13 @@
|
||||
local ItemStack = ItemStack
|
||||
local loadstring = loadstring
|
||||
local reg_items = core.registered_items
|
||||
local translate = core.get_translated_string
|
||||
local vec_new, vec_add, vec_mul = vector.new, vector.add, vector.multiply
|
||||
local sort, concat, insert = table.sort, table.concat, table.insert
|
||||
local min, floor, ceil = math.min, math.floor, math.ceil
|
||||
local fmt, find, match, gmatch, sub, split, lower =
|
||||
string.format, string.find, string.match, string.gmatch, string.sub, string.split, string.lower
|
||||
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
|
||||
|
||||
local old_is_creative_enabled = core.is_creative_enabled
|
||||
|
||||
@ -15,7 +19,7 @@ function core.is_creative_enabled(name)
|
||||
return core.check_player_privs(name, {creative = true}) or old_is_creative_enabled(name)
|
||||
end
|
||||
|
||||
local S = core.get_translator "i3"
|
||||
local S = core.get_translator"i3"
|
||||
local ES = function(...) return core.formspec_escape(S(...)) end
|
||||
|
||||
local function is_num(x)
|
||||
@ -61,6 +65,18 @@ local function round(num, decimal)
|
||||
return floor(num * mul + 0.5) / mul
|
||||
end
|
||||
|
||||
local function toupper(str)
|
||||
return str:gsub("%f[%w]%l", upper):gsub("_", " ")
|
||||
end
|
||||
|
||||
local function get_bag_description(data, stack)
|
||||
local desc = translate(data.lang_code, stack:get_description())
|
||||
desc = split(desc, "(")[1] or desc
|
||||
desc = toupper(desc:trim())
|
||||
|
||||
return desc
|
||||
end
|
||||
|
||||
local function search(data)
|
||||
reset_compression(data)
|
||||
|
||||
@ -84,8 +100,8 @@ local function search(data)
|
||||
|
||||
for i = 1, #data.items_raw do
|
||||
local item = data.items_raw[i]
|
||||
local def = core.registered_items[item]
|
||||
local desc = lower(core.get_translated_string(data.lang_code, def and def.description)) or ""
|
||||
local def = reg_items[item]
|
||||
local desc = lower(translate(data.lang_code, def and def.description)) or ""
|
||||
local search_in = fmt("%s %s", item, desc)
|
||||
local temp, j, to_add = {}, 1
|
||||
|
||||
@ -101,7 +117,7 @@ local function search(data)
|
||||
temp[item] = true
|
||||
end
|
||||
|
||||
j = j + 1
|
||||
j++
|
||||
end
|
||||
end
|
||||
else
|
||||
@ -120,7 +136,7 @@ local function search(data)
|
||||
end
|
||||
|
||||
if to_add then
|
||||
c = c + 1
|
||||
c++
|
||||
filtered_list[c] = item
|
||||
end
|
||||
end
|
||||
@ -148,7 +164,7 @@ local function table_merge(t1, t2, hash)
|
||||
local c = #t1
|
||||
|
||||
for i = 1, #t2 do
|
||||
c = c + 1
|
||||
c++
|
||||
t1[c] = t2[i]
|
||||
end
|
||||
end
|
||||
@ -174,7 +190,7 @@ local function array_diff(t1, t2)
|
||||
for i = 1, #t1 do
|
||||
local v = t1[i]
|
||||
if hash[v] then
|
||||
c = c + 1
|
||||
c++
|
||||
diff[c] = v
|
||||
end
|
||||
end
|
||||
@ -235,7 +251,7 @@ 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 = core.registered_items[stereotype]
|
||||
local def = reg_items[stereotype]
|
||||
|
||||
if valid_item(def) then
|
||||
return stereotype
|
||||
@ -244,7 +260,7 @@ local function groups_to_items(groups, get_all)
|
||||
|
||||
local names = {}
|
||||
|
||||
for name, def in pairs(core.registered_items) do
|
||||
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)
|
||||
@ -266,24 +282,19 @@ local function apply_recipe_filters(recipes, player)
|
||||
end
|
||||
|
||||
local function compression_active(data)
|
||||
return i3.item_compression and not next(i3.recipe_filters) and data.filter == ""
|
||||
return i3.settings.item_compression and not next(i3.recipe_filters) and data.filter == ""
|
||||
end
|
||||
|
||||
local function compressible(item, data)
|
||||
return compression_active(data) and i3.compress_groups[item]
|
||||
end
|
||||
|
||||
local function is_fav(favs, query_item)
|
||||
local fav, i
|
||||
for j = 1, #favs do
|
||||
if favs[j] == query_item then
|
||||
fav = true
|
||||
i = j
|
||||
break
|
||||
local function is_fav(data)
|
||||
for i = 1, #data.favs do
|
||||
if data.favs[i] == data.query_item then
|
||||
return i
|
||||
end
|
||||
end
|
||||
|
||||
return fav, i
|
||||
end
|
||||
|
||||
local function sort_by_category(data)
|
||||
@ -319,15 +330,15 @@ local function spawn_item(player, stack)
|
||||
local dir = player:get_look_dir()
|
||||
local ppos = player:get_pos()
|
||||
ppos.y = ppos.y + player:get_properties().eye_height
|
||||
local look_at = vector.add(ppos, vector.multiply(dir, 1))
|
||||
local look_at = vec_add(ppos, vec_mul(dir, 1))
|
||||
|
||||
core.add_item(look_at, stack)
|
||||
end
|
||||
|
||||
local function get_recipes(player, item)
|
||||
local clean_item = core.registered_aliases[item] or item
|
||||
local recipes = i3.recipes_cache[clean_item]
|
||||
local usages = i3.usages_cache[clean_item]
|
||||
item = core.registered_aliases[item] or item
|
||||
local recipes = i3.recipes_cache[item]
|
||||
local usages = i3.usages_cache[item]
|
||||
|
||||
if recipes then
|
||||
recipes = apply_recipe_filters(recipes, player)
|
||||
@ -336,7 +347,6 @@ local function get_recipes(player, item)
|
||||
local no_recipes = not recipes or #recipes == 0
|
||||
if no_recipes and not usages then return end
|
||||
usages = apply_recipe_filters(usages, player)
|
||||
|
||||
local no_usages = not usages or #usages == 0
|
||||
|
||||
return not no_recipes and recipes or nil,
|
||||
@ -375,7 +385,7 @@ local function craft_stack(player, data, craft_rcp)
|
||||
if item == _name and remaining > 0 then
|
||||
local c = min(remaining, _count)
|
||||
items[item] = c
|
||||
remaining = remaining - c
|
||||
remaining -= c
|
||||
end
|
||||
|
||||
if remaining == 0 then break end
|
||||
@ -396,7 +406,7 @@ local function craft_stack(player, data, craft_rcp)
|
||||
local c = min(stackmax, leftover)
|
||||
local stack = ItemStack(fmt("%s %s", stackname, c))
|
||||
get_stack(player, stack)
|
||||
leftover = leftover - stackmax
|
||||
leftover -= stackmax
|
||||
end
|
||||
end
|
||||
|
||||
@ -408,10 +418,13 @@ local function safe_teleport(player, pos)
|
||||
local name = player:get_player_name()
|
||||
play_sound(name, "i3_teleport", 0.8)
|
||||
|
||||
pos.y = pos.y + 0.5
|
||||
local vel = player:get_velocity()
|
||||
player:add_velocity(vector.multiply(vel, -1))
|
||||
player:set_pos(pos)
|
||||
player:add_velocity(vec_mul(vel, -1))
|
||||
|
||||
local p = vec_new(pos)
|
||||
p.y += 0.25
|
||||
|
||||
player:set_pos(p)
|
||||
end
|
||||
|
||||
local function get_sorting_idx(name)
|
||||
@ -481,7 +494,7 @@ local function compress_items(list, start_i)
|
||||
insert(special, stack)
|
||||
else
|
||||
hash[name] = hash[name] or 0
|
||||
hash[name] = hash[name] + count
|
||||
hash[name] += count
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -493,7 +506,7 @@ local function compress_items(list, start_i)
|
||||
|
||||
for _ = 1, iter do
|
||||
insert(new_inv, ItemStack(fmt("%s %u", name, min(stackmax, leftover))))
|
||||
leftover = leftover - stackmax
|
||||
leftover -= stackmax
|
||||
end
|
||||
end
|
||||
|
||||
@ -521,7 +534,7 @@ 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 10 or 1
|
||||
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)
|
||||
@ -548,6 +561,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",
|
||||
@ -566,6 +603,7 @@ local function get_detached_inv(name, player_name)
|
||||
}
|
||||
end
|
||||
|
||||
-- Much faster implementation of `unpack`
|
||||
local function createunpack(n)
|
||||
local ret = {"local t = ... return "}
|
||||
|
||||
@ -619,10 +657,12 @@ local _ = {
|
||||
msg = msg,
|
||||
|
||||
-- Misc. functions
|
||||
ItemStack = ItemStack,
|
||||
valid_item = valid_item,
|
||||
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,
|
||||
|
||||
@ -631,15 +671,19 @@ local _ = {
|
||||
slz = core.serialize,
|
||||
dslz = core.deserialize,
|
||||
ESC = core.formspec_escape,
|
||||
draw_cube = core.inventorycube,
|
||||
get_group = core.get_item_group,
|
||||
pos_to_str = core.pos_to_string,
|
||||
str_to_pos = core.string_to_pos,
|
||||
check_privs = core.check_player_privs,
|
||||
get_player_by_name = core.get_player_by_name,
|
||||
get_connected_players = core.get_connected_players,
|
||||
|
||||
-- Inventory
|
||||
get_stack = get_stack,
|
||||
craft_stack = craft_stack,
|
||||
get_detached_inv = get_detached_inv,
|
||||
get_bag_description = get_bag_description,
|
||||
create_inventory = core.create_detached_inventory,
|
||||
|
||||
-- Registered items
|
||||
@ -664,6 +708,7 @@ local _ = {
|
||||
split = string.split,
|
||||
match = string.match,
|
||||
gmatch = string.gmatch,
|
||||
toupper = toupper,
|
||||
|
||||
-- Table
|
||||
maxn = table.maxn,
|
||||
@ -691,6 +736,8 @@ local _ = {
|
||||
-- Vectors
|
||||
vec_new = vector.new,
|
||||
vec_add = vector.add,
|
||||
vec_sub = vector.subtract,
|
||||
vec_mul = vector.multiply,
|
||||
vec_round = vector.round,
|
||||
vec_eq = vector.equals,
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
local fmt, copy, insert = i3.get("fmt", "copy", "insert")
|
||||
IMPORT("fmt", "copy", "insert")
|
||||
|
||||
local wood_types = {
|
||||
"acacia_wood", "aspen_wood", "junglewood", "pine_wood",
|
||||
@ -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
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
local set_fs = i3.set_fs
|
||||
local fmt, play_sound, create_inventory = i3.get("fmt", "play_sound", "create_inventory")
|
||||
IMPORT("fmt", "play_sound", "create_inventory")
|
||||
|
||||
local trash = create_inventory("i3_trash", {
|
||||
allow_put = function(_, _, _, stack)
|
||||
@ -20,7 +20,7 @@ local trash = create_inventory("i3_trash", {
|
||||
|
||||
trash:set_size("main", 1)
|
||||
|
||||
local function init_inventories(player)
|
||||
local function init_detached(player)
|
||||
local name = player:get_player_name()
|
||||
|
||||
local output_rcp = create_inventory(fmt("i3_output_rcp_%s", name), {}, name)
|
||||
@ -30,4 +30,4 @@ local function init_inventories(player)
|
||||
output_usg:set_size("main", 1)
|
||||
end
|
||||
|
||||
return init_inventories
|
||||
return init_detached
|
||||
|
||||
447
src/fields.lua
Normal file
447
src/fields.lua
Normal file
@ -0,0 +1,447 @@
|
||||
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.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 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
|
||||
@ -1,4 +1,4 @@
|
||||
local S = i3.get("S")
|
||||
IMPORT("S")
|
||||
|
||||
i3.group_stereotypes = {
|
||||
dye = "dye:white",
|
||||
|
||||
548
src/gui.lua
548
src/gui.lua
@ -1,23 +1,24 @@
|
||||
local damage_enabled = core.settings:get_bool "enable_damage"
|
||||
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()
|
||||
|
||||
local ItemStack = ItemStack
|
||||
local S, ES, translate = i3.get("S", "ES", "translate")
|
||||
local clr, ESC, check_privs = i3.get("clr", "ESC", "check_privs")
|
||||
local min, max, floor, ceil, round = i3.get("min", "max", "floor", "ceil", "round")
|
||||
local sprintf, find, match, sub, upper = i3.get("fmt", "find", "match", "sub", "upper")
|
||||
local reg_items, reg_tools, reg_entities = i3.get("reg_items", "reg_tools", "reg_entities")
|
||||
local maxn, sort, concat, copy, insert, remove, unpack =
|
||||
i3.get("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
|
||||
local sprintf = string.format
|
||||
local VoxelArea, VoxelManip = VoxelArea, VoxelManip
|
||||
|
||||
local true_str, is_fav, is_num, get_group =
|
||||
i3.get("true_str", "is_fav", "is_num", "get_group")
|
||||
local groups_to_items, compression_active, compressible =
|
||||
i3.get("groups_to_items", "compression_active", "compressible")
|
||||
local get_sorting_idx, is_group, extract_groups, item_has_groups =
|
||||
i3.get("get_sorting_idx", "is_group", "extract_groups", "item_has_groups")
|
||||
IMPORT("find", "match", "sub", "upper")
|
||||
IMPORT("vec_new", "vec_sub", "vec_round")
|
||||
IMPORT("clr", "ESC", "msg", "check_privs")
|
||||
IMPORT("min", "max", "floor", "ceil", "round")
|
||||
IMPORT("reg_items", "reg_tools", "reg_entities")
|
||||
IMPORT("get_bag_description", "get_detached_inv")
|
||||
IMPORT("S", "ES", "translate", "ItemStack", "toupper")
|
||||
IMPORT("groups_to_items", "compression_active", "compressible")
|
||||
IMPORT("true_str", "is_fav", "is_num", "get_group", "str_to_pos")
|
||||
IMPORT("maxn", "sort", "concat", "copy", "insert", "remove", "unpack")
|
||||
IMPORT("get_sorting_idx", "is_group", "extract_groups", "item_has_groups", "get_recipes")
|
||||
|
||||
local function fmt(elem, ...)
|
||||
if not fs_elements[elem] then
|
||||
@ -36,10 +37,6 @@ local function weird_desc(str)
|
||||
return not true_str(str) or find(str, "\n") or not find(str, "%u")
|
||||
end
|
||||
|
||||
local function toupper(str)
|
||||
return str:gsub("%f[%w]%l", upper):gsub("_", " ")
|
||||
end
|
||||
|
||||
local function snip(str, limit)
|
||||
return #str > limit and fmt("%s...", sub(str, 1, limit - 3)) or str
|
||||
end
|
||||
@ -127,23 +124,25 @@ local function get_stack_max(inv, data, is_recipe, rcp)
|
||||
end
|
||||
|
||||
local function get_inv_slots(fs)
|
||||
local inv_x, inv_y, size, spacing = 0.22, 6.9, 1, 0.1
|
||||
local inv_x = i3.settings.legacy_inventory and 0.75 or 0.22
|
||||
local inv_y = 6.9
|
||||
local size, spacing = 1, 0.1
|
||||
|
||||
fs("style_type[box;colors=#77777710,#77777710,#777,#777]")
|
||||
fs"style_type[box;colors=#77777710,#77777710,#777,#777]"
|
||||
|
||||
for i = 0, i3.HOTBAR_LEN - 1 do
|
||||
for i = 0, hotbar_len - 1 do
|
||||
fs("box", i * size + inv_x + (i * spacing), inv_y, size, size, "")
|
||||
end
|
||||
|
||||
fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing),
|
||||
fmt("list[current_player;main;%f,%f;%u,1;]", inv_x, inv_y, i3.HOTBAR_LEN))
|
||||
fmt("list[current_player;main;%f,%f;%u,1;]", inv_x, inv_y, hotbar_len))
|
||||
|
||||
fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing),
|
||||
fmt("list[current_player;main;%f,%f;%u,%u;%u]", inv_x, inv_y + 1.15,
|
||||
i3.HOTBAR_LEN, i3.INV_SIZE / i3.HOTBAR_LEN, i3.HOTBAR_LEN),
|
||||
hotbar_len, i3.settings.inv_size / hotbar_len, hotbar_len),
|
||||
"style_type[list;size=1;spacing=0.15]")
|
||||
|
||||
fs("listring[current_player;craft]listring[current_player;main]")
|
||||
fs"listring[current_player;craft]listring[current_player;main]"
|
||||
end
|
||||
|
||||
local function add_subtitle(fs, name, y, ctn_len, font_size, sep, label)
|
||||
@ -209,7 +208,7 @@ local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlo
|
||||
insert(fs, "style_type[label;font_size=14]")
|
||||
insert(fs, fmt("label", icon_size + 0.55, y + 0.97, fmt("%u / %u", current, target)))
|
||||
|
||||
y = y - 0.14
|
||||
y -= 0.14
|
||||
end
|
||||
|
||||
local end_title = ESC(_title or title)
|
||||
@ -224,6 +223,81 @@ local function get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlo
|
||||
end
|
||||
end
|
||||
|
||||
local function get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
|
||||
pos = vec_round(pos)
|
||||
cubes = cubes or 0
|
||||
depth = depth or -1
|
||||
high = high or math.huge
|
||||
|
||||
t = t or {}
|
||||
t[depth] = {}
|
||||
|
||||
local width = 8
|
||||
local base_height = 4
|
||||
local base_depth = depth == -1
|
||||
local max_depth = -7
|
||||
local height = base_depth and (base_height - 1) or depth
|
||||
|
||||
local pos1 = vec_new(pos.x - width, pos.y + depth, pos.z - width)
|
||||
local pos2 = vec_new(pos.x + width, pos.y + height, pos.z + width)
|
||||
|
||||
local vm = VoxelManip(pos1, pos2)
|
||||
local emin, emax = vm:get_emerged_area()
|
||||
local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
|
||||
local data = vm:get_data()
|
||||
|
||||
for idx in area:iterp(pos1, pos2) do
|
||||
local cube = i3.cubes[data[idx]]
|
||||
local plant = i3.plants[data[idx]]
|
||||
local img = cube or plant
|
||||
|
||||
if img then
|
||||
local p = area:position(idx)
|
||||
p = vec_sub(p, pos)
|
||||
|
||||
local size = 0.25
|
||||
local x = 2 + (size / 2 * (p.z - p.x))
|
||||
local y = 1 + (size / 4 * (p.x + p.z - 2 * p.y))
|
||||
|
||||
if y < high then
|
||||
high = y
|
||||
end
|
||||
|
||||
if plant then
|
||||
size -= 0.05
|
||||
end
|
||||
|
||||
cubes++
|
||||
insert(t[depth], {x + X, y + Y, size, size, img})
|
||||
end
|
||||
end
|
||||
|
||||
local maxc = ((width * 2) ^ 2) * base_height
|
||||
|
||||
if cubes < maxc and depth > max_depth then
|
||||
-- if there's not enough map to preview, go deeper
|
||||
depth -= 1
|
||||
return get_isometric_view(fs, pos, X, Y, t, cubes, depth, high)
|
||||
end
|
||||
|
||||
local shift = -0.3 - high
|
||||
|
||||
for i = max_depth, 0 do
|
||||
local dth = t[i]
|
||||
if dth then
|
||||
dth[0] = #dth
|
||||
for j = 1, dth[0] do
|
||||
local params = dth[j]
|
||||
params[2] += shift
|
||||
insert(fs, fmt("image[%f,%f;%.1f,%.1f;%s]", unpack(params)))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
shift += (base_depth and 0.45 or 0.95)
|
||||
fs("image", 2.7, Y + shift, 0.3, 0.3, PNG.flag)
|
||||
end
|
||||
|
||||
local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
|
||||
fs(fmt("box[0,%f;4.9,0.6;#bababa25]", yextra + 1.1))
|
||||
fs("label", 0, yextra + 0.85, ES"Waypoint name:")
|
||||
@ -232,12 +306,13 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
|
||||
fs(fmt("tooltip[waypoint_add;%s]", ES"Add waypoint"))
|
||||
|
||||
if #data.waypoints == 0 then return end
|
||||
fs("style_type[label;font=bold;font_size=17]")
|
||||
|
||||
for i, v in ipairs(data.waypoints) do
|
||||
local y = yextra + 1.35 + (i - (i * 0.3))
|
||||
local icon_size, yi = 0.35, y + 0.12
|
||||
|
||||
fs("style_type[box;colors=#bababa30,#bababa30,#bababa05,#bababa05]")
|
||||
fs"style_type[box;colors=#bababa30,#bababa30,#bababa05,#bababa05]"
|
||||
fs("box", 0, y, ctn_len, 0.6, "")
|
||||
|
||||
local waypoint_name, lim = v.name, 18
|
||||
@ -246,18 +321,25 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
|
||||
waypoint_name = snip(waypoint_name, lim)
|
||||
end
|
||||
|
||||
fs("style_type[label;font_size=17]")
|
||||
|
||||
local hex = fmt("%02x", v.color)
|
||||
|
||||
while #hex < 6 do
|
||||
hex = "0" .. hex
|
||||
end
|
||||
|
||||
local teleport_priv = check_privs(player, {teleport = true})
|
||||
local waypoint_preview = data.waypoint_see and data.waypoint_see == i
|
||||
|
||||
fs("label", 0.15, y + 0.33, clr(fmt("#%s", hex), waypoint_name))
|
||||
fs("tooltip", 0, y, ctn_len - 2.5, 0.65,
|
||||
fmt("Name: %s\nPosition:%s", clr("#dbeeff", v.name),
|
||||
v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1"))))
|
||||
|
||||
local tooltip = fmt("Name: %s\nPosition:%s", clr("#dbeeff", v.name),
|
||||
v.pos:sub(2,-2):gsub("(%-*%d*%.?%d+)", clr("#dbeeff", " %1")))
|
||||
|
||||
if teleport_priv then
|
||||
tooltip = fmt("%s\n%s", tooltip, clr("#ff0", ES"[Click to teleport]"))
|
||||
end
|
||||
|
||||
fs("tooltip", 0, y, ctn_len - 2.1, 0.65, tooltip)
|
||||
|
||||
local del = fmt("waypoint_%u_delete", i)
|
||||
fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", del, PNG.trash, PNG.trash_hover))
|
||||
@ -269,21 +351,74 @@ local function get_waypoint_fs(fs, data, player, yextra, ctn_len)
|
||||
fs("image_button", ctn_len - 1, yi, icon_size, icon_size, "", rfs, "")
|
||||
fs(fmt("tooltip[%s;%s]", rfs, ES"Change color"))
|
||||
|
||||
local see = fmt("waypoint_%u_see", i)
|
||||
fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
|
||||
see, waypoint_preview and PNG.search_hover or PNG.search, PNG.search, PNG.search_hover))
|
||||
fs("image_button", ctn_len - 1.5, yi, icon_size, icon_size, "", see, "")
|
||||
fs(fmt("tooltip[%s;%s]", see, ES"Preview the waypoint area"))
|
||||
|
||||
local vsb = fmt("waypoint_%u_hide", i)
|
||||
fs(fmt("style[%s;fgimg=%s;content_offset=0]", vsb, v.hide and PNG.nonvisible or PNG.visible))
|
||||
fs("image_button", ctn_len - 1.5, yi, icon_size, icon_size, "", vsb, "")
|
||||
fs("image_button", ctn_len - 2, yi, icon_size, icon_size, "", vsb, "")
|
||||
fs(fmt("tooltip[%s;%s]", vsb, v.hide and ES"Show waypoint" or ES"Hide waypoint"))
|
||||
|
||||
if check_privs(player, {teleport = true}) then
|
||||
if teleport_priv then
|
||||
local tp = fmt("waypoint_%u_teleport", i)
|
||||
fs(fmt("style[%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]",
|
||||
tp, PNG.teleport, PNG.teleport_hover))
|
||||
fs("image_button", ctn_len - 2, yi, icon_size, icon_size, "", tp, "")
|
||||
fs(fmt("tooltip[%s;%s]", tp, ES"Teleport to waypoint"))
|
||||
fs("button", 0, y, ctn_len - 2.1, 0.6, tp, "")
|
||||
end
|
||||
|
||||
if waypoint_preview then
|
||||
fs("image", 0.25, y - 3.5, 5, 4, PNG.bg_content)
|
||||
fs("button", 0.25, y - 3.35, 5, 0.55, "area_preview", v.name)
|
||||
fs("image_button", 4.65, y - 3.25, 0.25, 0.25,
|
||||
PNG.cancel_hover .. "^\\[brighten", "close_preview", "")
|
||||
|
||||
local pos = str_to_pos(data.waypoints[i].pos)
|
||||
get_isometric_view(fs, pos, 0.6, y - 2.5)
|
||||
end
|
||||
end
|
||||
|
||||
fs("style_type[label;font_size=16]")
|
||||
fs"style_type[label;font=normal;font_size=16]"
|
||||
end
|
||||
|
||||
local function get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
|
||||
fs(fmt("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7))
|
||||
local bag = get_detached_inv("bag", name)
|
||||
if bag:is_empty"main" then return end
|
||||
|
||||
local v = {{1.9, 2, 0.12}, {3.05, 5, 0.06}, {4.2, 10}, {4.75, 10}}
|
||||
local h, m, yy = unpack(v[bag_size])
|
||||
|
||||
local bagstack = bag:get_stack("main", 1)
|
||||
local desc = ESC(get_bag_description(data, bagstack))
|
||||
|
||||
fs("image", 0.5, yextra + 1.85, 0.6, 0.6, PNG.arrow_content)
|
||||
fs(fmt("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]", PNG.bg_content, m))
|
||||
fs("image_button", 1.1, yextra + 0.5 + (yy or 0), 4.75, h, "", "bg_content", "")
|
||||
|
||||
if not data.bag_rename then
|
||||
fs("hypertext", 1.3, yextra + 0.8, 4.3, 0.6, "content",
|
||||
fmt("<global size=16><center><b>%s</b></center>", desc))
|
||||
fs("image_button", 5.22, yextra + 0.835, 0.25, 0.25, "", "bag_rename", "")
|
||||
fs(fmt("tooltip[%s;%s]", "bag_rename", ES"Rename the bag"))
|
||||
else
|
||||
fs("box", 1.7, yextra + 0.82, 2.6, 0.4, "#707070")
|
||||
fs(fmt("field[1.8,%f;2.5,0.4;bag_newname;;%s]", yextra + 0.82, desc),
|
||||
"field_close_on_enter[bag_newname;false]")
|
||||
fs("hypertext", 4.4, yextra + 0.88, 0.8, 0.6, "confirm_rename",
|
||||
fmt("<global size=16><tag name=action color=#fff hovercolor=%s>" ..
|
||||
"<center><b><action name=ok>OK</action></b></center>", colors.yellow))
|
||||
end
|
||||
|
||||
local x, size, spacing = 1.45, 0.9, 0.12
|
||||
|
||||
if bag_size == 4 then
|
||||
x, size, spacing = 1.7, 0.8, 0.1
|
||||
end
|
||||
|
||||
fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing))
|
||||
fs(fmt("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]", esc_name, x, yextra + 1.3, bag_size))
|
||||
fs"style_type[list;size=1;spacing=0.15]"
|
||||
end
|
||||
|
||||
local function get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb, bag_size)
|
||||
@ -310,7 +445,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
|
||||
(half == 1 and i == floor(hearts)) and PNG.heart_half or PNG.heart)
|
||||
end
|
||||
else
|
||||
yoffset = yoffset - 0.5
|
||||
yoffset -= 0.5
|
||||
end
|
||||
|
||||
fs(fmt("list[current_player;craft;%f,%f;3,3;]", 0, yoffset + 1.45))
|
||||
@ -321,7 +456,7 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
|
||||
|
||||
local yextra = damage_enabled and 5.5 or 5
|
||||
|
||||
for i, title in ipairs(i3.SUBCAT) do
|
||||
for i, title in ipairs(i3.categories) do
|
||||
local btn_name = fmt("btn_%s", title)
|
||||
fs(fmt("style[btn_%s;fgimg=%s;fgimg_hovered=%s;content_offset=0]", title,
|
||||
data.subcat == i and PNG[fmt("%s_hover", title)] or PNG[title],
|
||||
@ -340,72 +475,47 @@ local function get_container(fs, data, player, yoffset, ctn_len, award_list, awa
|
||||
end
|
||||
|
||||
if data.subcat == 1 then
|
||||
fs(fmt("list[detached:i3_bag_%s;main;0,%f;1,1;]", esc_name, yextra + 0.7))
|
||||
|
||||
local inv = core.get_inventory{type = "detached", name = fmt("i3_bag_%s", name)}
|
||||
|
||||
if not inv:is_empty"main" then
|
||||
local v = {{1.9, 2, 0.12}, {3.05, 5, 0.06}, {4.2, 10}, {4.75, 10}}
|
||||
local h, m, yy = unpack(v[bag_size])
|
||||
|
||||
fs("image", 0.5, yextra + 1.85, 0.6, 0.6, PNG.arrow_content)
|
||||
fs(fmt("style[bg_content;bgimg=%s;fgimg=i3_blank.png;bgimg_middle=10,%u;sound=]",
|
||||
PNG.bg_content, m))
|
||||
fs("image_button", 1.1, yextra + 0.5 + (yy or 0), 4.75, h, "", "bg_content", "")
|
||||
fs("hypertext", 1.3, yextra + 0.8, 4.3, 0.6, "content",
|
||||
fmt("<global size=16><center><b>%s</b></center>", ES"Content"))
|
||||
|
||||
local x, size, spacing = 1.45, 0.9, 0.12
|
||||
|
||||
if bag_size == 4 then
|
||||
x, size, spacing = 1.7, 0.8, 0.1
|
||||
end
|
||||
|
||||
fs(fmt("style_type[list;size=%f;spacing=%f]", size, spacing))
|
||||
fs(fmt("list[detached:i3_bag_content_%s;main;%f,%f;4,%u;]", esc_name, x, yextra + 1.3, bag_size))
|
||||
fs("style_type[list;size=1;spacing=0.15]")
|
||||
end
|
||||
get_bag_fs(fs, data, name, esc_name, bag_size, yextra)
|
||||
|
||||
elseif data.subcat == 2 then
|
||||
if i3.modules.armor then
|
||||
local armor_def = armor.def[name]
|
||||
fs(fmt("list[detached:%s_armor;armor;0,%f;3,2;]", esc_name, yextra + 0.7))
|
||||
fs("label", 3.65, yextra + 1.55, fmt("%s: %s", ES"Level", armor_def.level))
|
||||
fs("label", 3.65, yextra + 2.05, fmt("%s: %s", ES"Heal", armor_def.heal))
|
||||
else
|
||||
not_installed("3d_armor")
|
||||
if not i3.modules.armor then
|
||||
return not_installed "3d_armor"
|
||||
end
|
||||
|
||||
local armor_def = armor.def[name]
|
||||
fs(fmt("list[detached:%s_armor;armor;0,%f;3,2;]", esc_name, yextra + 0.7))
|
||||
fs("label", 3.65, yextra + 1.55, fmt("%s: %s", ES"Level", armor_def.level))
|
||||
fs("label", 3.65, yextra + 2.05, fmt("%s: %s", ES"Heal", armor_def.heal))
|
||||
|
||||
elseif data.subcat == 3 then
|
||||
if i3.modules.skins then
|
||||
local _skins = skins.get_skinlist_for_player(name)
|
||||
local skin_name = skins.get_player_skin(player).name
|
||||
local sks, id = {}, 1
|
||||
if not i3.modules.skins then
|
||||
return not_installed "skinsdb"
|
||||
end
|
||||
|
||||
for i, skin in ipairs(_skins) do
|
||||
if skin.name == skin_name then
|
||||
id = i
|
||||
end
|
||||
local _skins = skins.get_skinlist_for_player(name)
|
||||
local skin_name = skins.get_player_skin(player).name
|
||||
local sks, id = {}, 1
|
||||
|
||||
insert(sks, skin.name)
|
||||
for i, skin in ipairs(_skins) do
|
||||
if skin.name == skin_name then
|
||||
id = i
|
||||
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))
|
||||
else
|
||||
not_installed("skinsdb")
|
||||
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 i3.modules.awards then
|
||||
yextra = yextra + 0.7
|
||||
get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb)
|
||||
else
|
||||
not_installed("awards")
|
||||
if not i3.modules.awards then
|
||||
return not_installed "awards"
|
||||
end
|
||||
|
||||
yextra = yextra + 0.7
|
||||
get_award_list(data, fs, ctn_len, yextra, award_list, awards_unlocked, award_list_nb)
|
||||
|
||||
elseif data.subcat == 5 then
|
||||
get_waypoint_fs(fs, data, player, yextra, ctn_len)
|
||||
end
|
||||
@ -413,7 +523,7 @@ end
|
||||
|
||||
local function show_popup(fs, data)
|
||||
if data.confirm_trash then
|
||||
fs("style_type[box;colors=#999,#999,#808080,#808080]")
|
||||
fs"style_type[box;colors=#999,#999,#808080,#808080]"
|
||||
|
||||
for _ = 1, 3 do
|
||||
fs("box", 2.97, 10.75, 4.3, 0.5, "")
|
||||
@ -424,7 +534,7 @@ local function show_popup(fs, data)
|
||||
fs("image_button", 6.27, 10.75, 1, 0.5, "", "confirm_trash_no", "No")
|
||||
|
||||
elseif data.show_settings then
|
||||
fs("style_type[box;colors=#999,#999,#808080,#808080]")
|
||||
fs"style_type[box;colors=#999,#999,#808080,#808080]"
|
||||
|
||||
for _ = 1, 3 do
|
||||
fs("box", 2.1, 9.25, 6, 2, "")
|
||||
@ -457,7 +567,7 @@ local function show_popup(fs, data)
|
||||
if data.home then
|
||||
str = data.home:gsub(",", " "):sub(2,-2):gsub("%.%d", ""):gsub(
|
||||
"(%-?%d+)", function(a)
|
||||
c = c + 1
|
||||
c++
|
||||
return fmt("<b>%s: <style color=%s font=mono>%s</style></b>",
|
||||
coords[c], colors.black, a)
|
||||
end)
|
||||
@ -475,7 +585,7 @@ local function show_popup(fs, data)
|
||||
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", "")
|
||||
|
||||
fs("style[sort_method;font=bold;font_size=20]")
|
||||
fs"style[sort_method;font=bold;font_size=20]"
|
||||
fs("button", 2.55, 10.36, 5.1, 0.8, "sort_method", toupper(data.sort))
|
||||
|
||||
local idx = get_sorting_idx(data.sort)
|
||||
@ -495,10 +605,10 @@ local function show_popup(fs, data)
|
||||
fs("box", 5.4, 10.68, 2.4, 0.45, "#707070")
|
||||
end
|
||||
|
||||
fs("style[drop_items;font_size=15;font=mono;textcolor=#dbeeff]")
|
||||
fs(fmt("field[5.4,10.68;2.4,0.45;drop_items;Drop items:;%s]",
|
||||
ESC(concat(data.drop_items or {}, ","))))
|
||||
fs("field_close_on_enter[drop_items;false]")
|
||||
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]",
|
||||
ESC(concat(data.drop_items or {}, ","))),
|
||||
"field_close_on_enter[drop_items;false]")
|
||||
|
||||
fs(fmt("tooltip[cb_inv_compress;%s;#707070;#fff]",
|
||||
ES"Enable this option to compress your inventory"),
|
||||
@ -516,7 +626,7 @@ local function show_popup(fs, data)
|
||||
end
|
||||
|
||||
local function get_inventory_fs(player, data, fs)
|
||||
fs("listcolors[#bababa50;#bababa99]")
|
||||
fs"listcolors[#bababa50;#bababa99]"
|
||||
|
||||
get_inv_slots(fs)
|
||||
|
||||
@ -548,14 +658,14 @@ local function get_inventory_fs(player, data, fs)
|
||||
local bag_size = get_group(ItemStack(data.bag):get_name(), "bag")
|
||||
|
||||
if data.subcat == 1 and bag_size > 0 then
|
||||
max_val = max_val + min(32, 6 + ((bag_size - 1) * 10))
|
||||
max_val += min(32, 6 + ((bag_size - 1) * 10))
|
||||
|
||||
elseif i3.modules.armor and data.subcat == 2 then
|
||||
if data.scrbar_inv >= max_val then
|
||||
data.scrbar_inv = data.scrbar_inv + 10
|
||||
data.scrbar_inv += 10
|
||||
end
|
||||
|
||||
max_val = max_val + 10
|
||||
max_val += 10
|
||||
|
||||
elseif i3.modules.awards and data.subcat == 4 then
|
||||
award_list = awards.get_award_states(data.player_name)
|
||||
@ -565,18 +675,18 @@ local function get_inventory_fs(player, data, fs)
|
||||
local award = award_list[i]
|
||||
|
||||
if award.unlocked then
|
||||
awards_unlocked = awards_unlocked + 1
|
||||
awards_unlocked++
|
||||
end
|
||||
end
|
||||
|
||||
max_val = max_val + (award_list_nb * 13)
|
||||
max_val += (award_list_nb * 13)
|
||||
|
||||
elseif data.subcat == 5 then
|
||||
local wp_nb = #data.waypoints
|
||||
local wp = #data.waypoints
|
||||
|
||||
if wp_nb > 0 then
|
||||
local mul = (wp_nb > 8 and 7) or (wp_nb > 4 and 6) or 5
|
||||
max_val = max_val + 11 + (wp_nb * mul)
|
||||
if wp > 0 then
|
||||
local mul = (wp > 8 and 7) or (wp > 4 and 6) or 5
|
||||
max_val += 11 + (wp * mul)
|
||||
end
|
||||
end
|
||||
|
||||
@ -589,7 +699,7 @@ local function get_inventory_fs(player, data, fs)
|
||||
|
||||
fs(fmt("scroll_container[3.9,0.2;%f,%f;scrbar_inv;vertical]", ctn_len, ctn_hgt))
|
||||
get_container(fs, data, player, yoffset, ctn_len, award_list, awards_unlocked, award_list_nb, bag_size)
|
||||
fs("scroll_container_end[]")
|
||||
fs"scroll_container_end[]"
|
||||
|
||||
local btn = {
|
||||
{"trash", ES"Clear inventory"},
|
||||
@ -677,13 +787,13 @@ local function get_tooltip(item, info, pos)
|
||||
|
||||
tooltip = add(S("Only drop if using one of these tools: @1", sub(names, 1, -2)))
|
||||
else
|
||||
tooltip = add(S("Only drop if using this tool: @1",
|
||||
clr("#ff0", get_desc(info.tools[1]))))
|
||||
tooltip = add(S("Only drop if using this tool: @1", clr("#ff0", get_desc(info.tools[1]))))
|
||||
end
|
||||
end
|
||||
|
||||
if pos then
|
||||
return fmt("tooltip", pos.x, pos.y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, ESC(tooltip))
|
||||
local btn_size = i3.settings.item_btn_size
|
||||
return fmt("tooltip", pos.x, pos.y, btn_size, btn_size, ESC(tooltip))
|
||||
end
|
||||
|
||||
return fmt("tooltip[%s;%s]", item, ESC(tooltip))
|
||||
@ -691,37 +801,49 @@ end
|
||||
|
||||
local function get_output_fs(fs, data, rcp, is_recipe, shapeless, right, btn_size, _btn_size)
|
||||
local custom_recipe = i3.craft_types[rcp.type]
|
||||
local cooking = rcp.type == "cooking"
|
||||
local fuel = rcp.type == "fuel"
|
||||
|
||||
if custom_recipe or shapeless or rcp.type == "cooking" then
|
||||
local icon = custom_recipe and custom_recipe.icon or shapeless and "shapeless" or "furnace"
|
||||
if custom_recipe or shapeless or cooking then
|
||||
local icon, tooltip = PNG.blank
|
||||
|
||||
if not custom_recipe then
|
||||
icon = fmt("i3_%s.png^\\[resize:16x16", icon)
|
||||
if custom_recipe and true_str(custom_recipe.icon) then
|
||||
icon = fmt("%s^\\[resize:16x16", custom_recipe.icon)
|
||||
elseif shapeless then
|
||||
icon = PNG.shapeless
|
||||
end
|
||||
|
||||
local pos_x = right + btn_size + 0.42
|
||||
local pos_y = data.yoffset + 0.9
|
||||
|
||||
if sub(icon, 1, 10) == "i3_furnace" then
|
||||
if cooking then
|
||||
fs("animated_image", pos_x, pos_y, 0.5, 0.5, PNG.furnace_anim, 8, 180)
|
||||
else
|
||||
fs("image", pos_x, pos_y, 0.5, 0.5, icon)
|
||||
end
|
||||
|
||||
local tooltip = custom_recipe and custom_recipe.description or
|
||||
shapeless and S"Shapeless" or S"Cooking"
|
||||
if custom_recipe and true_str(custom_recipe.description) then
|
||||
tooltip = custom_recipe.description
|
||||
elseif shapeless then
|
||||
tooltip = S"Shapeless"
|
||||
elseif cooking then
|
||||
tooltip = S"Cooking"
|
||||
end
|
||||
|
||||
fs("tooltip", pos_x, pos_y, 0.5, 0.5, ESC(tooltip))
|
||||
if tooltip then
|
||||
fs("tooltip", pos_x, pos_y, 0.5, 0.5, ESC(tooltip))
|
||||
end
|
||||
end
|
||||
|
||||
local arrow_X = right + 0.2 + (_btn_size or i3.ITEM_BTN_SIZE)
|
||||
local BTN_SIZE = i3.settings.item_btn_size
|
||||
local arrow_X = right + 0.2 + (_btn_size or BTN_SIZE)
|
||||
local X = arrow_X + 1.2
|
||||
local Y = data.yoffset + 1.4
|
||||
|
||||
fs("image", arrow_X, Y + 0.06, 1, 1, PNG.arrow)
|
||||
|
||||
if rcp.type == "fuel" then
|
||||
fs("animated_image", X + 0.05, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, PNG.fire_anim, 8, 180)
|
||||
if fuel then
|
||||
fs("animated_image", X + 0.05, Y, BTN_SIZE, BTN_SIZE, PNG.fire_anim, 8, 180)
|
||||
return
|
||||
end
|
||||
|
||||
@ -730,29 +852,25 @@ local function get_output_fs(fs, data, rcp, is_recipe, shapeless, right, btn_siz
|
||||
local name = item:get_name()
|
||||
local count = item:get_count()
|
||||
local wear = item:get_wear()
|
||||
local bt_s = i3.ITEM_BTN_SIZE * 1.2
|
||||
local bt_s = BTN_SIZE * 1.2
|
||||
local _name = fmt("_%s", name)
|
||||
local pos
|
||||
|
||||
if meta:get_string"color" ~= "" or meta:get_string"palette_index" ~= "" then
|
||||
local rcp_usg = is_recipe and "rcp" or "usg"
|
||||
|
||||
fs(fmt("style_type[list;size=%f]", i3.ITEM_BTN_SIZE))
|
||||
fs("listcolors[#bababa50;#bababa99]")
|
||||
fs(fmt("style_type[list;size=%f]", BTN_SIZE))
|
||||
fs"listcolors[#bababa50;#bababa99]"
|
||||
fs(fmt("list[detached:i3_output_%s_%s;main;%f,%f;1,1;]", rcp_usg, data.player_name, X + 0.11, Y))
|
||||
fs("button", X + 0.11, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, _name, "")
|
||||
|
||||
local inv = core.get_inventory {
|
||||
type = "detached",
|
||||
name = fmt("i3_output_%s_%s", rcp_usg, data.player_name)
|
||||
}
|
||||
fs("button", X + 0.11, Y, BTN_SIZE, BTN_SIZE, _name, "")
|
||||
|
||||
local inv = get_detached_inv(fmt("output_%s", rcp_usg), data.player_name)
|
||||
inv:set_stack("main", 1, item)
|
||||
pos = {x = X + 0.11, y = Y}
|
||||
else
|
||||
fs("image", X, Y - 0.11, bt_s, bt_s, PNG.slot)
|
||||
fs("item_image_button",
|
||||
X + 0.11, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE,
|
||||
X + 0.11, Y, BTN_SIZE, BTN_SIZE,
|
||||
fmt("%s %u %u", name, count * (is_recipe and data.scrbar_rcp or data.scrbar_usg or 1), wear),
|
||||
_name, "")
|
||||
end
|
||||
@ -784,7 +902,8 @@ end
|
||||
|
||||
local function get_grid_fs(fs, data, rcp, is_recipe)
|
||||
local width = rcp.width or 1
|
||||
local right, btn_size, _btn_size = 0, i3.ITEM_BTN_SIZE
|
||||
local right = 0
|
||||
local btn_size, _btn_size = i3.settings.item_btn_size
|
||||
local cooktime, shapeless
|
||||
|
||||
if rcp.type == "cooking" then
|
||||
@ -799,7 +918,7 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
|
||||
local large_recipe = width > 3 or rows > 3
|
||||
|
||||
if large_recipe then
|
||||
fs("style_type[item_image_button;border=true]")
|
||||
fs"style_type[item_image_button;border=true]"
|
||||
end
|
||||
|
||||
for i = 1, width * rows do
|
||||
@ -832,10 +951,10 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
|
||||
Y = btn_size * yi + data.yoffset + 0.2 + (yi * 0.05) + add_y
|
||||
else
|
||||
X = ceil((i - 1) % width - width)
|
||||
X = X + (X * 0.2) + data.inv_width + 3.9
|
||||
X += (X * 0.2) + data.inv_width + 3.9
|
||||
|
||||
Y = ceil(i / width) - min(2, rows)
|
||||
Y = Y + (Y * 0.15) + data.yoffset + 1.4
|
||||
Y += (Y * 0.15) + data.yoffset + 1.4
|
||||
end
|
||||
|
||||
if X > right then
|
||||
@ -877,7 +996,7 @@ local function get_grid_fs(fs, data, rcp, is_recipe)
|
||||
fs("image", X, Y, btn_size, btn_size, PNG.slot)
|
||||
end
|
||||
|
||||
local btn_name = groups and fmt("group|%s|%s", groups[1], name) or name
|
||||
local btn_name = groups and fmt("group!%s!%s", groups[1], name) or name
|
||||
|
||||
fs("item_image_button", X, Y, btn_size, btn_size,
|
||||
fmt("%s %u", name, count * (is_recipe and data.scrbar_rcp or data.scrbar_usg or 1)),
|
||||
@ -975,8 +1094,7 @@ local function get_model_fs(fs, data, def, model_alias)
|
||||
hex = "0" .. hex
|
||||
end
|
||||
|
||||
_name = fmt("%s^[multiply:%s", v.name,
|
||||
fmt("#%s%s", sub(hex, 3), sub(hex, 1, 2)))
|
||||
_name = fmt("%s^[multiply:%s", v.name, fmt("#%s%s", sub(hex, 3), sub(hex, 1, 2)))
|
||||
else
|
||||
_name = fmt("%s^[multiply:%s", v.name, v.color)
|
||||
end
|
||||
@ -997,11 +1115,12 @@ local function get_model_fs(fs, data, def, model_alias)
|
||||
end
|
||||
|
||||
local function get_header(fs, data)
|
||||
local fav = is_fav(data.favs, data.query_item)
|
||||
local fav = is_fav(data)
|
||||
local nfavs = #data.favs
|
||||
local max_favs = i3.settings.max_favs
|
||||
local star_x, star_y, size = data.inv_width + 0.3, data.yoffset + 0.2, 0.4
|
||||
|
||||
if nfavs < i3.MAX_FAVS or (nfavs == i3.MAX_FAVS and fav) then
|
||||
if nfavs < max_favs or (nfavs == max_favs and fav) then
|
||||
local fav_marked = fmt("i3_fav%s.png", fav and "_off" or "")
|
||||
fs(fmt("style[fav;fgimg=%s;fgimg_hovered=%s;fgimg_pressed=%s]",
|
||||
fmt("i3_fav%s.png", fav and "" or "_off"), fav_marked, fav_marked))
|
||||
@ -1035,11 +1154,11 @@ local function get_header(fs, data)
|
||||
tech_name = snip(tech_name, name_lim)
|
||||
end
|
||||
|
||||
fs("style_type[label;font=bold;font_size=20]")
|
||||
fs"style_type[label;font=bold;font_size=20]"
|
||||
fs("label", X, Y1, desc)
|
||||
fs("style_type[label;font=mono;font_size=16]")
|
||||
fs"style_type[label;font=mono;font_size=16]"
|
||||
fs("label", X, Y2, clr(colors.blue, tech_name))
|
||||
fs("style_type[label;font=normal;font_size=16]")
|
||||
fs"style_type[label;font=normal;font_size=16]"
|
||||
|
||||
local def = reg_items[data.query_item]
|
||||
local model_alias = model_aliases[data.query_item]
|
||||
@ -1078,12 +1197,12 @@ 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))
|
||||
fs("button", data.inv_width + 8.1, data.yoffset + 0.4, 3, 0.7,
|
||||
fmt("craft_%s", name), ES("Craft (×@1)", stack_fs))
|
||||
end
|
||||
|
||||
local function get_rcp_extra(player, fs, data, panel, is_recipe, is_usage)
|
||||
fs("container[0,0.075]")
|
||||
local function get_rcp_extra(fs, data, player, panel, is_recipe, is_usage)
|
||||
fs"container[0,0.075]"
|
||||
local rn = panel.rcp and #panel.rcp
|
||||
|
||||
if rn then
|
||||
@ -1118,10 +1237,10 @@ local function get_rcp_extra(player, fs, data, panel, is_recipe, is_usage)
|
||||
fs("button", data.inv_width + 0.1, data.yoffset + (panel.height / 2) - 0.5, 7.8, 1, "no_rcp", lbl)
|
||||
end
|
||||
|
||||
fs("container_end[]")
|
||||
fs"container_end[]"
|
||||
end
|
||||
|
||||
local function get_items_fs(fs, data, full_height)
|
||||
local function hide_items(player, data)
|
||||
if compression_active(data) then
|
||||
local new = {}
|
||||
|
||||
@ -1135,11 +1254,32 @@ local function get_items_fs(fs, data, full_height)
|
||||
data.items = new
|
||||
end
|
||||
|
||||
if not core.is_creative_enabled(data.player_name) then
|
||||
local new = {}
|
||||
|
||||
for i = 1, #data.items do
|
||||
local item = data.items[i]
|
||||
local recipes, usages = get_recipes(player, item)
|
||||
|
||||
if recipes or usages then
|
||||
insert(new, item)
|
||||
end
|
||||
end
|
||||
|
||||
data.items = new
|
||||
end
|
||||
end
|
||||
|
||||
local function get_items_fs(fs, data, player, full_height)
|
||||
hide_items(player, data)
|
||||
|
||||
local items = data.alt_items or data.items or {}
|
||||
local rows, lines = 8, 12
|
||||
local ipp = rows * lines
|
||||
local size = 0.85
|
||||
|
||||
fs("bg9", data.inv_width + 0.1, 0, 7.9, full_height, PNG.bg_full, 10)
|
||||
|
||||
fs(fmt("box[%f,0.2;4.05,0.6;#bababa25]", data.inv_width + 0.3),
|
||||
"set_focus[filter]",
|
||||
fmt("field[%f,0.2;2.95,0.6;filter;;%s]", data.inv_width + 0.35, ESC(data.filter)),
|
||||
@ -1174,10 +1314,10 @@ local function get_items_fs(fs, data, full_height)
|
||||
local name = _compressed and item:sub(2) or item
|
||||
|
||||
local X = i % rows
|
||||
X = X - (X * 0.045) + data.inv_width + 0.28
|
||||
X -= (X * 0.045) + data.inv_width + 0.28
|
||||
|
||||
local Y = round((i % ipp - X) / rows + 1, 0)
|
||||
Y = Y - (Y * 0.085) + 0.95
|
||||
Y -= (Y * 0.085) + 0.95
|
||||
|
||||
insert(fs, fmt("item_image_button", X, Y, size, size, name, item, ""))
|
||||
|
||||
@ -1185,9 +1325,9 @@ local function get_items_fs(fs, data, full_height)
|
||||
local expand = data.expand == name
|
||||
|
||||
fs(fmt("tooltip[%s;%s]", item, expand and ES"Click to hide" or ES"Click to expand"))
|
||||
fs("style_type[label;font=bold;font_size=20]")
|
||||
fs"style_type[label;font=bold;font_size=20]"
|
||||
fs("label", X + 0.65, Y + 0.7, expand and "-" or "+")
|
||||
fs("style_type[label;font=normal;font_size=16]")
|
||||
fs"style_type[label;font=normal;font_size=16]"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1202,13 +1342,14 @@ local function get_items_fs(fs, data, full_height)
|
||||
selected and PNG.tab_small_hover or PNG.tab_small,
|
||||
PNG.tab_small_hover, selected and "#fff" or "#ddd"))
|
||||
|
||||
fs("style_type[image_button:hovered;textcolor=#fff]")
|
||||
fs"style_type[image_button:hovered;textcolor=#fff]"
|
||||
fs("image_button", (data.inv_width - 0.65) + (i * (tab_len + 0.1)),
|
||||
full_height, tab_len, tab_hgh, "", fmt("itab_%u", i), title)
|
||||
end
|
||||
end
|
||||
|
||||
local function get_favs(fs, data)
|
||||
local btn_size = i3.settings.item_btn_size
|
||||
fs("label", data.inv_width + 0.4, data.yoffset + 0.4, ES"Bookmarks")
|
||||
|
||||
for i = 1, #data.favs do
|
||||
@ -1217,54 +1358,34 @@ local function get_favs(fs, data)
|
||||
local Y = data.yoffset + 0.8
|
||||
|
||||
if data.query_item == item then
|
||||
fs("image", X, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, PNG.slot)
|
||||
fs("image", X, Y, btn_size, btn_size, PNG.slot)
|
||||
end
|
||||
|
||||
fs("item_image_button", X, Y, i3.ITEM_BTN_SIZE, i3.ITEM_BTN_SIZE, item, item, "")
|
||||
fs("item_image_button", X, Y, btn_size, btn_size, item, item, "")
|
||||
end
|
||||
end
|
||||
|
||||
local function get_panels(player, data, fs, full_height)
|
||||
local _title = {name = "title", height = 1.4}
|
||||
local _favs = {name = "favs", height = 2.23}
|
||||
local _items = {name = "items", height = full_height}
|
||||
local _recipes = {name = "recipes", rcp = data.recipes, height = 4.045}
|
||||
local _usages = {name = "usages", rcp = data.usages, height = 4.045}
|
||||
local panels
|
||||
local function get_panels(fs, data, player)
|
||||
local title = {name = "title", height = 1.4, func = get_header}
|
||||
local favs = {name = "favs", height = 2.23, func = get_favs}
|
||||
local recipes = {name = "recipes", rcp = data.recipes, height = 4.045, func = get_rcp_extra}
|
||||
local usages = {name = "usages", rcp = data.usages, height = 4.045, func = get_rcp_extra}
|
||||
local panels = {title, recipes, usages, favs}
|
||||
data.yoffset = 0
|
||||
|
||||
if data.query_item then
|
||||
panels = {_title, _recipes, _usages, _favs}
|
||||
else
|
||||
panels = {_items}
|
||||
end
|
||||
|
||||
for idx = 1, #panels do
|
||||
local panel = panels[idx]
|
||||
data.yoffset = 0
|
||||
|
||||
if idx > 1 then
|
||||
for _idx = idx - 1, 1, -1 do
|
||||
data.yoffset = data.yoffset + panels[_idx].height + 0.1
|
||||
end
|
||||
for i, panel in ipairs(panels) do
|
||||
if i > 1 then
|
||||
data.yoffset += panels[i - 1].height + 0.1
|
||||
end
|
||||
|
||||
fs("bg9", data.inv_width + 0.1, data.yoffset, 7.9, panel.height, PNG.bg_full, 10)
|
||||
|
||||
local is_recipe, is_usage = panel.name == "recipes", panel.name == "usages"
|
||||
|
||||
if is_recipe or is_usage then
|
||||
get_rcp_extra(player, fs, data, panel, is_recipe, is_usage)
|
||||
elseif panel.name == "items" then
|
||||
get_items_fs(fs, data, full_height)
|
||||
elseif panel.name == "title" then
|
||||
get_header(fs, data)
|
||||
elseif panel.name == "favs" then
|
||||
get_favs(fs, data)
|
||||
end
|
||||
panel.func(fs, data, player, panel, is_recipe, is_usage)
|
||||
end
|
||||
end
|
||||
|
||||
local function get_tabs_fs(player, data, fs, full_height)
|
||||
local function get_tabs_fs(fs, player, data, full_height)
|
||||
local tab_len, tab_hgh, c, over = 3, 0.5, 0
|
||||
local _tabs = copy(i3.tabs)
|
||||
|
||||
@ -1298,7 +1419,7 @@ local function get_tabs_fs(player, data, fs, full_height)
|
||||
local X = (data.inv_width / 2) + (c * (tab_len + 0.1)) - ((tab_len + 0.05) * (shift / 2))
|
||||
local Y = btm and full_height or -tab_hgh
|
||||
|
||||
fs("style_type[image_button:hovered;textcolor=#fff]")
|
||||
fs"style_type[image_button:hovered;textcolor=#fff]"
|
||||
fs("image_button", X, Y, tab_len, tab_hgh, "", fmt("tab_%s", def.name), ESC(def.description))
|
||||
|
||||
if true_str(def.image) then
|
||||
@ -1308,18 +1429,22 @@ local function get_tabs_fs(player, data, fs, full_height)
|
||||
Y + 0.05, 0.35, 0.35, fmt("%s^\\[resize:16x16", def.image))
|
||||
end
|
||||
|
||||
c = c + 1
|
||||
c++
|
||||
end
|
||||
end
|
||||
|
||||
local function get_debug_grid(data, fs, full_height)
|
||||
fs"style[hide_debug_grid;noclip=true]"
|
||||
fs("button", -2, full_height - 1, 2, 1, "hide_debug_grid", "Toggle grid")
|
||||
if data.hide_debug_grid then return end
|
||||
|
||||
fs("style_type[label;font_size=8;noclip=true]")
|
||||
local spacing, i = 0.2, 1
|
||||
|
||||
for x = 0, data.inv_width + 8, spacing do
|
||||
fs("box", x, 0, 0.01, full_height, "#ff0")
|
||||
fs("label", x, full_height + 0.1, tostring(i))
|
||||
i = i + 1
|
||||
i++
|
||||
end
|
||||
|
||||
i = 61
|
||||
@ -1327,16 +1452,16 @@ local function get_debug_grid(data, fs, full_height)
|
||||
for y = 0, full_height, spacing do
|
||||
fs("box", 0, y, data.inv_width + 8, 0.01, "#ff0")
|
||||
fs("label", -0.15, y, tostring(i))
|
||||
i = i - 1
|
||||
i -= 1
|
||||
end
|
||||
|
||||
fs("box", data.inv_width / 2, 0, 0.01, full_height, "#f00")
|
||||
fs("box", 0, full_height / 2, data.inv_width, 0.01, "#f00")
|
||||
fs("style_type[label;font_size=16]")
|
||||
fs"style_type[label;font_size=16]"
|
||||
end
|
||||
|
||||
local function make_fs(player, data)
|
||||
--local start = os.clock()
|
||||
local start = debug_mode and core.get_us_time() or nil
|
||||
|
||||
local fs = setmetatable({}, {
|
||||
__call = function(t, ...)
|
||||
@ -1354,26 +1479,31 @@ local function make_fs(player, data)
|
||||
data.inv_width = 10.23
|
||||
local full_height = 12
|
||||
|
||||
local tab = i3.tabs[data.tab]
|
||||
|
||||
fs(fmt("formspec_version[%u]size[%f,%f]no_prepend[]bgcolor[#0000]",
|
||||
i3.MIN_FORMSPEC_VERSION, data.inv_width + 8, full_height), styles)
|
||||
i3.settings.min_fs_version, data.inv_width + 8, full_height), styles)
|
||||
|
||||
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
|
||||
|
||||
get_panels(player, data, fs, full_height)
|
||||
|
||||
if #i3.tabs > 1 then
|
||||
get_tabs_fs(player, data, fs, full_height)
|
||||
if data.query_item then
|
||||
get_panels(fs, data, player)
|
||||
else
|
||||
get_items_fs(fs, data, player, full_height)
|
||||
end
|
||||
|
||||
--get_debug_grid(data, fs, full_height)
|
||||
--print("make_fs()", fmt("%.2f ms", (os.clock() - start) * 1000))
|
||||
--print("#fs elements", #fs)
|
||||
if #i3.tabs > 1 then
|
||||
get_tabs_fs(fs, player, data, full_height)
|
||||
end
|
||||
|
||||
if debug_mode then
|
||||
get_debug_grid(data, fs, full_height)
|
||||
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
|
||||
|
||||
return concat(fs)
|
||||
end
|
||||
|
||||
125
src/hud.lua
Normal file
125
src/hud.lua
Normal file
@ -0,0 +1,125 @@
|
||||
IMPORT("get_connected_players", "str_to_pos", "add_hud_waypoint")
|
||||
|
||||
local function init_hud(player)
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
|
||||
data.hud = {
|
||||
bg = player:hud_add {
|
||||
hud_elem_type = "image",
|
||||
position = {x = 0.78, y = 1},
|
||||
alignment = {x = 1, y = 1},
|
||||
scale = {x = 370, y = 112},
|
||||
text = "i3_bg.png",
|
||||
z_index = 0xDEAD,
|
||||
},
|
||||
|
||||
img = player:hud_add {
|
||||
hud_elem_type = "image",
|
||||
position = {x = 0.79, y = 1.02},
|
||||
alignment = {x = 1, y = 1},
|
||||
scale = {x = 4, y = 4},
|
||||
text = "",
|
||||
z_index = 0xDEAD,
|
||||
},
|
||||
|
||||
text = player:hud_add {
|
||||
hud_elem_type = "text",
|
||||
position = {x = 0.84, y = 1.04},
|
||||
alignment = {x = 1, y = 1},
|
||||
number = 0xffffff,
|
||||
text = "",
|
||||
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
|
||||
end
|
||||
|
||||
local function show_hud(player, data)
|
||||
-- It would better to have an engine function `hud_move` to only need
|
||||
-- 2 calls for the notification's back and forth.
|
||||
|
||||
local hud_info_bg = player:hud_get(data.hud.bg)
|
||||
local dt = 0.016
|
||||
|
||||
if hud_info_bg.position.y <= 0.9 then
|
||||
data.show_hud = false
|
||||
data.hud_timer = (data.hud_timer or 0) + dt
|
||||
end
|
||||
|
||||
player:hud_change(data.hud.text, "text", data.hud_msg)
|
||||
|
||||
if data.hud_img then
|
||||
player:hud_change(data.hud.img, "text", data.hud_img)
|
||||
end
|
||||
|
||||
if data.show_hud then
|
||||
for _, def in pairs(data.hud) do
|
||||
local hud_info = player:hud_get(def)
|
||||
|
||||
player:hud_change(def, "position", {
|
||||
x = hud_info.position.x,
|
||||
y = hud_info.position.y - ((dt / 5) * i3.settings.hud_speed)
|
||||
})
|
||||
end
|
||||
|
||||
elseif data.show_hud == false then
|
||||
if data.hud_timer >= i3.settings.hud_timer_max then
|
||||
for _, def in pairs(data.hud) do
|
||||
local hud_info = player:hud_get(def)
|
||||
|
||||
player:hud_change(def, "position", {
|
||||
x = hud_info.position.x,
|
||||
y = hud_info.position.y + ((dt / 5) * i3.settings.hud_speed)
|
||||
})
|
||||
end
|
||||
|
||||
if hud_info_bg.position.y >= 1 then
|
||||
data.show_hud = nil
|
||||
data.hud_timer = nil
|
||||
data.hud_msg = nil
|
||||
data.hud_img = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
core.register_globalstep(function()
|
||||
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 data and data.show_hud ~= nil then
|
||||
show_hud(player, data)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
local function init_waypoints(player)
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
data.waypoints = data.waypoints or {}
|
||||
|
||||
for _, v in ipairs(data.waypoints) do
|
||||
if not v.hide then
|
||||
local id = add_hud_waypoint(player, v.name, str_to_pos(v.pos), v.color)
|
||||
v.id = id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return function(player)
|
||||
init_hud(player)
|
||||
init_waypoints(player)
|
||||
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
|
||||
|
||||
82
src/operators.lua
Normal file
82
src/operators.lua
Normal file
@ -0,0 +1,82 @@
|
||||
--[[ All source files have to be preprocessed before loading.
|
||||
This allows implementing custom operators like bitwise ones. ]]
|
||||
|
||||
local fmt, split = string.format, string.split
|
||||
local var = "[%w%.%[%]\"\'_]"
|
||||
|
||||
local operators = {
|
||||
["([%+%-%*%^/&|])="] = function(a, b, c)
|
||||
return fmt("%s = %s %s %s", a, a, b, c)
|
||||
end,
|
||||
|
||||
["+%+"] = function(a, b)
|
||||
return fmt("%s = %s + 1\n%s", a, a, b)
|
||||
end,
|
||||
|
||||
["&"] = function(a, b)
|
||||
return fmt("bit.band(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["|"] = function(a, b)
|
||||
return fmt("bit.bor(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["<<"] = function(a, b)
|
||||
return fmt("bit.lshift(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
[">>"] = function(a, b)
|
||||
return fmt("bit.rshift(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["<<="] = function(a, b)
|
||||
return fmt("%s = bit.lshift(%s, %s)", a, a, b)
|
||||
end,
|
||||
|
||||
[">>="] = function(a, b)
|
||||
return fmt("%s = bit.rshift(%s, %s)", a, a, b)
|
||||
end,
|
||||
}
|
||||
|
||||
local function compile(data)
|
||||
data = data:gsub("IMPORT%((.-)%)", function(a)
|
||||
return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
|
||||
end)
|
||||
|
||||
for op, func in pairs(operators) do
|
||||
data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
|
||||
end
|
||||
|
||||
return data
|
||||
end
|
||||
|
||||
local function _load(path, line, data, t)
|
||||
if line then
|
||||
if not t then
|
||||
t = split(data, "\n")
|
||||
end
|
||||
t[line] = t[line]:gsub("(" .. var .. "+)%s?=%s?(" .. var .. "*)", "%2")
|
||||
data = table.concat(t, "\n")
|
||||
else
|
||||
local file = assert(io.open(path, "r"))
|
||||
data = file:read"*a"
|
||||
file:close()
|
||||
data = compile(data)
|
||||
end
|
||||
|
||||
local l, err = loadstring(data)
|
||||
|
||||
if not l then
|
||||
local err_line = tonumber(err:match(":(%d+):"))
|
||||
|
||||
if line ~= err_line then
|
||||
return _load(path, err_line, data, t)
|
||||
end
|
||||
end
|
||||
|
||||
return l, err
|
||||
end
|
||||
|
||||
return function(path)
|
||||
return _load(path) or loadfile(path)
|
||||
end
|
||||
@ -1,13 +1,9 @@
|
||||
local singleplayer = core.is_singleplayer()
|
||||
|
||||
local set_fs = i3.set_fs
|
||||
local fmt, search, table_merge, array_diff =
|
||||
i3.get("fmt", "search", "table_merge", "array_diff")
|
||||
local is_group, extract_groups, item_has_groups, apply_recipe_filters =
|
||||
i3.get("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
|
||||
|
||||
local hud_notif = i3.hud_notif
|
||||
local POLL_FREQ = 0.25
|
||||
local HUD_TIMER_MAX = 1.5
|
||||
|
||||
IMPORT("fmt", "search", "table_merge", "array_diff")
|
||||
IMPORT("is_group", "extract_groups", "item_has_groups", "apply_recipe_filters")
|
||||
|
||||
local function get_filtered_items(player, data)
|
||||
local items, known, c = {}, 0, 0
|
||||
@ -21,18 +17,13 @@ local function get_filtered_items(player, data)
|
||||
usages = #apply_recipe_filters(usages or {}, player)
|
||||
|
||||
if recipes > 0 or usages > 0 then
|
||||
c = c + 1
|
||||
c++
|
||||
items[c] = item
|
||||
|
||||
if data then
|
||||
known = known + recipes + usages
|
||||
end
|
||||
known += recipes + usages
|
||||
end
|
||||
end
|
||||
|
||||
if data then
|
||||
data.known_recipes = known
|
||||
end
|
||||
data.known_recipes = known
|
||||
|
||||
return items
|
||||
end
|
||||
@ -86,7 +77,7 @@ local function progressive_filter(recipes, player)
|
||||
for i = 1, #recipes do
|
||||
local recipe = recipes[i]
|
||||
if recipe_in_inv(recipe, data.inv_items) then
|
||||
c = c + 1
|
||||
c++
|
||||
filtered[c] = recipe
|
||||
end
|
||||
end
|
||||
@ -113,7 +104,7 @@ local function get_inv_items(player)
|
||||
if not stack:is_empty() then
|
||||
local name = stack:get_name()
|
||||
if core.registered_items[name] then
|
||||
c = c + 1
|
||||
c++
|
||||
inv_items[c] = name
|
||||
end
|
||||
end
|
||||
@ -122,129 +113,31 @@ local function get_inv_items(player)
|
||||
return inv_items
|
||||
end
|
||||
|
||||
local function init_hud(player, data)
|
||||
data.hud = {
|
||||
bg = player:hud_add {
|
||||
hud_elem_type = "image",
|
||||
position = {x = 0.78, y = 1},
|
||||
alignment = {x = 1, y = 1},
|
||||
scale = {x = 370, y = 112},
|
||||
text = "i3_bg.png",
|
||||
z_index = 0xDEAD,
|
||||
},
|
||||
|
||||
book = player:hud_add {
|
||||
hud_elem_type = "image",
|
||||
position = {x = 0.79, y = 1.02},
|
||||
alignment = {x = 1, y = 1},
|
||||
scale = {x = 4, y = 4},
|
||||
text = "i3_book.png",
|
||||
z_index = 0xDEAD,
|
||||
},
|
||||
|
||||
text = player:hud_add {
|
||||
hud_elem_type = "text",
|
||||
position = {x = 0.84, y = 1.04},
|
||||
alignment = {x = 1, y = 1},
|
||||
number = 0xffffff,
|
||||
text = "",
|
||||
z_index = 0xDEAD,
|
||||
style = 1,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
local function show_hud_success(player, data)
|
||||
-- It'd better to have an engine function `hud_move` to only need
|
||||
-- 2 calls for the notification's back and forth.
|
||||
|
||||
local hud_info_bg = player:hud_get(data.hud.bg)
|
||||
local dt = 0.016
|
||||
|
||||
if hud_info_bg.position.y <= 0.9 then
|
||||
data.show_hud = false
|
||||
data.hud_timer = (data.hud_timer or 0) + dt
|
||||
end
|
||||
|
||||
if data.show_hud then
|
||||
for _, def in pairs(data.hud) do
|
||||
local hud_info = player:hud_get(def)
|
||||
|
||||
player:hud_change(def, "position", {
|
||||
x = hud_info.position.x,
|
||||
y = hud_info.position.y - (dt / 5)
|
||||
})
|
||||
end
|
||||
|
||||
player:hud_change(data.hud.text, "text",
|
||||
fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or ""))
|
||||
|
||||
elseif data.show_hud == false then
|
||||
if data.hud_timer >= HUD_TIMER_MAX then
|
||||
for _, def in pairs(data.hud) do
|
||||
local hud_info = player:hud_get(def)
|
||||
|
||||
player:hud_change(def, "position", {
|
||||
x = hud_info.position.x,
|
||||
y = hud_info.position.y + (dt / 5)
|
||||
})
|
||||
end
|
||||
|
||||
if hud_info_bg.position.y >= 1 then
|
||||
data.show_hud = nil
|
||||
data.hud_timer = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Workaround. Need an engine call to detect when the contents of
|
||||
-- the player inventory changed, instead.
|
||||
local function poll_new_items()
|
||||
local players = core.get_connected_players()
|
||||
local function poll_new_items(player, data, join)
|
||||
local inv_items = get_inv_items(player)
|
||||
local diff = array_diff(inv_items, data.inv_items)
|
||||
|
||||
for i = 1, #players do
|
||||
local player = players[i]
|
||||
local name = player:get_player_name()
|
||||
local data = i3.data[name]
|
||||
if not data then return end
|
||||
if join or #diff > 0 then
|
||||
data.inv_items = table_merge(diff, data.inv_items)
|
||||
local oldknown = data.known_recipes or 0
|
||||
local items = get_filtered_items(player, data)
|
||||
data.discovered = data.known_recipes - oldknown
|
||||
|
||||
local inv_items = get_inv_items(player)
|
||||
local diff = array_diff(inv_items, data.inv_items)
|
||||
|
||||
if #diff > 0 then
|
||||
data.inv_items = table_merge(diff, data.inv_items)
|
||||
local oldknown = data.known_recipes or 0
|
||||
local items = get_filtered_items(player, data)
|
||||
data.discovered = data.known_recipes - oldknown
|
||||
|
||||
if data.show_hud == nil and data.discovered > 0 then
|
||||
data.show_hud = true
|
||||
end
|
||||
|
||||
data.items_raw = items
|
||||
data.itab = 1
|
||||
|
||||
search(data)
|
||||
set_fs(player)
|
||||
if data.discovered > 0 then
|
||||
local msg = fmt("%u new recipe%s unlocked!", data.discovered, data.discovered > 1 and "s" or "")
|
||||
hud_notif(data.player_name, msg, "i3_book.png")
|
||||
end
|
||||
|
||||
data.items_raw = items
|
||||
data.itab = 1
|
||||
|
||||
search(data)
|
||||
set_fs(player)
|
||||
end
|
||||
|
||||
core.after(POLL_FREQ, poll_new_items)
|
||||
end
|
||||
|
||||
poll_new_items()
|
||||
|
||||
if singleplayer then
|
||||
core.register_globalstep(function()
|
||||
local name = "singleplayer"
|
||||
local player = core.get_player_by_name(name)
|
||||
local data = i3.data[name]
|
||||
|
||||
if data and data.show_hud ~= nil then
|
||||
show_hud_success(player, data)
|
||||
end
|
||||
end)
|
||||
core.after(POLL_FREQ, poll_new_items, player, data)
|
||||
end
|
||||
|
||||
i3.add_recipe_filter("Default progressive filter", progressive_filter)
|
||||
@ -256,19 +149,7 @@ core.register_on_joinplayer(function(player)
|
||||
|
||||
data.inv_items = data.inv_items or {}
|
||||
data.known_recipes = data.known_recipes or 0
|
||||
data.discovered = data.discovered or 0
|
||||
|
||||
local oldknown = data.known_recipes
|
||||
local items = get_filtered_items(player, data)
|
||||
data.discovered = data.known_recipes - oldknown
|
||||
|
||||
data.items_raw = items
|
||||
search(data)
|
||||
|
||||
if singleplayer then
|
||||
init_hud(player, data)
|
||||
|
||||
if data.show_hud == nil and data.discovered > 0 then
|
||||
data.show_hud = true
|
||||
end
|
||||
end
|
||||
poll_new_items(player, data, true)
|
||||
end)
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
local PNG = {
|
||||
blank = "i3_blank.png",
|
||||
bg = "i3_bg.png",
|
||||
bg_full = "i3_bg_full.png",
|
||||
bg_content = "i3_bg_content.png",
|
||||
@ -27,18 +28,20 @@ local PNG = {
|
||||
tab_small = "i3_tab_small.png",
|
||||
tab_top = "i3_tab.png^\\[transformFY",
|
||||
furnace_anim = "i3_furnace_anim.png",
|
||||
shapeless = "i3_shapeless.png",
|
||||
bag = "i3_bag.png",
|
||||
armor = "i3_armor.png",
|
||||
awards = "i3_award.png",
|
||||
skins = "i3_skin.png",
|
||||
waypoints = "i3_waypoint.png",
|
||||
teleport = "i3_teleport.png",
|
||||
add = "i3_add.png",
|
||||
refresh = "i3_refresh.png",
|
||||
visible = "i3_visible.png^\\[brighten",
|
||||
nonvisible = "i3_non_visible.png",
|
||||
exit = "i3_exit.png",
|
||||
home = "i3_home.png",
|
||||
flag = "i3_flag.png",
|
||||
edit = "i3_edit.png",
|
||||
|
||||
cancel_hover = "i3_cancel.png^\\[brighten",
|
||||
search_hover = "i3_search.png^\\[brighten",
|
||||
@ -57,11 +60,11 @@ local PNG = {
|
||||
awards_hover = "i3_award_hover.png",
|
||||
skins_hover = "i3_skin_hover.png",
|
||||
waypoints_hover = "i3_waypoint_hover.png",
|
||||
teleport_hover = "i3_teleport.png^\\[brighten",
|
||||
add_hover = "i3_add.png^\\[brighten",
|
||||
refresh_hover = "i3_refresh.png^\\[brighten",
|
||||
exit_hover = "i3_exit.png^\\[brighten",
|
||||
home_hover = "i3_home.png^\\[brighten",
|
||||
edit_hover = "i3_edit.png^\\[brighten",
|
||||
}
|
||||
|
||||
local styles = string.format([[
|
||||
@ -83,6 +86,7 @@ local styles = string.format([[
|
||||
style[prev_usage;fgimg=%s;fgimg_hovered=%s]
|
||||
style[next_usage;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]
|
||||
style[craft_rcp,craft_usg;noclip=true;font_size=16;sound=i3_craft;
|
||||
bgimg=i3_btn9.png;bgimg_hovered=i3_btn9_hovered.png;
|
||||
@ -102,7 +106,8 @@ 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.add, PNG.add_hover,
|
||||
PNG.edit, PNG.edit_hover)
|
||||
|
||||
local fs_elements = {
|
||||
label = "label[%f,%f;%s]",
|
||||
|
||||
@ -38,6 +38,24 @@ i3.register_craft({
|
||||
items = {"default:copper_ingot 7, default:tin_ingot, default:steel_ingot 2"},
|
||||
})
|
||||
|
||||
i3.register_craft {
|
||||
result = "default:tree",
|
||||
items = {
|
||||
"default:wood",
|
||||
"",
|
||||
"default:wood"
|
||||
},
|
||||
}
|
||||
|
||||
i3.register_craft {
|
||||
result = "default:cobble 16",
|
||||
items = {
|
||||
"default:stone, default:stone",
|
||||
"default:stone, , default:stone",
|
||||
", default:stone, default:stone",
|
||||
}
|
||||
}
|
||||
|
||||
i3.register_craft({
|
||||
grid = {
|
||||
"X",
|
||||
@ -311,22 +329,3 @@ i3.register_craft({
|
||||
},
|
||||
result = "default:mese 3",
|
||||
})
|
||||
|
||||
i3.register_craft({
|
||||
grid = {
|
||||
"X #",
|
||||
" ## ",
|
||||
"X#X#",
|
||||
"#X#X#",
|
||||
"X X##X#X",
|
||||
" ## ",
|
||||
"#X#X#",
|
||||
"#X#X#",
|
||||
"X #",
|
||||
},
|
||||
key = {
|
||||
['#'] = "default:wood",
|
||||
['X'] = "default:glass",
|
||||
},
|
||||
result = "default:mese 3",
|
||||
})
|
||||
|
||||
26
tests/test_operators.lua
Normal file
26
tests/test_operators.lua
Normal file
@ -0,0 +1,26 @@
|
||||
local a, b, c = 0, 0, 0
|
||||
b+=1
|
||||
c++; local foo = "bar";
|
||||
local t = {
|
||||
a = a++,
|
||||
b = 2,
|
||||
c = c+=2,
|
||||
d = a&3,
|
||||
e = 1,
|
||||
}
|
||||
t["b"] <<= 4
|
||||
t.b >>= 2
|
||||
assert(t.b == 8)
|
||||
--print(dump(t))
|
||||
--c += 1
|
||||
c*=2
|
||||
local i = 16
|
||||
i += i<<4
|
||||
assert(i == 272)
|
||||
assert((a+=2) == 2)
|
||||
assert(c++ == 3)
|
||||
assert((a-=1) == -1)
|
||||
assert((c^=4) == 16)
|
||||
assert((a&b) == 0)
|
||||
assert((c|=a) == 2)
|
||||
assert((1<<8) == 256)
|
||||
BIN
textures/i3_edit.png
Normal file
BIN
textures/i3_edit.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 749 B |
BIN
textures/i3_flag.png
Normal file
BIN
textures/i3_flag.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 745 B |
Binary file not shown.
|
Before Width: | Height: | Size: 864 B |
130
util/luacheck.lua
Executable file
130
util/luacheck.lua
Executable file
@ -0,0 +1,130 @@
|
||||
local exec = os.execute
|
||||
local fmt, find, sub = string.format, string.find, string.sub
|
||||
local var = "[%w%.%[%]\"\'_]"
|
||||
|
||||
exec "clear"
|
||||
|
||||
local function split(str, delim, include_empty, max_splits, sep_is_pattern)
|
||||
delim = delim or ","
|
||||
max_splits = max_splits or -2
|
||||
local items = {}
|
||||
local pos, len = 1, #str
|
||||
local plain = not sep_is_pattern
|
||||
max_splits = max_splits + 1
|
||||
repeat
|
||||
local np, npe = find(str, delim, pos, plain)
|
||||
np, npe = (np or (len+1)), (npe or (len+1))
|
||||
if (not np) or (max_splits == 1) then
|
||||
np = len + 1
|
||||
npe = np
|
||||
end
|
||||
local s = sub(str, pos, np - 1)
|
||||
if include_empty or (s ~= "") then
|
||||
max_splits = max_splits - 1
|
||||
items[#items + 1] = s
|
||||
end
|
||||
pos = npe + 1
|
||||
until (max_splits == 0) or (pos > (len + 1))
|
||||
return items
|
||||
end
|
||||
|
||||
local files = {
|
||||
"api",
|
||||
"bags",
|
||||
"caches",
|
||||
"callbacks",
|
||||
"common",
|
||||
"compress",
|
||||
"detached_inv",
|
||||
"fields",
|
||||
"groups",
|
||||
"gui",
|
||||
"hud",
|
||||
"model_aliases",
|
||||
"progressive",
|
||||
"styles",
|
||||
}
|
||||
|
||||
local operators = {
|
||||
["([%+%-%*%^/&|])="] = function(a, b, c)
|
||||
return fmt("%s = %s %s %s", a, a, b, c)
|
||||
end,
|
||||
|
||||
["+%+"] = function(a, b)
|
||||
return fmt("%s = %s + 1\n%s", a, a, b)
|
||||
end,
|
||||
|
||||
["&"] = function(a, b)
|
||||
return fmt("bit.band(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["|"] = function(a, b)
|
||||
return fmt("bit.bor(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["<<"] = function(a, b)
|
||||
return fmt("bit.lshift(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
[">>"] = function(a, b)
|
||||
return fmt("bit.rshift(%s, %s)", a, b)
|
||||
end,
|
||||
|
||||
["<<="] = function(a, b)
|
||||
return fmt("%s = bit.lshift(%s, %s)", a, a, b)
|
||||
end,
|
||||
|
||||
[">>="] = function(a, b)
|
||||
return fmt("%s = bit.rshift(%s, %s)", a, a, b)
|
||||
end,
|
||||
}
|
||||
|
||||
local function compile(data)
|
||||
data = data:gsub("IMPORT%((.-)%)", function(a)
|
||||
return "local " .. a:gsub("\"", "") .. " = i3.get(" .. a .. ")"
|
||||
end)
|
||||
|
||||
for op, func in pairs(operators) do
|
||||
data = data:gsub("(" .. var .. "+)%s?" .. op .. "%s?(" .. var .. "*)", func)
|
||||
end
|
||||
|
||||
return data
|
||||
end
|
||||
|
||||
for _, p in ipairs(files) do
|
||||
local function _load(path, line, data, t)
|
||||
if line then
|
||||
if not t then
|
||||
t = split(data, "\n")
|
||||
end
|
||||
t[line] = t[line]:gsub("(" .. var .. "+)%s?=%s?(" .. var .. "*)", "%2")
|
||||
data = table.concat(t, "\n")
|
||||
else
|
||||
local file = assert(io.open(path, "r"))
|
||||
data = file:read"*a"
|
||||
file:close()
|
||||
data = compile(data)
|
||||
end
|
||||
|
||||
local l, err = loadstring(data)
|
||||
|
||||
if not l then
|
||||
local err_line = tonumber(err:match(":(%d+):"))
|
||||
|
||||
if line ~= err_line then
|
||||
return _load(path, err_line, data, t)
|
||||
end
|
||||
end
|
||||
|
||||
local _file = io.open(path:match("(.*)%.") .. ".l", "w")
|
||||
_file:write(data)
|
||||
_file:close()
|
||||
end
|
||||
|
||||
_load("../src/" .. p .. ".lua")
|
||||
end
|
||||
|
||||
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