From e1f07e048dec63ac3cd26f45bf9945de373ad45b Mon Sep 17 00:00:00 2001 From: HybridDog Date: Mon, 22 Dec 2025 12:59:24 +0100 Subject: [PATCH] Fix timegate's dependency on utils The addition of dependencies in commit 52fc535d26bf9a6890492f2bf07e023 was incomplete, so loading the moremesecons_timegate mod can fail. This change adds the moremesecons_utils dependency to those mods which require the moremesecons table as reported by luacheck. I've also made .luacheckrc more strict so that it sets globals per mod and allows reading the moremesecons table only in mods which also have the moremesecons_utils dependency. --- .luacheckrc | 14 +++++++++++--- moremesecons_luacontroller_tool/mod.conf | 2 +- moremesecons_timegate/mod.conf | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 7433251..b25cad6 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,9 +1,17 @@ read_globals = { - -- Defined by Minetest + -- Defined by Luanti "minetest", "vector", "PseudoRandom", "VoxelArea", "table", "ItemStack", -- Mods - "digiline", "default", "creative", + "digiline", "default", "creative", "mesecon" } -globals = {"moremesecons", "mesecon"} +files.moremesecons_utils = {globals = {"moremesecons"}} +local utils_depender = {"adjustable_blinkyplant", "adjustable_player_detector", + "commandblock", "entity_detector", "jammer", "luablock", "playerkiller", + "sayer", "teleporter", "timegate", "wireless"} +for _, folder_suffix in ipairs(utils_depender) do + files["moremesecons_" .. folder_suffix] = {read_globals = {"moremesecons"}} +end +files.moremesecons_jammer.globals = {"mesecon"} + ignore = {"212", "631", "422", "432"} diff --git a/moremesecons_luacontroller_tool/mod.conf b/moremesecons_luacontroller_tool/mod.conf index 3cac5a5..7b66258 100644 --- a/moremesecons_luacontroller_tool/mod.conf +++ b/moremesecons_luacontroller_tool/mod.conf @@ -1,2 +1,2 @@ name = moremesecons_luacontroller_tool -depends = mesecons,mesecons_luacontroller,moremesecons_utils +depends = mesecons,mesecons_luacontroller diff --git a/moremesecons_timegate/mod.conf b/moremesecons_timegate/mod.conf index d916d20..fcc3cc1 100644 --- a/moremesecons_timegate/mod.conf +++ b/moremesecons_timegate/mod.conf @@ -1,3 +1,3 @@ name = moremesecons_timegate -depends = mesecons,default +depends = mesecons,moremesecons_utils,default optional_depends = craft_guide