projectswg/launcher
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/launcher.git synced 2026-01-16 23:04:25 -05:00
Code Issues Projects Releases Wiki Activity

Got jlink to create something runnable

Browse Source
This commit is contained in:
Josh Larson
2019-10-09 01:41:15 -04:00
parent 62921cf6bd
commit 19a222f211
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@@ -10,7 +10,7 @@ plugins {
id 'org.jetbrains.kotlin.jvm' version '1.3.50'
id "com.github.johnrengelman.shadow" version "5.1.0"
id "org.openjfx.javafxplugin" version "0.0.7"
id "org.beryx.jlink" version "2.15.1"
id "org.beryx.jlink" version "2.16.0"
id "org.javamodularity.moduleplugin" version "1.5.0"
}
@@ -18,9 +18,12 @@ plugins {
group = 'com.projectswg.launcher'
version = '1.3.2'
mainClassName = "com.projectswg.launcher.core.LauncherKt"
sourceCompatibility = 12
application {
mainClassName = "com.projectswg.launcher/com.projectswg.launcher.core.LauncherKt"
}
sourceSets {
main {}
utility {}
@@ -41,7 +44,7 @@ jlink {
javafx {
version = "12.0.1"
modules = ['javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
modules = ['javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.media']
}
shadowJar {
@@ -63,8 +66,11 @@ dependencies {
compile 'net.openhft:zero-allocation-hashing:0.8'
compile group: 'me.joshlarson', name: 'fast-json', version: '2.2.3'
compile group: 'me.joshlarson', name: 'jlcommon-fx', version: '1.0.3'
compile group: 'no.tornado', name: 'tornadofx', version: '2.0.0-SNAPSHOT'
compile(group: 'no.tornado', name: 'tornadofx', version: '2.0.0-SNAPSHOT') {
exclude group: "org.jetbrains.kotlin"
}
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.50'
compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: '1.3.50'
compile 'de.jensd:fontawesomefx-fontawesome:4.7.0-9.1.2'
utilityCompile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60'

2
client-holocore

Submodule client-holocore updated: 1fb38ecf37...42894ee7e1

2
forwarder

Submodule forwarder updated: f84b584572...2e48e15577

2
src/main/java/com/projectswg/launcher/core/resources/gui/ServerListView.kt
View File

@@ -42,7 +42,7 @@ class ServerListView : View() {
placeholder = label(messages["noServers"])
setSortPolicy { _ -> Comparator.comparing<LoginServer, String> { it.name }; true }
column(messages["servers.column.name"], LoginServer::nameProperty) {
column(messages["servers.column.name"], valueProvider={cellDataFeatures:TableColumn.CellDataFeatures<LoginServer, String> -> ReadOnlyStringWrapper(cellDataFeatures.value?.name) }).apply {
prefWidth = COL_WIDTH_LARGE
styleClass += "center-table-cell"
}

9
src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayCell.kt
View File

@@ -79,10 +79,11 @@ class ServerPlayCell : TableCellFragment<LoginServer, LoginServer>() {
gameInstance.start()
GameLaunchedIntent(gameInstance).broadcast()
gameInstance
} ui {
if (LauncherData.INSTANCE.general.isAdmin) {
find<AdminDisplay>(AdminDisplay::forwarder to it.forwarder).openWindow()
}
// } ui {
// if (LauncherData.INSTANCE.general.isAdmin) {
// find<AdminDisplay>(AdminDisplay::forwarder to it.forwarder).openWindow()
// TODO: Fix admin display
// }
}
}
REQUIRES_DOWNLOAD -> DownloadPatchIntent(updateServerProperty.value ?: return).broadcast()