mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Fix modstore/favourites hang by adding asynchronous lua job support
This commit is contained in:
sapier
parent
b08d7558de
commit
2e66aca357
27 changed files with 2271 additions and 559 deletions
|
|
@ -24,6 +24,7 @@ dofile(scriptpath .. DIR_DELIM .. "modstore.lua")
|
|||
dofile(scriptpath .. DIR_DELIM .. "gamemgr.lua")
|
||||
dofile(scriptpath .. DIR_DELIM .. "mm_textures.lua")
|
||||
dofile(scriptpath .. DIR_DELIM .. "mm_menubar.lua")
|
||||
dofile(scriptpath .. DIR_DELIM .. "async_event.lua")
|
||||
|
||||
menu = {}
|
||||
local tabbuilder = {}
|
||||
|
|
@ -43,10 +44,10 @@ end
|
|||
--------------------------------------------------------------------------------
|
||||
function menu.render_favorite(spec,render_details)
|
||||
local text = ""
|
||||
|
||||
|
||||
if spec.name ~= nil then
|
||||
text = text .. engine.formspec_escape(spec.name:trim())
|
||||
|
||||
|
||||
-- if spec.description ~= nil and
|
||||
-- engine.formspec_escape(spec.description):trim() ~= "" then
|
||||
-- text = text .. " (" .. engine.formspec_escape(spec.description) .. ")"
|
||||
|
|
@ -54,51 +55,51 @@ function menu.render_favorite(spec,render_details)
|
|||
else
|
||||
if spec.address ~= nil then
|
||||
text = text .. spec.address:trim()
|
||||
|
||||
|
||||
if spec.port ~= nil then
|
||||
text = text .. ":" .. spec.port
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if not render_details then
|
||||
return text
|
||||
end
|
||||
|
||||
|
||||
local details = ""
|
||||
if spec.password == true then
|
||||
details = details .. "*"
|
||||
else
|
||||
details = details .. "_"
|
||||
end
|
||||
|
||||
|
||||
if spec.creative then
|
||||
details = details .. "C"
|
||||
else
|
||||
details = details .. "_"
|
||||
end
|
||||
|
||||
|
||||
if spec.damage then
|
||||
details = details .. "D"
|
||||
else
|
||||
details = details .. "_"
|
||||
end
|
||||
|
||||
|
||||
if spec.pvp then
|
||||
details = details .. "P"
|
||||
else
|
||||
details = details .. "_"
|
||||
end
|
||||
details = details .. " "
|
||||
|
||||
|
||||
local playercount = ""
|
||||
|
||||
|
||||
if spec.clients ~= nil and
|
||||
spec.clients_max ~= nil then
|
||||
playercount = string.format("%03d",spec.clients) .. "/" ..
|
||||
string.format("%03d",spec.clients_max) .. " "
|
||||
end
|
||||
|
||||
|
||||
return playercount .. engine.formspec_escape(details) .. text
|
||||
end
|
||||
|
||||
|
|
@ -106,7 +107,7 @@ end
|
|||
os.tempfolder = function()
|
||||
local filetocheck = os.tmpname()
|
||||
os.remove(filetocheck)
|
||||
|
||||
|
||||
local randname = "MTTempModFolder_" .. math.random(0,10000)
|
||||
if DIR_DELIM == "\\" then
|
||||
local tempfolder = os.getenv("TEMP")
|
||||
|
|
@ -122,7 +123,7 @@ end
|
|||
function init_globals()
|
||||
--init gamedata
|
||||
gamedata.worldindex = 0
|
||||
|
||||
|
||||
worldlist = filterlist.create(
|
||||
engine.get_worlds,
|
||||
compare_worlds,
|
||||
|
|
@ -139,7 +140,7 @@ function init_globals()
|
|||
return false
|
||||
end --filter fct
|
||||
)
|
||||
|
||||
|
||||
filterlist.add_sort_mechanism(worldlist,"alphabetic",sort_worlds_alphabetic)
|
||||
filterlist.set_sortmode(worldlist,"alphabetic")
|
||||
end
|
||||
|
|
@ -148,12 +149,12 @@ end
|
|||
function update_menu()
|
||||
|
||||
local formspec
|
||||
|
||||
|
||||
-- handle errors
|
||||
if gamedata.errormessage ~= nil then
|
||||
formspec = "size[12,5.2]" ..
|
||||
"field[1,2;10,2;;ERROR: " ..
|
||||
gamedata.errormessage ..
|
||||
gamedata.errormessage ..
|
||||
";]"..
|
||||
"button[4.5,4.2;3,0.5;btn_error_confirm;" .. fgettext("Ok") .. "]"
|
||||
else
|
||||
|
|
@ -166,14 +167,14 @@ end
|
|||
--------------------------------------------------------------------------------
|
||||
function menu.render_world_list()
|
||||
local retval = ""
|
||||
|
||||
|
||||
local current_worldlist = filterlist.get_list(worldlist)
|
||||
|
||||
|
||||
for i,v in ipairs(current_worldlist) do
|
||||
if retval ~= "" then
|
||||
retval = retval ..","
|
||||
end
|
||||
|
||||
|
||||
retval = retval .. engine.formspec_escape(v.name) ..
|
||||
" \\[" .. engine.formspec_escape(v.gameid) .. "\\]"
|
||||
end
|
||||
|
|
@ -196,24 +197,39 @@ function menu.render_texture_pack_list(list)
|
|||
return retval
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
function menu.asyncOnlineFavourites()
|
||||
menu.favorites = {}
|
||||
engine.handle_async(
|
||||
function(param)
|
||||
return engine.get_favorites("online")
|
||||
end,
|
||||
nil,
|
||||
function(result)
|
||||
menu.favorites = result
|
||||
engine.event_handler("Refresh")
|
||||
end
|
||||
)
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
function menu.init()
|
||||
--init menu data
|
||||
gamemgr.update_gamelist()
|
||||
|
||||
|
||||
menu.last_game = tonumber(engine.setting_get("main_menu_last_game_idx"))
|
||||
|
||||
|
||||
if type(menu.last_game) ~= "number" then
|
||||
menu.last_game = 1
|
||||
end
|
||||
|
||||
if engine.setting_getbool("public_serverlist") then
|
||||
menu.favorites = engine.get_favorites("online")
|
||||
menu.asyncOnlineFavourites()
|
||||
else
|
||||
menu.favorites = engine.get_favorites("local")
|
||||
end
|
||||
|
||||
menu.defaulttexturedir = engine.get_texturepath() .. DIR_DELIM .. "base" ..
|
||||
|
||||
menu.defaulttexturedir = engine.get_texturepath() .. DIR_DELIM .. "base" ..
|
||||
DIR_DELIM .. "pack" .. DIR_DELIM
|
||||
end
|
||||
|
||||
|
|
@ -222,12 +238,12 @@ function menu.lastgame()
|
|||
if menu.last_game > 0 and menu.last_game <= #gamemgr.games then
|
||||
return gamemgr.games[menu.last_game]
|
||||
end
|
||||
|
||||
|
||||
if #gamemgr.games >= 1 then
|
||||
menu.last_game = 1
|
||||
return gamemgr.games[menu.last_game]
|
||||
end
|
||||
|
||||
|
||||
--error case!!
|
||||
return nil
|
||||
end
|
||||
|
|
@ -238,11 +254,11 @@ function menu.update_last_game()
|
|||
local current_world = filterlist.get_raw_element(worldlist,
|
||||
engine.setting_get("mainmenu_last_selected_world")
|
||||
)
|
||||
|
||||
|
||||
if current_world == nil then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
local gamespec, i = gamemgr.find_by_gameid(current_world.gameid)
|
||||
if i ~= nil then
|
||||
menu.last_game = i
|
||||
|
|
@ -255,17 +271,17 @@ function menu.handle_key_up_down(fields,textlist,settingname)
|
|||
|
||||
if fields["key_up"] then
|
||||
local oldidx = engine.get_textlist_index(textlist)
|
||||
|
||||
|
||||
if oldidx > 1 then
|
||||
local newidx = oldidx -1
|
||||
engine.setting_set(settingname,
|
||||
filterlist.get_raw_index(worldlist,newidx))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["key_down"] then
|
||||
local oldidx = engine.get_textlist_index(textlist)
|
||||
|
||||
|
||||
if oldidx < filterlist.size(worldlist) then
|
||||
local newidx = oldidx + 1
|
||||
engine.setting_set(settingname,
|
||||
|
|
@ -293,7 +309,7 @@ function tabbuilder.dialog_create_world()
|
|||
end
|
||||
mglist = mglist:sub(1, -2)
|
||||
|
||||
local retval =
|
||||
local retval =
|
||||
"label[2,0;" .. fgettext("World name") .. "]"..
|
||||
"field[4.5,0.4;6,0.5;te_world_name;;]" ..
|
||||
|
||||
|
|
@ -335,7 +351,7 @@ function tabbuilder.gettab()
|
|||
if buildfunc ~= nil then
|
||||
retval = retval .. buildfunc()
|
||||
end
|
||||
|
||||
|
||||
retval = retval .. modmgr.gettab(tabbuilder.current_tab)
|
||||
retval = retval .. gamemgr.gettab(tabbuilder.current_tab)
|
||||
retval = retval .. modstore.gettab(tabbuilder.current_tab)
|
||||
|
|
@ -345,18 +361,18 @@ end
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
function tabbuilder.handle_create_world_buttons(fields)
|
||||
|
||||
|
||||
if fields["world_create_confirm"] or
|
||||
fields["key_enter"] then
|
||||
|
||||
|
||||
local worldname = fields["te_world_name"]
|
||||
local gameindex = engine.get_textlist_index("games")
|
||||
|
||||
|
||||
if gameindex > 0 and
|
||||
worldname ~= "" then
|
||||
|
||||
|
||||
local message = nil
|
||||
|
||||
|
||||
if not filterlist.uid_exists_raw(worldlist,worldname) then
|
||||
engine.setting_set("mg_name",fields["dd_mapgen"])
|
||||
message = engine.create_world(worldname,gameindex)
|
||||
|
|
@ -365,28 +381,28 @@ function tabbuilder.handle_create_world_buttons(fields)
|
|||
end
|
||||
|
||||
engine.setting_set("fixed_map_seed", fields["te_seed"])
|
||||
|
||||
|
||||
if message ~= nil then
|
||||
gamedata.errormessage = message
|
||||
else
|
||||
menu.last_game = gameindex
|
||||
engine.setting_set("main_menu_last_game_idx",gameindex)
|
||||
|
||||
|
||||
filterlist.refresh(worldlist)
|
||||
engine.setting_set("mainmenu_last_selected_world",
|
||||
filterlist.raw_index_by_uid(worldlist,worldname))
|
||||
end
|
||||
else
|
||||
gamedata.errormessage =
|
||||
gamedata.errormessage =
|
||||
fgettext("No worldname given or no game selected")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["games"] then
|
||||
tabbuilder.skipformupdate = true
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
--close dialog
|
||||
tabbuilder.is_dialog = false
|
||||
tabbuilder.show_buttons = true
|
||||
|
|
@ -395,16 +411,16 @@ end
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
function tabbuilder.handle_delete_world_buttons(fields)
|
||||
|
||||
|
||||
if fields["world_delete_confirm"] then
|
||||
if menu.world_to_del > 0 and
|
||||
if menu.world_to_del > 0 and
|
||||
menu.world_to_del <= #filterlist.get_raw_list(worldlist) then
|
||||
engine.delete_world(menu.world_to_del)
|
||||
menu.world_to_del = 0
|
||||
filterlist.refresh(worldlist)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
tabbuilder.is_dialog = false
|
||||
tabbuilder.show_buttons = true
|
||||
tabbuilder.current_tab = engine.setting_get("main_menu_tab")
|
||||
|
|
@ -412,12 +428,12 @@ end
|
|||
|
||||
--------------------------------------------------------------------------------
|
||||
function tabbuilder.handle_multiplayer_buttons(fields)
|
||||
|
||||
|
||||
if fields["te_name"] ~= nil then
|
||||
gamedata.playername = fields["te_name"]
|
||||
engine.setting_set("name", fields["te_name"])
|
||||
end
|
||||
|
||||
|
||||
if fields["favourites"] ~= nil then
|
||||
local event = explode_textlist_event(fields["favourites"])
|
||||
if event.typ == "DCL" then
|
||||
|
|
@ -429,12 +445,12 @@ function tabbuilder.handle_multiplayer_buttons(fields)
|
|||
gamedata.password = fields["te_pwd"]
|
||||
end
|
||||
gamedata.selected_world = 0
|
||||
|
||||
|
||||
if menu.favorites ~= nil then
|
||||
gamedata.servername = menu.favorites[event.index].name
|
||||
gamedata.serverdescription = menu.favorites[event.index].description
|
||||
end
|
||||
|
||||
|
||||
if gamedata.address ~= nil and
|
||||
gamedata.port ~= nil then
|
||||
engine.setting_set("address",gamedata.address)
|
||||
|
|
@ -443,53 +459,53 @@ function tabbuilder.handle_multiplayer_buttons(fields)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if event.typ == "CHG" then
|
||||
if event.index <= #menu.favorites then
|
||||
local address = menu.favorites[event.index].address
|
||||
local port = menu.favorites[event.index].port
|
||||
|
||||
|
||||
if address ~= nil and
|
||||
port ~= nil then
|
||||
engine.setting_set("address",address)
|
||||
engine.setting_set("remote_port",port)
|
||||
end
|
||||
|
||||
|
||||
menu.fav_selected = event.index
|
||||
end
|
||||
end
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
if fields["key_up"] ~= nil or
|
||||
fields["key_down"] ~= nil then
|
||||
|
||||
|
||||
local fav_idx = engine.get_textlist_index("favourites")
|
||||
|
||||
|
||||
if fields["key_up"] ~= nil and fav_idx > 1 then
|
||||
fav_idx = fav_idx -1
|
||||
else if fields["key_down"] and fav_idx < #menu.favorites then
|
||||
fav_idx = fav_idx +1
|
||||
end end
|
||||
|
||||
|
||||
local address = menu.favorites[fav_idx].address
|
||||
local port = menu.favorites[fav_idx].port
|
||||
|
||||
|
||||
if address ~= nil and
|
||||
port ~= nil then
|
||||
engine.setting_set("address",address)
|
||||
engine.setting_set("remote_port",port)
|
||||
end
|
||||
|
||||
|
||||
menu.fav_selected = fav_idx
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
if fields["cb_public_serverlist"] ~= nil then
|
||||
engine.setting_set("public_serverlist", fields["cb_public_serverlist"])
|
||||
|
||||
|
||||
if engine.setting_getbool("public_serverlist") then
|
||||
menu.favorites = engine.get_favorites("online")
|
||||
menu.asyncOnlineFavourites()
|
||||
else
|
||||
menu.favorites = engine.get_favorites("local")
|
||||
end
|
||||
|
|
@ -502,27 +518,27 @@ function tabbuilder.handle_multiplayer_buttons(fields)
|
|||
engine.delete_favorite(current_favourite)
|
||||
menu.favorites = engine.get_favorites()
|
||||
menu.fav_selected = nil
|
||||
|
||||
|
||||
engine.setting_set("address","")
|
||||
engine.setting_set("remote_port","30000")
|
||||
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
if fields["btn_mp_connect"] ~= nil or
|
||||
fields["key_enter"] ~= nil then
|
||||
|
||||
|
||||
gamedata.playername = fields["te_name"]
|
||||
gamedata.password = fields["te_pwd"]
|
||||
gamedata.address = fields["te_address"]
|
||||
gamedata.port = fields["te_port"]
|
||||
|
||||
|
||||
local fav_idx = engine.get_textlist_index("favourites")
|
||||
|
||||
|
||||
if fav_idx > 0 and fav_idx <= #menu.favorites and
|
||||
menu.favorites[fav_idx].address == fields["te_address"] and
|
||||
menu.favorites[fav_idx].port == fields["te_port"] then
|
||||
|
||||
|
||||
gamedata.servername = menu.favorites[fav_idx].name
|
||||
gamedata.serverdescription = menu.favorites[fav_idx].description
|
||||
else
|
||||
|
|
@ -531,10 +547,10 @@ function tabbuilder.handle_multiplayer_buttons(fields)
|
|||
end
|
||||
|
||||
gamedata.selected_world = 0
|
||||
|
||||
|
||||
engine.setting_set("address",fields["te_address"])
|
||||
engine.setting_set("remote_port",fields["te_port"])
|
||||
|
||||
|
||||
engine.start()
|
||||
return
|
||||
end
|
||||
|
|
@ -547,7 +563,7 @@ function tabbuilder.handle_server_buttons(fields)
|
|||
|
||||
if fields["srv_worlds"] ~= nil then
|
||||
local event = explode_textlist_event(fields["srv_worlds"])
|
||||
|
||||
|
||||
if event.typ == "DCL" then
|
||||
world_doubleclick = true
|
||||
end
|
||||
|
|
@ -556,13 +572,13 @@ function tabbuilder.handle_server_buttons(fields)
|
|||
filterlist.get_raw_index(worldlist,engine.get_textlist_index("srv_worlds")))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
menu.handle_key_up_down(fields,"srv_worlds","mainmenu_last_selected_world")
|
||||
|
||||
|
||||
if fields["cb_creative_mode"] then
|
||||
engine.setting_set("creative_mode", fields["cb_creative_mode"])
|
||||
end
|
||||
|
||||
|
||||
if fields["cb_enable_damage"] then
|
||||
engine.setting_set("enable_damage", fields["cb_enable_damage"])
|
||||
end
|
||||
|
|
@ -570,7 +586,7 @@ function tabbuilder.handle_server_buttons(fields)
|
|||
if fields["cb_server_announce"] then
|
||||
engine.setting_set("server_announce", fields["cb_server_announce"])
|
||||
end
|
||||
|
||||
|
||||
if fields["start_server"] ~= nil or
|
||||
world_doubleclick or
|
||||
fields["key_enter"] then
|
||||
|
|
@ -581,19 +597,20 @@ function tabbuilder.handle_server_buttons(fields)
|
|||
gamedata.port = fields["te_serverport"]
|
||||
gamedata.address = ""
|
||||
gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
|
||||
|
||||
|
||||
engine.setting_set("port",gamedata.port)
|
||||
|
||||
menu.update_last_game(gamedata.selected_world)
|
||||
engine.start()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["world_create"] ~= nil then
|
||||
tabbuilder.current_tab = "dialog_create_world"
|
||||
tabbuilder.is_dialog = true
|
||||
tabbuilder.show_buttons = false
|
||||
end
|
||||
|
||||
|
||||
if fields["world_delete"] ~= nil then
|
||||
local selected = engine.get_textlist_index("srv_worlds")
|
||||
if selected > 0 and
|
||||
|
|
@ -611,7 +628,7 @@ function tabbuilder.handle_server_buttons(fields)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["world_configure"] ~= nil then
|
||||
selected = engine.get_textlist_index("srv_worlds")
|
||||
if selected > 0 then
|
||||
|
|
@ -639,7 +656,7 @@ function tabbuilder.handle_settings_buttons(fields)
|
|||
if fields["cb_opaque_water"] then
|
||||
engine.setting_set("opaque_water", fields["cb_opaque_water"])
|
||||
end
|
||||
|
||||
|
||||
if fields["cb_mipmapping"] then
|
||||
engine.setting_set("mip_map", fields["cb_mipmapping"])
|
||||
end
|
||||
|
|
@ -652,7 +669,7 @@ function tabbuilder.handle_settings_buttons(fields)
|
|||
if fields["cb_trilinear"] then
|
||||
engine.setting_set("trilinear_filter", fields["cb_trilinear"])
|
||||
end
|
||||
|
||||
|
||||
if fields["cb_shaders"] then
|
||||
if (engine.setting_get("video_driver") == "direct3d8" or engine.setting_get("video_driver") == "direct3d9") then
|
||||
engine.setting_set("enable_shaders", "false")
|
||||
|
|
@ -683,23 +700,23 @@ function tabbuilder.handle_singleplayer_buttons(fields)
|
|||
|
||||
if fields["sp_worlds"] ~= nil then
|
||||
local event = explode_textlist_event(fields["sp_worlds"])
|
||||
|
||||
|
||||
if event.typ == "DCL" then
|
||||
world_doubleclick = true
|
||||
end
|
||||
|
||||
|
||||
if event.typ == "CHG" then
|
||||
engine.setting_set("mainmenu_last_selected_world",
|
||||
filterlist.get_raw_index(worldlist,engine.get_textlist_index("sp_worlds")))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
menu.handle_key_up_down(fields,"sp_worlds","mainmenu_last_selected_world")
|
||||
|
||||
|
||||
if fields["cb_creative_mode"] then
|
||||
engine.setting_set("creative_mode", fields["cb_creative_mode"])
|
||||
end
|
||||
|
||||
|
||||
if fields["cb_enable_damage"] then
|
||||
engine.setting_set("enable_damage", fields["cb_enable_damage"])
|
||||
end
|
||||
|
|
@ -711,19 +728,19 @@ function tabbuilder.handle_singleplayer_buttons(fields)
|
|||
if selected > 0 then
|
||||
gamedata.selected_world = filterlist.get_raw_index(worldlist,selected)
|
||||
gamedata.singleplayer = true
|
||||
|
||||
|
||||
menu.update_last_game(gamedata.selected_world)
|
||||
|
||||
|
||||
engine.start()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["world_create"] ~= nil then
|
||||
tabbuilder.current_tab = "dialog_create_world"
|
||||
tabbuilder.is_dialog = true
|
||||
tabbuilder.show_buttons = false
|
||||
end
|
||||
|
||||
|
||||
if fields["world_delete"] ~= nil then
|
||||
local selected = engine.get_textlist_index("sp_worlds")
|
||||
if selected > 0 and
|
||||
|
|
@ -741,7 +758,7 @@ function tabbuilder.handle_singleplayer_buttons(fields)
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if fields["world_configure"] ~= nil then
|
||||
selected = engine.get_textlist_index("sp_worlds")
|
||||
if selected > 0 then
|
||||
|
|
@ -768,7 +785,7 @@ function tabbuilder.handle_texture_pack_buttons(fields)
|
|||
if #list >= current_index then
|
||||
local new_path = engine.get_texturepath()..DIR_DELIM..list[current_index]
|
||||
if list[current_index] == "None" then new_path = "" end
|
||||
|
||||
|
||||
engine.setting_set("texture_path", new_path)
|
||||
end
|
||||
end
|
||||
|
|
@ -781,15 +798,15 @@ function tabbuilder.tab_header()
|
|||
if tabbuilder.last_tab_index == nil then
|
||||
tabbuilder.last_tab_index = 1
|
||||
end
|
||||
|
||||
|
||||
local toadd = ""
|
||||
|
||||
|
||||
for i=1,#tabbuilder.current_buttons,1 do
|
||||
|
||||
|
||||
if toadd ~= "" then
|
||||
toadd = toadd .. ","
|
||||
end
|
||||
|
||||
|
||||
toadd = toadd .. tabbuilder.current_buttons[i].caption
|
||||
end
|
||||
return "tabheader[-0.3,-0.99;main_tab;" .. toadd ..";" .. tabbuilder.last_tab_index .. ";true;false]"
|
||||
|
|
@ -802,21 +819,21 @@ function tabbuilder.handle_tab_buttons(fields)
|
|||
local index = tonumber(fields["main_tab"])
|
||||
tabbuilder.last_tab_index = index
|
||||
tabbuilder.current_tab = tabbuilder.current_buttons[index].name
|
||||
|
||||
|
||||
engine.setting_set("main_menu_tab",tabbuilder.current_tab)
|
||||
end
|
||||
|
||||
|
||||
--handle tab changes
|
||||
if tabbuilder.current_tab ~= tabbuilder.old_tab then
|
||||
if tabbuilder.current_tab ~= "singleplayer" and not tabbuilder.is_dialog then
|
||||
menu.update_gametype(true)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "singleplayer" then
|
||||
menu.update_gametype()
|
||||
end
|
||||
|
||||
|
||||
tabbuilder.old_tab = tabbuilder.current_tab
|
||||
end
|
||||
|
||||
|
|
@ -832,24 +849,24 @@ function tabbuilder.tab_multiplayer()
|
|||
"field[6.75,5.25;2.25,0.5;te_port;;" ..engine.setting_get("remote_port") .."]" ..
|
||||
"checkbox[1,3.6;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" ..
|
||||
dump(engine.setting_getbool("public_serverlist")) .. "]"
|
||||
|
||||
|
||||
if not engine.setting_getbool("public_serverlist") then
|
||||
retval = retval ..
|
||||
retval = retval ..
|
||||
"button[6.45,3.95;2.25,0.5;btn_delete_favorite;".. fgettext("Delete") .. "]"
|
||||
end
|
||||
|
||||
|
||||
retval = retval ..
|
||||
"button[9,4.95;2.5,0.5;btn_mp_connect;".. fgettext("Connect") .. "]" ..
|
||||
"field[9.3,3.75;2.5,0.5;te_name;;" ..engine.setting_get("name") .."]" ..
|
||||
"pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" ..
|
||||
"textarea[9.3,0.25;2.5,2.75;;"
|
||||
if menu.fav_selected ~= nil and
|
||||
if menu.fav_selected ~= nil and
|
||||
menu.favorites[menu.fav_selected].description ~= nil then
|
||||
retval = retval ..
|
||||
retval = retval ..
|
||||
engine.formspec_escape(menu.favorites[menu.fav_selected].description,true)
|
||||
end
|
||||
|
||||
retval = retval ..
|
||||
|
||||
retval = retval ..
|
||||
";]" ..
|
||||
"textlist[1,0.35;7.5,3.35;favourites;"
|
||||
|
||||
|
|
@ -857,7 +874,7 @@ function tabbuilder.tab_multiplayer()
|
|||
|
||||
if #menu.favorites > 0 then
|
||||
retval = retval .. menu.render_favorite(menu.favorites[1],render_details)
|
||||
|
||||
|
||||
for i=2,#menu.favorites,1 do
|
||||
retval = retval .. "," .. menu.render_favorite(menu.favorites[i],render_details)
|
||||
end
|
||||
|
|
@ -878,8 +895,8 @@ function tabbuilder.tab_server()
|
|||
local index = filterlist.get_current_index(worldlist,
|
||||
tonumber(engine.setting_get("mainmenu_last_selected_world"))
|
||||
)
|
||||
|
||||
local retval =
|
||||
|
||||
local retval =
|
||||
"button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
|
||||
"button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
|
||||
"button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
|
||||
|
|
@ -895,27 +912,27 @@ function tabbuilder.tab_server()
|
|||
"field[0.8,3.2;3,0.5;te_playername;".. fgettext("Name") .. ";" ..
|
||||
engine.setting_get("name") .. "]" ..
|
||||
"pwdfield[0.8,4.2;3,0.5;te_passwd;".. fgettext("Password") .. "]" ..
|
||||
"field[0.8,5.2;3,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
|
||||
"field[0.8,5.2;3,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
|
||||
engine.setting_get("port") .."]" ..
|
||||
"textlist[4,0.25;7.5,3.7;srv_worlds;" ..
|
||||
menu.render_world_list() ..
|
||||
";" .. index .. "]"
|
||||
|
||||
|
||||
return retval
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
function tabbuilder.tab_settings()
|
||||
return "vertlabel[0,0;" .. fgettext("SETTINGS") .. "]" ..
|
||||
"checkbox[1,0.75;cb_fancy_trees;".. fgettext("Fancy trees") .. ";"
|
||||
"checkbox[1,0.75;cb_fancy_trees;".. fgettext("Fancy trees") .. ";"
|
||||
.. dump(engine.setting_getbool("new_style_leaves")) .. "]"..
|
||||
"checkbox[1,1.25;cb_smooth_lighting;".. fgettext("Smooth Lighting")
|
||||
"checkbox[1,1.25;cb_smooth_lighting;".. fgettext("Smooth Lighting")
|
||||
.. ";".. dump(engine.setting_getbool("smooth_lighting")) .. "]"..
|
||||
"checkbox[1,1.75;cb_3d_clouds;".. fgettext("3D Clouds") .. ";"
|
||||
.. dump(engine.setting_getbool("enable_3d_clouds")) .. "]"..
|
||||
"checkbox[1,2.25;cb_opaque_water;".. fgettext("Opaque Water") .. ";"
|
||||
.. dump(engine.setting_getbool("opaque_water")) .. "]"..
|
||||
|
||||
|
||||
"checkbox[4,0.75;cb_mipmapping;".. fgettext("Mip-Mapping") .. ";"
|
||||
.. dump(engine.setting_getbool("mip_map")) .. "]"..
|
||||
"checkbox[4,1.25;cb_anisotrophic;".. fgettext("Anisotropic Filtering") .. ";"
|
||||
|
|
@ -924,7 +941,7 @@ function tabbuilder.tab_settings()
|
|||
.. dump(engine.setting_getbool("bilinear_filter")) .. "]"..
|
||||
"checkbox[4,2.25;cb_trilinear;".. fgettext("Tri-Linear Filtering") .. ";"
|
||||
.. dump(engine.setting_getbool("trilinear_filter")) .. "]"..
|
||||
|
||||
|
||||
"checkbox[7.5,0.75;cb_shaders;".. fgettext("Shaders") .. ";"
|
||||
.. dump(engine.setting_getbool("enable_shaders")) .. "]"..
|
||||
"checkbox[7.5,1.25;cb_pre_ivis;".. fgettext("Preload item visuals") .. ";"
|
||||
|
|
@ -933,13 +950,13 @@ function tabbuilder.tab_settings()
|
|||
.. dump(engine.setting_getbool("enable_particles")) .. "]"..
|
||||
"checkbox[7.5,2.25;cb_finite_liquid;".. fgettext("Finite Liquid") .. ";"
|
||||
.. dump(engine.setting_getbool("liquid_finite")) .. "]"..
|
||||
|
||||
|
||||
"button[1,4.25;2.25,0.5;btn_change_keys;".. fgettext("Change keys") .. "]"
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
function tabbuilder.tab_singleplayer()
|
||||
|
||||
|
||||
local index = filterlist.get_current_index(worldlist,
|
||||
tonumber(engine.setting_get("mainmenu_last_selected_world"))
|
||||
)
|
||||
|
|
@ -966,19 +983,19 @@ function tabbuilder.tab_texture_packs()
|
|||
"vertlabel[0,-0.25;".. fgettext("TEXTURE PACKS") .. "]" ..
|
||||
"textlist[4,0.25;7.5,5.0;TPs;"
|
||||
|
||||
local current_texture_path = engine.setting_get("texture_path")
|
||||
local list = filter_texture_pack_list(engine.get_dirlist(engine.get_texturepath(), true))
|
||||
local current_texture_path = engine.setting_get("texture_path")
|
||||
local list = filter_texture_pack_list(engine.get_dirlist(engine.get_texturepath(), true))
|
||||
local index = tonumber(engine.setting_get("mainmenu_last_selected_TP"))
|
||||
|
||||
|
||||
if index == nil then index = 1 end
|
||||
|
||||
|
||||
if current_texture_path == "" then
|
||||
retval = retval ..
|
||||
menu.render_texture_pack_list(list) ..
|
||||
";" .. index .. "]"
|
||||
return retval
|
||||
end
|
||||
|
||||
|
||||
local infofile = current_texture_path ..DIR_DELIM.."info.txt"
|
||||
local infotext = ""
|
||||
local f = io.open(infofile, "r")
|
||||
|
|
@ -988,7 +1005,7 @@ function tabbuilder.tab_texture_packs()
|
|||
infotext = f:read("*all")
|
||||
f:close()
|
||||
end
|
||||
|
||||
|
||||
local screenfile = current_texture_path..DIR_DELIM.."screenshot.png"
|
||||
local no_screenshot = nil
|
||||
if not file_exists(screenfile) then
|
||||
|
|
@ -1009,7 +1026,7 @@ function tabbuilder.tab_credits()
|
|||
local logofile = menu.defaulttexturedir .. "logo.png"
|
||||
return "vertlabel[0,-0.5;CREDITS]" ..
|
||||
"label[0.5,3;Minetest " .. engine.get_version() .. "]" ..
|
||||
"label[0.5,3.3;http://minetest.net]" ..
|
||||
"label[0.5,3.3;http://minetest.net]" ..
|
||||
"image[0.5,1;" .. engine.formspec_escape(logofile) .. "]" ..
|
||||
"textlist[3.5,-0.25;8.5,5.8;list_credits;" ..
|
||||
"#FFFF00" .. fgettext("Core Developers") .."," ..
|
||||
|
|
@ -1064,40 +1081,40 @@ function tabbuilder.init()
|
|||
}
|
||||
|
||||
tabbuilder.current_tab = engine.setting_get("main_menu_tab")
|
||||
|
||||
|
||||
if tabbuilder.current_tab == nil or
|
||||
tabbuilder.current_tab == "" then
|
||||
tabbuilder.current_tab = "singleplayer"
|
||||
engine.setting_set("main_menu_tab",tabbuilder.current_tab)
|
||||
end
|
||||
|
||||
|
||||
--initialize tab buttons
|
||||
tabbuilder.last_tab = nil
|
||||
tabbuilder.show_buttons = true
|
||||
|
||||
|
||||
tabbuilder.current_buttons = {}
|
||||
table.insert(tabbuilder.current_buttons,{name="singleplayer", caption=fgettext("Singleplayer")})
|
||||
table.insert(tabbuilder.current_buttons,{name="multiplayer", caption=fgettext("Client")})
|
||||
table.insert(tabbuilder.current_buttons,{name="server", caption=fgettext("Server")})
|
||||
table.insert(tabbuilder.current_buttons,{name="settings", caption=fgettext("Settings")})
|
||||
table.insert(tabbuilder.current_buttons,{name="texture_packs", caption=fgettext("Texture Packs")})
|
||||
|
||||
|
||||
if engine.setting_getbool("main_menu_game_mgr") then
|
||||
table.insert(tabbuilder.current_buttons,{name="game_mgr", caption=fgettext("Games")})
|
||||
end
|
||||
|
||||
|
||||
if engine.setting_getbool("main_menu_mod_mgr") then
|
||||
table.insert(tabbuilder.current_buttons,{name="mod_mgr", caption=fgettext("Mods")})
|
||||
end
|
||||
table.insert(tabbuilder.current_buttons,{name="credits", caption=fgettext("Credits")})
|
||||
|
||||
|
||||
|
||||
|
||||
for i=1,#tabbuilder.current_buttons,1 do
|
||||
if tabbuilder.current_buttons[i].name == tabbuilder.current_tab then
|
||||
tabbuilder.last_tab_index = i
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab ~= "singleplayer" then
|
||||
menu.update_gametype(true)
|
||||
else
|
||||
|
|
@ -1112,18 +1129,24 @@ function tabbuilder.checkretval(retval)
|
|||
if retval.current_tab ~= nil then
|
||||
tabbuilder.current_tab = retval.current_tab
|
||||
end
|
||||
|
||||
|
||||
if retval.is_dialog ~= nil then
|
||||
tabbuilder.is_dialog = retval.is_dialog
|
||||
end
|
||||
|
||||
|
||||
if retval.show_buttons ~= nil then
|
||||
tabbuilder.show_buttons = retval.show_buttons
|
||||
end
|
||||
|
||||
|
||||
if retval.skipformupdate ~= nil then
|
||||
tabbuilder.skipformupdate = retval.skipformupdate
|
||||
end
|
||||
|
||||
if retval.ignore_menu_quit == true then
|
||||
tabbuilder.ignore_menu_quit = true
|
||||
else
|
||||
tabbuilder.ignore_menu_quit = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -1134,54 +1157,54 @@ end
|
|||
--------------------------------------------------------------------------------
|
||||
engine.button_handler = function(fields)
|
||||
--print("Buttonhandler: tab: " .. tabbuilder.current_tab .. " fields: " .. dump(fields))
|
||||
|
||||
|
||||
if fields["btn_error_confirm"] then
|
||||
gamedata.errormessage = nil
|
||||
end
|
||||
|
||||
|
||||
local retval = modmgr.handle_buttons(tabbuilder.current_tab,fields)
|
||||
tabbuilder.checkretval(retval)
|
||||
|
||||
|
||||
retval = gamemgr.handle_buttons(tabbuilder.current_tab,fields)
|
||||
tabbuilder.checkretval(retval)
|
||||
|
||||
|
||||
retval = modstore.handle_buttons(tabbuilder.current_tab,fields)
|
||||
tabbuilder.checkretval(retval)
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "dialog_create_world" then
|
||||
tabbuilder.handle_create_world_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "dialog_delete_world" then
|
||||
tabbuilder.handle_delete_world_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "singleplayer" then
|
||||
tabbuilder.handle_singleplayer_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "texture_packs" then
|
||||
tabbuilder.handle_texture_pack_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "multiplayer" then
|
||||
tabbuilder.handle_multiplayer_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "settings" then
|
||||
tabbuilder.handle_settings_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
if tabbuilder.current_tab == "server" then
|
||||
tabbuilder.handle_server_buttons(fields)
|
||||
end
|
||||
|
||||
|
||||
--tab buttons
|
||||
tabbuilder.handle_tab_buttons(fields)
|
||||
|
||||
|
||||
--menubar buttons
|
||||
menubar.handle_buttons(fields)
|
||||
|
||||
|
||||
if not tabbuilder.skipformupdate then
|
||||
--update menu
|
||||
update_menu()
|
||||
|
|
@ -1194,6 +1217,10 @@ end
|
|||
engine.event_handler = function(event)
|
||||
if event == "MenuQuit" then
|
||||
if tabbuilder.is_dialog then
|
||||
if tabbuilder.ignore_menu_quit then
|
||||
return
|
||||
end
|
||||
|
||||
tabbuilder.is_dialog = false
|
||||
tabbuilder.show_buttons = true
|
||||
tabbuilder.current_tab = engine.setting_get("main_menu_tab")
|
||||
|
|
@ -1203,6 +1230,10 @@ engine.event_handler = function(event)
|
|||
engine.close()
|
||||
end
|
||||
end
|
||||
|
||||
if event == "Refresh" then
|
||||
update_menu()
|
||||
end
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue