From 2fa93b219eadfcdcf8f1d472aad046fc62d5b99d Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 3 Aug 2018 09:31:05 -0400 Subject: update castles, cottages, digistuff, gloopblocks, locks, maptools, mesecons, pipeworks, technic, unified inventory, unified dyes, and xban2 --- unified_inventory/init.lua | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'unified_inventory/init.lua') diff --git a/unified_inventory/init.lua b/unified_inventory/init.lua index 6929600..1c73fad 100644 --- a/unified_inventory/init.lua +++ b/unified_inventory/init.lua @@ -1,16 +1,10 @@ --- Unified Inventory for Minetest 0.4.8+ +-- Unified Inventory for Minetest >= 0.4.16 local modpath = minetest.get_modpath(minetest.get_current_modname()) local worldpath = minetest.get_worldpath() -local mygettext -if rawget(_G, "intllib") then - mygettext = intllib.Getter() -else - function mygettext(s, ...) - local t = { ... } - return (s:gsub("@(%d+)", function(n) return t[tonumber(n)] end)) - end -end + +-- Intllib +local S, NS = dofile(modpath .. "/intllib.lua") -- Data tables definitions unified_inventory = { @@ -40,14 +34,13 @@ unified_inventory = { default = "craft", -- intllib - gettext = mygettext, - fgettext = function(...) return minetest.formspec_escape(mygettext(...)) end, + gettext = S, -- "Lite" mode - lite_mode = minetest.setting_getbool("unified_inventory_lite"), - + lite_mode = minetest.settings:get_bool("unified_inventory_lite"), + -- Trash enabled - trash_enabled = (minetest.setting_getbool("unified_inventory_trash") ~= false), + trash_enabled = (minetest.settings:get_bool("unified_inventory_trash") ~= false), pagecols = 8, pagerows = 10, @@ -80,7 +73,7 @@ dofile(modpath.."/internal.lua") dofile(modpath.."/callbacks.lua") dofile(modpath.."/register.lua") -if minetest.setting_getbool("unified_inventory_bags") ~= false then +if minetest.settings:get_bool("unified_inventory_bags") ~= false then dofile(modpath.."/bags.lua") end -- cgit v1.2.3