From caa6a40714ecc5f73ea15642b178dd0cd058ae18 Mon Sep 17 00:00:00 2001 From: Olivier Dragon Date: Thu, 7 Apr 2022 20:53:13 -0400 Subject: [PATCH] Disable mtg_craftguide if found --- .luacheckrc | 3 +-- craftguide.lua | 3 +++ sfinv.lua | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 8d0516e..2fd05f4 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -4,6 +4,7 @@ allow_defined_top = true globals = { "sfcg", "doc", + "sfinv", } read_globals = { @@ -26,8 +27,6 @@ read_globals = { "vector", - "sfinv", - table = { fields = { "copy", diff --git a/craftguide.lua b/craftguide.lua index 234b40d..6f5c3c6 100644 --- a/craftguide.lua +++ b/craftguide.lua @@ -311,6 +311,7 @@ end minetest.register_on_mods_loaded(function() + local recipes_cache = sfcg.recipes_cache local usages_cache = sfcg.usages_cache local init_items = sfcg.init_items @@ -325,12 +326,14 @@ minetest.register_on_mods_loaded(function() end end end + for name, def in pairs(minetest.registered_items) do if recipes_cache[name] or usages_cache[name] then table.insert(init_items, name) end end table.sort(init_items) + end) diff --git a/sfinv.lua b/sfinv.lua index 976bb08..078a3e1 100644 --- a/sfinv.lua +++ b/sfinv.lua @@ -148,4 +148,17 @@ sfinv.register_page("sfcraftguide:craftguide", { sfinv.set_player_inventory_formspec(player) end end -}) \ No newline at end of file +}) + + +minetest.register_on_mods_loaded(function() + + sfinv.pages["mtg_craftguide:craftguide"] = nil + for idx = #sfinv.pages_unordered, 1, -1 do + local page = sfinv.pages_unordered[idx] + if page.name == "mtg_craftguide:craftguide" then + table.remove(sfinv.pages_unordered, idx) + end + end + +end) \ No newline at end of file