-Added close button to settings menu

-Added launcher settings tab

-Added automatic launcher update checker
This commit is contained in:
ceikry 2021-08-10 15:14:48 -05:00
parent b8ca80cd3d
commit 9fd2d9710d
12 changed files with 223 additions and 55 deletions

View file

@ -18,6 +18,7 @@ object Json {
val slayer = customization["slayer"] as JSONObject
val rcm = customization["right_click_menu"] as JSONObject
val styles = rcm["styles"] as JSONObject
val launcher = customization.getOrPut("launcher") { JSONObject() } as JSONObject
val background = rcm["background"] as JSONObject
val title_bar = rcm["title_bar"] as JSONObject
@ -42,6 +43,8 @@ object Json {
slayer["color"] = SettingsWindow.slayerColor.text
slayer["opacity"] = SettingsWindow.slayerOpacity.text
customization["login_theme"] = SettingsWindow.loginTheme.text
launcher["closeOnClientLaunch"] = SettingsWindow.closeLauncherOnLaunch.isToggled
launcher["notifyUpdates"] = Settings.CHECK_FOR_UPDATES
FileWriter(CONF).use { writer ->
writer.write(data.toJSONString())
@ -64,6 +67,7 @@ object Json {
}
val customization = data["customization"] as JSONObject
val launcher = customization.getOrPut("launcher") {JSONObject()} as JSONObject
val xpDrops = customization["xpdrops"] as JSONObject
val slayer = customization["slayer"] as JSONObject
val rcm = customization["right_click_menu"] as JSONObject
@ -95,6 +99,9 @@ object Json {
SettingsWindow.slayerColor.text = slayer.getOrDefault("color", "#635a38").toString()
SettingsWindow.slayerOpacity.text = slayer.getOrDefault("opacity","180").toString()
SettingsWindow.loginTheme.text = customization.getOrDefault("login_theme","scape main").toString()
SettingsWindow.closeLauncherOnLaunch.isToggled = launcher.getOrDefault("closeOnClientLaunch", true) as Boolean
Settings.CHECK_FOR_UPDATES = launcher.getOrDefault("notifyUpdates", true) as Boolean
} catch (e: Exception) {
println("error parsing settings, replacing with defaults...")
e.printStackTrace()