From 0522f0aae1bf69f9aa58f4e2de24ab9ada24431c Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Wed, 10 May 2023 00:06:00 -0600 Subject: java doesnt need downloading for now, running jar works --- app/build.gradle | 3 +++ .../kotlin/xyz/brysonsteck/serverfordummies/PrimaryController.kt | 9 +++++++-- .../main/resources/xyz/brysonsteck/serverfordummies/primary.fxml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index ac1dd3b..340cf3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,9 @@ dependencies { // Coroutines core implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.7.0" + + // Archiver + implementation "org.rauschig:jarchivelib:1.2.0" } application { diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/PrimaryController.kt b/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/PrimaryController.kt index 0932a3d..5bc578e 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/PrimaryController.kt +++ b/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/PrimaryController.kt @@ -2,6 +2,7 @@ package xyz.brysonsteck.serverfordummies import kotlinx.coroutines.* import kotlinx.coroutines.javafx.JavaFx +import org.rauschig.jarchivelib.* import java.io.File import java.io.IOException @@ -43,6 +44,7 @@ import javafx.stage.DirectoryChooser import javafx.stage.Modality import javafx.stage.Stage import javafx.event.EventHandler + import Download class PrimaryController { @@ -164,7 +166,6 @@ class PrimaryController { GlobalScope.launch(Dispatchers.Default) { progressBar.isVisible = true var downloads = mapOf( - "Java 20" to "https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_linux-x64_bin.tar.gz", "BuildTools" to "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar", ) downloads.forEach { @@ -197,7 +198,11 @@ class PrimaryController { @FXML private fun onStart() { - + statusBar.text = "The Minecraft Server is now running. Shutdown the server to unlock the settings." + @Suppress("OPT_IN_USAGE") + GlobalScope.launch(Dispatchers.Default) { + val proc = Runtime.getRuntime().exec("java -jar /home/bryson/test/testserver/server.jar"); + } } private fun createDialog(type: String, msg: String, yes: String, no: String) { diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml b/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml index 811ab8d..f09356b 100644 --- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml +++ b/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml @@ -221,7 +221,7 @@