diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index fa0637387..3413b5247 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -101,7 +101,7 @@ local function create_world_buttonhandler(this, fields) core.settings:set("fixed_map_seed", fields["te_seed"]) if not menudata.worldlist:uid_exists_raw(worldname) then - core.setting_set("mg_name","v6") + core.settings:set("mg_name","v6") message = core.create_world(worldname,gameindex) else message = fgettext("A world named \"$1\" already exists", worldname) diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 5fa27b72e..2e237ed6f 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -88,7 +88,7 @@ local function init_globals() menudata.worldlist:add_sort_mechanism("alphabetic", sort_worlds_alphabetic) menudata.worldlist:set_sortmode("alphabetic") - core.setting_set("menu_last_game", "default") + local default_game = "default" mm_texture.init() diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua index e3aae8c4c..ba3c8a438 100644 --- a/builtin/mainmenu/tab_local.lua +++ b/builtin/mainmenu/tab_local.lua @@ -38,7 +38,7 @@ local function get_formspec(tabview, name, tabdata) retval = retval .. "button[8.7,4.5;3.30,0.5;play;".. fgettext("Play") .. "]" .. "checkbox[0.0,4.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" .. - dump(core.setting_getbool("creative_mode")) .. "]".. + dump(core.settings:get_bool("creative_mode")) .. "]".. "textlist[0,0;11.75,3.7;sp_worlds;" .. menu_render_worldlist() .. ";" .. index .. ";true]" @@ -73,15 +73,14 @@ local function main_button_handler(this, fields, name, tabdata) end if fields["cb_creative_mode"] then - core.setting_set("creative_mode", fields["cb_creative_mode"]) + core.settings:set("creative_mode", fields["cb_creative_mode"]) local bool = fields["cb_creative_mode"] if bool == 'true' then bool = 'false' else bool = 'true' end - core.setting_set("enable_damage", bool) - core.setting_save() + core.settings:set("enable_damage", bool) return true end diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua index abab64864..21b83a1f6 100644 --- a/builtin/mainmenu/tab_server.lua +++ b/builtin/mainmenu/tab_server.lua @@ -80,7 +80,7 @@ local function main_button_handler(this, fields, name, tabdata) world_doubleclick = true end if event.type == "CHG" then - core.setting_set("mainmenu_last_selected_world", + core.settings:set("mainmenu_last_selected_world", menudata.worldlist:get_raw_index(core.get_textlist_index("srv_worlds"))) return true end @@ -91,7 +91,7 @@ local function main_button_handler(this, fields, name, tabdata) end if fields["cb_creative_mode"] then - core.setting_set("creative_mode", fields["cb_creative_mode"]) + core.settings:set("creative_mode", fields["cb_creative_mode"]) local selected = core.get_textlist_index("srv_worlds") menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"]) @@ -99,7 +99,7 @@ local function main_button_handler(this, fields, name, tabdata) end if fields["cb_enable_damage"] then - core.setting_set("enable_damage", fields["cb_enable_damage"]) + core.settings:set("enable_damage", fields["cb_enable_damage"]) local selected = core.get_textlist_index("srv_worlds") menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"]) @@ -107,7 +107,7 @@ local function main_button_handler(this, fields, name, tabdata) end if fields["cb_server_announce"] then - core.setting_set("server_announce", fields["cb_server_announce"]) + core.settings:set("server_announce", fields["cb_server_announce"]) local selected = core.get_textlist_index("srv_worlds") menu_worldmt(selected, "server_announce", fields["cb_server_announce"]) @@ -125,16 +125,16 @@ local function main_button_handler(this, fields, name, tabdata) gamedata.port = fields["te_serverport"] gamedata.address = "" - core.setting_set("port",gamedata.port) + core.settings:set("port",gamedata.port) if fields["te_serveraddr"] ~= nil then - core.setting_set("bind_address",fields["te_serveraddr"]) + core.settings:set("bind_address",fields["te_serveraddr"]) end --update last game local world = menudata.worldlist:get_raw_element(gamedata.selected_world) if world then local game, index = gamemgr.find_by_gameid(world.gameid) - core.setting_set("menu_last_game", game.id) + core.settings:set("menu_last_game", game.id) end core.start() diff --git a/textures/base/ignore.png b/textures/base/ignore.png new file mode 100644 index 000000000..fd92800bf Binary files /dev/null and b/textures/base/ignore.png differ diff --git a/textures/base/pack/air.png b/textures/base/pack/air.png deleted file mode 100644 index e2c487214..000000000 Binary files a/textures/base/pack/air.png and /dev/null differ diff --git a/textures/base/pack/ignore.png b/textures/base/pack/ignore.png deleted file mode 100644 index a73d2222d..000000000 Binary files a/textures/base/pack/ignore.png and /dev/null differ diff --git a/textures/base/pack/progress_bar.png b/textures/base/pack/progress_bar.png deleted file mode 100644 index e80367191..000000000 Binary files a/textures/base/pack/progress_bar.png and /dev/null differ diff --git a/textures/base/pack/progress_bar_bg.png b/textures/base/pack/progress_bar_bg.png deleted file mode 100644 index 4e30ae889..000000000 Binary files a/textures/base/pack/progress_bar_bg.png and /dev/null differ diff --git a/textures/base/pack/server_ping_1.png b/textures/base/pack/server_ping_1.png deleted file mode 100644 index ba5bba1e3..000000000 Binary files a/textures/base/pack/server_ping_1.png and /dev/null differ diff --git a/textures/base/pack/server_ping_2.png b/textures/base/pack/server_ping_2.png deleted file mode 100644 index 8dca0be0d..000000000 Binary files a/textures/base/pack/server_ping_2.png and /dev/null differ diff --git a/textures/base/pack/server_ping_3.png b/textures/base/pack/server_ping_3.png deleted file mode 100644 index c2cab017e..000000000 Binary files a/textures/base/pack/server_ping_3.png and /dev/null differ diff --git a/textures/base/pack/server_ping_4.png b/textures/base/pack/server_ping_4.png deleted file mode 100644 index 03b4b5b83..000000000 Binary files a/textures/base/pack/server_ping_4.png and /dev/null differ diff --git a/textures/base/progress_bar_bg.png b/textures/base/progress_bar_bg.png index 8197166b6..3e09a2cad 100644 Binary files a/textures/base/progress_bar_bg.png and b/textures/base/progress_bar_bg.png differ diff --git a/textures/base/progress_bar_overlay.png b/textures/base/progress_bar_overlay.png index 7e29f4ee8..dfbedc05c 100644 Binary files a/textures/base/progress_bar_overlay.png and b/textures/base/progress_bar_overlay.png differ diff --git a/textures/base/server_ping_1.png b/textures/base/server_ping_1.png new file mode 100644 index 000000000..f3c19194e Binary files /dev/null and b/textures/base/server_ping_1.png differ diff --git a/textures/base/server_ping_2.png b/textures/base/server_ping_2.png new file mode 100644 index 000000000..018ad1e1b Binary files /dev/null and b/textures/base/server_ping_2.png differ diff --git a/textures/base/server_ping_3.png b/textures/base/server_ping_3.png new file mode 100644 index 000000000..1a702d52c Binary files /dev/null and b/textures/base/server_ping_3.png differ diff --git a/textures/base/server_ping_4.png b/textures/base/server_ping_4.png new file mode 100644 index 000000000..bd369990b Binary files /dev/null and b/textures/base/server_ping_4.png differ