Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pkgmgr handle modpacks containing modpacks properly 

fixes #10550
master
Elias Fleckenstein 2021-03-01 12:13:47 +01:00 committed by GitHub
parent ccdaf5de54
commit c401a06f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builtin/mainmenu/pkgmgr.lua
View File

@ -413,18 +413,7 @@ function pkgmgr.is_modpack_entirely_enabled(data, name)
end end
---------- toggles or en/disables a mod or modpack and its dependencies -------- ---------- toggles or en/disables a mod or modpack and its dependencies --------
function pkgmgr.enable_mod(this, toset) local function toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, mod)
local list = this.data.list:get_list()
local mod = list[this.data.selected_mod]
-- Game mods can't be enabled or disabled
if mod.is_game_content then
return
end
local toggled_mods = {}
local enabled_mods = {}
if not mod.is_modpack then if not mod.is_modpack then
-- Toggle or en/disable the mod -- Toggle or en/disable the mod
if toset == nil then if toset == nil then
@ -443,19 +432,25 @@ function pkgmgr.enable_mod(this, toset)
-- interleaved unsupported -- interleaved unsupported
for i = 1, #list do for i = 1, #list do
if list[i].modpack == mod.name then if list[i].modpack == mod.name then
if toset == nil then toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, list[i])
toset = not list[i].enabled
end
if list[i].enabled ~= toset then
list[i].enabled = toset
toggled_mods[#toggled_mods+1] = list[i].name
end
if toset then
enabled_mods[list[i].name] = true
end end
end end
end end
end
function pkgmgr.enable_mod(this, toset)
local list = this.data.list:get_list()
local mod = list[this.data.selected_mod]
-- Game mods can't be enabled or disabled
if mod.is_game_content then
return
end end
local toggled_mods = {}
local enabled_mods = {}
toggle_mod_or_modpack(list, toggled_mods, enabled_mods, toset, mod)
if not toset then if not toset then
-- Mod(s) were disabled, so no dependencies need to be enabled -- Mod(s) were disabled, so no dependencies need to be enabled
table.sort(toggled_mods) table.sort(toggled_mods)