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 'master' into 'master'

Browse source 
No longer dump stuff in home folder on Linux

See merge request 2009scape/09launcher!4
This commit is contained in:
Ceikry 2022-04-24 17:09:27 +00:00
commit a6e855a740
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/Globals.kt
View file

@ -10,10 +10,10 @@ fun Component.placeAt(x: Int, y: Int, width: Int, height: Int){
fun launchClient() {
println("Launching client now.")
var proc = Runtime.getRuntime().exec("java -jar " + Settings.SAVE_NAME, null, File(System.getProperty("user.home")))
var proc = Runtime.getRuntime().exec("java -jar " + Settings.SAVE_NAME, null, File(Settings.SAVE_DIR))
if(proc.isAlive && SettingsWindow.closeLauncherOnLaunch.isToggled){
exitProcess(0)
} else if(SettingsWindow.closeLauncherOnLaunch.isToggled) {
MainWindow.loadingLabel.text = "Error starting the client."
}
}
}

8
src/main/kotlin/Settings.kt
View file

@ -1,5 +1,9 @@
object Settings {
val SAVE_DIR = System.getProperty("user.home")
val os = System.getProperty("os.name").toLowerCase()
var SAVE_DIR = when(os.contains("nix") || os.contains("nux") || os.contains("aix")) {
true -> System.getProperty("user.home") + "/.local/share/2009scape"
false -> System.getProperty("user.home")
}
val SAVE_NAME = "2009scape.jar"
val DOWNLOAD_URL = "http://play.2009scape.org/2009scape.jar"
val LAUNCHER_URL = "https://gitlab.com/2009scape/09launcher/-/jobs/artifacts/master/raw/build/libs/2009scape.jar?job=build"
@ -9,4 +13,4 @@ object Settings {
field = value
println(value)
}
}
}

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

@ -8,11 +8,24 @@ import java.io.FileWriter
object Json {
val HOME = System.getProperty("user.home")
val os = System.getProperty("os.name").toLowerCase()
var HOME = when(os.contains("nix") || os.contains("nux") || os.contains("aix")) {
true -> System.getProperty("user.home") + "/.local/share/2009scape"
false -> System.getProperty("user.home")
}
val CONF = HOME + File.separator + "config.json"
var data: JSONObject = JSONObject()
init {
val dir = File(HOME)
if (!dir.exists()) {
dir.mkdirs()
}
}
fun save(){
val osName = System.getProperty("os.name").toLowerCase()
val customization = data["customization"] as JSONObject
val xpDrops = customization["xpdrops"] as JSONObject
val slayer = customization["slayer"] as JSONObject