From 57a351c465181ab45e9df45be2095b66c96367c7 Mon Sep 17 00:00:00 2001 From: kakalak-lumberJack Date: Thu, 22 Feb 2018 21:55:37 -0500 Subject: [PATCH] add support for unified inventory --- creative_areas/depends.txt | 4 +++- creative_areas/init.lua | 14 ++++++++++---- creative_areas/mod.conf | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 creative_areas/mod.conf diff --git a/creative_areas/depends.txt b/creative_areas/depends.txt index d8fc7c3..812c0e7 100644 --- a/creative_areas/depends.txt +++ b/creative_areas/depends.txt @@ -1,2 +1,4 @@ areas -creative \ No newline at end of file +creative +sfinv? +unified_inventory? \ No newline at end of file diff --git a/creative_areas/init.lua b/creative_areas/init.lua index 067d275..5345ee7 100644 --- a/creative_areas/init.lua +++ b/creative_areas/init.lua @@ -109,8 +109,11 @@ minetest.register_globalstep(function(dtime) if not minetest.check_player_privs(pname, {creative = true}) then privs.creative = true minetest.set_player_privs(pname, privs) - local context = {page = sfinv.get_homepage_name(player)}--minetest.get_inventory{{type="detached", name="creative_"..pname}}--{page = sfinv.pages["creative_"..pname]} - sfinv.set_player_inventory_formspec(player, context) + if not minetest.get_modpath("unified_inventory") then + local context = {page = sfinv.get_homepage_name(player)}--minetest.get_inventory{{type="detached", name="creative_"..pname}}--{page = sfinv.pages["creative_"..pname]} + sfinv.set_player_inventory_formspec(player, context) + end + --unified_inventory.get_formspec(player, page) local invlist = inv:get_list("main") inv:set_list("saved", invlist) local list = "" @@ -129,8 +132,11 @@ minetest.register_globalstep(function(dtime) if saved ~= nil then inv:set_list("main", saved) end - local context = {page = sfinv.get_homepage_name(player)} - sfinv.set_player_inventory_formspec(player, context) + if not minetest.get_modpath("unified_inventory") then + local context = {page = sfinv.get_homepage_name(player)} + sfinv.set_player_inventory_formspec(player, context) + end + --unified_inventory.get_formspec(player, page) minetest.chat_send_player(pname, "You have left creative area.") end end diff --git a/creative_areas/mod.conf b/creative_areas/mod.conf new file mode 100644 index 0000000..625fd66 --- /dev/null +++ b/creative_areas/mod.conf @@ -0,0 +1 @@ +name = creative_areas \ No newline at end of file