From d38d79e9b7de14f837b02b850cbd86a5c03cfc1b Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Sun, 21 May 2023 00:00:15 -0600 Subject: update readme, windows still borked --- .../ServerCraft/controllers/PrimaryController.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/main/kotlin') diff --git a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt index 5b26481..75ebbbd 100644 --- a/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt @@ -494,23 +494,32 @@ class PrimaryController { builder.directory(File(directory + "ServerCraft" + File.separator + "Spigot")) val proc = builder.start() val reader = InputStreamReader(proc.inputStream) + val errors = InputStreamReader(proc.errorStream) val br = BufferedReader(reader) + val ebr = BufferedReader(errors) try { var line = br.readLine() + var errorLine = ebr.readline() var currentline = 0.0 - while (line != null) { + while (line != null || errorLine != null) { if (!building) { proc.destroy() } - withContext(Dispatchers.JavaFx) {log(line)} + withContext(Dispatchers.JavaFx) { + if (errorLine != null) { + log(errorLine) + } + log(line) + } line = br.readLine() + errorLine = ebr.readline() currentline++ if (currentline > 15) { withContext(Dispatchers.JavaFx) {progressBar.progress = if (spigotBuilt) {currentline/1100.0} else {currentline/14122.0} } } } } catch (e: IOException) { - withContext(Dispatchers.JavaFx) {log("Stream Closed")} + withContext(Dispatchers.JavaFx) {log("Stream Closed: ${e.toString()}")} } } -- cgit v1.2.3