From 583caa3fa055ce37079aafca7c2fa72c83eaf247 Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Tue, 25 Dec 2018 11:07:41 -0600 Subject: [PATCH] Added TLSv1.3 encryption --- .gitmodules | 3 - build.gradle | 65 +- client-holocore | 2 +- forwarder | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 55741 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 +++++ gradlew.bat | 84 +++ license.txt | 661 ++++++++++++++++++ pswgcommon | 2 +- pswgcommonfx | 1 - settings.gradle | 1 - .../projectswg/launcher/core/Launcher.java | 47 +- .../UserInterfaceService.java => Test.java} | 60 +- .../core/resources/data/LauncherData.java | 21 +- .../data/announcements/AnnouncementsData.java | 2 +- .../data/forwarder/ForwarderData.java | 2 +- .../resources/data/general/GeneralData.java | 21 +- .../core/resources/data/login/LoginData.java | 2 +- .../resources/data/login/LoginServer.java | 24 +- .../data/login/LoginServerInstanceInfo.java | 4 +- .../resources/data/update/UpdateData.java | 2 +- .../resources/data/update/UpdateServer.java | 8 +- .../core/resources/game/GameInstance.java | 17 +- .../core/resources/game/ProcessExecutor.java | 2 +- .../gui/AnnouncementsController.java | 6 +- .../launcher/core/resources/gui/Card.java | 3 +- .../core/resources/gui/LauncherUI.java | 73 -- .../resources/gui/NavigationController.java | 48 +- .../resources/gui/ServerListController.java | 16 +- .../resources/gui/SettingsController.java | 2 +- .../gui/servers/ServerPlayButton.java | 4 +- .../resources/gui/servers/ServerPlayCell.java | 4 +- .../gui/servers/ServerPlayLabel.java | 10 +- .../settings/SettingsForwarderController.java | 10 +- .../settings/SettingsGeneralController.java | 22 +- .../gui/settings/SettingsLoginController.java | 40 +- .../settings/SettingsUpdateController.java | 6 +- .../services/data/AnnouncementService.java | 16 +- .../core/services/data/DownloadService.java | 2 +- .../services/data/PreferencesDataService.java | 65 +- .../core/services/data/RemoteDataService.java | 21 +- .../services/launcher/LauncherManager.java | 1 - src/main/java/module-info.java | 27 + .../{theme/projectswg => }/css/theme.css | 0 .../projectswg => }/fxml/announcements.fxml | 0 .../projectswg => }/fxml/navigation.fxml | 2 +- .../{theme/projectswg => }/fxml/servers.fxml | 2 +- .../{theme/projectswg => }/fxml/settings.fxml | 0 .../fxml/settings/settings_forwarder.fxml | 0 .../fxml/settings/settings_general.fxml | 6 + .../fxml/settings/settings_login.fxml | 6 + .../fxml/settings/settings_update.fxml | 0 .../graphics/ProjectSWGLaunchpad.icns | Bin .../graphics/headers/server-table.png | Bin .../projectswg => }/graphics/pswg_icon.png | Bin .../{bundles => }/strings/strings.properties | 4 + .../strings/strings_de.properties | 2 + 58 files changed, 1304 insertions(+), 305 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 license.txt delete mode 160000 pswgcommonfx rename src/main/java/com/projectswg/launcher/core/{services/launcher/UserInterfaceService.java => Test.java} (62%) delete mode 100644 src/main/java/com/projectswg/launcher/core/resources/gui/LauncherUI.java create mode 100644 src/main/java/module-info.java rename src/main/resources/{theme/projectswg => }/css/theme.css (100%) rename src/main/resources/{theme/projectswg => }/fxml/announcements.fxml (100%) rename src/main/resources/{theme/projectswg => }/fxml/navigation.fxml (93%) rename src/main/resources/{theme/projectswg => }/fxml/servers.fxml (89%) rename src/main/resources/{theme/projectswg => }/fxml/settings.fxml (100%) rename src/main/resources/{theme/projectswg => }/fxml/settings/settings_forwarder.fxml (100%) rename src/main/resources/{theme/projectswg => }/fxml/settings/settings_general.fxml (77%) rename src/main/resources/{theme/projectswg => }/fxml/settings/settings_login.fxml (78%) rename src/main/resources/{theme/projectswg => }/fxml/settings/settings_update.fxml (100%) rename src/main/resources/{theme/projectswg => }/graphics/ProjectSWGLaunchpad.icns (100%) rename src/main/resources/{theme/projectswg => }/graphics/headers/server-table.png (100%) rename src/main/resources/{theme/projectswg => }/graphics/pswg_icon.png (100%) rename src/main/resources/{bundles => }/strings/strings.properties (81%) rename src/main/resources/{bundles => }/strings/strings_de.properties (86%) diff --git a/.gitmodules b/.gitmodules index bb4db48..c82164f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "pswgcommon"] path = pswgcommon url = git@bitbucket.org:projectswg/pswgcommon.git -[submodule "pswgcommonfx"] - path = pswgcommonfx - url = git@bitbucket.org:projectswg/pswgcommonfx.git [submodule "forwarder"] path = forwarder url = git@bitbucket.org:projectswg/forwarder.git diff --git a/build.gradle b/build.gradle index 39da7b1..d812aa4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,41 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' - } -} +import org.beryx.jlink.data.TargetPlatform plugins { id 'application' id 'java' id 'idea' id "edu.sc.seis.macAppBundle" version "2.2.1" + id "com.github.johnrengelman.shadow" version "4.0.3" + id "org.openjfx.javafxplugin" version "0.0.5" + id "org.beryx.jlink" version "2.2.1" + id "org.javamodularity.moduleplugin" version "1.3.0" } -group = 'com.projectswg.launcher' -version = '0.1' -mainClassName = 'com.projectswg.launcher.core.Launcher' -sourceCompatibility = 9 -targetCompatibility = 9 +// Note: define javaVersion, javaHomeLinux, javaHomeMac, and javaHomeWindows inside your gradle.properties file -apply plugin: 'com.github.johnrengelman.shadow' +group = 'com.projectswg.launcher' +version = '1.1.13' +mainClassName = "com.projectswg.launcher.core.Launcher" +sourceCompatibility = 11 +targetCompatibility = 11 sourceSets { - utility { - - } + main {} + utility {} +} + +idea { + module { + inheritOutputDirs = true + } +} + +jlink { + options.addAll('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages') + targetPlatforms.orNull.put('linux', new TargetPlatform('linux', javaHomeLinux)) + targetPlatforms.orNull.put('mac', new TargetPlatform('mac', javaHomeMac)) + targetPlatforms.orNull.put('windows', new TargetPlatform('windows', javaHomeWindows)) } shadowJar { @@ -37,10 +45,18 @@ shadowJar { } macAppBundle { - appName = "ProjectSWG Launcher" - dmgName = "Launcher-mac" - icon = "src/main/resources/theme/projectswg/graphics/ProjectSWGLaunchpad.icns" - mainClassName = "${->project.mainClassName}" + appName "ProjectSWG" + dmgName "ProjectSWG" + icon "src/main/resources/theme/projectswg/graphics/ProjectSWGLaunchpad.icns" + mainClassName "${->project.mainClassName}" + jarTask 'shadowJar' + jvmVersion javaVersion + jreHome javaHomeMac + bundleJRE true +} + +javafx { + modules = ['javafx.controls', 'javafx.fxml'] } repositories { @@ -49,14 +65,14 @@ repositories { dependencies { compile project(':pswgcommon') - compile project(':pswgcommonfx') compile project(':client-holocore') compile project(':forwarder') 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 'de.jensd:fontawesomefx-fontawesome:4.7.0-9.1.2' - utilityCompile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.59' + utilityCompile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60' utilityCompile group: 'me.joshlarson', name: 'fast-json', version: '2.2.3' utilityCompile 'net.openhft:zero-allocation-hashing:0.8' @@ -70,3 +86,4 @@ task CreateUpdateListTask(type: ShadowJar) { configurations = [project.configurations.utilityRuntime] exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA') } + diff --git a/client-holocore b/client-holocore index 5ca8bf2..18e78ef 160000 --- a/client-holocore +++ b/client-holocore @@ -1 +1 @@ -Subproject commit 5ca8bf29ac55824735723713729e713d1f36c50d +Subproject commit 18e78ef9b4de179c9841b5910bc695de0d265e8d diff --git a/forwarder b/forwarder index 668025f..b104f07 160000 --- a/forwarder +++ b/forwarder @@ -1 +1 @@ -Subproject commit 668025fac8b4ea7361e26e6407c43268f19eb12a +Subproject commit b104f07fd7bf9c4783493fe9e7edba80bf2fac4c diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..457aad0d98108420a977756b7145c93c8910b076 GIT binary patch literal 55741 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 O(FVj@M23F*_WuFL)$*MH literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..20c9e57 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Dec 22 15:24:22 CST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..0f8d593 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/license.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/pswgcommon b/pswgcommon index 5da6077..81bb85c 160000 --- a/pswgcommon +++ b/pswgcommon @@ -1 +1 @@ -Subproject commit 5da607789212896e3f27fc2936bb0ae10902a9ae +Subproject commit 81bb85c1ee17f3ee9653588498dd55cf7ab6994d diff --git a/pswgcommonfx b/pswgcommonfx deleted file mode 160000 index 2c647b2..0000000 --- a/pswgcommonfx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c647b2775fc808a98cc88b2cc95e50e1fd3e92a diff --git a/settings.gradle b/settings.gradle index 2326ead..cd946e6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ rootProject.name = 'launcher' include 'pswgcommon' -include 'pswgcommonfx' include 'client-holocore' include 'forwarder' diff --git a/src/main/java/com/projectswg/launcher/core/Launcher.java b/src/main/java/com/projectswg/launcher/core/Launcher.java index 5f42f4b..dddef58 100644 --- a/src/main/java/com/projectswg/launcher/core/Launcher.java +++ b/src/main/java/com/projectswg/launcher/core/Launcher.java @@ -20,14 +20,16 @@ package com.projectswg.launcher.core; -import com.projectswg.common.javafx.ResourceUtilities; +import com.projectswg.common.data.CrcDatabase; import com.projectswg.common.utilities.LocalUtilities; +import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.services.data.DataManager; import com.projectswg.launcher.core.services.launcher.LauncherManager; import me.joshlarson.jlcommon.control.IntentManager; import me.joshlarson.jlcommon.control.Manager; import me.joshlarson.jlcommon.control.SafeMain; import me.joshlarson.jlcommon.control.ServiceBase; +import me.joshlarson.jlcommon.javafx.control.FXMLManager; import me.joshlarson.jlcommon.log.Log; import me.joshlarson.jlcommon.log.log_wrapper.ConsoleLogWrapper; import me.joshlarson.jlcommon.log.log_wrapper.FileLogWrapper; @@ -40,37 +42,44 @@ import java.util.List; public class Launcher { - private final List services; - - private Launcher() { - this.services = new ArrayList<>(); + public static void main(String [] args) { + LocalUtilities.setApplicationName(".projectswg/launcher"); + Log.addWrapper(new ConsoleLogWrapper()); + Log.addWrapper(new FileLogWrapper(new File(LocalUtilities.getApplicationDirectory(), "log.txt"))); + + SafeMain.main("launcher", Launcher::run); + // No code can run after this point - SafeMain calls System.exit } - private void run() { + private static void run() { + List services = new ArrayList<>(List.of( + new DataManager(), + new LauncherManager(), + FXMLManager.builder() + .withResourceBundlePath("strings.strings") + .withKlass(Launcher.class) + .withLocale(LauncherData.INSTANCE.getGeneral().getLocale()) + .addFxml(Launcher.class.getResource("/fxml/navigation.fxml")) + .build() + )); + try (IntentManager intentManager = new IntentManager(Runtime.getRuntime().availableProcessors())) { IntentManager.setInstance(intentManager); - services.clear(); - services.add(new DataManager()); - services.add(new LauncherManager()); + for (ServiceBase s : services) s.setIntentManager(intentManager); + Manager.start(services); Manager.run(services, 100); Collections.reverse(services); // Allows the data services to stay alive longer Manager.stop(services); + + for (ServiceBase s : services) + s.setIntentManager(null); + IntentManager.setInstance(null); ThreadUtilities.printActiveThreads(); } } - public static void main(String [] args) { - LocalUtilities.setApplicationName(".projectswg/launcher"); - ResourceUtilities.setPrimarySource(Launcher.class); - Log.addWrapper(new ConsoleLogWrapper()); - Log.addWrapper(new FileLogWrapper(new File(LocalUtilities.getApplicationDirectory(), "log.txt"))); - - SafeMain.main("launcher", new Launcher()::run); - // No code can run after this point - SafeMain calls System.exit - } - } diff --git a/src/main/java/com/projectswg/launcher/core/services/launcher/UserInterfaceService.java b/src/main/java/com/projectswg/launcher/core/Test.java similarity index 62% rename from src/main/java/com/projectswg/launcher/core/services/launcher/UserInterfaceService.java rename to src/main/java/com/projectswg/launcher/core/Test.java index 37ef065..fb2ee5f 100644 --- a/src/main/java/com/projectswg/launcher/core/services/launcher/UserInterfaceService.java +++ b/src/main/java/com/projectswg/launcher/core/Test.java @@ -18,50 +18,28 @@ * * ***********************************************************************************/ -package com.projectswg.launcher.core.services.launcher; +package com.projectswg.launcher.core; -import com.projectswg.launcher.core.resources.gui.LauncherUI; -import javafx.application.Application; -import javafx.application.Platform; -import me.joshlarson.jlcommon.concurrency.ThreadPool; -import me.joshlarson.jlcommon.control.Service; +import com.projectswg.common.network.packets.swg.holo.HoloConnectionStopped.ConnectionStoppedReason; +import com.projectswg.holocore.client.HolocoreSocket; +import me.joshlarson.jlcommon.concurrency.Delay; -public class UserInterfaceService extends Service { +import java.net.InetAddress; + +public class Test { - private final ThreadPool uiThread; - - public UserInterfaceService() { - this.uiThread = new ThreadPool(1, "user-interface"); - } - - @Override - public boolean initialize() { - uiThread.start(); - uiThread.execute(this::run); - return true; - } - - @Override - public boolean isOperational() { - LauncherUI ui = LauncherUI.getInstance(); - return ui == null || ui.isOperational(); - } - - @Override - public boolean stop() { - uiThread.stop(true); - Platform.exit(); - return true; - } - - @Override - public boolean terminate() { - uiThread.awaitTermination(5000); - return true; - } - - private void run() { - Application.launch(LauncherUI.class); + public static void main(String [] args) { + HolocoreSocket socket = new HolocoreSocket(InetAddress.getLoopbackAddress(), 44463); + socket.setStatusChangedCallback(((oldStatus, newStatus, reason) -> System.out.println(oldStatus + " -> " + newStatus + " || " + reason))); + socket.connect(10000); + System.out.println("Connected"); + Delay.sleepMilli(10000); + System.out.println("Disconnecting..."); + socket.disconnect(ConnectionStoppedReason.APPLICATION); + Delay.sleepMilli(2000); + System.out.println("Closing..."); + socket.close(); } } + diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/LauncherData.java b/src/main/java/com/projectswg/launcher/core/resources/data/LauncherData.java index 411d16b..c36701d 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/LauncherData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/LauncherData.java @@ -26,18 +26,19 @@ import com.projectswg.launcher.core.resources.data.forwarder.ForwarderData; import com.projectswg.launcher.core.resources.data.general.GeneralData; import com.projectswg.launcher.core.resources.data.login.LoginData; import com.projectswg.launcher.core.resources.data.update.UpdateData; +import javafx.application.Application; import javafx.stage.Stage; import java.util.concurrent.atomic.AtomicReference; import java.util.prefs.Preferences; -public class LauncherData { +public enum LauncherData { + INSTANCE; - public static final String VERSION = "1.1.7"; + public static final String VERSION = "1.1.13"; public static final String UPDATE_ADDRESS = "login1.projectswg.com"; - private static final LauncherData INSTANCE = new LauncherData(); - + private final AtomicReference application; private final AtomicReference stage; private final AnnouncementsData announcementsData; private final GeneralData generalData; @@ -45,7 +46,8 @@ public class LauncherData { private final UpdateData updateData; private final ForwarderData forwarderData; - public LauncherData() { + LauncherData() { + this.application = new AtomicReference<>(null); this.stage = new AtomicReference<>(null); this.announcementsData = new AnnouncementsData(); this.generalData = new GeneralData(); @@ -58,6 +60,10 @@ public class LauncherData { return Preferences.userNodeForPackage(Launcher.class); } + public Application getApplication() { + return application.get(); + } + public Stage getStage() { return stage.get(); } @@ -82,6 +88,10 @@ public class LauncherData { return forwarderData; } + public void setApplication(Application application) { + this.application.set(application); + } + public void setStage(Stage stage) { this.stage.set(stage); } @@ -89,4 +99,5 @@ public class LauncherData { public static LauncherData getInstance() { return INSTANCE; } + } diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/announcements/AnnouncementsData.java b/src/main/java/com/projectswg/launcher/core/resources/data/announcements/AnnouncementsData.java index ef9104b..75e8881 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/announcements/AnnouncementsData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/announcements/AnnouncementsData.java @@ -21,7 +21,7 @@ package com.projectswg.launcher.core.resources.data.announcements; import com.projectswg.launcher.core.resources.gui.Card; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentList; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentList; public class AnnouncementsData { diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/forwarder/ForwarderData.java b/src/main/java/com/projectswg/launcher/core/resources/data/forwarder/ForwarderData.java index 3f424da..c2d43a6 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/forwarder/ForwarderData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/forwarder/ForwarderData.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.data.forwarder; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentInteger; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentInteger; import org.jetbrains.annotations.NotNull; public class ForwarderData { diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/general/GeneralData.java b/src/main/java/com/projectswg/launcher/core/resources/data/general/GeneralData.java index 624ce9e..3fbc93c 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/general/GeneralData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/general/GeneralData.java @@ -20,9 +20,9 @@ package com.projectswg.launcher.core.resources.data.general; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentBoolean; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentReference; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentString; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentBoolean; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentReference; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentString; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,12 +34,14 @@ public class GeneralData { private final ConcurrentReference theme; private final ConcurrentReference locale; private final ConcurrentString wine; + private final ConcurrentBoolean admin; public GeneralData() { this.sound = new ConcurrentBoolean(); this.theme = new ConcurrentReference<>(LauncherTheme.DEFAULT); this.locale = new ConcurrentReference<>(Locale.getDefault()); this.wine = new ConcurrentString(); + this.admin = new ConcurrentBoolean(); } @NotNull @@ -62,6 +64,11 @@ public class GeneralData { return wine; } + @NotNull + public ConcurrentBoolean getAdminProperty() { + return admin; + } + public boolean isSound() { return sound.get(); } @@ -81,6 +88,10 @@ public class GeneralData { return wine.get(); } + public boolean isAdmin() { + return admin.get(); + } + public void setSound(boolean sound) { this.sound.set(sound); } @@ -97,4 +108,8 @@ public class GeneralData { this.wine.set(wine); } + public void setAdmin(boolean admin) { + this.admin.set(admin); + } + } diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginData.java b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginData.java index 296416e..a866e6e 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginData.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.data.login; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentSet; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentSet; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServer.java b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServer.java index a32ed14..57b2632 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServer.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServer.java @@ -22,10 +22,7 @@ package com.projectswg.launcher.core.resources.data.login; import com.projectswg.launcher.core.resources.data.update.UpdateServer; import com.projectswg.launcher.core.resources.data.update.UpdateServer.UpdateServerStatus; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentBase; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentInteger; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentReference; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentString; +import me.joshlarson.jlcommon.javafx.beans.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,6 +34,7 @@ public class LoginServer { private final ConcurrentString username; private final ConcurrentString password; private final ConcurrentReference updateServer; + private final ConcurrentBoolean verifyServer; private final LoginServerInstanceInfo instanceInfo; public LoginServer(@NotNull String name) { @@ -46,9 +44,10 @@ public class LoginServer { this.username = new ConcurrentString(""); this.password = new ConcurrentString(""); this.updateServer = new ConcurrentReference<>(null); + this.verifyServer = new ConcurrentBoolean(true); this.instanceInfo = new LoginServerInstanceInfo(); - updateServer.addListener("login-server-"+name, this::updateServerListener); + updateServer.addSimpleListener("login-server-"+name, this::updateServerListener); instanceInfo.setUpdateStatus(UpdateServerStatus.UNKNOWN.getFriendlyName()); updateServerListener(updateServer, null, null); } @@ -73,6 +72,11 @@ public class LoginServer { return password; } + @NotNull + public ConcurrentBoolean getVerifyServerProperty() { + return verifyServer; + } + @NotNull public ConcurrentReference getUpdateServerProperty() { return updateServer; @@ -112,6 +116,10 @@ public class LoginServer { return updateServer.get(); } + public boolean isVerifyServer() { + return verifyServer.get(); + } + public void setAddress(@NotNull String address) { this.address.set(address); } @@ -132,6 +140,10 @@ public class LoginServer { this.updateServer.set(server); } + public void setVerifyServer(boolean verifyServer) { + this.verifyServer.set(verifyServer); + } + @Override public String toString() { return name; @@ -143,7 +155,7 @@ public class LoginServer { prev.getStatusProperty().removeListener(listenerName); } if (next != null) { - next.getStatusProperty().addListener(listenerName, this::onUpdateServerStatusUpdated); + next.getStatusProperty().addSimpleListener(listenerName, this::onUpdateServerStatusUpdated); instanceInfo.setReadyToPlay(calculateReadyToPlay(next.getStatus())); } else { instanceInfo.setReadyToPlay(false); diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServerInstanceInfo.java b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServerInstanceInfo.java index 78ef29d..65b1910 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServerInstanceInfo.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/login/LoginServerInstanceInfo.java @@ -20,8 +20,8 @@ package com.projectswg.launcher.core.resources.data.login; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentBoolean; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentString; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentBoolean; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentString; import org.jetbrains.annotations.NotNull; public class LoginServerInstanceInfo { diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateData.java b/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateData.java index 9d0cc33..7f1c99e 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateData.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateData.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.data.update; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentSet; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentSet; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateServer.java b/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateServer.java index 3105c50..f5e0fc6 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateServer.java +++ b/src/main/java/com/projectswg/launcher/core/resources/data/update/UpdateServer.java @@ -20,10 +20,10 @@ package com.projectswg.launcher.core.resources.data.update; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentInteger; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentList; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentReference; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentString; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentInteger; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentList; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentReference; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentString; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/src/main/java/com/projectswg/launcher/core/resources/game/GameInstance.java b/src/main/java/com/projectswg/launcher/core/resources/game/GameInstance.java index feee9bc..1c5a566 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/game/GameInstance.java +++ b/src/main/java/com/projectswg/launcher/core/resources/game/GameInstance.java @@ -61,10 +61,11 @@ public class GameInstance { return; ForwarderData data = forwarder.getData(); data.setAddress(new InetSocketAddress(server.getAddress(), server.getPort())); + data.setVerifyServer(server.isVerifyServer()); data.setUsername(server.getUsername()); data.setPassword(server.getPassword()); - data.setOutboundTunerInterval(LauncherData.getInstance().getForwarderData().getSendInterval()); - data.setOutboundTunerMaxSend(LauncherData.getInstance().getForwarderData().getSendMax()); + data.setOutboundTunerInterval(LauncherData.INSTANCE.getForwarderData().getSendInterval()); + data.setOutboundTunerMaxSend(LauncherData.INSTANCE.getForwarderData().getSendMax()); forwarderThread.start(); } @@ -167,7 +168,17 @@ public class GameInstance { "autoConnectToLoginServer=" + !username.isEmpty(), "logReportFatals=true", "logStderr=true", - "0fd345d9=true"); + "0fd345d9=" + (LauncherData.INSTANCE.getGeneral().isAdmin() ? "true" : "false"), + "-s", + "SharedNetwork", + "useTcp=false", + "networkHandlerDispatchThrottle=false", + "maxRawPacketSize=16384", + "fragmentSize=16384", + "maxInstandingPackets=4096", + "useNetworkThread=false", + "processOnSend=true", + "networkHandlerDispatchQueueSize=2000"); } private static void reportWarning(String title, String message) { diff --git a/src/main/java/com/projectswg/launcher/core/resources/game/ProcessExecutor.java b/src/main/java/com/projectswg/launcher/core/resources/game/ProcessExecutor.java index 5b3c6b8..0dad686 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/game/ProcessExecutor.java +++ b/src/main/java/com/projectswg/launcher/core/resources/game/ProcessExecutor.java @@ -111,7 +111,7 @@ public enum ProcessExecutor { private File getWine() { { - String wineStr = LauncherData.getInstance().getGeneral().getWine(); + String wineStr = LauncherData.INSTANCE.getGeneral().getWine(); if (wineStr != null) { File wine = new File(wineStr); if (wine.isFile()) { diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/AnnouncementsController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/AnnouncementsController.java index 767d0b8..48b687d 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/AnnouncementsController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/AnnouncementsController.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.gui; -import com.projectswg.common.javafx.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import javafx.fxml.FXML; import javafx.scene.Parent; @@ -52,13 +52,13 @@ public class AnnouncementsController implements FXMLController { @Override public void initialize(URL location, ResourceBundle resources) { - LauncherData.getInstance().getAnnouncements().getAnnouncementCards().addCollectionChangedListener(LISTENER_KEY, this::updateAnnouncements); + LauncherData.INSTANCE.getAnnouncements().getAnnouncementCards().addCollectionChangedListener(LISTENER_KEY, this::updateAnnouncements); updateAnnouncements(); } private void updateAnnouncements() { cardContainer.clearCards(); - LauncherData.getInstance().getAnnouncements().getAnnouncementCards().forEach(cardContainer::addCard); + LauncherData.INSTANCE.getAnnouncements().getAnnouncementCards().forEach(cardContainer::addCard); } } diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/Card.java b/src/main/java/com/projectswg/launcher/core/resources/gui/Card.java index d5283af..9589546 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/Card.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/Card.java @@ -20,6 +20,7 @@ package com.projectswg.launcher.core.resources.gui; +import com.projectswg.launcher.core.resources.data.LauncherData; import javafx.scene.Cursor; import javafx.scene.control.Label; import javafx.scene.control.Separator; @@ -102,7 +103,7 @@ public class Card extends VBox { } private void gotoLink() { - LauncherUI.getInstance().getHostServices().showDocument(link); + LauncherData.INSTANCE.getApplication().getHostServices().showDocument(link); } private static Region createPaddedRegion() { diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/LauncherUI.java b/src/main/java/com/projectswg/launcher/core/resources/gui/LauncherUI.java deleted file mode 100644 index a0af926..0000000 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/LauncherUI.java +++ /dev/null @@ -1,73 +0,0 @@ -/*********************************************************************************** - * Copyright (C) 2018 /// Project SWG /// www.projectswg.com * - * * - * This file is part of the ProjectSWG Launcher. * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as published by * - * the Free Software Foundation, either version 3 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - ***********************************************************************************/ - -package com.projectswg.launcher.core.resources.gui; - -import com.projectswg.common.javafx.FXMLUtilities; -import com.projectswg.launcher.core.resources.data.LauncherData; -import javafx.application.Application; -import javafx.application.Platform; -import javafx.scene.Scene; -import javafx.stage.Stage; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -public class LauncherUI extends Application { - - private static final AtomicReference INSTANCE = new AtomicReference<>(null); - - private final AtomicBoolean operational; - - public LauncherUI() { - this.operational = new AtomicBoolean(true); - INSTANCE.set(this); - } - - public boolean isOperational() { - return operational.get(); - } - - @Override - public void start(Stage primaryStage) { - // TODO: Theme specific loading - LauncherData data = LauncherData.getInstance(); - NavigationController controller = (NavigationController) FXMLUtilities.loadFxmlAsClassResource("/theme/projectswg/fxml/navigation.fxml", data.getGeneral().getLocale()); - if (controller == null) { - operational.set(false); - throw new NullPointerException("Invalid navigation controller"); - } - primaryStage.setTitle("ProjectSWG Launcher"); - primaryStage.setScene(new Scene(controller.getRoot())); - primaryStage.setResizable(false); - primaryStage.setOnCloseRequest(e -> Platform.exit()); - primaryStage.show(); - } - - @Override - public void stop() { - operational.set(false); - } - - public static LauncherUI getInstance() { - return INSTANCE.get(); - } - -} diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/NavigationController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/NavigationController.java index 4f33f1f..2c57933 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/NavigationController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/NavigationController.java @@ -20,20 +20,26 @@ package com.projectswg.launcher.core.resources.gui; -import com.projectswg.common.javafx.FXMLController; +import com.projectswg.launcher.core.resources.data.LauncherData; import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon; import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView; +import javafx.application.Platform; import javafx.fxml.FXML; import javafx.scene.Parent; +import javafx.scene.Scene; import javafx.scene.control.Label; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.paint.Color; +import javafx.stage.Stage; +import me.joshlarson.jlcommon.javafx.control.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLService; import java.net.URL; +import java.util.Locale; import java.util.ResourceBundle; -public class NavigationController implements FXMLController { +public class NavigationController extends FXMLService implements FXMLController { @FXML private TabPane tabPane; @@ -44,8 +50,11 @@ public class NavigationController implements FXMLController { @FXML private Parent root; + private Stage primaryStage; + public NavigationController() { - + this.primaryStage = LauncherData.INSTANCE.getStage(); + LauncherData.INSTANCE.getGeneral().getLocaleProperty().addSimpleListener("navigation-reinflate", this::updateLocale); } @Override @@ -61,6 +70,39 @@ public class NavigationController implements FXMLController { tabPane.getSelectionModel().selectedItemProperty().addListener((obs, prev, tab) -> selectedTabLabel.setText(tab.getText())); tabPane.getSelectionModel().select(serverListTab); + + setupStage(); + } + + @Override + public boolean stop() { + LauncherData.INSTANCE.getGeneral().getLocaleProperty().removeListener("navigation-reinflate"); + this.primaryStage = null; + return true; + } + + @Override + public boolean isOperational() { + return primaryStage == null || primaryStage.isShowing(); + } + + private void setupStage() { + if (this.primaryStage == null) { + Stage primaryStage = new Stage(); + primaryStage.setTitle("ProjectSWG Launcher"); + primaryStage.setScene(new Scene(root)); + primaryStage.setResizable(false); + primaryStage.show(); + LauncherData.INSTANCE.setApplication(getApplication()); + LauncherData.INSTANCE.setStage(primaryStage); + this.primaryStage = primaryStage; + } else { + this.primaryStage.setScene(new Scene(root)); + } + } + + private void updateLocale(Locale locale) { + new Thread(() -> reinflate(locale), "reinflator").start(); } private static FontAwesomeIconView createGlyph(FontAwesomeIcon icon) { diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/ServerListController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/ServerListController.java index e80b85c..4f41e21 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/ServerListController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/ServerListController.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.gui; -import com.projectswg.common.javafx.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.login.LoginServer; import com.projectswg.launcher.core.resources.data.update.UpdateServer; @@ -32,8 +32,8 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.image.ImageView; import javafx.scene.layout.Region; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentBase; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentString; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentBase; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentString; import java.net.URL; import java.util.Comparator; @@ -76,20 +76,20 @@ public class ServerListController implements FXMLController { addCenterAlignColumn(resources.getString("servers.column.localStatus"), COL_WIDTH_LARGE, resources::getString, s -> s.getInstanceInfo().getUpdateStatusProperty()); addPlayColumn(resources); - LauncherData.getInstance().getLogin().getServers().addCollectionChangedListener(LISTENER_KEY, this::updateServerTable); - LauncherData.getInstance().getAnnouncements().getServerListCards().addCollectionChangedListener(LISTENER_KEY, this::updateAnnouncements); + LauncherData.INSTANCE.getLogin().getServers().addCollectionChangedListener(LISTENER_KEY, this::updateServerTable); + LauncherData.INSTANCE.getAnnouncements().getServerListCards().addCollectionChangedListener(LISTENER_KEY, this::updateAnnouncements); updateServerTable(); updateAnnouncements(); } private void updateServerTable() { - serverTable.getItems().setAll(LauncherData.getInstance().getLogin().getServers()); + serverTable.getItems().setAll(LauncherData.INSTANCE.getLogin().getServers()); serverTable.getItems().sort(Comparator.comparing(LoginServer::getName)); } private void updateAnnouncements() { cardContainer.clearCards(); - LauncherData.getInstance().getAnnouncements().getServerListCards().forEach(cardContainer::addCard); + LauncherData.INSTANCE.getAnnouncements().getServerListCards().forEach(cardContainer::addCard); } private void addCenterAlignColumn(String name, double prefWidth, Function conv, Function> transform) { @@ -102,7 +102,7 @@ public class ServerListController implements FXMLController { col.setPrefWidth(prefWidth); col.setCellValueFactory(param -> { ConcurrentBase val = transform.apply(param.getValue()); - SimpleObjectProperty obj = new SimpleObjectProperty<>(conv.apply(val.get())); + SimpleObjectProperty obj = new SimpleObjectProperty<>(conv.apply(val.getValue())); val.addTransformListener(LISTENER_KEY, conv, obj::set); return obj; }); diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/SettingsController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/SettingsController.java index dc42d6a..abff307 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/SettingsController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/SettingsController.java @@ -20,9 +20,9 @@ package com.projectswg.launcher.core.resources.gui; -import com.projectswg.common.javafx.FXMLController; import javafx.fxml.FXML; import javafx.scene.Parent; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import java.net.URL; import java.util.ResourceBundle; diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayButton.java b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayButton.java index 42282fe..e2d25eb 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayButton.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayButton.java @@ -28,7 +28,7 @@ import com.projectswg.launcher.core.resources.intents.DownloadPatchIntent; import com.projectswg.launcher.core.resources.intents.LaunchGameIntent; import javafx.application.Platform; import javafx.scene.control.Button; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentDouble; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentDouble; import org.jetbrains.annotations.NotNull; import java.util.Objects; @@ -68,7 +68,7 @@ public class ServerPlayButton extends Button { private void setup(UpdateServer server) { if (server == null) return; - server.getStatusProperty().addListener(this, this::update); + server.getStatusProperty().addSimpleListener(this, this::update); update(server.getStatus()); } diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayCell.java b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayCell.java index 3a575e5..8a23b56 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayCell.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayCell.java @@ -24,7 +24,7 @@ import com.projectswg.launcher.core.resources.data.login.LoginServer; import com.projectswg.launcher.core.resources.data.update.UpdateServer; import javafx.scene.control.TableCell; import javafx.scene.layout.VBox; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentDouble; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentDouble; import java.util.ResourceBundle; @@ -50,7 +50,7 @@ public class ServerPlayCell extends TableCell { } super.updateItem(item, empty); if (item != null) { - item.getUpdateServerProperty().addListener(this, updateServer -> update(item, updateServer)); + item.getUpdateServerProperty().addSimpleListener(this, updateServer -> update(item, updateServer)); } update(item, item==null?null:item.getUpdateServer()); if (empty) { diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayLabel.java b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayLabel.java index 9b48136..57296db 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayLabel.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/servers/ServerPlayLabel.java @@ -25,7 +25,7 @@ import com.projectswg.launcher.core.resources.data.update.UpdateServer.RequiredF import com.projectswg.launcher.core.resources.data.update.UpdateServer.UpdateServerStatus; import javafx.application.Platform; import javafx.scene.control.Label; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentDouble; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentDouble; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -59,7 +59,7 @@ public class ServerPlayLabel extends Label { private void setup(UpdateServer server) { if (server == null) return; - server.getStatusProperty().addListener(this, status -> update(server, status)); + server.getStatusProperty().addSimpleListener(this, status -> update(server, status)); } private void teardown(UpdateServer server) { @@ -74,18 +74,18 @@ public class ServerPlayLabel extends Label { case UNKNOWN: case READY: case SCANNING: - progressBar.setValue(-1); + progressBar.set(-1); internalSetText(bundle.getString("servers.action_info.empty")); setManaged(false); break; case REQUIRES_DOWNLOAD: setManaged(true); - progressBar.setValue(-1); + progressBar.set(-1); internalSetText(calculateDownloadSize(server.getRequiredFiles()) + " " + bundle.getString("servers.action_info.required")); break; case DOWNLOADING: setManaged(true); - progressBar.addListener("server-play-label", p -> internalSetText(String.format("%.2f%% %s", p*100, bundle.getString("servers.action_info.progress")))); + progressBar.addSimpleListener("server-play-label", p -> internalSetText(String.format("%.2f%% %s", p*100, bundle.getString("servers.action_info.progress")))); if (progressBar.get() == -1) internalSetText(bundle.getString("servers.action_info.downloading")); else diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsForwarderController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsForwarderController.java index 639d8b8..f5b21fb 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsForwarderController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsForwarderController.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.gui.settings; -import com.projectswg.common.javafx.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.forwarder.ForwarderData; import javafx.beans.value.ObservableValue; @@ -52,8 +52,8 @@ public class SettingsForwarderController implements FXMLController { @Override public void initialize(URL location, ResourceBundle resources) { - sendIntervalTextField.setText(Integer.toString(LauncherData.getInstance().getForwarderData().getSendInterval())); - sendMaxTextField.setText(Integer.toString(LauncherData.getInstance().getForwarderData().getSendMax())); + sendIntervalTextField.setText(Integer.toString(LauncherData.INSTANCE.getForwarderData().getSendInterval())); + sendMaxTextField.setText(Integer.toString(LauncherData.INSTANCE.getForwarderData().getSendMax())); sendIntervalTextField.textProperty().addListener(this::handleInterval); sendMaxTextField.textProperty().addListener(this::handleMax); @@ -69,7 +69,7 @@ public class SettingsForwarderController implements FXMLController { sendIntervalTextField.setText(filtered); next = filtered; } - LauncherData.getInstance().getForwarderData().setSendInterval(Integer.parseInt(next)); + LauncherData.INSTANCE.getForwarderData().setSendInterval(Integer.parseInt(next)); } private void handleMax(@SuppressWarnings("unused") ObservableValue prop, @SuppressWarnings("unused") String prev, String next) { @@ -78,7 +78,7 @@ public class SettingsForwarderController implements FXMLController { sendMaxTextField.setText(filtered); next = filtered; } - LauncherData.getInstance().getForwarderData().setSendMax(Integer.parseInt(next)); + LauncherData.INSTANCE.getForwarderData().setSendMax(Integer.parseInt(next)); } } diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsGeneralController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsGeneralController.java index 19d60fc..580757d 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsGeneralController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsGeneralController.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.gui.settings; -import com.projectswg.common.javafx.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.general.GeneralData; import com.projectswg.launcher.core.resources.data.general.LauncherTheme; @@ -56,6 +56,8 @@ public class SettingsGeneralController implements FXMLController { private TextField wineTextField; @FXML private Button wineSelectionButton; + @FXML + private CheckBox adminCheckBox; @Override public Parent getRoot() { @@ -64,16 +66,10 @@ public class SettingsGeneralController implements FXMLController { @Override public void initialize(URL location, ResourceBundle resources) { - GeneralData data = LauncherData.getInstance().getGeneral(); + GeneralData data = LauncherData.INSTANCE.getGeneral(); wineSelectionButton.setGraphic(createFolderGlyph()); - soundCheckbox.selectedProperty().addListener((obs, prev, s) -> data.setSound(s)); - themeComboBox.valueProperty().addListener((obs, prev, v) -> data.setTheme(v)); - localeComboBox.valueProperty().addListener((obs, prev, v) -> data.setLocale(v)); - wineTextField.textProperty().addListener((obs, prev, t) -> data.setWine(t)); - wineSelectionButton.setOnAction(this::processWineSelectionButtonAction); - themeComboBox.getItems().setAll(LauncherTheme.values()); localeComboBox.getItems().setAll(Locale.ENGLISH, Locale.GERMAN); @@ -81,6 +77,14 @@ public class SettingsGeneralController implements FXMLController { themeComboBox.setValue(data.getTheme()); localeComboBox.setValue(data.getLocale()); wineTextField.setText(data.getWine()); + adminCheckBox.setSelected(data.isAdmin()); + + soundCheckbox.selectedProperty().addListener((obs, prev, s) -> data.setSound(s)); + themeComboBox.valueProperty().addListener((obs, prev, v) -> data.setTheme(v)); + localeComboBox.valueProperty().addListener((obs, prev, v) -> data.setLocale(v)); + wineTextField.textProperty().addListener((obs, prev, t) -> data.setWine(t)); + wineSelectionButton.setOnAction(this::processWineSelectionButtonAction); + adminCheckBox.selectedProperty().addListener((obs, prev, a) -> data.setAdmin(a)); } private static FontAwesomeIconView createFolderGlyph() { @@ -104,7 +108,7 @@ public class SettingsGeneralController implements FXMLController { private static File chooseOpenFile(String title) { FileChooser fileChooser = new FileChooser(); fileChooser.setTitle(title); - File file = fileChooser.showOpenDialog(LauncherData.getInstance().getStage()); + File file = fileChooser.showOpenDialog(LauncherData.INSTANCE.getStage()); if (file == null || !file.isFile()) return null; return file; diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsLoginController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsLoginController.java index 8c4e90c..2b815e6 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsLoginController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsLoginController.java @@ -20,7 +20,9 @@ package com.projectswg.launcher.core.resources.gui.settings; -import com.projectswg.common.javafx.FXMLController; +import javafx.scene.control.CheckBox; +import me.joshlarson.jlcommon.concurrency.ThreadPool; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.login.LoginServer; import com.projectswg.launcher.core.resources.data.update.UpdateServer; @@ -30,29 +32,28 @@ import javafx.scene.Parent; import javafx.scene.control.ComboBox; import javafx.scene.control.PasswordField; import javafx.scene.control.TextField; +import me.joshlarson.jlcommon.javafx.control.FXMLService; import java.net.URL; import java.util.ResourceBundle; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -public class SettingsLoginController implements FXMLController { +public class SettingsLoginController extends FXMLService implements FXMLController { private final AtomicReference server; + private final ThreadPool executor; - @FXML - private Parent root; - @FXML - private ComboBox nameComboBox; - @FXML - private TextField addressTextField, portTextField, usernameTextField; - @FXML - private PasswordField passwordField; - @FXML - private ComboBox updateServerComboBox; + @FXML private Parent root; + @FXML private ComboBox nameComboBox; + @FXML private TextField addressTextField, portTextField, usernameTextField; + @FXML private PasswordField passwordField; + @FXML private ComboBox updateServerComboBox; + @FXML private CheckBox verifyServerCheckBox; public SettingsLoginController() { this.server = new AtomicReference<>(null); + this.executor = new ThreadPool(1, "settings-login"); } @Override @@ -62,34 +63,43 @@ public class SettingsLoginController implements FXMLController { @Override public void initialize(URL location, ResourceBundle resources) { + executor.start(); // TODO: Add/remove login servers addressTextField.textProperty().addListener((obs, prev, t) -> setIfPresent(s -> s.setAddress(t))); portTextField.textProperty().addListener((obs, prev, t) -> setIfPresent(s -> s.setPort(Integer.parseInt(t)))); usernameTextField.textProperty().addListener((obs, prev, t) -> setIfPresent(s -> s.setUsername(t))); passwordField.textProperty().addListener((obs, prev, t) -> setIfPresent(s -> s.setPassword(t))); updateServerComboBox.valueProperty().addListener((obs, prev, v) -> setIfPresent(s -> s.setUpdateServer(v))); + verifyServerCheckBox.selectedProperty().addListener((obs, prev, v) -> setIfPresent(s -> s.setVerifyServer(v))); nameComboBox.valueProperty().addListener((obs, prev, next) -> { server.set(next); updateFields(next); }); - nameComboBox.setItems(FXCollections.observableArrayList(LauncherData.getInstance().getLogin().getServers())); - updateServerComboBox.setItems(FXCollections.observableArrayList(LauncherData.getInstance().getUpdate().getServers())); + nameComboBox.setItems(FXCollections.observableArrayList(LauncherData.INSTANCE.getLogin().getServers())); + updateServerComboBox.setItems(FXCollections.observableArrayList(LauncherData.INSTANCE.getUpdate().getServers())); LoginServer def = nameComboBox.getItems().get(0); updateFields(def); nameComboBox.setValue(def); } + @Override + public boolean terminate() { + executor.stop(false); + return executor.awaitTermination(1000); + } + private void updateFields(LoginServer server) { addressTextField.setText(server.getAddress()); portTextField.setText(Integer.toString(server.getPort())); usernameTextField.setText(server.getUsername()); passwordField.setText(server.getPassword()); updateServerComboBox.setValue(server.getUpdateServer()); + verifyServerCheckBox.setSelected(server.isVerifyServer()); } private void setIfPresent(Consumer c) { LoginServer s = server.get(); if (s != null) - c.accept(s); + executor.execute(() -> c.accept(s)); } } diff --git a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsUpdateController.java b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsUpdateController.java index 6f2514c..85984e6 100644 --- a/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsUpdateController.java +++ b/src/main/java/com/projectswg/launcher/core/resources/gui/settings/SettingsUpdateController.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.resources.gui.settings; -import com.projectswg.common.javafx.FXMLController; +import me.joshlarson.jlcommon.javafx.control.FXMLController; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.update.UpdateServer; import com.projectswg.launcher.core.resources.game.ProcessExecutor; @@ -80,7 +80,7 @@ public class SettingsUpdateController implements FXMLController { localPathSelectionButton.setOnAction(this::processLocalPathSelectionButtonAction); nameComboBox.valueProperty().addListener((obs, prev, next) -> { server.set(next); updateFields(next); }); - nameComboBox.setItems(FXCollections.observableArrayList(LauncherData.getInstance().getUpdate().getServers())); + nameComboBox.setItems(FXCollections.observableArrayList(LauncherData.INSTANCE.getUpdate().getServers())); UpdateServer def = nameComboBox.getItems().get(0); updateFields(def); @@ -150,7 +150,7 @@ public class SettingsUpdateController implements FXMLController { DirectoryChooser directoryChooser = new DirectoryChooser(); directoryChooser.setTitle(title); directoryChooser.setInitialDirectory(currentDirectory); - File file = directoryChooser.showDialog(LauncherData.getInstance().getStage()); + File file = directoryChooser.showDialog(LauncherData.INSTANCE.getStage()); if (file == null || !file.isDirectory()) return null; return file; diff --git a/src/main/java/com/projectswg/launcher/core/services/data/AnnouncementService.java b/src/main/java/com/projectswg/launcher/core/services/data/AnnouncementService.java index 6f49cf9..f2c883f 100644 --- a/src/main/java/com/projectswg/launcher/core/services/data/AnnouncementService.java +++ b/src/main/java/com/projectswg/launcher/core/services/data/AnnouncementService.java @@ -83,7 +83,7 @@ public class AnnouncementService extends Service { List serverCards = parseCards(announcements.getArray("servers")).stream().map(this::downloadImage).collect(Collectors.toList()); Platform.runLater(() -> { - AnnouncementsData data = LauncherData.getInstance().getAnnouncements(); + AnnouncementsData data = LauncherData.INSTANCE.getAnnouncements(); data.getAnnouncementCards().clear(); data.getAnnouncementCards().addAll(announcementCards.stream().map(this::dataToCard).collect(Collectors.toList())); data.getServerListCards().clear(); @@ -146,13 +146,8 @@ public class AnnouncementService extends Service { if (destination.isFile()) return; Log.d("Downloading image '%s' to '%s'", url, destination); - try (ReadableByteChannel rbc = Channels.newChannel(new URL(url).openStream()); FileChannel fc = FileChannel.open(destination.toPath(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) { - ByteBuffer bb = ByteBuffer.allocateDirect(8*1024); - while (rbc.read(bb) >= 0) { - bb.flip(); - fc.write(bb); - bb.clear(); - } + try { + new URL(url).openStream().transferTo(new FileOutputStream(destination)); Log.t("Completed download of %s", destination); } catch (IOException e) { Log.e("Failed to download file %s from %s with error: %s: %s", destination, url, e.getClass().getName(), e.getMessage()); @@ -166,8 +161,7 @@ public class AnnouncementService extends Service { String os = filter.getString("os"); if (os != null) { String currentOs = System.getProperty("os.name").toLowerCase(Locale.US); - os = os.toLowerCase(Locale.US); - switch (os) { + switch (os.toLowerCase(Locale.US)) { case "windows": if (!currentOs.contains("win")) return false; @@ -213,7 +207,7 @@ public class AnnouncementService extends Service { Log.t("Retrieving latest announcements..."); JSONObject announcements; - try (JSONInputStream in = new JSONInputStream(new URL("http", LauncherData.UPDATE_ADDRESS, 80, "/launcher/announcements.json").openConnection().getInputStream())) { + try (JSONInputStream in = new JSONInputStream(new URL("http", LauncherData.UPDATE_ADDRESS, 80, "/launcher/announcements.json").openStream())) { announcements = in.readObject(); try (JSONOutputStream out = new JSONOutputStream(new FileOutputStream(localFileList))) { out.writeObject(announcements); diff --git a/src/main/java/com/projectswg/launcher/core/services/data/DownloadService.java b/src/main/java/com/projectswg/launcher/core/services/data/DownloadService.java index afb2895..5176480 100644 --- a/src/main/java/com/projectswg/launcher/core/services/data/DownloadService.java +++ b/src/main/java/com/projectswg/launcher/core/services/data/DownloadService.java @@ -27,9 +27,9 @@ import com.projectswg.launcher.core.resources.intents.CancelDownloadIntent; import com.projectswg.launcher.core.resources.intents.DownloadPatchIntent; import com.projectswg.launcher.core.resources.intents.RequestScanIntent; import me.joshlarson.jlcommon.concurrency.ThreadPool; -import me.joshlarson.jlcommon.concurrency.beans.ConcurrentLong; import me.joshlarson.jlcommon.control.IntentHandler; import me.joshlarson.jlcommon.control.Service; +import me.joshlarson.jlcommon.javafx.beans.ConcurrentLong; import me.joshlarson.jlcommon.log.Log; import java.io.File; diff --git a/src/main/java/com/projectswg/launcher/core/services/data/PreferencesDataService.java b/src/main/java/com/projectswg/launcher/core/services/data/PreferencesDataService.java index f5b8def..8ae8048 100644 --- a/src/main/java/com/projectswg/launcher/core/services/data/PreferencesDataService.java +++ b/src/main/java/com/projectswg/launcher/core/services/data/PreferencesDataService.java @@ -42,19 +42,17 @@ import java.util.prefs.Preferences; public class PreferencesDataService extends Service { - private final LauncherData data; private final Preferences preferences; private final ScheduledThreadPool executor; public PreferencesDataService() { - this.data = LauncherData.getInstance(); - this.preferences = data.getPreferences(); + this.preferences = LauncherData.INSTANCE.getPreferences(); this.executor = new ScheduledThreadPool(1, 3, "data-executor-%d"); + loadPreferences(); } @Override - public boolean initialize() { - loadPreferences(); + public boolean start() { createDefaults(); executor.start(); executor.executeWithFixedDelay(5*60000, 5*60000, this::savePreferences); @@ -62,53 +60,52 @@ public class PreferencesDataService extends Service { } @Override - public boolean terminate() { - executor.stop(); - executor.awaitTermination(1000); + public boolean stop() { savePreferences(); - return true; + executor.stop(); + return executor.awaitTermination(1000); } private void createDefaults() { createPSWG(); createTeamSWG(); - if (data.getGeneral().getWine() == null || data.getGeneral().getWine().isEmpty()) - data.getGeneral().setWine(getWinePath()); + if (LauncherData.INSTANCE.getGeneral().getWine() == null || LauncherData.INSTANCE.getGeneral().getWine().isEmpty()) + LauncherData.INSTANCE.getGeneral().setWine(getWinePath()); } private void createPSWG() { - UpdateServer pswgUpdateServer = data.getUpdate().getServers().stream().filter(s -> s.getName().equals("ProjectSWG")).findFirst().orElse(null); + UpdateServer pswgUpdateServer = LauncherData.INSTANCE.getUpdate().getServers().stream().filter(s -> s.getName().equals("ProjectSWG")).findFirst().orElse(null); if (pswgUpdateServer == null) { pswgUpdateServer = new UpdateServer("ProjectSWG"); pswgUpdateServer.setAddress("login1.projectswg.com"); pswgUpdateServer.setPort(80); pswgUpdateServer.setBasePath("/launcher/patch"); pswgUpdateServer.setGameVersion("NGE"); - data.getUpdate().addServer(pswgUpdateServer); + LauncherData.INSTANCE.getUpdate().addServer(pswgUpdateServer); } else if (pswgUpdateServer.getGameVersion().isEmpty()) { // Migrate existing persisted update servers pswgUpdateServer.setGameVersion("NGE"); } - if (data.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("ProjectSWG"))) { + if (LauncherData.INSTANCE.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("ProjectSWG"))) { LoginServer defaultLive = new LoginServer("ProjectSWG"); defaultLive.setAddress("login1.projectswg.com"); defaultLive.setPort(44453); defaultLive.setUpdateServer(pswgUpdateServer); - data.getLogin().addServer(defaultLive); + LauncherData.INSTANCE.getLogin().addServer(defaultLive); } - if (data.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("localhost"))) { + if (LauncherData.INSTANCE.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("localhost"))) { LoginServer defaultLocalhost = new LoginServer("localhost"); defaultLocalhost.setAddress("localhost"); defaultLocalhost.setPort(44463); defaultLocalhost.setUpdateServer(pswgUpdateServer); - data.getLogin().addServer(defaultLocalhost); + LauncherData.INSTANCE.getLogin().addServer(defaultLocalhost); } } private void createTeamSWG() { - UpdateServer teamswgUpdateServer = data.getUpdate().getServers().stream().filter(s -> s.getName().equals("TeamSWG")).findFirst().orElse(null); + UpdateServer teamswgUpdateServer = LauncherData.INSTANCE.getUpdate().getServers().stream().filter(s -> s.getName().equals("TeamSWG")).findFirst().orElse(null); if (teamswgUpdateServer == null) { teamswgUpdateServer = new UpdateServer("TeamSWG"); @@ -116,35 +113,35 @@ public class PreferencesDataService extends Service { teamswgUpdateServer.setPort(80); teamswgUpdateServer.setBasePath("/launcher/patch"); teamswgUpdateServer.setGameVersion("CU"); - data.getUpdate().addServer(teamswgUpdateServer); + LauncherData.INSTANCE.getUpdate().addServer(teamswgUpdateServer); } - if (data.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("Constrictor"))) { + if (LauncherData.INSTANCE.getLogin().getServers().stream().noneMatch(s -> s.getName().equals("Constrictor"))) { LoginServer constrictor = new LoginServer("Constrictor"); constrictor.setAddress("game.teamswg.com"); constrictor.setPort(44463); constrictor.setUpdateServer(teamswgUpdateServer); - data.getLogin().addServer(constrictor); + LauncherData.INSTANCE.getLogin().addServer(constrictor); } } - private void loadPreferences() { + private synchronized void loadPreferences() { try { - loadGeneralPreferences(data.getGeneral()); - loadUpdatePreferences(data.getUpdate()); - loadLoginPreferences(data.getLogin()); - loadForwarderPreferences(data.getForwarderData()); + loadGeneralPreferences(LauncherData.INSTANCE.getGeneral()); + loadUpdatePreferences(LauncherData.INSTANCE.getUpdate()); + loadLoginPreferences(LauncherData.INSTANCE.getLogin()); + loadForwarderPreferences(LauncherData.INSTANCE.getForwarderData()); } catch (BackingStoreException e) { Log.w(e); } } - private void savePreferences() { + private synchronized void savePreferences() { try { - saveGeneralPreferences(data.getGeneral()); - saveUpdatePreferences(data.getUpdate()); - saveLoginPreferences(data.getLogin()); - saveForwarderPreferences(data.getForwarderData()); + saveGeneralPreferences(LauncherData.INSTANCE.getGeneral()); + saveUpdatePreferences(LauncherData.INSTANCE.getUpdate()); + saveLoginPreferences(LauncherData.INSTANCE.getLogin()); + saveForwarderPreferences(LauncherData.INSTANCE.getForwarderData()); preferences.flush(); } catch (BackingStoreException e) { Log.w(e); @@ -157,6 +154,7 @@ public class PreferencesDataService extends Service { ifPresent(generalPreferences, "theme", LauncherTheme::forThemeTag, generalData::setTheme); ifPresent(generalPreferences, "locale", Locale::forLanguageTag, generalData::setLocale); ifPresent(generalPreferences, "wine", generalData::setWine); + ifPresent(generalPreferences, "admin", Boolean::valueOf, generalData::setAdmin); } private void saveGeneralPreferences(GeneralData generalData) { @@ -164,6 +162,7 @@ public class PreferencesDataService extends Service { generalPreferences.putBoolean("sound", generalData.isSound()); generalPreferences.put("theme", generalData.getTheme().getTag()); generalPreferences.put("locale", generalData.getLocale().toLanguageTag()); + generalPreferences.putBoolean("admin", generalData.isAdmin()); String wine = generalData.getWine(); if (wine != null) generalPreferences.put("wine", wine); @@ -178,7 +177,8 @@ public class PreferencesDataService extends Service { ifPresent(loginServerPreferences, "port", Integer::parseInt, server::setPort); ifPresent(loginServerPreferences, "username", server::setUsername); ifPresent(loginServerPreferences, "password", server::setPassword); - ifPresent(loginServerPreferences, "updateServer", name -> server.setUpdateServer(data.getUpdate().getServers().stream().filter(s -> s.getName().equals(name)).findFirst().orElse(null))); + ifPresent(loginServerPreferences, "updateServer", name -> server.setUpdateServer(LauncherData.INSTANCE.getUpdate().getServers().stream().filter(s -> s.getName().equals(name)).findFirst().orElse(null))); + ifPresent(loginServerPreferences, "verifyServer", Boolean::parseBoolean, server::setVerifyServer); loginData.getServers().add(server); } } @@ -192,6 +192,7 @@ public class PreferencesDataService extends Service { loginServerPreferences.putInt("port", server.getPort()); loginServerPreferences.put("username", server.getUsername()); loginServerPreferences.put("password", server.getPassword()); + loginServerPreferences.putBoolean("verifyServer", server.isVerifyServer()); UpdateServer updateServer = server.getUpdateServer(); if (updateServer != null) loginServerPreferences.put("updateServer", updateServer.getName()); diff --git a/src/main/java/com/projectswg/launcher/core/services/data/RemoteDataService.java b/src/main/java/com/projectswg/launcher/core/services/data/RemoteDataService.java index 40a1191..c48e137 100644 --- a/src/main/java/com/projectswg/launcher/core/services/data/RemoteDataService.java +++ b/src/main/java/com/projectswg/launcher/core/services/data/RemoteDataService.java @@ -20,7 +20,7 @@ package com.projectswg.launcher.core.services.data; -import com.projectswg.connection.HolocoreSocket; +import com.projectswg.holocore.client.HolocoreSocket; import com.projectswg.launcher.core.resources.data.LauncherData; import com.projectswg.launcher.core.resources.data.login.LoginData; import com.projectswg.launcher.core.resources.data.login.LoginServer; @@ -53,6 +53,12 @@ public class RemoteDataService extends Service { getLoginData().getServers().addCollectionChangedListener(LISTENER_KEY, loginServers::synchronize); } + @Override + public boolean initialize() { + loginServers.synchronize(getLoginData().getServers()); + return true; + } + @Override public boolean start() { executor.start(); @@ -66,8 +72,7 @@ public class RemoteDataService extends Service { @Override public boolean stop() { executor.stop(); - executor.awaitTermination(1000); - return true; + return executor.awaitTermination(1000); } @Override @@ -91,11 +96,11 @@ public class RemoteDataService extends Service { } private static LoginData getLoginData() { - return LauncherData.getInstance().getLogin(); + return LauncherData.INSTANCE.getLogin(); } private static UpdateData getUpdateData() { - return LauncherData.getInstance().getUpdate(); + return LauncherData.INSTANCE.getUpdate(); } private static class LoginServerUpdater { @@ -107,15 +112,15 @@ public class RemoteDataService extends Service { this.server = server; this.socket = null; - server.getAddressProperty().addListener(LISTENER_KEY, addr -> updateSocket()); - server.getPortProperty().addListener(LISTENER_KEY, port -> updateSocket()); + server.getAddressProperty().addSimpleListener(LISTENER_KEY, addr -> updateSocket()); + server.getPortProperty().addSimpleListener(LISTENER_KEY, port -> updateSocket()); updateSocket(); } public void terminate() { HolocoreSocket socket = this.socket; if (socket != null) - socket.terminate(); + socket.close(); } public void update() { diff --git a/src/main/java/com/projectswg/launcher/core/services/launcher/LauncherManager.java b/src/main/java/com/projectswg/launcher/core/services/launcher/LauncherManager.java index d70373c..50b9d23 100644 --- a/src/main/java/com/projectswg/launcher/core/services/launcher/LauncherManager.java +++ b/src/main/java/com/projectswg/launcher/core/services/launcher/LauncherManager.java @@ -25,7 +25,6 @@ import me.joshlarson.jlcommon.control.ManagerStructure; @ManagerStructure(children = { GameService.class, - UserInterfaceService.class }) public class LauncherManager extends Manager { diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..bb367c5 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,27 @@ +module com.projectswg.launcher { + requires javafx.controls; + requires javafx.fxml; + requires me.joshlarson.jlcommon; + requires me.joshlarson.jlcommon.javafx; + requires fast.json; + requires zero.allocation.hashing; + requires de.jensd.fx.glyphs.fontawesome; + requires org.bouncycastle.provider; + + requires com.projectswg.common; + requires com.projectswg.forwarder; + requires com.projectswg.holocore.client; + + requires java.prefs; + + opens strings; + opens css; + opens graphics; + opens graphics.headers; + opens fxml; + opens com.projectswg.launcher.core.resources.gui; + opens com.projectswg.launcher.core.resources.gui.servers; + opens com.projectswg.launcher.core.resources.gui.settings; + opens com.projectswg.launcher.core.services.data; + opens com.projectswg.launcher.core.services.launcher; +} diff --git a/src/main/resources/theme/projectswg/css/theme.css b/src/main/resources/css/theme.css similarity index 100% rename from src/main/resources/theme/projectswg/css/theme.css rename to src/main/resources/css/theme.css diff --git a/src/main/resources/theme/projectswg/fxml/announcements.fxml b/src/main/resources/fxml/announcements.fxml similarity index 100% rename from src/main/resources/theme/projectswg/fxml/announcements.fxml rename to src/main/resources/fxml/announcements.fxml diff --git a/src/main/resources/theme/projectswg/fxml/navigation.fxml b/src/main/resources/fxml/navigation.fxml similarity index 93% rename from src/main/resources/theme/projectswg/fxml/navigation.fxml rename to src/main/resources/fxml/navigation.fxml index 4466db0..c65c02f 100644 --- a/src/main/resources/theme/projectswg/fxml/navigation.fxml +++ b/src/main/resources/fxml/navigation.fxml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/theme/projectswg/fxml/servers.fxml b/src/main/resources/fxml/servers.fxml similarity index 89% rename from src/main/resources/theme/projectswg/fxml/servers.fxml rename to src/main/resources/fxml/servers.fxml index 2a32791..8a30909 100644 --- a/src/main/resources/theme/projectswg/fxml/servers.fxml +++ b/src/main/resources/fxml/servers.fxml @@ -7,7 +7,7 @@ - + diff --git a/src/main/resources/theme/projectswg/fxml/settings.fxml b/src/main/resources/fxml/settings.fxml similarity index 100% rename from src/main/resources/theme/projectswg/fxml/settings.fxml rename to src/main/resources/fxml/settings.fxml diff --git a/src/main/resources/theme/projectswg/fxml/settings/settings_forwarder.fxml b/src/main/resources/fxml/settings/settings_forwarder.fxml similarity index 100% rename from src/main/resources/theme/projectswg/fxml/settings/settings_forwarder.fxml rename to src/main/resources/fxml/settings/settings_forwarder.fxml diff --git a/src/main/resources/theme/projectswg/fxml/settings/settings_general.fxml b/src/main/resources/fxml/settings/settings_general.fxml similarity index 77% rename from src/main/resources/theme/projectswg/fxml/settings/settings_general.fxml rename to src/main/resources/fxml/settings/settings_general.fxml index 3a642a3..fb1c96d 100644 --- a/src/main/resources/theme/projectswg/fxml/settings/settings_general.fxml +++ b/src/main/resources/fxml/settings/settings_general.fxml @@ -20,4 +20,10 @@