diff --git a/mods/API/Api/init.lua b/mods/API/Api/init.lua new file mode 100644 index 0000000..817b55b --- /dev/null +++ b/mods/API/Api/init.lua @@ -0,0 +1,4 @@ +local modInfo = Mod.getInfo('smc__api__api') +local require = modInfo.require + +require('Api') \ No newline at end of file diff --git a/mods/API/ApiLoader/mod.conf b/mods/API/Api/mod.conf similarity index 89% rename from mods/API/ApiLoader/mod.conf rename to mods/API/Api/mod.conf index bc23b9f..30fb5c0 100644 --- a/mods/API/ApiLoader/mod.conf +++ b/mods/API/Api/mod.conf @@ -1,3 +1,3 @@ -name = smc__api__api_loader +name = smc__api__api description = Include this mod in your `depends` to ensure all necessary APIs are loaded for your mod depends = smc__api__ensure, smc__api__math, smc__api__mod, smc__api__require, smc__api__table, smc__api__string, smc__api__utf8, smc__api__class diff --git a/mods/API/ApiLoader/src/Api.lua b/mods/API/Api/src/Api.lua similarity index 57% rename from mods/API/ApiLoader/src/Api.lua rename to mods/API/Api/src/Api.lua index ec56362..877d0a8 100644 --- a/mods/API/ApiLoader/src/Api.lua +++ b/mods/API/Api/src/Api.lua @@ -1,6 +1,6 @@ Api = {} -local modInfo = Mod.getInfo('smc__api__api_loader') +local modInfo = Mod.getInfo('smc__api__api') local require = modInfo.require require('Api.globalStep') diff --git a/mods/API/ApiLoader/src/Api/globalStep.lua b/mods/API/Api/src/Api/globalStep.lua similarity index 100% rename from mods/API/ApiLoader/src/Api/globalStep.lua rename to mods/API/Api/src/Api/globalStep.lua diff --git a/mods/API/ApiLoader/init.lua b/mods/API/ApiLoader/init.lua deleted file mode 100644 index 538706a..0000000 --- a/mods/API/ApiLoader/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -local modInfo = Mod.getInfo('smc__api__api_loader') -local require = modInfo.require - -require('Api') \ No newline at end of file diff --git a/mods/CORE/Control/mod.conf b/mods/CORE/Control/mod.conf index 885c8da..73739ee 100644 --- a/mods/CORE/Control/mod.conf +++ b/mods/CORE/Control/mod.conf @@ -1,2 +1,2 @@ name = smc__core__control -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/CraftSystem/mod.conf b/mods/CORE/CraftSystem/mod.conf index 5bb9aee..5eec03e 100644 --- a/mods/CORE/CraftSystem/mod.conf +++ b/mods/CORE/CraftSystem/mod.conf @@ -1,2 +1,2 @@ name = smc__core__craft_system -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/Formspec/mod.conf b/mods/CORE/Formspec/mod.conf index 8b0b9ae..76fdfde 100644 --- a/mods/CORE/Formspec/mod.conf +++ b/mods/CORE/Formspec/mod.conf @@ -1,2 +1,2 @@ name = smc__core__formspec -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/Item/mod.conf b/mods/CORE/Item/mod.conf index 8419ee5..14e252e 100644 --- a/mods/CORE/Item/mod.conf +++ b/mods/CORE/Item/mod.conf @@ -1,2 +1,2 @@ name = smc__core__item -depends = smc__api__api_loader, smc__core__item_factory +depends = smc__api__api, smc__core__item_factory diff --git a/mods/CORE/ItemFactory/mod.conf b/mods/CORE/ItemFactory/mod.conf index 81a0c8d..48d8d36 100644 --- a/mods/CORE/ItemFactory/mod.conf +++ b/mods/CORE/ItemFactory/mod.conf @@ -1,2 +1,2 @@ name = smc__core__item_factory -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/MapGen/mod.conf b/mods/CORE/MapGen/mod.conf index b54774d..780bd88 100644 --- a/mods/CORE/MapGen/mod.conf +++ b/mods/CORE/MapGen/mod.conf @@ -1,2 +1,2 @@ name = smc__core__map_gen -depends = smc__api__api_loader \ No newline at end of file +depends = smc__api__api \ No newline at end of file diff --git a/mods/CORE/Player/mod.conf b/mods/CORE/Player/mod.conf index 3ce3ec8..8224e5b 100644 --- a/mods/CORE/Player/mod.conf +++ b/mods/CORE/Player/mod.conf @@ -1,2 +1,2 @@ name = smc__core__player -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/Sound/mod.conf b/mods/CORE/Sound/mod.conf index c2e6bcc..f1d4c78 100644 --- a/mods/CORE/Sound/mod.conf +++ b/mods/CORE/Sound/mod.conf @@ -1,2 +1,2 @@ name = smc__core__sound -depends = smc__api__api_loader \ No newline at end of file +depends = smc__api__api \ No newline at end of file diff --git a/mods/CORE/TileSheet/mod.conf b/mods/CORE/TileSheet/mod.conf index 59bc1ed..2174d99 100644 --- a/mods/CORE/TileSheet/mod.conf +++ b/mods/CORE/TileSheet/mod.conf @@ -1,2 +1,2 @@ name = smc__core__tilesheet -depends = smc__api__api_loader +depends = smc__api__api diff --git a/mods/CORE/adminCommands/mod.conf b/mods/CORE/adminCommands/mod.conf index 4bccec4..cf6f1ee 100644 --- a/mods/CORE/adminCommands/mod.conf +++ b/mods/CORE/adminCommands/mod.conf @@ -1,2 +1,2 @@ name = smc__core__admin_commands -depends = smc__api__api_loader, smc__core__formspec, smc__core__item +depends = smc__api__api, smc__core__formspec, smc__core__item diff --git a/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua b/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua index 71f6d26..7a447b2 100644 --- a/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua +++ b/mods/ENVIRONMENT/mapGenerator/src/asyncInit.lua @@ -36,7 +36,7 @@ dofile(core.get_modpath('smc__api__table')..'/init.lua') -- TODO: пока что закоментировано, поскольку вызывает ошибку из-за global_step -- Api loader --- dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') +-- dofile(core.get_modpath('smc__api__api')..'/init.lua') ---@type MapGen local mapGenerator = dofile(core.get_modpath('smc__core__map_generator')..'/src/mapGenerator.lua')