minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Tidy up dlg_config_world.lua (#5351) 

Move code to pkgmgr
mutilcraft-mt53
you 2018-05-29 18:37:51 +02:00 committed by SmallJoker
parent 75aa41c6de
commit 7f7678e4e3
2 changed files with 125 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
builtin/mainmenu/dlg_config_world.lua
View File

@ -24,159 +24,118 @@ local function modname_valid(name)
end end
local function get_formspec(data) local function get_formspec(data)
local mod = data.list:get_list()[data.selected_mod] local mod = data.list:get_list()[data.selected_mod] or {name = ""}
local retval = local retval =
"size[11.5,7.5,true]" .. "size[11.5,7.5,true]" ..
"label[0.5,0;" .. fgettext("World:") .. "]" .. "label[0.5,0;" .. fgettext("World:") .. "]" ..
"label[1.75,0;" .. data.worldspec.name .. "]" "label[1.75,0;" .. data.worldspec.name .. "]"
if mod == nil then
mod = {name=""}
end
local hard_deps, soft_deps = pkgmgr.get_dependencies(mod.path) local hard_deps, soft_deps = pkgmgr.get_dependencies(mod.path)
retval = retval .. retval = retval ..
"label[0,0.7;" .. fgettext("Mod:") .. "]" .. "label[0,0.7;" .. fgettext("Mod:") .. "]" ..
"label[0.75,0.7;" .. mod.name .. "]" .. "label[0.75,0.7;" .. mod.name .. "]" ..
"label[0,1.25;" .. fgettext("Dependencies:") .. "]" .. "label[0,1.25;" .. fgettext("Dependencies:") .. "]" ..
"textlist[0,1.75;5,2.125;world_config_depends;" .. "textlist[0,1.75;5,2.125;world_config_depends;" .. hard_deps .. ";0]" ..
hard_deps .. ";0]" ..
"label[0,3.875;" .. fgettext("Optional dependencies:") .. "]" .. "label[0,3.875;" .. fgettext("Optional dependencies:") .. "]" ..
"textlist[0,4.375;5,1.8;world_config_optdepends;" .. "textlist[0,4.375;5,1.8;world_config_optdepends;" ..
soft_deps .. ";0]" .. soft_deps .. ";0]" ..
"button[3.25,7;2.5,0.5;btn_config_world_save;" .. fgettext("Save") .. "]" .. "button[3.25,7;2.5,0.5;btn_config_world_save;" ..
"button[5.75,7;2.5,0.5;btn_config_world_cancel;" .. fgettext("Cancel") .. "]" fgettext("Save") .. "]" ..
"button[5.75,7;2.5,0.5;btn_config_world_cancel;" ..
fgettext("Cancel") .. "]"
if mod and mod.name ~= "" and not mod.is_game_content then if mod.name ~= "" and not mod.is_game_content then
if mod.is_modpack then if mod.is_modpack then
local rawlist = data.list:get_raw_list()
local all_enabled = true if pkgmgr.is_modpack_entirely_enabled(data, mod.name) then
for j = 1, #rawlist, 1 do retval = retval ..
if rawlist[j].modpack == mod.name and not rawlist[j].enabled then "button[5.5,0.125;2.5,0.5;btn_mp_disable;" ..
all_enabled = false
break
end
end
if all_enabled then
retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_disable;" ..
fgettext("Disable MP") .. "]" fgettext("Disable MP") .. "]"
else else
retval = retval .. "button[5.5,0.125;2.5,0.5;btn_mp_enable;" .. retval = retval ..
"button[5.5,0.125;2.5,0.5;btn_mp_enable;" ..
fgettext("Enable MP") .. "]" fgettext("Enable MP") .. "]"
end end
else else
if mod.enabled then retval = retval ..
retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" .. "checkbox[5.5,-0.125;cb_mod_enable;" .. fgettext("enabled") ..
fgettext("enabled") .. ";true]" ";" .. tostring(mod.enabled) .. "]"
else
retval = retval .. "checkbox[5.5,-0.125;cb_mod_enable;" ..
fgettext("enabled") .. ";false]"
end
end end
end end
if enabled_all then if enabled_all then
retval = retval .. retval = retval ..
"button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" .. fgettext("Disable all") .. "]" "button[8.75,0.125;2.5,0.5;btn_disable_all_mods;" ..
fgettext("Disable all") .. "]"
else else
retval = retval .. retval = retval ..
"button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" .. fgettext("Enable all") .. "]" "button[8.75,0.125;2.5,0.5;btn_enable_all_mods;" ..
fgettext("Enable all") .. "]"
end end
retval = retval .. return retval ..
"tablecolumns[color;tree;text]" .. "tablecolumns[color;tree;text]" ..
"table[5.5,0.75;5.75,6;world_config_modlist;" "table[5.5,0.75;5.75,6;world_config_modlist;" ..
retval = retval .. pkgmgr.render_packagelist(data.list) pkgmgr.render_packagelist(data.list) .. ";" .. data.selected_mod .."]"
retval = retval .. ";" .. data.selected_mod .."]"
return retval
end end
local function enable_mod(this, toset)
local mod = this.data.list:get_list()[this.data.selected_mod]
if mod.is_game_content then
-- game mods can't be enabled or disabled
elseif not mod.is_modpack then
if toset == nil then
mod.enabled = not mod.enabled
else
mod.enabled = toset
end
else
local list = this.data.list:get_raw_list()
for i=1,#list,1 do
if list[i].modpack == mod.name then
if toset == nil then
toset = not list[i].enabled
end
list[i].enabled = toset
end
end
end
end
local function handle_buttons(this, fields) local function handle_buttons(this, fields)
if fields["world_config_modlist"] ~= nil then if fields.world_config_modlist then
local event = core.explode_table_event(fields["world_config_modlist"]) local event = core.explode_table_event(fields.world_config_modlist)
this.data.selected_mod = event.row this.data.selected_mod = event.row
core.settings:set("world_config_selected_mod", event.row) core.settings:set("world_config_selected_mod", event.row)
if event.type == "DCL" then if event.type == "DCL" then
enable_mod(this) pkgmgr.enable_mod(this)
end end
return true return true
end end
if fields["key_enter"] ~= nil then if fields.key_enter then
enable_mod(this) pkgmgr.enable_mod(this)
return true return true
end end
if fields["cb_mod_enable"] ~= nil then if fields.cb_mod_enable ~= nil then
local toset = core.is_yes(fields["cb_mod_enable"]) pkgmgr.enable_mod(this, core.is_yes(fields.cb_mod_enable))
enable_mod(this,toset)
return true return true
end end
if fields["btn_mp_enable"] ~= nil or if fields.btn_mp_enable ~= nil or
fields["btn_mp_disable"] then fields.btn_mp_disable then
local toset = (fields["btn_mp_enable"] ~= nil) pkgmgr.enable_mod(this, fields.btn_mp_enable ~= nil)
enable_mod(this,toset)
return true return true
end end
if fields["btn_config_world_save"] then if fields.btn_config_world_save then
local filename = this.data.worldspec.path .. local filename = this.data.worldspec.path .. DIR_DELIM .. "world.mt"
DIR_DELIM .. "world.mt"
local worldfile = Settings(filename) local worldfile = Settings(filename)
local mods = worldfile:to_table() local mods = worldfile:to_table()
local rawlist = this.data.list:get_raw_list() local rawlist = this.data.list:get_raw_list()
local i,mod for i = 1, #rawlist do
for i,mod in ipairs(rawlist) do local mod = rawlist[i]
if not mod.is_modpack and if not mod.is_modpack and
not mod.is_game_content then not mod.is_game_content then
if modname_valid(mod.name) then if modname_valid(mod.name) then
worldfile:set("load_mod_"..mod.name, tostring(mod.enabled)) worldfile:set("load_mod_" .. mod.name,
else tostring(mod.enabled))
if mod.enabled then elseif mod.enabled then
gamedata.errormessage = fgettext_ne("Failed to enable mod \"$1\" as it contains disallowed characters. Only chararacters [a-z0-9_] are allowed.", mod.name) gamedata.errormessage = fgettext_ne("Failed to enable mo" ..
"d \"$1\" as it contains disallowed characters. " ..
"Only chararacters [a-z0-9_] are allowed.",
mod.name)
end end
end mods["load_mod_" .. mod.name] = nil
mods["load_mod_"..mod.name] = nil
end end
end end
-- Remove mods that are not present anymore -- Remove mods that are not present anymore
for key,value in pairs(mods) do for key in pairs(mods) do
if key:sub(1,9) == "load_mod_" then if key:sub(1, 9) == "load_mod_" then
worldfile:remove(key) worldfile:remove(key)
end end
end end
@ -189,7 +148,7 @@ local function handle_buttons(this, fields)
return true return true
end end
if fields["btn_config_world_cancel"] then if fields.btn_config_world_cancel then
this:delete() this:delete()
return true return true
end end
@ -224,32 +183,29 @@ local function handle_buttons(this, fields)
end end
function create_configure_world_dlg(worldidx) function create_configure_world_dlg(worldidx)
local dlg = dialog_create("sp_config_world", local dlg = dialog_create("sp_config_world", get_formspec, handle_buttons)
get_formspec,
handle_buttons,
nil)
dlg.data.selected_mod = tonumber(core.settings:get("world_config_selected_mod")) dlg.data.selected_mod = tonumber(
if dlg.data.selected_mod == nil then core.settings:get("world_config_selected_mod")) or 0
dlg.data.selected_mod = 0
end
dlg.data.worldspec = core.get_worlds()[worldidx] dlg.data.worldspec = core.get_worlds()[worldidx]
if dlg.data.worldspec == nil then dlg:delete() return nil end if not dlg.data.worldspec then
dlg:delete()
return
end
dlg.data.worldconfig = pkgmgr.get_worldconfig(dlg.data.worldspec.path) dlg.data.worldconfig = pkgmgr.get_worldconfig(dlg.data.worldspec.path)
if dlg.data.worldconfig == nil or dlg.data.worldconfig.id == nil or if not dlg.data.worldconfig or not dlg.data.worldconfig.id or
dlg.data.worldconfig.id == "" then dlg.data.worldconfig.id == "" then
dlg:delete() dlg:delete()
return nil return
end end
dlg.data.list = filterlist.create( dlg.data.list = filterlist.create(
pkgmgr.preparemodlist, --refresh pkgmgr.preparemodlist,
pkgmgr.comparemod, --compare pkgmgr.comparemod,
function(element,uid) --uid match function(element, uid)
if element.name == uid then if element.name == uid then
return true return true
end end
@ -265,9 +221,11 @@ function create_configure_world_dlg(worldidx)
return false return false
end end
return true return true
end, --filter end,
{ worldpath= dlg.data.worldspec.path, {
gameid = dlg.data.worldspec.gameid } worldpath = dlg.data.worldspec.path,
gameid = dlg.data.worldspec.gameid
}
) )
@ -275,10 +233,9 @@ function create_configure_world_dlg(worldidx)
dlg.data.selected_mod = 0 dlg.data.selected_mod = 0
end end
dlg.data.list:set_filtercriteria( dlg.data.list:set_filtercriteria({
{ hide_game = dlg.data.hide_gamemods,
hide_game=dlg.data.hide_gamemods, hide_modpackcontents = dlg.data.hide_modpackcontents
hide_modpackcontents= dlg.data.hide_modpackcontents
}) })
dlg.data.list:add_sort_mechanism("alphabetic", sort_mod_list) dlg.data.list:add_sort_mechanism("alphabetic", sort_mod_list)
dlg.data.list:set_sortmode("alphabetic") dlg.data.list:set_sortmode("alphabetic")

42
builtin/mainmenu/pkgmgr.lua
View File

@ -309,6 +309,48 @@ function pkgmgr.get_dependencies(path)
return table.concat(info.depends or {}, ","), table.concat(info.optional_depends or {}, ",") return table.concat(info.depends or {}, ","), table.concat(info.optional_depends or {}, ",")
end end
----------- tests whether all of the mods in the modpack are enabled -----------
function pkgmgr.is_modpack_entirely_enabled(data, name)
local rawlist = data.list:get_raw_list()
for j = 1, #rawlist do
if rawlist[j].modpack == name and not rawlist[j].enabled then
return false
end
end
return true
end
---------- toggles or en/disables a mod or modpack -----------------------------
function pkgmgr.enable_mod(this, toset)
local mod = this.data.list:get_list()[this.data.selected_mod]
-- game mods can't be enabled or disabled
if mod.is_game_content then
return
end
-- toggle or en/disable the mod
if not mod.is_modpack then
if toset == nil then
mod.enabled = not mod.enabled
else
mod.enabled = toset
end
return
end
-- toggle or en/disable every mod in the modpack, interleaved unsupported
local list = this.data.list:get_raw_list()
for i = 1, #list do
if list[i].modpack == mod.name then
if toset == nil then
toset = not list[i].enabled
end
list[i].enabled = toset
end
end
end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function pkgmgr.get_worldconfig(worldpath) function pkgmgr.get_worldconfig(worldpath)
local filename = worldpath .. local filename = worldpath ..