From 0ab3dd5ffa4a18d8b1e104c33c4c19adc0f172a6 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Sun, 4 Jul 2021 18:19:49 +0200 Subject: [PATCH 1/6] Fix item compression setting (fix #27) --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 6ad7cc0..8060036 100644 --- a/init.lua +++ b/init.lua @@ -21,7 +21,7 @@ local compress_groups, compressed = loadfile(modpath .. "/etc/compress.lua")() local group_stereotypes, group_names = loadfile(modpath .. "/etc/groups.lua")() local progressive_mode = core.settings:get_bool "i3_progressive_mode" -local item_compression = core.settings:get_bool "i3_item_compression" +local item_compression = core.settings:get_bool("i3_item_compression", true) local damage_enabled = core.settings:get_bool "enable_damage" local __3darmor, __skinsdb, __awards From 4ca50e846db77c286b370c5b5962f7b673815ecd Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Mon, 5 Jul 2021 03:21:04 +0200 Subject: [PATCH 2/6] Fix potential issue with progressive mode --- init.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 8060036..1b6a8d3 100644 --- a/init.lua +++ b/init.lua @@ -3273,6 +3273,7 @@ if progressive_mode then local player = players[i] local name = player:get_player_name() local data = pdata[name] + if not data then return end local inv_items = get_inv_items(player) local diff = array_diff(inv_items, data.inv_items) @@ -3308,7 +3309,7 @@ if progressive_mode then local name = player:get_player_name() local data = pdata[name] - if data.show_hud ~= nil and singleplayer then + if data and data.show_hud ~= nil and singleplayer then show_hud_success(player, data) end end @@ -3319,6 +3320,7 @@ if progressive_mode then core.register_on_joinplayer(function(player) local name = player:get_player_name() local data = pdata[name] + if not data then return end data.inv_items = data.inv_items or {} data.known_recipes = data.known_recipes or 0 From 970220c561d6a1c1adbbdffb9456a237ac83d028 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Mon, 5 Jul 2021 03:32:31 +0200 Subject: [PATCH 3/6] Add .editorconfig --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..89dddff --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +[*] +end_of_line = lf + +[*.{lua,txt,md,json}] +charset = utf8 +indent_size = 8 +indent_style = tab +insert_final_newline = true +trim_trailing_whitespace = true From 1c4ae1df28373d1e15044a8d003ced2e70d98fb5 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Mon, 5 Jul 2021 22:40:31 +0200 Subject: [PATCH 4/6] Outdated clients are now kicked ruthlessly without fallback --- init.lua | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/init.lua b/init.lua index 1b6a8d3..8d6c265 100644 --- a/init.lua +++ b/init.lua @@ -25,8 +25,6 @@ local item_compression = core.settings:get_bool("i3_item_compression", true) local damage_enabled = core.settings:get_bool "enable_damage" local __3darmor, __skinsdb, __awards -local __sfinv, old_sfinv_fn -local __unified_inventory, old_unified_inventory_fn local http = core.request_http_api() local singleplayer = core.is_singleplayer() @@ -107,11 +105,11 @@ local function get_formspec_version(info) end local function outdated(name) - local fs = sprintf("size[5.8,1.3]image[0,0;1,1;%s]label[1,0;%s]button_exit[2.4,0.8;1,1;;OK]", + local fs = sprintf("size[6.3,1.3]image[0,0;1,1;%s]label[1,0;%s]button_exit[2.6,0.8;1,1;;OK]", PNG.book, - "Your Minetest client is outdated.\nGet the latest version on minetest.net to use i3") + "Your Minetest client is outdated.\nGet the latest version on minetest.net to play the game.") - core.show_formspec(name, "i3", fs) + core.show_formspec(name, "i3_outdated", fs) end local old_is_creative_enabled = core.is_creative_enabled @@ -2518,7 +2516,7 @@ local function get_inventory_fs(player, data, fs) fs("scroll_container_end[]") local btn = { - {"trash", ES"Trash all items"}, + {"trash", ES"Clear inventory"}, {"sort_az", ES"Sort items (A-Z)"}, {"sort_za", ES"Sort items (Z-A)"}, {"compress", ES"Compress items"}, @@ -2887,18 +2885,12 @@ end core.register_on_mods_loaded(function() get_init_items() - __sfinv = rawget(_G, "sfinv") - - if __sfinv then - old_sfinv_fn = sfinv.set_player_inventory_formspec + if rawget(_G, "sfinv") then function sfinv.set_player_inventory_formspec() return end sfinv.enabled = false end - __unified_inventory = rawget(_G, "unified_inventory") - - if __unified_inventory then - old_unified_inventory_fn = unified_inventory.set_inventory_formspec + if rawget(_G, "unified_inventory") then function unified_inventory.set_inventory_formspec() return end end end) @@ -2978,21 +2970,7 @@ core.register_on_joinplayer(function(player) local info = core.get_player_information and core.get_player_information(name) if not info or get_formspec_version(info) < MIN_FORMSPEC_VERSION then - if __sfinv then - sfinv.set_player_inventory_formspec = old_sfinv_fn - sfinv.enabled = true - end - - if __unified_inventory then - unified_inventory.set_inventory_formspec = old_unified_inventory_fn - - if __sfinv then - sfinv.enabled = false - end - end - pdata[name] = nil - return outdated(name) end @@ -3061,11 +3039,14 @@ end after(SAVE_INTERVAL, routine) core.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "" then + local name = player:get_player_name() + + if formname == "i3_outdated" then + return false, core.kick_player(name, "Come back when your client is up-to-date.") + elseif formname ~= "" then return false end - local name = player:get_player_name() local data = pdata[name] if not data then return end From 5c96ede065644c2cc8762b34955e078b10f5fc8c Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Mon, 5 Jul 2021 23:38:43 +0200 Subject: [PATCH 5/6] Add confirmation dialog on inventory clearing --- etc/styles.lua | 3 +++ init.lua | 54 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/etc/styles.lua b/etc/styles.lua index da91599..fd3fa10 100644 --- a/etc/styles.lua +++ b/etc/styles.lua @@ -84,6 +84,9 @@ local styles = fmt([[ style[craft_rcp,craft_usg;noclip=true;font_size=16;sound=i3_craft; bgimg=i3_btn9.png;bgimg_hovered=i3_btn9_hovered.png; bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6] + style[confirm_trash_yes,confirm_trash_no;noclip=true;font_size=16; + bgimg=i3_btn9.png;bgimg_hovered=i3_btn9_hovered.png; + bgimg_pressed=i3_btn9_pressed.png;bgimg_middle=4,6] ]], PNG.slot, PNG.exit, PNG.exit_hover, diff --git a/init.lua b/init.lua index 8d6c265..fe74c68 100644 --- a/init.lua +++ b/init.lua @@ -2301,20 +2301,21 @@ local function init_data(player, info) 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.items = data.items_raw + 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.items = data.items_raw if data.current_itab > 1 then sort_by_category(data) @@ -2531,6 +2532,18 @@ local function get_inventory_fs(player, data, fs) fs("image_button", i + 3.447 - (i * 0.4), 11.43, 0.35, 0.35, "", btn_name, "") fs(fmt("tooltip[%s;%s]", btn_name, tooltip)) end + + if data.confirm_trash then + fs("style_type[box;colors=#999,#999,#808080,#808080]") + + for _ = 1, 3 do + fs("box", 2.95, 10.75, 4.35, 0.5, "") + end + + fs("label", 3.1, 11, "Confirm trash?") + fs("image_button", 5.2, 10.75, 1, 0.5, "", "confirm_trash_yes", "Yes") + fs("image_button", 6.3, 10.75, 1, 0.5, "", "confirm_trash_no", "No") + end end i3.new_tab { @@ -2602,9 +2615,16 @@ i3.new_tab { end if fields.trash then - local inv = player:get_inventory() - inv:set_list("main", {}) - inv:set_list("craft", {}) + data.confirm_trash = true + + elseif fields.confirm_trash_yes or fields.confirm_trash_no then + if fields.confirm_trash_yes then + local inv = player:get_inventory() + inv:set_list("main", {}) + inv:set_list("craft", {}) + end + + data.confirm_trash = nil elseif fields.compress then compress_items(player) From f2cc874ec006e57281a391dad7dcd96900660e15 Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Tue, 6 Jul 2021 01:38:16 +0200 Subject: [PATCH 6/6] Some tweakings --- init.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index fe74c68..e1c7f39 100644 --- a/init.lua +++ b/init.lua @@ -2130,18 +2130,26 @@ local function get_tabs_fs(player, data, fs, full_height) end local function get_debug_grid(data, fs, full_height) - local spacing = 0.2 + 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 end + i = 61 + 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 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]") end local function make_fs(player, data) @@ -2537,12 +2545,12 @@ local function get_inventory_fs(player, data, fs) fs("style_type[box;colors=#999,#999,#808080,#808080]") for _ = 1, 3 do - fs("box", 2.95, 10.75, 4.35, 0.5, "") + fs("box", 2.97, 10.75, 4.3, 0.5, "") end - fs("label", 3.1, 11, "Confirm trash?") - fs("image_button", 5.2, 10.75, 1, 0.5, "", "confirm_trash_yes", "Yes") - fs("image_button", 6.3, 10.75, 1, 0.5, "", "confirm_trash_no", "No") + fs("label", 3.12, 11, "Confirm trash?") + fs("image_button", 5.17, 10.75, 1, 0.5, "", "confirm_trash_yes", "Yes") + fs("image_button", 6.27, 10.75, 1, 0.5, "", "confirm_trash_no", "No") end end