aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/App.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/serverfordummies/App.kt)4
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/Main.kt5
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/InfoController.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/InfoController.kt)2
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/PrimaryController.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/PrimaryController.kt)26
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Download.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Download.kt)2
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Server.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Server.kt)2
-rw-r--r--app/src/main/kotlin/xyz/brysonsteck/serverfordummies/Main.kt5
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/app.png (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/app.png)bin75026 -> 75026 bytes
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/css/info-tabs.css (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/css/info-tabs.css)0
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/icons/info.png (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/info.png)bin5289 -> 5289 bytes
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/icons/warning.png (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/warning.png)bin5131 -> 5131 bytes
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/info.fxml (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/info.fxml)2
-rw-r--r--app/src/main/resources/xyz/brysonsteck/servercraft/primary.fxml (renamed from app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml)2
-rw-r--r--app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt2
14 files changed, 26 insertions, 26 deletions
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/App.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/App.kt
index 3ff7c46..7aa5639 100644
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/App.kt
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/App.kt
@@ -1,7 +1,7 @@
/*
* This Kotlin source file was generated by the Gradle 'init' task.
*/
-package xyz.brysonsteck.serverfordummies
+package xyz.brysonsteck.servercraft
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
@@ -17,7 +17,7 @@ class App : Application() {
var scene = Scene(loadFXML("primary"), 963.0, 713.0)
stage.icons.add(Image(this.javaClass.getResourceAsStream("app.png")))
stage.setResizable(false)
- stage.title = "Server For Dummies"
+ stage.title = "ServerCraft"
stage.scene = scene
stage.show()
}
diff --git a/app/src/main/kotlin/xyz/brysonsteck/servercraft/Main.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/Main.kt
new file mode 100644
index 0000000..e914e99
--- /dev/null
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/Main.kt
@@ -0,0 +1,5 @@
+package xyz.brysonsteck.servercraft
+
+fun main() {
+ App().run()
+} \ No newline at end of file
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/InfoController.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/InfoController.kt
index a0b7915..a4bdb18 100644
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/InfoController.kt
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/InfoController.kt
@@ -1,4 +1,4 @@
-package xyz.brysonsteck.serverfordummies.controllers
+package xyz.brysonsteck.servercraft.controllers
import javafx.fxml.FXML
import javafx.application.Platform
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/PrimaryController.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/PrimaryController.kt
index 81a860e..dd795e2 100644
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/controllers/PrimaryController.kt
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/controllers/PrimaryController.kt
@@ -1,4 +1,4 @@
-package xyz.brysonsteck.serverfordummies.controllers
+package xyz.brysonsteck.servercraft.controllers
import kotlinx.coroutines.*
import kotlinx.coroutines.javafx.JavaFx
@@ -52,9 +52,9 @@ import javafx.stage.Stage
import javafx.event.EventHandler
import org.rauschig.jarchivelib.*
-import xyz.brysonsteck.serverfordummies.server.Server
-import xyz.brysonsteck.serverfordummies.server.Download
-import xyz.brysonsteck.serverfordummies.App
+import xyz.brysonsteck.servercraft.server.Server
+import xyz.brysonsteck.servercraft.server.Download
+import xyz.brysonsteck.servercraft.App
class PrimaryController {
@FXML
@@ -265,8 +265,8 @@ class PrimaryController {
"BuildTools" to "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar",
)
val destinations = mapOf (
- "Java 20" to directory + "ServerForDummies" + File.separator + "Java" + File.separator,
- "BuildTools" to directory + "ServerForDummies" + File.separator + "Spigot" + File.separator
+ "Java 20" to directory + "ServerCraft" + File.separator + "Java" + File.separator,
+ "BuildTools" to directory + "ServerCraft" + File.separator + "Spigot" + File.separator
)
val spigotBuilt = File(destinations["BuildTools"]).exists()
val javaExtracted = File(destinations["Java 20"] + "jdk-20.0.1").exists()
@@ -301,13 +301,13 @@ class PrimaryController {
progressBar.progress = ProgressBar.INDETERMINATE_PROGRESS
statusBar.text = "Extracting Java archive..."
}
- var stream = archiver.stream(File(directory + "ServerForDummies" + File.separator + "Java" + File.separator + javaFile))
- val dest = File(directory + "ServerForDummies" + File.separator + "Java")
+ var stream = archiver.stream(File(directory + "ServerCraft" + File.separator + "Java" + File.separator + javaFile))
+ val dest = File(directory + "ServerCraft" + File.separator + "Java")
var entries = 0.0
while(stream.getNextEntry() != null && building) {
entries++
}
- stream = archiver.stream(File(directory + "ServerForDummies" + File.separator + "Java" + File.separator + javaFile))
+ stream = archiver.stream(File(directory + "ServerCraft" + File.separator + "Java" + File.separator + javaFile))
var entry = stream.getNextEntry()
var currentEntry = 0.0
do {
@@ -324,7 +324,7 @@ class PrimaryController {
statusBar.text = "Building Minecraft Server..."
}
val builder = ProcessBuilder("java", "-jar", "BuildTools.jar", "--rev", "latest", "-o", ".." + File.separator + ".." + File.separator)
- builder.directory(File(directory + "ServerForDummies" + File.separator + "Spigot"))
+ builder.directory(File(directory + "ServerCraft" + File.separator + "Spigot"))
val proc = builder.start()
val reader = InputStreamReader(proc.inputStream)
val br = BufferedReader(reader)
@@ -566,7 +566,7 @@ class PrimaryController {
if (directory[directory.length-1] != File.separatorChar)
directory += File.separatorChar
- val hasDummy = File(directory + "ServerForDummies").isDirectory
+ val hasDummy = File(directory + "ServerCraft").isDirectory
val hasProperties = File(directory + File.separator + "server.properties").isFile
val hasServer = findServerJar()
@@ -581,7 +581,7 @@ class PrimaryController {
statusBar.text = "Server needs to be built before starting."
} else if (!hasDummy && hasServer) {
// server created externally
- val result = createDialog("warning", "This server directory was not created by \nServerForDummies. Errors may occur; copying\nthe world directories to a new folder may be\nsafer. Proceed anyway?", "Yes", "No", true)
+ val result = createDialog("warning", "This server directory was not created by \nServerCraft. Errors may occur; copying\nthe world directories to a new folder may be\nsafer. Proceed anyway?", "Yes", "No", true)
statusBar.text = "Ready."
if (result) {
startButton.isDisable = false
@@ -591,7 +591,7 @@ class PrimaryController {
// assume clean directory
val result = createDialog("info", "There is no server in this directory.\nCreate one?", "Yes", "No", true)
if (result) {
- File(directory + "ServerForDummies").mkdir()
+ File(directory + "ServerCraft").mkdir()
startButton.isDisable = true
buildButton.text = "Build Server"
}
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Download.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Download.kt
index d7e5aed..a10ff69 100644
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Download.kt
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Download.kt
@@ -1,4 +1,4 @@
-package xyz.brysonsteck.serverfordummies.server
+package xyz.brysonsteck.servercraft.server
import java.io.*;
import java.net.*;
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Server.kt b/app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Server.kt
index 3aae89a..38e79a1 100644
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/server/Server.kt
+++ b/app/src/main/kotlin/xyz/brysonsteck/servercraft/server/Server.kt
@@ -1,4 +1,4 @@
-package xyz.brysonsteck.serverfordummies.server
+package xyz.brysonsteck.servercraft.server
import java.io.File
import java.util.Properties
diff --git a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/Main.kt b/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/Main.kt
deleted file mode 100644
index 604825f..0000000
--- a/app/src/main/kotlin/xyz/brysonsteck/serverfordummies/Main.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package xyz.brysonsteck.serverfordummies
-
-fun main() {
- App().run()
-} \ No newline at end of file
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/app.png b/app/src/main/resources/xyz/brysonsteck/servercraft/app.png
index ceb633a..ceb633a 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/app.png
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/app.png
Binary files differ
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/css/info-tabs.css b/app/src/main/resources/xyz/brysonsteck/servercraft/css/info-tabs.css
index 023b0c1..023b0c1 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/css/info-tabs.css
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/css/info-tabs.css
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/info.png b/app/src/main/resources/xyz/brysonsteck/servercraft/icons/info.png
index c1951a7..c1951a7 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/info.png
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/icons/info.png
Binary files differ
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/warning.png b/app/src/main/resources/xyz/brysonsteck/servercraft/icons/warning.png
index 4d66729..4d66729 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/icons/warning.png
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/icons/warning.png
Binary files differ
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/info.fxml b/app/src/main/resources/xyz/brysonsteck/servercraft/info.fxml
index 1457d46..9228a2b 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/info.fxml
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/info.fxml
@@ -15,7 +15,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="358.0" prefWidth="398.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.brysonsteck.serverfordummies.controllers.InfoController">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="358.0" prefWidth="398.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.brysonsteck.servercraft.controllers.InfoController">
<children>
<ImageView fitHeight="115.0" fitWidth="92.0" layoutX="30.0" layoutY="30.0" pickOnBounds="true" preserveRatio="true">
<image>
diff --git a/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml b/app/src/main/resources/xyz/brysonsteck/servercraft/primary.fxml
index 2cedc4f..dfdadd7 100644
--- a/app/src/main/resources/xyz/brysonsteck/serverfordummies/primary.fxml
+++ b/app/src/main/resources/xyz/brysonsteck/servercraft/primary.fxml
@@ -20,7 +20,7 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?>
-<Pane fx:id="primary" maxHeight="713.0" maxWidth="963.0" minHeight="713.0" minWidth="963.0" prefHeight="713.0" prefWidth="963.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.brysonsteck.serverfordummies.controllers.PrimaryController">
+<Pane fx:id="primary" maxHeight="713.0" maxWidth="963.0" minHeight="713.0" minWidth="963.0" prefHeight="713.0" prefWidth="963.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.brysonsteck.servercraft.controllers.PrimaryController">
<children>
<HBox fx:id="directoryPane" prefHeight="39.0" prefWidth="963.0">
<children>
diff --git a/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt b/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt
index e1d1866..0376e26 100644
--- a/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt
+++ b/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt
@@ -1,7 +1,7 @@
/*
* This Kotlin source file was generated by the Gradle 'init' task.
*/
-package xyz.brysonsteck.serverfordummies
+package xyz.brysonsteck.servercraft
import kotlin.test.Test
import kotlin.test.assertNotNull