2009Scape/classic-launcher
1
0
Fork 0
mirror of https://gitlab.com/2009scape/09launcher.git synced 2025-12-09 16:45:54 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'left-click-attack' into 'master'

Browse source 
Add support for editing the Left Click Attack setting.

See merge request 2009scape/09launcher!1
This commit is contained in:
Ceikry 2021-12-26 00:57:23 +00:00
commit 6ea4c51ad2
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/settingseditor/Json.kt
View file

@ -44,6 +44,7 @@ object Json {
slayer["opacity"] = SettingsWindow.slayerOpacity.text slayer["opacity"] = SettingsWindow.slayerOpacity.text
customization["login_theme"] = SettingsWindow.loginTheme.text customization["login_theme"] = SettingsWindow.loginTheme.text
customization["december_snow"] = SettingsWindow.enableSnowDecember.isToggled customization["december_snow"] = SettingsWindow.enableSnowDecember.isToggled
rcm["left_click_attack"] = SettingsWindow.enableLeftClickAttack.isToggled
launcher["closeOnClientLaunch"] = SettingsWindow.closeLauncherOnLaunch.isToggled launcher["closeOnClientLaunch"] = SettingsWindow.closeLauncherOnLaunch.isToggled
launcher["notifyUpdates"] = Settings.CHECK_FOR_UPDATES launcher["notifyUpdates"] = Settings.CHECK_FOR_UPDATES
@ -101,6 +102,7 @@ object Json {
SettingsWindow.slayerOpacity.text = slayer.getOrDefault("opacity","180").toString() SettingsWindow.slayerOpacity.text = slayer.getOrDefault("opacity","180").toString()
SettingsWindow.loginTheme.text = customization.getOrDefault("login_theme","scape main").toString() SettingsWindow.loginTheme.text = customization.getOrDefault("login_theme","scape main").toString()
SettingsWindow.enableSnowDecember.isToggled = customization.getOrDefault("december_snow", true) as Boolean SettingsWindow.enableSnowDecember.isToggled = customization.getOrDefault("december_snow", true) as Boolean
SettingsWindow.enableLeftClickAttack.isToggled = rcm.getOrDefault("left_click_attack", false) as Boolean
SettingsWindow.closeLauncherOnLaunch.isToggled = launcher.getOrDefault("closeOnClientLaunch", true) as Boolean SettingsWindow.closeLauncherOnLaunch.isToggled = launcher.getOrDefault("closeOnClientLaunch", true) as Boolean
Settings.CHECK_FOR_UPDATES = launcher.getOrDefault("notifyUpdates", true) as Boolean Settings.CHECK_FOR_UPDATES = launcher.getOrDefault("notifyUpdates", true) as Boolean
@ -117,4 +119,4 @@ object Json {
parse() parse()
} }
} }
} }

10
src/main/kotlin/settingseditor/SettingsWindow.kt
View file

@ -37,6 +37,7 @@ object SettingsWindow : JFrame("Client Settings") {
val borderOpacity = JTextField() val borderOpacity = JTextField()
val loginTheme = JTextField() val loginTheme = JTextField()
val enableSnowDecember = Checkbox() val enableSnowDecember = Checkbox()
val enableLeftClickAttack = Checkbox()
val xpDropsEnabled = Checkbox() val xpDropsEnabled = Checkbox()
val xpDropMode = JComboBox(xpDropModeOptions) val xpDropMode = JComboBox(xpDropModeOptions)
val xpTrackMode = JComboBox(xpTrackModeOptions) val xpTrackMode = JComboBox(xpTrackModeOptions)
@ -96,6 +97,7 @@ object SettingsWindow : JFrame("Client Settings") {
val slayerOpacityPanel = getThemedPanel(BorderLayout()) val slayerOpacityPanel = getThemedPanel(BorderLayout())
val loginThemePanel = getThemedPanel(BorderLayout()) val loginThemePanel = getThemedPanel(BorderLayout())
val enableSnowDecemberPanel = getThemedPanel(BorderLayout()) val enableSnowDecemberPanel = getThemedPanel(BorderLayout())
val enableLeftClickAttackPanel = getThemedPanel(BorderLayout())
val xpToggleLabel = getLabel("XP Drops Enabled") val xpToggleLabel = getLabel("XP Drops Enabled")
val xpDropLabel = getLabel("XP Drop Mode") val xpDropLabel = getLabel("XP Drop Mode")
val xpTrackLabel = getLabel("XP Track Mode") val xpTrackLabel = getLabel("XP Track Mode")
@ -104,6 +106,7 @@ object SettingsWindow : JFrame("Client Settings") {
val slayerOpacityLabel = getLabel("Slayer Tracker Opacity") val slayerOpacityLabel = getLabel("Slayer Tracker Opacity")
val loginThemeLabel = getLabel("Login Theme") val loginThemeLabel = getLabel("Login Theme")
val enableSnowDecemberLabel = getLabel("Enable Snow During December") val enableSnowDecemberLabel = getLabel("Enable Snow During December")
val enableLeftClickAttackLabel = getLabel("Enable Left Click Attack")
for(field in arrayOf(loginTheme, xpDropMode, xpTrackMode, slayerColor, slayerOpacity)) for(field in arrayOf(loginTheme, xpDropMode, xpTrackMode, slayerColor, slayerOpacity))
{ {
@ -147,6 +150,11 @@ object SettingsWindow : JFrame("Client Settings") {
slayerOpacityPanel.add(slayerOpacityLabel, BorderLayout.WEST) slayerOpacityPanel.add(slayerOpacityLabel, BorderLayout.WEST)
slayerOpacityPanel.add(slayerOpacity, BorderLayout.EAST) slayerOpacityPanel.add(slayerOpacity, BorderLayout.EAST)
pane.add(slayerOpacityPanel) pane.add(slayerOpacityPanel)
pane.add(getSeparator())
enableLeftClickAttackPanel.add(enableLeftClickAttackLabel, BorderLayout.WEST)
enableLeftClickAttackPanel.add(enableLeftClickAttack, BorderLayout.EAST)
pane.add(enableLeftClickAttackPanel)
addTab(pane, button, getLabel("Misc Settings")) addTab(pane, button, getLabel("Misc Settings"))
} }
@ -351,4 +359,4 @@ object SettingsWindow : JFrame("Client Settings") {
label.foreground = Color(227,208,179) label.foreground = Color(227,208,179)
return label return label
} }
} }