X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=builtin%2Fmainmenu%2Ftab_multiplayer.lua;h=570259718f0db9de752f1fa2ddfe64f1c9c77429;hb=58babf8b1945f1a2db0180a4a3ed7b0d52872bef;hp=c3a7d921e2c7ced7e4d032e77f1dbb1555df0cae;hpb=2625323f25ebb4e9ab1079ff60a77b40f58c5bf9;p=oweals%2Fminetest.git diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua index c3a7d921e..570259718 100644 --- a/builtin/mainmenu/tab_multiplayer.lua +++ b/builtin/mainmenu/tab_multiplayer.lua @@ -20,25 +20,27 @@ local function get_formspec(tabview, name, tabdata) local render_details = core.is_yes(core.setting_getbool("public_serverlist")) local retval = - "vertlabel[0,-0.25;".. fgettext("CLIENT") .. "]" .. - "label[1,-0.25;".. fgettext("Favorites:") .. "]".. - "label[1,4.25;".. fgettext("Address/Port") .. "]".. - "label[9,2.75;".. fgettext("Name/Password") .. "]" .. - "field[1.25,5.25;5.5,0.5;te_address;;" ..core.setting_get("address") .."]" .. - "field[6.75,5.25;2.25,0.5;te_port;;" ..core.setting_get("remote_port") .."]" .. - "checkbox[1,3.6;cb_public_serverlist;".. fgettext("Public Serverlist") .. ";" .. + "label[7.75,-0.15;" .. fgettext("Address / Port :") .. "]" .. + "label[7.75,1.05;" .. fgettext("Name / Password :") .. "]" .. + "field[8,0.75;3.4,0.5;te_address;;" .. + core.formspec_escape(core.setting_get("address")) .. "]" .. + "field[11.25,0.75;1.3,0.5;te_port;;" .. + core.formspec_escape(core.setting_get("remote_port")) .. "]" .. + "checkbox[0,4.85;cb_public_serverlist;" .. fgettext("Public Serverlist") .. ";" .. dump(core.setting_getbool("public_serverlist")) .. "]" if not core.setting_getbool("public_serverlist") then retval = retval .. - "button[6.45,3.95;2.25,0.5;btn_delete_favorite;".. fgettext("Delete") .. "]" + "button[8,4.9;2,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;;" ..core.setting_get("name") .."]" .. - "pwdfield[9.3,4.5;2.5,0.5;te_pwd;]" .. - "textarea[9.3,0.25;2.5,2.75;;" + "button[10,4.9;2,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]" .. + "field[8,1.95;2.95,0.5;te_name;;" .. + core.formspec_escape(core.setting_get("name")) .. "]" .. + "pwdfield[10.78,1.95;1.77,0.5;te_pwd;]" .. + "box[7.73,2.35;4.3,2.28;#999999]" .. + "textarea[8.1,2.4;4.26,2.6;;" if tabdata.fav_selected ~= nil and menudata.favorites[tabdata.fav_selected] ~= nil and @@ -49,10 +51,24 @@ local function get_formspec(tabview, name, tabdata) retval = retval .. ";]" - + --favourites + if render_details then + retval = retval .. "tablecolumns[" .. + "color,span=3;" .. + "text,align=right;" .. -- clients + "text,align=center,padding=0.25;" .. -- "/" + "text,align=right,padding=0.25;" .. -- clients_max + image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" .. + image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" .. + image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" .. + "color,span=1;" .. + "text,padding=1]" -- name + else + retval = retval .. "tablecolumns[text]" + end retval = retval .. - "textlist[1,0.35;7.5,3.35;favourites;" + "table[-0.15,-0.1;7.75,5;favourites;" if #menudata.favorites > 0 then retval = retval .. render_favorite(menudata.favorites[1],render_details) @@ -73,18 +89,21 @@ end -------------------------------------------------------------------------------- local function main_button_handler(tabview, fields, name, tabdata) - if fields["te_name"] ~= nil then gamedata.playername = fields["te_name"] core.setting_set("name", fields["te_name"]) end if fields["favourites"] ~= nil then - local event = core.explode_textlist_event(fields["favourites"]) + local event = core.explode_table_event(fields["favourites"]) if event.type == "DCL" then - if event.index <= #menudata.favorites then - gamedata.address = menudata.favorites[event.index].address - gamedata.port = menudata.favorites[event.index].port + if event.row <= #menudata.favorites then + if not is_server_protocol_compat_or_error(menudata.favorites[event.row].proto_min, + menudata.favorites[event.row].proto_max) then + return true + end + gamedata.address = menudata.favorites[event.row].address + gamedata.port = menudata.favorites[event.row].port gamedata.playername = fields["te_name"] if fields["te_pwd"] ~= nil then gamedata.password = fields["te_pwd"] @@ -92,8 +111,8 @@ local function main_button_handler(tabview, fields, name, tabdata) gamedata.selected_world = 0 if menudata.favorites ~= nil then - gamedata.servername = menudata.favorites[event.index].name - gamedata.serverdescription = menudata.favorites[event.index].description + gamedata.servername = menudata.favorites[event.row].name + gamedata.serverdescription = menudata.favorites[event.row].description end if gamedata.address ~= nil and @@ -107,9 +126,9 @@ local function main_button_handler(tabview, fields, name, tabdata) end if event.type == "CHG" then - if event.index <= #menudata.favorites then - local address = menudata.favorites[event.index].address - local port = menudata.favorites[event.index].port + if event.row <= #menudata.favorites then + local address = menudata.favorites[event.row].address + local port = menudata.favorites[event.row].port if address ~= nil and port ~= nil then @@ -117,7 +136,7 @@ local function main_button_handler(tabview, fields, name, tabdata) core.setting_set("remote_port",port) end - tabdata.fav_selected = event.index + tabdata.fav_selected = event.row end return true @@ -127,7 +146,7 @@ local function main_button_handler(tabview, fields, name, tabdata) if fields["key_up"] ~= nil or fields["key_down"] ~= nil then - local fav_idx = core.get_textlist_index("favourites") + local fav_idx = core.get_table_index("favourites") if fav_idx ~= nil then if fields["key_up"] ~= nil and fav_idx > 1 then @@ -171,10 +190,10 @@ local function main_button_handler(tabview, fields, name, tabdata) end if fields["btn_delete_favorite"] ~= nil then - local current_favourite = core.get_textlist_index("favourites") + local current_favourite = core.get_table_index("favourites") if current_favourite == nil then return end core.delete_favorite(current_favourite) - menudata.favorites = core.get_favorites() + menudata.favorites = order_favorite_list(core.get_favorites()) tabdata.fav_selected = nil core.setting_set("address","") @@ -183,15 +202,16 @@ local function main_button_handler(tabview, fields, name, tabdata) return true end - if fields["btn_mp_connect"] ~= nil or - fields["key_enter"] ~= nil then + if (fields["btn_mp_connect"] ~= nil or + fields["key_enter"] ~= nil) and fields["te_address"] ~= nil and + fields["te_port"] ~= 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 = core.get_textlist_index("favourites") + local fav_idx = core.get_table_index("favourites") if fav_idx ~= nil and fav_idx <= #menudata.favorites and menudata.favorites[fav_idx].address == fields["te_address"] and @@ -199,6 +219,11 @@ local function main_button_handler(tabview, fields, name, tabdata) gamedata.servername = menudata.favorites[fav_idx].name gamedata.serverdescription = menudata.favorites[fav_idx].description + + if not is_server_protocol_compat_or_error(menudata.favorites[fav_idx].proto_min, + menudata.favorites[fav_idx].proto_max)then + return true + end else gamedata.servername = "" gamedata.serverdescription = ""