brysonsteck/ServerCraft
brysonsteck/ServerCraft
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

fixed jvm settings being overwritten, hardcore error

Browse source
This commit is contained in:
Bryson Steck 2023-05-24 00:16:49 -06:00
parent e57a3d6864
commit 01f6beb513
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt
View file

@ -336,10 +336,10 @@ class PrimaryController {
} }
prop == "difficulty" -> { prop == "difficulty" -> {
if (value == "Hardcore") { if (value == "Hardcore") {
server.setProp("hardcode", "true") server.setProp("hardcore", "true")
server.setProp(prop, "hard") server.setProp(prop, "hard")
} else { } else {
server.setProp("hardcode", "false") server.setProp("hardcore", "false")
server.setProp(prop, value.lowercase()) server.setProp(prop, value.lowercase())
} }
} }
@ -777,6 +777,7 @@ class PrimaryController {
buildButton.text = "Build Server" buildButton.text = "Build Server"
} }
statusBar.text = "Ready." statusBar.text = "Ready."
server.dir = dir
server.loadProps() server.loadProps()
return result return result
} }

11
src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt
View file

@ -33,16 +33,23 @@ public class Server {
props.setProperty("level-seed", "") props.setProperty("level-seed", "")
props.setProperty("level-type", "minecraft:normal") props.setProperty("level-type", "minecraft:normal")
props.setProperty("motd", "A server for a dummy") props.setProperty("motd", "A server for a dummy")
writeProps()
} }
public fun loadProps(dir: String) { public fun loadProps(dir: String) {
val ins = File(dir + File.separator + "server.properties").inputStream() var ins = File(dir + File.separator + "server.properties").inputStream()
props.load(ins)
ins = File(dir + File.separator + "ServerCraft" + File.separator + "ServerCraft.properties").inputStream()
props.load(ins) props.load(ins)
} }
private fun writeProps() { private fun writeProps() {
val outs = File(dir + File.separator + "server.properties").outputStream() var outs = File(dir + File.separator + "server.properties").outputStream()
props.store(outs, "Minecraft server properties\nCreated with ServerCraft: https://codeberg.org/brysonsteck/ServerCraft") props.store(outs, "Minecraft server properties\nCreated with ServerCraft: https://codeberg.org/brysonsteck/ServerCraft")
val temp = Properties()
outs = File(dir + File.separator + "ServerCraft" + File.separator + "ServerCraft.properties").outputStream()
temp.setProperty("jvm-ram", props.getProperty("jvm-ram"))
temp.store(outs, "ServerCraft settings backup\nSometimes, Minecraft will completely overwrite the server.properties file,\ncompletely destroying these app-specific settings. This file backs up these settings\njust in case. :)\nhttps://codeberg.org/brysonsteck/ServerCraft")
} }
public fun getProp(prop: String): String { public fun getProp(prop: String): String {