jadedctrl/ minetest-i4
1
0
Disbranĉigi 0
Fontkodo Issues Tirpetoj Actions Packages Projects Eldonoj Wiki Activity

*Really* disable sfinv

This commit is contained in:
Jean-Patrick Guerrero 2021-05-07 03:16:11 +02:00
parent 8d55d89efe
commit 9ab92ba056
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.luacheckrc
View File

@ -6,7 +6,6 @@ ignore = {
read_globals = { read_globals = {
"minetest", "minetest",
"default",
"armor", "armor",
"skins", "skins",
"awards", "awards",
@ -19,4 +18,6 @@ read_globals = {
globals = { globals = {
"i3", "i3",
"core", "core",
"sfinv",
"unified_inventory",
} }

20
init.lua
View File

@ -16,7 +16,8 @@ local progressive_mode = core.settings:get_bool "i3_progressive_mode"
local damage_enabled = core.settings:get_bool "enable_damage" local damage_enabled = core.settings:get_bool "enable_damage"
local __3darmor, __skinsdb, __awards local __3darmor, __skinsdb, __awards
local sfinv, unified_inventory, old_unified_inventory_fn local __sfinv, old_sfinv_fn
local __unified_inventory, old_unified_inventory_fn
local http = core.request_http_api() local http = core.request_http_api()
local singleplayer = core.is_singleplayer() local singleplayer = core.is_singleplayer()
@ -2948,15 +2949,17 @@ end
on_mods_loaded(function() on_mods_loaded(function()
get_init_items() get_init_items()
sfinv = rawget(_G, "sfinv") __sfinv = rawget(_G, "sfinv")
if sfinv then if __sfinv then
old_sfinv_fn = sfinv.set_player_inventory_formspec
function sfinv.set_player_inventory_formspec() return end
sfinv.enabled = false sfinv.enabled = false
end end
unified_inventory = rawget(_G, "unified_inventory") __unified_inventory = rawget(_G, "unified_inventory")
if unified_inventory then if __unified_inventory then
old_unified_inventory_fn = unified_inventory.set_inventory_formspec old_unified_inventory_fn = unified_inventory.set_inventory_formspec
function unified_inventory.set_inventory_formspec() return end function unified_inventory.set_inventory_formspec() return end
end end
@ -3038,14 +3041,15 @@ on_joinplayer(function(player)
local info = get_player_info(name) local info = get_player_info(name)
if get_formspec_version(info) < MIN_FORMSPEC_VERSION then if get_formspec_version(info) < MIN_FORMSPEC_VERSION then
if sfinv then if __sfinv then
sfinv.set_player_inventory_formspec = old_sfinv_fn
sfinv.enabled = true sfinv.enabled = true
end end
if unified_inventory then if __unified_inventory then
unified_inventory.set_inventory_formspec = old_unified_inventory_fn unified_inventory.set_inventory_formspec = old_unified_inventory_fn
if sfinv then if __sfinv then
sfinv.enabled = false sfinv.enabled = false
end end
end end