# Cleanup (See below)

* Remove installer (javafx-gradle-plugin)
    * Remove signed builds - ability
* Exclude SQLite linux natives and win32 natives
* Update readme
* Fix initial launcher startup

Author: Bios-Marcel

README.md

@@ -49,10 +49,11 @@ Overall, you have 3 options:
 
 The latest `launcher.jar` is available under https://github.com/Bios-Marcel/ServerBrowser/releases/latest , but it will **require** you to have Java 8 or later installed, i strongly suggest installing **Java 9**, since future versions of this project will use **Java 9**.
 
-#### Downloading the latest Installer
+#### Downloading the latest Installer (NOT SUPPORTED ANYMORE)
 
-The latest installer is also available under https://github.com/Bios-Marcel/ServerBrowser/releases/latest
+The latest installer is also available under https://github.com/Bios-Marcel/ServerBrowser/releases/tag/8.5.7
 Unlike when using the `launcher.jar` file, the installer **won't require** you to download anything other than the installer itself.
+The installer isn't supported after version 8.5.7 anymore.
 
 #### Build all the stuff yourself
 
@@ -97,7 +98,7 @@ There is a light and a dark theme, here are screenshots including both themes:
 
 ![Settings Light](https://i.imgur.com/CVds2Od.png)
 
-## Documentation
+## Documentation (Outdated)
 
 Javadoc is available under: (https://bios-marcel.github.io/ServerBrowser-Doc/overview-summary.html)
 
@@ -425,19 +426,6 @@ enterServerPasswordMessage=Enter the servers password (Leave empty if you think
 
 This project is managed using [gradle](https://gradle.org).
 
-### Structure
-
-The project formerly consisted of 3 subprojects, those were `client`, `server` and `shared`, but since the backend has
-been removed, `shared` and `client` got merged into `client`.
-
-```
-ServerBrowser			The parent project
-|__ client				The Windows GUI client with which humans interact
-```
-
-At some point the project structure might get to see a refactoring, since the multi-project structure isn't necessary
-in this case.
-
 ### Building with Gradle
 
 To see which tasks are available, run:
@@ -467,16 +455,15 @@ $ cd client
 $ ../gradlew run
 ```
 
-Or run it from the parent project by prefixing the task with the subprojects name and a ":" (colon).
+Assemble and test the build outputs. You will find the results in the __build__ folder of __client__.
 
 ``` shell
-$ ./gradlew client:run
+$ ./gradlew build
 ```
 
-Assemble and test the build outputs. You will find the results in the __build__ folder of __client__.
-
+In order to build a runnable `.jar` file, run:
 ``` shell
-$ ./gradlew build
+$ ./gradlew shadowJar
 ```
 
 ### Syncing gradle with Eclipse
@@ -493,75 +480,5 @@ $ ./gradlew eclipseClean eclipse
 
 Eclipse will instantly reload the fresh project settings files.
 
-### Pipeline
-
-__ServerBrowser__ utilizes advanced build techniques in order to assemble and optimize the output. The goal is to build the smallest possible 'self-contained' executable for Windows for the client.
-
-__self-contained__ in this context means the JVM is bundled with the output.
-
-In order to achieve this the following 2 step process is used:
-
-1. Put all build outputs into a single JAR (fat JAR), including (transitive) dependencies.
-2. Bundle the optimized JAR with a JVM and build a native container around them (exe/deb).
-
-These steps map to these tools:
-
-1. [Gradle Shadow Plugin](http://imperceptiblethoughts.com/shadow/#introduction)
-2. [javapackager](https://github.com/FibreFoX/javafx-gradle-plugin) + [JavaFX-Gradle-Plugin](https://github.com/FibreFoX/javafx-gradle-plugin)
-
-Our build scripts are largely glue around those tools.
-
-### Building the native output
-
-``` shell
-$ ./gradlew jfxNative
-```
-
-This will generate an installable artifact in `client/build/jfx/native`. Depending on which platform you are building from, an EXE is generated on Windows, DEB/RPM on Linux and PKG/DMG on OSX.
-
-We support Windows and Linux and in order to be able to generate an installer, some dependencies need to be installed.
-
-#### Windows
-
-- Inno Setup 5 or later
-
-#### Linux (rpm)
-
-- RPMBuild
-
-#### Linux (deb)
-
-- Debian packaging tools
-
-### Javapackager
-
-The underlying technology for building native installer bundles is `javapackager`.
-Learn more about it here:
-
-- https://docs.oracle.com/javase/8/docs/technotes/guides/deploy/self-contained-packaging.html
-- https://docs.oracle.com/javase/8/docs/technotes/tools/windows/javapackager.html
-- https://docs.oracle.com/javase/8/docs/technotes/tools/unix/javapackager.html
-
-### Realising a signed build
-
-Our builds are cryptographically signed. In order to build with signing enabled you need to setup 2 things.
-
-* A `local.properties` file:
-
-```
-localSecretKeystorePassword = "choose super secret pw"
-localSecretKeyPassword = "choose super secret pw yet again!"
-```
-
-* A keystore and private key
-
-Once you have your passwords setup, these can automatically generated for you with:
-
-``` shell
-$ ./gradlew jfxGenerateKeyStore
-```
-
-None of these files should __ever__ be committed to version control !
-
 ## You need help?
 [Send me an E-Mail](mailto:[email protected])

build.gradle

@@ -1,14 +1,11 @@
-/*
-* When using plugins in gradle, we need to tell it where it can download them:
-*/
 buildscript {
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
     }
-    ext.kotlin_version = '1.2.31'
+
+    ext.kotlin_version = '1.2.41'
     dependencies {
-        classpath 'de.dynamicfiles.projects.gradle.plugins:javafx-gradle-plugin:8.8.+'
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.+'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-M4'
@@ -26,16 +23,16 @@ apply plugin: 'org.junit.platform.gradle.plugin'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-mainClassName = "com.msc.serverbrowser.Client"
+mainClassName = 'com.msc.serverbrowser.Client'
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = '1.8'
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = '1.8'
     }
 }
 
@@ -64,11 +61,8 @@ dependencies {
     compile 'com.github.albfernandez:juniversalchardet:2.0.+'
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    //javapacker for native build. This will only be necessary if the userJvmOptions are used
-    //compile files("${System.properties['java.home']}/../lib/packager.jar")
-
-    testCompile("org.junit.jupiter:junit-jupiter-api:5.0.0-M4")
-    testRuntime("org.junit.jupiter:junit-jupiter-engine:5.0.0-M4")
+    testCompile 'org.junit.jupiter:junit-jupiter-api:5.0.0-M4'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.0.0-M4'
 }
 
 /*
@@ -78,120 +72,34 @@ task wrapper(type: Wrapper) {
     gradleVersion = gradleWrapperVersion
 }
 
-/*
-* Load private and secret properties!
-*/
-def localProps = project.rootProject.file('local.properties')
-if (localProps.exists()) {
-    Properties properties = new Properties()
-    properties.load(localProps.newDataInputStream())
-    ext.localSecretKeystorePassword = properties.getProperty('localSecretKeystorePassword')
-    ext.localSecretKeyPassword = properties.getProperty('localSecretKeyPassword')
-} else {
-    //for the travis build we set the secrets via environment variables, because these can be encrypted with travis api
-    ext.localSecretKeystorePassword = System.getenv("KEYSTORE_PW")
-    ext.localSecretKeyPassword = System.getenv("KEY_PW")
-}
-
-
 apply plugin: 'com.github.johnrengelman.shadow'
 shadowJar {
+    baseName = 'launcher'
+    classifier = null
+    version = null
+
     /*
     * WARNING! Changes to excludes/includes only seem to take effect after a "clean" with gradle.
     * I am not sure where the bug lies, but this should not happen with gradle...
     */
-    //Excluding binary stuff for unsupported platforms
 
+    //Excluding binary stuff for unsupported platforms
     exclude 'org/sqlite/native/Linux/android-arm/**'
     exclude 'org/sqlite/native/Linux/arm/**'
     exclude 'org/sqlite/native/Linux/armv6/**'
     exclude 'org/sqlite/native/Linux/armv7/**'
     exclude 'org/sqlite/native/Linux/ppc64/**'
+    exclude 'org/sqlite/native/Linux/x86/**'
+    exclude 'org/sqlite/native/Linux/x86_64/**'
     exclude 'org/sqlite/native/FreeBSD/**'
     exclude 'org/sqlite/native/Mac/**'
-    //Theoretically, in a distant future, one could kill windows 32bit support...
-    //exclude 'org/sqlite/native/Windows/x86/**'
 
-    //Linux x86 bit support already killed
-    exclude 'org/sqlite/native/Linux/x86/**'
+    //If you are still using 32-bit ... fuck you ;)
+    exclude 'org/sqlite/native/Windows/x86/**'
 
     //Trash
     exclude 'META-INF/maven/**'
 
     //Merges all service file under "META-INF/services" to one
     mergeServiceFiles()
 }
-
-/*
-* The 'javafx-gradle-plugin' can generate executable JARs, exe, deb, RPM and DMG files.
-* Shadow generates a fat JAR.
-* Proguard is an optimizer.
-*/
-apply plugin: 'javafx-gradle-plugin'
-jfx {
-    verbose = true
-
-    mainClass = mainClassName
-    println("$mainClass")
-    vendor = projectVendor
-
-    // String - setting this for windows-bundlers makes it possible to generate upgradeable installers (using same GUID)
-    identifier = "$projectGroup" + "." + "$rootProject.name" + "." + "$projectVendor" + "." + "$projectVersion"
-
-    nativeReleaseVersion = "$projectVersion"
-
-    //bundler = "RPM"
-
-    //useful during debugging. but when all bundles are tried, some WILL ALWAYS fail, because EXE can only be built on windows, DEB/RPM on linux and PKG/DMG on OSX.
-    //failOnError = true
-
-    //TODO
-    //icon under linux does not work
-    //remove libs from native bundle
-    //jvmArgs = ['-Xmx=128m','-Xms=64m'] //this syntax is wrong
-    //remove eclipse annotations
-    //signing
-
-    needShortcut = true
-    needMenu = true
-
-    bundleArguments = [
-            copyright      : "TODO",
-            email          : "TODO",
-            category       : "Game",
-            "win.menuGroup": "Game",
-            licenseType    : 'MPLv2.0',
-            //because windows is "special", it requires "special" file formats for the license...
-            licenseFile    : org.gradle.internal.os.OperatingSystem.current().isWindows() ? 'license.rtf' : 'LICENSE'
-    ]
-    // per default the outcome of the gradle "jarTask" will be used, set this to specify otherwise (like proguard-output)
-    alternativePathToJarFile = "$libsDir/$shadowJar.baseName-$shadowJar.version-$shadowJar.classifier" + ".jar"
-    copyAdditionalAppResourcesToJar = true
-    skipCopyingDependencies = true
-    useLibFolderContentForManifestClasspath = true
-
-    // this is used for files below "src/main/deploy", e.g. "src/main/deploy/windows/$rootProject.name.ico"
-    appName = "SA-MP-ServerBrowser"
-    additionalAppResources = 'src/main/additionalFiles'
-    jfxMainAppJarName = "$appName" + ".jar"
-
-    //precompiles the CSS to binary. Useful performance gain, if the CSS files are not modified during runtime
-    css2bin = true
-
-    // gradle jfxGenerateKeyStore
-    keyStore = "src/main/deploy/keystore.jks"
-    keyStoreAlias = "$projectVendor" + "-" + "$rootProject.name"
-    // assumes you have a file "local.properties" which does NOT get version controlled!
-    keyStorePassword = "$localSecretKeystorePassword"
-    keyPassword = "$localSecretKeyPassword"
-    keyStoreType = "jks"
-    overwriteKeyStore = false
-
-    certDomain = "$projectGroup" // required
-    certOrgUnit = "$projectVendor" // defaults to "none"
-    certOrg = "$projectVendor" // required
-    certState = "Lower Saxony" // required
-    certCountry = "Germany" // required
-}
-
-jfxJar.dependsOn shadowJar

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion = 8.5.7
+projectVersion = 8.5.8
 projectGroup = me.marcelschr.samp
 projectVendor = Bios-Marcel
 gradleWrapperVersion = 4.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Apr 30 15:51:17 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

src/main/kotlin/com/msc/serverbrowser/Client.kt

@@ -67,6 +67,7 @@ class Client : Application() {
 
     override fun start(primaryStage: Stage) {
         loadUI(primaryStage)
+        primaryStage.titleProperty().bind(mainController.titleProperty)
 
         // Only update if not in development mode
         if (!isDevelopmentModeActivated) {
@@ -190,15 +191,6 @@ class Client : Application() {
         }.start()
     }
 
-    /**
-     * Adds nodes to the Clients bottom bar.
-     *
-     * @param nodes the node that will be added
-     */
-    fun addItemsToBottomBar(vararg nodes: Node) {
-        mainController.addItemsToBottomBar(*nodes)
-    }
-
     /**
      * Downloads the latest version and restarts the client.
      */
@@ -358,6 +350,7 @@ class Client : Application() {
         var languageResourceBundle: ResourceBundle
 
         init {
+            createFolderStructure()
             val locale = Locale(ClientPropertiesController.getProperty(LanguageProperty))
             languageResourceBundle = ResourceBundle.getBundle("com.msc.serverbrowser.localization.Lang", locale)
         }
@@ -371,7 +364,6 @@ class Client : Application() {
          */
         @JvmStatic
         fun main(args: Array<String>) {
-            createFolderStructure()
             Thread.setDefaultUncaughtExceptionHandler { thread, exception ->
                 Logging.error("Uncaught exception in thread: $thread", exception)
                 Platform.runLater { UncaughtExceptionHandlerView(UncaughtExceptionHandlerController(), exception).show() }

src/main/kotlin/com/msc/serverbrowser/FXExtension.kt

@@ -3,4 +3,4 @@ package com.msc.serverbrowser
 import javafx.scene.layout.Region
 import javafx.stage.Window
 
-fun Region.getWindow(): Window = this.scene.window
+fun Region.getWindow(): Window? = this.scene?.window

src/main/kotlin/com/msc/serverbrowser/constants/PathConstants.kt

@@ -24,6 +24,8 @@ object PathConstants {
     private val CACHE = SAMPEX_PATH + File.separator + "cache"
     val CLIENT_CACHE = CACHE + File.separator + "clientversions"
     val SAMP_CMD = SAMPEX_PATH + File.separator + "sampcmd.exe"
+    val TEMP_INSTALLER_ZIP = SAMPEX_PATH + File.separator + "tempInstaller.zip"
+    val TEMP_INSTALLER_EXE = SAMPEX_PATH + File.separator + "tempInstaller.exe"
 
     // GTA / SAMP specific Paths
     private val GTA_USER_FILES = (FileSystemView.getFileSystemView().defaultDirectory.path + File.separator
@@ -33,6 +35,4 @@ object PathConstants {
     val SAMP_CFG = SAMP_PATH + File.separator + "sa-mp.cfg"
     val SAMP_CHATLOG = "$SAMP_PATH\\chatlog.txt"
     val SAMP_USERDATA = "$SAMP_PATH\\USERDATA.DAT"
-    val TEMP_INSTALLER_ZIP = SAMPEX_PATH + File.separator + "tempInstaller.zip"
-    val TEMP_INSTALLER_EXE = SAMPEX_PATH + File.separator + "tempInstaller.exe"
 }