diff options
-rw-r--r-- | build.gradle (renamed from app/build.gradle) | 29 | ||||
-rw-r--r-- | settings.gradle | 1 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt) | 0 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt) | 0 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt) | 0 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt) | 0 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt) | 0 | ||||
-rw-r--r-- | src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt (renamed from app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt) | 0 | ||||
-rw-r--r-- | src/main/resources/dmg.png (renamed from app/src/main/resources/dmg.png) | bin | 8844 -> 8844 bytes | |||
-rw-r--r-- | src/main/resources/icon.icns (renamed from app/src/main/resources/icon.icns) | bin | 1575945 -> 1575945 bytes | |||
-rw-r--r-- | src/main/resources/icon.ico (renamed from app/src/main/resources/icon.ico) | bin | 220027 -> 220027 bytes | |||
-rw-r--r-- | src/main/resources/icon.png (renamed from app/src/main/resources/icon.png) | bin | 213761 -> 213761 bytes | |||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/app.png (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/app.png) | bin | 75026 -> 75026 bytes | |||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css) | 0 | ||||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png) | bin | 5289 -> 5289 bytes | |||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png) | bin | 5131 -> 5131 bytes | |||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml) | 0 | ||||
-rw-r--r-- | src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml (renamed from app/src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml) | 0 | ||||
-rw-r--r-- | src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt (renamed from app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt) | 0 |
19 files changed, 22 insertions, 8 deletions
diff --git a/app/build.gradle b/build.gradle index 584f0ab..49bc3d4 100644 --- a/app/build.gradle +++ b/build.gradle @@ -6,6 +6,10 @@ * User Manual available at https://docs.gradle.org/8.0.2/userguide/building_java_projects.html */ +import org.gradle.internal.os.OperatingSystem +import java.nio.file.Files +import java.io.File + buildscript { repositories { mavenCentral() @@ -28,6 +32,8 @@ plugins { apply plugin: 'io.github.fvarrui.javapackager.plugin' +version = "1.0" + repositories { // Use Maven Central for resolving dependencies. mavenCentral() @@ -62,7 +68,7 @@ distTar { } jar { - archiveFileName = 'ServerCraft.jar' + // archiveFileName = 'ServerCraft.jar' manifest { attributes 'Main-Class': application.mainClass @@ -83,12 +89,10 @@ task pack(type: io.github.fvarrui.javapackager.gradle.PackageTask, dependsOn: bu organizationUrl = "https://brysonsteck.xyz" organizationEmail = "me@brysonsteck.xyz" url = "https://codeberg.org/brysonsteck/ServerCraft" - createTarball = true - createZipball = true - additionalResources = [ file('src/main/resources/xyz/brysonsteck/ServerCraft/') ] linuxConfig { pngFile = file('src/main/resources/icon.png') + wrapJar = false } macConfig { @@ -109,11 +113,22 @@ task pack(type: io.github.fvarrui.javapackager.gradle.PackageTask, dependsOn: bu } } -clean.doFirst { - delete "${rootDir}/app/bin" - delete "${rootDir}/build" +// tasks.register('fixAppImageIcon', Copy) { +build.doLast { + if (OperatingSystem.current().isLinux()) { + exec { + workingDir "${buildDir}" + commandLine "mkdir", "-p", "assets/AppDir" + } + exec { + workingDir "${buildDir}" + commandLine "cp", "resources/main/icon.png", "assets/AppDir/ServerCraft.png" + } + } } +// build.finalizedBy(fixAppImageIcon) + javafx { version = "20" modules = ['javafx.controls', 'javafx.fxml', 'javafx.graphics'] diff --git a/settings.gradle b/settings.gradle index 0347dfc..4e1a932 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,3 @@ */ rootProject.name = 'ServerCraft' -include('app') diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt index 5b5ddac..5b5ddac 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/App.kt diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt index fbb61e4..fbb61e4 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/Main.kt diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt index dcf77ba..dcf77ba 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/InfoController.kt diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt index 99d1009..99d1009 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/controllers/PrimaryController.kt diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt index 757c32c..757c32c 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Download.kt diff --git a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt b/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt index 746bc55..746bc55 100644 --- a/app/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt +++ b/src/main/kotlin/xyz/brysonsteck/ServerCraft/server/Server.kt diff --git a/app/src/main/resources/dmg.png b/src/main/resources/dmg.png Binary files differindex 5c33572..5c33572 100644 --- a/app/src/main/resources/dmg.png +++ b/src/main/resources/dmg.png diff --git a/app/src/main/resources/icon.icns b/src/main/resources/icon.icns Binary files differindex fe1d98a..fe1d98a 100644 --- a/app/src/main/resources/icon.icns +++ b/src/main/resources/icon.icns diff --git a/app/src/main/resources/icon.ico b/src/main/resources/icon.ico Binary files differindex bcfb4b0..bcfb4b0 100644 --- a/app/src/main/resources/icon.ico +++ b/src/main/resources/icon.ico diff --git a/app/src/main/resources/icon.png b/src/main/resources/icon.png Binary files differindex a24c362..a24c362 100644 --- a/app/src/main/resources/icon.png +++ b/src/main/resources/icon.png diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/app.png b/src/main/resources/xyz/brysonsteck/ServerCraft/app.png Binary files differindex ceb633a..ceb633a 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/app.png +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/app.png diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css b/src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css index 023b0c1..023b0c1 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/css/info-tabs.css diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png b/src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png Binary files differindex c1951a7..c1951a7 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/icons/info.png diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png b/src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png Binary files differindex 4d66729..4d66729 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/icons/warning.png diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml b/src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml index f0b73f3..f0b73f3 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/info.fxml diff --git a/app/src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml b/src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml index 6b34102..6b34102 100644 --- a/app/src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml +++ b/src/main/resources/xyz/brysonsteck/ServerCraft/primary.fxml diff --git a/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt b/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt index aca9105..aca9105 100644 --- a/app/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt +++ b/src/test/kotlin/xyz/brysonsteck/serverfordummies/AppTest.kt |